Burner phase 2.0 (#263)

* Remove steam science pack * Update bobtech.cfg Add locale for new tech, remove redundant or outdated locales. * Remove steam science pack * Add burner generator * Add burner generator * Remove steam science pack * Update burner phase Add new burner lab tech, adjust prereqs, remove redundant recipe disabling. * Add burner generator * Remove steam science pack, add burner generator * Remove steam science pack, add burner generator * Update burner phase * Add burner generator * Add burner generator * Add burner generator * Add burner generator * Make t1 pipes unlock on steam power * Make t1 pipes unlock on steam power * Remove unneeded steel prereq from electrolysis-2 * Revise repair pack techs Since repair pack 1 now has its own vanilla tech, this pushes the remaining repair packs down the tree by one science pack. Repair pack 2 was also previously one of only a handful of steel techs that did not require SP2, so this is also more consistent in that regard. * Update areadrills.lua Since electric mining drills now have their own vanilla tech, this pushes the remaining drills down the tree by one science pack. Area drill 1 was also previously one of only a handful of steel techs that did not require SP2, so this is also more consistent in that regard. * Update drills.lua Since electric mining drills now have their own vanilla tech, this pushes the remaining drills down the tree by one science pack. Bob drill 1 was also previously one of only a handful of steel techs that did not require SP2, so this is also more consistent in that regard. * Push water pumpjack techs down tree by 1 science pack * Revise area drill tech numbering * Revise area drill tech numbering * Revising mining drill tech numbering * Revise area drill tech numbering * Revise pumpjack tech numbering * Update pumpjacks.lua Revise pumpjack tech numbering. Change pumpjack 2 recipe to have red circuits so that there is any kind of separation between its recipe and pumpjack 1's recipe. * Revising mining drill tech numbering * Update burner phase * Change SP2 back to using yellow belts Makes SP2 recipe require tin. * Update burner phase * Update with perceived_performance * Update with perceived_performance * Remove unneeded direction_count * Adjust burner phase * Reverting change to fix softlock Labs can't require yellow belts when yellow belts require science packs to unlock * Reduce the number of tiers of Pumpjack and Water pumpjack T1 and T2 pumpjack were both being unlocked at green science * Fix log file errors with just bobrevamp * Fixing prerequisites with plates / revamp * Formatting * Fixing log file warning * Fixing prerequisites / recipe unlocks * Add burner lab tech icon * Burner stage fixes - Removed tech Basic Automation - Burner Assembling Machine should be unlocked from the start - Steam Assembling Machine should be unlocked with Steam Power tech - Move tech prototype creation from data-updates stage to data stage - bobtech mod was creating "bob-steam-engine-1" in technology-updates.lua - Remove technology "steam-automation" - Make Basic Logistics a trigger tech - 10 iron gear wheels - * Don't rename science packs * Remove science pack colours update setting This has caused a lot of confusion when discussing progression. It' much easier if people all mean the same thing when they are talking about red science! * Remove warning about conflict with AAI. Burner phase is automatically disabled with AAI * Update changelog.txt --------- Co-authored-by: KiwiHawk <[email protected]>
modded-factorio · Dec 24, 2024 · b69a951 · b69a951
1 parent 32dcd90
commit b69a951
Show file tree

Hide file tree

Showing 40 changed files with 475 additions and 718 deletions.
diff --git a/bobassembly/locale/en/bobassembly.cfg b/bobassembly/locale/en/bobassembly.cfg
@@ -95,8 +95,6 @@ fluid-furnace=Fluid burning furnace
 fluid-chemical-furnace=Fluid burning chemical furnace
 fluid-mixing-furnace=Fluid burning metal mixing furnace
 
-basic-automation=Basic automation
-
 
 [mod-setting-name]
 bobmods-assembly-oilrefineries=Oil refineries

diff --git a/bobassembly/locale/ru/bobassembly.cfg b/bobassembly/locale/ru/bobassembly.cfg
@@ -95,8 +95,6 @@ fluid-furnace=Жидкотопливная печь
 fluid-chemical-furnace=Жидкотопливная химическая печь
 fluid-mixing-furnace=Жидкотопливная печь для сплавов
 
-basic-automation=Базовая автоматизация
-
 
 [mod-setting-name]
 bobmods-assembly-oilrefineries=Включить новые нефтеперерабатывающие заводы

diff --git a/bobassembly/prototypes/assembly-burner.lua b/bobassembly/prototypes/assembly-burner.lua
@@ -55,7 +55,7 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
     {
       type = "recipe",
       name = "burner-assembling-machine",
-      enabled = false,
+      enabled = true,
       ingredients = {
         { type = "item", name = "iron-gear-wheel", amount = 5 },
         { type = "item", name = "iron-plate", amount = 9 },
@@ -332,35 +332,6 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
       },
       allowed_effects = {},
     },
-
-    {
-      type = "technology",
-      name = "basic-automation",
-      icon = "__base__/graphics/technology/automation-1.png",
-      icon_size = 256,
-      effects = {
-        {
-          type = "unlock-recipe",
-          recipe = "burner-assembling-machine",
-        },
-        {
-          type = "unlock-recipe",
-          recipe = "steam-assembling-machine",
-        },
-      },
-      prerequisites = {
-        "automation-science-pack",
-      },
-      unit = {
-        count = 5,
-        ingredients = {
-          { "automation-science-pack", 1 },
-        },
-        time = 5,
-      },
-      ignore_tech_cost_multiplier = true,
-      order = "a-b-0",
-    },
   })
 
   bobmods.lib.tech.add_prerequisite("automation", "basic-automation")

diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua
@@ -3,6 +3,10 @@ if mods["aai-loaders"] and settings.startup["aai-loaders-fit-assemblers"].value
   aailoaderssize = true
 end
 
+if settings.startup["bobmods-assembly-burner"].value == true then
+  bobmods.lib.tech.add_recipe_unlock("steam-power", "steam-assembling-machine")
+end
+
 data.raw.technology["automation-2"].prerequisites = { "automation", "electronics" }
 bobmods.lib.tech.add_prerequisite("automation-2", "steel-processing")
 bobmods.lib.tech.add_prerequisite("automation-2", "logistic-science-pack")

diff --git a/bobelectronics/prototypes/technology-updates.lua b/bobelectronics/prototypes/technology-updates.lua
@@ -9,8 +9,8 @@ if mods["bobassembly"] then
   bobmods.lib.tech.add_prerequisite("electrolyser-2", "bob-electronics")
 end
 if mods["bobmining"] then
-  bobmods.lib.tech.add_prerequisite("bob-drills-1", "bob-electronics")
-  bobmods.lib.tech.add_prerequisite("bob-area-drills-1", "bob-electronics")
+  bobmods.lib.tech.add_prerequisite("bob-drills-2", "bob-electronics")
+  bobmods.lib.tech.add_prerequisite("bob-area-drills-2", "bob-electronics")
   bobmods.lib.tech.add_prerequisite("water-miner-2", "bob-electronics")
 end
 if mods["bobrevamp"] then

