Linearilized dependencies

changelog.txt

@@ -2,6 +2,7 @@
 Version: 4.0.0
 Date: ???
   Changes:
+    - Linearilized Dependencies.
     - Change order for muddy-sludge to set it as the default recipe. Resolves https://github.com/pyanodon/pybugreports/issues/1193
     - Update recipe icon for muddy-sludge.
 ---------------------------------------------------------------------------------------------------

data-updates.lua

@@ -1,7 +1,3 @@
-if mods.pyindustry then
-    require "prototypes/updates/pyindustry-updates"
-end
-
 require "prototypes/updates/base-updates"
 require "prototypes/updates/entity-updates"
 require "prototypes/technologies/stacking-belts"
@@ -22,6 +18,9 @@ ITEM("lab"):set("icon_size", 64)
 ITEM("electric-engine-unit"):set("icon", "__pycoalprocessinggraphics__/graphics/icons/electric-engine-unit.png")
 ITEM("electric-engine-unit"):set("icon_size", 64)
 
+RECIPE("niobium-pipe"):remove_unlock("py-storage-tanks"):add_unlock("niobium")
+RECIPE("niobium-pipe-to-ground"):remove_unlock("py-storage-tanks"):add_unlock("niobium")
+
 RECIPE("small-electric-pole"):replace_result("small-electric-pole", {type = "item", name = "small-electric-pole", amount = 1})
 
 RECIPE("medium-electric-pole"):add_ingredient {type = "item", name = "niobium-plate", amount = 1}:replace_ingredient("copper-plate", {type = "item", name = "copper-cable", amount = 5}):replace_ingredient("iron-stick", {type = "item", name = "nbfe-alloy", amount = 2}):remove_ingredient("steel-plate")

data.lua

@@ -59,6 +59,10 @@ require "prototypes/technologies/hidden-mining-fluid-autounlock"
 require "prototypes.ores.borax"
 require "prototypes.ores.niobium"
 
+-- Armor
+require "prototypes/equipment/armor-updates"
+require "prototypes/equipment/portable-gasoline-generator"
+
 
 -- (( RECIPES )) --
 require "prototypes/recipes/recipes"
@@ -83,6 +87,8 @@ require "prototypes/items/canister"
 
 -- (( TILES )) --
 require "prototypes/tiles/polluted-ground"
+require "prototypes/tiles/py-iron-oxide"
+require "prototypes/tiles/py-nexelit"
 
 -- (( FLUIDS )) --
 require "prototypes/fluids/acidgas"
@@ -161,7 +167,7 @@ require "prototypes/buildings/beacon"
 require "prototypes/buildings/diet-beacon"
 require "prototypes/buildings/lab"
 
-require 'prototypes/achievements'
+require "prototypes/achievements"
 require "prototypes/logo"
 require "prototypes/menu-simulations"
 
@@ -187,19 +193,17 @@ data.raw.fluid["methanol"].fuel_value = "1MJ"
 data.raw.fluid["tar"].fuel_value = "0.2MJ"
 --data.raw.fluid['combustion-mixture1'].fuel_value = '0.1MJ'
 
-if mods.pyindustry then
-    data:extend {{
-        type = "shortcut",
-        name = "py-toggle-equipment-fuel-manager",
-        action = "lua",
-        technology_to_unlock = "personal-roboport-equipment",
-        unavailable_until_unlocked = true,
-        toggleable = true,
-        style = "default",
-        icon = "__pycoalprocessinggraphics__/graphics/gui/toggle-equipment-fuel-manager.png",
-        small_icon = "__pycoalprocessinggraphics__/graphics/gui/toggle-equipment-fuel-manager.png",
-        icon_size = 36,
-        small_icon_size = 36,
-        order = data.raw.shortcut["toggle-equipment-movement-bonus"].order
-    }}
-end
+data:extend {{
+    type = "shortcut",
+    name = "py-toggle-equipment-fuel-manager",
+    action = "lua",
+    technology_to_unlock = "personal-roboport-equipment",
+    unavailable_until_unlocked = true,
+    toggleable = true,
+    style = "default",
+    icon = "__pycoalprocessinggraphics__/graphics/gui/toggle-equipment-fuel-manager.png",
+    small_icon = "__pycoalprocessinggraphics__/graphics/gui/toggle-equipment-fuel-manager.png",
+    icon_size = 36,
+    small_icon_size = 36,
+    order = data.raw.shortcut["toggle-equipment-movement-bonus"].order
+}}

