Merge pull request #3385 from myk002/myk_orders

[orders] improve orders library with new findings

data/orders/basic.json

@@ -1,31 +1,9 @@
 [
-	{
-		"amount_left" : 150,
-		"amount_total" : 150,
-		"frequency" : "Monthly",
-		"id" : 0,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "LessThan",
-				"flags" : 
-				[
-					"unrotten"
-				],
-				"item_type" : "FOOD",
-				"value" : 400
-			}
-		],
-		"job" : "PrepareMeal",
-		"meal_ingredients" : 2
-	},
 	{
 		"amount_left" : 10,
 		"amount_total" : 10,
 		"frequency" : "Daily",
-		"id" : 1,
+		"id" : 0,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -47,7 +25,7 @@
 					"unrotten",
 					"cookable"
 				],
-				"value" : 500
+				"value" : 80
 			},
 			{
 				"condition" : "AtMost",
@@ -57,15 +35,6 @@
 				],
 				"item_type" : "FOOD",
 				"value" : 3500
-			},
-			{
-				"condition" : "AtLeast",
-				"flags" : 
-				[
-					"unrotten"
-				],
-				"item_type" : "FOOD",
-				"value" : 400
 			}
 		],
 		"job" : "PrepareMeal",
@@ -75,7 +44,7 @@
 		"amount_left" : 2,
 		"amount_total" : 2,
 		"frequency" : "Daily",
-		"id" : 2,
+		"id" : 1,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -112,7 +81,7 @@
 		"amount_left" : 2,
 		"amount_total" : 2,
 		"frequency" : "Daily",
-		"id" : 3,
+		"id" : 2,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -149,7 +118,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 4,
+		"id" : 3,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -170,7 +139,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 5,
+		"id" : 4,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -205,7 +174,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 6,
+		"id" : 5,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -237,7 +206,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 7,
+		"id" : 6,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -268,7 +237,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 8,
+		"id" : 7,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -290,7 +259,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 9,
+		"id" : 8,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -322,7 +291,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 10,
+		"id" : 9,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -353,7 +322,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 11,
+		"id" : 10,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -386,7 +355,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 12,
+		"id" : 11,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -426,7 +395,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 13,
+		"id" : 12,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -452,7 +421,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 14,
+		"id" : 13,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -487,7 +456,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 15,
+		"id" : 14,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -522,7 +491,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 16,
+		"id" : 15,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -557,7 +526,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 17,
+		"id" : 16,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -587,7 +556,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 18,
+		"id" : 17,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -618,6 +587,36 @@
 		"job" : "MakeTool",
 		"material" : "INORGANIC"
 	},
+	{
+		"amount_left" : 1,
+		"amount_total" : 1,
+		"frequency" : "Daily",
+		"id" : 18,
+		"is_active" : false,
+		"is_validated" : false,
+		"item_conditions" : 
+		[
+			{
+				"condition" : "AtLeast",
+				"item_type" : "WOOD",
+				"value" : 50
+			},
+			{
+				"condition" : "AtMost",
+				"flags" : 
+				[
+					"empty"
+				],
+				"item_type" : "BIN",
+				"value" : 5
+			}
+		],
+		"job" : "ConstructBin",
+		"material_category" : 
+		[
+			"wood"
+		]
+	},
 	{
 		"amount_left" : 1,
 		"amount_total" : 1,

data/orders/military.json

@@ -92,15 +92,16 @@
 		[
 			{
 				"condition" : "AtLeast",
-				"item_type" : "SKIN_TANNED",
+				"flags" : 
+				[
+					"silk"
+				],
+				"item_type" : "CLOTH",
+				"min_dimension" : 10000,
 				"value" : 10
 			},
 			{
 				"condition" : "AtMost",
-				"flags" : 
-				[
-					"leather"
-				],
 				"item_subtype" : "ITEM_ARMOR_CLOAK",
 				"item_type" : "ARMOR",
 				"value" : 10
@@ -110,7 +111,7 @@
 		"job" : "MakeArmor",
 		"material_category" : 
 		[
-			"leather"
+			"silk"
 		]
 	},
 	{
@@ -152,25 +153,21 @@
 		[
 			{
 				"condition" : "AtLeast",
-				"item_type" : "SKIN_TANNED",
+				"item_type" : "WOOD",
-				"value" : 25
+				"value" : 50
 			},
 			{
 				"condition" : "AtMost",
-				"flags" : 
-				[
-					"leather"
-				],
 				"item_subtype" : "ITEM_SHIELD_SHIELD",
 				"item_type" : "SHIELD",
-				"value" : 1
+				"value" : 10
 			}
 		],
 		"item_subtype" : "ITEM_SHIELD_SHIELD",
 		"job" : "MakeShield",
 		"material_category" : 
 		[
-			"leather"
+			"wood"
 		]
 	},
 	{
@@ -191,7 +188,7 @@
 				"condition" : "AtMost",
 				"item_subtype" : "ITEM_ARMOR_LEATHER",
 				"item_type" : "ARMOR",
-				"value" : 1
+				"value" : 10
 			}
 		],
 		"item_subtype" : "ITEM_ARMOR_LEATHER",
@@ -223,7 +220,7 @@
 				],
 				"item_subtype" : "ITEM_HELM_HELM",
 				"item_type" : "HELM",