diff --git a/boblogistics/prototypes/recipe/pipes-recipe.lua b/boblogistics/prototypes/recipe/pipes-recipe.lua
@@ -2,6 +2,7 @@ data:extend({
   {
     type = "recipe",
     name = "stone-pipe",
+    enabled = false,
     ingredients = {
       { type = "item", name = "stone-brick", amount = 1 },
     },
@@ -11,6 +12,7 @@ data:extend({
   {
     type = "recipe",
     name = "stone-pipe-to-ground",
+    enabled = false,
     ingredients = {
       { type = "item", name = "stone-pipe", amount = 10 },
       { type = "item", name = "stone-brick", amount = 5 },
@@ -21,6 +23,7 @@ data:extend({
   {
     type = "recipe",
     name = "copper-pipe",
+    enabled = false,
     ingredients = {
       { type = "item", name = "copper-plate", amount = 1 },
     },
@@ -30,6 +33,7 @@ data:extend({
   {
     type = "recipe",
     name = "copper-pipe-to-ground",
+    enabled = false,
     ingredients = {
       { type = "item", name = "copper-pipe", amount = 10 },
       { type = "item", name = "copper-plate", amount = 5 },

diff --git a/boblogistics/prototypes/repair-pack.lua b/boblogistics/prototypes/repair-pack.lua
@@ -126,6 +126,7 @@ data:extend({
     prerequisites = {
       "steel-processing",
       "repair-pack",
+      "logistic-science-pack",
     },
     effects = {
       {
@@ -137,6 +138,7 @@ data:extend({
       count = 25,
       ingredients = {
         { "automation-science-pack", 1 },
+        { "logistic-science-pack", 1 },
       },
       time = 30,
     },
@@ -149,6 +151,7 @@ data:extend({
     prerequisites = {
       "bob-repair-pack-2",
       "advanced-circuit",
+      "chemical-science-pack",
     },
     effects = {
       {
@@ -161,6 +164,7 @@ data:extend({
       ingredients = {
         { "automation-science-pack", 1 },
         { "logistic-science-pack", 1 },
+        { "chemical-science-pack", 1 },
       },
       time = 30,
     },
@@ -173,6 +177,7 @@ data:extend({
     prerequisites = {
       "bob-repair-pack-3",
       "processing-unit",
+      "production-science-pack",
     },
     effects = {
       {
@@ -186,6 +191,7 @@ data:extend({
         { "automation-science-pack", 1 },
         { "logistic-science-pack", 1 },
         { "chemical-science-pack", 1 },
+        { "production-science-pack", 1 },
       },
       time = 30,
     },
@@ -198,6 +204,7 @@ data:extend({
     prerequisites = {
       "bob-repair-pack-4",
       "production-science-pack",
+      "utility-science-pack",
     },
     effects = {
       {
@@ -212,6 +219,7 @@ data:extend({
         { "logistic-science-pack", 1 },
         { "chemical-science-pack", 1 },
         { "production-science-pack", 1 },
+        { "utility-science-pack", 1 },
       },
       time = 30,
     },

diff --git a/boblogistics/prototypes/technology-updates.lua b/boblogistics/prototypes/technology-updates.lua
@@ -268,6 +268,12 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then
   bobmods.lib.tech.add_recipe_unlock("bob-robots-3", "bob-robot-tool-4")
 end
 
+bobmods.lib.tech.add_recipe_unlock("steam-power", "copper-pipe")
+bobmods.lib.tech.add_recipe_unlock("steam-power", "copper-pipe-to-ground")
+
+bobmods.lib.tech.add_recipe_unlock("steam-power", "stone-pipe")
+bobmods.lib.tech.add_recipe_unlock("steam-power", "stone-pipe-to-ground")
+
 bobmods.lib.tech.add_recipe_unlock("steel-processing", "steel-pipe")
 bobmods.lib.tech.add_recipe_unlock("steel-processing", "steel-pipe-to-ground")
 

diff --git a/boblogistics/prototypes/technology.lua b/boblogistics/prototypes/technology.lua
@@ -806,20 +806,19 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
           type = "unlock-recipe",
           recipe = "basic-underground-belt",
         },
+        {
+          type = "unlock-recipe",
+          recipe = "copper-cable",
+        },
         {
           type = "unlock-recipe",
           recipe = "basic-splitter",
         },
       },
-      prerequisites = {
-        "automation-science-pack",
-      },
-      unit = {
+      research_trigger = {
+        type = "craft-item",
+        item = "iron-gear-wheel",
         count = 10,
-        ingredients = {
-          { "automation-science-pack", 1 },
-        },
-        time = 10,
       },
       order = "a-f-0",
       ignore_tech_cost_multiplier = true,

diff --git a/bobmining/data-updates.lua b/bobmining/data-updates.lua
@@ -20,11 +20,9 @@ if feature_flags["quality"] then
     "bob-pumpjack-1",
     "bob-pumpjack-2",
     "bob-pumpjack-3",
-    "bob-pumpjack-4",
     "water-miner-1",
     "water-miner-2",
     "water-miner-3",
     "water-miner-4",
-    "water-miner-5",
   })
 end
diff --git a/bobmining/migrations/bobmining_1.3.0.json b/bobmining/migrations/bobmining_1.3.0.json
@@ -0,0 +1,17 @@
+{
+  "item":
+  [
+    ["bob-pumpjack-4", "bob-pumpjack-3"],
+    ["water-miner-5", "water-miner-4"]
+  ],
+  "recipe":
+  [
+    ["bob-pumpjack-4", "bob-pumpjack-3"],
+    ["water-miner-5", "water-miner-4"]
+  ],
+  "entity":
+  [
+    ["bob-pumpjack-4", "bob-pumpjack-3"],
+    ["water-miner-5", "water-miner-4"]
+  ]
+}
diff --git a/bobmining/prototypes/areadrill-updates.lua b/bobmining/prototypes/areadrill-updates.lua
@@ -5,22 +5,22 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
 
   if data.raw.item["cobalt-steel-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-2", "steel-plate", "cobalt-steel-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-2", "cobalt-processing")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "cobalt-processing")
   else
     if data.raw.item["invar-alloy"] then
       bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-2", "steel-plate", "invar-alloy")
-      bobmods.lib.tech.add_prerequisite("bob-area-drills-2", "invar-processing")
+      bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "invar-processing")
     else
       if data.raw.item["brass-alloy"] then
         bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-2", "steel-plate", "brass-alloy")
-        bobmods.lib.tech.add_prerequisite("bob-area-drills-2", "zinc-processing")
+        bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "zinc-processing")
       end
     end
   end
 
   if data.raw.item["brass-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-2", "iron-gear-wheel", "brass-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-2", "zinc-processing")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "zinc-processing")
   else
     if data.raw.item["steel-gear-wheel"] then
       bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-2", "iron-gear-wheel", "steel-gear-wheel")
@@ -29,46 +29,46 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
 
   if data.raw.item["bob-titanium-plate"] then
     bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "titanium-processing")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "titanium-processing")
   else
     if data.raw.item["bob-tungsten-plate"] then
       bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "steel-plate", "bob-tungsten-plate")
-      bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "tungsten-processing")
+      bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "tungsten-processing")
     end
   end
 
   if data.raw.item["titanium-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "iron-gear-wheel", "titanium-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "titanium-processing")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "titanium-processing")
   else
     if data.raw.item["tungsten-gear-wheel"] then
       bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "iron-gear-wheel", "tungsten-gear-wheel")
-      bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "tungsten-processing")
+      bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "tungsten-processing")
     end
   end
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "processing-unit", "advanced-processing-unit")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "advanced-processing-unit")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-5", "advanced-processing-unit")
   end
 
   if data.raw.item["tungsten-carbide"] then
     bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "steel-plate", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-5", "tungsten-alloy-processing")
   else
     if data.raw.item["copper-tungsten-alloy"] then
       bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "steel-plate", "copper-tungsten-alloy")
-      bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "tungsten-alloy-processing")
+      bobmods.lib.tech.add_prerequisite("bob-area-drills-5", "tungsten-alloy-processing")
     end
   end
 
   if data.raw.item["nitinol-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "iron-gear-wheel", "nitinol-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "nitinol-processing")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-5", "nitinol-processing")
   else
     if data.raw.item["tungsten-gear-wheel"] then
       bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "iron-gear-wheel", "tungsten-gear-wheel")
-      bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "tungsten-processing")
+      bobmods.lib.tech.add_prerequisite("bob-area-drills-5", "tungsten-processing")
     end
   end
 end