info.json

@@ -9,6 +9,7 @@
     "description": "Extends and overhauls Factorio's burner phase. Use realistic oil and coal processes to create advanced products. Functions as the core and library for the rest of the pY mods.",
     "dependencies": [
         "base >= 2.0.58",
+        "pyindustry >= 4.0.0",
         "~ pycoalprocessinggraphics >= 3.0.6",
         "~ pypostprocessing >= 3.0.37",
         "(?) DiscoScience",

prototypes/buildings/advanced-foundry.lua

@@ -14,6 +14,10 @@ RECIPE {
     }
 }:add_unlock("steel-processing")
 
+if mods.pyrawores then
+    RECIPE("advanced-foundry-mk01"):replace_ingredient_unsafe("steel-furnace", {type = "item", name = "py-burner", amount = 1})
+end
+
 for i = 1, 4 do
     if not mods.pyrawores and i == 2 then return end
 
@@ -151,7 +155,10 @@ RECIPE {
         {type = "item", name = "engine-unit",           amount = 4},
         {type = "item", name = "steel-plate",           amount = 40},
         {type = "item", name = "plastic-bar",           amount = 10},
-        {type = "item", name = "advanced-circuit",      amount = 10}
+        {type = "item", name = "advanced-circuit",      amount = 10},
+        {type = "item", name = "duralumin",             amount = 30},
+        {type = "item", name = "stainless-steel",       amount = 15},
+        {type = "item", name = "glass",                 amount = 15},
     },
     results = {
         {type = "item", name = "advanced-foundry-mk02", amount = 1}
@@ -169,6 +176,8 @@ RECIPE {
         {type = "item", name = "processing-unit",       amount = 15},
         {type = "item", name = "niobium-plate",         amount = 10},
         {type = "item", name = "electric-engine-unit",  amount = 4},
+        {type = "item", name = "titanium-plate",        amount = 10},
+        {type = "item", name = "super-steel",           amount = 20},
     },
     results = {
         {type = "item", name = "advanced-foundry-mk03", amount = 1}
@@ -184,6 +193,7 @@ RECIPE {
         {type = "item", name = "advanced-foundry-mk03", amount = 1},
         {type = "item", name = "low-density-structure", amount = 20},
         {type = "item", name = "nbfe-alloy",            amount = 10},
+        {type = "item", name = "lead-plate",            amount = 40}
     },
     results = {
         {type = "item", name = "advanced-foundry-mk04", amount = 1}

prototypes/buildings/automated-factory.lua

@@ -24,6 +24,10 @@ RECIPE {
     }
 }:add_unlock("advanced-circuit")
 
+if mods["pyrawores"] then
+    RECIPE("automated-factory-mk01"):replace_ingredient("advanced-circuit", "electronic-circuit"):remove_unlock("advanced-circuit"):add_unlock("fast-inserter")
+end
+
 for i = 1, 4 do
     if not mods.pyrawores and i == 2 then return end
 
@@ -138,7 +142,9 @@ RECIPE {
         {type = "item", name = "plastic-bar",            amount = 20},
         {type = "item", name = "fast-inserter",          amount = 4},
         {type = "item", name = "engine-unit",            amount = 4},
-        {type = "item", name = "advanced-circuit",       amount = 15}
+        {type = "item", name = "advanced-circuit",       amount = 15},
+        {type = "item", name = "duralumin",              amount = 30},
+        {type = "item", name = "stainless-steel",        amount = 20},
     },
     results = {
         {type = "item", name = "automated-factory-mk02", amount = 1}
@@ -155,7 +161,9 @@ RECIPE {
         {type = "item", name = "bulk-inserter",          amount = 4},
         {type = "item", name = "electric-engine-unit",   amount = 4},
         {type = "item", name = "niobium-plate",          amount = 25},
-        {type = "item", name = "processing-unit",        amount = 10}
+        {type = "item", name = "processing-unit",        amount = 10},
+        {type = "item", name = "titanium-plate",         amount = 30},
+        {type = "item", name = "super-steel",            amount = 30}
     },
     results = {
         {type = "item", name = "automated-factory-mk03", amount = 1}
@@ -171,6 +179,7 @@ RECIPE {
         {type = "item", name = "automated-factory-mk03", amount = 1},
         {type = "item", name = "low-density-structure",  amount = 10},
         {type = "item", name = "nbfe-alloy",             amount = 10},
+        {type = "item", name = "lead-plate",             amount = 10},
 
     },
     results = {

prototypes/buildings/ball-mill.lua

@@ -1,4 +1,4 @@
-RECIPE {
+local ball_mill_1 = RECIPE {
     type = "recipe",
     name = "ball-mill-mk01",
     energy_required = 0.5,
@@ -15,6 +15,10 @@ RECIPE {
     }
 }:add_unlock("crusher")
 
+if mods.pyrawores then
+    RECIPE("ball-mill-mk01"):add_ingredient_unsafe {type = "item", name = "py-asphalt", amount = 50}
+end
+
 for i = 1, 4 do
     if not mods.pyrawores and i == 2 then return end
 
@@ -103,6 +107,8 @@ RECIPE {
         {type = "item", name = "steel-plate",      amount = 30},
         {type = "item", name = "engine-unit",      amount = 1},
         {type = "item", name = "advanced-circuit", amount = 5},
+        {type = "item", name = "duralumin",        amount = 10},
+        {type = "item", name = "stainless-steel",  amount = 25},
     },
     results = {
         {type = "item", name = "ball-mill-mk02", amount = 1}
@@ -119,6 +125,8 @@ RECIPE {
         {type = "item", name = "niobium-plate",        amount = 15},
         {type = "item", name = "electric-engine-unit", amount = 2},
         {type = "item", name = "processing-unit",      amount = 10},
+        {type = "item", name = "titanium-plate",       amount = 50},
+        {type = "item", name = "super-steel",          amount = 15},
     },
     results = {
         {type = "item", name = "ball-mill-mk03", amount = 1}
@@ -134,6 +142,7 @@ RECIPE {
         {type = "item", name = "ball-mill-mk03", amount = 1},
         {type = "item", name = "concrete",       amount = 35},
         {type = "item", name = "nbfe-alloy",     amount = 10},
+        {type = "item", name = "lead-plate",     amount = 30},
     },
     results = {
         {type = "item", name = "ball-mill-mk04", amount = 1}

prototypes/buildings/borax-mine.lua

@@ -147,7 +147,9 @@ RECIPE {
         {type = "item", name = "plastic-bar",         amount = 50},
         {type = "item", name = "nexelit-plate",       amount = 15},
         {type = "item", name = "engine-unit",         amount = 3},
-        {type = "item", name = "fast-transport-belt", amount = 30}
+        {type = "item", name = "fast-transport-belt", amount = 30},
+        {type = "item", name = "duralumin",           amount = 15},
+        {type = "item", name = "stainless-steel",     amount = 20}
     },
     results = {
         {type = "item", name = "borax-mine-mk02", amount = 1}
@@ -164,7 +166,9 @@ RECIPE {
         {type = "item", name = "processing-unit",        amount = 20},
         {type = "item", name = "niobium-plate",          amount = 30},
         {type = "item", name = "electric-engine-unit",   amount = 6},
-        {type = "item", name = "express-transport-belt", amount = 15}
+        {type = "item", name = "express-transport-belt", amount = 15},
+        {type = "item", name = "titanium-plate",         amount = 40},
+        {type = "item", name = "super-steel",            amount = 30}
     },
     results = {
         {type = "item", name = "borax-mine-mk03", amount = 1}
@@ -181,6 +185,7 @@ RECIPE {
         {type = "item", name = "kevlar",                amount = 30},
         {type = "item", name = "nbfe-alloy",            amount = 15},
         {type = "item", name = "low-density-structure", amount = 10},
+        {type = "item", name = "lead-plate",            amount = 20},
     },
     results = {
         {type = "item", name = "borax-mine-mk04", amount = 1}

prototypes/buildings/botanical-nursery.lua

@@ -42,6 +42,10 @@ RECIPE {
     }
 }:add_unlock("wood-processing")
 
+if mods.pyrawores then
+    RECIPE("botanical-nursery"):add_ingredient_unsafe {type = "item", name = "glass", amount = 10}
+end
+
 for i = 1, 4 do
     if not mods.pyrawores and i == 2 then return end
 
@@ -157,7 +161,9 @@ RECIPE {
         {type = "item", name = "botanical-nursery", amount = 1},
         {type = "item", name = "engine-unit",       amount = 2},
         {type = "item", name = "advanced-circuit",  amount = 5},
-        {type = "item", name = "nexelit-plate",     amount = 30}
+        {type = "item", name = "nexelit-plate",     amount = 30},
+        {type = "item", name = "duralumin",         amount = 10},
+        {type = "item", name = "glass",             amount = 50}
     },
     results = {
         {type = "item", name = "botanical-nursery-mk02", amount = 1}
@@ -174,7 +180,9 @@ RECIPE {
         {type = "item", name = "electric-engine-unit",   amount = 2},
         {type = "item", name = "processing-unit",        amount = 10},
         {type = "item", name = "niobium-plate",          amount = 40},
-        {type = "item", name = "kevlar",                 amount = 15}
+        {type = "item", name = "kevlar",                 amount = 15},
+        {type = "item", name = "titanium-plate",         amount = 10},
+        {type = "item", name = "stainless-steel",        amount = 10}
     },
     results = {
         {type = "item", name = "botanical-nursery-mk03", amount = 1}
@@ -190,6 +198,8 @@ RECIPE {
         {type = "item", name = "botanical-nursery-mk03", amount = 1},
         {type = "item", name = "low-density-structure",  amount = 10},
         {type = "item", name = "nbfe-alloy",             amount = 20},
+        {type = "item", name = "tin-plate",              amount = 20},
+        {type = "item", name = "super-steel",            amount = 30},
     },
     results = {
         {type = "item", name = "botanical-nursery-mk04", amount = 1}

prototypes/buildings/carbon-filter.lua

@@ -147,6 +147,7 @@ RECIPE {
         {type = "item", name = "plastic-bar",      amount = 10},
         {type = "item", name = "nexelit-plate",    amount = 15},
         {type = "item", name = "advanced-circuit", amount = 5},
+        {type = "item", name = "duralumin",        amount = 20},
     },
     results = {
         {type = "item", name = "carbon-filter-mk02", amount = 1}
@@ -164,7 +165,9 @@ RECIPE {
         {type = "item", name = "niobium-plate",        amount = 20},
         {type = "item", name = "niobium-pipe",         amount = 10},
         {type = "item", name = "electric-engine-unit", amount = 1},
-        {type = "item", name = "kevlar",               amount = 10}
+        {type = "item", name = "kevlar",               amount = 10},
+        {type = "item", name = "titanium-plate",       amount = 30},
+        {type = "item", name = "stainless-steel",      amount = 15},
     },
     results = {
         {type = "item", name = "carbon-filter-mk03", amount = 1}
@@ -180,6 +183,8 @@ RECIPE {
         {type = "item", name = "carbon-filter-mk03",    amount = 1},
         {type = "item", name = "low-density-structure", amount = 15},
         {type = "item", name = "nbfe-alloy",            amount = 5},
+        {type = "item", name = "tin-plate",             amount = 30},
+        {type = "item", name = "super-steel",           amount = 20},
     },
     results = {
         {type = "item", name = "carbon-filter-mk04", amount = 1}

prototypes/buildings/chemical-plant.lua

@@ -16,6 +16,10 @@ RECIPE {
     }
 }:add_unlock("filtration")
 
+if mods.pyrawores then
+    RECIPE("chemical-plant-mk01"):add_ingredient_unsafe {type = "item", name = "glass", amount = 50}
+end
+
 for i = 1, 4 do
     if not mods.pyrawores and i == 2 then return end
 
@@ -293,6 +297,8 @@ RECIPE {
         {type = "item", name = "titanium-plate",      amount = 20},
         {type = "item", name = "nickel-plate",        amount = 50},
         {type = "item", name = "engine-unit",         amount = 5},
+        {type = "item", name = "duralumin",           amount = 15},
+        {type = "item", name = "tin-plate",           amount = 25},
     },
     results = {
         {type = "item", name = "chemical-plant-mk02", amount = 1}
@@ -309,6 +315,10 @@ RECIPE {
         {type = "item", name = "electric-engine-unit", amount = 4},
         {type = "item", name = "nichrome",             amount = 20},
         {type = "item", name = "glass",                amount = 50},
+        {type = "item", name = "titanium-plate",       amount = 40},
+        {type = "item", name = "stainless-steel",      amount = 40},
+        {type = "item", name = "sc-unit",              amount = 10},
+        {type = "item", name = "molybdenum-plate",     amount = 20},
     },
     results = {
         {type = "item", name = "chemical-plant-mk03", amount = 1}
@@ -323,6 +333,8 @@ RECIPE {
     ingredients = {
         {type = "item", name = "chemical-plant-mk03",   amount = 1},
         {type = "item", name = "low-density-structure", amount = 30},
+        {type = "item", name = "super-steel",           amount = 45},
+        {type = "item", name = "control-unit",          amount = 10},
     },
     results = {
         {type = "item", name = "chemical-plant-mk04", amount = 1}

prototypes/buildings/classifier.lua

@@ -116,6 +116,8 @@ RECIPE {
         {type = "item", name = "engine-unit",         amount = 2},
         {type = "item", name = "fast-transport-belt", amount = 30},
         {type = "item", name = "steel-plate",         amount = 15},
+        {type = "item", name = "duralumin",           amount = 30},
+        {type = "item", name = "tin-plate",           amount = 30},
     },
     results = {
         {type = "item", name = "classifier-mk02", amount = 1}
@@ -134,6 +136,8 @@ RECIPE {
         {type = "item", name = "kevlar",                 amount = 15},
         {type = "item", name = "processing-unit",        amount = 5},
         {type = "item", name = "niobium-plate",          amount = 10},
+        {type = "item", name = "titanium-plate",         amount = 20},
+        {type = "item", name = "stainless-steel",        amount = 15},
     },
     results = {
         {type = "item", name = "classifier-mk03", amount = 1}
@@ -149,6 +153,7 @@ RECIPE {
         {type = "item", name = "classifier-mk03",       amount = 1},
         {type = "item", name = "low-density-structure", amount = 5},
         {type = "item", name = "nbfe-alloy",            amount = 10},
+        {type = "item", name = "super-steel",           amount = 30},
     },
     results = {
         {type = "item", name = "classifier-mk04", amount = 1}

prototypes/buildings/cooling-tower-mk01.lua

@@ -14,6 +14,10 @@ RECIPE {
     }
 }:add_unlock("cooling-tower-1")
 
+if mods.pyrawores then
+    RECIPE("cooling-tower-mk01"):replace_ingredient_unsafe("iron-plate", "duralumin")
+end
+
 ITEM {
     type = "item",
     name = "cooling-tower-mk01",