-				"value" : 1
+				"value" : 10
 			}
 		],
 		"item_subtype" : "ITEM_HELM_HELM",
@@ -255,7 +252,7 @@
 				],
 				"item_subtype" : "ITEM_SHOES_BOOTS",
 				"item_type" : "SHOES",
-				"value" : 2
+				"value" : 20
 			}
 		],
 		"item_subtype" : "ITEM_SHOES_BOOTS",
@@ -287,7 +284,7 @@
 				],
 				"item_subtype" : "ITEM_PANTS_LEGGINGS",
 				"item_type" : "PANTS",
-				"value" : 1
+				"value" : 10
 			}
 		],
 		"item_subtype" : "ITEM_PANTS_LEGGINGS",
@@ -319,7 +316,7 @@
 				],
 				"item_subtype" : "ITEM_GLOVES_GLOVES",
 				"item_type" : "GLOVES",
-				"value" : 2
+				"value" : 20
 			}
 		],
 		"item_subtype" : "ITEM_GLOVES_GLOVES",
@@ -571,37 +568,6 @@
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BOULDER",
-				"material" : "INORGANIC:NATIVE_PLATINUM",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:PLATINUM",
-				"value" : 10
-			}
-		],
-		"job" : "SmeltOre",
-		"material" : "INORGANIC:NATIVE_PLATINUM"
-	},
-	{
-		"amount_left" : 4,
-		"amount_total" : 4,
-		"frequency" : "Daily",
-		"id" : 19,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
 		[
 			{
 				"condition" : "AtLeast",
@@ -629,7 +595,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 20,
+		"id" : 19,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -660,7 +626,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 21,
+		"id" : 20,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -691,7 +657,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 22,
+		"id" : 21,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -722,7 +688,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 23,
+		"id" : 22,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -759,7 +725,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 24,
+		"id" : 23,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -808,7 +774,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 25,
+		"id" : 24,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -845,7 +811,7 @@
 		"amount_left" : 4,
 		"amount_total" : 4,
 		"frequency" : "Daily",
-		"id" : 26,
+		"id" : 25,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -888,7 +854,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 27,
+		"id" : 26,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -924,7 +890,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 28,
+		"id" : 27,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -967,7 +933,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 29,
+		"id" : 28,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1015,7 +981,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 30,
+		"id" : 29,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1070,79 +1036,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 35,
+		"id" : 30,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"flags" : 
-				[
-					"metal"
-				],
-				"item_subtype" : "ITEM_WEAPON_MACE",
-				"item_type" : "WEAPON",
-				"value" : 10
-			}
-		],
-		"item_subtype" : "ITEM_WEAPON_MACE",
-		"job" : "MakeWeapon",
-		"material" : "INORGANIC:SILVER"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 35,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
-			{
-				"condition" : "AtLeast",
-				"item_type" : "BAR",
-				"material" : "COAL",
-				"value" : 100
-			},
-			{
-				"condition" : "AtMost",
-				"flags" : 
-				[
-					"metal"
-				],
-				"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
-				"item_type" : "WEAPON",
-				"value" : 10
-			}
-		],
-		"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
-		"job" : "MakeWeapon",
-		"material" : "INORGANIC:SILVER"
-	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 37,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1175,7 +1069,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 38,
+		"id" : 31,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1208,7 +1102,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 39,
+		"id" : 32,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1241,7 +1135,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 40,
+		"id" : 33,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1274,7 +1168,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 41,
+		"id" : 34,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1307,7 +1201,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 42,
+		"id" : 35,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1347,7 +1241,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 43,
+		"id" : 36,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1387,7 +1281,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 44,
+		"id" : 37,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1404,12 +1298,6 @@
 				"material" : "COAL",
 				"value" : 100
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"item_subtype" : "ITEM_WEAPON_MACE",
@@ -1426,7 +1314,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 45,
+		"id" : 38,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1443,12 +1331,6 @@
 				"material" : "COAL",
 				"value" : 100
 			},
