From 9094011d49ae9ad2e3a74570242d83c50bd6f683 Mon Sep 17 00:00:00 2001 From: myk002 Date: Fri, 27 Aug 2021 22:16:28 -0700 Subject: [PATCH] move cages to basic, reindex each file from 0 --- data/examples/orders/basic.json | 54 ++++++-- data/examples/orders/furnace.json | 26 ++-- data/examples/orders/glassstock.json | 42 +++---- data/examples/orders/military.json | 182 +++++++++++++-------------- data/examples/orders/otherstock.json | 28 +++++ data/examples/orders/rockstock.json | 36 +++--- data/examples/orders/smelting.json | 62 ++++----- data/examples/orders/woodstock.json | 54 -------- 8 files changed, 244 insertions(+), 240 deletions(-) create mode 100644 data/examples/orders/otherstock.json delete mode 100644 data/examples/orders/woodstock.json diff --git a/data/examples/orders/basic.json b/data/examples/orders/basic.json index aca5a2037..1338bb7fc 100644 --- a/data/examples/orders/basic.json +++ b/data/examples/orders/basic.json @@ -695,6 +695,36 @@ "is_active" : false, "is_validated" : false, "item_conditions" : + [ + { + "condition" : "AtLeast", + "item_type" : "WOOD", + "value" : 150 + }, + { + "condition" : "AtMost", + "flags" : + [ + "empty" + ], + "item_type" : "CAGE", + "value" : 30 + } + ], + "job" : "MakeCage", + "material_category" : + [ + "wood" + ] + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 22, + "is_active" : false, + "is_validated" : false, + "item_conditions" : [ { "condition" : "AtLeast", @@ -722,7 +752,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 22, + "id" : 23, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -758,7 +788,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 23, + "id" : 24, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -794,7 +824,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 24, + "id" : 25, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -830,7 +860,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 25, + "id" : 26, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -849,7 +879,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 26, + "id" : 27, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -871,7 +901,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 27, + "id" : 28, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -897,7 +927,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 28, + "id" : 29, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -923,7 +953,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 29, + "id" : 30, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -956,7 +986,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 30, + "id" : 31, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -995,7 +1025,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 31, + "id" : 32, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1029,7 +1059,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 32, + "id" : 33, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1052,7 +1082,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 33, + "id" : 34, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/furnace.json b/data/examples/orders/furnace.json index 1bb7e6641..39a05bdc3 100644 --- a/data/examples/orders/furnace.json +++ b/data/examples/orders/furnace.json @@ -3,7 +3,7 @@ "amount_left" : 20, "amount_total" : 20, "frequency" : "Daily", - "id" : 34, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -38,7 +38,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 35, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -61,7 +61,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 36, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -86,7 +86,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 37, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -111,7 +111,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 38, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -154,7 +154,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 39, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -186,7 +186,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 40, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -216,7 +216,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 41, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -249,7 +249,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 42, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -288,7 +288,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 43, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -328,7 +328,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 44, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -347,7 +347,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 45, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -378,7 +378,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 46, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/glassstock.json b/data/examples/orders/glassstock.json index bb80cf9f6..ec5ad5ec6 100644 --- a/data/examples/orders/glassstock.json +++ b/data/examples/orders/glassstock.json @@ -3,7 +3,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 187, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -35,7 +35,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 188, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -68,7 +68,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 189, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -101,7 +101,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 190, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -133,7 +133,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 191, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -165,7 +165,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 192, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -197,7 +197,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 193, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -229,7 +229,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 194, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -261,7 +261,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 195, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -293,7 +293,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 196, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -325,7 +325,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 197, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -357,7 +357,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 198, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -389,7 +389,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 199, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -421,7 +421,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 200, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -456,7 +456,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 201, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -490,7 +490,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 202, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -524,7 +524,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 203, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -558,7 +558,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 204, + "id" : 17, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -590,7 +590,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 205, + "id" : 18, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -623,7 +623,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 206, + "id" : 19, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -656,7 +656,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 207, + "id" : 20, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/military.json b/data/examples/orders/military.json index 8d682fc52..f5e02ca00 100644 --- a/data/examples/orders/military.json +++ b/data/examples/orders/military.json @@ -3,7 +3,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 47, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -29,7 +29,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 48, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -59,7 +59,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 49, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -85,7 +85,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 50, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -117,7 +117,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 51, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -145,7 +145,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 52, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -177,7 +177,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 53, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -205,7 +205,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 54, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -237,7 +237,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 55, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -269,7 +269,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 56, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -301,7 +301,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 57, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -333,7 +333,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 58, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -370,7 +370,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 59, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -412,7 +412,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 60, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -443,7 +443,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 61, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -474,7 +474,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 62, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -505,7 +505,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 63, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -536,7 +536,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 64, + "id" : 17, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -567,7 +567,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 65, + "id" : 18, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -598,7 +598,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 66, + "id" : 19, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -629,7 +629,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 67, + "id" : 20, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -660,7 +660,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 68, + "id" : 21, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -691,7 +691,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 69, + "id" : 22, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -722,7 +722,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 70, + "id" : 23, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -759,7 +759,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 71, + "id" : 24, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -808,7 +808,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 72, + "id" : 25, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -845,7 +845,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 73, + "id" : 26, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -888,7 +888,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 74, + "id" : 27, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -924,7 +924,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 75, + "id" : 28, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -967,7 +967,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 76, + "id" : 29, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1000,7 +1000,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 77, + "id" : 30, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1033,7 +1033,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 123, + "id" : 76, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1066,7 +1066,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 80, + "id" : 33, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1105,7 +1105,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 80, + "id" : 33, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1144,7 +1144,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 123, + "id" : 76, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1183,7 +1183,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 82, + "id" : 35, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1228,7 +1228,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 83, + "id" : 36, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1261,7 +1261,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 84, + "id" : 37, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1294,7 +1294,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 85, + "id" : 38, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1327,7 +1327,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 86, + "id" : 39, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1360,7 +1360,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 87, + "id" : 40, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1400,7 +1400,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 88, + "id" : 41, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1433,7 +1433,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 89, + "id" : 42, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1473,7 +1473,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 90, + "id" : 43, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1506,7 +1506,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 91, + "id" : 44, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1539,7 +1539,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 92, + "id" : 45, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1572,7 +1572,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 93, + "id" : 46, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1617,7 +1617,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 94, + "id" : 47, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1650,7 +1650,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 95, + "id" : 48, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1695,7 +1695,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 96, + "id" : 49, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1746,7 +1746,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 97, + "id" : 50, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1785,7 +1785,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 98, + "id" : 51, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1824,7 +1824,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 99, + "id" : 52, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1863,7 +1863,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 100, + "id" : 53, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1902,7 +1902,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 101, + "id" : 54, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1948,7 +1948,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 102, + "id" : 55, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1987,7 +1987,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 103, + "id" : 56, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2033,7 +2033,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 104, + "id" : 57, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2072,7 +2072,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 105, + "id" : 58, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2111,7 +2111,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 106, + "id" : 59, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2150,7 +2150,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 107, + "id" : 60, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2201,7 +2201,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 108, + "id" : 61, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2240,7 +2240,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 123, + "id" : 76, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2291,7 +2291,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 110, + "id" : 63, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2348,7 +2348,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 111, + "id" : 64, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2393,7 +2393,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 112, + "id" : 65, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2438,7 +2438,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 113, + "id" : 66, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2483,7 +2483,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 114, + "id" : 67, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2528,7 +2528,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 115, + "id" : 68, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2580,7 +2580,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 116, + "id" : 69, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2625,7 +2625,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 117, + "id" : 70, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2677,7 +2677,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 118, + "id" : 71, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2722,7 +2722,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 119, + "id" : 72, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2767,7 +2767,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 120, + "id" : 73, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2812,7 +2812,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 121, + "id" : 74, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2869,7 +2869,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 122, + "id" : 75, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2914,7 +2914,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 123, + "id" : 76, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2971,7 +2971,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 124, + "id" : 77, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3034,7 +3034,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 125, + "id" : 78, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3085,7 +3085,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 126, + "id" : 79, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3136,7 +3136,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 127, + "id" : 80, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3187,7 +3187,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 128, + "id" : 81, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3238,7 +3238,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 129, + "id" : 82, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3296,7 +3296,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 130, + "id" : 83, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3347,7 +3347,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 131, + "id" : 84, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3405,7 +3405,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 132, + "id" : 85, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3456,7 +3456,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 133, + "id" : 86, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3507,7 +3507,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 134, + "id" : 87, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3558,7 +3558,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 135, + "id" : 88, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3621,7 +3621,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 136, + "id" : 89, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3672,7 +3672,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 137, + "id" : 90, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/otherstock.json b/data/examples/orders/otherstock.json new file mode 100644 index 000000000..a15835159 --- /dev/null +++ b/data/examples/orders/otherstock.json @@ -0,0 +1,28 @@ +[ + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 0, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "item_type" : "WOOD", + "value" : 150 + }, + { + "condition" : "AtMost", + "item_type" : "BED", + "value" : 2 + } + ], + "job" : "ConstructBed", + "material_category" : + [ + "wood" + ] + } +] diff --git a/data/examples/orders/rockstock.json b/data/examples/orders/rockstock.json index cd7f354c9..c09b9b436 100644 --- a/data/examples/orders/rockstock.json +++ b/data/examples/orders/rockstock.json @@ -3,7 +3,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 169, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -32,7 +32,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 170, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -61,7 +61,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 171, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -90,7 +90,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 172, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -120,7 +120,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 173, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -149,7 +149,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 174, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -178,7 +178,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 175, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -207,7 +207,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 176, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -236,7 +236,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 177, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -265,7 +265,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 178, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -294,7 +294,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 179, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -323,7 +323,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 180, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -352,7 +352,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 181, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -381,7 +381,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 182, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -410,7 +410,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 183, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -439,7 +439,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 184, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -470,7 +470,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 185, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -501,7 +501,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 186, + "id" : 17, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/smelting.json b/data/examples/orders/smelting.json index 67d102dcd..fec669324 100644 --- a/data/examples/orders/smelting.json +++ b/data/examples/orders/smelting.json @@ -3,7 +3,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 138, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -34,7 +34,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 139, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -65,7 +65,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 140, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -96,7 +96,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 141, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -127,7 +127,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 142, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -158,7 +158,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 143, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -189,7 +189,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 144, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -220,7 +220,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 145, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -251,7 +251,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 146, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -282,7 +282,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 147, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -313,7 +313,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 148, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -344,7 +344,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 149, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -375,7 +375,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 150, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -406,7 +406,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 151, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -437,7 +437,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 152, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -468,7 +468,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 153, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -499,7 +499,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 154, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -536,7 +536,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 155, + "id" : 17, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -579,7 +579,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 156, + "id" : 18, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -622,7 +622,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 157, + "id" : 19, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -659,7 +659,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 158, + "id" : 20, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -696,7 +696,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 159, + "id" : 21, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -745,7 +745,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 160, + "id" : 22, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -782,7 +782,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 161, + "id" : 23, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -819,7 +819,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 162, + "id" : 24, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -862,7 +862,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 163, + "id" : 25, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -905,7 +905,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 164, + "id" : 26, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -942,7 +942,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 165, + "id" : 27, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -979,7 +979,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 166, + "id" : 28, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1022,7 +1022,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 167, + "id" : 29, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1059,7 +1059,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 168, + "id" : 30, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/woodstock.json b/data/examples/orders/woodstock.json deleted file mode 100644 index ce8865f06..000000000 --- a/data/examples/orders/woodstock.json +++ /dev/null @@ -1,54 +0,0 @@ -[ - { - "amount_left" : 1, - "amount_total" : 1, - "frequency" : "Daily", - "id" : 208, - "is_active" : false, - "is_validated" : false, - "item_conditions" : - [ - { - "condition" : "AtLeast", - "item_type" : "WOOD", - "value" : 150 - }, - { - "condition" : "AtMost", - "item_type" : "BED", - "value" : 2 - } - ], - "job" : "ConstructBed", - "material_category" : - [ - "wood" - ] - }, - { - "amount_left" : 1, - "amount_total" : 1, - "frequency" : "Daily", - "id" : 209, - "is_active" : false, - "is_validated" : false, - "item_conditions" : - [ - { - "condition" : "AtLeast", - "item_type" : "WOOD", - "value" : 150 - }, - { - "condition" : "AtMost", - "item_type" : "CAGE", - "value" : 2 - } - ], - "job" : "MakeCage", - "material_category" : - [ - "wood" - ] - } -]