fix power pole stuff

aluminum-burner-phase.lua

@@ -40,6 +40,7 @@ end
 if mods["aai-industry"] then
   util.replace_ingredient("burner-assembling-machine", "iron-plate", "aluminum-plate")
   util.replace_ingredient("small-iron-electric-pole", "copper-cable", "aluminum-cable")
+  util.set_ingredient("small-iron-electric-pole", "aluminum-cable", 1)
   util.remove_ingredient("electric-motor", "copper-cable")
   util.add_ingredient("electric-motor", "aluminum-cable", 1)
   util.replace_ingredient("electric-motor", "iron-plate", "aluminum-plate")
@@ -78,6 +79,7 @@ util.replace_ingredient("shotgun", "copper-plate", "aluminum-plate")
 util.replace_ingredient("shotgun-shell", "copper-plate", "stone")
 util.replace_ingredient("automation-science-pack", "copper-plate", "aluminum-plate")
 util.replace_ingredient("small-electric-pole", "copper-cable", "aluminum-cable")
+util.set_ingredient("small-electric-pole", "aluminum-cable", 1)
 util.replace_ingredient("gun-turret", "copper-cable", "aluminum-cable")
 util.replace_ingredient("gun-turret", "copper-plate", "aluminum-plate")
 

aluminum-recipe-updates-power.lua

@@ -0,0 +1,36 @@
+local util = require("data-util");
+
+-- most small electric poles handled in burner phase updates.
+
+-- vanilla 
+util.replace_ingredient("medium-electric-pole", "copper-plate", "acsr-cable")
+util.replace_ingredient("big-electric-pole", "copper-plate", "acsr-cable")
+util.replace_ingredient("substation", "copper-plate", "acsr-cable")
+util.add_ingredient("substation", "aluminum-plate", 4)
+
+-- aai or k2
+if mods["aai-industry"] or mods.Krastorio2 then
+  util.replace_ingredient("medium-electric-pole", "copper-cable", "acsr-cable")
+  util.replace_ingredient("big-electric-pole", "copper-cable", "acsr-cable")
+  util.replace_ingredient("substation", "copper-cable", "acsr-cable")
+end
+
+-- SE recycling
+if mods["space-exploration"] then
+  util.remove_product("se-recycle-small-iron-electric-pole", "copper-cable")
+  util.remove_product("se-recycle-small-electric-pole", "copper-cable")
+  util.remove_product("se-recycle-medium-electric-pole", "copper-cable")
+  util.remove_product("se-recycle-big-electric-pole", "copper-cable")
+  util.remove_product("se-recycle-substation", "copper-cable")
+
+  util.add_product("se-recycle-small-iron-electric-pole", {"aluminum-cable", 1})
+  util.add_product("se-recycle-small-electric-pole", {"aluminum-cable", 1})
+  util.add_product("se-recycle-medium-electric-pole", {"acsr-cable", 1})
+  util.add_product("se-recycle-big-electric-pole", {"acsr-cable", 2})
+  util.add_product("se-recycle-substation", {"acsr-cable", 4})
+end
+
+-- final amounts apply to all mod loadouts
+util.set_ingredient("medium-electric-pole", "acsr-cable", 1)
+util.set_ingredient("big-electric-pole", "acsr-cable", 2)
+util.set_ingredient("substation", "acsr-cable", 4)

aluminum-recipe-updates-transport.lua

@@ -1,7 +1,9 @@
 local util = require("data-util");
 
 
-util.replace_ingredient("car", "iron-plate", "aluminum-plate")
+util.replace_ingredient("car", "iron-plate", "aluminum-6061")
+util.replace_some_ingredient("car", "steel-plate", 3, "aluminum-6061", 6) -- if iron was removed from car already
+util.add_prerequisite("automobilism", "basic-alloys")
 util.add_prerequisite("railway", "basic-alloys")
 util.replace_ingredient("cargo-wagon", "iron-plate", "aluminum-6061")
 util.replace_some_ingredient("locomotive", "steel-plate", 10, "aluminum-6061", 20)
@@ -10,6 +12,7 @@ util.add_prerequisite("turbo-bike", "basic-alloys")
 util.replace_ingredient("turbo-bike", "steel-plate", "aluminum-6061")
 
 util.replace_ingredient("Hualing-Truck", "iron-plate", "aluminum-plate") -- LJD
+util.replace_ingredient("Hauling-Truck", "iron-plate", "aluminum-plate") -- LJD
 util.add_prerequisite("trucks", "basic-alloys")
 util.replace_ingredient("dumper-truck", "iron-plate", "aluminum-6061") -- Heavy Truck
 
@@ -144,6 +147,7 @@ util.add_ingredient("JunkTrain", "aluminum-plate", 4)
 util.add_prerequisite("ret-electric-locomotives", "reinforced-cable")
 util.replace_ingredient("ret-electric-locomotive", "steel-plate", "aluminum-6061")
 util.replace_ingredient("ret-power-pole", "copper-plate", "acsr-cable")