-			{
-				"condition" : "LessThan",
-				"item_type" : "BAR",
-				"material" : "INORGANIC:SILVER",
-				"value" : 5
-			},
 			{
 				"condition" : "AtMost",
 				"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
@@ -1465,7 +1347,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 46,
+		"id" : 39,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1498,7 +1380,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 47,
+		"id" : 40,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1531,7 +1413,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 48,
+		"id" : 41,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1564,7 +1446,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 49,
+		"id" : 42,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1597,7 +1479,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 50,
+		"id" : 43,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1630,7 +1512,103 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 51,
+		"id" : 44,
+		"is_active" : false,
+		"is_validated" : false,
+		"item_conditions" : 
+		[
+			{
+				"condition" : "AtLeast",
+				"item_type" : "BAR",
+				"material" : "INORGANIC:SILVER",
+				"value" : 5
+			},
+			{
+				"condition" : "AtLeast",
+				"item_type" : "BAR",
+				"material" : "COAL",
+				"value" : 100
+			},
+			{
+				"condition" : "LessThan",
+				"item_type" : "BOULDER",
+				"reaction_class" : "FLUX",
+				"value" : 5
+			},
+			{
+				"condition" : "AtMost",
+				"flags" : 
+				[
+					"metal"
+				],
+				"item_subtype" : "ITEM_WEAPON_MACE",
+				"item_type" : "WEAPON",
+				"value" : 10
+			},
+			{
+				"condition" : "LessThan",
+				"item_type" : "BAR",
+				"material" : "INORGANIC:STEEL",
+				"value" : 10
+			}
+		],
+		"item_subtype" : "ITEM_WEAPON_MACE",
+		"job" : "MakeWeapon",
+		"material" : "INORGANIC:SILVER"
+	},
+	{
+		"amount_left" : 1,
+		"amount_total" : 1,
+		"frequency" : "Daily",
+		"id" : 45,
+		"is_active" : false,
+		"is_validated" : false,
+		"item_conditions" : 
+		[
+			{
+				"condition" : "AtLeast",
+				"item_type" : "BAR",
+				"material" : "INORGANIC:SILVER",
+				"value" : 5
+			},
+			{
+				"condition" : "AtLeast",
+				"item_type" : "BAR",
+				"material" : "COAL",
+				"value" : 100
+			},
+			{
+				"condition" : "LessThan",
+				"item_type" : "BOULDER",
+				"reaction_class" : "FLUX",
+				"value" : 5
+			},
+			{
+				"condition" : "AtMost",
+				"flags" : 
+				[
+					"metal"
+				],
+				"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
+				"item_type" : "WEAPON",
+				"value" : 10
+			},
+			{
+				"condition" : "LessThan",
+				"item_type" : "BAR",
+				"material" : "INORGANIC:STEEL",
+				"value" : 10
+			}
+		],
+		"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
+		"job" : "MakeWeapon",
+		"material" : "INORGANIC:SILVER"
+	},
+	{
+		"amount_left" : 1,
+		"amount_total" : 1,
+		"frequency" : "Daily",
+		"id" : 46,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1678,7 +1656,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 52,
+		"id" : 47,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1726,7 +1704,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 53,
+		"id" : 48,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1774,7 +1752,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 54,
+		"id" : 49,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1822,7 +1800,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 55,
+		"id" : 50,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1870,7 +1848,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 56,
+		"id" : 51,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1928,7 +1906,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 57,
+		"id" : 52,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -1986,7 +1964,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 58,
+		"id" : 53,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2040,7 +2018,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 59,
+		"id" : 54,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2094,7 +2072,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 60,
+		"id" : 55,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2142,7 +2120,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 61,
+		"id" : 56,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2190,7 +2168,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 62,
+		"id" : 57,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2238,7 +2216,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 63,
+		"id" : 58,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2286,7 +2264,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 64,
+		"id" : 59,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2334,7 +2312,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 79,
+		"id" : 74,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2382,7 +2360,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 80,
+		"id" : 75,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2430,7 +2408,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 81,
+		"id" : 76,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2478,7 +2456,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 82,
+		"id" : 77,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2526,7 +2504,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 83,
+		"id" : 78,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2574,7 +2552,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 84,
+		"id" : 79,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2632,7 +2610,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 85,
+		"id" : 80,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2690,7 +2668,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 72,
+		"id" : 67,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2735,7 +2713,7 @@
 				"item_type" : "BAR",
 				"material" : "INORGANIC:SILVER",
 				"value" : 5
-			},
+			}
 		],
 		"item_subtype" : "ITEM_WEAPON_MACE",
 		"job" : "MakeWeapon",
