Skip to content

Commit

Permalink
Merge pull request #37470 from Qrox/recipe-loading-perf
Browse files Browse the repository at this point in the history 
Improve recipe loading speed by changing auto requirements calculation to requirements check in unit test
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg committed Jan 29, 2020
2 parents e26f2ea + 82413f8 commit 77d2679
Show file tree
Hide file tree
Showing 68 changed files with 8,060 additions and 618 deletions.
154 changes: 142 additions & 12 deletions data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json
View file
Expand Up @@ -34,7 +34,15 @@
],
"blueprint_excludes": [ { "id": "fbmk_canteen_fire" } ],
"blueprint_resources": [ "fake_fireplace", "pot" ],
"blueprint_autocalc": true,
"blueprint_needs": {
"time": "4 h 30 m",
"skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ],
"components": [ [ [ "2x4", 2 ] ], [ [ "wood_sheet", 1 ], [ "wood_panel", 2 ] ], [ [ "nail", 8 ] ], [ [ "rock", 80 ] ] ]
}
},
"components": [ [ [ "pot", 1 ], [ "rock_pot", 1 ], [ "pot_copper", 1 ], [ "clay_pot", 1 ] ], [ [ "pan", 1 ] ] ]
},
{
Expand All @@ -58,7 +66,21 @@
],
"blueprint_excludes": [ { "id": "fbmk_canteen_fire" } ],
"blueprint_resources": [ "fake_fireplace", "pot" ],
"blueprint_autocalc": true,
"blueprint_needs": {
"time": "2 h 30 m",
"skills": [ [ "fabrication", 5 ], [ "mechanics", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "SAW_W" } ] ],
"components": [
[ [ "2x4", 2 ] ],
[ [ "wood_sheet", 1 ], [ "wood_panel", 2 ] ],
[ [ "nail", 8 ] ],
[ [ "metal_tank", 2 ] ],
[ [ "pipe", 2 ] ]
]
}
},
"components": [ [ [ "pot", 1 ], [ "rock_pot", 1 ], [ "pot_copper", 1 ], [ "clay_pot", 1 ] ], [ [ "pan", 1 ] ] ]
},
{
Expand All @@ -74,7 +96,15 @@
"blueprint_requires": [ { "id": "fbmk_canteen_fire" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_well" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_well" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "11 h",
"skills": [ [ "fabrication", 4 ], [ "mechanics", 2 ], [ "survival", 4 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH" } ] ],
"components": [ [ [ "rock", 40 ] ], [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ], [ [ "well_pump", 1 ] ], [ [ "pipe", 6 ] ] ]
}
}
},
{
"type": "recipe",
Expand All @@ -89,7 +119,15 @@
"blueprint_requires": [ { "id": "fbmk_center2" } ],
"blueprint_provides": [ { "id": "fbmk_counters" } ],
"blueprint_excludes": [ { "id": "fbmk_counters" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "7 h 20 m",
"skills": [ [ "fabrication", 1 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ],
"components": [ [ [ "2x4", 32 ] ], [ [ "wood_sheet", 12 ], [ "wood_panel", 24 ] ], [ [ "nail", 192 ] ] ]
}
}
},
{
"type": "recipe",
Expand All @@ -106,7 +144,15 @@
"blueprint_provides": [ { "id": "fbmk_canteen_smoking" }, { "id": "kitchen_recipes_2" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_smoking" } ],
"blueprint_resources": [ "fake_char_smoker", "fake_char_smoker", "fake_char_smoker", "fake_char_kiln" ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "6 h 30 m",
"skills": [ [ "cooking", 2 ], [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "CUT" } ], [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ],
"components": [ [ [ "rock", 64 ] ], [ [ "stick", 48 ], [ "2x4", 48 ] ] ]
}
}
},
{
"type": "recipe",
Expand All @@ -121,7 +167,23 @@
"blueprint_requires": [ { "id": "fbmk_pantry_room" } ],
"blueprint_provides": [ { "id": "fbmk_pantry_furniture" }, { "id": "pantry" } ],
"blueprint_excludes": [ { "id": "fbmk_pantry_furniture" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "1 d 4 h 20 m",
"skills": [ [ "cooking", 3 ], [ "fabrication", 4 ], [ "survival", 4 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ],
"components": [
[ [ "2x4", 112 ] ],
[ [ "wood_sheet", 24 ], [ "wood_panel", 48 ] ],
[ [ "nail", 504 ] ],
[ [ "sheet_metal_small", 24 ] ],
[ [ "water_faucet", 2 ] ],
[ [ "rock", 80 ], [ "brick", 80 ] ],
[ [ "withered", 24 ], [ "straw_pile", 24 ] ]
]
}
}
},
{
"type": "recipe",
Expand All @@ -137,7 +199,35 @@
"blueprint_requires": [ { "id": "fbmk_canteen_smoking" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_butchery" }, { "id": "kitchen_recipes_3" }, { "id": "trapping" }, { "id": "hunting" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_butchery" } ],
"blueprint_autocalc": true,
"blueprint_needs": {
"time": "1 h 15 m",
"skills": [ [ "fabrication", 1 ], [ "survival", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ],
"components": [
[ [ "2x4", 4 ] ],
[ [ "wood_sheet", 1 ], [ "wood_panel", 1 ] ],
[ [ "nail", 8 ] ],
[ [ "stick_long", 6 ] ],
[
[ "rope_6", 1 ],
[ "vine_6", 1 ],
[ "rope_makeshift_6", 1 ],
[ "string_36", 2 ],
[ "cordage_36", 2 ],
[ "string_6", 12 ],
[ "cordage_6", 12 ],
[ "thread", 600 ],
[ "sinew", 600 ],
[ "plant_fibre", 600 ],
[ "yarn", 600 ],
[ "wire", 8 ]
],
[ [ "pointy_stick", 2 ], [ "spike", 2 ] ]
]
}
},
"components": [ [ [ "knife_butcher", 1 ], [ "knife_steak", 1 ], [ "knife_chef", 1 ], [ "knife_carving", 1 ] ] ]
},
{
Expand All @@ -154,7 +244,15 @@
"blueprint_requires": [ { "id": "fbmk_canteen_dining_center" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_dining_furniture" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_dining_furniture" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "12 h",
"skills": [ [ "fabrication", 2 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ],
"components": [ [ [ "2x4", 96 ] ], [ [ "wood_sheet", 8 ], [ "wood_panel", 8 ] ], [ [ "nail", 192 ] ] ]
}
}
},
{
"type": "recipe",
Expand All @@ -170,7 +268,15 @@
"blueprint_requires": [ { "id": "fbmk_canteen_well" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_planterA" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_planterA" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "2 h 30 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [ [ [ "2x4", 72 ] ], [ [ "nail", 216 ] ], [ [ "pebble", 1200 ] ], [ [ "material_soil", 450 ] ] ]
}
}
},
{
"type": "recipe",
Expand All @@ -186,7 +292,15 @@
"blueprint_requires": [ { "id": "fbmk_canteen_planterA" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_planterB" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_planterB" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "2 h 30 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [ [ [ "2x4", 72 ] ], [ [ "nail", 216 ] ], [ [ "pebble", 1200 ] ], [ [ "material_soil", 450 ] ] ]
}
}
},
{
"type": "recipe",
Expand All @@ -202,7 +316,15 @@
"blueprint_requires": [ { "id": "fbmk_canteen_planterB" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_planterC" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_planterC" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "2 h 30 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [ [ [ "2x4", 72 ] ], [ [ "nail", 216 ] ], [ [ "pebble", 1200 ] ], [ [ "material_soil", 450 ] ] ]
}
}
},
{
"type": "recipe",
Expand All @@ -218,6 +340,14 @@
"blueprint_requires": [ { "id": "fbmk_canteen_planterC" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_planterD" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_planterD" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "2 h 30 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [ [ [ "2x4", 72 ] ], [ [ "nail", 216 ] ], [ [ "pebble", 1200 ] ], [ [ "material_soil", 450 ] ] ]
}
}
}
]
112 changes: 105 additions & 7 deletions data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json
View file
Expand Up @@ -12,7 +12,22 @@
"blueprint_requires": [ { "id": "fbmk_0" } ],
"blueprint_provides": [ { "id": "fbmk_center" } ],
"blueprint_excludes": [ { "id": "fbmk_center" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "1 d 16 h 45 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [
[ [ "2x4", 197 ] ],
[ [ "nail", 566 ] ],
[ [ "wood_panel", 23 ] ],
[ [ "hinge", 2 ] ],
[ [ "glass_sheet", 3 ] ],
[ [ "log", 24 ] ]
]
}
}
},
{
"type": "recipe",
Expand All @@ -27,7 +42,22 @@
"blueprint_requires": [ { "id": "fbmk_center" } ],
"blueprint_provides": [ { "id": "fbmk_center2" } ],
"blueprint_excludes": [ { "id": "fbmk_center2" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "2 d 6 h 45 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [
[ [ "2x4", 247 ] ],
[ [ "nail", 742 ] ],
[ [ "wood_panel", 34 ] ],
[ [ "hinge", 4 ] ],
[ [ "glass_sheet", 1 ] ],
[ [ "log", 36 ] ]
]
}
}
},
{
"type": "recipe",
Expand All @@ -42,7 +72,15 @@
"blueprint_requires": [ { "id": "fbmk_center2" } ],
"blueprint_provides": [ { "id": "fbmk_smoking_area" } ],
"blueprint_excludes": [ { "id": "fbmk_smoking_area" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "1 d 10 h 25 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [ [ [ "2x4", 252 ] ], [ [ "nail", 448 ] ], [ [ "log", 24 ] ], [ [ "wood_panel", 22 ] ] ]
}
}
},
{
"type": "recipe",
Expand All @@ -57,7 +95,23 @@
"blueprint_requires": [ { "id": "fbmk_center2" } ],
"blueprint_provides": [ { "id": "fbmk_pantry_room" } ],
"blueprint_excludes": [ { "id": "fbmk_pantry_room" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "3 d 11 h 30 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [
[ [ "2x4", 30 ], [ "log", 4 ] ],
[ [ "nail", 1060 ] ],
[ [ "glass_sheet", 2 ] ],
[ [ "log", 60 ] ],
[ [ "stick", 90 ], [ "2x4", 180 ] ],
[ [ "wood_sheet", 25 ], [ "wood_panel", 50 ] ],
[ [ "2x4", 150 ] ]
]
}
}
},
{
"type": "recipe",
Expand All @@ -72,7 +126,22 @@
"blueprint_requires": [ { "id": "fbmk_pantry_room" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_dining_west" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_dining_west" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "1 d 16 h 36 m",
"skills": [ [ "fabrication", 3 ], [ "survival", 0 ] ],
"inline": {
"tools": [ [ [ "machete", -1 ], [ "makeshift_machete", -1 ], [ "scythe", -1 ], [ "sickle", -1 ], [ "survivor_machete", -1 ] ] ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [
[ [ "2x4", 194 ] ],
[ [ "nail", 566 ] ],
[ [ "wood_panel", 23 ] ],
[ [ "hinge", 2 ] ],
[ [ "glass_sheet", 2 ] ],
[ [ "log", 24 ] ]
]
}
}
},
{
"type": "recipe",
Expand All @@ -87,7 +156,21 @@
"blueprint_requires": [ { "id": "fbmk_canteen_dining_west" }, { "id": "fbmk_smoking_area" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_dining_east" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_dining_east" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "2 d 6 h 45 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [
[ [ "2x4", 243 ] ],
[ [ "nail", 800 ] ],
[ [ "glass_sheet", 3 ] ],
[ [ "log", 28 ] ],
[ [ "wood_sheet", 17 ], [ "wood_panel", 34 ] ]
]
}
}
},
{
"type": "recipe",
Expand All @@ -102,6 +185,21 @@
"blueprint_requires": [ { "id": "fbmk_canteen_dining_east" } ],
"blueprint_provides": [ { "id": "fbmk_canteen_dining_center" } ],
"blueprint_excludes": [ { "id": "fbmk_canteen_dining_center" } ],
"blueprint_autocalc": true
"blueprint_needs": {
"time": "2 d 7 h 15 m",
"skills": [ [ "fabrication", 3 ] ],
"inline": {
"tools": [ ],
"qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [
[ [ "2x4", 197 ] ],
[ [ "nail", 1026 ] ],
[ [ "wood_panel", 49 ] ],
[ [ "hinge", 2 ] ],
[ [ "glass_sheet", 1 ] ],
[ [ "log", 8 ] ]
]
}
}
}
]

0 comments on commit 77d2679

Please sign in to comment.