Update to 0.18.0

Add boiler to heat exchange and steam engine to turbine Signed-off-by: Jelmergu <[email protected]>
Jelmergu · Jan 21, 2020 · a588ee7 · a588ee7
1 parent 6f925c4
commit a588ee7
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 3 deletions.
diff --git a/graphicsProjects/converter-project.xcf b/graphicsProjects/converter-project.xcf
diff --git a/upgrade-machines/changelog.txt b/upgrade-machines/changelog.txt
@@ -3,6 +3,9 @@ Version: 0.18.0
 Date: 21. 01. 2020
   General:
     - Update for 0.18
+  New Recipes:
+    - Boiler to Heat exchanger
+    - Steam engine to Steam turbine
 ---------------------------------------------------------------------------------------------------
 Version: 0.17.1
 Date: 30. 05. 2019

diff --git a/upgrade-machines/graphics/icons/boiler-to-heat-exchanger.png b/upgrade-machines/graphics/icons/boiler-to-heat-exchanger.png
diff --git a/upgrade-machines/graphics/icons/steam-engine-to-steam-turbine.png b/upgrade-machines/graphics/icons/steam-engine-to-steam-turbine.png
diff --git a/upgrade-machines/locale/en/recipe-name.cfg b/upgrade-machines/locale/en/recipe-name.cfg
@@ -13,4 +13,6 @@ pistol-to-combat-shotgun=Pistol to Combat shotgun
 light-to-heavy-armor=Light to Heavy armor
 heavy-to-modular-armor=Heavy to Modular armor
 modular-to-power-armor=Modular to Power armor
-power-to-power-armor-mk2=Power to Power armor MK2
+power-to-power-armor-mk2=Power to Power armor MK2
+boiler-to-heat-exchanger=Boiler to Heat exchanger
+steam-engine-to-steam-turbine=Steam engine to Steam turbine
diff --git a/upgrade-machines/migrations/2020-01-21_upgrade-machines_0.18.0.lua b/upgrade-machines/migrations/2020-01-21_upgrade-machines_0.18.0.lua
@@ -0,0 +1,8 @@
+for index, force in pairs(game.forces) do
+    if force.technologies["nuclear-power"].researched == true then
+        force.recipes["boiler-to-heat-exchanger"].enabled = true
+        force.recipes["boiler-to-heat-exchanger"].reload()
+        force.recipes["steam-engine-to-steam-turbine"].enabled = true
+        force.recipes["steam-engine-to-steam-turbine"].reload()
+    end
+end
diff --git a/upgrade-machines/prototypes/recipes/vanilla.lua b/upgrade-machines/prototypes/recipes/vanilla.lua
@@ -30,7 +30,7 @@ Jelmergu:addRecipe({
         },
     },
     main_product = "electric-mining-drill",
-    energy_required = 1,
+    energy_required = 2,
 })
 
 Jelmergu:addRecipe(
@@ -42,7 +42,7 @@ Jelmergu:addRecipe(
                 { "electronic-circuit", 1 }
             },
             result = "inserter",
-            energy_required = 1,
+            energy_required = 0.5,
             enabled = true
         }
 )
@@ -187,4 +187,41 @@ Jelmergu:addRecipe(
             energy_required = 25
 
         }
+)
+
+Jelmergu:addRecipe(
+        {
+            name = "boiler-to-heat-exchanger",
+            ingredients = {
+                {"boiler", 2},
+                {"pipe", 2},
+                {"copper-plate", 100},
+                {"steel-plate", 10}
+
+            },
+            results = {
+                {"heat-exchanger", 1},
+                {"stone-furnace", 2},
+            },
+            expensive = false,
+            icon_size = 64,
+            energy_required = 3
+        }
+)
+
+Jelmergu:addRecipe(
+        {
+            name = "steam-engine-to-steam-turbine",
+            ingredients = {
+                {"steam-engine", 3},
+                {"pipe", 5},
+                {"copper-plate", 50},
+                {"iron-gear-wheel", 11}
+
+            },
+            icon_size = 64,
+            result = "steam-turbine",
+            expensive = false,
+            energy_required = 3
+        }
 )
diff --git a/upgrade-machines/prototypes/technology/vanilla.lua b/upgrade-machines/prototypes/technology/vanilla.lua
@@ -37,3 +37,11 @@ table.insert(data.raw["technology"]["power-armor-mk2"].effects, {
     type = "unlock-recipe",
     recipe = "power-to-power-armor-mk2"
 })
+table.insert(data.raw["technology"]["nuclear-power"].effects, {
+    type = "unlock-recipe",
+    recipe = "boiler-to-heat-exchanger"
+})
+table.insert(data.raw["technology"]["nuclear-power"].effects, {
+    type = "unlock-recipe",
+    recipe = "steam-engine-to-steam-turbine"
+})