@@ -2745,7 +2723,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 87,
+		"id" : 82,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2799,7 +2777,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 88,
+		"id" : 83,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2847,7 +2825,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 89,
+		"id" : 84,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2895,7 +2873,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 90,
+		"id" : 85,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2943,7 +2921,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 91,
+		"id" : 86,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -2991,7 +2969,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 92,
+		"id" : 87,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3039,7 +3017,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 79,
+		"id" : 74,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3093,7 +3071,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 80,
+		"id" : 75,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3147,7 +3125,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 81,
+		"id" : 76,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3201,7 +3179,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 82,
+		"id" : 77,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3255,7 +3233,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 83,
+		"id" : 78,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3309,7 +3287,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 84,
+		"id" : 79,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3373,7 +3351,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 85,
+		"id" : 80,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3437,7 +3415,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 86,
+		"id" : 81,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3497,7 +3475,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 87,
+		"id" : 82,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3557,7 +3535,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 88,
+		"id" : 83,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3611,7 +3589,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 89,
+		"id" : 84,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3665,7 +3643,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 90,
+		"id" : 85,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3719,7 +3697,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 91,
+		"id" : 86,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3773,7 +3751,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 92,
+		"id" : 87,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3827,7 +3805,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 93,
+		"id" : 88,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3887,7 +3865,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 94,
+		"id" : 89,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -3947,7 +3925,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 95,
+		"id" : 90,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4007,7 +3985,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 96,
+		"id" : 91,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4067,7 +4045,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 97,
+		"id" : 92,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4127,7 +4105,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 98,
+		"id" : 93,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4197,7 +4175,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 99,
+		"id" : 94,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4267,7 +4245,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 100,
+		"id" : 95,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4333,7 +4311,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 101,
+		"id" : 96,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4399,7 +4377,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 102,
+		"id" : 97,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4459,7 +4437,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 103,
+		"id" : 98,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4519,7 +4497,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 104,
+		"id" : 99,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4579,7 +4557,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 105,
+		"id" : 100,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 
@@ -4639,7 +4617,7 @@
 		"amount_left" : 1,
 		"amount_total" : 1,
 		"frequency" : "Daily",
