Recipes properly detect all tool variants

Orcicorn-ProjectZomboid · Aug 6, 2022 · ff1d9e8 · ff1d9e8
1 parent 7ce8db8
commit ff1d9e8
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 93 deletions.
diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Modern Counter ------------------------------------------- */
     recipe ICMakeCabinet1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -25,8 +25,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet1Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -45,8 +45,8 @@ module ImprovisedCabinetry {
 
     /* Wooden Counter ------------------------------------------- */
     recipe ICMakeCabinet2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -63,8 +63,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet2Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -81,8 +81,8 @@ module ImprovisedCabinetry {
 
     /* Birchwood Counter ---------------------------------------- */
     recipe ICMakeCabinet3 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -99,8 +99,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet3Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -116,8 +116,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet3Float {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue,
         Nails=4,
@@ -135,8 +135,8 @@ module ImprovisedCabinetry {
 
     /* Oak Counter ---------------------------------------------- */
     recipe ICMakeCabinet4 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -153,8 +153,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet4Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -171,8 +171,8 @@ module ImprovisedCabinetry {
 
     /* Dark Counter --------------------------------------------- */
     recipe ICMakeCabinet5 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -190,8 +190,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet5Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -209,8 +209,8 @@ module ImprovisedCabinetry {
 
     /* Green Counter -------------------------------------------- */
     recipe ICMakeCabinet6 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -228,8 +228,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet6Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -247,8 +247,8 @@ module ImprovisedCabinetry {
 
     /* White Counter -------------------------------------------- */
     recipe ICMakeCabinet7 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -266,8 +266,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinet7Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -285,8 +285,8 @@ module ImprovisedCabinetry {
 
     /* Bathroom Cabinets ---------------------------------------- */
     recipe ICMakeCabinetBathroom {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue,
         Nails=4,

diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_bar.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_bar.txt
@@ -18,8 +18,8 @@ module ImprovisedCabinetry {
 
     /* Bar Counter (Natural) ------------------------------------- */
     recipe ICMakeCabinetBar1Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=4,
         Woodglue=2,
         Nails=8,
@@ -36,8 +36,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetBar1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=4,
         Woodglue=2,
         Nails=8,

diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_motel.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_motel.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Sunstar Model --------------------------------------------- */
     recipe ICMakeCabinetMotel1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -24,8 +24,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetMotel2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue,
         Nails=4,

diff --git a/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_restaurant.txt b/Contents/mods/ImprovisedCabinetry/media/scripts/IC_recipes_cabinets_restaurant.txt
@@ -5,8 +5,8 @@ module ImprovisedCabinetry {
 
     /* Diner ---------------------------------------------------- */
     recipe ICMakeCabinetRestaurant1 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -25,8 +25,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant1Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -46,8 +46,8 @@ module ImprovisedCabinetry {
 
     /* Pie Restaurant -------------------------------------------- */
     recipe ICMakeCabinetRestaurant2 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -64,8 +64,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant2Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -83,8 +83,8 @@ module ImprovisedCabinetry {
 
     /* Pizza Whirled -------------------------------------------- */
     recipe ICMakeCabinetRestaurant3 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -104,8 +104,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant3Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -126,8 +126,8 @@ module ImprovisedCabinetry {
 
     /* Seahorse Coffee ------------------------------------------ */
     recipe ICMakeCabinetRestaurant4 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -147,8 +147,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant4Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -168,8 +168,8 @@ module ImprovisedCabinetry {
 
     /* Spiffo's ------------------------------------------------- */
     recipe ICMakeCabinetRestaurant5 {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,
@@ -188,8 +188,8 @@ module ImprovisedCabinetry {
     }
 
     recipe ICMakeCabinetRestaurant5Corner {
-        keep Hammer,
-        keep Saw/GardenSaw,
+        keep [Recipe.GetItemTypes.Hammer],
+        keep [Recipe.GetItemTypes.Saw],
         Plank=2,
         Woodglue=2,
         Nails=8,