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

…into dev2.0
modded-factorio · Dec 4, 2024 · f9a5a68 · f9a5a68
2 parents b271b46 + ce50513
commit f9a5a68
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/bobplates/data-updates.lua b/bobplates/data-updates.lua
@@ -117,7 +117,10 @@ bobmods.lib.recipe.set_subgroup("kovarex-enrichment-process", "bob-nuclear")
 if settings.startup["bobmods-plates-nuclearupdate"].value == true then
   bobmods.lib.recipe.disallow_productivity("uranium-fuel-cell")
   bobmods.lib.recipe.remove_ingredient("uranium-fuel-cell", "iron-plate")
-  bobmods.lib.recipe.add_ingredient("uranium-fuel-cell", { type = "item", name = "empty-nuclear-fuel-cell", amount = 10, ignored_by_stats = 10})
+  bobmods.lib.recipe.add_ingredient(
+    "uranium-fuel-cell",
+    { type = "item", name = "empty-nuclear-fuel-cell", amount = 10, ignored_by_stats = 10 }
+  )
 
   data.raw.technology["nuclear-fuel-reprocessing"].icon =
     "__bobplates__/graphics/icons/technology/uranium-nuclear-fuel-reprocessing-new.png"
@@ -140,7 +143,13 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then
 
   bobmods.lib.recipe.add_result(
     "nuclear-fuel-reprocessing",
-    { type = "item", name = "empty-nuclear-fuel-cell", amount = 10, ignored_by_productivity = 10, ignored_by_stats = 10 }
+    {
+      type = "item",
+      name = "empty-nuclear-fuel-cell",
+      amount = 10,
+      ignored_by_productivity = 10,
+      ignored_by_stats = 10,
+    }
   )
   bobmods.lib.recipe.add_result(
     "nuclear-fuel-reprocessing",

diff --git a/bobplates/prototypes/recipe/nuclear-recipe.lua b/bobplates/prototypes/recipe/nuclear-recipe.lua
@@ -87,7 +87,10 @@ if data.raw.item["thorium-ore"] then
 
   if settings.startup["bobmods-plates-nuclearupdate"].value == true then
     bobmods.lib.recipe.remove_ingredient("thorium-fuel-cell", "bob-lead-plate")
-    bobmods.lib.recipe.add_ingredient("thorium-fuel-cell", { type = "item", name = "empty-nuclear-fuel-cell", amount = 10, ignored_by_stats = 10 })
+    bobmods.lib.recipe.add_ingredient(
+      "thorium-fuel-cell",
+      { type = "item", name = "empty-nuclear-fuel-cell", amount = 10, ignored_by_stats = 10 }
+    )
     data:extend({
       {
         type = "recipe",
@@ -117,7 +120,13 @@ if data.raw.item["thorium-ore"] then
         results = {
           { type = "item", name = "thorium-232", amount = 4, ignored_by_productivity = 3 },
           { type = "item", name = "uranium-235", amount = 3, ignored_by_productivity = 2 },
-          { type = "item", name = "empty-nuclear-fuel-cell", amount = 10, ignored_by_productivity = 10, ignored_by_stats = 10 },
+          {
+            type = "item",
+            name = "empty-nuclear-fuel-cell",
+            amount = 10,
+            ignored_by_productivity = 10,
+            ignored_by_stats = 10,
+          },
           { type = "item", name = "fusion-catalyst", amount = 1 },
         },
         crafting_machine_tint = {
@@ -270,7 +279,13 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then
         { type = "item", name = "bob-depleted-deuterium-fuel-cell", amount = 10 },
       },
       results = {
-        { type = "item", name = "empty-nuclear-fuel-cell", amount = 10, ignored_by_productivity = 10, ignored_by_stats = 10 },
+        {
+          type = "item",
+          name = "empty-nuclear-fuel-cell",
+          amount = 10,
+          ignored_by_productivity = 10,
+          ignored_by_stats = 10,
+        },
         { type = "item", name = "lithium", amount = 1, probability = 0.1 },
         { type = "item", name = "fusion-catalyst", amount = 1 },
       },

diff --git a/bobrevamp/prototypes/rocket-fuel-updates.lua b/bobrevamp/prototypes/rocket-fuel-updates.lua
@@ -1,7 +1,10 @@
 if data.raw.fluid.ammonia and data.raw.fluid.hydrazine and data.raw.fluid["dinitrogen-tetroxide"] then
   if data.raw.fluid["pure-water"] then
     bobmods.lib.recipe.remove_result("hydrazine", "water")
-    bobmods.lib.recipe.add_result("hydrazine", { type = "fluid", name = "pure-water", amount = 4, ignored_by_productivity = 4 })
+    bobmods.lib.recipe.add_result(
+      "hydrazine",
+      { type = "fluid", name = "pure-water", amount = 4, ignored_by_productivity = 4 }
+    )
   end
 
   data.raw.recipe["rocket-fuel"].ingredients = {