diff --git a/changelog.txt b/changelog.txt index 4e0cc74..c667f85 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,8 @@ --------------------------------------------------------------------------------------------------- -Version: 3.0.17 +Version: 4.0.0 Date: ??? Changes: + - Linearilized Dependencies. - Remade tech tree with autotech 2.0. Science pack cost comparasion: - automation: n/a -> trigger - py1: 100 -> 100 diff --git a/data-updates.lua b/data-updates.lua index 8475212..6057606 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -1,3 +1,7 @@ +if not mods["pyalienlife"] then + table.insert(data.raw["assembling-machine"]["crash-site-assembling-machine-1-repaired"].minable.results, {type = "item", name = "duralumin", amount = 50}) +end + require "prototypes/updates/base-updates" require "prototypes/updates/pycoalprocessing-updates" require "prototypes/updates/pyfusionenergy-updates" diff --git a/data.lua b/data.lua index 8cd9114..b22edda 100644 --- a/data.lua +++ b/data.lua @@ -64,6 +64,7 @@ require "prototypes/ore/rare-earth-bolide" --(( RECIPES ))-- require "prototypes/recipes/recipes" require "prototypes/recipes/recipes-particle" +require "prototypes/recipes/pyrawores-recipes" --(( ITEMS ))-- require "prototypes/items/items" diff --git a/info.json b/info.json index 7ecd8c7..ab89c27 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyhightech", - "version": "3.0.16", + "version": "4.0.0", "factorio_version": "2.0", "title": "Pyanodons HighTech", "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232", @@ -9,10 +9,8 @@ "description": "Rebuilds the entire circuits and high tech production chain. Uncover technological secrets that perhaps should have been left in science fiction.", "dependencies": [ "base >= 2.0.48", - "pyfusionenergy >= 2.0.5", - "~ pyhightechgraphics >= 3.0.2", - "pyindustry >= 1.5.3", - "? pyrawores" + "pyrawores >= 4.0.0", + "~ pyhightechgraphics >= 3.0.2" ], "package": { "ignore": [], @@ -23,4 +21,4 @@ "spoiling_required": false, "freezing_required": false, "segmented_units_required": false -} \ No newline at end of file +} diff --git a/prototypes/buildings/chipshooter-mk02.lua b/prototypes/buildings/chipshooter-mk02.lua index 369b4ec..3ff6f03 100644 --- a/prototypes/buildings/chipshooter-mk02.lua +++ b/prototypes/buildings/chipshooter-mk02.lua @@ -8,7 +8,8 @@ RECIPE { {type = "item", name = "engine-unit", amount = 4}, {type = "item", name = "nexelit-plate", amount = 20}, {type = "item", name = "advanced-circuit", amount = 15}, - {type = "item", name = "chipshooter-mk01", amount = 1} + {type = "item", name = "chipshooter-mk01", amount = 1}, + {type = "item", name = "glass", amount = 40} }, results = { {type = "item", name = "chipshooter-mk02", amount = 1} diff --git a/prototypes/buildings/electronics-factory-mk02.lua b/prototypes/buildings/electronics-factory-mk02.lua index 27e9ad1..da28943 100644 --- a/prototypes/buildings/electronics-factory-mk02.lua +++ b/prototypes/buildings/electronics-factory-mk02.lua @@ -9,7 +9,8 @@ RECIPE { {type = "item", name = "plastic-bar", amount = 40}, {type = "item", name = "niobium-plate", amount = 20}, {type = "item", name = "engine-unit", amount = 10}, - {type = "item", name = "steel-plate", amount = 40} + {type = "item", name = "steel-plate", amount = 40}, + {type = "item", name = "glass", amount = 40} }, results = { {type = "item", name = "electronics-factory-mk02", amount = 1} diff --git a/prototypes/buildings/ht-locomotive/ht-generic-fluid-wagon.lua b/prototypes/buildings/ht-locomotive/ht-generic-fluid-wagon.lua index 0e97564..49b927d 100644 --- a/prototypes/buildings/ht-locomotive/ht-generic-fluid-wagon.lua +++ b/prototypes/buildings/ht-locomotive/ht-generic-fluid-wagon.lua @@ -6,12 +6,14 @@ RECIPE { energy_required = 0.5, enabled = false, ingredients = { - {type = "item", name = "steel-plate", amount = 50}, + {type = "item", name = "aluminium-plate", amount = 50}, {type = "item", name = "plastic-bar", amount = 50}, {type = "item", name = "nbfe-alloy", amount = 20}, {type = "item", name = "nexelit-plate", amount = 30}, {type = "item", name = "iron-gear-wheel", amount = 100}, {type = "item", name = "nichrome", amount = 15}, + {type = "item", name = "glass", amount = 20}, + {type = "item", name = "nickel-plate", amount = 10} }, results = { {type = "item", name = "ht-generic-fluid-wagon", amount = 1} diff --git a/prototypes/buildings/ht-locomotive/ht-generic-wagon.lua b/prototypes/buildings/ht-locomotive/ht-generic-wagon.lua index 36bb14c..5eda9a2 100644 --- a/prototypes/buildings/ht-locomotive/ht-generic-wagon.lua +++ b/prototypes/buildings/ht-locomotive/ht-generic-wagon.lua @@ -6,12 +6,14 @@ RECIPE { energy_required = 0.5, enabled = false, ingredients = { - {type = "item", name = "steel-plate", amount = 50}, + {type = "item", name = "aluminium-plate", amount = 50}, {type = "item", name = "plastic-bar", amount = 50}, {type = "item", name = "nbfe-alloy", amount = 20}, {type = "item", name = "nexelit-plate", amount = 30}, {type = "item", name = "iron-gear-wheel", amount = 100}, {type = "item", name = "nichrome", amount = 15}, + {type = "item", name = "glass", amount = 20}, + {type = "item", name = "nickel-plate", amount = 10} }, results = { {type = "item", name = "ht-generic-wagon", amount = 1} diff --git a/prototypes/buildings/ht-locomotive/ht-locomotive.lua b/prototypes/buildings/ht-locomotive/ht-locomotive.lua index 09549f7..9c0a435 100644 --- a/prototypes/buildings/ht-locomotive/ht-locomotive.lua +++ b/prototypes/buildings/ht-locomotive/ht-locomotive.lua @@ -6,7 +6,7 @@ RECIPE { energy_required = 0.5, enabled = false, ingredients = { - {type = "item", name = "steel-plate", amount = 60}, + {type = "item", name = "aluminium-plate", amount = 60}, {type = "item", name = "evaporator", amount = 1}, {type = "item", name = "plastic-bar", amount = 100}, {type = "item", name = "advanced-circuit", amount = 20}, @@ -15,6 +15,8 @@ RECIPE { {type = "item", name = "iron-gear-wheel", amount = 100}, {type = "item", name = "nichrome", amount = 10}, {type = "item", name = "electric-engine-unit", amount = 6}, + {type = "item", name = "glass", amount = 60}, + {type = "item", name = "nickel-plate", amount = 50} }, results = { {type = "item", name = "ht-locomotive", amount = 1} diff --git a/prototypes/buildings/kicalk-plantation.lua b/prototypes/buildings/kicalk-plantation.lua index 46ead8e..74dd18e 100644 --- a/prototypes/buildings/kicalk-plantation.lua +++ b/prototypes/buildings/kicalk-plantation.lua @@ -14,7 +14,7 @@ RECIPE { enabled = false, ingredients = { {type = "item", name = "botanical-nursery", amount = 2}, - {type = "item", name = "storage-tank", amount = 1}, --replace py-tank-5 + {type = "item", name = "py-tank-5", amount = 1}, --replace py-tank-5 {type = "item", name = "classifier", amount = 1}, }, diff --git a/prototypes/buildings/moondrop-greenhouse-mk01.lua b/prototypes/buildings/moondrop-greenhouse-mk01.lua index 8387455..44ef100 100644 --- a/prototypes/buildings/moondrop-greenhouse-mk01.lua +++ b/prototypes/buildings/moondrop-greenhouse-mk01.lua @@ -8,6 +8,7 @@ RECIPE { {type = "item", name = "pipe", amount = 15}, {type = "item", name = "iron-plate", amount = 100}, {type = "item", name = "iron-gear-wheel", amount = 40}, + {type = "item", name = "glass", amount = 40}, }, results = { {type = "item", name = "moondrop-greenhouse-mk01", amount = 1} diff --git a/prototypes/buildings/nano-assembler-mk01.lua b/prototypes/buildings/nano-assembler-mk01.lua index 01495c7..48a348a 100644 --- a/prototypes/buildings/nano-assembler-mk01.lua +++ b/prototypes/buildings/nano-assembler-mk01.lua @@ -12,6 +12,7 @@ RECIPE { {type = "item", name = "advanced-circuit", amount = 10}, {type = "item", name = "iron-gear-wheel", amount = 30}, {type = "item", name = "steam-engine", amount = 3}, + {type = "item", name = "glass", amount = 40}, }, results = { {type = "item", name = "nano-assembler-mk01", amount = 1} diff --git a/prototypes/buildings/nano-assembler-mk02.lua b/prototypes/buildings/nano-assembler-mk02.lua index 3a2718d..73ce133 100644 --- a/prototypes/buildings/nano-assembler-mk02.lua +++ b/prototypes/buildings/nano-assembler-mk02.lua @@ -10,6 +10,7 @@ RECIPE { {type = "item", name = "engine-unit", amount = 4}, {type = "item", name = "niobium-plate", amount = 10}, {type = "item", name = "low-density-structure", amount = 15}, + {type = "item", name = "glass", amount = 40} }, results = { {type = "item", name = "nano-assembler-mk02", amount = 1} diff --git a/prototypes/buildings/pulp-mill-mk03.lua b/prototypes/buildings/pulp-mill-mk03.lua index 56df221..0ab5ea9 100644 --- a/prototypes/buildings/pulp-mill-mk03.lua +++ b/prototypes/buildings/pulp-mill-mk03.lua @@ -25,7 +25,7 @@ RECIPE { {type = "item", name = "pulp-mill-mk02", amount = 1}, {type = "item", name = "graphene-roll", amount = 20}, {type = "item", name = "processing-unit", amount = 10}, - {type = "item", name = "pipe", amount = 20}, + {type = "item", name = "niobium-pipe", amount = 20}, {type = "item", name = "low-density-structure", amount = 15}, {type = "item", name = "electric-engine-unit", amount = 10}, }, diff --git a/prototypes/fluids/acrolein.lua b/prototypes/fluids/acrolein.lua index 8dbb74d..dbc91f8 100644 --- a/prototypes/fluids/acrolein.lua +++ b/prototypes/fluids/acrolein.lua @@ -6,6 +6,7 @@ RECIPE { energy_required = 15, ingredients = { {type = "fluid", name = "glycerol", amount = 80}, + {type = "fluid", name = "oxygen", amount = 80}, }, results = { {type = "fluid", name = "acrolein", amount = 50} diff --git a/prototypes/fluids/chloromethane.lua b/prototypes/fluids/chloromethane.lua index 4a6eb42..240ba9a 100644 --- a/prototypes/fluids/chloromethane.lua +++ b/prototypes/fluids/chloromethane.lua @@ -5,8 +5,8 @@ RECIPE { enabled = false, energy_required = 10, ingredients = { - {type = "fluid", name = "methanol", amount = 100}, - {type = "fluid", name = "sulfuric-acid", amount = 50}, + {type = "fluid", name = "methanol", amount = 100}, + {type = "fluid", name = "hydrogen-chloride", amount = 50}, }, results = { {type = "fluid", name = "chloromethane", amount = 30} diff --git a/prototypes/fluids/dimethyldichlorosilane.lua b/prototypes/fluids/dimethyldichlorosilane.lua index bafd5c0..f1a5b1b 100644 --- a/prototypes/fluids/dimethyldichlorosilane.lua +++ b/prototypes/fluids/dimethyldichlorosilane.lua @@ -7,7 +7,7 @@ RECIPE { ingredients = { {type = "fluid", name = "chloromethane", amount = 100}, {type = "item", name = "silicon", amount = 5}, - {type = "item", name = "crushed-copper", amount = 10}, + {type = "item", name = "grade-4-copper", amount = 10}, }, results = { {type = "fluid", name = "dimethyldichlorosilane", amount = 50} diff --git a/prototypes/fluids/ech.lua b/prototypes/fluids/ech.lua index d281561..3e0d07c 100644 --- a/prototypes/fluids/ech.lua +++ b/prototypes/fluids/ech.lua @@ -5,8 +5,9 @@ RECIPE { enabled = false, energy_required = 10, ingredients = { - {type = "fluid", name = "oleochemicals", amount = 10}, - {type = "fluid", name = "glycerol", amount = 30}, + {type = "fluid", name = "oleochemicals", amount = 10}, + {type = "fluid", name = "glycerol", amount = 30}, + {type = "fluid", name = "hydrogen-chloride", amount = 150}, }, results = { {type = "fluid", name = "ech", amount = 30} diff --git a/prototypes/fluids/msa.lua b/prototypes/fluids/msa.lua index 3ff91e7..6a31359 100644 --- a/prototypes/fluids/msa.lua +++ b/prototypes/fluids/msa.lua @@ -5,9 +5,9 @@ RECIPE { enabled = false, energy_required = 6, ingredients = { - {type = "fluid", name = "dms", amount = 50}, - {type = "fluid", name = "hydrogen-peroxide", amount = 100}, - {type = "fluid", name = "industrial-solvent", amount = 100}, + {type = "fluid", name = "dms", amount = 50}, + {type = "fluid", name = "hydrogen-peroxide", amount = 100}, + {type = "fluid", name = "chlorine", amount = 100}, }, results = { {type = "fluid", name = "msa", amount = 100} diff --git a/prototypes/fluids/propene.lua b/prototypes/fluids/propene.lua index b4eaf7a..bee31fb 100644 --- a/prototypes/fluids/propene.lua +++ b/prototypes/fluids/propene.lua @@ -7,7 +7,7 @@ RECIPE { ingredients = { {type = "fluid", name = "syngas", amount = 60}, {type = "fluid", name = "steam", amount = 200}, - {type = "item", name = "iron-plate", amount = 4} + {type = "item", name = "lead-plate", amount = 4} }, results = { {type = "fluid", name = "propene", amount = 60}, diff --git a/prototypes/item-groups.lua b/prototypes/item-groups.lua index 803f599..4608845 100644 --- a/prototypes/item-groups.lua +++ b/prototypes/item-groups.lua @@ -137,13 +137,13 @@ data:extend { }, } -if not mods["pyindustry"] then - data:extend { - { - type = "item-subgroup", - name = "py-trains", - group = "py-hightech", - order = "u" - } - } -end +-- if not mods["pyindustry"] then +-- data:extend { +-- { +-- type = "item-subgroup", +-- name = "py-trains", +-- group = "py-hightech", +-- order = "u" +-- } +-- } +-- end diff --git a/prototypes/recipes/pyrawores-recipes.lua b/prototypes/recipes/pyrawores-recipes.lua new file mode 100644 index 0000000..e9fa9c5 --- /dev/null +++ b/prototypes/recipes/pyrawores-recipes.lua @@ -0,0 +1,551 @@ +--copied from pyrawores/prototypes/recipes/pyhightech-recipes.lua + +RECIPE { + type = "recipe", + name = "hydrogen-chloride-2", + category = "mixer", --pyfe mixer + enabled = false, + energy_required = 2, + ingredients = { + {type = "fluid", name = "phosphine-gas", amount = 5}, + {type = "fluid", name = "water-saline", amount = 100} + }, + results = { + {type = "fluid", name = "hydrogen-chloride", amount = 40}, + {type = "fluid", name = "phosphoric-acid", amount = 15}, + {type = "fluid", name = "oxygen", amount = 20} + }, + main_product = "hydrogen-chloride", + icon = "__pyraworesgraphics__/graphics/icons/hydrogen-chloride.png", + icon_size = 32, + subgroup = "py-rawores-fluids", + order = "cab" +}:add_unlock("additives") + +RECIPE { + type = "recipe", + name = "fiberboard-mk02", + category = "pulp", + enabled = false, + energy_required = 5, + ingredients = { + {type = "item", name = "treated-wood", amount = 3}, + {type = "item", name = "raw-fiber", amount = 5}, + {type = "item", name = "sodium-sulfate", amount = 1}, + {type = "item", name = "sodium-hydroxide", amount = 5}, + {type = "fluid", name = "steam", amount = 500} + }, + results = { + {type = "item", name = "fiberboard", amount = 8} + }, + main_product = "fiberboard" +} + +RECIPE { + type = "recipe", + name = "fiberboard-3", + category = "pulp", + enabled = false, + energy_required = 5, + ingredients = { + {type = "item", name = "treated-wood", amount = 5}, + {type = "item", name = "fiber", amount = 5}, + {type = "item", name = "sodium-sulfate", amount = 1}, + {type = "item", name = "sodium-hydroxide", amount = 5}, + {type = "fluid", name = "steam", amount = 500}, + {type = "fluid", name = "anthraquinone", amount = 50}, + }, + results = { + {type = "item", name = "fiberboard", amount = 12}, + }, +} + +RECIPE { + type = "recipe", + name = "biofilm-pyht", + category = "nano", + enabled = false, + energy_required = 3, + ingredients = { + {type = "item", name = "sub-denier-microfiber", amount = 1}, + {type = "item", name = "resilin", amount = 1}, + {type = "fluid", name = "nitrogen", amount = 500} + }, + results = { + {type = "item", name = "biofilm", amount = 15} + }, + main_product = "biofilm" +} + +RECIPE { + type = "recipe", + name = "xylenol-3", + category = "mixer", + enabled = false, + energy_required = 3, + ingredients = { + {type = "fluid", name = "benzene", amount = 50}, + {type = "fluid", name = "aromatics", amount = 100} + }, + results = { + {type = "fluid", name = "xylenol", amount = 50} + }, + main_product = "xylenol", + subgroup = "py-rawores-fluids", + order = "q-1" +}:add_unlock("additives") + +RECIPE { + type = "recipe", + name = "ammonium-chloride-2", + category = "fbreactor", + enabled = false, + energy_required = 2, + ingredients = { + {type = "fluid", name = "hydrogen-chloride", amount = 100}, + {type = "fluid", name = "ammonia", amount = 100} + }, + results = { + {type = "item", name = "ammonium-chloride", amount = 5} + }, + main_product = "ammonium-chloride", + icon = "__pyraworesgraphics__/graphics/icons/ammonium-chloride.png", + icon_size = 32, + subgroup = "py-rawores-items", + order = "q-2" +}:add_unlock("additives") + +RECIPE { + type = "recipe", + name = "ammonia2", + category = "chemistry", + enabled = false, + energy_required = 10, + ingredients = { + {type = "fluid", name = "nitrogen", amount = 100}, + {type = "fluid", name = "hydrogen", amount = 300}, + {type = "item", name = "chromium", amount = 1}, + }, + results = { + {type = "fluid", name = "ammonia", amount = 100} + } +}:add_unlock("advanced-circuit") + +RECIPE { + type = "recipe", + name = "pa-oxygen", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "item", name = "graphite", amount = 5}, + {type = "item", name = "proton-donor", amount = 2} + }, + results = { + {type = "fluid", name = "oxygen", amount = 5000}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "oxygen", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyraworesgraphics__/graphics/icons/oxygen.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-helium", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "fluid", name = "hydrogen", amount = 1000}, + {type = "item", name = "proton-donor", amount = 20} + }, + results = { + {type = "fluid", name = "helium", amount = 80}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "helium", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyfusionenergygraphics__/graphics/icons/helium.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-hydrogen", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "fluid", name = "helium", amount = 100}, + {type = "item", name = "proton-receiver", amount = 4} + }, + results = { + {type = "fluid", name = "hydrogen", amount = 2000}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "hydrogen", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyraworesgraphics__/graphics/icons/hydrogen.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-boron", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "item", name = "carbon-dust", amount = 5}, + {type = "item", name = "proton-receiver", amount = 2} + }, + results = { + {type = "item", name = "boron", amount = 10}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "boron", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyfusionenergygraphics__/graphics/icons/boron.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-coal2", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "fluid", name = "nitrogen", amount = 1000}, + {type = "item", name = "proton-receiver", amount = 2} + }, + results = { + {type = "item", name = "coal", amount = 200}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "coal", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__base__/graphics/icons/coal.png", icon_size = 64, scale = 0.25} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-aluminium", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "item", name = "silicon", amount = 10}, + {type = "item", name = "proton-receiver", amount = 1} + }, + results = { + {type = "item", name = "aluminium-plate", amount = 10}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "aluminium-plate", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyraworesgraphics__/graphics/icons/aluminium-plate.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-nickel", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "item", name = "copper-plate", amount = 10}, + {type = "item", name = "proton-receiver", amount = 1} + }, + results = { + {type = "item", name = "nickel-plate", amount = 20}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "nickel-plate", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyraworesgraphics__/graphics/icons/nickel-plate.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-zinc", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "item", name = "copper-plate", amount = 10}, + {type = "item", name = "proton-donor", amount = 1} + }, + results = { + {type = "item", name = "zinc-plate", amount = 20}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "zinc-plate", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyraworesgraphics__/graphics/icons/zinc-plate.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-silver", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "item", name = "copper-plate", amount = 10}, + {type = "item", name = "proton-donor", amount = 2} + }, + results = { + {type = "item", name = "silver-plate", amount = 20}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "silver-plate", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyraworesgraphics__/graphics/icons/silver-plate.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-gold", + category = "pa", + enabled = false, + energy_required = 15, + ingredients = { + {type = "item", name = "lead-plate", amount = 10}, + {type = "item", name = "proton-receiver", amount = 4} + }, + results = { + {type = "item", name = "gold-plate", amount = 10}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "gold-plate", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyraworesgraphics__/graphics/icons/gold-plate.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "pa-vanadium2", + category = "pa", + enabled = false, + energy_required = 45, + ingredients = { + {type = "item", name = "titanium-plate", amount = 10}, + {type = "item", name = "proton-donor", amount = 2} + }, + results = { + {type = "item", name = "vanadium-oxide", amount = 10}, + {type = "item", name = "crystallographic-substrate", amount = 1, probability = 0.3} + }, + main_product = "vanadium-oxide", + icons = + { + {icon = "__pyhightechgraphics__/graphics/icons/pa/pa-over.png", icon_size = 32}, + {icon = "__pyfusionenergygraphics__/graphics/icons/vanadium-oxide.png", icon_size = 32, scale = 0.5} + }, + icon_size = 32, + subgroup = "py-hightech-recipes", + order = "f" +} + +RECIPE { + type = "recipe", + name = "fertilizer-2", + category = "mixer", + enabled = false, + energy_required = 5, + ingredients = { + {type = "item", name = "bones", amount = 6}, + {type = "item", name = "urea", amount = 5}, + {type = "item", name = "ash", amount = 30}, + {type = "item", name = "ammonium-chloride", amount = 20} + }, + results = { + {type = "item", name = "fertilizer", amount = 15} + } +} + +RECIPE { + type = "recipe", + name = "aramid-2", + category = "nmf", + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "tpa", amount = 50}, + {type = "item", name = "sub-denier-microfiber", amount = 1}, + {type = "item", name = "aluminium-plate", amount = 5}, + {type = "fluid", name = "chlorine", amount = 200}, + {type = "item", name = "molybdenum-plate", amount = 5}, + }, + results = { + {type = "item", name = "aramid", amount = 20} + }, + subgroup = "py-rawores-recipes", + order = "j" +} + +RECIPE { + type = "recipe", + name = "ceramic-2", + category = "hpf", + enabled = false, + energy_required = 4, + ingredients = { + {type = "item", name = "clay", amount = 10}, + {type = "item", name = "coke", amount = 1}, + {type = "item", name = "salt", amount = 5} + }, + results = { + {type = "item", name = "ceramic", amount = 10} + }, + main_product = "ceramic" +} + +RECIPE { + type = "recipe", + name = "cyanic-acid-01", + category = "quenching-tower", + enabled = false, + energy_required = 5, + ingredients = { + {type = "fluid", name = "methane", amount = 100}, + {type = "fluid", name = "ammonia", amount = 100}, + {type = "item", name = "coal", amount = 20}, + }, + results = { + {type = "fluid", name = "cyanic-acid", amount = 100}, + {type = "fluid", name = "hydrogen", amount = 50}, + }, + main_product = "cyanic-acid", +}:add_unlock("advanced-circuit") + +RECIPE { + type = "recipe", + name = "collagen-glycerol", + category = "chemistry", + enabled = false, + energy_required = 4, + ingredients = { + {type = "fluid", name = "water", amount = 100}, + {type = "item", name = "collagen", amount = 10}, + }, + results = { + {type = "fluid", name = "glycerol", amount = 100}, + }, + main_product = "glycerol", +}:add_unlock("advanced-circuit") + +RECIPE { + type = "recipe", + name = "fecr-alloy-2", + category = "py-rawores-smelter", + enabled = false, + energy_required = 5, + ingredients = { + {type = "fluid", name = "molten-iron", amount = 50}, + {type = "fluid", name = "molten-chromium", amount = 10}, + {type = "item", name = "sand-casting", amount = 1} + }, + results = { + {type = "item", name = "fecr-alloy", amount = 20} + } +}:add_unlock("alloys-mk03") + +RECIPE { + type = "recipe", + name = "casting-ht-pipe", + category = "casting", + enabled = false, + energy_required = 5, + ingredients = { + {type = "fluid", name = "molten-copper", amount = 10}, + {type = "fluid", name = "molten-titanium", amount = 10}, + {type = "item", name = "plastic-bar", amount = 5}, + {type = "item", name = "sand-casting", amount = 5} + }, + results = { + {type = "item", name = "ht-pipes", amount = 20} + }, + main_product = "ht-pipes", + subgroup = "py-rawores-casting", + order = "on" +}:add_unlock("casting-mk04") + +RECIPE { + type = "recipe", + name = "casting-ht-pipe-underground", + category = "casting", + enabled = false, + energy_required = 5, + ingredients = { + {type = "fluid", name = "molten-copper", amount = 50}, + {type = "fluid", name = "molten-titanium", amount = 10}, + {type = "item", name = "plastic-bar", amount = 5}, + {type = "item", name = "sand-casting", amount = 5} + }, + results = { + {type = "item", name = "ht-pipes-to-ground", amount = 30} + }, + main_product = "ht-pipes-to-ground", + subgroup = "py-rawores-casting", + order = "ou" +}:add_unlock("casting-mk04") diff --git a/prototypes/recipes/recipes-particle.lua b/prototypes/recipes/recipes-particle.lua index 32f29e8..bfb5b3a 100644 --- a/prototypes/recipes/recipes-particle.lua +++ b/prototypes/recipes/recipes-particle.lua @@ -155,7 +155,7 @@ RECIPE { enabled = false, energy_required = 15, ingredients = { - {type = "item", name = "chromium", amount = 10}, + {type = "item", name = "nickel-plate", amount = 10}, {type = "item", name = "proton-donor", amount = 2}, }, results = { @@ -255,7 +255,7 @@ RECIPE { enabled = false, energy_required = 15, ingredients = { - {type = "item", name = "iron-plate", amount = 10}, + {type = "item", name = "gold-plate", amount = 10}, {type = "item", name = "proton-donor", amount = 2}, }, results = { diff --git a/prototypes/recipes/recipes.lua b/prototypes/recipes/recipes.lua index 53451d9..226f5f0 100644 --- a/prototypes/recipes/recipes.lua +++ b/prototypes/recipes/recipes.lua @@ -45,7 +45,7 @@ RECIPE { {type = "fluid", name = "organic-solvent", amount = 100} }, results = { - {type = "item", name = "iron-ore", amount = 5}, + {type = "item", name = "zinc-plate", amount = 5}, {type = "fluid", name = "rare-earth-mud", amount = 100} }, main_product = "rare-earth-mud" @@ -228,9 +228,9 @@ RECIPE { {type = "fluid", name = "ammonia", amount = 20} }, results = { - {type = "item", name = "melamine", amount = 20}, - {type = "fluid", name = "carbon-dioxide", amount = 30}, - {type = "fluid", name = "muddy-sludge", amount = 50} + {type = "item", name = "melamine", amount = 20}, + {type = "fluid", name = "carbon-dioxide", amount = 30}, + {type = "fluid", name = "muddy-sludge", amount = 50} }, main_product = "melamine" } @@ -290,8 +290,8 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "ceramic", amount = 1}, - {type = "item", name = "copper-plate", amount = 2} + {type = "item", name = "ceramic", amount = 1}, + {type = "item", name = "tin-plate", amount = 2} }, results = { {type = "item", name = "capacitor1", amount = 3} @@ -306,8 +306,9 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "iron-plate", amount = 1}, - {type = "item", name = "coke", amount = 2} + {type = "item", name = "tin-plate", amount = 1}, + {type = "item", name = "coke", amount = 2}, + {type = "item", name = "glass", amount = 1} }, results = { {type = "item", name = "resistor1", amount = 3} @@ -340,7 +341,8 @@ RECIPE { {type = "item", name = "iron-plate", amount = 5}, {type = "item", name = "copper-plate", amount = 2}, {type = "item", name = "graphite", amount = 2}, - {type = "fluid", name = "vacuum", amount = 50} + {type = "fluid", name = "vacuum", amount = 50}, + {type = "item", name = "glass", amount = 2} }, results = { {type = "item", name = "vacuum-tube", amount = 2} @@ -355,9 +357,10 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "treated-wood", amount = 3}, - {type = "item", name = "raw-fiber", amount = 5}, - {type = "fluid", name = "steam", amount = 500} + {type = "item", name = "treated-wood", amount = 3}, + {type = "item", name = "raw-fiber", amount = 5}, + {type = "fluid", name = "steam", amount = 500}, + {type = "item", name = "sodium-hydroxide", amount = 3} }, results = { {type = "item", name = "fiberboard", amount = 4}, @@ -507,8 +510,10 @@ RECIPE { enabled = false, energy_required = 8, ingredients = { - {type = "item", name = "silicon", amount = 5}, - {type = "item", name = "graphite", amount = 3} + {type = "item", name = "silicon", amount = 5}, + {type = "item", name = "graphite", amount = 3}, + {type = "item", name = "crushed-quartz", amount = 2}, + {type = "item", name = "aramid", amount = 1} }, results = { {type = "fluid", name = "flue-gas", amount = 100}, @@ -658,6 +663,10 @@ RECIPE { main_product = "phenolicboard" }:add_unlock("integrated-circuits-1") +if mods.pyhightech then + RECIPE("phenolicboard"):add_ingredient_unsafe {type = "item", name = "sodium-hydroxide", amount = 3} +end + RECIPE { type = "recipe", name = "pcb2", @@ -668,7 +677,8 @@ RECIPE { {type = "item", name = "phenolicboard", amount = 5}, {type = "fluid", name = "etching", amount = 25}, {type = "item", name = "copper-plate", amount = 5}, - {type = "item", name = "nylon-parts", amount = 10} + {type = "item", name = "nylon-parts", amount = 10}, + {type = "item", name = "tin-plate", amount = 5} }, results = { {type = "item", name = "pcb2", amount = 3} @@ -687,8 +697,9 @@ RECIPE { {type = "item", name = "p-dope", amount = 10}, {type = "item", name = "plastic-bar", amount = 6}, {type = "item", name = "cermet", amount = 5}, - {type = "item", name = "copper-cable", amount = 10}, - {type = "fluid", name = "vacuum", amount = 50} + {type = "item", name = "tinned-cable", amount = 10}, + {type = "fluid", name = "vacuum", amount = 50}, + {type = "item", name = "tin-plate", amount = 5} }, results = { {type = "item", name = "microchip", amount = 3} @@ -704,7 +715,8 @@ RECIPE { energy_required = 5, ingredients = { {type = "item", name = "ceramic", amount = 5}, - {type = "item", name = "molybdenum-ore", amount = 3} + {type = "item", name = "molybdenum-ore", amount = 3}, + {type = "item", name = "ore-nickel", amount = 5} }, results = { {type = "item", name = "crude-cermet", amount = 5} @@ -730,12 +742,13 @@ RECIPE { RECIPE { type = "recipe", name = "fecr-alloy", - category = "hpf", + category = mods.pyhightech and "py-rawores-smelter" or "hpf", enabled = false, energy_required = 3, ingredients = { {type = "item", name = "iron-plate", amount = 5}, - {type = "item", name = "chromium", amount = 1} + {type = "item", name = "chromium", amount = 1}, + {type = "item", name = "graphite", amount = 3} }, results = { {type = "item", name = "fecr-alloy", amount = 2} @@ -766,12 +779,13 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "light-n", amount = 4}, - {type = "item", name = "reo", amount = 4}, - {type = "item", name = "cermet", amount = 4}, - {type = "item", name = "p-dope", amount = 4}, - {type = "item", name = "nylon", amount = 3}, - {type = "fluid", name = "vacuum", amount = 50} + {type = "item", name = "light-n", amount = 4}, + {type = "item", name = "reo", amount = 4}, + {type = "item", name = "cermet", amount = 4}, + {type = "item", name = "p-dope", amount = 4}, + {type = "item", name = "nylon", amount = 3}, + {type = "fluid", name = "vacuum", amount = 50}, + {type = "item", name = "tin-plate", amount = 3} }, results = { {type = "item", name = "diode", amount = 4} @@ -788,7 +802,7 @@ RECIPE { {type = "item", name = "melamine-resin", amount = 5}, {type = "item", name = "inductor1", amount = 5}, {type = "item", name = "ferrite", amount = 10}, - {type = "item", name = "copper-cable", amount = 20} + {type = "item", name = "tinned-cable", amount = 20} }, results = { {type = "item", name = "inductor2", amount = 5} @@ -802,11 +816,11 @@ RECIPE { enabled = false, energy_required = 10, ingredients = { - {type = "item", name = "cermet", amount = 5}, - {type = "item", name = "capacitor1", amount = 5}, - {type = "item", name = "steel-plate", amount = 10}, - {type = "item", name = "copper-cable", amount = 20}, - {type = "fluid", name = "boric-acid", amount = 200} + {type = "item", name = "capacitor1", amount = 5}, + {type = "item", name = "aluminium-plate", amount = 10}, + {type = "item", name = "tinned-cable", amount = 20}, + {type = "fluid", name = "boric-acid", amount = 200}, + {type = "fluid", name = "al-pulp-01", amount = 10} }, results = { {type = "item", name = "capacitor2", amount = 5} @@ -846,7 +860,9 @@ RECIPE { {type = "item", name = "limestone", amount = 5}, {type = "item", name = "clay", amount = 5}, {type = "item", name = "boron-trioxide", amount = 3}, - {type = "fluid", name = "refsyngas", amount = 50, fluidbox_index = 1} + {type = "fluid", name = "refsyngas", amount = 50, fluidbox_index = 1}, + {type = "item", name = "sodium-sulfate", amount = 1}, + {type = "fluid", name = "molten-glass", amount = 100, fluidbox_index = 2} }, results = { {type = "item", name = "glass-fiber", amount = 3} @@ -861,8 +877,9 @@ RECIPE { enabled = false, energy_required = 10, ingredients = { - {type = "item", name = "phenol", amount = 10}, - {type = "fluid", name = "acetone", amount = 20} + {type = "item", name = "phenol", amount = 10}, + {type = "fluid", name = "acetone", amount = 20}, + {type = "fluid", name = "hydrogen-chloride", amount = 50} }, results = { {type = "item", name = "bisphenol-a", amount = 3} @@ -877,9 +894,10 @@ RECIPE { enabled = false, energy_required = 15, ingredients = { - {type = "item", name = "bisphenol-a", amount = 6}, - {type = "item", name = "iron-plate", amount = 1}, - {type = "fluid", name = "ech", amount = 30} + {type = "item", name = "bisphenol-a", amount = 6}, + {type = "item", name = "iron-plate", amount = 1}, + {type = "fluid", name = "ech", amount = 30}, + {type = "item", name = "sodium-hydroxide", amount = 5} }, results = { {type = "item", name = "epoxy", amount = 4} @@ -895,7 +913,8 @@ RECIPE { energy_required = 10, ingredients = { {type = "fluid", name = "dimethyldichlorosilane", amount = 100}, - {type = "fluid", name = "water", amount = 200} + {type = "fluid", name = "water", amount = 200}, + {type = "fluid", name = "hydrogen-chloride", amount = 50} }, results = { {type = "item", name = "pdms", amount = 5} @@ -914,8 +933,10 @@ RECIPE { enabled = false, energy_required = 6, ingredients = { - {type = "item", name = "pure-sand", amount = 30}, - {type = "fluid", name = "methane", amount = 100} + {type = "item", name = "pure-sand", amount = 30}, + {type = "fluid", name = "methane", amount = 100}, + {type = "item", name = "nickel-plate", amount = 2}, + {type = "fluid", name = "hydrogen", amount = 100} }, results = { {type = "item", name = "nic-core", amount = 2} @@ -970,8 +991,8 @@ RECIPE { {type = "item", name = "biofilm", amount = 4} }, results = { - {type = "item", name = "graphene-roll", amount = 5}, - {type = "fluid", name = "muddy-sludge", amount = 50} + {type = "item", name = "graphene-roll", amount = 5}, + {type = "fluid", name = "muddy-sludge", amount = 50} }, main_product = "graphene-roll" }:add_unlock("graphene") @@ -1022,7 +1043,9 @@ RECIPE { {type = "item", name = "graphene-roll", amount = 4}, {type = "item", name = "epoxy", amount = 5}, {type = "fluid", name = "industrial-solvent", amount = 50}, - {type = "fluid", name = "vacuum", amount = 100} + {type = "fluid", name = "vacuum", amount = 100}, + {type = "item", name = "gold-plate", amount = 2}, + {type = "item", name = "aluminium-plate", amount = 2} }, results = { {type = "item", name = "processor", amount = 1} @@ -1038,9 +1061,10 @@ RECIPE { energy_required = 4, ingredients = { {type = "item", name = "iron-oxide", amount = 12}, - {type = "item", name = "glass-fiber", amount = 6}, + {type = "item", name = "crushed-quartz", amount = 6}, {type = "item", name = "phosphate-rock", amount = 5}, - {type = "fluid", name = "acetylene", amount = 50, fluidbox_index = 1} + {type = "fluid", name = "acetylene", amount = 50, fluidbox_index = 1}, + {type = "item", name = "sodium-sulfate", amount = 1} }, results = { {type = "item", name = "phosphate-glass", amount = 1} @@ -1078,7 +1102,8 @@ RECIPE { {type = "item", name = "phosphate-glass", amount = 2}, {type = "item", name = "nichrome", amount = 1}, {type = "item", name = "epoxy", amount = 5}, - {type = "fluid", name = "vacuum", amount = 100} + {type = "fluid", name = "vacuum", amount = 100}, + {type = "item", name = "nickel-plate", amount = 2} }, results = { {type = "item", name = "resistor3", amount = 3} @@ -1130,7 +1155,8 @@ RECIPE { {type = "item", name = "copper-plate", amount = 5}, {type = "item", name = "fiberglass", amount = 1}, {type = "item", name = "nylon-parts", amount = 15}, - {type = "fluid", name = "msa", amount = 100} + {type = "fluid", name = "msa", amount = 100}, + {type = "item", name = "tin-plate", amount = 5} }, results = { {type = "item", name = "pcb3", amount = 2} @@ -1165,7 +1191,7 @@ RECIPE { {type = "item", name = "nbfe-alloy", amount = 1}, {type = "item", name = "magnetic-core", amount = 1}, {type = "item", name = "graphene-roll", amount = 2}, - {type = "fluid", name = "liquid-pure-air", amount = 30} + {type = "fluid", name = "liquid-nitrogen", amount = 30} }, results = { {type = "item", name = "high-flux-core", amount = 1} @@ -1181,7 +1207,8 @@ RECIPE { ingredients = { {type = "item", name = "high-flux-core", amount = 1}, {type = "item", name = "epoxy", amount = 1}, - {type = "item", name = "copper-cable", amount = 30} + {type = "item", name = "tinned-cable", amount = 30}, + {type = "item", name = "gold-plate", amount = 1} }, results = { {type = "item", name = "inductor3", amount = 3} @@ -1191,11 +1218,11 @@ RECIPE { RECIPE { type = "recipe", name = "re-tin", - category = "advanced-foundry", + category = mods.pyhightech and "py-rawores-smelter" or "advanced-foundry", enabled = false, energy_required = 6, ingredients = { - {type = "item", name = "iron-plate", amount = 5}, + {type = "item", name = "tin-plate", amount = 5}, {type = "item", name = "reo", amount = 4}, {type = "item", name = "sand-casting", amount = 1}, {type = "fluid", name = "heavy-oil", amount = 100} @@ -1216,7 +1243,7 @@ RECIPE { {type = "item", name = "biofilm", amount = 1}, {type = "item", name = "re-tin", amount = 1}, {type = "item", name = "nexelit-plate", amount = 2}, - {type = "fluid", name = "liquid-pure-air", amount = 30} + {type = "fluid", name = "liquid-nitrogen", amount = 30} }, results = { {type = "item", name = "diode-core", amount = 3} @@ -1246,9 +1273,10 @@ RECIPE { enabled = false, energy_required = 4, ingredients = { - {type = "item", name = "copper-coating", amount = 1}, - {type = "item", name = "ceramic", amount = 3}, - {type = "item", name = "boron-carbide", amount = 1} + {type = "item", name = "copper-coating", amount = 1}, + {type = "item", name = "ceramic", amount = 3}, + {type = "item", name = "boron-carbide", amount = 1}, + {type = "item", name = "sodium-hydroxide", amount = 30} }, results = { {type = "item", name = "capacitor-core", amount = 2} @@ -1262,9 +1290,10 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "steel-plate", amount = 4}, - {type = "item", name = "copper-plate", amount = 4}, - {type = "fluid", name = "boric-acid", amount = 50} + {type = "item", name = "nickel-plate", amount = 4}, + {type = "item", name = "tin-plate", amount = 4}, + {type = "fluid", name = "liquid-nitrogen", amount = 50}, + {type = "item", name = "silver-plate", amount = 1} }, results = { {type = "item", name = "capacitor-termination", amount = 2} @@ -1340,6 +1369,10 @@ RECIPE { } } +if mods.pyhightech then + RECIPE("biopolymer"):add_ingredient_unsafe {type = "fluid", name = "diesel", amount = 150} +end + RECIPE { type = "recipe", name = "carbon-nanotube", @@ -1365,9 +1398,9 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "pure-sand", amount = 20}, - {type = "fluid", name = "refsyngas", amount = 150}, - {type = "item", name = "phenol", amount = 15} + {type = "item", name = "pure-sand", amount = 20}, + {type = "fluid", name = "refsyngas", amount = 150}, + {type = "item", name = "sodium-hydroxide", amount = 15} }, results = { {type = "item", name = "sodium-silicate", amount = 1} @@ -1397,7 +1430,7 @@ RECIPE { ingredients = { {type = "item", name = "silica-powder", amount = 5}, {type = "item", name = "sulfur", amount = 3}, - {type = "item", name = "niobium-plate", amount = 2}, + {type = "item", name = "lead-plate", amount = 2}, {type = "item", name = "plastic-bar", amount = 20}, {type = "fluid", name = "vacuum", amount = 200} }, @@ -1595,7 +1628,8 @@ RECIPE { enabled = false, energy_required = 8, ingredients = { - {type = "item", name = "fiber", amount = 4} + {type = "item", name = "fiber", amount = 4}, + {type = "item", name = "sodium-hydroxide", amount = 3} }, results = { {type = "item", name = "micro-fiber", amount = 2} @@ -1609,8 +1643,8 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "melamine-resin", amount = 2}, - {type = "item", name = "phenol", amount = 10} + {type = "item", name = "melamine-resin", amount = 2}, + {type = "item", name = "sodium-hydroxide", amount = 10} }, results = { {type = "item", name = "resorcinol", amount = 2} @@ -1644,8 +1678,8 @@ RECIPE { {type = "fluid", name = "water", amount = 100} }, results = { - {type = "item", name = "clean-rf-gel", amount = 1}, - {type = "fluid", name = "tailings", amount = 100} + {type = "item", name = "clean-rf-gel", amount = 1}, + {type = "fluid", name = "tailings", amount = 100} }, main_product = "clean-rf-gel" }:add_unlock("aerogel") @@ -1671,9 +1705,9 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "fluid", name = "syngas", amount = 200}, - {type = "item", name = "aerogel", amount = 1}, - {type = "item", name = "silicon", amount = 5} + {type = "fluid", name = "nitrogen", amount = 50}, + {type = "item", name = "aerogel", amount = 1}, + {type = "item", name = "purified-quartz", amount = 1} }, results = { {type = "item", name = "carbon-aerogel", amount = 1} @@ -1725,9 +1759,10 @@ RECIPE { ingredients = { {type = "item", name = "copper-plate", amount = 10}, {type = "item", name = "reo", amount = 5}, - {type = "item", name = "uranium-238", amount = 10}, + {type = "item", name = "40-u-powder", amount = 10}, {type = "item", name = "fuelrod-mk01", amount = 2}, - {type = "item", name = "sand-casting", amount = 4} + {type = "item", name = "sand-casting", amount = 4}, + {type = "item", name = "gold-plate", amount = 5} }, results = { {type = "item", name = "heavy-fermion", amount = 1} @@ -1776,7 +1811,7 @@ RECIPE { RECIPE { type = "recipe", name = "crco-alloy", - category = "advanced-foundry", + category = mods.pyhightech and "py-rawores-smelter" or "advanced-foundry", enabled = false, energy_required = 6, ingredients = { @@ -1803,6 +1838,7 @@ RECIPE { {type = "item", name = "super-alloy", amount = 1}, {type = "fluid", name = "boric-acid", amount = 100}, {type = "fluid", name = "vacuum", amount = 100}, + {type = "item", name = "silver-plate", amount = 4} }, results = { {type = "item", name = "nxag-matrix", amount = 1} @@ -1821,7 +1857,8 @@ RECIPE { {type = "item", name = "cermet", amount = 5}, {type = "item", name = "crco-alloy", amount = 2}, {type = "item", name = "nxag-matrix", amount = 1}, - {type = "fluid", name = "boric-acid", amount = 100} + {type = "fluid", name = "boric-acid", amount = 100}, + {type = "item", name = "lead-plate", amount = 4} }, results = { {type = "item", name = "paradiamatic-resistor", amount = 1} @@ -1835,7 +1872,7 @@ RECIPE { enabled = false, energy_required = 3.5, ingredients = { - {type = "item", name = "stone-brick", amount = 10}, + {type = "item", name = "zinc-plate", amount = 10}, {type = "fluid", name = "acetic-acid", amount = 100} }, results = { @@ -1880,9 +1917,10 @@ RECIPE { enabled = false, energy_required = 7, ingredients = { - {type = "item", name = "zinc-acetate", amount = 1}, - {type = "item", name = "sulfur", amount = 10}, - {type = "fluid", name = "ralesia-extract", amount = 50} + {type = "item", name = "zinc-acetate", amount = 1}, + {type = "item", name = "sulfur", amount = 10}, + {type = "fluid", name = "ralesia-extract", amount = 50}, + {type = "item", name = "sodium-hydroxide", amount = 8} }, results = { {type = "item", name = "zinc-nanocompound", amount = 1} @@ -1900,8 +1938,8 @@ RECIPE { {type = "fluid", name = "methanol", amount = 100} }, results = { - {type = "item", name = "zinc-nanocomplex", amount = 1}, - {type = "fluid", name = "tailings", amount = 100} + {type = "item", name = "zinc-nanocomplex", amount = 1}, + {type = "fluid", name = "tailings", amount = 100} }, main_product = "zinc-nanocomplex", icon = "__pyhightechgraphics__/graphics/icons/wash-zincnano.png", @@ -1937,7 +1975,8 @@ RECIPE { {type = "item", name = "biopolymer", amount = 2}, {type = "item", name = "carbon-nanotube", amount = 1}, {type = "item", name = "zno-nanoparticles", amount = 1}, - {type = "fluid", name = "boric-acid", amount = 100} + {type = "fluid", name = "boric-acid", amount = 100}, + {type = "item", name = "salt", amount = 40} }, results = { {type = "item", name = "csle-diode", amount = 3} @@ -1947,17 +1986,17 @@ RECIPE { RECIPE { type = "recipe", name = "ndfeb-alloy", - category = "advanced-foundry", + category = "py-rawores-smelter", enabled = false, energy_required = 4, ingredients = { - {type = "item", name = "iron-plate", amount = 12}, - {type = "item", name = "reo", amount = 5}, - {type = "item", name = "boron", amount = 4}, - {type = "item", name = "borax", amount = 5}, - {type = "item", name = "fuelrod-mk01", amount = 1}, - {type = "item", name = "sand-casting", amount = 2}, - {type = "fluid", name = "carbon-dioxide", amount = 100} + {type = "item", name = "iron-plate", amount = 12}, + {type = "item", name = "reo", amount = 5}, + {type = "item", name = "boron", amount = 4}, + {type = "item", name = "borax", amount = 5}, + {type = "item", name = "fuelrod-mk01", amount = 1}, + {type = "item", name = "sand-casting", amount = 2}, + {type = "fluid", name = "oxygen", amount = 100} }, results = { {type = "item", name = "ndfeb-alloy", amount = 1} @@ -1988,7 +2027,8 @@ RECIPE { {type = "item", name = "ndfeb-powder", amount = 5}, {type = "item", name = "borax", amount = 5}, {type = "item", name = "fuelrod-mk01", amount = 1}, - {type = "item", name = "sand-casting", amount = 2} + {type = "item", name = "sand-casting", amount = 2}, + {type = "item", name = "nickel-plate", amount = 2} }, results = { {type = "item", name = "re-magnet", amount = 1} @@ -2021,11 +2061,12 @@ RECIPE { enabled = false, energy_required = 10, ingredients = { - {type = "item", name = "sc-substrate", amount = 1}, - {type = "item", name = "re-magnet", amount = 1}, - {type = "item", name = "agzn-alloy", amount = 1}, - {type = "item", name = "nbti-alloy", amount = 5}, - {type = "fluid", name = "liquid-helium", amount = 50} + {type = "item", name = "sc-substrate", amount = 1}, + {type = "item", name = "re-magnet", amount = 1}, + {type = "item", name = "agzn-alloy", amount = 1}, + {type = "item", name = "nbti-alloy", amount = 5}, + {type = "fluid", name = "liquid-nitrogen", amount = 50}, + {type = "item", name = "gold-plate", amount = 1} }, results = { {type = "item", name = "superconductor", amount = 1} @@ -2043,7 +2084,8 @@ RECIPE { {type = "item", name = "silicon", amount = 10}, {type = "item", name = "iron-plate", amount = 5}, {type = "item", name = "boron", amount = 3}, - {type = "item", name = "copper-plate", amount = 5} + {type = "item", name = "copper-plate", amount = 5}, + {type = "item", name = "gold-plate", amount = 2} }, results = { {type = "item", name = "nanocrystaline-core", amount = 1} @@ -2079,7 +2121,8 @@ RECIPE { {type = "item", name = "graphite", amount = 1}, {type = "item", name = "carbon-aerogel", amount = 8}, {type = "item", name = "sodium-chlorate", amount = 10}, - {type = "fluid", name = "water", amount = 50} + {type = "fluid", name = "water", amount = 50}, + {type = "item", name = "silver-plate", amount = 2} }, results = { {type = "item", name = "supercapacitor-core", amount = 1} @@ -2096,7 +2139,7 @@ RECIPE { {type = "item", name = "fiberboard", amount = 2}, {type = "item", name = "nexelit-plate", amount = 2}, {type = "item", name = "molybdenum-plate", amount = 2}, - {type = "item", name = "iron-plate", amount = 3}, + {type = "item", name = "aluminium-plate", amount = 3}, {type = "fluid", name = "water", amount = 50} }, results = { @@ -2132,7 +2175,8 @@ RECIPE { {type = "item", name = "ceramic", amount = 3}, {type = "item", name = "zno-nanoparticles", amount = 2}, {type = "fluid", name = "etching", amount = 40}, - {type = "fluid", name = "msa", amount = 50} + {type = "fluid", name = "msa", amount = 50}, + {type = "item", name = "lead-plate", amount = 5} }, results = { {type = "item", name = "pcb4", amount = 1} @@ -2154,7 +2198,8 @@ RECIPE { {type = "item", name = "supercapacitor", amount = 1}, {type = "item", name = "paradiamatic-resistor", amount = 1}, {type = "item", name = "nanochip", amount = 2}, - {type = "item", name = "fault-current-inductor", amount = 1} + {type = "item", name = "fault-current-inductor", amount = 1}, + {type = "item", name = "solder", amount = 4} }, results = { {type = "item", name = "intelligent-unit", amount = 2} @@ -2385,8 +2430,9 @@ RECIPE { enabled = false, energy_required = 10, ingredients = { - {type = "fluid", name = "steam", amount = 300}, - {type = "item", name = "skin", amount = 5} + {type = "fluid", name = "steam", amount = 300}, + {type = "item", name = "skin", amount = 5}, + {type = "item", name = "sodium-hydroxide", amount = 5} }, results = { {type = "fluid", name = "glycerol", amount = 50} @@ -2400,11 +2446,12 @@ RECIPE { enabled = false, energy_required = 6, ingredients = { - {type = "fluid", name = "carbon-sulfide", amount = 50}, - {type = "fluid", name = "ammonia", amount = 50}, - {type = "item", name = "urea", amount = 10}, - {type = "fluid", name = "sulfuric-acid", amount = 150}, - {type = "item", name = "fiber", amount = 15} + {type = "fluid", name = "carbon-sulfide", amount = 50}, + {type = "fluid", name = "ammonia", amount = 50}, + {type = "item", name = "urea", amount = 10}, + {type = "fluid", name = "sulfuric-acid", amount = 150}, + {type = "item", name = "fiber", amount = 15}, + {type = "item", name = "sodium-carbonate", amount = 5} }, results = { {type = "item", name = "rayon", amount = 5} @@ -2554,7 +2601,8 @@ RECIPE { ingredients = { {type = "item", name = "sc-wire", amount = 10}, {type = "item", name = "silicon", amount = 5}, - {type = "item", name = "carbon-nanotube", amount = 2} + {type = "item", name = "carbon-nanotube", amount = 2}, + {type = "item", name = "gold-plate", amount = 10} }, results = { {type = "item", name = "nano-wires", amount = 5} @@ -2608,7 +2656,8 @@ RECIPE { {type = "item", name = "nexelit-plate", amount = 10}, {type = "item", name = "silicon-wafer", amount = 5}, {type = "item", name = "resilin", amount = 1}, - {type = "fluid", name = "etching", amount = 50} + {type = "fluid", name = "etching", amount = 50}, + {type = "item", name = "glass", amount = 10} }, results = { {type = "item", name = "nems", amount = 5} @@ -2622,9 +2671,9 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "reo", amount = 10}, - {type = "item", name = "chromite-sand", amount = 10}, - {type = "fluid", name = "sulfuric-acid", amount = 300} + {type = "item", name = "reo", amount = 10}, + {type = "item", name = "chromite-sand", amount = 10}, + {type = "fluid", name = "hydrogen-chloride", amount = 300} }, results = { {type = "item", name = "lithium-chloride", amount = 3} @@ -2644,6 +2693,7 @@ RECIPE { {type = "item", name = "graphene-roll", amount = 2}, {type = "item", name = "vanadium-oxide", amount = 3}, {type = "fluid", name = "vacuum", amount = 150}, + {type = "item", name = "glass", amount = 10} }, results = { {type = "item", name = "volumetric-capacitor", amount = 1} @@ -2675,9 +2725,10 @@ RECIPE { enabled = false, energy_required = 10, ingredients = { - {type = "item", name = "laser-module", amount = 1}, - {type = "item", name = "reo", amount = 10}, - {type = "item", name = "re-magnet", amount = 3} + {type = "item", name = "laser-module", amount = 1}, + {type = "item", name = "reo", amount = 10}, + {type = "item", name = "re-magnet", amount = 3}, + {type = "item", name = "aluminium-plate", amount = 10} }, results = { {type = "item", name = "yag-laser-module", amount = 1} @@ -2691,10 +2742,10 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "item", name = "chromium", amount = 5}, - {type = "item", name = "niobium-plate", amount = 10}, - {type = "item", name = "boron", amount = 5}, - {type = "fluid", name = "helium", amount = 20} + {type = "item", name = "lithium-chloride", amount = 5}, + {type = "item", name = "niobium-plate", amount = 10}, + {type = "item", name = "boron", amount = 5}, + {type = "fluid", name = "helium", amount = 20} }, results = { {type = "item", name = "lithium-niobate", amount = 2} @@ -2750,12 +2801,12 @@ RECIPE { enabled = false, energy_required = 8, ingredients = { - {type = "fluid", name = "syngas", amount = 200}, - {type = "item", name = "niobium-plate", amount = 1} + {type = "fluid", name = "syngas", amount = 200}, + {type = "item", name = "nickel-plate", amount = 1} }, results = { - {type = "fluid", name = "methane", amount = 200}, - {type = "fluid", name = "flue-gas", amount = 75} + {type = "fluid", name = "methane", amount = 200}, + {type = "fluid", name = "oxygen", amount = 75} }, main_product = "methane" }:add_unlock("coal-processing-3") @@ -2768,7 +2819,7 @@ RECIPE { energy_required = 4, ingredients = { {type = "fluid", name = "methane", amount = 30}, - {type = "fluid", name = "water", amount = 50}, + {type = "fluid", name = "oxygen", amount = 50}, {type = "item", name = "molybdenum-ore", amount = 3} }, results = { @@ -2855,11 +2906,11 @@ RECIPE { enabled = false, energy_required = 12, ingredients = { - {type = "item", name = "myoglobin", amount = 4}, - {type = "item", name = "chromium", amount = 5}, - {type = "item", name = "iron-plate", amount = 5}, - {type = "item", name = "nylon", amount = 2}, - {type = "item", name = "iron-oxide", amount = 3} + {type = "item", name = "myoglobin", amount = 4}, + {type = "item", name = "chromium", amount = 5}, + {type = "item", name = "aluminium-plate", amount = 5}, + {type = "item", name = "nylon", amount = 2}, + {type = "item", name = "iron-oxide", amount = 3} }, results = { {type = "item", name = "paramagnetic-material", amount = 1} @@ -2877,7 +2928,8 @@ RECIPE { {type = "item", name = "re-magnet", amount = 1}, {type = "item", name = "niobium-plate", amount = 2}, {type = "item", name = "rayon", amount = 2}, - {type = "item", name = "copper-plate", amount = 5} + {type = "item", name = "copper-plate", amount = 5}, + {type = "item", name = "lead-plate", amount = 2} }, results = { {type = "item", name = "diamagnetic-material", amount = 1} @@ -3251,7 +3303,8 @@ RECIPE { enabled = false, energy_required = 5, ingredients = { - {type = "fluid", name = "black-liquor", amount = 80} + {type = "fluid", name = "black-liquor", amount = 80}, + {type = "fluid", name = "oxygen", amount = 100} }, results = { {type = "fluid", name = "aromatics", amount = 100}, @@ -3299,7 +3352,8 @@ RECIPE { ingredients = { {type = "item", name = "chromium", amount = 1}, {type = "fluid", name = "nitrobenzene", amount = 50}, - {type = "fluid", name = "methanal", amount = 50} + {type = "fluid", name = "methanal", amount = 50}, + {type = "fluid", name = "hydrogen", amount = 50} }, results = { {type = "item", name = "plastic-bar", amount = 10} @@ -3490,10 +3544,10 @@ RECIPE { enabled = false, energy_required = 10, ingredients = { - {type = "fluid", name = "benzene", amount = 100}, - {type = "fluid", name = "ammonia", amount = 100}, - {type = "fluid", name = "sulfuric-acid", amount = 50}, - {type = "item", name = "nichrome", amount = 2}, + {type = "fluid", name = "benzene", amount = 100}, + {type = "fluid", name = "ammonia", amount = 100}, + {type = "fluid", name = "chlorine", amount = 50}, + {type = "item", name = "nichrome", amount = 2}, }, results = { {type = "item", name = "nylon", amount = 6} @@ -3557,7 +3611,7 @@ RECIPE { RECIPE { type = "recipe", name = "propene-to-acetone", - category = "fbreactor", + category = "wet-scrubber", enabled = false, energy_required = 5, ingredients = { @@ -3578,7 +3632,7 @@ RECIPE { enabled = false, energy_required = 6, ingredients = { - {type = "item", name = "clay", amount = 20}, + {type = "item", name = "clay", amount = 20}, {type = "fluid", name = "muddy-sludge", amount = 100} }, results = { @@ -3603,6 +3657,7 @@ RECIPE { {type = "item", name = "nexelit-plate", amount = 5}, {type = "item", name = "zinc-acetate", amount = 1}, {type = "item", name = "nylon", amount = 2}, + {type = "item", name = "lead-plate", amount = 5}, }, results = { {type = "item", name = "used-nexelit-battery", amount = 1} diff --git a/prototypes/robots/py-construction-robot-mk04.lua b/prototypes/robots/py-construction-robot-mk04.lua index cfe7d37..3aaa7e2 100644 --- a/prototypes/robots/py-construction-robot-mk04.lua +++ b/prototypes/robots/py-construction-robot-mk04.lua @@ -12,8 +12,9 @@ RECIPE { {type = "item", name = "diamagnetic-material", amount = 1}, {type = "item", name = "paramagnetic-material", amount = 1}, {type = "item", name = "intelligent-unit", amount = 1}, - {type = "item", name = "construction-robot", amount = 1}, - {type = "fluid", name = "grease", amount = 300} + {type = "item", name = "py-construction-robot-mk01", amount = 1}, + {type = "fluid", name = "grease", amount = 300}, + {type = "item", name = "super-alloy", amount = 4} }, results = { {type = "item", name = "py-construction-robot-mk04", amount = 1} diff --git a/prototypes/robots/py-logistic-robot-mk04.lua b/prototypes/robots/py-logistic-robot-mk04.lua index 8cc31d9..fa4e3ff 100644 --- a/prototypes/robots/py-logistic-robot-mk04.lua +++ b/prototypes/robots/py-logistic-robot-mk04.lua @@ -12,8 +12,9 @@ RECIPE { {type = "item", name = "diamagnetic-material", amount = 2}, {type = "item", name = "paramagnetic-material", amount = 2}, {type = "item", name = "intelligent-unit", amount = 1}, - {type = "item", name = "logistic-robot", amount = 1}, - {type = "fluid", name = "grease", amount = 300} + {type = "item", name = "py-logistic-robot-mk01", amount = 1}, + {type = "fluid", name = "grease", amount = 300}, + {type = "item", name = "super-alloy", amount = 4} }, results = { {type = "item", name = "py-logistic-robot-mk04", amount = 1} diff --git a/prototypes/technologies/fiberboard.lua b/prototypes/technologies/fiberboard.lua index 811a67e..2887076 100644 --- a/prototypes/technologies/fiberboard.lua +++ b/prototypes/technologies/fiberboard.lua @@ -20,24 +20,22 @@ TECHNOLOGY { } } -if mods["pyrawores"] then - TECHNOLOGY { - type = "technology", - name = "fiberboard-mk02", - icon = "__pyhightechgraphics__/graphics/technology/fiberboard-mk02.png", - icon_size = 128, - order = "c-a", - prerequisites = {"fiberboard"}, - effects = { +TECHNOLOGY { + type = "technology", + name = "fiberboard-mk02", + icon = "__pyhightechgraphics__/graphics/technology/fiberboard-mk02.png", + icon_size = 128, + order = "c-a", + prerequisites = {"fiberboard"}, + effects = { + }, + unit = { + count = 50, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, - unit = { - count = 50, - ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - }, - time = 30 - } + time = 30 } -end +} diff --git a/prototypes/technologies/plastics.lua b/prototypes/technologies/plastics.lua index 966bc15..9f1aa66 100644 --- a/prototypes/technologies/plastics.lua +++ b/prototypes/technologies/plastics.lua @@ -44,27 +44,26 @@ TECHNOLOGY { } } -if mods["pyrawores"] then - TECHNOLOGY { - type = "technology", - name = "plastics-mk04", - icon = "__pyhightechgraphics__/graphics/technology/plastics-mk04.png", - icon_size = 128, - order = "c-a", - prerequisites = {"plastics-mk03"}, - effects = { - {type = "unlock-recipe", recipe = "plastics-mk03"}, - {type = "unlock-recipe", recipe = "plastic2"}, + +TECHNOLOGY { + type = "technology", + name = "plastics-mk04", + icon = "__pyhightechgraphics__/graphics/technology/plastics-mk04.png", + icon_size = 128, + order = "c-a", + prerequisites = {"plastics-mk03"}, + effects = { + {type = "unlock-recipe", recipe = "plastics-mk03"}, + {type = "unlock-recipe", recipe = "plastic2"}, + }, + unit = { + count = 50, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1}, }, - unit = { - count = 50, - ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"production-science-pack", 1}, - }, - time = 30 - } + time = 30 } -end +} diff --git a/prototypes/updates/base-updates.lua b/prototypes/updates/base-updates.lua index cb7cb2d..78e4d4c 100644 --- a/prototypes/updates/base-updates.lua +++ b/prototypes/updates/base-updates.lua @@ -54,6 +54,7 @@ RECIPE("centrifuge"):remove_unlock("uranium-processing"):remove_unlock("nuclear- -- RECIPE CHANGES +RECIPE("electronic-circuit"):add_ingredient {type = "item", name = "solder", amount = 2} RECIPE("explosives"):add_ingredient {type = "item", name = "collagen", amount = 5} RECIPE("small-lamp"):replace_ingredient("electronic-circuit", "copper-plate") RECIPE("battery"):add_ingredient {type = "item", name = "rayon", amount = 2} diff --git a/prototypes/updates/pycoalprocessing-updates.lua b/prototypes/updates/pycoalprocessing-updates.lua index 759bc23..daa4896 100644 --- a/prototypes/updates/pycoalprocessing-updates.lua +++ b/prototypes/updates/pycoalprocessing-updates.lua @@ -7,18 +7,3 @@ TECHNOLOGY("energy-3"):remove_prereq("fuel-production"):remove_prereq("advanced- TECHNOLOGY("fine-electronics"):remove_prereq("sulfur-processing"):remove_prereq("niobium"):remove_prereq("plastics") TECHNOLOGY("fluid-processing-machines-1"):remove_prereq("coal-processing-2"):remove_prereq("py-storage-tanks") TECHNOLOGY("kevlar"):remove_prereq("filtration") - --- RECIPE UNLOCKS - - --- RECIPE CHANGES -RECIPE("kevlar"):add_ingredient {type = "item", name = "nylon", amount = 5} -RECIPE("biofilm"):add_ingredient {type = "item", name = "rayon", amount = 2} -RECIPE("cladding"):add_ingredient {type = "fluid", name = "nitrobenzene", amount = 50} -RECIPE("nas-battery"):add_ingredient {type = "item", name = "rayon", amount = 2} -if RECIPE["mukmoux-pasture"] then RECIPE("mukmoux-pasture"):replace_ingredient("advanced-circuit", "electronic-circuit") end -RECIPE("niobium-oxide"):replace_ingredient("water", "ammonia") -RECIPE("ball-mill-mk01"):remove_ingredient("py-asphalt"):add_ingredient {type = "item", name = "electronic-circuit", amount = 10} -RECIPE("olefin-plant"):replace_ingredient("advanced-circuit", "electronic-circuit") -RECIPE("evaporator"):remove_ingredient("electronic-circuit") -RECIPE("jaw-crusher"):remove_ingredient("electronic-circuit") diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index 9ffc342..3b680de 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -25,39 +25,9 @@ RECIPE("coil-core"):remove_unlock("sc-unit") RECIPE("sc-coil"):remove_unlock("sc-unit") RECIPE("magnetic-core"):remove_unlock("sc-unit") RECIPE("ferrite"):remove_unlock("sc-unit"):add_unlock("basic-electronics") +RECIPE("centrifugal-pan-mk01"):remove_unlock("machines-mk03"):add_unlock("rare-earth-tech") +RECIPE("gas-separator-mk01"):remove_unlock("coke-mk02"):add_unlock("sulfur-processing") -if not (mods["pyrawores"] or mods["pypetroleumhandling"]) then - RECIPE("centrifugal-pan-mk01"):remove_unlock("diamond-mining"):add_unlock("rare-earth-tech") - RECIPE("thickener-mk01"):remove_unlock("advanced-mining-facilities"):add_unlock("rare-earth-tech") - RECIPE("agitator-mk01"):remove_unlock("advanced-mining-facilities"):add_unlock("rare-earth-tech") - RECIPE("mixer-mk01"):remove_unlock("advanced-mining-facilities"):add_unlock("nylon") -elseif mods["pyrawores"] then - RECIPE("centrifugal-pan-mk01"):remove_unlock("machines-mk03"):add_unlock("rare-earth-tech") -end -if mods["pyrawores"] then - RECIPE("gas-separator-mk01"):remove_unlock("coke-mk02"):add_unlock("sulfur-processing") -else - RECIPE("gas-separator-mk01"):remove_unlock("helium-processing-mk02"):add_unlock("sulfur-processing") -end - -if mods["pyrawores"] and not mods["pypetroleumhandling"] then +if not mods["pypetroleumhandling"] then RECIPE("mixer-mk01"):remove_unlock("advanced-mining-facilities"):add_unlock("mibc") end - - --- RECIPE CHANGES -RECIPE("science-coating"):add_ingredient {type = "item", name = "nylon", amount = 5}:add_ingredient {type = "item", name = "zinc-acetate", amount = 15} -RECIPE("bio-reactor-mk01"):add_ingredient {type = "item", name = "advanced-circuit", amount = 5} -RECIPE("sc-coil"):add_ingredient {type = "item", name = "re-tin", amount = 1} -RECIPE("coil-core"):add_ingredient {type = "item", name = "nexelit-plate", amount = 2} -RECIPE("magnetic-core"):add_ingredient {type = "item", name = "ndfeb-alloy", amount = 1}:add_ingredient {type = "item", name = "epoxy", amount = 1} -RECIPE("deposited-core").category = "nano" -RECIPE("boron-mixture"):replace_ingredient("helium", "acetylene") -RECIPE("fusion-reactor-mk01"):replace_ingredient("advanced-circuit", "processing-unit") -RECIPE("fusion-reactor-mk02"):replace_ingredient("advanced-circuit", "intelligent-unit") -RECIPE("nexelit-matrix"):replace_ingredient("treated-wood", "epoxy") -RECIPE("mixer-mk01"):add_ingredient {type = "item", name = "electronic-circuit", amount = 10} -RECIPE("kmauts-ration"):remove_ingredient("organics"):add_ingredient {type = "item", name = "skin", amount = 25} -RECIPE("kmauts-ration"):remove_ingredient("ralesia"):add_ingredient {type = "item", name = "blood-meal", amount = 5} -RECIPE("agitator-mk01"):replace_ingredient("plastic-bar", "melamine") -RECIPE("centrifugal-pan-mk01"):replace_ingredient("advanced-circuit", "electronic-circuit") diff --git a/prototypes/updates/pyindustry-updates.lua b/prototypes/updates/pyindustry-updates.lua index 713788e..e9cdc01 100644 --- a/prototypes/updates/pyindustry-updates.lua +++ b/prototypes/updates/pyindustry-updates.lua @@ -2,16 +2,4 @@ TECHNOLOGY("railway-mk02"):remove_prereq("niobium") TECHNOLOGY("advanced-mining-facilities"):remove_prereq("py-storage-tanks") TECHNOLOGY("ht-robotics"):remove_prereq("construction-robotics") - --- RECIPE UNLOCKS - - --- RECIPE CHANGES -RECIPE("accumulator-mk01"):add_ingredient {type = "item", name = "used-nexelit-battery", amount = 1} -RECIPE("accumulator-mk02"):add_ingredient {type = "item", name = "used-nexelit-battery", amount = 5} -RECIPE("kicalk-plantation"):replace_ingredient("storage-tank", "py-tank-5") -RECIPE("accumulator-mk02"):remove_ingredient("battery"):add_ingredient {type = "item", name = "re-magnet", amount = 10}:add_ingredient {type = "item", name = "sc-coil", amount = 10} -RECIPE("pulp-mill-mk03"):replace_ingredient("pipe", "niobium-pipe") -RECIPE("py-construction-robot-mk04"):replace_ingredient("construction-robot", "py-construction-robot-mk01") -RECIPE("py-logistic-robot-mk04"):replace_ingredient("logistic-robot", "py-logistic-robot-mk01") ---RECIPE('mk02-locomotive'):replace_ingredient('engine-unit', 'electric-engine-unit') +TECHNOLOGY("radars-mk02"):remove_pack("chemical-science-pack") diff --git a/prototypes/updates/pyrawores-updates.lua b/prototypes/updates/pyrawores-updates.lua index b77dbd2..7bb8101 100644 --- a/prototypes/updates/pyrawores-updates.lua +++ b/prototypes/updates/pyrawores-updates.lua @@ -20,16 +20,3 @@ RECIPE("nylon-plastic"):remove_unlock("plastics-mk02"):add_unlock("plastics-mk03 RECIPE("plastics-mk03"):remove_unlock("plastics-mk03") RECIPE("plastic2"):remove_unlock("plastics-mk03") RECIPE("crco-alloy"):remove_unlock("quantum-processor"):add_unlock("alloys-mk04") - --- RECIPE CHANGES -RECIPE("fawogae-plantation-mk03"):replace_ingredient("treated-wood", "fiberboard") -RECIPE("ree-float"):replace_result("iron-ore", "zinc-plate") -RECIPE("ree-concentrate3"):replace_result("copper-plate", "nickel-plate") -RECIPE("syngas-methane"):replace_result("flue-gas", "oxygen") -RECIPE("pa-niobium"):replace_ingredient("chromium", "nickel-plate") -RECIPE("pa-uranium"):replace_ingredient("iron-plate", "gold-plate") -RECIPE("propene"):replace_ingredient("iron-plate", "lead-plate") -RECIPE("msa"):replace_ingredient("industrial-solvent", "chlorine") -RECIPE("acrolein"):add_ingredient {type = "fluid", name = "oxygen", amount = 80} -RECIPE("pa-niobium"):replace_ingredient("chromium", "nickel-plate") -RECIPE("propene-to-acetone").category = "wet-scrubber"