-		"id" : 106,
+		"id" : 101,
 		"is_active" : false,
 		"is_validated" : false,
 		"item_conditions" : 

docs/changelog.txt

@@ -47,6 +47,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `autolabor`: work detail override warning now only appears on the work details screen
 
 ## Misc Improvements
+- `orders`: update orders in orders library for prepared meals, bins, archer uniforms, and weapons
 - Terminal console no longer appears in front of the game window on startup
 - `gui/design`: Improved performance for drawing shapes
 - Core: For debugging purposes, you can now pass ``--disable-dfhack`` on the Dwarf Fortress commandline or specify ``DFHACK_DISABLE=1`` in the environment to disable DFHack for the current session.
@@ -59,6 +60,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``overlay.reload()``: has been renamed to ``overlay.rescan()`` so as not to conflict with the global ``reload()`` function. If you are developing an overlay, please take note of the new function name for reloading your overlay during development.
 
 ## Removed
+- `orders`: ``library/military_include_artifact_materials`` library file removed since recent research indicates that platinum blunt weapons and silver crossbows are not more effective than standard steel. the alternate military orders file was also causing unneeded confusion.
 
 # 50.08-r1
 

docs/plugins/orders.rst

@@ -67,7 +67,7 @@ This collection of orders handles basic fort necessities:
 - prepared meals and food products (and by-products like oil)
 - booze/mead
 - thread/cloth/dye
-- pots/jugs/buckets/mugs
+- pots/bins/jugs/buckets/mugs
 - bags of leather, cloth, silk, and yarn
 - crafts, totems, and shleggings from otherwise unusable by-products
 - mechanisms/cages
@@ -80,7 +80,10 @@ This collection of orders handles basic fort necessities:
 You should import it as soon as you have enough dwarves to perform the tasks.
 Right after the first migration wave is usually a good time.
 
-Armok's note: shleggings? Yes, `shleggings <https://youtu.be/bLN8cOcTjdo>`__.
+Note that the jugs are specifically made out of wood. This is so, as long as you don't may any other "Tools" out of wood, you can have a stockpile just for jugs by restricting a finished goods stockpile to only take wooden tools.
+
+Armok's additional note: "shleggings? Yes,
+`shleggings <https://youtu.be/bLN8cOcTjdo>`__."
 
 :source:`library/furnace <data/orders/furnace.json>`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -104,13 +107,15 @@ Orders are missing for plaster powder until DF :bug:`11803` is fixed.
 This collection adds high-volume smelting jobs for military-grade metal ores and
 produces weapons and armor:
 
-- leather backpacks/waterskins/cloaks/quivers/armor
+- leather backpacks/waterskins/quivers/armor
+- silk cloaks
 - bone/wooden bolts
 - smelting for platinum, silver, steel, bronze, bismuth bronze, and copper (and
   their dependencies)
 - bronze/bismuth bronze/copper bolts
-- silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
+- steel/silver/iron/bismuth bronze/bronze/copper weapons and armor,
   with checks to ensure only the best available materials are being used
+- wooden shields (if metal isn't available)
 
 If you set a stockpile to take weapons and armor of less than masterwork quality
 and turn on `automelt` (like what `dreamfort` provides on its industry level),
@@ -120,16 +125,6 @@ Make sure you have a lot of fuel (or magma forges and furnaces) before you turn
 
 This file should only be imported, of course, if you need to equip a military.
 
-:source:`library/military_include_artifact_materials <data/orders/military_include_artifact_materials.json>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-As above, but this collection will also allow creation of platinum blunt weapons.
-Normally these are only created by artifact moods, work orders can't be created
-manually for them.
-
-- platinum/silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
-  with checks to ensure only the best available materials are being used
-
 :source:`library/smelting <data/orders/smelting.json>`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~