diff --git a/changelog.txt b/changelog.txt index 227243b86..e6ba42374 100644 --- a/changelog.txt +++ b/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. --------------------------------------------------------------------------------------------------- diff --git a/data-updates.lua b/data-updates.lua index 5bcffd441..75bccd437 100644 --- a/data-updates.lua +++ b/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") diff --git a/data.lua b/data.lua index 60a8f0a24..e740b021d 100644 --- a/data.lua +++ b/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 +}} diff --git a/info.json b/info.json index d10307884..7c4a90216 100644 --- a/info.json +++ b/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", diff --git a/prototypes/buildings/advanced-foundry.lua b/prototypes/buildings/advanced-foundry.lua index 8342987ec..e465d341f 100644 --- a/prototypes/buildings/advanced-foundry.lua +++ b/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} diff --git a/prototypes/buildings/automated-factory.lua b/prototypes/buildings/automated-factory.lua index abb234949..4dcee135a 100644 --- a/prototypes/buildings/automated-factory.lua +++ b/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 = { diff --git a/prototypes/buildings/ball-mill.lua b/prototypes/buildings/ball-mill.lua index 022299722..81bf6ac1d 100644 --- a/prototypes/buildings/ball-mill.lua +++ b/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} diff --git a/prototypes/buildings/borax-mine.lua b/prototypes/buildings/borax-mine.lua index a740b3e19..794cf23e7 100644 --- a/prototypes/buildings/borax-mine.lua +++ b/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} diff --git a/prototypes/buildings/botanical-nursery.lua b/prototypes/buildings/botanical-nursery.lua index 52905cde1..85f765134 100644 --- a/prototypes/buildings/botanical-nursery.lua +++ b/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} diff --git a/prototypes/buildings/carbon-filter.lua b/prototypes/buildings/carbon-filter.lua index 558618cf9..8d12d79c4 100644 --- a/prototypes/buildings/carbon-filter.lua +++ b/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} diff --git a/prototypes/buildings/chemical-plant.lua b/prototypes/buildings/chemical-plant.lua index f9ad7e029..80edc5f71 100644 --- a/prototypes/buildings/chemical-plant.lua +++ b/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} diff --git a/prototypes/buildings/classifier.lua b/prototypes/buildings/classifier.lua index d6cd04d91..208221402 100644 --- a/prototypes/buildings/classifier.lua +++ b/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} diff --git a/prototypes/buildings/cooling-tower-mk01.lua b/prototypes/buildings/cooling-tower-mk01.lua index 07d97f827..67fc3517b 100644 --- a/prototypes/buildings/cooling-tower-mk01.lua +++ b/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", diff --git a/prototypes/buildings/cooling-tower-mk02.lua b/prototypes/buildings/cooling-tower-mk02.lua index 3b5ea4a17..cf01ced96 100644 --- a/prototypes/buildings/cooling-tower-mk02.lua +++ b/prototypes/buildings/cooling-tower-mk02.lua @@ -25,6 +25,10 @@ RECIPE { } }:add_unlock("cooling-tower-2") +if mods.pyrawores then + RECIPE("cooling-tower-mk02"):replace_ingredient_unsafe("pipe", "niobium-pipe"):replace_ingredient_unsafe("iron-plate", "stainless-steel") +end + ITEM { type = "item", name = "cooling-tower-mk02", diff --git a/prototypes/buildings/desulfurizator-unit.lua b/prototypes/buildings/desulfurizator-unit.lua index a4d1d5716..05b113855 100644 --- a/prototypes/buildings/desulfurizator-unit.lua +++ b/prototypes/buildings/desulfurizator-unit.lua @@ -33,6 +33,10 @@ RECIPE { } }:add_unlock("desulfurization") +if mods.pyrawores then + RECIPE("desulfurizator-unit"):replace_ingredient_unsafe("iron-plate", "titanium-plate") +end + for i = 1, 4 do if not mods.pyrawores and i == 2 then return end @@ -137,7 +141,10 @@ RECIPE { {type = "item", name = "desulfurizator-unit", amount = 1}, {type = "item", name = "engine-unit", amount = 2}, {type = "item", name = "advanced-circuit", amount = 10}, - {type = "item", name = "nexelit-plate", amount = 10} + {type = "item", name = "nexelit-plate", amount = 10}, + {type = "item", name = "duralumin", amount = 15}, + {type = "item", name = "tin-plate", amount = 25}, + {type = "item", name = "glass", amount = 10} }, results = { {type = "item", name = "desulfurizator-unit-mk02", amount = 1} @@ -154,7 +161,9 @@ RECIPE { {type = "item", name = "processing-unit", amount = 5}, {type = "item", name = "niobium-plate", amount = 10}, {type = "item", name = "electric-engine-unit", amount = 4}, - {type = "item", name = "kevlar", amount = 30} + {type = "item", name = "kevlar", amount = 30}, + {type = "item", name = "titanium-plate", amount = 40}, + {type = "item", name = "stainless-steel", amount = 30}, }, results = { {type = "item", name = "desulfurizator-unit-mk03", amount = 1} diff --git a/prototypes/buildings/distilator.lua b/prototypes/buildings/distilator.lua index f9f365af4..5282aad3b 100644 --- a/prototypes/buildings/distilator.lua +++ b/prototypes/buildings/distilator.lua @@ -218,6 +218,8 @@ RECIPE { {type = "item", name = "advanced-circuit", amount = 5}, {type = "item", name = "plastic-bar", amount = 10}, {type = "item", name = "engine-unit", amount = 3}, + {type = "item", name = "stainless-steel", amount = 30}, + {type = "item", name = "duralumin", amount = 20}, }, results = { {type = "item", name = "distilator-mk02", amount = 1} @@ -236,6 +238,8 @@ RECIPE { {type = "item", name = "niobium-plate", amount = 20}, {type = "item", name = "processing-unit", amount = 5}, {type = "item", name = "niobium-pipe", amount = 15}, + {type = "item", name = "titanium-plate", amount = 10}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "distilator-mk03", amount = 1} @@ -251,6 +255,7 @@ RECIPE { {type = "item", name = "distilator-mk03", amount = 1}, {type = "item", name = "pump", amount = 4}, {type = "item", name = "nbfe-alloy", amount = 15}, + {type = "item", name = "lead-plate", amount = 20}, }, results = { {type = "item", name = "distilator-mk04", amount = 1} diff --git a/prototypes/buildings/evaporator.lua b/prototypes/buildings/evaporator.lua index 87e7c72ac..f0ac6a967 100644 --- a/prototypes/buildings/evaporator.lua +++ b/prototypes/buildings/evaporator.lua @@ -34,6 +34,10 @@ RECIPE { } }:add_unlock("fluid-processing-machines-1") +if mods.pyrawores then + RECIPE("evaporator"):replace_ingredient_unsafe("iron-plate", "tin-plate") +end + for i = 1, 4 do if not mods.pyrawores and i == 2 then return end @@ -240,6 +244,9 @@ RECIPE { {type = "item", name = "engine-unit", amount = 2}, {type = "item", name = "nexelit-plate", amount = 10}, {type = "item", name = "advanced-circuit", amount = 10}, + {type = "item", name = "duralumin", amount = 15}, + {type = "item", name = "tin-plate", amount = 25}, + {type = "item", name = "glass", amount = 10}, }, results = { {type = "item", name = "evaporator-mk02", amount = 1} @@ -257,6 +264,8 @@ RECIPE { {type = "item", name = "kevlar", amount = 5}, {type = "item", name = "processing-unit", amount = 10}, {type = "item", name = "niobium-plate", amount = 12}, + {type = "item", name = "titanium-plate", amount = 40}, + {type = "item", name = "stainless-steel", amount = 30}, }, results = { {type = "item", name = "evaporator-mk03", amount = 1} @@ -272,6 +281,7 @@ RECIPE { {type = "item", name = "evaporator-mk03", amount = 1}, {type = "item", name = "low-density-structure", amount = 10}, {type = "item", name = "nbfe-alloy", amount = 5}, + {type = "item", name = "super-steel", amount = 35}, }, results = { {type = "item", name = "evaporator-mk04", amount = 1} diff --git a/prototypes/buildings/fawogae-plantation.lua b/prototypes/buildings/fawogae-plantation.lua index 32980c3c1..c9f36a000 100644 --- a/prototypes/buildings/fawogae-plantation.lua +++ b/prototypes/buildings/fawogae-plantation.lua @@ -32,6 +32,10 @@ RECIPE { } } +if mods.pyrawores then + RECIPE("fawogae-plantation-mk01"):replace_ingredient_unsafe("copper-cable", "tinned-cable") +end + local fluid_boxes if mods.pyalienlife then fluid_boxes = { diff --git a/prototypes/buildings/fluid-separator.lua b/prototypes/buildings/fluid-separator.lua index 5c0ceb341..377b35a60 100644 --- a/prototypes/buildings/fluid-separator.lua +++ b/prototypes/buildings/fluid-separator.lua @@ -139,11 +139,13 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "fluid-separator", amount = 1}, - {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "py-tank-3", amount = 1}, {type = "item", name = "nexelit-plate", amount = 10}, {type = "item", name = "concrete", 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 = "lead-plate", amount = 20}, }, results = { {type = "item", name = "fluid-separator-mk02", amount = 1} @@ -157,11 +159,13 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "fluid-separator-mk02", amount = 1}, - {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "py-tank-7", amount = 1}, {type = "item", name = "processing-unit", amount = 5}, {type = "item", name = "niobium-plate", amount = 15}, {type = "item", name = "electric-engine-unit", amount = 5}, - {type = "item", name = "kevlar", amount = 30} + {type = "item", name = "kevlar", amount = 30}, + {type = "item", name = "titanium-plate", amount = 20}, + {type = "item", name = "stainless-steel", amount = 20} }, results = { {type = "item", name = "fluid-separator-mk03", amount = 1} @@ -175,10 +179,11 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "fluid-separator-mk03", amount = 1}, - {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "py-tank-8", amount = 1}, {type = "item", name = "low-density-structure", amount = 10}, {type = "item", name = "nbfe-alloy", amount = 5}, {type = "item", name = "niobium-pipe", amount = 15}, + {type = "item", name = "super-steel", amount = 10}, }, results = { {type = "item", name = "fluid-separator-mk04", amount = 1} diff --git a/prototypes/buildings/fts-reactor.lua b/prototypes/buildings/fts-reactor.lua index 75bd123a8..882f7a175 100644 --- a/prototypes/buildings/fts-reactor.lua +++ b/prototypes/buildings/fts-reactor.lua @@ -17,6 +17,10 @@ RECIPE { } }:add_unlock("coal-processing-2") +if mods.pyrawores then + RECIPE("fts-reactor"):replace_ingredient_unsafe("stone-brick", "glass") +end + for i = 1, 4 do if not mods.pyrawores and i == 2 then return end @@ -267,7 +271,9 @@ RECIPE { {type = "item", name = "engine-unit", amount = 6}, {type = "item", name = "nexelit-plate", amount = 10}, {type = "item", name = "plastic-bar", amount = 10}, - {type = "item", name = "advanced-circuit", amount = 20} + {type = "item", name = "advanced-circuit", amount = 20}, + {type = "item", name = "duralumin", amount = 20}, + {type = "item", name = "lead-plate", amount = 20} }, results = { {type = "item", name = "fts-reactor-mk02", amount = 1} @@ -284,6 +290,8 @@ RECIPE { {type = "item", name = "electric-engine-unit", amount = 6}, {type = "item", name = "kevlar", amount = 15}, {type = "item", name = "processing-unit", amount = 10}, + {type = "item", name = "titanium-plate", amount = 25}, + {type = "item", name = "stainless-steel", amount = 20}, }, results = { {type = "item", name = "fts-reactor-mk03", amount = 1} @@ -299,6 +307,7 @@ RECIPE { {type = "item", name = "fts-reactor-mk03", amount = 1}, {type = "item", name = "low-density-structure", amount = 15}, {type = "item", name = "nbfe-alloy", amount = 5}, + {type = "item", name = "super-steel", amount = 20}, }, results = { {type = "item", name = "fts-reactor-mk04", amount = 1} diff --git a/prototypes/buildings/gasifier.lua b/prototypes/buildings/gasifier.lua index b6f2ba208..a530d9441 100644 --- a/prototypes/buildings/gasifier.lua +++ b/prototypes/buildings/gasifier.lua @@ -156,10 +156,12 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "gasifier", amount = 1}, - {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "py-tank-3", amount = 1}, {type = "item", name = "plastic-bar", amount = 30}, {type = "item", name = "engine-unit", amount = 2}, - {type = "item", name = "advanced-circuit", amount = 10} + {type = "item", name = "advanced-circuit", amount = 10}, + {type = "item", name = "duralumin", amount = 20}, + {type = "item", name = "lead-plate", amount = 20} }, results = { {type = "item", name = "gasifier-mk02", amount = 1} @@ -173,11 +175,13 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "gasifier-mk02", amount = 1}, - {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "py-tank-7", amount = 1}, {type = "item", name = "electric-engine-unit", amount = 2}, {type = "item", name = "kevlar", amount = 15}, {type = "item", name = "processing-unit", amount = 10}, {type = "item", name = "niobium-plate", amount = 20}, + {type = "item", name = "titanium-plate", amount = 25}, + {type = "item", name = "stainless-steel", amount = 20}, }, results = { {type = "item", name = "gasifier-mk03", amount = 1} @@ -191,10 +195,12 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "gasifier-mk03", amount = 1}, - {type = "item", name = "storage-tank", amount = 1}, + {type = "item", name = "py-tank-8", amount = 1}, {type = "item", name = "nbfe-alloy", amount = 20}, + {type = "item", name = "super-steel", amount = 20}, + {type = "item", name = "tin-plate", amount = 40}, }, results = { - {type = "item", name = "gasifier-mk04", amount = 1} + {type = "item", name = "gasifier-mk04", amount = 1}, } } diff --git a/prototypes/buildings/glassworks.lua b/prototypes/buildings/glassworks.lua index e2a9bbd12..d87fae8a3 100644 --- a/prototypes/buildings/glassworks.lua +++ b/prototypes/buildings/glassworks.lua @@ -244,7 +244,9 @@ RECIPE { {type = "item", name = "glassworks-mk01", amount = 1}, {type = "item", name = "steel-plate", amount = 35}, {type = "item", name = "engine-unit", amount = 5}, - {type = "item", name = "advanced-circuit", amount = 10} + {type = "item", name = "advanced-circuit", amount = 10}, + {type = "item", name = "duralumin", amount = 30}, + {type = "item", name = "tin-plate", amount = 30} }, results = { {type = "item", name = "glassworks-mk02", amount = 1} @@ -262,6 +264,8 @@ RECIPE { {type = "item", name = "kevlar", amount = 15}, {type = "item", name = "processing-unit", amount = 10}, {type = "item", name = "niobium-plate", amount = 20}, + {type = "item", name = "titanium-plate", amount = 20}, + {type = "item", name = "stainless-steel", amount = 15}, }, results = { {type = "item", name = "glassworks-mk03", amount = 1} @@ -278,6 +282,7 @@ RECIPE { {type = "item", name = "concrete", amount = 40}, {type = "item", name = "nbfe-alloy", amount = 15}, {type = "item", name = "low-density-structure", amount = 10}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "glassworks-mk04", amount = 1} diff --git a/prototypes/buildings/ground-borer.lua b/prototypes/buildings/ground-borer.lua index 7974fb827..8d66b9e86 100644 --- a/prototypes/buildings/ground-borer.lua +++ b/prototypes/buildings/ground-borer.lua @@ -15,6 +15,10 @@ RECIPE { } }:add_unlock("excavation-1") +if mods.pyrawores then + RECIPE("ground-borer"):replace_ingredient_unsafe("iron-plate", "titanium-plate") +end + for i = 1, 4 do if not mods.pyrawores and i == 2 then return end @@ -134,7 +138,9 @@ RECIPE { {type = "item", name = "concrete", amount = 40}, {type = "item", name = "plastic-bar", amount = 10}, {type = "item", name = "engine-unit", amount = 4}, - {type = "item", name = "advanced-circuit", amount = 10} + {type = "item", name = "advanced-circuit", amount = 10}, + {type = "item", name = "duralumin", amount = 30}, + {type = "item", name = "tin-plate", amount = 30}, }, results = { {type = "item", name = "ground-borer-mk02", amount = 1} @@ -152,6 +158,8 @@ RECIPE { {type = "item", name = "electric-engine-unit", amount = 4}, {type = "item", name = "processing-unit", amount = 10}, {type = "item", name = "kevlar", amount = 15}, + {type = "item", name = "titanium-plate", amount = 20}, + {type = "item", name = "stainless-steel", amount = 15}, }, results = { {type = "item", name = "ground-borer-mk03", amount = 1} @@ -168,6 +176,7 @@ RECIPE { {type = "item", name = "concrete", amount = 40}, {type = "item", name = "nbfe-alloy", amount = 30}, {type = "item", name = "low-density-structure", amount = 15}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "ground-borer-mk04", amount = 1} diff --git a/prototypes/buildings/hpf.lua b/prototypes/buildings/hpf.lua index e9ecd86cc..1539a2b81 100644 --- a/prototypes/buildings/hpf.lua +++ b/prototypes/buildings/hpf.lua @@ -176,6 +176,8 @@ RECIPE { {type = "item", name = "advanced-circuit", amount = 10}, {type = "item", name = "steel-plate", amount = 15}, {type = "item", name = "concrete", amount = 10}, + {type = "item", name = "duralumin", amount = 30}, + {type = "item", name = "tin-plate", amount = 30}, }, results = { {type = "item", name = "hpf-mk02", amount = 1} @@ -193,6 +195,8 @@ RECIPE { {type = "item", name = "kevlar", amount = 10}, {type = "item", name = "processing-unit", amount = 5}, {type = "item", name = "niobium-pipe", amount = 10}, + {type = "item", name = "titanium-plate", amount = 20}, + {type = "item", name = "stainless-steel", amount = 15}, }, results = { {type = "item", name = "hpf-mk03", amount = 1} @@ -208,6 +212,7 @@ RECIPE { {type = "item", name = "hpf-mk03", amount = 1}, {type = "item", name = "low-density-structure", amount = 20}, {type = "item", name = "nbfe-alloy", amount = 10}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "hpf-mk04", amount = 1} diff --git a/prototypes/buildings/jaw-crusher.lua b/prototypes/buildings/jaw-crusher.lua index a6ad8f1a6..6988482b4 100644 --- a/prototypes/buildings/jaw-crusher.lua +++ b/prototypes/buildings/jaw-crusher.lua @@ -129,7 +129,10 @@ RECIPE { {type = "item", name = "jaw-crusher", amount = 1}, {type = "item", name = "nexelit-plate", amount = 30}, {type = "item", name = "engine-unit", amount = 4}, - {type = "item", name = "advanced-circuit", amount = 10} + {type = "item", name = "advanced-circuit", amount = 10}, + {type = "item", name = "duralumin", amount = 20}, + {type = "item", name = "stainless-steel", amount = 30}, + {type = "item", name = "tin-plate", amount = 30}, }, results = { {type = "item", name = "jaw-crusher-mk02", amount = 1} @@ -146,6 +149,8 @@ RECIPE { {type = "item", name = "niobium-plate", amount = 20}, {type = "item", name = "electric-engine-unit", amount = 4}, {type = "item", name = "processing-unit", amount = 10}, + {type = "item", name = "titanium-plate", amount = 60}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "jaw-crusher-mk03", amount = 1} @@ -161,6 +166,7 @@ RECIPE { {type = "item", name = "jaw-crusher-mk03", amount = 1}, {type = "item", name = "concrete", amount = 40}, {type = "item", name = "nbfe-alloy", amount = 15}, + {type = "item", name = "lead-plate", amount = 30}, }, results = { {type = "item", name = "jaw-crusher-mk04", amount = 1} diff --git a/prototypes/buildings/methanol-reactor.lua b/prototypes/buildings/methanol-reactor.lua index 0e99679a1..d853d8576 100644 --- a/prototypes/buildings/methanol-reactor.lua +++ b/prototypes/buildings/methanol-reactor.lua @@ -27,6 +27,10 @@ RECIPE { } }:add_unlock("methanol-processing-1") +if mods.pyrawores then + RECIPE("methanol-reactor"):replace_ingredient_unsafe("chemical-plant-mk01", "electrolyzer-mk01") +end + for i = 1, 4 do if not mods.pyrawores and i == 2 then return end @@ -185,6 +189,7 @@ RECIPE { {type = "item", name = "plastic-bar", amount = 50}, {type = "item", name = "nexelit-plate", amount = 15}, {type = "item", name = "engine-unit", amount = 8}, + {type = "item", name = "duralumin", amount = 20}, }, results = { {type = "item", name = "methanol-reactor-mk02", amount = 1} @@ -201,6 +206,8 @@ 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 = "titanium-plate", amount = 30}, + {type = "item", name = "stainless-steel", amount = 15}, }, results = { {type = "item", name = "methanol-reactor-mk03", amount = 1} @@ -217,6 +224,8 @@ 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 = "tin-plate", amount = 30}, + {type = "item", name = "super-steel", amount = 20}, }, results = { {type = "item", name = "methanol-reactor-mk04", amount = 1} diff --git a/prototypes/buildings/olefin-plant.lua b/prototypes/buildings/olefin-plant.lua index ee17644f5..7e74e5ec0 100644 --- a/prototypes/buildings/olefin-plant.lua +++ b/prototypes/buildings/olefin-plant.lua @@ -15,6 +15,10 @@ RECIPE { } }:add_unlock("lubricant") +if mods.pyrawores then + RECIPE("olefin-plant"):replace_ingredient_unsafe("chemical-plant-mk01", "electrolyzer-mk01"):replace_ingredient_unsafe("advanced-circuit", "electronic-circuit") +end + for i = 1, 4 do if not mods.pyrawores and i == 2 then return end @@ -163,12 +167,14 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "olefin-plant", amount = 1}, - {type = "item", name = "storage-tank", amount = 3}, + {type = "item", name = "py-tank-3", amount = 3}, {type = "item", name = "advanced-circuit", amount = 10}, {type = "item", name = "pump", amount = 4}, {type = "item", name = "concrete", amount = 40}, {type = "item", name = "engine-unit", amount = 2}, - {type = "item", name = "nexelit-plate", amount = 10} + {type = "item", name = "nexelit-plate", amount = 10}, + {type = "item", name = "duralumin", amount = 15}, + {type = "item", name = "tin-plate", amount = 25} }, results = { {type = "item", name = "olefin-plant-mk02", amount = 1} @@ -182,12 +188,14 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "olefin-plant-mk02", amount = 1}, - {type = "item", name = "storage-tank", amount = 3}, + {type = "item", name = "py-tank-7", amount = 3}, {type = "item", name = "processing-unit", amount = 15}, {type = "item", name = "niobium-plate", amount = 20}, {type = "item", name = "pump", amount = 4}, {type = "item", name = "electric-engine-unit", amount = 4}, - {type = "item", name = "kevlar", amount = 20} + {type = "item", name = "kevlar", amount = 20}, + {type = "item", name = "titanium-plate", amount = 40}, + {type = "item", name = "stainless-steel", amount = 30} }, results = { {type = "item", name = "olefin-plant-mk03", amount = 1} @@ -201,10 +209,11 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "olefin-plant-mk03", amount = 1}, - {type = "item", name = "storage-tank", amount = 3}, + {type = "item", name = "py-tank-8", amount = 3}, {type = "item", name = "pump", amount = 4}, {type = "item", name = "nbfe-alloy", amount = 20}, {type = "item", name = "low-density-structure", amount = 10}, + {type = "item", name = "super-steel", amount = 35}, }, results = { {type = "item", name = "olefin-plant-mk04", amount = 1} diff --git a/prototypes/buildings/power-house.lua b/prototypes/buildings/power-house.lua index a83f94f08..ee2d261f3 100644 --- a/prototypes/buildings/power-house.lua +++ b/prototypes/buildings/power-house.lua @@ -42,6 +42,10 @@ RECIPE { } }:add_unlock("energy-1") +if mods.pyrawores then + RECIPE("power-house"):replace_ingredient_unsafe("iron-plate", "lead-plate") +end + for i = 1, 4 do if not mods.pyrawores and i == 2 then return end @@ -198,6 +202,8 @@ RECIPE { {type = "item", name = "fast-transport-belt", amount = 30}, {type = "item", name = "steel-plate", amount = 15}, {type = "item", name = "engine-unit", amount = 1}, + {type = "item", name = "duralumin", amount = 15}, + {type = "item", name = "stainless-steel", amount = 20}, }, results = { {type = "item", name = "power-house-mk02", amount = 1} @@ -215,6 +221,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 = 40}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "power-house-mk03", amount = 1} @@ -230,6 +238,7 @@ RECIPE { {type = "item", name = "power-house-mk03", amount = 1}, {type = "item", name = "low-density-structure", amount = 5}, {type = "item", name = "nbfe-alloy", amount = 10}, + {type = "item", name = "lead-plate", amount = 20} }, results = { {type = "item", name = "power-house-mk04", amount = 1} diff --git a/prototypes/buildings/quenching-tower.lua b/prototypes/buildings/quenching-tower.lua index e4c1c5dde..f8ca77aa2 100644 --- a/prototypes/buildings/quenching-tower.lua +++ b/prototypes/buildings/quenching-tower.lua @@ -165,6 +165,8 @@ RECIPE { {type = "item", name = "pump", amount = 4}, {type = "item", name = "advanced-circuit", amount = 15}, {type = "item", name = "engine-unit", amount = 1}, + {type = "item", name = "duralumin", amount = 20}, + {type = "item", name = "lead-plate", amount = 20}, }, results = { {type = "item", name = "quenching-tower-mk02", amount = 1} @@ -181,7 +183,9 @@ RECIPE { {type = "item", name = "electric-engine-unit", amount = 4}, {type = "item", name = "niobium-plate", amount = 20}, {type = "item", name = "niobium-pipe", amount = 20}, - {type = "item", name = "processing-unit", amount = 10} + {type = "item", name = "processing-unit", amount = 10}, + {type = "item", name = "titanium-plate", amount = 25}, + {type = "item", name = "stainless-steel", amount = 20}, }, results = { {type = "item", name = "quenching-tower-mk03", amount = 1} @@ -198,6 +202,7 @@ RECIPE { {type = "item", name = "low-density-structure", amount = 10}, {type = "item", name = "nbfe-alloy", amount = 10}, {type = "item", name = "kevlar", amount = 20}, + {type = "item", name = "super-steel", amount = 20}, }, results = { {type = "item", name = "quenching-tower-mk04", amount = 1} diff --git a/prototypes/buildings/ralesia-plantation.lua b/prototypes/buildings/ralesia-plantation.lua index c36ef89ef..cad3bd310 100644 --- a/prototypes/buildings/ralesia-plantation.lua +++ b/prototypes/buildings/ralesia-plantation.lua @@ -99,6 +99,10 @@ RECIPE { } }:add_unlock("ralesia") +if mods.pyrawores then + RECIPE("ralesia-plantation-mk01"):replace_ingredient_unsafe("stone", "glass") +end + for i = 1, 4 do if not mods.pyalienlife and i == 2 then return end diff --git a/prototypes/buildings/rectisol.lua b/prototypes/buildings/rectisol.lua index 3aa769d83..8e5224b7e 100644 --- a/prototypes/buildings/rectisol.lua +++ b/prototypes/buildings/rectisol.lua @@ -221,12 +221,13 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "rectisol", amount = 1}, - {type = "item", name = "storage-tank", amount = 2}, + {type = "item", name = "py-tank-3", amount = 2}, {type = "item", name = "advanced-circuit", amount = 25}, {type = "item", name = "plastic-bar", amount = 50}, {type = "item", name = "nexelit-plate", amount = 15}, {type = "item", name = "pump", amount = 2}, {type = "item", name = "engine-unit", amount = 1}, + {type = "item", name = "duralumin", amount = 20}, }, results = { {type = "item", name = "rectisol-mk02", amount = 1} @@ -240,11 +241,13 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "rectisol-mk02", amount = 1}, - {type = "item", name = "storage-tank", amount = 2}, + {type = "item", name = "py-tank-7", amount = 2}, {type = "item", name = "processing-unit", amount = 20}, {type = "item", name = "niobium-plate", amount = 30}, {type = "item", name = "electric-engine-unit", amount = 4}, {type = "item", name = "pump", amount = 2}, + {type = "item", name = "titanium-plate", amount = 30}, + {type = "item", name = "stainless-steel", amount = 15}, }, results = { {type = "item", name = "rectisol-mk03", amount = 1} @@ -258,10 +261,12 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "rectisol-mk03", amount = 1}, - {type = "item", name = "storage-tank", amount = 2}, + {type = "item", name = "py-tank-8", amount = 2}, {type = "item", name = "kevlar", amount = 30}, {type = "item", name = "nbfe-alloy", amount = 15}, {type = "item", name = "low-density-structure", amount = 10}, + {type = "item", name = "tin-plate", amount = 30}, + {type = "item", name = "super-steel", amount = 20}, }, results = { {type = "item", name = "rectisol-mk04", amount = 1} diff --git a/prototypes/buildings/sand-extractor.lua b/prototypes/buildings/sand-extractor.lua index 4f6692cba..0e51d5370 100644 --- a/prototypes/buildings/sand-extractor.lua +++ b/prototypes/buildings/sand-extractor.lua @@ -117,6 +117,9 @@ RECIPE { {type = "item", name = "engine-unit", amount = 5}, {type = "item", name = "nexelit-plate", amount = 15}, {type = "item", name = "advanced-circuit", amount = 5}, + {type = "item", name = "duralumin", amount = 20}, + {type = "item", name = "stainless-steel", amount = 30}, + {type = "item", name = "tin-plate", amount = 30}, }, results = { {type = "item", name = "sand-extractor-mk02", amount = 1} @@ -134,7 +137,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 = 60}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "sand-extractor-mk03", amount = 1} @@ -150,6 +155,7 @@ RECIPE { {type = "item", name = "sand-extractor-mk03", amount = 1}, {type = "item", name = "low-density-structure", amount = 20}, {type = "item", name = "nbfe-alloy", amount = 10}, + {type = "item", name = "lead-plate", amount = 30}, }, results = { {type = "item", name = "sand-extractor-mk04", amount = 1} diff --git a/prototypes/buildings/soil-extractor.lua b/prototypes/buildings/soil-extractor.lua index 63872694e..a841ec4c5 100644 --- a/prototypes/buildings/soil-extractor.lua +++ b/prototypes/buildings/soil-extractor.lua @@ -30,6 +30,10 @@ RECIPE { } } +if mods.pyrawores then + RECIPE("soil-extractor-mk01"):replace_ingredient_unsafe("copper-cable", "tinned-cable") +end + for i = 1, 4 do if not mods.pyrawores and i == 2 then return end @@ -169,7 +173,9 @@ RECIPE { {type = "item", name = "engine-unit", amount = 2}, {type = "item", name = "pump", amount = 4}, {type = "item", name = "advanced-circuit", amount = 15}, - {type = "item", name = "copper-cable", amount = 50}, + {type = "item", name = "tinned-cable", amount = 50}, + {type = "item", name = "duralumin", amount = 20}, + {type = "item", name = "stainless-steel", amount = 30}, }, results = { {type = "item", name = "soil-extractor-mk02", amount = 1} @@ -186,6 +192,8 @@ 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 = "titanium-plate", amount = 10}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "soil-extractor-mk03", amount = 1} @@ -201,6 +209,7 @@ RECIPE { {type = "item", name = "soil-extractor-mk03", amount = 1}, {type = "item", name = "pump", amount = 1}, {type = "item", name = "nbfe-alloy", amount = 35}, + {type = "item", name = "lead-plate", amount = 20}, }, results = { {type = "item", name = "soil-extractor-mk04", amount = 1} diff --git a/prototypes/buildings/solid-separator.lua b/prototypes/buildings/solid-separator.lua index 7dcd5d108..d0702ddc9 100644 --- a/prototypes/buildings/solid-separator.lua +++ b/prototypes/buildings/solid-separator.lua @@ -103,7 +103,9 @@ RECIPE { {type = "item", name = "engine-unit", amount = 6}, {type = "item", name = "nexelit-plate", amount = 10}, {type = "item", name = "plastic-bar", amount = 10}, - {type = "item", name = "advanced-circuit", amount = 20} + {type = "item", name = "advanced-circuit", amount = 20}, + {type = "item", name = "duralumin", amount = 30}, + {type = "item", name = "tin-plate", amount = 30}, }, results = { {type = "item", name = "solid-separator-mk02", amount = 1} @@ -122,6 +124,8 @@ RECIPE { {type = "item", name = "niobium-plate", amount = 20}, {type = "item", name = "processing-unit", amount = 5}, {type = "item", name = "niobium-pipe", amount = 15}, + {type = "item", name = "titanium-plate", amount = 20}, + {type = "item", name = "stainless-steel", amount = 15}, }, results = { {type = "item", name = "solid-separator-mk03", amount = 1} @@ -137,6 +141,7 @@ RECIPE { {type = "item", name = "solid-separator-mk03", amount = 1}, {type = "item", name = "nbfe-alloy", amount = 20}, {type = "item", name = "low-density-structure", amount = 10}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "solid-separator-mk04", amount = 1} diff --git a/prototypes/buildings/tar-processing-unit.lua b/prototypes/buildings/tar-processing-unit.lua index 5bf0dae7c..3e07dcf8d 100644 --- a/prototypes/buildings/tar-processing-unit.lua +++ b/prototypes/buildings/tar-processing-unit.lua @@ -210,7 +210,9 @@ RECIPE { {type = "item", name = "nexelit-plate", amount = 20}, {type = "item", name = "concrete", amount = 60}, {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 = 20}, + {type = "item", name = "lead-plate", amount = 20}, }, results = { {type = "item", name = "tar-processing-unit-mk02", amount = 1} @@ -228,6 +230,8 @@ RECIPE { {type = "item", name = "niobium-plate", amount = 30}, {type = "item", name = "electric-engine-unit", amount = 2}, {type = "item", name = "pump", amount = 2}, + {type = "item", name = "titanium-plate", amount = 25}, + {type = "item", name = "stainless-steel", amount = 20}, }, results = { {type = "item", name = "tar-processing-unit-mk03", amount = 1} @@ -244,6 +248,8 @@ RECIPE { {type = "item", name = "pump", amount = 4}, {type = "item", name = "nbfe-alloy", amount = 20}, {type = "item", name = "low-density-structure", amount = 10}, + {type = "item", name = "super-steel", amount = 20}, + {type = "item", name = "tin-plate", amount = 40}, }, results = { {type = "item", name = "tar-processing-unit-mk04", amount = 1} diff --git a/prototypes/buildings/washer.lua b/prototypes/buildings/washer.lua index c16dc722c..992dfe6d7 100644 --- a/prototypes/buildings/washer.lua +++ b/prototypes/buildings/washer.lua @@ -137,7 +137,9 @@ RECIPE { {type = "item", name = "washer", 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 = 30}, + {type = "item", name = "lead-plate", amount = 20}, }, results = { {type = "item", name = "washer-mk02", amount = 1} @@ -154,6 +156,8 @@ 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 = "titanium-plate", amount = 20}, + {type = "item", name = "stainless-steel", amount = 20}, }, results = { {type = "item", name = "washer-mk03", amount = 1} @@ -169,6 +173,7 @@ RECIPE { {type = "item", name = "washer-mk03", amount = 1}, {type = "item", name = "low-density-structure", amount = 15}, {type = "item", name = "nbfe-alloy", amount = 5}, + {type = "item", name = "super-steel", amount = 10}, }, results = { {type = "item", name = "washer-mk04", amount = 1} diff --git a/prototypes/buildings/wpu.lua b/prototypes/buildings/wpu.lua index b21ba7c85..8131e1348 100644 --- a/prototypes/buildings/wpu.lua +++ b/prototypes/buildings/wpu.lua @@ -129,12 +129,13 @@ RECIPE { energy_required = 0.5, enabled = false, ingredients = { - {type = "item", name = "wpu-mk01", amount = 1}, + {type = "item", name = "wpu-mk01", amount = 1}, {type = "item", name = "engine-unit", amount = 2}, {type = "item", name = "advanced-circuit", amount = 25}, {type = "item", name = "plastic-bar", amount = 50}, {type = "item", name = "nexelit-plate", amount = 15}, {type = "item", name = "fast-inserter", amount = 4}, + {type = "item", name = "duralumin", amount = 10}, }, results = { {type = "item", name = "wpu-mk02", amount = 1} @@ -151,7 +152,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 = 10}, + {type = "item", name = "stainless-steel", amount = 10}, }, results = { {type = "item", name = "wpu-mk03", amount = 1} @@ -167,6 +170,8 @@ RECIPE { {type = "item", name = "wpu-mk03", amount = 1}, {type = "item", name = "low-density-structure", amount = 10}, {type = "item", name = "nbfe-alloy", amount = 10}, + {type = "item", name = "tin-plate", amount = 20}, + {type = "item", name = "super-steel", amount = 30}, }, results = { {type = "item", name = "wpu-mk04", amount = 1} diff --git a/prototypes/equipment/armor-updates.lua b/prototypes/equipment/armor-updates.lua new file mode 100644 index 000000000..6170cb039 --- /dev/null +++ b/prototypes/equipment/armor-updates.lua @@ -0,0 +1,141 @@ +data:extend {{ + name = "light-armor-equipment-grid", + type = "equipment-grid", + height = 6, + width = 4, + equipment_categories = {"armor"} +}} + +data:extend {{ + name = "heavy-armor-equipment-grid", + type = "equipment-grid", + height = 8, + width = 6, + equipment_categories = {"armor"} +}} + +data.raw.armor["light-armor"].equipment_grid = "light-armor-equipment-grid" +data.raw.armor["heavy-armor"].equipment_grid = "heavy-armor-equipment-grid" + +data.raw["equipment-grid"]["small-equipment-grid"].width = 10 +data.raw["equipment-grid"]["small-equipment-grid"].height = 8 +data.raw["equipment-grid"]["medium-equipment-grid"].width = 12 +data.raw["equipment-grid"]["medium-equipment-grid"].height = 10 +data.raw["equipment-grid"]["large-equipment-grid"].width = 14 +data.raw["equipment-grid"]["large-equipment-grid"].height = 12 + +data.raw.armor["light-armor"].inventory_size_bonus = 20 +data.raw.armor["heavy-armor"].inventory_size_bonus = 40 +data.raw.armor["modular-armor"].inventory_size_bonus = 60 +data.raw.armor["power-armor"].inventory_size_bonus = 80 +data.raw.armor["power-armor-mk2"].inventory_size_bonus = 100 + +-- This should fix this issue https://github.com/pyanodon/pybugreports/issues/1050 +-- IF IF IF IF pyindustry and or pycoalprocessing are enabled only +if mods.pyhightech then + data.raw.technology["battery-equipment"].hidden = true + data.raw.technology["battery-equipment"].enabled = false + data.raw.recipe["battery-equipment"].hidden = true + data.raw.item["battery-equipment"].hidden = true + data.raw.item["battery-equipment"].place_as_equipment_result = nil + data.raw.item["battery-equipment"].localised_name = {"equipment-name.battery-equipment"} + data.raw.technology["battery-mk2-equipment"].hidden = true + data.raw.technology["battery-mk2-equipment"].enabled = false + data.raw.recipe["battery-mk2-equipment"].hidden = true + data.raw.item["battery-mk2-equipment"].hidden = true + data.raw.item["battery-mk2-equipment"].place_as_equipment_result = nil + data.raw.item["battery-mk2-equipment"].localised_name = {"equipment-name.battery-mk2-equipment"} +end + +data:extend {{ + name = "personal-fusion-cell", + type = "fuel-category" +}} + +ITEM { + type = "item", + name = "personal-fusion-cell", + icon = "__pyindustrygraphics__/graphics/icons/fusion-cell.png", + icon_size = 64, + subgroup = "py-generator-equipment", + order = "a[energy-source]-cb[personal-fusion-cell]", + stack_size = 10, + burnt_result = "personal-fusion-cell-used", + fuel_value = "2GJ", + fuel_category = "personal-fusion-cell" +} + +RECIPE { + type = "recipe", + name = "personal-fusion-cell", + energy_required = 10, + category = "crafting-with-fluid", + enabled = false, + ingredients = { + {type = "item", name = "barrel", amount = 1}, + {type = "fluid", name = "water", amount = 100} + }, + results = { + {type = "item", name = "personal-fusion-cell", amount = 1} + } +}:add_unlock("fission-reactor-equipment") + +ITEM { + type = "item", + name = "personal-fusion-cell-used", + icon = "__pyindustrygraphics__/graphics/icons/empty-fusion-cell.png", + icon_size = 64, + subgroup = "py-generator-equipment", + order = "a[energy-source]-cb[personal-fusion-cell-used]", + stack_size = 10, +} + +RECIPE { + type = "recipe", + name = "personal-fusion-cell-refuel", + energy_required = 10, + category = "crafting-with-fluid", + enabled = false, + ingredients = { + {type = "item", name = "personal-fusion-cell-used", amount = 1}, + {type = "fluid", name = "water", amount = 100} + }, + results = { + {type = "item", name = "personal-fusion-cell", amount = 1} + } +}:add_unlock("fission-reactor-equipment") + +data.raw.item["solar-panel-equipment"].subgroup = "py-generator-equipment" +data.raw.item["solar-panel-equipment"].order = "a[energy-source]-b[solar-panel-equipment]" + +data.raw.technology["fission-reactor-equipment"].icons = util.technology_icon_constant_equipment("__pyindustrygraphics__/graphics/technology/fusion-reactor-equipment.png") +data.raw.technology["fission-reactor-equipment"].icon_size = 256 +data.raw.technology["fission-reactor-equipment"].icon = nil +data.raw.item["fission-reactor-equipment"].icon = "__pyindustrygraphics__/graphics/icons/fusion-reactor-equipment.png" +data.raw.item["fission-reactor-equipment"].icon_size = 256 +data.raw.item["fission-reactor-equipment"].subgroup = "py-generator-equipment" +data.raw.item["fission-reactor-equipment"].order = "a[energy-source]-c[fission-reactor-equipment]" +data.raw["generator-equipment"]["fission-reactor-equipment"].power = "2.7MW" +data.raw["generator-equipment"]["fission-reactor-equipment"].burner = { + type = "burner", + fuel_inventory_size = 4, + burnt_inventory_size = 4, + fuel_categories = {"personal-fusion-cell"} +} +data.raw["generator-equipment"]["fission-reactor-equipment"].sprite = { + filename = "__pyindustrygraphics__/graphics/icons/fusion-reactor-equipment.png", + size = 256 +} +data.raw["generator-equipment"]["fission-reactor-equipment"].shape = { + type = "manual", + width = 4, + height = 4, + points = { + {1, 0}, {2, 0}, + {0, 1}, {1, 1}, {2, 1}, {3, 1}, + {0, 2}, {1, 2}, {2, 2}, {3, 2}, + {0, 3}, {1, 3}, {2, 3}, {3, 3} + } +} + +data.raw["solar-panel-equipment"]["solar-panel-equipment"].power = "90kW" diff --git a/prototypes/equipment/portable-gasoline-generator.lua b/prototypes/equipment/portable-gasoline-generator.lua new file mode 100644 index 000000000..d89ff5cc6 --- /dev/null +++ b/prototypes/equipment/portable-gasoline-generator.lua @@ -0,0 +1,66 @@ +data:extend {{ + type = "generator-equipment", + name = "portable-gasoline-generator", + power = "180kW", + burner = { + type = "burner", + emissions_per_minute = { + pollution = 6 + }, + fuel_inventory_size = 4, + burnt_inventory_size = 4, + fuel_categories = {"jerry"} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-output" + }, + categories = {"armor"}, + shape = {type = "full", width = 2, height = 2}, + sprite = { + width = 64, + height = 64, + filename = "__pyindustrygraphics__/graphics/icons/gasoline-burner.png" + } +}} + +ITEM { + type = "item", + name = "portable-gasoline-generator", + icon = "__pyindustrygraphics__/graphics/icons/gasoline-burner.png", + icon_size = 64, + subgroup = "py-generator-equipment", + order = "a[energy-source]-a[portable-gasoline-generator]", + stack_size = 10, + place_as_equipment_result = "portable-gasoline-generator", + localised_description = {"equipment-description.portable-gasoline-generator"} +} + +RECIPE { + type = "recipe", + name = "portable-gasoline-generator", + energy_required = 10, + category = "crafting", + enabled = false, + ingredients = { + {type = "item", name = "engine-unit", amount = 4}, + {type = "item", name = "boiler", amount = 1}, + {type = "item", name = "steel-plate", amount = 20}, + {type = "item", name = "iron-gear-wheel", amount = 14}, + {type = "item", name = "small-electric-pole", amount = 1} + }, + results = { + {type = "item", name = "portable-gasoline-generator", amount = 1} + } +}:add_unlock("personal-roboport-equipment") + +data.raw.recipe["personal-roboport-equipment"].ingredients = { + {type = "item", name = "iron-gear-wheel", amount = 45}, + {type = "item", name = "steel-plate", amount = 20}, + {type = "item", name = "electronic-circuit", amount = 10}, + {type = "item", name = "battery", amount = 10}, +} + +data.raw.technology["personal-roboport-equipment"].prerequisites = {"construction-robotics"} +data.raw.technology["personal-roboport-equipment"].unit.count = 300 +data.raw.technology["personal-roboport-mk2-equipment"]:remove_prereq("solar-panel-equipment") diff --git a/prototypes/fluids/aromatics.lua b/prototypes/fluids/aromatics.lua index 7f28ffdcc..dd1c4d8c5 100644 --- a/prototypes/fluids/aromatics.lua +++ b/prototypes/fluids/aromatics.lua @@ -14,6 +14,10 @@ RECIPE { } }:add_unlock("advanced-oil-processing") +if mods.pyrawores then + RECIPE("aromatics2"):replace_ingredient_unsafe("water", {type = "fluid", name = "hydrogen", amount = 500}) +end + FLUID { type = "fluid", name = "aromatics", diff --git a/prototypes/fluids/boric-acid.lua b/prototypes/fluids/boric-acid.lua index 17286046c..ced2ce646 100644 --- a/prototypes/fluids/boric-acid.lua +++ b/prototypes/fluids/boric-acid.lua @@ -13,6 +13,10 @@ RECIPE { } }:add_unlock("lab-instrument") +if mods.pyrawores then + RECIPE("boric-acid").category = "electrolyzer" +end + FLUID { type = "fluid", name = "boric-acid", diff --git a/prototypes/fluids/diborane.lua b/prototypes/fluids/diborane.lua index 8ff034c7a..131ae7cc5 100644 --- a/prototypes/fluids/diborane.lua +++ b/prototypes/fluids/diborane.lua @@ -13,6 +13,10 @@ RECIPE { } }:add_unlock("energy-1") +if mods.pyrawores then + RECIPE("diborane"):replace_ingredient_unsafe("water", {type = "fluid", name = "hydrogen", amount = 250}).category = "electrolyzer" +end + FLUID { type = "fluid", name = "diborane", diff --git a/prototypes/fluids/hydrogen-peroxide.lua b/prototypes/fluids/hydrogen-peroxide.lua index 7d2ffcbd8..86cfda890 100644 --- a/prototypes/fluids/hydrogen-peroxide.lua +++ b/prototypes/fluids/hydrogen-peroxide.lua @@ -13,6 +13,10 @@ RECIPE { } }:add_unlock("sulfur-processing") +if mods.pyrawores then + RECIPE("hydrogen-peroxide"):replace_ingredient_unsafe("iron-plate", "nickel-plate") +end + FLUID { type = "fluid", name = "hydrogen-peroxide", diff --git a/prototypes/fluids/methanol.lua b/prototypes/fluids/methanol.lua index 5e5b58826..b307b0955 100644 --- a/prototypes/fluids/methanol.lua +++ b/prototypes/fluids/methanol.lua @@ -16,6 +16,10 @@ RECIPE { order = "a" }:add_unlock("methanol-processing-1") +if mods.pyrawores then + RECIPE("methanol-from-syngas"):replace_ingredient_unsafe("iron-plate", "zinc-plate") +end + RECIPE { type = "recipe", name = "oleo-methanol", diff --git a/prototypes/fluids/molten-glass.lua b/prototypes/fluids/molten-glass.lua index 82fdff1cc..8e913b417 100644 --- a/prototypes/fluids/molten-glass.lua +++ b/prototypes/fluids/molten-glass.lua @@ -15,6 +15,10 @@ RECIPE { order = "aac" } +if mods.pyrawores then + RECIPE("glass"):set_fields {enabled = false}:set_fields {hidden = true} +end + RECIPE { type = "recipe", name = "glass-2", diff --git a/prototypes/fluids/niobium-complex.lua b/prototypes/fluids/niobium-complex.lua index f8b480584..5b65c6789 100644 --- a/prototypes/fluids/niobium-complex.lua +++ b/prototypes/fluids/niobium-complex.lua @@ -16,6 +16,10 @@ RECIPE { order = "c" }:add_unlock("niobium") +if mods.pyrawores then + RECIPE("niobium-complex"):replace_ingredient_unsafe("water", {type = "fluid", name = "hydrogen-chloride", amount = 100}) +end + FLUID { type = "fluid", name = "niobium-complex", diff --git a/prototypes/item-sounds.lua b/prototypes/item-sounds.lua index 80e0c0782..c6c213377 100644 --- a/prototypes/item-sounds.lua +++ b/prototypes/item-sounds.lua @@ -173,59 +173,58 @@ add_sound_multiple("gasturbinemk%02d", 1, 3, item_sounds.mechanical_inventory_mo add_sound_single("beacon-mk01", item_sounds.mechanical_inventory_move, item_sounds.mechanical_inventory_pickup, item_sounds.mechanical_inventory_move) -- PyIndustry -if mods.pyindustry then - add_sound_single("py-tank-1", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-2", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-3", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-4", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-5", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-6", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-7", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-8", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-9", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-tank-10", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("barrel-machine-mk01", item_sounds.mechanical_inventory_move, item_sounds.mechanical_inventory_pickup, item_sounds.mechanical_inventory_move) - add_sound_single("py-check-valve", item_sounds.fluid_inventory_move, item_sounds.fluid_inventory_pickup, item_sounds.fluid_inventory_move) - add_sound_single("py-overflow-valve", item_sounds.fluid_inventory_move, item_sounds.fluid_inventory_pickup, item_sounds.fluid_inventory_move) - add_sound_single("py-underflow-valve", item_sounds.fluid_inventory_move, item_sounds.fluid_inventory_pickup, item_sounds.fluid_inventory_move) - add_sound_single("niobium-pipe", item_sounds.metal_small_inventory_move, item_sounds.metal_small_inventory_pickup, item_sounds.metal_small_inventory_move) - add_sound_single("niobium-pipe-to-ground", item_sounds.metal_small_inventory_move, item_sounds.metal_small_inventory_pickup, item_sounds.metal_small_inventory_move) - add_sound_multiple("accumulator-mk%02d", 1, 2, item_sounds.electric_large_inventory_move, item_sounds.electric_large_inventory_pickup, item_sounds.electric_large_inventory_move) - for _, building in ipairs {"shed", "storehouse", "warehouse", "deposit"} do - for _, type in ipairs {"basic", "active-provider", "buffer", "passive-provider", "requester", "storage"} do - add_sound_single("py-" .. building .. "-" .. type, item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - end +add_sound_single("py-tank-1", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-2", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-3", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-4", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-5", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-6", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-7", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-8", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-9", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-tank-10", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("barrel-machine-mk01", item_sounds.mechanical_inventory_move, item_sounds.mechanical_inventory_pickup, item_sounds.mechanical_inventory_move) +add_sound_single("py-check-valve", item_sounds.fluid_inventory_move, item_sounds.fluid_inventory_pickup, item_sounds.fluid_inventory_move) +add_sound_single("py-overflow-valve", item_sounds.fluid_inventory_move, item_sounds.fluid_inventory_pickup, item_sounds.fluid_inventory_move) +add_sound_single("py-underflow-valve", item_sounds.fluid_inventory_move, item_sounds.fluid_inventory_pickup, item_sounds.fluid_inventory_move) +add_sound_single("niobium-pipe", item_sounds.metal_small_inventory_move, item_sounds.metal_small_inventory_pickup, item_sounds.metal_small_inventory_move) +add_sound_single("niobium-pipe-to-ground", item_sounds.metal_small_inventory_move, item_sounds.metal_small_inventory_pickup, item_sounds.metal_small_inventory_move) +add_sound_multiple("accumulator-mk%02d", 1, 2, item_sounds.electric_large_inventory_move, item_sounds.electric_large_inventory_pickup, item_sounds.electric_large_inventory_move) +for _, building in ipairs {"shed", "storehouse", "warehouse", "deposit"} do + for _, type in ipairs {"basic", "active-provider", "buffer", "passive-provider", "requester", "storage"} do + add_sound_single("py-" .. building .. "-" .. type, item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) end - add_sound_single("py-recharge-station-mk01", item_sounds.electric_large_inventory_move, item_sounds.electric_large_inventory_pickup, item_sounds.electric_large_inventory_move) - add_sound_multiple("py-roboport-mk%02d", 1, 2, item_sounds.roboport_inventory_move, item_sounds.roboport_inventory_pickup, item_sounds.roboport_inventory_move) - add_sound_single("py-ze", item_sounds.roboport_inventory_move, item_sounds.roboport_inventory_pickup, item_sounds.roboport_inventory_move) - add_sound_multiple("py-ze-mk%02d", 2, 4, item_sounds.roboport_inventory_move, item_sounds.roboport_inventory_pickup, item_sounds.roboport_inventory_move) - add_sound_single("py-construction-robot-mk01", item_sounds.robotic_inventory_move, item_sounds.robotic_inventory_pickup, item_sounds.robotic_inventory_move) - add_sound_single("py-logistic-robot-mk01", item_sounds.robotic_inventory_move, item_sounds.robotic_inventory_pickup, item_sounds.robotic_inventory_move) - -- These sounds cannot be added here because these items are implemented during data-updates. - --add_sound_item("py-aluminium", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - --add_sound_item("py-iron", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - --add_sound_item("py-iron-oxide", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - --add_sound_item("py-limestone", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - --add_sound_item("py-nexelit", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - --add_sound_item("py-steel", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - --add_sound_item("py-coal-tile", item_sounds.concrete_inventory_move, item_sounds.concrete_inventory_pickup, item_sounds.concrete_inventory_move) - --add_sound_item("py-asphalt", item_sounds.concrete_inventory_move, item_sounds.concrete_inventory_pickup, item_sounds.concrete_inventory_move) - add_sound_single("mk02-locomotive", item_sounds.locomotive_inventory_move, item_sounds.locomotive_inventory_pickup, item_sounds.locomotive_inventory_move) - add_sound_single("mk02-wagon", item_sounds.metal_large_inventory_move, item_sounds.locomotive_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("mk02-fluid-wagon", item_sounds.fluid_inventory_move, item_sounds.fluid_inventory_pickup, item_sounds.fluid_inventory_move) - add_sound_single("py-burner", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-gas-vent", item_sounds.metal_small_inventory_move, item_sounds.metal_small_inventory_pickup, item_sounds.metal_small_inventory_move) - add_sound_single("py-sinkhole", item_sounds.concrete_inventory_move, item_sounds.concrete_inventory_pickup, item_sounds.concrete_inventory_move) - add_sound_single("concrete-wall", item_sounds.concrete_inventory_move, item_sounds.concrete_inventory_pickup, item_sounds.concrete_inventory_move) - add_sound_single("poorman-wood-fence", item_sounds.wood_inventory_move, item_sounds.wood_inventory_pickup, item_sounds.wood_inventory_move) - add_sound_single("wood-fence", item_sounds.wood_inventory_move, item_sounds.wood_inventory_pickup, item_sounds.wood_inventory_move) - add_sound_single("megadar", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("py-local-radar", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) - add_sound_single("portable-gasoline-generator", item_sounds.mechanical_inventory_move, item_sounds.mechanical_inventory_pickup, item_sounds.mechanical_inventory_move) - add_sound_single("personal-fusion-cell", item_sounds.fuel_cell_inventory_move, item_sounds.fuel_cell_inventory_pickup, item_sounds.fuel_cell_inventory_move) - add_sound_single("personal-fusion-cell-used", item_sounds.fuel_cell_inventory_move, item_sounds.fuel_cell_inventory_pickup, item_sounds.fuel_cell_inventory_move) end +add_sound_single("py-recharge-station-mk01", item_sounds.electric_large_inventory_move, item_sounds.electric_large_inventory_pickup, item_sounds.electric_large_inventory_move) +add_sound_multiple("py-roboport-mk%02d", 1, 2, item_sounds.roboport_inventory_move, item_sounds.roboport_inventory_pickup, item_sounds.roboport_inventory_move) +add_sound_single("py-ze", item_sounds.roboport_inventory_move, item_sounds.roboport_inventory_pickup, item_sounds.roboport_inventory_move) +add_sound_multiple("py-ze-mk%02d", 2, 4, item_sounds.roboport_inventory_move, item_sounds.roboport_inventory_pickup, item_sounds.roboport_inventory_move) +add_sound_single("py-construction-robot-mk01", item_sounds.robotic_inventory_move, item_sounds.robotic_inventory_pickup, item_sounds.robotic_inventory_move) +add_sound_single("py-logistic-robot-mk01", item_sounds.robotic_inventory_move, item_sounds.robotic_inventory_pickup, item_sounds.robotic_inventory_move) +-- These sounds cannot be added here because these items are implemented during data-updates. +--add_sound_item("py-aluminium", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +--add_sound_item("py-iron", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +--add_sound_item("py-iron-oxide", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +--add_sound_item("py-limestone", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +--add_sound_item("py-nexelit", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +--add_sound_item("py-steel", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +--add_sound_item("py-coal-tile", item_sounds.concrete_inventory_move, item_sounds.concrete_inventory_pickup, item_sounds.concrete_inventory_move) +--add_sound_item("py-asphalt", item_sounds.concrete_inventory_move, item_sounds.concrete_inventory_pickup, item_sounds.concrete_inventory_move) +add_sound_single("mk02-locomotive", item_sounds.locomotive_inventory_move, item_sounds.locomotive_inventory_pickup, item_sounds.locomotive_inventory_move) +add_sound_single("mk02-wagon", item_sounds.metal_large_inventory_move, item_sounds.locomotive_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("mk02-fluid-wagon", item_sounds.fluid_inventory_move, item_sounds.fluid_inventory_pickup, item_sounds.fluid_inventory_move) +add_sound_single("py-burner", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-gas-vent", item_sounds.metal_small_inventory_move, item_sounds.metal_small_inventory_pickup, item_sounds.metal_small_inventory_move) +add_sound_single("py-sinkhole", item_sounds.concrete_inventory_move, item_sounds.concrete_inventory_pickup, item_sounds.concrete_inventory_move) +add_sound_single("concrete-wall", item_sounds.concrete_inventory_move, item_sounds.concrete_inventory_pickup, item_sounds.concrete_inventory_move) +add_sound_single("poorman-wood-fence", item_sounds.wood_inventory_move, item_sounds.wood_inventory_pickup, item_sounds.wood_inventory_move) +add_sound_single("wood-fence", item_sounds.wood_inventory_move, item_sounds.wood_inventory_pickup, item_sounds.wood_inventory_move) +add_sound_single("megadar", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("py-local-radar", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move) +add_sound_single("portable-gasoline-generator", item_sounds.mechanical_inventory_move, item_sounds.mechanical_inventory_pickup, item_sounds.mechanical_inventory_move) +add_sound_single("personal-fusion-cell", item_sounds.fuel_cell_inventory_move, item_sounds.fuel_cell_inventory_pickup, item_sounds.fuel_cell_inventory_move) +add_sound_single("personal-fusion-cell-used", item_sounds.fuel_cell_inventory_move, item_sounds.fuel_cell_inventory_pickup, item_sounds.fuel_cell_inventory_move) + -- PyRawOres if mods.pyrawores then add_sound_single("py-construction-robot-mk02", item_sounds.robotic_inventory_move, item_sounds.robotic_inventory_pickup, item_sounds.robotic_inventory_pickup) diff --git a/prototypes/items/canister.lua b/prototypes/items/canister.lua index 1c2b22f01..01e29a4b8 100644 --- a/prototypes/items/canister.lua +++ b/prototypes/items/canister.lua @@ -21,6 +21,10 @@ RECIPE { order = "c [methanol]" }:add_unlock("methanol-processing-1") +if mods.pyrawores then + RECIPE("empty-gas-canister"):replace_ingredient_unsafe("steel-plate", "aluminium-plate") +end + ITEM { type = "item", name = "empty-gas-canister", diff --git a/prototypes/items/items.lua b/prototypes/items/items.lua index 94abae687..8d8d43770 100644 --- a/prototypes/items/items.lua +++ b/prototypes/items/items.lua @@ -797,6 +797,11 @@ ITEM { stack_size = 100 } +if mods.pyrawores then + ITEM("crushed-copper").hidden = true + ITEM("crushed-iron").hidden = true +end + ITEM { type = "item", name = "log", diff --git a/prototypes/logo.lua b/prototypes/logo.lua index 5bf60ec09..b351fb0ff 100644 --- a/prototypes/logo.lua +++ b/prototypes/logo.lua @@ -5,7 +5,7 @@ data:extend {{ icon_size = 64, flags = {"placeable-neutral", "player-creation"}, hidden = true, - minable = {mining_time = 0.5}, + minable = {mining_time = 0.5, result = "py-logo-15tiles"}, max_health = 666, inventory_type = "with_filters_and_bar", collision_box = {{-7.5 + 0.15, -1.5 + 0.15}, {7.5 - 0.15, 1.5 - 0.15}}, @@ -20,3 +20,30 @@ data:extend {{ scale = 0.5 } }} + +ITEM { + name = "py-logo-15tiles", + type = "item", + stack_size = 10, + icon = "__pycoalprocessinggraphics__/graphics/icons/py-logo-15tiles.png", + icon_size = 64, + place_result = "py-logo-15tiles", + flags = {}, + subgroup = "py-walls", + order = "zz" +} + +RECIPE { + type = "recipe", + name = "py-logo-15tiles", + energy_required = 0.5, + enabled = false, + ingredients = { + {type = "item", name = "py-iron-oxide", amount = 45}, + {type = "item", name = "iron-chest", amount = 1}, + }, + category = "crafting-with-fluid", + results = { + {type = "item", name = "py-logo-15tiles", amount = 1} + } +}:add_unlock("py-asphalt-mk03"):add_ingredient {type = "fluid", name = "flue-gas", amount = 200}:add_ingredient {type = "item", name = "small-parts-01", amount = 10} diff --git a/prototypes/menu-simulations.lua b/prototypes/menu-simulations.lua index e5ced8eb8..f417bb7b6 100644 --- a/prototypes/menu-simulations.lua +++ b/prototypes/menu-simulations.lua @@ -1,7 +1,3 @@ -if not mods["pyindustry"] then - return -end - local menu_simulations = data.raw["utility-constants"]["default"].main_menu_simulations -- do not work diff --git a/prototypes/recipes/advanced-foundry-recipes.lua b/prototypes/recipes/advanced-foundry-recipes.lua index 93394e7ec..6f6644e23 100644 --- a/prototypes/recipes/advanced-foundry-recipes.lua +++ b/prototypes/recipes/advanced-foundry-recipes.lua @@ -21,6 +21,10 @@ RECIPE { order = "a1" }:add_unlock("nexelit") +if mods.pyrawores then + data.raw.recipe["nexelit-plate"] = nil +end + --STEEL PLATE - cant change the base one,so i did that. RECIPE { type = "recipe", diff --git a/prototypes/recipes/coal-processing-recipes.lua b/prototypes/recipes/coal-processing-recipes.lua index 4540ba8d1..8905ce4e5 100644 --- a/prototypes/recipes/coal-processing-recipes.lua +++ b/prototypes/recipes/coal-processing-recipes.lua @@ -6,7 +6,7 @@ RECIPE { enabled = false, energy_required = 45, ingredients = { - {type = "item", name = "ralesia", amount = 10}, + {type = "item", name = "ralesia", amount = 10}, {type = "item", name = "muddy-sludge-barrel", amount = 5} }, results = { @@ -62,6 +62,10 @@ RECIPE { order = "h" }:add_unlock("ralesia") +if mods.pyrawores then + RECIPE("ralesia"):replace_ingredient_unsafe("water", {type = "fluid", name = "hydrogen", amount = 300}) +end + RECIPE { type = "recipe", name = "rich-clay", @@ -163,6 +167,11 @@ RECIPE { order = "n" }:add_unlock("lab-instrument") +if mods.pyrawores then + RECIPE("equipment-chassi"):replace_ingredient_unsafe("copper-plate", "tin-plate") + RECIPE("equipment-chassi"):replace_ingredient_unsafe("iron-plate", "duralumin") +end + RECIPE { type = "recipe", name = "lab-instrument", @@ -203,6 +212,10 @@ RECIPE { order = "f" }:add_unlock("lab-instrument") +if mods.pyrawores then + RECIPE("lens"):remove_ingredient("molten-glass"):add_ingredient_unsafe {type = "fluid", name = "molten-glass", amount = 100, fluidbox_index = 2} +end + RECIPE { type = "recipe", name = "boron-trioxide", @@ -269,7 +282,7 @@ RECIPE { {type = "item", name = "raw-borax", amount = 10} }, results = { - {type = "item", name = "borax", amount = 10}, + {type = "item", name = "borax", amount = 10}, {type = "fluid", name = "muddy-sludge", amount = 100} }, main_product = "borax", @@ -342,6 +355,10 @@ RECIPE { order = "g" }:add_unlock("coal-processing-1") +if mods.pyrawores then + RECIPE("coal-fawogae"):replace_result_unsafe("coal", "raw-coal", 3) +end + RECIPE { type = "recipe", name = "coke-coal", @@ -361,6 +378,10 @@ RECIPE { order = "h" }:add_unlock("coal-processing-1") +if mods.pyrawores then + RECIPE("coke-coal"):replace_ingredient_unsafe("coal", "raw-coal", 10) +end + RECIPE { type = "recipe", name = "stone-distilation", @@ -372,10 +393,10 @@ RECIPE { {type = "fluid", name = "water", amount = 200} }, results = { - {type = "item", name = "tailings-dust", amount = 10}, - {type = "item", name = "coarse", amount = 10}, - {type = "fluid", name = "tar", amount = 100}, - {type = "fluid", name = "tailings", amount = 100} + {type = "item", name = "tailings-dust", amount = 10}, + {type = "item", name = "coarse", amount = 10}, + {type = "fluid", name = "tar", amount = 100}, + {type = "fluid", name = "tailings", amount = 100} }, main_product = "tar", icon = "__pycoalprocessinggraphics__/graphics/icons/tar.png", @@ -519,7 +540,7 @@ RECIPE { main_product = "syngas" }:add_unlock("coal-processing-3") -RECIPE { +local nichrome = RECIPE { type = "recipe", name = "nichrome", category = "hpf", @@ -535,6 +556,11 @@ RECIPE { } }:add_unlock("chromium") +if mods.pyrawores then + RECIPE("nichrome"):replace_ingredient_unsafe("water", {type = "fluid", name = "nitrogen", amount = 100}) + RECIPE("nichrome"):replace_ingredient_unsafe("iron-plate", "nickel-plate") +end + RECIPE { type = "recipe", name = "active-carbon", @@ -552,6 +578,10 @@ RECIPE { } }:add_unlock("filtration") +if mods.pyrawores then + RECIPE("active-carbon"):remove_ingredient("water"):add_ingredient_unsafe {type = "fluid", name = "nitrogen", amount = 50}:add_ingredient_unsafe {type = "item", name = "sodium-hydroxide", amount = 4} +end + RECIPE { type = "recipe", name = "zinc-chloride", @@ -573,6 +603,10 @@ RECIPE { order = "d [syn-gas]" }:add_unlock("filtration") +if mods.pyrawores then + RECIPE("zinc-chloride"):replace_ingredient_unsafe("iron-plate", "zinc-plate"):replace_ingredient_unsafe("water", {type = "fluid", name = "hydrogen-chloride", amount = 20}):remove_ingredient("copper-plate"):add_result {type = "fluid", name = "hydrogen", amount = 20} +end + RECIPE { type = "recipe", name = "tailings-dust", @@ -672,6 +706,10 @@ RECIPE { main_product = "niobium-oxide" }:add_unlock("niobium") +if mods.pyrawores then + RECIPE("niobium-oxide"):replace_ingredient_unsafe("water", {type = "fluid", name = "nitrogen", amount = 250}) +end + RECIPE { type = "recipe", name = "niobium-plate", @@ -688,6 +726,10 @@ RECIPE { main_product = "niobium-plate" }:add_unlock("niobium") +if mods.pyrawores then + RECIPE("niobium-plate"):replace_ingredient_unsafe("coal", "salt").category = "electrolyzer" +end + RECIPE { type = "recipe", name = "log5", @@ -695,8 +737,8 @@ RECIPE { enabled = false, energy_required = 20, ingredients = { - {type = "fluid", name = "muddy-sludge", amount = 500}, - {type = "fluid", name = "carbon-dioxide", amount = 300} + {type = "fluid", name = "muddy-sludge", amount = 500}, + {type = "fluid", name = "carbon-dioxide", amount = 300} }, results = { {type = "item", name = "log", amount = 3} @@ -752,9 +794,9 @@ RECIPE { enabled = false, energy_required = 15, ingredients = { - {type = "fluid", name = "muddy-sludge", amount = 500}, - {type = "item", name = "ash", amount = 30}, - {type = "fluid", name = "carbon-dioxide", amount = 350} + {type = "fluid", name = "muddy-sludge", amount = 500}, + {type = "item", name = "ash", amount = 30}, + {type = "fluid", name = "carbon-dioxide", amount = 350} }, results = { {type = "item", name = "log", amount = 3} @@ -803,6 +845,10 @@ RECIPE { order = "f" }:add_unlock("chromium") +if mods.pyrawores then + RECIPE("richdust-separation"):replace_result_unsafe("chromite-sand", "chromite-sand", 3) +end + RECIPE { type = "recipe", name = "organic-solvent", @@ -909,6 +955,10 @@ RECIPE { order = "a" }:add_unlock("chromium") +if mods.pyrawores then + data.raw.recipe["making-chromium"] = nil +end + RECIPE { type = "recipe", name = "wood-to-coal", @@ -995,6 +1045,11 @@ RECIPE { order = "i" }:add_unlock("advanced-oil-processing") +if mods.pyrawores then + RECIPE("oleochemicals-distilation"):replace_result_unsafe("coal", "raw-coal", 4) + RECIPE("oleochemicals-distilation"):replace_ingredient_unsafe("water", {type = "fluid", name = "oxygen", amount = 400}) +end + RECIPE { type = "recipe", name = "oleo-gasification", @@ -1012,6 +1067,10 @@ RECIPE { }, main_product = "aromatics", }:add_unlock("mukmoux") + +if mods.pyrawores then + RECIPE("oleo-gasification"):replace_ingredient_unsafe("water", {type = "fluid", name = "oxygen", amount = 250}) +end --)) Coal Processing 2 ((-- --(( Coal Processing 3 ))-- diff --git a/prototypes/recipes/fts-reactor-recipes.lua b/prototypes/recipes/fts-reactor-recipes.lua index bedbc3f97..aee9e3d84 100644 --- a/prototypes/recipes/fts-reactor-recipes.lua +++ b/prototypes/recipes/fts-reactor-recipes.lua @@ -88,6 +88,10 @@ RECIPE { order = "h4" }:add_unlock("advanced-oil-processing") +if mods.pyrawores then + RECIPE("ref-to-light-oil"):add_ingredient_unsafe {type = "fluid", name = "hydrogen", amount = 250} +end + RECIPE { type = "recipe", name = "sulfuric-petgas", diff --git a/prototypes/recipes/mukmoux-recipes.lua b/prototypes/recipes/mukmoux-recipes.lua index 81a0b2260..fd6978855 100644 --- a/prototypes/recipes/mukmoux-recipes.lua +++ b/prototypes/recipes/mukmoux-recipes.lua @@ -58,3 +58,7 @@ RECIPE { subgroup = "py-fluid-handling", order = "c" }:add_unlock("mukmoux") + +if mods.pyrawores then + RECIPE("dedicated-oleochemicals"):replace_ingredient_unsafe("chromium", "titanium-plate") +end diff --git a/prototypes/recipes/olefin-plant-recipes.lua b/prototypes/recipes/olefin-plant-recipes.lua index a9b81ea25..67940604a 100644 --- a/prototypes/recipes/olefin-plant-recipes.lua +++ b/prototypes/recipes/olefin-plant-recipes.lua @@ -42,6 +42,10 @@ RECIPE { order = "d4" }:add_unlock("fuel-production") +if mods.pyrawores then + RECIPE("olefin"):replace_ingredient_unsafe("water", {type = "fluid", name = "hydrogen", amount = 400}) +end + RECIPE { type = "recipe", name = "olefin-petgas", diff --git a/prototypes/recipes/recipes.lua b/prototypes/recipes/recipes.lua index 9efa9ac04..3515954a9 100644 --- a/prototypes/recipes/recipes.lua +++ b/prototypes/recipes/recipes.lua @@ -50,7 +50,7 @@ RECIPE { {type = "fluid", name = "water", amount = 600} }, results = { - {type = "item", name = "sand", amount = 10}, + {type = "item", name = "sand", amount = 10}, {type = "fluid", name = "muddy-sludge", amount = 100} }, main_product = "sand", @@ -89,7 +89,7 @@ RECIPE { {type = "fluid", name = "water", amount = 200} }, results = { - {type = "item", name = "pure-sand", amount = 8}, + {type = "item", name = "pure-sand", amount = 8}, {type = "fluid", name = "muddy-sludge", amount = 80} }, main_product = "pure-sand", @@ -138,6 +138,10 @@ RECIPE { order = "f" } +if mods.pyrawores then + RECIPE("flask"):remove_ingredient("molten-glass"):add_ingredient_unsafe {type = "fluid", name = "molten-glass", amount = 200, fluidbox_index = 2} +end + RECIPE { type = "recipe", name = "automation-science-pack", @@ -255,7 +259,7 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "biofilm", amount = 1}, + {type = "item", name = "biofilm", amount = 1}, {type = "fluid", name = "tailings", amount = 200} }, results = { @@ -386,6 +390,11 @@ RECIPE { }, }:add_unlock("battery") +if mods.pyrawores then + RECIPE("nas-battery"):replace_ingredient_unsafe("copper-ore", "sodium-hydroxide") + RECIPE("nas-battery"):add_ingredient_unsafe {type = "item", name = "lead-plate", amount = 6} +end + RECIPE { type = "recipe", name = "fluegas-filtration", @@ -454,6 +463,11 @@ RECIPE { main_product = "glass-core" }:add_unlock("fine-electronics") +if mods.pyrawores then + RECIPE("glass-core"):remove_ingredient("molten-glass"):add_ingredient_unsafe {type = "fluid", name = "molten-glass", amount = 100, fluidbox_index = 2} + RECIPE("glass-core"):replace_ingredient_unsafe("steel-plate", "silver-plate") +end + RECIPE { type = "recipe", name = "cladding", @@ -470,6 +484,10 @@ RECIPE { main_product = "cladding" }:add_unlock("fine-electronics") +if mods.pyrawores then + RECIPE("cladding"):remove_ingredient("molten-glass"):add_ingredient_unsafe {type = "item", name = "glass", amount = 5} +end + RECIPE { type = "recipe", name = "ppd", @@ -486,6 +504,10 @@ RECIPE { main_product = "ppd" }:add_unlock("kevlar") +if mods.pyrawores then + RECIPE("ppd"):replace_ingredient_unsafe("water", {type = "fluid", name = "hydrogen", amount = 500}):add_ingredient_unsafe {type = "fluid", name = "chlorine", amount = 400}.category = "electrolyzer" +end + RECIPE { type = "recipe", name = "kevlar", @@ -535,6 +557,10 @@ RECIPE { main_product = "nbfe-alloy" }:add_unlock("niobium") +if mods.pyrawores then + RECIPE("nbfe-alloy").category = "py-rawores-smelter" +end + RECIPE { type = "recipe", name = "nbfe-coating", @@ -567,6 +593,10 @@ RECIPE { main_product = "cladded-core" }:add_unlock("fine-electronics") +if mods.pyrawores then + RECIPE("cladded-core"):add_ingredient_unsafe {type = "item", name = "aramid", amount = 1} +end + RECIPE { type = "recipe", name = "copper-coating", @@ -584,6 +614,11 @@ RECIPE { main_product = "copper-coating" }:add_unlock("fine-electronics") +if mods.pyrawores then + RECIPE("copper-coating").category = "electrolyzer" + RECIPE("copper-coating"):replace_ingredient_unsafe("organic-solvent", {type = "fluid", name = "water-saline", amount = 100}) +end + RECIPE { type = "recipe", name = "optical-fiber", @@ -600,6 +635,10 @@ RECIPE { main_product = "optical-fiber" }:add_unlock("fine-electronics") +if mods.pyrawores then + RECIPE("optical-fiber"):remove_ingredient("plastic-bar"):add_ingredient {type = "item", name = "plastic-bar", amount = 5} +end + RECIPE { type = "recipe", name = "biofilm", @@ -634,6 +673,10 @@ RECIPE { main_product = "filtration-media", }:add_unlock("advanced-oil-processing") +if mods.pyrawores then + RECIPE("filtration-media"):add_ingredient_unsafe {type = "item", name = "glass", amount = 6} +end + RECIPE { type = "recipe", name = "nexelit-ore-1", diff --git a/prototypes/recipes/seperation-recipes.lua b/prototypes/recipes/seperation-recipes.lua index 7d0eb2658..13d80f00f 100644 --- a/prototypes/recipes/seperation-recipes.lua +++ b/prototypes/recipes/seperation-recipes.lua @@ -61,6 +61,11 @@ RECIPE { order = "c" }:add_unlock("separation") +if mods.pyrawores then + RECIPE("tailings-classification"):replace_ingredient_unsafe("copper-ore", "ore-lead") + RECIPE("tailings-classification"):replace_ingredient_unsafe("iron-ore", "ore-tin") +end + RECIPE { type = "recipe", name = "co2-organics", diff --git a/prototypes/tiles/py-iron-oxide.lua b/prototypes/tiles/py-iron-oxide.lua new file mode 100644 index 000000000..408c649e7 --- /dev/null +++ b/prototypes/tiles/py-iron-oxide.lua @@ -0,0 +1,75 @@ +RECIPE { + type = "recipe", + name = "py-iron-oxide", + category = "hpf", + enabled = false, + ingredients = { + {type = "item", name = "iron-oxide", amount = 4}, + {type = "item", name = "pipe", amount = 1}, + {type = "fluid", name = "muddy-sludge", amount = 20} + }, + results = { + {type = "item", name = "py-iron-oxide", amount = 2} + }, + requester_paste_multiplier = 4, + energy_required = 3 +}:add_unlock("py-asphalt") + +ITEM { + type = "item", + name = "py-iron-oxide", + icon = "__pyindustrygraphics__/graphics/icons/py-iron-oxide.png", + icon_size = 64, + flags = {}, + subgroup = "py-tiles", + order = "a-iron-oxide", + stack_size = 1000, + place_as_tile = {result = "py-iron-oxide", condition_size = 1, condition = {layers = {water_tile = true}}} +} + +TILE { + type = "tile", + name = "py-iron-oxide", + needs_correction = false, + minable = {mining_time = 0.1, result = "py-iron-oxide"}, + mined_sound = {filename = "__base__/sound/deconstruct-bricks.ogg"}, + collision_mask = {layers = {ground_tile = true}}, + walking_speed_modifier = 3.5, + decorative_removal_probability = 1, + layer = 76, + layer_group = "ground-artificial", + walking_sound = { + { + filename = "__pyindustrygraphics__/sounds/iron-foot-01.ogg", + volume = 0.3, + speed = 1.2 + }, + { + filename = "__pyindustrygraphics__/sounds/iron-foot-02.ogg", + volume = 0.3, + speed = 1.2 + }, + { + filename = "__pyindustrygraphics__/sounds/iron-foot-03.ogg", + volume = 0.3, + speed = 1.2 + }, + { + filename = "__pyindustrygraphics__/sounds/iron-foot-04.ogg", + volume = 0.3, + speed = 1.2 + } + }, + map_color = {r = 87, g = 33, b = 3, a = 1}, + absorptions_per_second = {pollution = 0}, + vehicle_friction_modifier = 0.75, + variants = { + transition = table.deepcopy(TILE("concrete").variants.transition), + material_background = + { + picture = "__pyindustrygraphics__/graphics/tiles/py-iron-oxide/py-iron-oxide.png", + count = 2, + scale = 0.5 + } + } +} diff --git a/prototypes/tiles/py-nexelit.lua b/prototypes/tiles/py-nexelit.lua new file mode 100644 index 000000000..7407f8b54 --- /dev/null +++ b/prototypes/tiles/py-nexelit.lua @@ -0,0 +1,54 @@ +RECIPE { + type = "recipe", + name = "py-nexelit", + category = mods.pyhightech and "pcb" or "hpf", + enabled = false, + ingredients = { + {type = "item", name = "nexelit-plate", amount = 1}, + mods.pyhightech and {type = "item", name = "resistor1", amount = 1} or {type = "item", name = "gravel", amount = 2}, + {type = "fluid", name = "tar", amount = 20} + }, + results = { + {type = "item", name = "py-nexelit", amount = 2} + }, + requester_paste_multiplier = 4, + energy_required = 3 +}:add_unlock("py-asphalt-mk02", "nexelit-mk02") + +ITEM { + type = "item", + name = "py-nexelit", + icon = "__pyindustrygraphics__/graphics/icons/py-nexelit.png", + icon_size = 64, + flags = {}, + subgroup = "py-tiles", + order = "a-nexelit", + stack_size = 1000, + place_as_tile = {result = "py-nexelit", condition_size = 1, condition = {layers = {water_tile = true}}} +} + +TILE { + type = "tile", + name = "py-nexelit", + needs_correction = false, + minable = {mining_time = 0.1, result = "py-nexelit"}, + mined_sound = {filename = "__base__/sound/deconstruct-bricks.ogg"}, + collision_mask = {layers = {ground_tile = true}}, + walking_speed_modifier = 3.5, + decorative_removal_probability = 1, + layer = 75, + layer_group = "ground-artificial", + walking_sound = table.deepcopy(data.raw.tile["grass-1"].walking_sound), + map_color = {r = 0, g = 110, b = 255, a = 1}, + absorptions_per_second = {pollution = 0}, + vehicle_friction_modifier = 0.6, + variants = { + transition = table.deepcopy(TILE("concrete").variants.transition), + material_background = + { + picture = "__pyindustrygraphics__/graphics/tiles/py-nexelit/py-nexelit.png", + count = 2, + scale = 0.5 + } + } +} diff --git a/prototypes/updates/base-oil.lua b/prototypes/updates/base-oil.lua index 328940dd1..e2c97ced3 100644 --- a/prototypes/updates/base-oil.lua +++ b/prototypes/updates/base-oil.lua @@ -37,7 +37,7 @@ RECIPE("sulfur"):remove_unlock("sulfur-processing"):set_fields {hidden = true} ITEM("solid-fuel"):set_fields {hidden = true} -if not (mods["pyhightech"] or mods["pypetroleumhandling"] or mods["pyrawores"]) then +if not (mods["pyrawores"]) then TECHNOLOGY("sulfur-processing"):add_pack("chemical-science-pack") TECHNOLOGY("battery"):add_pack("chemical-science-pack") TECHNOLOGY("battery-equipment"):add_pack("chemical-science-pack") diff --git a/prototypes/updates/base-updates.lua b/prototypes/updates/base-updates.lua index e945f0292..548a6a9cf 100644 --- a/prototypes/updates/base-updates.lua +++ b/prototypes/updates/base-updates.lua @@ -51,7 +51,7 @@ TECHNOLOGY("braking-force-7"):add_pack("military-science-pack") TECHNOLOGY("power-armor-mk2"):add_pack("production-science-pack") TECHNOLOGY("rocket-silo"):add_pack("military-science-pack") TECHNOLOGY("research-speed-6"):add_pack("military-science-pack") -TECHNOLOGY("logistic-system"):add_pack("military-science-pack"):add_pack("production-science-pack") +--TECHNOLOGY("logistic-system"):add_pack("military-science-pack"):add_pack("production-science-pack") TECHNOLOGY("worker-robots-speed-5"):add_pack("military-science-pack") TECHNOLOGY("worker-robots-speed-6"):add_pack("military-science-pack").unit.count_formula = "1.5^(L-6)*1000" TECHNOLOGY("worker-robots-storage-3"):add_pack("military-science-pack") diff --git a/prototypes/updates/pyindustry-updates.lua b/prototypes/updates/pyindustry-updates.lua index feca2568b..3a954f64b 100644 --- a/prototypes/updates/pyindustry-updates.lua +++ b/prototypes/updates/pyindustry-updates.lua @@ -1,30 +1,4 @@ -ITEM { - name = "py-logo-15tiles", - type = "item", - stack_size = 10, - icon = "__pycoalprocessinggraphics__/graphics/icons/py-logo-15tiles.png", - icon_size = 64, - place_result = "py-logo-15tiles", - flags = {}, - subgroup = "py-walls", - order = "zz" -} - -RECIPE { - type = "recipe", - name = "py-logo-15tiles", - energy_required = 0.5, - enabled = false, - ingredients = { - {type = "item", name = "py-iron-oxide", amount = 45}, - {type = "item", name = "iron-chest", amount = 1}, - }, - category = "crafting-with-fluid", - results = { - {type = "item", name = "py-logo-15tiles", amount = 1} - } -}:add_unlock("py-asphalt-mk03"):add_ingredient {type = "fluid", name = "flue-gas", amount = 200}:add_ingredient {type = "item", name = "small-parts-01", amount = 10} - -data.raw["container"]["py-logo-15tiles"].minable.result = "py-logo-15tiles" -RECIPE("niobium-pipe"):remove_unlock("py-storage-tanks"):add_unlock("niobium") -RECIPE("niobium-pipe-to-ground"):remove_unlock("py-storage-tanks"):add_unlock("niobium") +--DEPRECIATED-- +if mods["pycoalprocessing"] then + TECHNOLOGY("railway"):add_prereq("wood-processing"):remove_prereq("steel-processing") +end diff --git a/scripts/generator-equipment-autofill.lua b/scripts/generator-equipment-autofill.lua index 787ac6012..842a2752c 100644 --- a/scripts/generator-equipment-autofill.lua +++ b/scripts/generator-equipment-autofill.lua @@ -54,13 +54,13 @@ local function restock_generator_equipment(player) local burner_data = burners[index] if burner_data.fuel_categories[prototypes.item[item_stack.name].fuel_category] then local item_stack_size = prototypes.item[item_stack.name].stack_size - local inserted_count = burner_data.burner_inventory.insert{ - name = item_stack.name, - quality = item_stack.quality, - count = math.min(item_stack.count, item_stack_size) - } + local inserted_count = burner_data.burner_inventory.insert { + name = item_stack.name, + quality = item_stack.quality, + count = math.min(item_stack.count, item_stack_size) + } if inserted_count ~= 0 then -- if items were inserted then remove them from the player's inventory - inventory.remove{ + inventory.remove { name = item_stack.name, quality = item_stack.quality, count = inserted_count @@ -110,7 +110,6 @@ local function restock_generator_equipment(player) end py.register_on_nth_tick(251, "generator-equipment-autofill", "pycp", function() - if not script.active_mods["pyindustry"] then return end for _, player in pairs(game.connected_players) do restock_generator_equipment(player) end