+util.set_ingredient("ret-power-pole", "acsr-cable", 2)
 
 -- Electric trains
 util.replace_ingredient("deg-electric-locomotive", "steel-plate", "aluminum-6061")

aluminum-recipe-updates.lua

@@ -22,9 +22,6 @@ util.add_ingredient("flamethrower-turret", "spark-plug", 1)
 util.add_ingredient("tank", "spark-plug", 1)
 util.add_ingredient("tank", "spark-plug", 1)
 
-
-util.add_prerequisite("engine", "basic-alloys")
-
 if mods.bztitanium then
   util.remove_ingredient("laser-turret", "diamond")
   util.add_ingredient("laser-turret", "ti-sapphire", 1)
@@ -37,16 +34,10 @@ util.replace_some_ingredient("distractor-capsule", "defender-capsule", 1, "ti-sa
 util.replace_ingredient("fast-inserter", "iron-plate", "aluminum-plate")
 util.replace_ingredient("long-handed-inserter", "iron-plate", "aluminum-plate")
 
-util.replace_ingredient("medium-electric-pole", "copper-plate", "acsr-cable")
-util.replace_ingredient("big-electric-pole", "copper-plate", "acsr-cable")
-util.replace_ingredient("substation", "copper-plate", "acsr-cable")
-util.add_ingredient("substation", "aluminum-plate", 4)
-
 util.replace_some_ingredient("light-armor", "iron-plate", 20, "alumina", 20)
 util.replace_some_ingredient("heavy-armor", "copper-plate", 20, "alumina", 50)
 util.replace_some_ingredient("tank", "steel-plate", 10, "alumina", 40)
 
-
 util.add_ingredient("kr-white-reinforced-plate", "alumina", 10)
 util.add_ingredient("kr-black-reinforced-plate", "alumina", 10)
 util.replace_ingredient("transport-belt-loader", "iron-plate", "aluminum-plate")
@@ -115,17 +106,8 @@ end
 
 util.replace_ingredient("chute-miniloader", "iron-plate", "aluminum-plate")
 
--- aai
-if mods["aai-industry"] then
-  util.replace_ingredient("medium-electric-pole", "copper-cable", "acsr-cable")
-  util.set_ingredient("medium-electric-pole", "acsr-cable", 2)
-  util.replace_ingredient("big-electric-pole", "copper-cable", "acsr-cable")
-  util.set_ingredient("big-electric-pole", "acsr-cable", 5)
-  util.replace_ingredient("substation", "copper-cable", "acsr-cable")
-  util.set_ingredient("substation", "acsr-cable", 10)
-end
-
 if mods["space-exploration"] then
+
   util.add_product("se-scrap-recycling", {name="aluminum-ore", amount=1, probability=0.1})
 
   util.replace_ingredient("se-adaptive-armour-equipment-1", "titanium-plate", "alumina")

aluminum-recipe.lua

@@ -204,8 +204,8 @@ data:extend({
     order = "d[acsr-cable]",
     enabled = false,
     energy_required = 0.5,
-    ingredients = {{"aluminum-cable", 1}, {"steel-plate", 1}},
+    ingredients = {{"aluminum-cable", 6}, {"steel-plate", 1}},
-    results = {{"acsr-cable", 1}},
+    results = {{"acsr-cable", 3}},
   }
 })
 
@@ -240,6 +240,9 @@ data:extend({
 })
 util.add_effect("engine", { type = "unlock-recipe", recipe = "spark-plug" })
 util.replace_ingredient("spark-plug", "iron-plate", "tungsten-plate")
+if mods.bzzirconium then
+  util.add_prerequisite("engine", "zirconia-processing")
+end
 
 
 local aluminum_6061 = {}

changelog.txt

@@ -1,4 +1,18 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.5
+Date: 2022-02-14
+  Changes:
+    - Change cost of ACSR cable a bit (slightly cheaper overall).
+    - Tweak costs of power poles and substations to be cheaper.
+    - Car requires 6061 aluminum alloy
+    - Tech tree tweaks
+---------------------------------------------------------------------------------------------------
+Version: 0.0.4
+Date: 2022-02-13
+  Fixes:
+    - K2 medium and up electric poles now use ACSR Cable
+    - SE electric pole recycling recipes
+---------------------------------------------------------------------------------------------------
 Version: 0.0.3
 Date: 2022-02-12
   Fixes:

data-updates.lua

@@ -1,6 +1,7 @@
 require("aluminum-recipe-updates")
 require("aluminum-recipe-updates-lds")
 require("aluminum-recipe-updates-transport")
+require("aluminum-recipe-updates-power")
 require("aluminum-matter")
 -- require("omni")
 require("map-gen-preset-updates")

info.json

@@ -1,6 +1,6 @@
 {
     "name": "bzaluminum",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "factorio_version": "1.1",
     "title": "Aluminum",
     "author": "Brevven",