Merge branch 'dev2.0' of https://github.com/modded-factorio/bobsmods …

…into dev2.0
modded-factorio · Nov 26, 2024 · c23ef81 · c23ef81
2 parents 65ce56d + 83fe472
commit c23ef81
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 13 deletions.
diff --git a/bobelectronics/prototypes/recipe-updates.lua b/bobelectronics/prototypes/recipe-updates.lua
@@ -36,9 +36,18 @@ if data.raw.item["silicon-wafer"] then
   bobmods.lib.recipe.add_ingredient("processing-electronics", { type = "item", name = "silicon-wafer", amount = 6 })
 else
   if data.raw.item["bob-silicon-plate"] then
-    bobmods.lib.recipe.add_ingredient("electronic-components", { type = "item", name = "bob-silicon-plate", amount = 1 })
-    bobmods.lib.recipe.add_ingredient("intergrated-electronics", { type = "item", name = "bob-silicon-plate", amount = 2 })
-    bobmods.lib.recipe.add_ingredient("processing-electronics", { type = "item", name = "bob-silicon-plate", amount = 3 })
+    bobmods.lib.recipe.add_ingredient(
+      "electronic-components",
+      { type = "item", name = "bob-silicon-plate", amount = 1 }
+    )
+    bobmods.lib.recipe.add_ingredient(
+      "intergrated-electronics",
+      { type = "item", name = "bob-silicon-plate", amount = 2 }
+    )
+    bobmods.lib.recipe.add_ingredient(
+      "processing-electronics",
+      { type = "item", name = "bob-silicon-plate", amount = 3 }
+    )
   else
     bobmods.lib.recipe.add_ingredient("electronic-components", { type = "item", name = "copper-plate", amount = 1 })
     bobmods.lib.recipe.add_ingredient("intergrated-electronics", { type = "item", name = "copper-plate", amount = 2 })

diff --git a/bobelectronics/prototypes/resource.lua b/bobelectronics/prototypes/resource.lua
@@ -155,7 +155,7 @@ if not data.raw.item["silicon-wafer"] and data.raw.item["bob-silicon-plate"] the
       enabled = false,
       energy_required = 5,
       ingredients = {
-        { type = "item", name = "bob-silicon-plate", amount = 1 }
+        { type = "item", name = "bob-silicon-plate", amount = 1 },
       },
       results = { { type = "item", name = "silicon-wafer", amount = 8 } },
       allow_productivity = true,

diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
@@ -140,7 +140,11 @@ else
 
   if data.raw.item["bob-titanium-plate"] then
     bobmods.lib.recipe.replace_ingredient("personal-roboport-antenna-equipment-3", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.recipe.replace_ingredient("personal-roboport-chargepad-equipment-3", "steel-plate", "bob-titanium-plate")
+    bobmods.lib.recipe.replace_ingredient(
+      "personal-roboport-chargepad-equipment-3",
+      "steel-plate",
+      "bob-titanium-plate"
+    )
   end
 
   if data.raw.item["titanium-bearing"] then

diff --git a/bobmodules/prototypes/recipe/module-merged-updates.lua b/bobmodules/prototypes/recipe/module-merged-updates.lua
@@ -375,7 +375,10 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru
   end
 
   if data.raw.item["bob-emerald-5"] then
-    bobmods.lib.recipe.add_ingredient("raw-productivity-module-6", { type = "item", name = "bob-emerald-5", amount = 1 })
+    bobmods.lib.recipe.add_ingredient(
+      "raw-productivity-module-6",
+      { type = "item", name = "bob-emerald-5", amount = 1 }
+    )
   else
     if data.raw.item["alien-artifact"] then
       bobmods.lib.recipe.add_ingredient(
@@ -397,7 +400,10 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru
   end
 
   if data.raw.item["bob-diamond-5"] then
-    bobmods.lib.recipe.add_ingredient("raw-productivity-module-8", { type = "item", name = "bob-diamond-5", amount = 1 })
+    bobmods.lib.recipe.add_ingredient(
+      "raw-productivity-module-8",
+      { type = "item", name = "bob-diamond-5", amount = 1 }
+    )
   else
     if data.raw.item["alien-artifact"] then
       bobmods.lib.recipe.add_ingredient(

diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua
@@ -489,7 +489,10 @@ if data.raw.item["gilded-copper-cable"] then
 end
 
 if data.raw.item["bob-ruby-5"] then
-  bobmods.lib.recipe.add_ingredient("vehicle-laser-defense-equipment-1", { type = "item", name = "bob-ruby-5", amount = 1 })
+  bobmods.lib.recipe.add_ingredient(
+    "vehicle-laser-defense-equipment-1",
+    { type = "item", name = "bob-ruby-5", amount = 1 }
+  )
   bobmods.lib.tech.add_prerequisite("vehicle-laser-defense-equipment-1", "gem-processing-3")
 end
 

diff --git a/bobwarfare/prototypes/recipe/recipe-updates.lua b/bobwarfare/prototypes/recipe/recipe-updates.lua
@@ -254,7 +254,10 @@ if data.raw.item["bob-ruby-5"] then
 end
 
 if data.raw.item["bob-sapphire-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-sapphire", { type = "item", name = "bob-sapphire-5", amount = 1 })
+  bobmods.lib.recipe.add_ingredient(
+    "laser-rifle-battery-sapphire",
+    { type = "item", name = "bob-sapphire-5", amount = 1 }
+  )
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-sapphire",
     "laser-rifle-battery-ruby",
@@ -265,7 +268,10 @@ if data.raw.item["bob-sapphire-5"] then
 end
 
 if data.raw.item["bob-emerald-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-emerald", { type = "item", name = "bob-emerald-5", amount = 1 })
+  bobmods.lib.recipe.add_ingredient(
+    "laser-rifle-battery-emerald",
+    { type = "item", name = "bob-emerald-5", amount = 1 }
+  )
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-emerald",
     "laser-rifle-battery-sapphire",
@@ -275,7 +281,10 @@ if data.raw.item["bob-emerald-5"] then
 end
 
 if data.raw.item["bob-amethyst-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-amethyst", { type = "item", name = "bob-amethyst-5", amount = 1 })
+  bobmods.lib.recipe.add_ingredient(
+    "laser-rifle-battery-amethyst",
+    { type = "item", name = "bob-amethyst-5", amount = 1 }
+  )
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-amethyst",
     "laser-rifle-battery-emerald",
@@ -294,7 +303,10 @@ if data.raw.item["bob-topaz-5"] then
 end
 
 if data.raw.item["bob-diamond-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-diamond", { type = "item", name = "bob-diamond-5", amount = 1 })
+  bobmods.lib.recipe.add_ingredient(
+    "laser-rifle-battery-diamond",
+    { type = "item", name = "bob-diamond-5", amount = 1 }
+  )
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-diamond",
     "laser-rifle-battery-topaz",

diff --git a/bobwarfare/prototypes/robots-updates.lua b/bobwarfare/prototypes/robots-updates.lua
@@ -205,7 +205,10 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
 
   if data.raw.recipe["robot-tool-combat-3"] then
     if data.raw.item["bob-titanium-plate"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "bob-titanium-plate", amount = 1 })
+      bobmods.lib.recipe.add_ingredient(
+        "robot-tool-combat-3",
+        { type = "item", name = "bob-titanium-plate", amount = 1 }
+      )
     else
       bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "steel-plate", amount = 1 })
     end