From 5f5ac6bd391caf03ea2d40dfcd8f1f9a7aec9f02 Mon Sep 17 00:00:00 2001 From: Zachary Picco Date: Tue, 19 Aug 2025 15:45:40 -0500 Subject: [PATCH 1/6] Removed niobium pipes from hydrocyclone recipe. Resolves https://github.com/pyanodon/pybugreports/issues/851 --- changelog.txt | 5 +++++ prototypes/pipes/niobium-pipes.lua | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index d4b1ae2..e881e40 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: ??? +Date: ??? + Changes: + - Removed niobium pipes from hydrocyclone recipe. Resolves https://github.com/pyanodon/pybugreports/issues/851 +--------------------------------------------------------------------------------------------------- Version: 3.0.17 Date: 2025-07-20 Changes: diff --git a/prototypes/pipes/niobium-pipes.lua b/prototypes/pipes/niobium-pipes.lua index 37844b0..f024d50 100644 --- a/prototypes/pipes/niobium-pipes.lua +++ b/prototypes/pipes/niobium-pipes.lua @@ -345,7 +345,6 @@ ITEM { local recipes = { "xyhiphoe-pool-mk01", - "hydrocyclone-mk01", "compressor-mk01", "genlab-mk01", "kmauts-enclosure-mk01", From ec79661311daae24e6b1e9405a75bc75127dba85 Mon Sep 17 00:00:00 2001 From: Zachary Picco Date: Sun, 14 Sep 2025 21:25:45 -0500 Subject: [PATCH 2/6] Rebase master (#137) * Added Spanish translation Added a Spanish locale file * Added Dutch locale (#134) * Added Dutch locale * Update changelog.txt --------- Co-authored-by: oorzkws <65210810+oorzkws@users.noreply.github.com> * Autotech 2.0 (#136) * Adapt codebase to style required by autotech 2.0 * Regenerate cache files. * Remove ignore_for_dependencies flag. * Fixed personal roboport mk02 being unlocked too late. * Regenerate cache files. * Changelog * Enforce linux-style line endings. * Regenerate cache files. --------- Co-authored-by: DimeWolf <137341769+Starl1ght5@users.noreply.github.com> Co-authored-by: oorzkws <65210810+oorzkws@users.noreply.github.com> Co-authored-by: QatSquirrel <79841562+QatSquirrel@users.noreply.github.com> --- ...alprocessing+pyfusionenergy+pyindustry.lua | 536 +++++++++--------- .../pycoalprocessing+pyindustry.lua | 492 ++++++++-------- cached-configs/pyindustry.lua | 204 +++++++ changelog.txt | 20 +- info.json | 2 +- locale/es-ES/locale.cfg | 233 ++++++++ locale/nl/locale.cfg | 232 ++++++++ prototypes/buildings/megadar.lua | 1 - .../equipment/portable-gasoline-generator.lua | 2 +- prototypes/technologies/accumulators.lua | 6 +- prototypes/technologies/asphalt.lua | 4 +- prototypes/technologies/railway.lua | 7 +- prototypes/technologies/warehouses.lua | 3 +- prototypes/void-recipes/fluid-void.lua | 2 +- prototypes/void-recipes/item-void.lua | 2 +- 15 files changed, 1195 insertions(+), 551 deletions(-) create mode 100644 locale/es-ES/locale.cfg create mode 100644 locale/nl/locale.cfg diff --git a/cached-configs/pycoalprocessing+pyfusionenergy+pyindustry.lua b/cached-configs/pycoalprocessing+pyfusionenergy+pyindustry.lua index 6016c0a..db61079 100644 --- a/cached-configs/pycoalprocessing+pyfusionenergy+pyindustry.lua +++ b/cached-configs/pycoalprocessing+pyfusionenergy+pyindustry.lua @@ -1,278 +1,258 @@ -science_pack_order("automation-science-pack", "001-000028") -science_pack_order("logistic-science-pack", "002-000063") -science_pack_order("military-science-pack", "003-000070") -science_pack_order("chemical-science-pack", "003-000110") -science_pack_order("utility-science-pack", "005-000158") -science_pack_order("production-science-pack", "004-000147") -science_pack_order("space-science-pack", "006-000213") -fix_tech("physical-projectile-damage-1", {order = "000007", prerequisites = {"military"}, unit = {count = 250, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("physical-projectile-damage-2", {order = "000008", prerequisites = {"physical-projectile-damage-1", "logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("weapon-shooting-speed-1", {order = "000007", prerequisites = {"military"}, unit = {count = 250, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("weapon-shooting-speed-2", {order = "000008", prerequisites = {"weapon-shooting-speed-1", "logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("stronger-explosives-1", {order = "000009", prerequisites = {"military-2"}, unit = {count = 100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("physical-projectile-damage-3", {order = "000010", prerequisites = {"physical-projectile-damage-2", "military-science-pack"}, unit = {count = 20, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("physical-projectile-damage-4", {order = "000011", prerequisites = {"physical-projectile-damage-3"}, unit = {count = 36, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("physical-projectile-damage-5", {order = "000014", prerequisites = {"physical-projectile-damage-4", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("physical-projectile-damage-6", {order = "000023", prerequisites = {"physical-projectile-damage-5", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("physical-projectile-damage-7", {order = "000028", prerequisites = {"physical-projectile-damage-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"production-science-pack", 3}}, time = 1200}}) -fix_tech("stronger-explosives-2", {order = "000010", prerequisites = {"stronger-explosives-1", "military-science-pack"}, unit = {count = 20, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("stronger-explosives-3", {order = "000014", prerequisites = {"stronger-explosives-2", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("stronger-explosives-4", {order = "000023", prerequisites = {"stronger-explosives-3", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("stronger-explosives-5", {order = "000024", prerequisites = {"stronger-explosives-4"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("stronger-explosives-6", {order = "000025", prerequisites = {"stronger-explosives-5"}, unit = {count = 800, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("stronger-explosives-7", {order = "000028", prerequisites = {"stronger-explosives-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"production-science-pack", 3}}, time = 1200}}) -fix_tech("refined-flammables-1", {order = "000011", prerequisites = {"flamethrower"}, unit = {count = 36, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("refined-flammables-2", {order = "000012", prerequisites = {"refined-flammables-1"}, unit = {count = 60, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("refined-flammables-3", {order = "000014", prerequisites = {"refined-flammables-2", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("refined-flammables-4", {order = "000023", prerequisites = {"refined-flammables-3", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("refined-flammables-5", {order = "000024", prerequisites = {"refined-flammables-4"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("refined-flammables-6", {order = "000025", prerequisites = {"refined-flammables-5"}, unit = {count = 800, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("refined-flammables-7", {order = "000028", prerequisites = {"refined-flammables-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"production-science-pack", 3}}, time = 1200}}) -fix_tech("energy-weapons-damage-1", {order = "000014", prerequisites = {"chemical-science-pack", "military-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("energy-weapons-damage-2", {order = "000015", prerequisites = {"energy-weapons-damage-1"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("energy-weapons-damage-3", {order = "000016", prerequisites = {"energy-weapons-damage-2"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("energy-weapons-damage-4", {order = "000017", prerequisites = {"energy-weapons-damage-3"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("energy-weapons-damage-5", {order = "000023", prerequisites = {"energy-weapons-damage-4", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("energy-weapons-damage-6", {order = "000024", prerequisites = {"energy-weapons-damage-5"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("energy-weapons-damage-7", {order = "000028", prerequisites = {"energy-weapons-damage-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"production-science-pack", 3}}, time = 1200}}) -fix_tech("weapon-shooting-speed-3", {order = "000010", prerequisites = {"weapon-shooting-speed-2", "military-science-pack"}, unit = {count = 20, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("weapon-shooting-speed-4", {order = "000011", prerequisites = {"weapon-shooting-speed-3"}, unit = {count = 36, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("weapon-shooting-speed-5", {order = "000014", prerequisites = {"weapon-shooting-speed-4", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("weapon-shooting-speed-6", {order = "000023", prerequisites = {"weapon-shooting-speed-5", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("laser-shooting-speed-1", {order = "000014", prerequisites = {"chemical-science-pack", "military-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("laser-shooting-speed-2", {order = "000015", prerequisites = {"laser-shooting-speed-1"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("laser-shooting-speed-3", {order = "000016", prerequisites = {"laser-shooting-speed-2"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("laser-shooting-speed-4", {order = "000017", prerequisites = {"laser-shooting-speed-3"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("laser-shooting-speed-5", {order = "000023", prerequisites = {"laser-shooting-speed-4", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("laser-shooting-speed-6", {order = "000024", prerequisites = {"laser-shooting-speed-5"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("laser-shooting-speed-7", {order = "000025", prerequisites = {"laser-shooting-speed-6"}, unit = {count = 800, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("artillery-shell-range-1", {order = "000019", prerequisites = {"artillery"}, unit = {count = 2000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("artillery-shell-speed-1", {order = "000019", prerequisites = {"artillery"}, unit = {ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("follower-robot-count-1", {order = "000011", prerequisites = {"defender"}, unit = {count = 36, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("follower-robot-count-2", {order = "000012", prerequisites = {"follower-robot-count-1"}, unit = {count = 60, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("follower-robot-count-3", {order = "000014", prerequisites = {"follower-robot-count-2", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("follower-robot-count-4", {order = "000015", prerequisites = {"follower-robot-count-3"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("follower-robot-count-5", {order = "000023", prerequisites = {"follower-robot-count-4", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("follower-robot-count-6", {order = "000024", prerequisites = {"follower-robot-count-5"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("follower-robot-count-7", {order = "000028", prerequisites = {"follower-robot-count-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"production-science-pack", 3}, {"utility-science-pack", 2}, {"space-science-pack", 1}}, time = 1200}}) -fix_tech("bulk-inserter", {order = "000013", prerequisites = {"fast-inserter", "logistics-2"}, unit = {count = 750, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("inserter-capacity-bonus-1", {order = "000014", prerequisites = {"bulk-inserter"}, unit = {count = 1200, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("inserter-capacity-bonus-2", {order = "000015", prerequisites = {"inserter-capacity-bonus-1"}, unit = {count = 2000, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("inserter-capacity-bonus-3", {order = "000016", prerequisites = {"inserter-capacity-bonus-2", "chemical-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("inserter-capacity-bonus-4", {order = "000020", prerequisites = {"inserter-capacity-bonus-3", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("inserter-capacity-bonus-5", {order = "000021", prerequisites = {"inserter-capacity-bonus-4"}, unit = {count = 800, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("inserter-capacity-bonus-6", {order = "000022", prerequisites = {"inserter-capacity-bonus-5"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("inserter-capacity-bonus-7", {order = "000023", prerequisites = {"inserter-capacity-bonus-6", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("automation", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("automation-2", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("logistic-science-pack", {order = "000007", prerequisites = {"lab-instrument", "automation", "ulric"}, unit = {count = 250, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("steel-processing", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("steel-axe", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("military", {order = "000006", prerequisites = {"fluid-processing-machines-1"}, unit = {count = 150, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("military-2", {order = "000008", prerequisites = {"military", "logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("fast-inserter", {order = "000003", prerequisites = {"automation", "steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("logistics", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("automated-rail-transportation", {order = "000006", prerequisites = {"railway"}, unit = {count = 150, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("rail-signals", {order = "000007", prerequisites = {"automated-rail-transportation"}, unit = {count = 250, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("automobilism", {order = "000004", prerequisites = {"engine"}, unit = {count = 55, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("optics", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("solar-energy", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("heavy-armor", {order = "000007", prerequisites = {"military"}, unit = {count = 250, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("gun-turret", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("research-speed-1", {order = "000009", prerequisites = {"automation-2"}, unit = {count = 100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("research-speed-2", {order = "000010", prerequisites = {"research-speed-1"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("electric-energy-distribution-1", {order = "000012", prerequisites = {"niobium"}, unit = {count = 450, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("advanced-material-processing", {order = "000010", prerequisites = {"concrete", "crusher", "filtration"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("concrete", {order = "000008", prerequisites = {"logistic-science-pack", "separation"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("engine", {order = "000003", prerequisites = {"automation", "steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("landfill", {order = "000005", prerequisites = {"separation"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("logistics-2", {order = "000012", prerequisites = {"logistics", "lubricant", "niobium"}, unit = {count = 450, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("toolbelt", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("stone-wall", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("gate", {order = "000003", prerequisites = {"stone-wall", "steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("chemical-science-pack", {order = "000013", prerequisites = {"advanced-circuit", "nexelit", "fine-electronics"}, unit = {count = 750, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("military-science-pack", {order = "000009", prerequisites = {"military-2", "stone-wall"}, unit = {count = 100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("production-science-pack", {order = "000019", prerequisites = {"coated-container", "nuclear-fuel-reprocessing", "filtration-mk02", "advanced-material-processing-2", "nenbit-matrix"}, unit = {count = 2000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("utility-science-pack", {order = "000022", prerequisites = {"kovarex-enrichment-process", "automation-3", "destroyer", "fusion-reactor-equipment"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}, {"military-science-pack", 2}}, time = 300}}) -fix_tech("space-science-pack", {order = "000027", prerequisites = {"rocket-silo", "fusion-mk02"}, unit = {count = 2250, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("military-3", {order = "000014", prerequisites = {"chemical-science-pack", "military-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("military-4", {order = "000020", prerequisites = {"military-3", "explosives", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"military-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("uranium-ammo", {order = "000018", prerequisites = {"uranium-processing", "tank"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("atomic-bomb", {order = "000024", prerequisites = {"rocket-control-unit", "rocketry"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("automation-3", {order = "000020", prerequisites = {"speed-module", "production-science-pack", "bulk-inserter"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("explosives", {order = "000016", prerequisites = {"sulfur-processing", "mukmoux"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("cliff-explosives", {order = "000017", prerequisites = {"explosives", "military-2"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("land-mine", {order = "000017", prerequisites = {"explosives", "military-science-pack"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("flamethrower", {order = "000010", prerequisites = {"military-science-pack", "coal-processing-2", "filtration"}, unit = {count = 20, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("advanced-circuit", {order = "000009", prerequisites = {"plastics"}, unit = {count = 100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("processing-unit", {order = "000016", prerequisites = {"sulfur-processing"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("fluid-wagon", {order = "000006", prerequisites = {"railway", "py-storage-tanks", "engine"}, unit = {count = 150, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("braking-force-1", {order = "000014", prerequisites = {"railway", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("braking-force-2", {order = "000015", prerequisites = {"braking-force-1"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("braking-force-3", {order = "000020", prerequisites = {"braking-force-2", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("braking-force-4", {order = "000021", prerequisites = {"braking-force-3"}, unit = {count = 800, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("braking-force-5", {order = "000022", prerequisites = {"braking-force-4"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("braking-force-6", {order = "000023", prerequisites = {"braking-force-5", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("braking-force-7", {order = "000024", prerequisites = {"braking-force-6"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("tank", {order = "000017", prerequisites = {"military-science-pack", "explosives"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("logistics-3", {order = "000020", prerequisites = {"production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("rocketry", {order = "000017", prerequisites = {"explosives", "military-science-pack"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("explosive-rocketry", {order = "000018", prerequisites = {"rocketry", "military-3"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("modular-armor", {order = "000010", prerequisites = {"heavy-armor", "advanced-circuit"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("power-armor", {order = "000017", prerequisites = {"modular-armor", "electric-engine", "processing-unit"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("power-armor-mk2", {order = "000023", prerequisites = {"speed-module-2", "efficiency-module-2", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("laser-turret", {order = "000017", prerequisites = {"military-science-pack", "battery"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("robotics", {order = "000017", prerequisites = {"electric-engine", "battery", "construction-robotics"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("rocket-fuel", {order = "000016", prerequisites = {"military-science-pack", "fast-inserter", "sulfur-processing"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("low-density-structure", {order = "000014", prerequisites = {"advanced-material-processing", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("rocket-control-unit", {order = "000023", prerequisites = {"utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"military-science-pack", 3}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("rocket-silo", {order = "000024", prerequisites = {"speed-module-3", "productivity-module-3", "rocket-control-unit", "super-alloy"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("research-speed-3", {order = "000014", prerequisites = {"research-speed-2", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("research-speed-4", {order = "000015", prerequisites = {"research-speed-3"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("research-speed-5", {order = "000020", prerequisites = {"research-speed-4", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("research-speed-6", {order = "000023", prerequisites = {"research-speed-5", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("electric-energy-distribution-2", {order = "000014", prerequisites = {"electric-energy-distribution-1", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("electric-energy-accumulators", {order = "000017", prerequisites = {"electric-energy-distribution-1", "battery"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("advanced-material-processing-2", {order = "000014", prerequisites = {"advanced-material-processing", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("effect-transmission", {order = "000022", prerequisites = {"processing-unit", "super-alloy"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("lubricant", {order = "000011", prerequisites = {"mukmoux", "filtration"}, unit = {count = 275, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("electric-engine", {order = "000014", prerequisites = {"lubricant", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("battery", {order = "000016", prerequisites = {"sulfur-processing"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("construction-robotics", {order = "000003", prerequisites = {"steel-processing", "automation"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("logistic-robotics", {order = "000012", prerequisites = {"construction-robotics", "plastics", "niobium"}, unit = {count = 450, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("logistic-system", {order = "000013", prerequisites = {"logistic-robotics"}, unit = {count = 750, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("worker-robots-speed-1", {order = "000013", prerequisites = {"logistic-robotics"}, unit = {count = 750, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("worker-robots-speed-2", {order = "000014", prerequisites = {"worker-robots-speed-1", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("worker-robots-speed-3", {order = "000020", prerequisites = {"worker-robots-speed-2", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("worker-robots-speed-4", {order = "000021", prerequisites = {"worker-robots-speed-3"}, unit = {count = 800, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("worker-robots-speed-5", {order = "000023", prerequisites = {"worker-robots-speed-4", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("worker-robots-speed-6", {order = "000028", prerequisites = {"worker-robots-speed-5", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"production-science-pack", 3}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"military-science-pack", 6}}, time = 1200}}) -fix_tech("worker-robots-storage-1", {order = "000018", prerequisites = {"robotics"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("worker-robots-storage-2", {order = "000020", prerequisites = {"worker-robots-storage-1", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("worker-robots-storage-3", {order = "000023", prerequisites = {"worker-robots-storage-2", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("energy-shield-equipment", {order = "000012", prerequisites = {"solar-panel-equipment", "military-science-pack"}, unit = {count = 60, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("night-vision-equipment", {order = "000012", prerequisites = {"solar-panel-equipment"}, unit = {count = 450, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("belt-immunity-equipment", {order = "000012", prerequisites = {"solar-panel-equipment"}, unit = {count = 450, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("energy-shield-mk2-equipment", {order = "000018", prerequisites = {"energy-shield-equipment", "military-3", "low-density-structure", "power-armor"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("solar-panel-equipment", {order = "000011", prerequisites = {"modular-armor", "solar-energy"}, unit = {count = 275, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("personal-laser-defense-equipment", {order = "000018", prerequisites = {"laser-turret", "military-3", "low-density-structure", "power-armor", "solar-panel-equipment"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("discharge-defense-equipment", {order = "000018", prerequisites = {"laser-turret", "military-3", "power-armor", "solar-panel-equipment"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("fusion-reactor-equipment", {order = "000020", prerequisites = {"power-armor", "military-science-pack", "production-science-pack", "low-density-structure"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"military-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("exoskeleton-equipment", {order = "000017", prerequisites = {"processing-unit", "electric-engine", "solar-panel-equipment"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("personal-roboport-equipment", {order = "000017", prerequisites = {"construction-robotics", "battery"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("personal-roboport-mk2-equipment", {order = "000023", prerequisites = {"personal-roboport-equipment", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"military-science-pack", 3}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("fluid-handling", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("oil-processing", {order = "000014", prerequisites = {"chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("advanced-oil-processing", {order = "000020", prerequisites = {"production-science-pack", "fuel-production"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("sulfur-processing", {order = "000015", prerequisites = {"oil-processing"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("plastics", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("speed-module", {order = "000010", prerequisites = {"advanced-circuit"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("speed-module-2", {order = "000017", prerequisites = {"speed-module", "processing-unit"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("speed-module-3", {order = "000020", prerequisites = {"speed-module-2", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("productivity-module", {order = "000010", prerequisites = {"advanced-circuit"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("productivity-module-2", {order = "000017", prerequisites = {"productivity-module", "processing-unit"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("productivity-module-3", {order = "000020", prerequisites = {"productivity-module-2", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("efficiency-module", {order = "000010", prerequisites = {"advanced-circuit"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("efficiency-module-2", {order = "000017", prerequisites = {"efficiency-module", "processing-unit"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("efficiency-module-3", {order = "000020", prerequisites = {"efficiency-module-2", "production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("defender", {order = "000010", prerequisites = {"military-science-pack"}, unit = {count = 20, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("distractor", {order = "000014", prerequisites = {"chemical-science-pack", "defender"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("destroyer", {order = "000021", prerequisites = {"military-4", "distractor", "speed-module"}, unit = {count = 800, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"military-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("uranium-processing", {order = "000016", prerequisites = {"concrete", "sulfur-processing"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("nuclear-power", {order = "000017", prerequisites = {"uranium-processing"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("kovarex-enrichment-process", {order = "000017", prerequisites = {"uranium-processing", "rocket-fuel"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("nuclear-fuel-reprocessing", {order = "000018", prerequisites = {"nuclear-power"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("mining-productivity-1", {order = "000010", prerequisites = {"advanced-circuit"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("mining-productivity-2", {order = "000014", prerequisites = {"mining-productivity-1", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("mining-productivity-3", {order = "000023", prerequisites = {"mining-productivity-2", "utility-science-pack"}, unit = {count = 300, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("mining-productivity-4", {order = "000028", prerequisites = {"mining-productivity-3", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"production-science-pack", 3}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"military-science-pack", 6}}, time = 1200}}) -fix_tech("artillery", {order = "000018", prerequisites = {"tank"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("spidertron", {order = "000024", prerequisites = {"exoskeleton-equipment", "rocketry", "rocket-control-unit", "efficiency-module-3"}, unit = {count = 500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("circuit-network", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("coal-processing-1", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("coal-processing-2", {order = "000009", prerequisites = {"chromium", "methanol-processing-1"}, unit = {count = 100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("coal-processing-3", {order = "000014", prerequisites = {"chemical-science-pack", "wood-processing", "mukmoux"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("syngas", {order = "000004", prerequisites = {"tar-processing"}, unit = {count = 55, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("tar-processing", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("energy-1", {order = "000006", prerequisites = {"boron"}, unit = {count = 150, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("energy-2", {order = "000010", prerequisites = {"coal-processing-2", "advanced-circuit"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("energy-3", {order = "000018", prerequisites = {"energy-2", "desulfurization", "processing-unit", "acetylene", "fuel-production", "advanced-material-processing-2"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("methanol-processing-1", {order = "000008", prerequisites = {"logistic-science-pack", "py-storage-tanks", "engine", "energy-1"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("methanol-processing-2", {order = "000014", prerequisites = {"chemical-science-pack", "mukmoux"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("cooling-tower-1", {order = "000007", prerequisites = {"energy-1"}, unit = {count = 250, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("cooling-tower-2", {order = "000011", prerequisites = {"cooling-tower-1", "energy-2"}, unit = {count = 275, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("excavation-1", {order = "000012", prerequisites = {"lubricant", "niobium"}, unit = {count = 450, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("excavation-2", {order = "000014", prerequisites = {"excavation-1", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("biofilm", {order = "000014", prerequisites = {"chemical-science-pack", "wood-processing"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("filtration", {order = "000009", prerequisites = {"separation", "automation-2"}, unit = {count = 100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("filtration-mk02", {order = "000016", prerequisites = {"sulfur-processing"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("desulfurization", {order = "000015", prerequisites = {"oil-processing"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("crusher", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("separation", {order = "000004", prerequisites = {"coal-processing-1", "engine"}, unit = {count = 55, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("fluid-separation", {order = "000016", prerequisites = {"sulfur-processing", "mukmoux"}, unit = {count = 450, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("fuel-production", {order = "000017", prerequisites = {"cooling-tower-1", "lubricant", "fluid-separation"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("fine-electronics", {order = "000012", prerequisites = {"fluid-processing-machines-1", "niobium", "kevlar", "plastics"}, unit = {count = 450, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("fluid-processing-machines-1", {order = "000005", prerequisites = {"separation"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("ralesia", {order = "000005", prerequisites = {"creosote", "optics"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("ulric", {order = "000006", prerequisites = {"ralesia", "fluid-handling"}, unit = {count = 150, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("wood-processing", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("wood-processing-2", {order = "000008", prerequisites = {"wood-processing", "logistic-science-pack"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("lab-instrument", {order = "000006", prerequisites = {"boron"}, unit = {count = 150, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("niobium", {order = "000011", prerequisites = {"crusher", "organic-solvent"}, unit = {count = 275, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("nexelit", {order = "000010", prerequisites = {"fluid-processing-machines-1", "coal-processing-2"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("chromium", {order = "000008", prerequisites = {"logistic-science-pack", "separation"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("organic-solvent", {order = "000010", prerequisites = {"coal-processing-2", "filtration"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("mukmoux", {order = "000010", prerequisites = {"coal-processing-2", "advanced-circuit"}, unit = {count = 160, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("kevlar", {order = "000011", prerequisites = {"organic-solvent"}, unit = {count = 275, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("creosote", {order = "000004", prerequisites = {"tar-processing"}, unit = {count = 55, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("pyrrhic", {order = "000028", prerequisites = {"space-science-pack"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"military-science-pack", 6}, {"chemical-science-pack", 6}, {"production-science-pack", 3}, {"utility-science-pack", 2}, {"space-science-pack", 1}}, time = 1200}}) -fix_tech("artillery-2", {order = "000019", prerequisites = {"artillery", "railway", "processing-unit"}, unit = {count = 2000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("artillery-shell-range-2", {order = "000020", prerequisites = {"artillery-shell-range-1"}, unit = {count = 3600, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("artillery-shell-range-3", {order = "000021", prerequisites = {"artillery-shell-range-2"}, unit = {count = 6000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("artillery-shell-range-4", {order = "000022", prerequisites = {"artillery-shell-range-3"}, unit = {count = 10000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("artillery-shell-range-5", {order = "000023", prerequisites = {"artillery-shell-range-4"}, unit = {count = 16000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("artillery-shell-range-6", {order = "000024", prerequisites = {"artillery-shell-range-5", "production-science-pack"}, unit = {count = 3600, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"military-science-pack", 2}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("artillery-shell-range-7", {order = "000025", prerequisites = {"artillery-shell-range-6"}, unit = {count = 6000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"military-science-pack", 2}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("artillery-shell-range-8", {order = "000026", prerequisites = {"artillery-shell-range-7"}, unit = {count = 10000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"military-science-pack", 2}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("artillery-shell-range-9", {order = "000027", prerequisites = {"artillery-shell-range-8", "utility-science-pack"}, unit = {count = 2250, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("artillery-shell-range-10", {order = "000028", prerequisites = {"artillery-shell-range-9"}, unit = {count = 3600, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("artillery-shell-range-11", {order = "000029", prerequisites = {"artillery-shell-range-10"}, unit = {count = 6500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("artillery-shell-range-12", {order = "000030", prerequisites = {"artillery-shell-range-11"}, unit = {count = 10000, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) - -fix_tech("diet-beacon", {order = "000015", prerequisites = {"speed-module", "productivity-module", "efficiency-module", "electric-engine"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("advanced-mining-facilities", {order = "000014", prerequisites = {"chemical-science-pack", "excavation-1", "logistics-2", "wood-processing"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("sc-unit", {order = "000024", prerequisites = {"helium-processing-mk02"}, unit = {count = 3600, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("fusion-mk01", {order = "000025", prerequisites = {"energy-3", "sc-unit", "boron-mk02", "fast-inserter"}, unit = {count = 6000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("fusion-mk02", {order = "000026", prerequisites = {"fusion-mk01"}, unit = {count = 10000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("fusion-mk03", {order = "000027", prerequisites = {"fusion-mk02", "utility-science-pack"}, unit = {count = 2250, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("fusion-mk04", {order = "000028", prerequisites = {"fusion-mk03"}, unit = {count = 3600, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("diamond-mining", {order = "000017", prerequisites = {"electric-engine", "advanced-mining-facilities", "fluid-pressurization", "fluid-separation", "acetylene"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("regolite-mining", {order = "000022", prerequisites = {"super-alloy"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("molybdenum-processing", {order = "000017", prerequisites = {"advanced-mining-facilities", "fluid-pressurization", "filtration-mk02", "excavation-2"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("nenbit-matrix", {order = "000015", prerequisites = {"fluid-pressurization", "advanced-mining-facilities"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("vanadium-processing", {order = "000018", prerequisites = {"xyhiphoe", "fluid-separation"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("helium-processing", {order = "000020", prerequisites = {"production-science-pack", "fuel-production"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("helium-processing-mk02", {order = "000023", prerequisites = {"liquid-petroleum-processing", "regolite-mining", "ethanolamine", "advanced-oil-processing"}, unit = {count = 2250, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("super-alloy", {order = "000021", prerequisites = {"helium-processing", "molybdenum-processing", "vanadium-processing"}, unit = {count = 800, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("kmauts", {order = "000020", prerequisites = {"production-science-pack"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("ethanolamine", {order = "000022", prerequisites = {"energy-2", "super-alloy", "kmauts"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("liquid-petroleum-processing", {order = "000020", prerequisites = {"production-science-pack", "fuel-production"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("xyhiphoe", {order = "000017", prerequisites = {"fluid-pressurization", "advanced-mining-facilities", "filtration-mk02"}, unit = {count = 750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("wood-processing-3", {order = "000018", prerequisites = {"wood-processing-2", "xyhiphoe"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("boron", {order = "000005", prerequisites = {"coal-processing-1", "syngas"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("boron-mk02", {order = "000021", prerequisites = {"helium-processing"}, unit = {count = 800, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("kovarex-enrichment-process-2", {order = "000020", prerequisites = {"kovarex-enrichment-process", "production-science-pack", "molybdenum-processing"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"military-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("fluid-pressurization", {order = "000014", prerequisites = {"chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("coated-container", {order = "000018", prerequisites = {"diamond-mining"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("acetylene", {order = "000014", prerequisites = {"chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("py-storage-tanks", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("py-asphalt", {order = "000009", prerequisites = {"concrete"}, unit = {count = 100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("py-warehouse-research", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("py-warehouse-logistics-research", {order = "000014", prerequisites = {"py-warehouse-research", "logistic-system", "chemical-science-pack"}, unit = {count = 160, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("railway", {order = "000005", prerequisites = {"wood-processing", "creosote"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("railway-mk02", {order = "000012", prerequisites = {"railway", "niobium", "nexelit", "plastics"}, unit = {count = 450, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("py-accumulator-mk01", {order = "000018", prerequisites = {"electric-energy-accumulators"}, unit = {count = 1300, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("py-accumulator-mk02", {order = "000020", prerequisites = {"py-accumulator-mk01", "production-science-pack", "processing-unit", "construction-robotics"}, unit = {count = 450, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("radars-mk01", {order = "000008", prerequisites = {"logistic-science-pack", "engine"}, unit = {count = 55, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("radars-mk02", {order = "000015", prerequisites = {"radars-mk01", "electric-engine"}, unit = {count = 275, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("py-burner", {order = "000011", prerequisites = {"advanced-material-processing"}, unit = {count = 275, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) +return [[ +AHsAYQBjAGUAdAB5AGwAZQBuAGUAPQB7AGMAbwB1AG4AdAA9ADcAMAAwACwAZQBzAHMBBwB0AGkAYQBsAD0AdAByAHUAZQAsAGkA +bgBnAHIAZQBkAGkBGQBzAQoAewAiAGMAaABlAG0AaQBjARwALQBzAGMBKgBuAQIALQBwAQEAawAiACwAMQB9ACwBLgBsAG8AZwBp +AHMBGgBjATcBOQEHATwBPgBjAUABQgFEAS4AYQB1AHQAbwBtAGEBGgBvAG4BTgE6AVEBPwFBAUMBRABvAHIAZABlAHIAPQAiAVgB +WgB0AGUBMAAtAFsBEwAwADEAMwA2AF0BdAEBAQMBBQEHAGUAXQFBAHABJwEnAHEAdQFKAGkBcQEsAS4BMAEyATQBNgE4AWIAZQE9 +AWQBRAEaAG0BCQAzADABRABbAW4AZAB2AGEBOwEoAC0BOQByAGMBiAB0ACIAXQEKAQwBDgEQAZsBFAEWARgBDwEbAR0BHwEhASMB +JQEnASkBKwEtACIBRwFJAUsBNAFhAVABlAFSAVQBQwFFAW4BWQFbAV0AaQFfAcUBowGVAVMBZQB9AWcBaQFrAW0BbwBvAXEBcwF1 +AXYAOAAyAXsAWwBhAaABogECAGQBpQBpAacBqQGCACwBhAFrAGUBhwGJAYsBCgAiAHAAbABhAcMAYwBzACIBlwBpAZkAPQGbAZ0B +nwGhAaMB6gEMAG0AYgEkAV0BaAH+AawBCwENAQ8APQAxADcANQEVARcBGQG2AD0AZgEcARgBugEmASgBOgB0AYwBRgFIAUoBTAHS +AWMB1QFVAcsB3AFcAV4BYAGSAcYB1AHJAdcALAFoAWoBbAHMAXABcgBoAXQBdgAwADYANQHkAeYCBwHpAaUBWwIMAG4CDgByAHMB +7wHxAYYBiABzAYoBFgH3AaYBqAGKAC0BCAB0AHcBaAFAAgACAgIEACwBngJHAegBpAIxAWsBtgE9AHIAbwECARcBJABnAasBrQIT +ARAAMgAyAhgBswIbARwBHgEgASICcgG8AiQCJgHAAigB/AIrAccBZAIuAVcBzQIxAdACMwFPAdMByAHWAdgCOwHbAc0B3gJAAeAB +EwA2ADcCRgHnAggALQJqAHICbAGEAm8BswJyAlEBhQHzAlQCVgGMACIAZgBpAGwBHwHPAV8BQQEvASAAcwExAHICtwEMATsBJwFx +Af8ALAGYAZoBnAJlAgYCaAHqAqMCpQJuAnACVQElAC0AMgJ0AhIBrwERARMCGQG0ARoCfQG4AoABuwIjAb4AewGNATEBMwE1AGwC +iAI2AdYBywHBAikBxAI0ApICigHKAowBWgKOAdEC7gIsAjcClQHaAj0B3QI/AkEBEwAxADIANAKfAkgCaQFdAmsBNgKmAs4CcgLR +AqoB8gH0AlUB9gLiAY8C5QLnApMALALIAqECywMIAs0CqAElAsICxAIDAsYCZgKgAkkBMwBuAwsCHgE5AGwBigEqAhACdQLVARIB +sgIaAbUC2wJ/AiECggLgAxIC5AGRApEC9wLpAicBwgIqAvYCiQItAvEC+wL0ApABkwLoAVUC+QI8AdwCmQL+AXcAMwA5AwMCyQKi +ASQDKAEBArIDLAEWAw0CUwH1AlcBLgBlAHgBNQGhAjIALQAxArcC6wH8AHMC0QK9AuMBkALmA0MDSwAiAl8AbwHqAwkDHQJzAmIC +xQIFAmcCoQBvArICbQKnAnEDHgIRAa4CFAAxADYC1wJ7AzQBtwM2AoEC3wEPAoQCpgBkAHUAYwNnA3MDFgNGAY4DOwNyAz0DRAI3 +AuoChgNCA6ADSwNGAjACtQNJAjUDmwI4AjoC+gNPAv0CmwAyADADVAF8AyQBpAOBAuYDeQOFAGcDXgKsA2ACrwOVA5cDmQOmAxYC +sAEhA7sCbgOWA5gCjwMfAgEBCQOLAUQAYQByARoAbAEGAHIAeQMvA4kDtAMyAtkCHAIeAGwCIAORAb0DkwG/A50DcQMVAvABVgKF +A0EC7QPGA+sCLwKNA6oD6gNFA+wBMwMrAHQD1AB5A/UC+AI5AdkDTgKYA7IBdgAxADgAMwJGA9UCsgPYAHkDvwMPAq4B9wP6AG4B +VAAiAHIB5gPUA20AbQBrAXcDzwJjAyIBbgQJA9cBawP8AtIDhwJ2AhUANAOMAzMC2gEdA+ED4wLeA+UCJQPnA3ADFAOaA/EDQALs +AU0ENQP2A/IC8wP0BDoDogEuA/gBigP7A/0ClAP/ApYC+wNQApsAMQA5ADgECAPWBAsDDAGDAqsEDgMRBB8EUAQiBBwDfQLHA9QE +WAPZATcBMQPXAC0EFQElAZQDaQQlAtUAMQQoA94CfAQsAh8C3QIiBDAChAPoBDQD8AQ7BDcChwQ/Az8DRwQ+BHYEQAAiBEID+gRf +BHoDTARHA7AEAgHfBAQAOQF6AXwEIARRAroAZQRiBGQAZwRmBA0CrQRWBF0ECgRZA3wDIQN+BI4EIgRgBJEC5gSTAZQEJAPbARAD +igQpA98CfQQtBHADOAPmAuEBLwQzAzwDSgOtA6MD7gQ5BH4EewOpA8UEtQQ2BIADWwSCA/wEhAFmBIYEAQI+BIkBEwPdBE8EmgSD +BGEEowGiBJQEUgHwBFQElwNhBFcEzQTDBM8EYwTRBGYEWgSdBFwEnwTOBKIE3ARlAC0AMwLTA4gCdwF2AtgEbQIdBG8DNwOSBDEE +sQR0BLQDrAS/A2sDpQS+BHcEfAS9BPcE/ASBBEQExAOuBAAClwTIApoBdgAyBAUEzAQhBOMEkgTdBOcElgPBAfcEmQUNBNoE5ASk +A24EnAJkAmYE4gUXBQ8E5gA0BOkEJgJ4ADUEbAOOBO8D4gSuBPIEcwSzA58E+wR/BPkD7wUwBLsD8wT+Au8FAATBBQIEugSFA68E +xwL8BMkAMAUlBQwEjwTbBRkDAgRTAw4E1gKvBRUFRQUYBRAE6AUbBB4FTQSgBJAFIATSADUFIwLVAnkEqgTuBK0E8QRyBDIDEwT2 +BTgFMQOkBTME/wR/BLwCjwRFAosEwAP5BTsFNAU9BQUESQQDBMoAMwHjBI0EXgUfBNAE5gJFBUkDXwMQBNcFVAUOBX0E0gUiBVIE +ngV7BKEFVwGUADYFWgIUADICFwUnBCsFKQQuBHECgwG/A8MDzQL1BTwDnAUuBW0DRgUyBLkFcgOoBTYFbAUDAcsFAQSDBZ4FBARI +A7EFQQVcBUQFVQVGBRABegWAA8AFggVMBR4FjAWGAZQFWQMXBZsFNwM+BJwD0gThBYsFVgW+AC0ANwWQAbABsQTtBSgFXwPkBZkE +sQXCBagFrQHLBPUFLwVpBHsFowWhA+wFawWdBaUD9wU6BawF4wNNBQYFQAUIBMoANQROBXoE2QW9BOUE0gKeBbgEVQWDBbwFyQXy +BY4E3wXGBR0FyAW1BOYAOAXNAgMDiwWUA+AE8AXTAzkB+APLA8QF1wXjBdkFoAWpBHgE+gXcBW4F4QOrBWUEewWrBMMFrQXoBXUF +sQA2AwIF7wUWBfEFGQROBfUFSwUUBfgGAAXzBfwFUwYrBU8E5gA5BgMEawYGBKwGCAQvBdQBLgFZBMEGHAYPAS4F1gXiBhUFnwVj +BdsGGQVuBd4GEgT9Bg4GQwXkBXAF5gZNBh4FsAXrBUIANgSMAeUGMAWNAC0DVAYoBRMBVwZZBcoGAgMXBjwD+QY+BdwFxQYvBf8G +MQTSADEAMAY0BSYGNgRuBSoFYAY6ACIGZAGKBmYGRwNGBkEGGAM+BW4F2gXfBLcEOAaBAvIBzgXDA6EGGgXlBnkGfgTFBT4F6QRK +BQkANgXuBlgGagZaBm0FEgW6BioGlQXKBjMGaAWKBfAF+QUZADEEZwSnAD0GcAZxBZYFKwVhBLEGdwEEBoQGCwN3Bg0GQgZ6A+wG +gAZKBkkF2AaFA0gGrwYbBd8GUgSIBlQFkgAxBbMFhQX6A2gGwwZdBpkGXwabBsYGbQYuBp8GJAahBRADAAYDADUGcAXQBZUF0gY5 +BgoGrQaLBogFbgZ8Bq8Gtga5A+0GgwZKBhcGvAaKBr4ExgaPBXYFQgA3BlcFhAV8Bs0B4wbJBA8GywagBiwEZgNpBp4Fxwb5BmsE +ZgToBGgBDwBfAGYBaABtAHUB+gFtACgGBQAwACkAIAArACAAMgBeAEwAKgZtARMBQQONBtkGOAWYBgoAcwFSAZQGSgbdBq8G4QZK +BuMGPwblBHkG5AboBkoGvQUDBr8FBwNRADIAOAJFBiMFTgaWBAcG9gSYBmAG9AK3As0AawEDATcCsgBvBs8G/gbRBNsHHwBlAaQG +pALUBwQHBgByBwgHCgAiACgEagETBw8HEQcXADAAKwAzAF4AKABMA2gAKQcWAXYHGQQqBgcGcwYJBLADOgPpBrcFZwWkBk0EPAaG +BkwGtAWqBuoHLwbsBh8GVARMAp4HNgW0BOQHSQdLBpgG9wTYBRYE3wUcAW4C8wHEAGICSwYDBVwGqAbaBx0HaQZ2A9YGeAckBgwF +nAZ9Bt8GRAOeBq8GuAcoBywG5AcuBh0HdwZTBzIANAbDAXwHiAFNB4oCCweBBFYHIwSEBBQCbwdAAR8AeQdFAmYFNgGkBBUDggK0 +AG4HHwFoA/oCMgYDAkQG2AdmBZcErwTzBroEfQXnB6MGwANRADAAMwd7AeUHuAHqB7oC5ge8B74D1QOqB60E1wfVAHcAYQe1BJwD +tAPTBacBXwalAnkHxAM1AbkHaAfIBksGswaMBa4EhwcxApsBdwc1B9IEPQIyB9sCrwSRAXIBHwFfATQB/gfhBVMH5AFgBKYHTQSo +A7QH6AOPB+oG2weRB50HbwfJBocDpwfwBT8GkAF2ADQH0QboBvUE1AVKBl4HKQYUBhkFiQRcCAME5wYDBKkGqALcBnQGCgclBuQH +JwgPCB4FaAdzCBAHcgfvBzAF6gcyB88CRggjBzkIGwWBB4IIKwVyACIAYgcJAGsALQEkARgD1QFrArcHfwLKBrEBBge2B+0HmALo +AhEHGgIcCCgGjgd4B84FQgg5B/cIMwOhB/kB9wFLAGUAYQBtAT0AbwB3CEkCOAIwAG8CDAMrAHMAbQalADMAMwgJBqkIKQeRB58H +ywhXB6QH8wJ5CFsBWwhrA1sIbghfA2IBJQEkAGUE3wfiACwAYgFdAXED2QalADkFXQUoCCgH6wUtBkUHnAdtBq8IdwZRB8wH8gQE +BSYB5AiKAHQIjAQMBzoE1wBzBwkAZgB1AHIDgwMKAx4IIQGeCKAIogAtA8AAcAGZAQ8IJQTsCFQGNwdnCAwH7AgtCDEILwduCL8I +mQa0CDUIFQF3ADcHpwBbCLAEoAizCLUAdAiCCEEIiwRZAxcAcwBvAfoIqgE+AQgC5gjNARkHhQQeCMsEXwQZADIIsgH0CLQI3QcD +CAcIkAcbCLsHkAi9BhEG5AgOCMIIIwd2CHkHzQRLCI8InwjSCOEAawjjCNwBDwjQCOAD/Aj+AaoFwQhmAWsALQPUAG0BaANqCGYA +LQFqB70HlAFLASADmAipCIYIrghBBJEAdAhFAG0HCAMnBq4JAwfCCOoHxQaqBnUI8QfvB3AGuwj0BXQIegQEADAGkwBiCRkJGwkd +B5QJAwjQCNUI1wGVCNoI5AGICOYItgghAgwAbwKxAGwIbwgGAtYHjgccB8cIlAebB2wEuAiYCPMHogj1CJwC/whxCJ8B0AlCAG0I +0Ai+Bn4DdQBvA3cIqwN6CN4BRAeKAm4AbgalADQCegdlB+kJJAYKCMMINAibCDYH8wAzCMkJYwFfCTYAeQElAfsCvQBvAxsDhALP +AGcDaAiHCN8BaAHRBBkFQgeMCLgJaQgKCWsHkQg/CC4JWgeZA+wJJgmQCSgHygiaCVEJcAUJAwEInwmDAWAJhQgaAlIFuQeCBGEA +aQB1CGQDvAl+ArcDfwJJA7oJXwO9CE8AYgQVAGsDKAFoATwHTATqCUYIcwePCUkFYglLCPAIlwbnCU8IeAkrCPYEBAO0CJ8JsQmz +AacElQikAq8JjwN0B90H3wlhAscJsABhCbIC0AdPATwIBQm3CI8JRwjsCbsE9AjvBygJkggSCZQIEQOtCMUG7gRqBAcBdAnUCdYJ +fwnYBKUJAAnICdcJtATeCRcJ7QnJATwHAgalCCYJuQlIBSwFmgeWCeYEvwnOBLYGEwgwCScIMgfuCZAJ6AWxADAGIgjKCfMJ7wn1 +BREJzAH3CY0GRwhBChIALQnwBRoCwwPQAD0F/QoaCdUJ+QGUBSII6AA9A90J3QfGCgAF1QoCCF0J5AdqBHUJ4gm/BysJwQmWCcMJ +UgVCBQoJxwokCfQJygAtBUgIPAmhBFYJ+Ao/CfoJrwobCh0FWQooBSUKKwmLB+wKGAoJBLIIlQlMBuYKNghcCgsIEgoNBsEHMwo9 +Ce4KHAoUBX8KQwX2Aq8KRgoTCkAFiAofAgIKIgpnCmEKQAWPCk0G1wi5BnIKLAarBjsHkwauBkoKUgmTCjIFZApTCeMKBghQBukG +TwbeClsJbwjGAwEJLwpKChQFtwpkBikBLgpuCksCtwevBLoG/QivCowKQAXMCk0Fkwn+Cd4KLQp4Bj0HlQaxB5cG4gnhCC4KgQS/ +CW0KfQVvBEMGUAjECogG7gJ5BlcKkgoUBfQKjwgdCrUKcAmvCEMIRQe9AWsIjAYDAzEIcwiSCLwChAqpBPwKqwoxClQJvQnCBa8J +xAL/BQsJ7Aq9CEYKwAFrCVkKpwoZAh4BSwq+CEcKwQkXATUAcgBnAG8ALQH6AG4BKQLQAT4CCQBhAVIGeAXNBwUHBwcJAGEHCwan +B1cHEgddB18AMQdhCioHZASrCnUKUAKECpUHKAp8CssKBQT4CjUHngo3CL8HoQrOB/EJmATKAhcB5ArhCuMK5QGiCugJfwrqAaUK +7ANaAQQI0Ac/B0ECVQFHCE8LBgHVCigGBQrEA5AKxgG/CsgFagsKCW4JlwjGBm0H9QskAGsI0AKxAQgIsgEGA5gJZAf/CakDuAIJ +AewCWgkEACIBCAB4BJEBignSATACbgEzCaUJ/AgICnQCfggLCO0KxwsICC4KygnnCrEFQQAwADUH0QtKAVsJpAlYChYKBwjBCVsB +GAE+BBUHwQrgC0EBqQJcAQMCXwByAUAKKAMACk8IdQfsCywFNQpZCFELWAswBu4LWwnrAFsCWQtsAl0Lbws1C2IIwARFCuADKwBm +AGYIsgB4AfkAbwJVAHYBFgi3CSIIugp2BnULNAXdC1UI8gt5BusLfAVBADEF7QsSC4oLjANjC48LkQNdC4YLpgFHC6gB/gMXBr0C +0grgCXsC5gMrAYcAZQMpB8EKTQmICv4IdAiTCgEKpAoDBPwLmQZIC5sKUwtXA+sKXAcyAngLEguzCuUAaQu2C7gCjwjQCaoDuQOC +CacCcgsjC80L1wLQCbYFJAAyCygLUgnfCgoLegvIC1kGVAF3BXkLgAvaAxwDvQNoC9MLLgaICAECBQEMCXwIrAl/CdoL3gloC7wK +xQtTCysLxQqsC8cD9gvJB/MGkgvMC/UDegTTCaAKZQH3CUICtAfBAxcLXgtMAG0J0gGeC/QDygl9AwsJ+wlFCsMLUAm6CqAKzAdr +Cb4JTQnAC50JKgrPCjoBeAjJDBYJrQl+ChUKuAbKDCAKMwYVBIAAdQBrCQoAdQB4ArcDdgN4C+wJqAuyAwYCCQFfA/oIhQK8C3ID +3QvgCwAJvAwhCjQMIwpYB3EKWgt7CjkLDwF3ADkKEAv0AXEMQQEPAGEMRAjQASkIYwFfAsoDWAitCmsEWwK+AGMCwAEJCUULcwxI +C3ULVAxNCwkMJQlQDFIIxgtbADALzAK/AQMBgQuGC3cI1ABlC2cDqgwUAS8BXwkSBrIBYAJuB4oBTAMuCUUIcQqeC5cJbAvwCocL +nwvnCZoBdAK+DIQKpQyHAd0H/wvvC3kISgFxBJEMLAvYC/ICxwEMCNYDCwFaCGcIqgvdAtUIjwyNDEkEsQwBA/4MkgfOADQLfwyl +AysC0AyoCQcGyAwvB4IBgAriA/wG/AxkCikEHgy3DKcJBgiqC/gC1QlnC3QLvgSxDHwFpgxxCw0IFAnpAXcLzAymDLkMyAwJBNUI +HQy/AGcEIwl6DNgJfwy6DKoLSQEnC5AC/AhwCHILUAv8C+IKgwwmCw4MdApeDJUM5wjVAXEI0ASCDKEMYwMgCIgMZwB1BJABbAxq +C08JiQtRDK8LYwlODNIKOAwnDFMLWwszArkCuwjQC3cIIQFqAGYBBwKWCUUFJQxsDM4NBwwkDE8L5AU5CoULngxzC30ANwvpDRQN +FgrXC4YLDAZnDMMCZAFqCRIAbwB5AdoNGAu7BO4M7QwfCwQKggvDBaIL/wrLDLEGiQ0hDPAM1AWxCcYBdA0vB/0NMgByCNAGvQUi +AxcBKQkSAQEBWgK8CNQAcAdKCEwDlghOBv0NLwinCKkAaQB6A6oGpQwcDQQNNwp3DDEKfwqsDNAF4AyQDFENCwsxADMKEA1bAGwI +qAKkDV8H+AuGC5kJFwxeCQoK5wNXAycDhgn8DTUIkQspC/0J4ApVDCIKVwxwDR4NIg1tCekG8AHkDXoMYA19AqkLhgBmAGwBiAHq +C2YD1AyAAxcMDQtoBWwJngs+AwQMYQ1+Ce8DWgP5Ay0Ctw2VDZcCbQGzDV0NdQPOAxcH+ws7AcQBBwFJAQgMgQG9CRoJMAEBArYK +KAncDK4MbQxKDDIIvw1pCeUKMA1sDPEJ6QlnDY8BKg26CGICvgjQDbIBHw20CIQNtw2xC4sBNAFiA/wJCg1YCIYNVA1WAqIITQkW +DS0EHg1PATAD1ATSDScKvwk7AGkJPQGqDEYLlQr/DcENhQrNCqgNPQqCDT8Fbg0rCrAMswRLADgH0Q3mAGgN6AGUDeoBGA3sDe4N +EQH7CQcAdAipAsACtwBwDNoJCQkLC68G6gToCNQI1gPUCTkMoAkgDRMCKQQVA5gBaA1hDfENBQ3zCn4GRgqADfcKqg1rBL8N+wsv +DSMLoAzzAFsNTwK0DiANSg13CtkJWw3qAjsMgQu3DRUDmAAtB9cBMwJxDb0H5gVcDcANGwawA8wLwQR/DTsJkQ4pCskOKwwCC+YL +ygO2AFsOPQf8DkAEZAhuAUoCVQl1C4YIpg1VCKoBHAFHB7UFwQw9AwsBDgtICpcAIg49DdkBUA3bDeIGbwzNCyoMzw5PCy0NCQ38 +Di8HeQETAeQObQM9DnAN3QjQBdYAdgeUDdwHCQ3jAyAHhg5+DdoN4Q3dA24Lcg2BCOsMjgeRDk0GggcqDYkJKQxyDYwLoAZWDn0N +2A5/Do0OhwzbCBwMMAvbCX8OaQtDDosObw6hDVkN5AIFDqoBOw6ADqIMGgm3Cf0MHQn/DWUNOQoEDjgNaA52C3gNig1CBu0FsQMA +Dp4CsQ6gDoYBBgwuDAoKkA5JDIUFbQ5sDp8OjA7IBKUITw3SAqQBTQzeA/wBAQGoB1ECTgyKDrUOkQhVDYMM7g6VDRwMTg6ZDNMO +wgd5ARIOfQs6DdMO2AEIDMAJCABjDtwK8g1SAlALhgkBArcO1g3UAWsM3wkODh4AaQhCA2cMwg6JBB4O/A7wDv4D/A4zAqQPAwVs +DKsCFAzMDRoOdA7mDpgJlQ55DpsL5wA5B/UPCAiyDvEO/w8MDwIGPAHRDLwOywgdAycIfwmlDjwO7g7XDx4PCg8ACRIPIgNnDMoC +FA1iC7wMHg1lDuULhw0dDugNCg3JDjALfw8dDtkPMA3TDw4B0QmfDNwMMAvDDmwPLA79DvIPIQ9GAWAPBQogDooPTQ7wDbYIhgoo +DzYNNg7jDB8POg3FC+MNiw8/B3kIfAF0D0IN1Qx6DL0EVg9LDZYJsAGQCT4OrgLHDx0DJgMLAGQCpAPXB4wL3w63Cp8NZQ35Bo0O +eghZChAPcwxiCX8PdgQKDJwOwAqWDMMIiA7WB/4B/Q5FDxMNhA9hDsEIWAfzCDgPZg8sD44O+A9qBYMOUQJhD4sPBw8fDMEHwgv6 +D1wL4QwfD34IEw7qB84AMw8cD6IL7g75CZwJgQ6vD68PNAGwA4sPkQzuD2AM7w6aD2MHzgA5C+kPQw9IDqQHggvUC0AB7QtIDBAL +6wwYAtAC0guvAQMOAgBuCNYM+gl/D1MEHQ+0Dy8OtAQmC3MIJw9dDzkOvArLD7sPqQwDBIoPQQ+vCDsPJgwwCKgMoAZ8Dg8OZwLQ +DqgJqQECAQQBBg3WACINcQ1zDV4NmwMYAyUDBgKkDAcL7Q/ODmwPtQ48D68CugEqAGwB6gkgCyYOIw84CSUOvgYWD54NQAquCoYN +yA1DDnsGVw9DEAcEkRAKCOUIzgk2DhgI2AGiDhsQHgjdDhQNQQ+KDwYP2A7yEBsQCQKiCPwOBwjOCCUMRw97DpMI7g2GDEwNiAtW +EBIN+gd1D70QFwNRBAUPrg8vEC0CyhAwCTULhg4QDKkJCAdQDhMChQB3CQ4BBwMQBMMBuAkUAScCtwa9DhYQAxBEAGgQCBAdCTwQ +MgghDbUIhQfmD6UNgg+nD30QPA9/DxkHzgrSDlYPaAk2DJ8MFwv2D7MBFQB0D9EOGAMmDGkJtwpOD7kNOAovDFAOuxA4DfYMbxA7 +DngOLhBsA7MJcg59EHcBohB5CIUJNgB1DmEJCAPXDTECtww2AW8LrhBbDvILsQzDCiIDYwNlA/QPEAEQCycM7A/eEA8QhQucD4kO +6Q+VBAQGlw9mA2QAYQNmDw8NEQB1D24BNQi2AxcPKAIMDyoJFxCgELID9A+2CbgQphBoC5gP4AqCD+IQag+qEK0JUwaTEL8Qsw9H +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 +F30XEAqvF5kWzhcVF74XqBfBF9AXwwnxDHsX4BfOF8IXrBXCF0kXORfNF6kX4xesFuUU6hdRFscX1hPGF9gUCRe3FAsXXBcSFNEG +1hc4CQcX7hfiF9EBlBb4FrgXGxfnF+8YBBb/FyAWOBgJGAMX5ApBEQ0X1BA3FTIRgxf4FIMX2hdbF6MXuhYbCMcWbBftF78YChgR +FxkYBxbZGCEX4RfPGAsXHxG7F20IqhgCGCoYERclBSQXJxd1FS0XKhdTCwMWEgpTF3sRmxWSF7gXyBUSGB4AMhZGF5wYDxgxF6wX +PRgmB5IKogewF8wYIhgQF6wXRwpsF+wYARhQGEgE0hdOEHwXUBcoGDcXdxg5EyAYOwqsGD0SHBRyFqwYHBhCF4EANQt/GE8YKRfp +GFkOCRgoF+gX8AVYCE8YbRhzGAsXcgTqE0UO3RNIB1YHEAr3E00ANwdhB1kTUBewGF4ChAcfAX0TVRhgE1cYYhTvF/YUBxgYFw4X +lhfbEzcWkxaABzMX3xhyGCMXrBeGFz4AIhiKATwYThhHGG8F+w5rFJoSLRScAm4UnhRuEo8UXhXoFGAYjw06FwwYkxcxD2IYQwuh +FkcLzxSbEQsI1gBlFjURtBXYCqUTbROED+0YqAiXErcLPRGWFW0X9BTsFskVNhQiFlYWsRjJEvEMmwuGEasPKgXBEa4MiQl6B70R +6QVsGMoRXxa+Dr4NvhixFEwY0RJrADQXYA52FfwAbA7XA2oSFBZJCaUQJghQFFkPOwB5CGEMExAMGBQR+RZkFGYYlRN/F7sPlwBb +BkkY+QFxC2ESJwXeGOISsREDBaMVxgWRD3oWUhZ+FE0WVRHWF5wHbQ+bFnANPxZbGRkWDQm3Fg8O4hWrGP4XtRU1F/oU8QZtFlcZ +HhbXDswPbROPFbwY2QwTFJkZGRbfGR4X8hkhC5YWERUvFzIUfxZiGBcY/xaqGD8QyxMrA7QH9RkPFRsYSxQEGMgQUAkPEFMBNxHp +CRUKwhR8Fo4YtRlAF7YZARBrF7sKPBkYGUwQUgkRGVABJxfFGBYDdA/GEmIIjALMEo8WdxOOD28BEBZ7GOcSGhWRGGYW7xkDC+kZ +LhlsDUsRQRKSDIESBRB4FcAMLROVDGsUSxlwGNAZJxjSC1sKEBl8Fb8SYRa3FPsW+hAQEJsO/wNpBcESqwQVBNISrxCaEGMNtwkX +GYkUjxJhEMIXrxYQEZkYZBV0GUIZKAV4AeQZnA/TEnAZLAgdD0sHCBKRDDgJ0gYbBqUHwxmCEpsWfxgeB88ZiAaKCzYSYBSLEmMR +uBL0ErICxwuwEQ0SaBWsFzAUzRXwDHQANAaTC7ANERmPFFgZmxEmEkoZbxanGVUZJRXQGVgX+xhoFdIV8QRMGagOFRliF7MG3xbL +F9wXyRgNGeYD/BcGFccZUxKbF3oZ2BaQGVcYGhhAFzQX/RNiCFoBdA1MGMMVkhZxC6cWcxfHEe0YLBPWAgUW7gglEWQZthTLGckV +rhn3EsQANgvpFu4NSwbqEXQUKAAtFCoAbBl7D4QUdQPNDoQGrhOVAXkY/Qv+GgsZuBZqA7UIyRS1GhsBGhodDMEL0ws/AesPyBOR +El4aKA6DB5QZnxbGFQ0YkRRkGfIZJhnbGaYSbRozCi8aKxYlGY0CWBa6GkAUcRpCF+saBRoaGjQGrhblB40VbgZ1F3gEvxnwGjkV +DxZlGUIV7hf8F90TYhE4GfoaTBpBB5QYBhpEFz8KehdBGkcTdRpCEJ0VZRpLDaQaKREHB5QZ7AdOCvEHUgAoBtYYfwcRB40TTABM +ACAALQAgADMTTxpRE1MYiwciGI0UAxizEIIZYxDIGYQZ2xpaGd0VVxiZBAYZ4RpuGk0Z6wk2E2waZxpgGkgaYghPDsgOGRHjBgMa +IBnHGSQaOxnaGfQZQxKeCS4H0RqeDmIURxotDaIaLwtCArcUURRTCQsIIQ7TGRAPtxohDnUaIxkVFoAJLhnODeIZGhdlGWULgQ5q +GjIWMRYzAQcYwRB0F48aow3CDWcTWxq9GOkT7AIWC38JCgBsFjIWNBiuC/YLNhF5FocT0BACGWUaKAMpBMENqA2xENMQwRGwFJsB +JxJYEkgLaQ9xGa8RQhWpGs8avBi2GcoXXQ0MADka1xl5DDgarwNWGsYLQwwrGasODxmUF6wZlwyBAQgAbgIMCRoCMQKkDDkY5hnW +F/UaihXOGVYaPBqnGSgXXwHkGwobDBlmGw8a/wMZGhoa5Q2nC5MNnBm+Gu0IphrvA84IIQtFC0cZbQm3F3QPphK+GowbGBmGADcH +0RstA/kJWRILDAgQAhJvEPYScRJkARYZwhUkC0QAaQBnAGgJGg6EFBIQ4QlFGTgW6BmDGtMZhRJTADAbOBtHG0kALRtLBWwQSBJ1 +EP4I2RAkEGAI3RssAdAQvAlEGzAS2xkTDkgZcRUwEh4UTgA4ChAZMRW1CuIV/gQ5FboY9Qz+DQAbCQOXAQYOGRR0AScSKg3wGxIa +OBsUFesbUho9GNIETAf1FMYAYxt8CKobfgx+FG8Y2Bt7CGII2AzIG3objBuUCGUMqRXnGvUXLgpWGxYaphmlG4gbNxsbG5MOGRHh +FpgYoBX9AycazBJCEl4JrBQlArsL2A3wG50VcxpYGXIbbRZVADUL6RuwAV0bsgElGdAUCBJ5Ei0SPQyiG68L1hFbC3IaCBtpFK4W +yg1pFPECQwoQEikbkRInG70QdwJrDPsKIAHKAZ4Vtht0FbkAbBW7De8R9huCDWUbaxk8GqgSxAA3BpMb3RW4CTcb4Rs7EAAMLRpr +F8oCxw5hCNUCTQu0FtoOBQGUG00OtRcIGDYR+BrQEYIa0hr3GgwS4Be5GGkXEwZXG/YBXwE2Fp4b+xHcGHEOCxeeDg8OERRHCQwZ +XRHnEFQJExHqDd4Z6ggkDhcJOBtfEQAbYRECG/QBnhwMG/gTMABvDhAD1RHcG5wYzg/fGlYbthkAGzUSUw0lAeQcKQE2DJkcLQka +G1wWcBehDIIY3xwcGOEY1hjjEl4cOgSjEsocPRAvCP0RARviDRgYNRUsHAEGrBqGFY0aiBMiHDMb5gqEGfYaXBXTADQcCwFrG/cc +OxxLB78cTRwRC4YaUwItAfgcYhwNHEoHihxMDhwXbABwAGgY+QPpAqYAagf8ArIOBBgLE5UUShhdHFQa+BoNDQwVmAF0HHQcdgMU +HHgceg7JGHQJyxInGdIZwxwoHHUCVRyJAm4ceQPNHIwYCxTpDQMcABszG4YcNhRODcschhyTHHcclhyLHHwYERmsDDAMfAH4HKQc +lQBvHJcD1hyoF+oMgRyHHJQJfByxHHsYpggkCk0H5xwxEWYboBdZGo0TAxhBGd4MdAA2DlUcthylHLAcpxy7GmMW2BwfB7Acyhyv +HLkcmRypHLUcrhy4HM0cjRgSErsaNxvlGzQaWRzEHF0YHRolADccyRzZDBcc1RyzBYcOghzpA4Mc6xzOHNgciBzaHJgc7AW/GVIa +uxueDYccwReVGqcajhnnHAkU0QajHDkc7xyKHPYcuxhKGmQXVhzSHQYcph0IHNwYUxgtHNMc9RyyHLsYWhg0HN8aUhxWFywcWBUx +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 +AT4B7AI2FlkbuB9sHuABpwJAFt4byh+JC70bUSBrH3MZhgA1DlUe6CCrF2ISzhrEEXMf8yCqAXMWoxDCDRkfoxqkIIoboSCzEmsO +nR+sHvYguCDAIE0gyyC/Fv4aSiA0IL4grBb+H9sgOx46IB4gAB5bGJQePxlaC+kgtyDQFvce1iCIHGsg4SDVFtYgvSDPIOgBpB/3 +AD0Rfh/AGaIgQRg+IMca1RjrICcg6yC5GCUdCyDnILkaAweGIP0XPB5UINgDlCBnFY8fDCAgHskg9RVYAkMg+B7UILkgLR4qHwoE +FCDUIPogUiD5FqMgOAWRH/kf3RIaH/wG4CEGFcwfSRfXINwYtwctICMYmBhDDLUhDh7pILkdLhhLIR8hFCEYFv4dNiB9ACwZDBZf +IGEdDBz8Hw0dVCDeHgsgthxGHrEYSxxBH1QUkQ/KHEMOzh50H7cRIx3WGhgfRh16GxMf/x1SIT0eXB8PH6cYuBZqBGohQR8ZCRoT +cx3DET4SKheiHxEBlhJeFgILIQdEH28ghQbcIGUf/SEhHPsQOSElHIIcByBEISkgRiFcB7MHQgFHCzYT0wQaEFoeLA6OEFoWox4o +EVwNsw8JDvIeah41Ak8HPh8tH1EZkhihEP4O2R8cESMIjQxqFucgsB17ISMX9yFyHAYKrB/EHzYLMQA2CMkRIAPZENIZ/xEqEbAf +tABoEgcCvAkXE6wdtwfmIBgfMh4fFUEeWSGaGJIhnB6pE2ILXAHkIa8JHgjQFIobQA2gBv0SigflF3MeqCCgHqoVeCG9FoYSWhIn +Hz8JqQgDCXoengvcGPcJNw4ZIZIbtB4EHOAfNBvnG9AUiCG9IZEPohvBF9ghrhteECMcJA3tFj0fiB9wHpIdVwtaHdAh4RwiIegc +aByPHY4arR14HCEh2A+iDIEgdwXcCFMZExI4BZIL6SH+BWUfGCF5IWgB/wIFIYMOcRO+IWsIDR5+Id4Zhh5BIb0dsQ3iHpsPxxqy +Ia4iFg6OFOkhlxZBH0ghUx9KIbkhyRKeA4oKECIMIh0dhgwIHYgiKQ6HIf0iHA6zIQMiDxPCID8VcSEIIMUgISELGJkUOiIuDskf +6w6lIRMiPg7UIcQAcBGyCsAJZB8CIZceVhhfID0YjiI2FhMg8xhlHzUhWB1uDFMFkgt/Bx8iRwPVCWQiBx8aCyIN1w7GDtIeEBBa +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 +]] diff --git a/cached-configs/pycoalprocessing+pyindustry.lua b/cached-configs/pycoalprocessing+pyindustry.lua index 31226d3..42e5a6b 100644 --- a/cached-configs/pycoalprocessing+pyindustry.lua +++ b/cached-configs/pycoalprocessing+pyindustry.lua @@ -1,253 +1,239 @@ -science_pack_order("automation-science-pack", "001-000028") -science_pack_order("logistic-science-pack", "002-000065") -science_pack_order("military-science-pack", "003-000072") -science_pack_order("chemical-science-pack", "003-000112") -science_pack_order("utility-science-pack", "005-000146") -science_pack_order("production-science-pack", "004-000135") -science_pack_order("space-science-pack", "006-000160") -fix_tech("physical-projectile-damage-1", {order = "000007", prerequisites = {"military"}, unit = {count = 275, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("physical-projectile-damage-2", {order = "000008", prerequisites = {"physical-projectile-damage-1", "logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("weapon-shooting-speed-1", {order = "000007", prerequisites = {"military"}, unit = {count = 275, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("weapon-shooting-speed-2", {order = "000008", prerequisites = {"weapon-shooting-speed-1", "logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("stronger-explosives-1", {order = "000009", prerequisites = {"military-2"}, unit = {count = 150, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("physical-projectile-damage-3", {order = "000010", prerequisites = {"physical-projectile-damage-2", "military-science-pack"}, unit = {count = 50, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("physical-projectile-damage-4", {order = "000011", prerequisites = {"physical-projectile-damage-3"}, unit = {count = 80, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("physical-projectile-damage-5", {order = "000014", prerequisites = {"physical-projectile-damage-4", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("physical-projectile-damage-6", {order = "000021", prerequisites = {"physical-projectile-damage-5", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("physical-projectile-damage-7", {order = "000024", prerequisites = {"physical-projectile-damage-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"production-science-pack", 3}}, time = 1200}}) -fix_tech("stronger-explosives-2", {order = "000010", prerequisites = {"stronger-explosives-1", "military-science-pack"}, unit = {count = 50, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("stronger-explosives-3", {order = "000014", prerequisites = {"stronger-explosives-2", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("stronger-explosives-4", {order = "000021", prerequisites = {"stronger-explosives-3", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("stronger-explosives-5", {order = "000022", prerequisites = {"stronger-explosives-4"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("stronger-explosives-6", {order = "000023", prerequisites = {"stronger-explosives-5"}, unit = {count = 1500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("stronger-explosives-7", {order = "000024", prerequisites = {"stronger-explosives-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"production-science-pack", 3}}, time = 1200}}) -fix_tech("refined-flammables-1", {order = "000011", prerequisites = {"flamethrower"}, unit = {count = 80, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("refined-flammables-2", {order = "000012", prerequisites = {"refined-flammables-1"}, unit = {count = 130, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("refined-flammables-3", {order = "000014", prerequisites = {"refined-flammables-2", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("refined-flammables-4", {order = "000021", prerequisites = {"refined-flammables-3", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("refined-flammables-5", {order = "000022", prerequisites = {"refined-flammables-4"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("refined-flammables-6", {order = "000023", prerequisites = {"refined-flammables-5"}, unit = {count = 1500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("refined-flammables-7", {order = "000024", prerequisites = {"refined-flammables-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"production-science-pack", 3}}, time = 1200}}) -fix_tech("energy-weapons-damage-1", {order = "000014", prerequisites = {"chemical-science-pack", "military-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("energy-weapons-damage-2", {order = "000015", prerequisites = {"energy-weapons-damage-1"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("energy-weapons-damage-3", {order = "000016", prerequisites = {"energy-weapons-damage-2"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("energy-weapons-damage-4", {order = "000017", prerequisites = {"energy-weapons-damage-3"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("energy-weapons-damage-5", {order = "000021", prerequisites = {"energy-weapons-damage-4", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("energy-weapons-damage-6", {order = "000022", prerequisites = {"energy-weapons-damage-5"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("energy-weapons-damage-7", {order = "000024", prerequisites = {"energy-weapons-damage-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"production-science-pack", 3}}, time = 1200}}) -fix_tech("weapon-shooting-speed-3", {order = "000010", prerequisites = {"weapon-shooting-speed-2", "military-science-pack"}, unit = {count = 50, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("weapon-shooting-speed-4", {order = "000011", prerequisites = {"weapon-shooting-speed-3"}, unit = {count = 80, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("weapon-shooting-speed-5", {order = "000014", prerequisites = {"weapon-shooting-speed-4", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("weapon-shooting-speed-6", {order = "000021", prerequisites = {"weapon-shooting-speed-5", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("laser-shooting-speed-1", {order = "000014", prerequisites = {"chemical-science-pack", "military-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("laser-shooting-speed-2", {order = "000015", prerequisites = {"laser-shooting-speed-1"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("laser-shooting-speed-3", {order = "000016", prerequisites = {"laser-shooting-speed-2"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("laser-shooting-speed-4", {order = "000017", prerequisites = {"laser-shooting-speed-3"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("laser-shooting-speed-5", {order = "000021", prerequisites = {"laser-shooting-speed-4", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("laser-shooting-speed-6", {order = "000022", prerequisites = {"laser-shooting-speed-5"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("laser-shooting-speed-7", {order = "000023", prerequisites = {"laser-shooting-speed-6"}, unit = {count = 1500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("artillery-shell-range-1", {order = "000019", prerequisites = {"artillery"}, unit = {count = 5000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("artillery-shell-speed-1", {order = "000019", prerequisites = {"artillery"}, unit = {ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("follower-robot-count-1", {order = "000011", prerequisites = {"defender"}, unit = {count = 80, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("follower-robot-count-2", {order = "000012", prerequisites = {"follower-robot-count-1"}, unit = {count = 130, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("follower-robot-count-3", {order = "000014", prerequisites = {"follower-robot-count-2", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("follower-robot-count-4", {order = "000015", prerequisites = {"follower-robot-count-3"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("follower-robot-count-5", {order = "000021", prerequisites = {"follower-robot-count-4", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("follower-robot-count-6", {order = "000022", prerequisites = {"follower-robot-count-5"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("follower-robot-count-7", {order = "000024", prerequisites = {"follower-robot-count-6", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"military-science-pack", 6}, {"production-science-pack", 3}, {"utility-science-pack", 2}, {"space-science-pack", 1}}, time = 1200}}) -fix_tech("bulk-inserter", {order = "000013", prerequisites = {"fast-inserter", "logistics-2"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("inserter-capacity-bonus-1", {order = "000014", prerequisites = {"bulk-inserter"}, unit = {count = 2000, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("inserter-capacity-bonus-2", {order = "000015", prerequisites = {"inserter-capacity-bonus-1"}, unit = {count = 3300, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("inserter-capacity-bonus-3", {order = "000016", prerequisites = {"inserter-capacity-bonus-2", "chemical-science-pack"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("inserter-capacity-bonus-4", {order = "000019", prerequisites = {"inserter-capacity-bonus-3", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("inserter-capacity-bonus-5", {order = "000020", prerequisites = {"inserter-capacity-bonus-4"}, unit = {count = 1600, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("inserter-capacity-bonus-6", {order = "000021", prerequisites = {"inserter-capacity-bonus-5"}, unit = {count = 2750, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("inserter-capacity-bonus-7", {order = "000022", prerequisites = {"inserter-capacity-bonus-6", "utility-science-pack"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("automation", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("automation-2", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("logistic-science-pack", {order = "000007", prerequisites = {"lab-instrument", "automation", "ulric"}, unit = {count = 275, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("steel-processing", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("steel-axe", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("military", {order = "000006", prerequisites = {"fluid-processing-machines-1"}, unit = {count = 160, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("military-2", {order = "000008", prerequisites = {"military", "logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("fast-inserter", {order = "000003", prerequisites = {"automation", "steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("logistics", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("automated-rail-transportation", {order = "000006", prerequisites = {"railway"}, unit = {count = 160, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("rail-signals", {order = "000007", prerequisites = {"automated-rail-transportation"}, unit = {count = 275, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("automobilism", {order = "000004", prerequisites = {"engine"}, unit = {count = 55, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("optics", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("solar-energy", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("heavy-armor", {order = "000007", prerequisites = {"military"}, unit = {count = 275, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("gun-turret", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("research-speed-1", {order = "000009", prerequisites = {"automation-2"}, unit = {count = 150, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("research-speed-2", {order = "000010", prerequisites = {"research-speed-1"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("electric-energy-distribution-1", {order = "000012", prerequisites = {"niobium"}, unit = {count = 700, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("advanced-material-processing", {order = "000010", prerequisites = {"concrete", "crusher", "filtration"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("concrete", {order = "000008", prerequisites = {"logistic-science-pack", "separation"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("engine", {order = "000003", prerequisites = {"automation", "steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("landfill", {order = "000005", prerequisites = {"separation"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("logistics-2", {order = "000012", prerequisites = {"logistics", "lubricant", "niobium"}, unit = {count = 700, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("toolbelt", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("stone-wall", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("gate", {order = "000003", prerequisites = {"stone-wall", "steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("chemical-science-pack", {order = "000013", prerequisites = {"advanced-circuit", "nexelit", "fine-electronics"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("military-science-pack", {order = "000009", prerequisites = {"military-2", "stone-wall"}, unit = {count = 150, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("production-science-pack", {order = "000018", prerequisites = {"energy-3", "electric-engine", "uranium-processing", "filtration-mk02", "speed-module-2", "efficiency-module-2"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("utility-science-pack", {order = "000020", prerequisites = {"kovarex-enrichment-process", "automation-3", "destroyer", "fusion-reactor-equipment"}, unit = {count = 1600, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}, {"military-science-pack", 2}}, time = 300}}) -fix_tech("space-science-pack", {order = "000023", prerequisites = {"rocket-silo", "solar-energy", "electric-energy-accumulators"}, unit = {count = 1500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("military-3", {order = "000014", prerequisites = {"chemical-science-pack", "military-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("military-4", {order = "000021", prerequisites = {"military-3", "utility-science-pack", "explosives"}, unit = {count = 2750, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"military-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("uranium-ammo", {order = "000018", prerequisites = {"uranium-processing", "tank"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("atomic-bomb", {order = "000022", prerequisites = {"military-4", "rocket-control-unit", "rocketry"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("automation-3", {order = "000019", prerequisites = {"production-science-pack", "bulk-inserter"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("explosives", {order = "000016", prerequisites = {"sulfur-processing", "mukmoux"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("cliff-explosives", {order = "000017", prerequisites = {"explosives", "military-2"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("land-mine", {order = "000017", prerequisites = {"explosives", "military-science-pack"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("flamethrower", {order = "000010", prerequisites = {"military-science-pack", "coal-processing-2", "filtration"}, unit = {count = 50, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("advanced-circuit", {order = "000009", prerequisites = {"plastics"}, unit = {count = 150, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("processing-unit", {order = "000016", prerequisites = {"sulfur-processing"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("fluid-wagon", {order = "000006", prerequisites = {"railway", "py-storage-tanks", "engine"}, unit = {count = 160, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("braking-force-1", {order = "000014", prerequisites = {"railway", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("braking-force-2", {order = "000015", prerequisites = {"braking-force-1"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("braking-force-3", {order = "000019", prerequisites = {"braking-force-2", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("braking-force-4", {order = "000020", prerequisites = {"braking-force-3"}, unit = {count = 1600, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("braking-force-5", {order = "000021", prerequisites = {"braking-force-4"}, unit = {count = 2750, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("braking-force-6", {order = "000022", prerequisites = {"braking-force-5", "utility-science-pack"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("braking-force-7", {order = "000023", prerequisites = {"braking-force-6"}, unit = {count = 1500, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("tank", {order = "000017", prerequisites = {"military-science-pack", "explosives"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("logistics-3", {order = "000019", prerequisites = {"production-science-pack", "logistics-2"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("rocketry", {order = "000017", prerequisites = {"explosives", "military-science-pack"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("explosive-rocketry", {order = "000018", prerequisites = {"rocketry", "military-3"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("modular-armor", {order = "000010", prerequisites = {"heavy-armor", "advanced-circuit"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("power-armor", {order = "000017", prerequisites = {"modular-armor", "electric-engine", "processing-unit"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("power-armor-mk2", {order = "000022", prerequisites = {"military-4"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"military-science-pack", 3}, {"utility-science-pack", 1}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("laser-turret", {order = "000017", prerequisites = {"military-science-pack", "battery"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("robotics", {order = "000017", prerequisites = {"electric-engine", "battery", "construction-robotics"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("rocket-fuel", {order = "000016", prerequisites = {"military-science-pack", "fast-inserter", "sulfur-processing"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("low-density-structure", {order = "000014", prerequisites = {"advanced-material-processing", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("rocket-control-unit", {order = "000021", prerequisites = {"utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"military-science-pack", 3}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("rocket-silo", {order = "000022", prerequisites = {"speed-module-3", "productivity-module-3", "rocket-control-unit"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("research-speed-3", {order = "000014", prerequisites = {"research-speed-2", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("research-speed-4", {order = "000015", prerequisites = {"research-speed-3"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("research-speed-5", {order = "000019", prerequisites = {"research-speed-4", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("research-speed-6", {order = "000021", prerequisites = {"research-speed-5", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("electric-energy-distribution-2", {order = "000014", prerequisites = {"electric-energy-distribution-1", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("electric-energy-accumulators", {order = "000017", prerequisites = {"electric-energy-distribution-1", "battery"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("advanced-material-processing-2", {order = "000014", prerequisites = {"advanced-material-processing", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("effect-transmission", {order = "000019", prerequisites = {"production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("lubricant", {order = "000011", prerequisites = {"mukmoux", "filtration"}, unit = {count = 400, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("electric-engine", {order = "000014", prerequisites = {"lubricant", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("battery", {order = "000016", prerequisites = {"sulfur-processing"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("construction-robotics", {order = "000003", prerequisites = {"steel-processing", "automation"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("logistic-robotics", {order = "000012", prerequisites = {"construction-robotics", "plastics", "niobium"}, unit = {count = 700, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("logistic-system", {order = "000013", prerequisites = {"logistic-robotics"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("worker-robots-speed-1", {order = "000013", prerequisites = {"logistic-robotics"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("worker-robots-speed-2", {order = "000014", prerequisites = {"worker-robots-speed-1", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("worker-robots-speed-3", {order = "000019", prerequisites = {"worker-robots-speed-2", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("worker-robots-speed-4", {order = "000020", prerequisites = {"worker-robots-speed-3"}, unit = {count = 1600, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("worker-robots-speed-5", {order = "000021", prerequisites = {"worker-robots-speed-4", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("worker-robots-speed-6", {order = "000024", prerequisites = {"worker-robots-speed-5", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"production-science-pack", 3}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"military-science-pack", 6}}, time = 1200}}) -fix_tech("worker-robots-storage-1", {order = "000018", prerequisites = {"robotics"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("worker-robots-storage-2", {order = "000019", prerequisites = {"worker-robots-storage-1", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("worker-robots-storage-3", {order = "000021", prerequisites = {"worker-robots-storage-2", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("energy-shield-equipment", {order = "000012", prerequisites = {"solar-panel-equipment", "military-science-pack"}, unit = {count = 130, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("night-vision-equipment", {order = "000012", prerequisites = {"solar-panel-equipment"}, unit = {count = 700, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("belt-immunity-equipment", {order = "000012", prerequisites = {"solar-panel-equipment"}, unit = {count = 700, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("energy-shield-mk2-equipment", {order = "000018", prerequisites = {"energy-shield-equipment", "military-3", "low-density-structure", "power-armor"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("solar-panel-equipment", {order = "000011", prerequisites = {"modular-armor", "solar-energy"}, unit = {count = 400, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("personal-laser-defense-equipment", {order = "000018", prerequisites = {"laser-turret", "military-3", "low-density-structure", "power-armor", "solar-panel-equipment"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("discharge-defense-equipment", {order = "000018", prerequisites = {"laser-turret", "military-3", "power-armor", "solar-panel-equipment"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("fusion-reactor-equipment", {order = "000019", prerequisites = {"power-armor", "military-science-pack", "production-science-pack", "low-density-structure"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"military-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("exoskeleton-equipment", {order = "000017", prerequisites = {"processing-unit", "electric-engine", "solar-panel-equipment"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("personal-roboport-equipment", {order = "000017", prerequisites = {"construction-robotics", "battery"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("personal-roboport-mk2-equipment", {order = "000021", prerequisites = {"personal-roboport-equipment", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"utility-science-pack", 1}, {"military-science-pack", 3}, {"production-science-pack", 2}}, time = 600}}) -fix_tech("fluid-handling", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("oil-processing", {order = "000014", prerequisites = {"chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("advanced-oil-processing", {order = "000019", prerequisites = {"production-science-pack", "wood-processing"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("sulfur-processing", {order = "000015", prerequisites = {"oil-processing"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("plastics", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("speed-module", {order = "000010", prerequisites = {"advanced-circuit"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("speed-module-2", {order = "000017", prerequisites = {"speed-module", "processing-unit"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("speed-module-3", {order = "000019", prerequisites = {"production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("productivity-module", {order = "000010", prerequisites = {"advanced-circuit"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("productivity-module-2", {order = "000017", prerequisites = {"productivity-module", "processing-unit"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("productivity-module-3", {order = "000019", prerequisites = {"productivity-module-2", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("efficiency-module", {order = "000010", prerequisites = {"advanced-circuit"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("efficiency-module-2", {order = "000017", prerequisites = {"efficiency-module", "processing-unit"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("efficiency-module-3", {order = "000019", prerequisites = {"production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("defender", {order = "000010", prerequisites = {"military-science-pack"}, unit = {count = 50, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}}, time = 90}}) -fix_tech("distractor", {order = "000014", prerequisites = {"chemical-science-pack", "defender"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("destroyer", {order = "000019", prerequisites = {"distractor", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"military-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("uranium-processing", {order = "000016", prerequisites = {"concrete", "sulfur-processing"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("nuclear-power", {order = "000017", prerequisites = {"uranium-processing"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("kovarex-enrichment-process", {order = "000019", prerequisites = {"rocket-fuel", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}, {"military-science-pack", 2}}, time = 300}}) -fix_tech("nuclear-fuel-reprocessing", {order = "000019", prerequisites = {"nuclear-power", "production-science-pack"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("mining-productivity-1", {order = "000010", prerequisites = {"advanced-circuit"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("mining-productivity-2", {order = "000014", prerequisites = {"mining-productivity-1", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("mining-productivity-3", {order = "000021", prerequisites = {"mining-productivity-2", "utility-science-pack"}, unit = {count = 550, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}, {"military-science-pack", 3}}, time = 600}}) -fix_tech("mining-productivity-4", {order = "000024", prerequisites = {"mining-productivity-3", "space-science-pack"}, unit = {ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"chemical-science-pack", 6}, {"production-science-pack", 3}, {"utility-science-pack", 2}, {"space-science-pack", 1}, {"military-science-pack", 6}}, time = 1200}}) -fix_tech("artillery", {order = "000018", prerequisites = {"tank"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("spidertron", {order = "000022", prerequisites = {"military-4", "exoskeleton-equipment", "rocketry", "rocket-control-unit", "efficiency-module-3"}, unit = {count = 900, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("circuit-network", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("coal-processing-1", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("coal-processing-2", {order = "000009", prerequisites = {"chromium", "methanol-processing-1"}, unit = {count = 150, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("coal-processing-3", {order = "000014", prerequisites = {"chemical-science-pack", "wood-processing", "mukmoux"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("syngas", {order = "000004", prerequisites = {"tar-processing"}, unit = {count = 55, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("tar-processing", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("energy-1", {order = "000005", prerequisites = {"syngas", "coal-processing-1"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("energy-2", {order = "000010", prerequisites = {"coal-processing-2", "advanced-circuit"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("energy-3", {order = "000017", prerequisites = {"energy-2", "desulfurization", "mukmoux", "processing-unit"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("methanol-processing-1", {order = "000008", prerequisites = {"logistic-science-pack", "py-storage-tanks", "engine"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("methanol-processing-2", {order = "000014", prerequisites = {"chemical-science-pack", "mukmoux"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("cooling-tower-1", {order = "000006", prerequisites = {"energy-1"}, unit = {count = 160, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("cooling-tower-2", {order = "000011", prerequisites = {"cooling-tower-1", "energy-2"}, unit = {count = 400, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("excavation-1", {order = "000012", prerequisites = {"lubricant", "niobium"}, unit = {count = 700, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("excavation-2", {order = "000014", prerequisites = {"excavation-1", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("biofilm", {order = "000014", prerequisites = {"chemical-science-pack", "wood-processing"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("filtration", {order = "000009", prerequisites = {"separation", "automation-2"}, unit = {count = 150, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("filtration-mk02", {order = "000016", prerequisites = {"sulfur-processing"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("desulfurization", {order = "000015", prerequisites = {"oil-processing"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("crusher", {order = "000008", prerequisites = {"logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("separation", {order = "000004", prerequisites = {"coal-processing-1", "engine"}, unit = {count = 55, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("fluid-separation", {order = "000016", prerequisites = {"sulfur-processing", "mukmoux"}, unit = {count = 1100, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("fuel-production", {order = "000017", prerequisites = {"cooling-tower-1", "lubricant", "fluid-separation"}, unit = {count = 1750, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("fine-electronics", {order = "000012", prerequisites = {"fluid-processing-machines-1", "niobium", "kevlar", "plastics"}, unit = {count = 700, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("fluid-processing-machines-1", {order = "000005", prerequisites = {"separation"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("ralesia", {order = "000005", prerequisites = {"creosote", "optics"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("ulric", {order = "000006", prerequisites = {"ralesia", "fluid-handling"}, unit = {count = 160, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("wood-processing", {order = "000002", prerequisites = {}, unit = {count = 20, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("wood-processing-2", {order = "000008", prerequisites = {"wood-processing", "logistic-science-pack"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("lab-instrument", {order = "000006", prerequisites = {"energy-1"}, unit = {count = 160, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("niobium", {order = "000011", prerequisites = {"crusher", "organic-solvent"}, unit = {count = 400, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("nexelit", {order = "000010", prerequisites = {"fluid-processing-machines-1", "coal-processing-2"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("chromium", {order = "000008", prerequisites = {"logistic-science-pack", "separation"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("organic-solvent", {order = "000010", prerequisites = {"coal-processing-2", "filtration"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("mukmoux", {order = "000010", prerequisites = {"coal-processing-2", "advanced-circuit"}, unit = {count = 250, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("kevlar", {order = "000011", prerequisites = {"organic-solvent"}, unit = {count = 400, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("creosote", {order = "000004", prerequisites = {"tar-processing"}, unit = {count = 55, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("pyrrhic", {order = "000024", prerequisites = {"space-science-pack"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 20}, {"logistic-science-pack", 10}, {"military-science-pack", 6}, {"chemical-science-pack", 6}, {"production-science-pack", 3}, {"utility-science-pack", 2}, {"space-science-pack", 1}}, time = 1200}}) -fix_tech("artillery-2", {order = "000019", prerequisites = {"artillery", "railway", "processing-unit"}, unit = {count = 5000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("artillery-shell-range-2", {order = "000020", prerequisites = {"artillery-shell-range-1"}, unit = {count = 8000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}, {"military-science-pack", 1}}, time = 120}}) -fix_tech("artillery-shell-range-3", {order = "000021", prerequisites = {"artillery-shell-range-2"}, unit = {count = 14000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("artillery-shell-range-4", {order = "000022", prerequisites = {"artillery-shell-range-3"}, unit = {count = 22500, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("artillery-shell-range-5", {order = "000023", prerequisites = {"artillery-shell-range-4"}, unit = {count = 40000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"military-science-pack", 1}, {"chemical-science-pack", 1}}, time = 90}}) -fix_tech("artillery-shell-range-6", {order = "000024", prerequisites = {"artillery-shell-range-5", "production-science-pack"}, unit = {count = 13000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"military-science-pack", 2}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("artillery-shell-range-7", {order = "000025", prerequisites = {"artillery-shell-range-6"}, unit = {count = 22500, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"military-science-pack", 2}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("artillery-shell-range-8", {order = "000026", prerequisites = {"artillery-shell-range-7"}, unit = {count = 36000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"military-science-pack", 2}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("artillery-shell-range-9", {order = "000027", prerequisites = {"artillery-shell-range-8", "utility-science-pack"}, unit = {count = 12000, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("artillery-shell-range-10", {order = "000028", prerequisites = {"artillery-shell-range-9"}, unit = {count = 20000, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("artillery-shell-range-11", {order = "000029", prerequisites = {"artillery-shell-range-10"}, unit = {count = 33000, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) -fix_tech("artillery-shell-range-12", {order = "000030", prerequisites = {"artillery-shell-range-11"}, unit = {count = 55000, ingredients = {{"automation-science-pack", 10}, {"logistic-science-pack", 6}, {"military-science-pack", 3}, {"chemical-science-pack", 3}, {"production-science-pack", 2}, {"utility-science-pack", 1}}, time = 600}}) - -fix_tech("diet-beacon", {order = "000015", prerequisites = {"speed-module", "productivity-module", "efficiency-module", "electric-engine"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("py-storage-tanks", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("py-asphalt", {order = "000009", prerequisites = {"concrete"}, unit = {count = 150, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("py-warehouse-research", {order = "000003", prerequisites = {"steel-processing"}, unit = {count = 33, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("py-warehouse-logistics-research", {order = "000014", prerequisites = {"py-warehouse-research", "logistic-system", "chemical-science-pack"}, unit = {count = 360, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("railway", {order = "000005", prerequisites = {"wood-processing", "creosote"}, unit = {count = 90, ingredients = {{"automation-science-pack", 1}}, time = 30}}) -fix_tech("railway-mk02", {order = "000012", prerequisites = {"railway", "niobium", "nexelit", "plastics"}, unit = {count = 700, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("py-accumulator-mk01", {order = "000018", prerequisites = {"electric-energy-accumulators"}, unit = {count = 3000, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("py-accumulator-mk02", {order = "000019", prerequisites = {"py-accumulator-mk01", "production-science-pack", "construction-robotics"}, unit = {count = 1000, ingredients = {{"automation-science-pack", 6}, {"logistic-science-pack", 3}, {"chemical-science-pack", 2}, {"production-science-pack", 1}}, time = 300}}) -fix_tech("radars-mk01", {order = "000008", prerequisites = {"logistic-science-pack", "engine"}, unit = {count = 90, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) -fix_tech("radars-mk02", {order = "000015", prerequisites = {"radars-mk01", "electric-engine"}, unit = {count = 650, ingredients = {{"automation-science-pack", 3}, {"logistic-science-pack", 2}, {"chemical-science-pack", 1}}, time = 120}}) -fix_tech("py-burner", {order = "000011", prerequisites = {"advanced-material-processing"}, unit = {count = 400, ingredients = {{"automation-science-pack", 2}, {"logistic-science-pack", 1}}, time = 60}}) +return [[ +AHsAWwAiAGEAZAB2AGEAbgBjAGUAZAAtAGMAaQByAGMAdQBpAHQAIgBdAD0AewBjAG8AdQBuAHQAPQA1ADUAMAAsAGUAcwBzAGUB +GgBpAGEAbAA9AHQAcgB1AGUALABpAG4AZwByAQkAaQEkAHQAcwEVAHsAIgBsAG8AZwBpAHMAdABpAGMALQBzAQwBJAEIAC0AcABh +AGMAawAiACwAMQB9ACwBOQBhAHUAdABvAG0AYQFAAG8AbgFDAUUBBwBlAUgBSgFMAU4AfQFQAG8AcgBkAGUAcgA9AQIBVABvAHQA +ZQBjAGgALQBbADABdQAwADgAMQBdAXMBAwEFAV4BCgEMAQ4BEAB0AF0BTQBwATIBMgBxARAAcwERASEBFQAiAHAAbABhAT8BQQBz +ACIBUAFAAG0AZQA9ADMAMAFQAQEBfAEGAQgBfwFWAGIBLwFYAWYBlQEUARYBGAEaAZsBnAEgASIBNQEmASgAZgEnASMBLgEwATIA +ZAE0ARoBNwB7ATkBOwE9AZMBQgFEAbwBRwFJAUsBTQFPAVEBbAFVAVcBWQFbAcUBRgFfAcgBYgFPAWUBZwFpAWsBUwFVAW8BcQFz +AXYAMAA2ADQBegBbAaABfgELAaQBpgFVAHIAcwGEACwBhgFpAGUBiQE+AYwBvgAiAYABDwERAC0AbgBlAHQAdwFmAUwBlwBpAZkB +mwGdACwBnwEEAaEBCQAtAc8BaQGzAUgAcgBvAQgBIgEvAGcBEwEVARcBGQEbADQBHgGwASMBJQEnASkBKwEtAhYBugG8ATYBOAE6 +ATwBPgFAAcQBXQHHAWEBygFQAVIBbQHPAGkBWgFcAcYB1AIyAWMB2AFoAWoBzQFuAXABcgF0AXYANgA2AeUB5wGiAg0BWAIPAScC +EQITASEBiwEwAe8B8QGIAYoB9gGOAGYAaQBsASoBWAI4AG4BTQH4ASsAcwBoAWkCYwEXAQcBMgFvAZYALAGYAZoBnAGeAQICCgHo +Ag4AcgIQAYYCUgIVATAALQAyAhgBqwIbAD0AMQA0AXUCHwGyAiIBtQBsAbcCJgEzATUBvgE5AXEAZQBtAUECUAHSAV4BYAHJAWMB +zAHBAi0BQQI6AdMCmQHWAjQCQgI3AjkClwIxApoB1wAsAWYCQAHbAW0B3gJFAXYAMQAyADMCSgJ1AkwCdwJ5AhICFAJUAGcCfgJW +AYcB8wJZAW8B9wKSApQAYwKWAjACPAKaAnQBfQK5Ak4CeAJQAnoCvQIWAm4CcAIGAnMCSwIMAG8CXQJRAtUBMAKAAhoBrQAyADcC +HgJTAogBtAG2AiUBuQKOAb0CKgJ6AGQAdQBjAdACoAKYAdUCMwHMAscClQBsAvYCqQKjApwCLAHDAv4CzAMAAjUBzgJgAqcCywKi +AjMCPwHaAkICsQHgAXUAMQA5AkkBewK4AtwC3gLUAlMCFgLBAfIB9AGLAsUBjgLxAvMC9QKoAwUCYwIAAG8BCgMbAnwCFwIDAgUA +NgIHAGEAcgFAAGwAbAFpAHkCGQGsARsAMgEeAR8C6AIhAuoCiwLsATEC7gIpAb8B+AJnAsgCygI7AwwCmwHAAwICLgMEA08BywMH +AVYDCQHRAwsC+ANQACIClABsAREDNAB5A1QDXAKrAq0DDwHcAkMB3wJGADAAMQLmAkoDNQJdAzgAcgB5Ax4CWAH1AyIBOQB0AQYB +YgAiAHIBAwM0AHMCDQBrA20C1wIEAnECBwGfA3EDNwM5An4C4gM8AD0C5QLnAbEDQgA9AooCjALtAbsCjwIqAvsCyQL9AycDVQKk +Ap0DAwOgA2UCpANpAqYDWgNOA6YBzANfA2EDdANkAj0DZgHZAkEDaQMRA2wAMQA4AxYB5gOLA3MDYwAyA3YCwwN4AY0BUgO9AzkD +hgIFAnICCAECA8YDsAJmAGUDNwAtA38BMAFfADEDjwKCA5IDQAOUAUACiQLrAbgDRgOaAu8DSQOdA00CoQOsA1EBwgNTA6UDsgOn +AjYDWQOxAqoCpAOuA3sDzgNbA+wDDgO1ArACRAMSA20AOAHkAXsDzQNjA88D0QPTAGcD1QPBAyACWgPFAzYDvgPIA4gC2gQBAUMC +ZwQEAQYEBgOOAaoC4wEbADMBnAPaAiAD3ANDA5gD4AIoApADSgKTAvwD8AMGAisD6QKfA+sD8QHMA6gD7wQtBCkD8wNiBCgDDQKs +A7QCrwHdA/sDbAAyADACtgQABAwDjQQDAv0EBQFfA8ABhQLCBAkDeQPMBEIDzgQTBEUEFQPVBA4C2QPLAzQETgQCBFAD0gRSAC0A +MwPXAa0ChQKGA0EEHwOWA94CjQPhA0gCkQNLBCcEMgL5A+gCngIvA6sD7AQvA+4DJgP2BC4BOQQ0A/UEcgPxA/gEOgNqArIBdQQ+ +ADgDcARYBBID0ARRA9QEXQQIAsQDxARNA3IEQwRaBEYDjgMwBA8EVgQRBEQEWwSKADQEXwIcAz8ChwOVA5cDRQInA5sD4wRrA54E +NgNdA6MD6gR3BCkEMAR2BHwEMwJdA68EAgStBDcDZwP5BDsDawF2ADICtASFBJAETwSIBJoEFgHkBEkDHwSNAfcEVwTABFkEwgST +BF4ElQRVA4oEhgSZBJMANQSdARwBdgSgBGQEogPfBKQD4gRqBCYEqARtBKoDUgQsBLYDXQSvAmEEqQNWA14EswP0BLUEsQS3BDkD +EAQ8BLwBnAS/A4wEwQQUBIoANQSMA8MEyQSYBJIEXAScBNADygTSBMsEhwT7BBYANgTXAR0EYgPbAbMEZQNEBN0DRwQkAyQC9ATq +BOME7APkA58E5wTsBKsE5gTxBOgEdQUZBR4D8gTuBDUFGgFkBDgCrgT0BLsEggA0AXkEQQUIBNQEXAJJBMYDdwMhBI4EygT5BMwF +CgFfBNYALAGPAhIC8gUYAwoE8QTQAzIEEATTBQIEigA3BNcANgSfBGMFEQTcBGcEIwLwBUQDJQUlBSIFGwSnA+UC9wRzBG8DpAUm +BHQDCASwA+YFYQTtA2AE7wTrBSsEuAR/A7cEvAA1BTIDvAVMBM0EXAA3BP4FOgUABXYFPwAtBQwFSQOJBI8FPQUJBIkEFgA4BNcA +NwTZBVMD3QUTBVYEpQE5BRcFZwVgBHgEJQNMBR0FXAOiBOUEcQVoBZUE6QVHBZ0EsgVrBSkFJgR+BS4EgQAwAz4E/QUzBYQFNQSK +BIQFOAPCBXsBjgU8A74FhQTDAV8FTwWBBUsFNAVNBBYAOQTXADgFiwUQBY0EIQTeBGkAIgFUBO4E8AWhBG4FQwMrBVoFoAWUBCkF +HAVtAwEEKwWcBdMFzgWfA6oFzQNdBHoFzAXaAj4FLANoA/oFLwWpADUDuwW1BJEFdwSKADkFegQKBYMFtgWuBYcCYwXKBWsF4QL/ +BFQFSgSXBX0FhgPVADAE1wA5BcMEHgVUBGYDmQVXA0kF9wERBfkDKANdBZIFWwXeBV0E4QVfBfoE5AXYBdYDVwOpBhkFagS0BW0F +pgO2BPUEggA1BXkFrAXzBb4GAAXwBEwF6wT6Bf8ALQXABbsF/QW9Be0EFgAxA9YEGAOQADEB4QTaBgYFjgYIBZAFyQM2BgwGHAYQ +BdIGFgYTBZcGHAUgBdkGRwPtBWYGEQXiBOwF4AYfBeQEuQSAA/wDPgSEBiYF7AV+BjYGKgU7BQEGNAYABfsFggYsBT4GLgK0BNcG +NgYEAukFEgXGBRUCKgYLAHQGDQOhAcwGRQXdBlECpAXVBSoF1wRwBhwF3AYcBlMFKgYgBeYFqAM+Be8GWwYtBbgALQS+BbEESwZg +Bf4GiwY2BmQFvAWtBigGjAReBjgCGwBfAGYBZgBtAHUBkQFrACgCtAF2ACkAIAArACAAMgBeAEwAKgY6AXUBTQWMBCAEowZwA0kA +cwHIAV8GfAE5BnIGdAPnBc8FRQWTBk0C+gVeBZgGEgWaBhgGuQKlBDEFZAR5BSgEewbFBoQEugaGAzIE+AYnBmIGmAZfBXwGMwZd +An8FQgK8AGsB/gFDAl0AbwaUBjIGlgTCBrYAZQIMBjcDOwabBp0AcgafBqEAIgAoA9kGpgaoBq4AMAArADMAXgAoAEwGjAApBq0B +dgawBcQGsgUUBGgEJAZ7BssEKgZ+BsgGgAbIBoIFpQZVBXAGIgP9BasFdQbaA58AcAbpAQoBeQaOBMgFtAQBBFQFBgECAc4CnwBi +AaQE1wIdBQ8GBQXFBrMHBgZxBkIGcwZEBVkFRgZ4BsEE4AZJBsgGSwZ/BSQGRgYOBlIGzQa8A/cHEQWnBlgEvQJKByQBQgcmAG0A +YgbYAY4GuwSpA34CEwbfASoAeQbkAZ8EdQIMA38C3gJfAG4GtgFmA3sB0AZqBjoGPAcsBwUGCQYaBsoFmQbQBlcDbAQ/BiUB5gdY +AQoHWgL9B1wHXgM1A1kHTQE5B3MAdwBhB1UE0AQ+AVAF3AbsAa0BrwaxAiMBLAdmBkAHDQcQBW8HRAdtADEHFQXcB3kAIgPQAXAB +KgFaAZQEVAeABFYHPAFbAn8GmgLkAz4HZAEoASoHiAWPBN8HCgVjBZkFZQNYBsAHPgVuBPMGIQXnADAANAXqB50CwAcdBP8Bjgc6 +BG0FBQZlB7cGmQeDAz0C5gQdBm0HpQctB2cGvgXRBzUHrwbCBhQGxAZ5Bn0HqgbFB6wGGwaDB0MHsgWoA7kGiAdwBk8COQK2B7kF +swWRBzMHrgNPACIAYgagAGsALQEvASMDNQJoBjEHVwfeB8wDDAGqB4YHxwfYBoUD/ASCAkoHtwQyB5MBPwBlAGEAbQFIAG8Adwfv +B4ECNgBvAaUDYABzAG0HwgA9Ah0HowZuB8gHigf9B4wHsQf5B20DPgf8Ac4ICgSzCA0HkwEkAT0B/QeaAgcAYgFYAW8DdAgPA24D +kwcrB6QCJAeJB6gHCAerBWIErAg0BskH5QOmB2sFcQMTB7UB5QgnAHQIKQN1B+EF8QBzBqAAZgB1AHIC3wMcAuEHvgJzCEAIQgAt +A8IAcAGZARoE1wQ+ByoGbQVVBj8IMgbDBkoFmwc7B/IGVAeNB9kD/AAxADYHbwhQA40IUwhVAYMIRARMCGoDdAJjAHMAbwGRCEoB +SQH9Av0IbAE1ByEFgghxA2MAbQBrADIIUgH0CFQIfAegAz0FUgcDCBMIMQXICDMH1Ag1BSEIkAg4BlAGTQg7BxMDuQPAAXMIfwOD +CIMIewEaB5MInAifARIFQgBwCAUBaQAtAzQAbQFmAmMBOwB3AC0BaAddBkMBPwErAvQISQBlCH0ITwPQAHQH6wBtBp8AbgZDCKMH +YghZBKEGBwQiBkAHvAcJB4sHagf4BtEIZgAwCGkIuwi9CL8IwQiFCG0H/wh1AzQBYAh5CIQBEAiGCFYITgAsAaUAbwJcAGwIDgKB +Aa0ChAjEBNsIxgXHBwcIXgc5CGAHDAgWCMwIZAgZArMAMwiaAFsI4wjlAG0HkwiPBeIAIgMqAywCvAhMAy8CbwOHBNEH5wN/AGsC +FgAtBu4BRwbrCOgBGwjqB8UIxQY+CMcIXQfPCF8GxwjKCPQGzwjNB2wCswMUCD8JDAkOCRAEBwhvBI4JAAYWA34AYQJdB3wHfgkI +A8kIfgkmAn0JKAQXCCsHxAgSCFsJGQiOCPAHCQjJCDcIywkgCPYIzgO4ADMH3ABiCTYCvwk4BEgB8ARKBx4BOQlLAGEJDQk3AWYJ +EQi5A8sJVAlWCU0JWAFfB8EJEwORCTsHhgk9CO4FWAXQBzQGHAksB80IkQZMCW0IlAc9A6EIlwXnAxQAMAklCVUJJwlfBIsJKgH3 +BncHUAlcCXoBDgRHB1YJCwl5CVcJgwAtBJwIiAGuCOsGPQZvBy4DSQl/BsgJbAZ1CW4IYQetCJUHrwl0BoYB4gl4CV0JDwl7BMUJ +UATHB7oJUwlMCaEJiQTPCTMBmgX8AQEJgQmIAUcE1gmMBGEJFgjsCRgJZwmSB+QJmgmWBZYEbAlBCPIJHghiB9cJRgkiBIIGXgib +CagJOAT9CX0BjgmwCV4JiQUECawAPQmuCYYJoAk4BQwJtAiKCC4IjAenBcgHTwbICZMHCQmVBr0JQgiTCUQH0QbMBaMGzgZ5CZwH +RQlKCcoJewU3CaQFOQXxCc8JqQmyBfYHMAdBAckH8AnWCYIBRwVPCYwDPwm2CY8IFAeoCeAHCQniCDcJ5AVpCeYJ6QlxB/MGvQcP +CPUIGAlHBLwChQmfCgAFuQihCfEJiQWACdMJ1QfoAGwH6gfsAWkIKQZqBGEIEgf3Cd4EJAoPBzYKEQlrCUAKFQUtCGUDuANuCD8H +6QfrB10KJwFpCP8KMwXeACIBtQE/CjsH7QooCOEBAQLJAHIAZwBvAC0BkQBuAbsCfQFJAX8AYQHIBgwEnQacBp4GoABhBqIKBAb1 +BqkG+wb9ADEG/whYBgEJPAjtBrQGugn7BzIJaQg5BWkKDQWVCi8JcAnoCjAKFAlFChYJxgWpADMGWgBbCkoKTApOAQYKUQK/ClMB +CwpVAUoGDAeTBt4G4AGLATsJhQpwAUwJjAZrCgUCIgosCFwFyApyCb0KdAmbCSEIPANtB7QB5QqPB5MCXAH9CFIDOAL0AhIIwABj +AZUFQgLbAX8BDQH6CKQAIgH9AHgD0AERCVoBcQISApQAdQjnBBkDkQeiB/YIMAotAioKmAa9CpoJcwqcBxMAMAXpCqAAaAq5AGkK +uweTCsQCPQAiASMBSQN/B2EKSAH4Cq8BggH8Af4CAAByCpAIDwAyCr8IiwlmCmkHqQg2CecJHwntCsgHswA1CPoB+QrcAf0B/wIB +CtEJwQVICdMHIgBjA2AAZgBmCFIAeAGQAG8BiwB2ASEIVwZsCRcJkAfJCo8FzgrSBZ4K6wiWCu0H2gA1BEAKfQr8Cv4AZQsAATsL +AwEhCCELGQsCAGkLBAqrBh0FbAJ/CtkBFwJQA2ABiQBlAbUHNATXBBsJjgdlCsIJugptCbwGvQsLBhcHCwnCCZkJcgg6CxEGWAjQ +CqAAbwsoAGkLKgssAdAHkwqtAC0C3QL9Ay0CvgqOC0ILTAkFAy4GjAhXADIKKwrBCpYEJArGCz0JxQqdA20K8AtQCEsLUwccCfQF +sgXxC1sCMgd/BYILJwtRAnsCvgk5CWIHKQtXB6YLWQrDCvcK6gnDCBcKNQj3AkcHbwtsC2ILbwlPAlcLZgRMCOUCXwdhBUIKuAFW +Cs8AbQlaCkkLYQtNCQ4JYQq9CRUKZwm4CucLNwUfC3cKEAtoBH0LPglICXcBcwt/C5ECfQfgC2UGjwLGCkAJAQafAGsIqwB1AHgD +KQBvAysLgALWCOECagBjAmwBmgliCuMANQtzCgcKlwubCjALnQKjCe4HbQA0B9wLtwu5CvYJHQUiCtQAZQrWA1kLjgH4AVoItAfL +A9IICgFuB5kJ2guWCwkIFQt5CjQF5QoXChgLQQddB6UJagISByYCLgHuCc0HaAuICtQBbwPQC7QITQnTB5sLjwh1CQ4BVQgGCEoJ +EguUB2MJZQpoCZEL7Qs1B0ILXQrJADMHFQEXC/cCfQv5CKgLZAuDC6gBjgEkAWkAZwNjA9YLagJzDAkDYAwLCKcISgefCA8GAwqT +BwQLMgmXCPML3wp3C3sL4gqeC6EKfQuyDBoCvwwMDB0IIQH9CksDvwJpDC0L+AwcC1QLtgEyCwICQwgPCBEKwAt0CT4LWgsPCpsM +BQezADIKfAu4AGUMPQFvB5MD9AvyCQcC2AebC7gAdQPPAWoLuwrkCdwKlQxDC3YLzAt4CzsKEgwECngLXgA1A/8KfQJlAmcAcgvL +CzkK+ALYA8oBaABmASQCrgtxCC0HxgtYDF0DSQsNBK4MRQm9CnYK7AxHBagI0AV0DHEMcwo+C+wLIwWkDG4JCQxwASEHlwB5AdoJ +YgsvDCEHhwu/BRYJuws8Cm8LqgowDHsF2wx9ChMHQAhjDGQHEwQ+BxUBaAi0AG8MkAxrDIgGUwScBUIBuwi0AUoB7AbkDKcIRwhJ +AGkAegNZCCsKKgxBDJYDnAybCXAMnQUjDCYMgAyjCXUEGwHlDLUAbAhIAngMuQtHDIgLCwrZA5oIvABiCAECagZqCWQK5QwACwoM +wAm9DMIE7AvDBPIMKAp5AoQMhAE0DNQM1gFaCCEKpgEqAp8IIgEvCLgFQgsrAlwCMAiABdADOAhzBxkCDAirAvIM+AzSAT4BcQM0 +BBYMhQo8CN0AaQjfARIJjAM+CzAMIgt1BKYJGwjxDF8LnAyfBWkMfwsQDIEIZgA3B9wMsA0BCksBXw0EASMNBg0ICtEBkgioAHQI +SQJsAmMIpgv6CKkG7wisBUIGUwReBUIIdAh2CNsL8QjCCOEMsAJfAvQBZgy7DQwMlQiNCO8NEAnADRILwg0UBZUNFgxGDMYH2gLl +DMkCLQN/DTwMqwunCVIJvgTiBOcAIg0EAkAL0gzzB5YALQd1ApQCFQFaCFcM2QncCuYMAQfKCWoJlAzdCeULwQpzDUcLxAufArMA +OQsUDVwC9A1eA9MIDQE+AYsM6gyICgsFzQn+DPMBQQHGDPYM/Qi4CYwMIAu+DUEMXgxtDGAH1gt6C+EKeQAwADkH3A2BDPUCDQz3 +AGUHkwYQAHYGQwz8BqAIuArZDZUNgw2XDYULcAq9CmUNiQwjDVUGFQzBDW0KmQ1vDOINkAqdCGcFdA2iAUYNhA2fB7gNUwmmBc8C +4AK/ARkKtgzyCv0Ngg23DaQNnw1bDcMNlg2eAzgEXQ1jDHYLCAy+CzMGvwwDBZULmQbGDYwNEwzEDRcNSwhmDZMB5Q22AQcNuA3M +C6YMDw1UDX4F2g2ADOwCeAFCDBIMNAipAGMBDwbwAacB7QsGDT8MXAm5BzcJvwg3DN8GTgxhDKIM4w2zAkgN3w3qDO4MMwwUDe8N +8QpbAewL6w27B+IH5wgoA8cM8g4EDewOBgNjDToCeAfoAvUMFgr5BYIHlQqnDgUMEw4WDU8AaQ4ZBOoL/AOQDYgMvQ2KDHoNrgrF +DbAF4w0YB20AOQxnDh4M7Q4UDiEIsA4jDiUCOQwOCVENvAjACB4Kuw1bDhMIUg4VDjkItA4kBcoCOQweCWILlQv/C5cNZw3WB9IK +6Q3ZDf4JxA3cA7gK4w4DB5YN6w5FDjgOFw5JAvULgg4+Dg4LNweUDkQN7Q4HDmAOOwFbDhsMbw4dDmgBMAzwCikN9gx4DfgNqwfQ +DJwOLQVpDOEOMA5YArMAMg40DnEIIw2ZDNANawrTAGwAdQlLApUI4A4cAnMONQ5dApQIwAJ9AGQCeAM3C1UL3A3RDAIMmQueDjEB +4QqfAXMOkAKfDpIJDg6VA3ILSA2wDBcBIA3qB5gKqgriC1YOKg2qDn0Dsw4ACskEPw5bCqcOrQ4MDeUNvAzhDqoBAQ5pDBUFiQyU +DfcK5w6zB7AOtQezADMNtQ5GDj0JpQ4OAHMAeQEwAZIMNgLTC1ILbw5uCQkL9QeUDkYOTAq9DWQMdwxCDncN/AfVB2kMJw2yCskA +OQ7MDjgOYw7PC2cDGAquAYENwQvTDtYLbgkOBtwDXgH+AGgBBgh1DFEMOg6OA8sOwQ3NDQoLBwRkDsUOUQ6HCnEOewsODdoNSg7J +B9oANgj6DwIN5A5kBfELpA2/CMAKsQzKDMwMuAvRDTAAdQutARgLsAzyDt0NWw5GAmYBNABsAQoIwgqRBq4OmQ4rDCQLOg2OCDcN +SQrHDp4DEwrKDd8PJwBoDykPKwjWATUI2A01CHgNNw8/CFYNMAyhB70PAA7ADzsPPQidDSIIbQhXCdsIWgzbBkAOUg8xCUMOLwc/ +CesJ/A1wDzcDbQA3B28PAg8oA9ABCgiBCJ4PRQhuDg0PFgw5CKoNLwIrCK8IsQMhBAIL5g0nATICYw0xAmMPYg88D2QPTwh8COEM +7wH9CA8HhQiLDwcHyQ7HC8UB4QO5DzoOhAf/C/ALbQ2+CCUOjwB4AskBBQ4aCMMMlA1mB8kO5A6bDGIOnQ5/DzgNlA+TAGEPlQ4m +CtEOig3rAQYKsQ5AAaUOQg2hD6IPpA5LDnQPmA9UCRoHOA1EDdgNRg8NDzYPnwNtDAcN3w+vA+8O7Qn1BEwLGA+UA+8D1guJDwkC +Ag9KB5QAeAsCBt8DOAFVAVsPLAriDwUKBg8wDngJHA+4DW4PugtcD7wHkAp8CxgPzweVD9IPfQigDX0O1wkODcAKsQ6iDhQOhAhz +CNkIdwEGD0QI3g9QD64LAQsbC9cBSwH+CHINCg9SDdAP2A9WCugIkg5VDzMIkw81D94PDw0ZA7sLGA/4CyABXwqKB1QKiQdSD/wH +VQ9HD1sNzQ9/Cx4LGwG+C5QO4AOVD4UPVQ/KCwwPCwx8D90MYxAKA7gANA10EBsQDw67DxUETAhGDMsISQxRD3cPIAuuC7AK2QpD +CLwKJgfuAHILLg7EDnYOxg9ZDsgO6AezCjgBcxA7CkUKPQ1SDrwO0A+OEDUOEg5cDroPkQAsC4YK1wJhD4IPgwxbEEINZw+bCjEO +VxApAeEANQfcEFcHeAyIBoAO+ArVAzQL0RA6Al0LhwTqCIEFqQzYDc8PBhBdDNwNQw37ECUMnhAnD54QYgg9B28QZgL1EHIPwguE +BI4QMgzMEDUQbgqkDpAQVA2HDnUO4grnEF8Phw1xAXYAORCBDPAKpRBTCqkQLw7uBEwG3wB2CHYCYw+rC4wNKgGRAcMLIgBmDokA +aQkEDvYCfQFXAXEM8AOCDtkJNAJzAlwNYQFbATIMsgFmD+YNCQriEB8QdhCRDWcN5wowEAIQkxBEA60PSA2PBlYNswA5BxUQtw17 +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 +F3EP6xFwEDMRcheAGZMbPAXaFf0bDRseGdMZJxshGIwbWRnYFAUDuRrMG2UC/xalAvMZLgh3DBwXag44GcEN4ABjDeIJhA0zFMcY +nxjfCkIQbxFuA4MQcxBSDh8P7g5zGpgYTw3GDPgYhxtTE/kYihtsGLkbQxomADgH3BiAG5AOhRsAGA8B6BjDG2QYeAcxG4MXnRQs +EJAYGxtqGUAa8hfQGVoYIQbTG10bpBt/GCgYew29GN4bKwilG48YnxujDdMYJxuDGDUHwxuTEp8a7xtWF7YblhjVG5gbcAA5Gagb +uw2YGnAXShVeDWgBQBu/G88aeRY+GhUSrg3wCrsOChs1A4QaIAiJGzgbaRc0ChAXeRRLGdkBeBpHG9oOCQGRENQQchgNDVQP7Q5e +De4BShvsDfMYzBX2G9kOCBvcG+0b3hBzGSAaghn0B+MTZhdCFV8awxUZGyMTmgQ+CPoYyBv7DfIb7gOEGk4PFhtzBg4XZBwOG90I +ShvvFqsZvBauFqMWsAn+HA0BkhoWAScZggq9Cy8a6Ri3G8gaJReQDxEb6gipBrYO+wJeEQICawH+DaAZyBL+CEkMMxqBGmEQkhtY +HAUbbxiPADcMZxwNB+gAcgwzGMAYEAJNCCkCuxtjGpgYyRdnA3wBqRKBGYQHqBwrGI8HRhtGHE8RkRxRETgL8RKVGjQDYwd8ATIU +ogxWAV8XGQEyASMDNAFxFIgW8RM3HAcVYRuvFxAAMxxDHGEDNABlHGQNIRxnASEZGgFxF8EOeRwVFtQBbxb/HBYcYhx3ARgNIRxo +HHwAaBmTHHUcYxyHEBAcexxqHIsJjBfmF3UZbRkpE9obRQBbHA0chRx4HJAcaQEOAGgcXRmRC7UW6wHwAHkAcgByDzwAYxDwFMoY +owIqGusSQRs6Cb0bxRurGqIcKhluFcYbWhaFFLQb6hypHKsQEw/7CLwKjAbjBjEDfxW5DFgXVBwoEoQaQxaeAXUDuxzHE94QaBbq +FGoDyxzRAe0biBvgCr4aPhBcG5QcKRutGB8ccRdaB28c1wOCG+8W1hmgB+YPgBw2GU8JLhzIHOYcERB0HDwPCBrwC5obDxziD98A +NAj6HOUbiBwSD8QbLQgkBt0DgBzYHBoI4Qd7B30T0RzzEYAcmBRiCPkB5R0HCEMbnwxLDE0M8QkCC7IRThE7EZYdEBz9BgIb4hw9 +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 +]] diff --git a/cached-configs/pyindustry.lua b/cached-configs/pyindustry.lua index e69de29..0a62d76 100644 --- a/cached-configs/pyindustry.lua +++ b/cached-configs/pyindustry.lua @@ -0,0 +1,204 @@ +return [[ +AHsAWwAiAGEAZAB2AGEAbgBjAGUAZAAtAGMAaQByAGMAdQBpAHQAIgBdAD0AewBjAG8AdQBuAHQAPQA2ADUAMAAsAGUAcwBzAGUB +GgBpAGEAbAA9AHQAcgB1AGUALABpAG4AZwByAQkAaQEkAHQAcwEVAHsAIgBsAG8AZwBpAHMAdABpAGMALQBzAQwBJAEIAC0AcABh +AGMAawAiACwAMQB9ACwBOQBhAHUAdABvAG0AYQFAAG8AbgFDAUUBBwBlAUgBSgFMAU4AfQFQAG8AcgBkAGUAcgA9AQIBVABvAHQA +ZQBjAGgALQBbADABdQAwAR0AXQFzAQMBBQFeAQoBDAEOARAAdABdAU0AcAEyATIAcQEQAHMBEQEhARUAIgBwAGwAYQE/AUEAcwAi +AVABQABtAGUAPQAzADABUAEBAXsBBgEIAX4BVgBiAS8BWAFmAZQBFAEWARgBGgA9ADEAMgF1ASABIgE1ASYBKABmAScBIwEuATAB +MgBkATQBGgE3AHsBOQFxAGUAbQFBAScBXAG9AUcBSQFLAU0BTwFRAToBPAE+AUABQgFEAcgBXwHKAWIBzQFSAW0BVwFZAVsB1AFG +AdYBYQHMAWQALAFmAWgBagFsAVUBbwFxAXMBdgAwADkANQF5AFsBnwF9AQsBowGlAVUAcgBzAYMALAGFAWkAZQGIAT4BiwG/ACIB +wgHEAGMBxgHfAV4BYAHLACwCBQENAQ8BEQAtAG4AZQB0AHcBZgFMAZYAaQGYAZoBnAAsAZ4BBAGgAQkALQHcAWkBtAFIAHIAbwEI +ASIBLwBnARMBFQEXARkBGwA1ADUBsQEjASUBJwEpASsBLQItAbsBvQE2ATgBzwE9AZIB0wFdAckB4gFjAc4BUwFVAdwAaQFaAccB +4AIMAdgB5AHmAWkBawJLAW4BcAFyAXQBdgAyADMB8gH0AaECJAFYAiYBxgGFAioBIQGKATAB/AH+AYcBiQIDAY0BPwBlAGUAbAIo +AmgCLAEwAU0CQgHRAUECUAILAdcBlQAsAZcBmQGbAZ0BAgIhAfUCJQByAicCZwIrAmoAZwAtADICLwGqAjIBrQGvAR8CaQGzAjkB +KgEsAbkBMQEzATUBvwHBAGgBwwHFAnUCCgJHAg0B2QJ7AkQCfgKpAlMCSgHbAVgCTgHeAkYB4QKqAlQBZwJWAekCWQHsAlwBdQA5 +ADICYAKIAmICigKMAikCjgItApECbAGGAgACbwFvAgQCBgKmAq4CtwFiAocBfALFAmQCiwJmAsgCaQItAoECgwIdAoYCYQIjAG8A +aQJ1Ao0C3gJ5AakCMQGsAa4BsAKZAjgBKAKcAjwBugKgAb4CQQLSAggCpwK2AlIB4wHOATsCQwHSAtQC/gJJAdoCTAKzAk8CqALV +AeMBZQK6AegCWAHrAlsB7gA5Al8BegLEAuUC5wJ2AskCawGEAs0CAQGKAtABjQL6AgkC/QKAAhoCHAKFACwAYQByAUAAbABsAWkA +eQIwAasCMwF2AjYCmgG1AbcC9QKfAbwCoQJBAVQC5wERAHkDBAKAAwYBjgIpAGQAdQBjAd0DRAJIAqsDJAL8AdUDBQKrAwECfAJF +A1IDRQKrAlgCTQMKAyYDTgFQATkBxABsAREDLANDAwsDUwK5AecCVwFtAxIB7QF1ADEAOAA2AmADLQLnAzAAcgB5AswB/wMgAnAD +YQNBAHQDZQAtADQCegN/AG4C1gByAQMDLABzAiQAawAwADECegEXAQcBMgFvAuACGwGZADYCHgGeA3QDLwMxAUMCpAMvAC0DhwEw +AV8DjgLsAzQAXwBmAWYAbQB1AZABawAoA5cBdQApACAAKwAgADIAXgBMACoAMQF2AU0C8QFAAjkBtgBsAbgCPQL3AkABwAAiAHMB +ygFfA2cDWQNgACIDQANjAHQDZgNeArgBzgJnA0kDSwK0A00D0wKjAqUC+wPZArABOQNVAq0DygNfArEDCANMA+MD2gAiA2IDZAN3 +A94DDQHlAw8DawHqAloDbgONADkAOANzAy4DdgNmA54CdQOhAGcDowN5Am4CAgMiATkDxwFKA8kD0gLWAywD+gMxA5QCHAOXAuMD +mgP7A50CdAKnAHACcwEKA6QDMwIyA6cDqQOrAGEDrQOvADADsQOzA7kBdQArADMAXgAoAEwALQAxACkDuAO6AzcC8gA9A78DwQL2 +Az0C+APFBAcBRwPoA98DzQMuA0ID7gNGA9UDSgPnBAoC/wPbAgcDJQNYA+QD4AHQA+IESANGA1sDCQK1BE0D6QPrA38D7QQ+A+8C +VQMQA2wD9AK/ADEAOQA5A/kDdQOcAHMD/QFDBBgCIwAxBAICzgQEAYwEBgPIBEMBAgQTBA4DKAOWA5gBAgJMAn0AYgGjApMC7QM1 +AvABsgQ0BDYDOwI+Az4DxQPOBEIEXAREA0gERgPYBI4DTwKkBEsDUQJRA8sDAARQAwMEkwPMBFQERwRXBD8EWQOABJ0DDgNqArwD +bQRiADgDFgHzBH0BQgR/AG0AYgRvA3sEBQPqA34DgAOCAg4AawBvAQUBMgB4AC0BJAKLAXEBmAEaAxsCaQJ6AsgAawIVA3cEDwR6 +AuMCsgFvAQoDhwMaASoBBgPHAWYDfwHdBIEDNAGtADcCNQO8AbQENQM6Ap4EiQQ6AwcBVgRVBEMDVASbAn0EpQPwBKcDEQRhAe4A +NANyAXoE0AIjBNMCdQTVAG4E1wMtBFUEswLPBHIAIgT5AHcAYQB5BM0APQGvAVAEnwK0BBwBrAGbBDMDvQLzAjsE5APDAqICvANc +BFYEmANfBKYCuwTxAr4B7gAwADcCYATQArQFAARxAgQFDANdBKEFCAUKAh8FGATpApIDpQKVAjQFEQThAvQFFQQ5A8QETwMCBO0E +UgNaBSUFKwUbArgFHQRfA/MFIAF2BGMFJAPmA9gCwgMeA3oFAQIEAnICdATGAngCLgIOA+EEnARSBTAE2gR5AuIFLwUqAVsAMwTb +ApUAMgTeApgEhQUSBOIDwASIBRYCQQRFA9cFQgJ/BE4CBQSVAtMEnQSaBT0DVwVDBD8FYQTqA2kFHgRgBUgDjQA0ADQFSwToA0wC +XwVPBAMDIQUCAnQBcAEqAn0BJAE9AhQCegVwBKAFfAJ6A8cEGQIkAG8DSQMwBQgEEQVgBUEFGgVzAcsBqQTgApsFFAReA/ICvQMT +Ae4ErAV+BD4FJwWNAgQFjwNLAikAbgGTBZoBbwBhAG0BSABvAHcBaQGVBQsB2wBvAaQDYwBzAG0FDgEbBCcFNgO+BOMDwgU6BRcF +WQU+BSwEUwWkBX8FRQWtBKkE8wWGBPYCTAXHA0EFygW0A3wCrAHSA4oCkgIOBZMBLwBlBQgDKgBiAVgBbwN3BcwBHAEeBc8FEwKd +BdICPwXUBOwFewWmBX0F2QTuBawEqATyAXYANgXfAFsF8QB0BfMDeAWLBHAFtQJxA6sAZgB1AHIFVQKPBe8EewYLBg0EwAIBAHAE +xAESBTMC7gOvBfgFawQ3AzwF/AJBBdUF/wKvBEkFXASSBT8FgAVGBa4D9QLvAfIGGwOcBHAGHwE1BeUEtQBzAG8BkAYWAUkCFAJ1 +BjoGIAJ6BjgEzAVeAyoBAQZJA0MAbQBrADIGHQEQBjsBGgVkBQ8BmwVoAjcFagSHBTkGKQPFA1AFfwV5A1YGYgTnBRkF2gTvBYEF +RwWvA40CNAY3BfIDnAZQBlIGRgY8Bg8EtAUCAHAFwQFpAC0DLABtAWYGSAZwA+0GdAZWBVgFwQAtAWgE/ASNApwDSwYVBe4GSwYa +AnQAdAAtAhsDqgW6A9AGUwBpBlUGIQX1ADEGJAWpAzkFbAZeBIoFPAZkBXgGZgTpBgMD8QYFBYMAMQVKAXMAYgaRBpMAbQaVBEIG +gwGCBnYFUQJxBkADLAFgBkQGmAaaBhkChgBiA4cAawLKA6gBDgOjBlcFzQKXBiUGXQX7BqMFdQPcBEwFmQNGBisGZQYvBXIGLQFj +BdsGqwZsADAAOAUjBq8GxAbGAWYBRwRuBrgFKAMjBXYD3QSOBQMAYQLnBQUFBwaPBsIG4wEwAC0GxwFHBTIGnAaeBWkE4QbOBDgG +XwRKBXcGMQZjBFEF1wVABUwG2QMMBtsGaQYzBd0DbwbfBjcG9QKQBvgBXwVOAf0DHwa5ATkGwwBhBsUG9gcVBC4GwQUvBxwHHgcU +BuUBXwVjBiIBGwKXBloDOAYmBW0F0wVvBJAFcQWlBtoElAbSBJcGAAYuBtYGpgbYBzUHCwFPBtwFHwZsADEAMwRuBuIHHQbkBsgA +LQWKBxgFUAbpATkFlwYwBdcAIgckB0oG+QWhBhoHEwb3BycDgQbKBQkFZwbNBdEHAAbQB1IHCgNoAc4GYQc9BzwHBAanBZgHOgcM +BgQHQwY1AR4HEgdJBx8HXQWGBugGEQcbB1sHIAVjBV4FogZNB34HXQA1B18AMwZZB2IGoQbPBOYDRwWeBJEHZwSZBwIG7AdtBecF +1gbUBwgFiAdTB5gGMgXcBgYDjQOXB3YHJQdcB0sB8Qd7BeYHVgd4B0sDggeBB1oHdwcmB0sANgdfADQDNgafBy8GogeNBIwGlwc9 +B2YHPwdoB5MG0wdwBOsFegbXBbIGMQdCBYIHRAA3BPUGCgeEB7EGPQUCB6kHsAFHB4YCDge6A9EFLAetBvQHrwekAUcANwdfAR4E +hAZbBv4HYwYoBtAH1wbXB70G1wdqB5UHbAcHBJ4GAgfHBw0HngasADkHRwfNB9wHIAUjB6cEtQfSB90BXweyB9oHIwOrAGsGkwT8 +AWkF8wdfADkH4gcuBv8H5geNB+4HnAPlB5oHkQUcB/MG3QP1BSICwgavCAQIBgEjAy0BaQfQBSkDGAF+AhABgQJ6BisF6QJ6AbYB +PwgeCAgFwwbzBS8H7AUsByoAPQgLBy0ENAU4B4wFOweWBiwHQAfwBwkHvgPLB8gGawgZADcErAgzBXwIIgGNAuQIJQGAAREFmgYT +BhUGFwLfCDEBAQF/AhEGkgIUAhYCGAfgBN8G/QXQB4sHZAgQBf4HxQfxB+8IRAY0Ar8DjQP4AXMIWAGBAhMCFQIXAHIAawhLBqQH +BgWZCFYCBQNjAGYAZgTAAHgBjwBvAYoAdgEhCAoIDASGB+UE5Qg8CBEHwghACBQIQggWB3IHyQgZADYIbQBbAGMIfAh+AGUIgAE7 +CIMBIQh2ACIImwiBCJ4BlAIOBKMD7QKSCHoBFwHGA2MBiABlAbYHNAdfBywHigYnCIoFFwfqBz0ISQiNBwUFWgfvCBMGZwapBPAI +kwRiADMB8QhuAG8IrABpCK4IsAHdCKAIuAVbCE0ALQLmAugC3QVWB1kBUAOQAGMDkgGZApQC7giHBWoIOghjCIsIZQc9B8YIaAgX +B3MIawjFAfII2QjbCKAI0QLGAtwCdwYYAg4FfgipAoIDlQVfCFcBWgE/ASsHNAOgBccBbgW7CDUFzge2COEIDwg8COYIEgh3CL0H +nAhpBw8BdQAzCBsIlwj8BosDTAIpBH8F6AjvBdkI9wLhBS4BaABmASQDagjdBc0E3gi0BzAHAQg9CGYIQQbXCKcH2AkOCOgIwwHu +ADUErAkgCSIIIQf8BQIJLgPuCDEBaAj9AG8AeQJWCSQAPQfhCDgGXAiJBW4EiwRBB7sHlQjPCL4HwAc5BzYDzAiMCVIIvwaoB5UJ +OwjBBmoIagVJADgIxgBbCT4BKglACTgHTgWMBeYJOwS5ACIBvAj9AUoB+QWaBGwBCgZ+BZ8Gjgj4BBAEewlrAXEDLAQABocIrwEk +ASMGvwZHCDUHiAjfB+QIYgkIBRcIuglVCQwHlwi7B24HmwmNBLYDzwSkB/IIkghFBGIANQbhCWABPgl5AHIJewk2CAcJgAZ1CWUG +EAXmBnkFwgYWBn0GfwVYAZEGewB0BhUDkgWaBrsGQgEGBVQGtgJ6CTsHgAl1AoQCHglrBNUDSwFmBvsJhAhhCLUJSQlQBtcJVAg/ +CVYHbwmKCZED7AkvCI0JDwefBq0JEwm9A4cJvwByCKABkAgfCbcEtwPtBWMCDgmfAecHIgEBCK8JIQNLAC0E+wXKAT4BigFaCLIH +tQhgBqAJxAcxA8UJTgkLBtEElgnHCOQHlQkKCdAJMQmWBUkAMwYJCeUFkAnoA6EJ6gIsAVoIzgczCcsHCweOAxwCkAEZCFAIAgnk +CH0BQQHIBk8HjwWgCQQGzAe2CA4ItgYqCfoJTwc+BmgJlQlcBxAAMAHyCeUKFgFGChgJcwigCXIDqwiFCHoKKgJGCi0KMQKRB18G +nQnCCfEJKAbQCYkJyQmLCD4HvwojCVoHDgnSADIJXwo0ChcFnQlzAssJOQW2ChUKNQpMCjEFlgjVAo8ALQoRARIKMwpRCksKMAMw +B0wJ7go7B7cIOwi3CgsJjwnMCj8KQwnICkMJ/AlSCdEGrAe0CikKXAosClMKXwdNAm0JpAS1CkoKdApeBxYKVQePCP8EXAoTCKED +MAW4BZICFAmdA0MBSgEPA6oBkAH5AagF9Qg3BiUJBwofA8UKaweSCkQJlAaqCOkB7gA3B/cFtwWRAUIBJAFpAGcKigBjCowEIAqP +CKAGTgJ6CqAEwgTACogKpQaHAdECiwBiA0ACTwOOCjMKhQqhCrAKpANDCdUAaQq2A0wEGwlDBTUJBgUUCmQKIAfECOUIZwkwCiUJ +EAAwADIJEwquCocKvgqzCP0KwQq3AVsG5wmjBncFUgFvBVQC6QjWBoUKywRICroFkAqvCqMKiQrXBZEKwgVNCjkKHAnwCmMI4gmI +BusHwQnMCpcFdAptCD8KbwbeB/YKKQq7CukKsQq/CrQK2QNMBxcKeAreBuoHOAR1CtQKogsDCuwKtQraByEK5wqGCw8FlAXuCDUI +swrHBfoK9AL5CvYJUQpACSoKzAksCkUH9AdEADIEZQFzCw4KsAsYCdkAdQbDAcUGVgsVCrwBxAW6BvYAZAKLAy8HhwlGCYUJ8gkp +CvsDaAr9CBkAMAoCCwECfQs2AsoLOQN1CRsLJQrmCboFCQIeCq4BWgGTARULHAEtCs8HnwF1CtMLAQtUAGMB+wpPARUB5AnkCxAE +aQE0AGwBCgm2CQQG/AfjCcMKPQhkCuUKIgtBCpgJWQqaCMIJ/wNvADEJmQrqCrILZgJ0C2kGHgYgCKAGPwZBBr0JtQuBATUJ3AmS +BFsLTwLhBkwIoQtlAGgLZwlxBlEJoQZWCYIHiQodCUgJ8wnGB2sKIQn2C3MFdAt1COcLWQasADUKAguRC5MDiwZzC4gBGgjOBnoJ +qAByBn4AcgqtC6kLfwuWARIGhQB3CXwGiQe7CRYGjQuKCc4KYAgxBewCFAX1CsYK8gqUCcUKmQukCpsJMgJdC6gLLgthBAYK4AjU +CPMC3wj1BaQFLQR7CJsIggTKAzABVQFbC2oF9QVmBfcLmgmGCpULnQftC58JkAuhBUQJ/gomBYQLewB4C94FjwvhC7gIoAssC8UF +7gIOC4QGvAZDC4cGVAZHAg4K4gpXClkJ4wihCJwIggBpCIQJAAFLBMsFBwtrCmIKHgvLCmkKmAr5A+kL7gSiCd0JzwpuC/AJEAO5 +C/MIowwMAV8EyQwQCi8MHApgAg4MJgEqBvILUAMqCKIInQwkAb8EggX2Cz0Lbge4COMLcQugCs0J/QulBt4ANgSsDDEMCwiEC2AK +3QcaA8YIUgZCClYIVQwvBHsILAaSAS8IHwgJCYIMNwo8DDkFFwwaBF0Lzgt4C3kB8gxQCC4IIAnYC9MLzAh5C1AFLgEBAGYJ6wPY +ATIJbQFmC7gHswnvC20MVwrJCUoDfgwdCyIJ9QmQDBYFdAwYBgELTgoiC6MKzgxcC/ELegkTDGoKCAFbDG0J1wv4DGQH6AbtCaYG +ewmpC7QCDgBuA0oDMAv/C7AKfwPWCgwDBQnNBFoMeAL+CAIAZgGQAZgAdABoAikJpwX1AR0MVgrzCYcKygalCfsMPQnMDIIMPgyE +CtAANgyHDKUCFQyoC7AIoAykBb4BVwBiAzAIpQyfCZMH2QxOAVAMwAazAGEMwwRyDDUANAvmC8kKyAseCpYL7AnMDFoHcQy3C1oA +NQiWDMsMwgzECKAI0whUAnkIegykARABCgBoAQYAZANjAusGnApiC8oLnAsjDLIMgAyDC3cL8QAwADMJmQznAGkM6QzrDO0AZwv5 +ATAF7QJ6CPYMCAz8AQoFBQBnCe0JBAkmC+cLPwbQDNkHwwyxC80M9wrQADQM+wBsDOgALQ0KCgkMZABwA2YB+QBhCXsDhABrDMUF +BAUGC9sChgOoAy8LsAkACRkB9gIyByELGg0OCvIMFAzyDH4GLg0SA8wMtQweDD8IGQmYDF8GQAE7CacNLwFuDTEExQrcCwkMSAnh +CDAMyQUvDSwNRAZ7CRgNRwSCCjgINQzRDK0NNwkpDTkF2Az1CZANPQr8DB8LWgA2B/cNUQ0uDVQGkg1WCwgHGQdQACINZw1FDWkN +SAaSCrkNTwxpDUMNaAkBDWoDNApgChsMEwubCSkMfAPpDV0HmQjACVgMKQsmCBgIawA4BgkNcA1TDXoNcwdMCKANggLWDY4GFg1y +DWsNBw14DXENkA1WA4IINQQjCScMWAM/CUsMoQqYDHoKaAsgCfkMOwvtDLMLIg1hC0INYwf1CV8Nlg1GDXsNMgd6DEcNbglhAikJ +QQyUDW8Nmw2PDTANVgm5AuEHgg3ADS0NnA3DDXwHhgcqBB4LsgQgA60ANwF2BCUAIAQnADAAKgQsA4EAKQO7DTYNgAbQBDwECQoi +DI8JTQpmCBUD6Q2UBzsM1wsiDTsBzg2wCEMNsgZsAa8NtA3BDZcNnQ3MDL8N9Q22DZEJaQ3hCTwLUAWiAGcCZAzvDVoN3wtwDRQM +PA1fDT4M2wWDC0UJEw4CAW8MKAuLA0MF6gPGC+EBXwUFCzsIegBnARkJ6AmvAhULPA2iDHUJjg3nAlMLQwhrADEGCQ4cAVsJrgBy +A5ILTQiPDf8JHgR7AqQAYQB2CooLsgZ/CDULyAxzDK4L6QxlDLYNFgtaCykB8g41DjcGfA45DGMNugd8DMYEzAv9C9UM5AIuBV4M +aAAiDFIILwYWAggBygRCBH8MlgOKCsQMNQLvDgUL6AvLDYQIjg2GDRUJWwrQADgKKAFzDlYMYgELAGEOWgaXDlwAdQ5eCqsIHQ5u +CAkIeg55BnsOWQFKDlsBWg51DVcJwQ5iDRAOBwh4Da0OCg1iDT8EYgAwCV8OfA5YDnEOfw5zDoEF6QigDpAOcA5yA0MOdA5eDAgO +mA5+AQwOlA5dDX0L5AxyCA0OBgg8DekG1Q3rCmwNrg2xDowFSQAyB8wOnw6SDqEOmw6VDZIMZA60DpoALQ6cCjgCDg3pDnsIBw5v +DqAOgA6jDZ8L5AdhDQ8Lbwg8DagLIg6qDRMOiAzYDq4N8A6wA28ANAf3DrsOkw63DscOlw7DBfMOmQ7bDr0OuAnfB44MnApnAwwK +gw7aDrYO4w6jDc0F9QmDDoUOzAplCoAMnQqYDtAJUw6sCpgNOw4nBUkANQ7ZDt8OfQ61DsYOggemDksF5g7rDwQDigesDgAEew8J +DqIOggeyDVgOpgiIDmMM8g7OCkMO+Ai8CYwO0w6KDq8ODAdEDWUB8g8PDtwPEQ7eDFMPAg68Dr4Hhg7qDwEOkQ8qDrgH3w47DxQJ +Rw8WCSkN5AoiDxgO9w2qC54NrA8dDjENiQqcA28ANwmZDyQO7Q6CB/sPBwS1D0YOvgeyB9YNpQ4yCPkNxwS7BL0ImwqwBMIAaAYg +BhcKYQ7yDaMJ9A3mCJAN6A88C+sPPg3sDtQIkQ8gBjUM+gHyD1QDLA9WBMEBQQ9ZATUGFwoKDvUO6AyeBhUBBgBpAHUFvwwFC9gF +AwIqBMoGkgYUAnQI1wAsDKUAcA7wD10OIw5ADgsOQg4NB0UB8g+IDjAOZwxmDjMChgGQAG4JcQ0ECDUKkg7LD14KQQkrD0ANhw4T +CiQPaQhrADYLKgBbD5kPmwIUC/kMCgikC8EMoA9RAykCHg+sDGoDLwvHCF8OPQ1bBtAOZQnKD3cO1Q+nAe4GnQ+SDOsPuABsCdkO ++gHiCDEJ2glCDmAK8Q+8DqgK9QsMDz0OCA6JD6MOaApGDg0AOAiWD84OSg1LDW4OqgdVBoEMLguOBHsP3wOdAG8JAgb2BZsEbQo5 +C2wOpw82Cj4PYwoiD78OJA9hDBsPpQ9BC88DjQO5D8YIHw/qD+wCkA/uBBoJ2QmsDb8N7w/MDXYBOhAIEAIBQA/tCXAOgwlDCxsN +3g/zB40PGg+hCyQP2Qn2EAoL7w7WA40AMg/eEA4EaQ/rEBAQBBASDWwHTw5MD+kQJRADBGsFnA11D+cPmBAkAGgQJgLKEAUOpBAU +DsoQFg6GDqkP9Qn2D/cPjQ2vDYgLdg5pCdIANASsEC0QNhAvEDkKdw1tECwQNRA3EBEFnAkdCPkLjxBLEFMQKAWcDsgJQw7xDiIM +1QvqD/YPywwZD2cEWBBFD9oLJwd0EEoQUhBNEBINuQ/hEFEQARAuECcQMAIjDcUQVw/oEG0QdRA5Du8JQwe0DX8QFwg8DzgJ9g86 +BXQQGQzzC3IQZg/6C8IP/AxdBp0JmRBZEG4FnA8GEHEF5hCEB3AQDRBzEEwQfBBvDJsHkA/5D4YBARCSEJ0FnA8SC8cPNAs+DvMN +pAx3B+kPYAfrEEAJkBBCDe0DfQ/7EEYP2wdEADgH9xCkEDgQEgNyDGQQvBBUAiMPLA8NEDQQmxBaEHYBCg8yDKsQqQw4D4wQmAnM +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 +F8oMJRfNF7kAaBd9F8gX2gOgF9wBDhfeDjsS8xdkEyMW4xeHCkgXoQ0cF9kBGAl/F7cXzgBoC4MOUBZKDlMCHgOHETMBahBeFxcL +QBVdEucBdwHyF/oDLBLrEokX+AKGGAQB+hczE2AVWBeZF2UWzBcbFnoUiwAzCJYYCgOKFxQXJBWwAY0L+xMFFG0DJxAMGBcXMxbb +BysWTxYXEs4XOhQpFv8XwhgTFOwXahgDA4gYCxdIF6cLFgstFl8G7hf7GBgXIwciDSgDMheYEswXmgzyF5wOZRc/DPkErBg9GDQK +vAt8CwQK2Bd7CtsVTQEBATIMagIUAQoM3wzNDMQVOglDFAsYJxSIFuISJQ3uFiUXhhRRAXcJmRhSBe0YVQylDOABIQQuFJIFvgy8 +DKkNThbyGGYYVAb3GGkYVxhrGCQClheCFssYXhcAGGAVjxaeFwIFIg+qGHMCIxhWDM4OlgxkGIUYaAzBGHcOnQh6GIsYdRiNGIgV +eRVYFCYPNRZuFxkS0RadEPcYgBXKFaYDuQYJGJEYhxhYFwgMSBijGHYYlA4VDsEYIQivGGcYkgzMGJQRewTcFQ4XvBOhFnAVEhZy +Ec4YKRedFpwXZxYkGJ4WsBXyBggYAxiuGHQYpBhrFa8XCRZvCUwHVBUoGKgYkxilE0IY0BixGFgVvgU0Fm0TZBYbAqsW/AdpGLwX +hBOEGMAVpBXxGKAANxiEGMYYhhipGNYIoBjUGGoPCxjTGOgYjBjVGGsV4gTcDaEU5g4/GNsDzBjdEw0WdRgfF8EYEg08GGEVGhTs +AxUYxRhTGOkY0Rj0GOwY8RiwGO4ALRYDCXYYCRkNGMgDihYKA6YTwhYNACgN0wOwEfEWERH0EfYEMhj4C8sWGQmQGPoD1BdMEIcY +3xgRGJwUuxjjF54XAgGvGKIZFBjqGGsSEBXTAY0Y7RiOEOcJbwQID7QT7RhRFEIG7wmzBacS4xkjGEIYABSLDo4YxQFJAQ0CUhgG +EKEYCAUvF/IX3RDmGA0I3hf+FA4YfRgsFwEP/Qz5B/cZVBfkGVYZUBaPGHIX4wHsEDkYeQt6F+cYmBgQGVsZARhFFlcBcxlhGWgQ +KRkMF7gZYhA5F60VlhlBGXgZdQWcFvcVvxh7E38X1g2DGSwYvxldDF0B7xHYGXQBchBOFqQXvgdUGY0Q5hWVCbsZExl+GY4Qnhap +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 +]] diff --git a/changelog.txt b/changelog.txt index 35a6154..52f2da8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,9 +1,27 @@ --------------------------------------------------------------------------------------------------- -Version: 3.2.0? +Version: 4.0.0 Date: ??? Changes: - Removed niobium pipes from hydrocyclone recipe. Resolves https://github.com/pyanodon/pybugreports/issues/851 --------------------------------------------------------------------------------------------------- +Version: 3.0.19 +Date: ??? + Changes: + - Remade tech tree with autotech 2.0. Science pack cost comparasion: + - automation: n/a -> trigger + - py1: 100 -> 100 + - logi: 360 -> 300 + - py2: 1300 -> 800 + - chem: 2000 -> 1400 + - py3: 2250 -> 1750 + - prod: 1750 -> 2250 + - py4: 2250 -> 3000 + - utility: 1500 -> 3300 + - space: 1000 -> 3600 + - phyrric: 3000 -> 8000 + - Added Dutch locale (thanks, QatSquirrel!) + - Added Spanish locale (thanks, Starl1ght5!) +--------------------------------------------------------------------------------------------------- Version: 3.0.18 Date: 2025-08-12 Changes: diff --git a/info.json b/info.json index 6990f58..18cc529 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyindustry", - "version": "3.0.18", + "version": "4.0.0", "factorio_version": "2.0", "title": "Pyanodons Industry", "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232", diff --git a/locale/es-ES/locale.cfg b/locale/es-ES/locale.cfg new file mode 100644 index 0000000..8e19720 --- /dev/null +++ b/locale/es-ES/locale.cfg @@ -0,0 +1,233 @@ +[item-group-name] +py-industry=Py Industrial + +[item-name] +py-asphalt=Asfalto +py-iron-oxide=Baldosa de óxido de hierro +py-limestone=Baldosa de arenisca +py-coal-tile=Baldosa de carbón +py-iron=Baldosa de hierro +py-steel=Baldosa de acero +py-aluminium=Baldosa de aluminio +py-nexelit=Baldosa de nexelit +py-quartz=Baldosa de cuarzo purificado +personal-fusion-cell=Célula de energía de fusión personal +personal-fusion-cell-used=Célula de energía de fusión personal (Gastada) +fission-reactor-equipment=Reactor de fusión portátil + +[item-description] +py-aluminium=Una peor version de la baldosa de arenisca. +py-asphalt=Necesito velocidad. +py-coal-tile=Oscuro y misterioso... +py-iron-oxide=El paraíso del tétano. +py-steel=Arriba los hexágonos! +py-nexelit=Arrodíllate ante mí. +py-limestone=Camina como un egipcio. +py-iron=Para los que aman las cuadriculas. +py-quartz=Flashbang! +hazard-concrete=Para aparentar que cumples con todas las normativas de OSHA. Reduce la velocidad de las personas y vehículos. +refined-hazard-concrete=Para aparentar aun mejor que cumples con todas las normativas de OSHA. Reduce la velocidad de las personas y reduce enormemente la velocidad de los vehículos. +personal-fusion-cell=Un milagro tecnológico. El poder de un sol en la palma de tu mano. +personal-fusion-cell-used=La célula de fusión de deuterio y tritio se ha gastado. + +[entity-name] +py-tank-1000=Cisterna Py (10 kL) +py-tank-1500=Cisterna Py (15 kL) +py-tank-3000=Cisterna Py (30 kL) +py-tank-4000=Cisterna Py (40 kL) +py-tank-5000=Cisterna Py (50 kL) +py-tank-6500=Cisterna Py (65 kL) +py-tank-7000=Cisterna Py (70 kL) +py-tank-8000=Cisterna Py (80 kL) + +py-tank-3000-adjust=Cisterna Py (10 kL) +py-tank-4000-adjust=Cisterna Py (27.5 kL) +py-tank-5000-adjust=Cisterna Py (65 kL) +py-tank-6500-adjust=Cisterna Py (75 kL) +py-tank-8000-adjust=Cisterna Py (125 kL) + +py-check-valve=Válvula de control +py-overflow-valve=Válvula de desbordamiento +py-underflow-valve=Válvula de salida inferior + +niobium-pipe=Tubería de niobio +niobium-pipe-to-ground=Tubería subterránea de niobio + +poorman-wood-fence=Cerca de madera básica +wood-fence=Cerca de madera +concrete-wall=Muro de hormigón + +accumulator-mk01=Acumulador alimentado por nexelit MK 01 +accumulator-mk02=Acumulador alimentado por nexelit MK 02 +py-local-radar=Radar local +megadar=Mega radar +py-burner=Quemador +py-sinkhole=Sumidero +py-gas-vent=Tubería de escape + +py-warehouse-basic=Bodega +py-warehouse-passive-provider=Bodega proveedora pasiva +py-warehouse-storage=Bodega de almacenamiento +py-warehouse-active-provider=Bodega proveedora activa +py-warehouse-requester=Bodega solicitadora +py-warehouse-buffer=Bodega de reserva + +py-storehouse-basic=Almacén +py-storehouse-passive-provider=Almacén proveedor pasivo +py-storehouse-storage=Almacén logístico +py-storehouse-active-provider=Almacén proveedor activo +py-storehouse-requester=Almacén solicitador +py-storehouse-buffer=Almacén de reserva + +py-shed-basic=Cobertizo +py-shed-passive-provider=Cobertizo proveedor pasivo +py-shed-storage=Cobertizo de almacenamiento +py-shed-active-provider=Cobertizo proveedor activo +py-shed-requester=Cobertizo solicitador +py-shed-buffer=Cobertizo de reserva + +py-deposit-basic=Deposito +py-deposit-passive-provider=Deposito proveedor pasivo +py-deposit-storage=Deposito de almacenamiento +py-deposit-active-provider=Deposito proveedor activo +py-deposit-requester=Deposito solicitador +py-deposit-buffer=Deposito de reserva + +py-construction-robot-mk01=Pybot constructor MK 01 +py-logistic-robot-mk01=Pybot logístico MK 01 +py-recharge-station-mk01=Estación de recarga de dron +py-roboport-mk01=Robopuerto Py MK 01 +py-roboport-mk02=Robopuerto Py MK 02 +py-ze=Extensor de zona de construcción Py MK 01 +py-ze-mk02=Extensor de zona de construcción Py MK 02 +py-ze-mk03=Extensor de zona de construcción Py MK 03 +py-ze-mk04=Extensor de zona de construcción Py MK 04 +barrel-machine-mk01=Embarriladora + +mk02-locomotive=Locomotora avanzada +mk02-wagon=Vagón de carga avanzado +mk02-fluid-wagon=Vagón cisterna avanzado + +[entity-description] +py-tank-1000=A veces no quieres almacenar mucho. +py-tank-1500=Barato y de baja capacidad. +py-tank-3000=Compacto y de baja capacidad. +py-tank-4000=Cisterna de capacidad mediana. +py-tank-5000=Cisterna de capacidad mediana. +py-tank-6500=Cisterna de buena capacidad. +py-tank-7000=Cisterna larga. +py-tank-8000=Cisterna de alta capacidad. +py-tank-9000=Cisterna de muy alta capacidad. +py-tank-10000=Para los que prefieren patear el problema en vez de solucionarlo. + +py-check-valve=Permite a la red de circuitos leer el nivel de fluido en una tubería. +py-overflow-valve=Permite el flujo cuando la entrada supera el 80%. +py-underflow-valve=Permite el flujo cuando la salida es menor al 80%. + +poorman-wood-fence=Al menos tienes algo. +wood-fence=Hecha de madera pura. +concrete-wall=Duro pero frágil. + +accumulator-mk01=Acumuladores alimentados con nexelit para almacenar grandes cantidades de energía. +accumulator-mk02=La siguiente etapa de los acumuladores alimentados con nexelit, ahora capaces de almacenar aun mas energía. +py-local-radar=No posee capacidades de escaneo a larga distancia. +megadar=Large radar structure. +py-burner=El destino final de lo que sea que no quieras, puedes recolectar las cenizas. +py-sinkhole=Encontraste una cueva subterránea gigante. Porque no lanzar todos los fluidos que no necesitas ahi? +py-gas-vent=Deshazte de los gases no requeridos liberándolos a la atmósfera. + +py-warehouse-basic=Almacena muchos, muchos objetos. +py-warehouse-passive-provider=Bodega proveedora pasiva. +py-warehouse-storage=Bodega de almacenamiento. +py-warehouse-active-provider=Bodega proveedora activa. +py-warehouse-requester=Bodega solicitadora. +py-warehouse-buffer=Bodega de reserva. + +py-deposit-basic=Para aquellos que realmente necesitan espacio. +py-deposit-passive-provider=Deposito proveedor pasivo. +py-deposit-storage=Deposito de almacenamiento. +py-deposit-active-provider=Deposito proveedor activo. +py-deposit-requester=Deposito solicitador. +py-deposit-buffer=Deposito de reserva. + +py-storehouse-basic=Almacena algunos objetos. +py-storehouse-passive-provider=Almacén proveedor pasivo. +py-storehouse-storage=Almacén logístico. +py-storehouse-active-provider=Almacén proveedor activo. +py-storehouse-requester=Almacén solicitador. +py-storehouse-buffer=Almacén de reserva. + +py-shed-basic=Almacena algunos objetos. +py-shed-passive-provider=Cobertizo proveedor pasivo. +py-shed-storage=Cobertizo de almacenamiento. +py-shed-active-provider=Cobertizo proveedor activo. +py-shed-requester=Cobertizo solicitador. +py-shed-buffer=Cobertizo de reserva. +barrel-machine-mk01=Maquina para la carga y descarga de barriles. + +mk02-locomotive=Fabricado con materiales mas fuertes y con un diseño mas sofisticado. +mk02-wagon=Con un diseño mas compacto que aprovecha mejor el espacio. +mk02-fluid-wagon=Con un diseño mas compacto que aprovecha mejor el espacio. + +[technology-name] +py-accumulator-mk01=Acumuladores alimentados por nexelit +py-accumulator-mk02=Acumuladores alimentados por nexelit avanzados +py-accumulator-mk03=Acumuladores alimentados por nexelit definitivos +py-asphalt-mk03=Baldosas - Etapa 3 +py-asphalt-mk02=Baldosas - Etapa 2 +py-asphalt=Baldosas - Etapa 1 +py-burner=Quemador +py-storage-tanks=Cisternas +py-warehouse-logistics-research=Almacenamiento logístico +py-warehouse-research=Almacenamiento +railway=Trenes y redes ferroviarias - Etapa 1 +railway-mk02=Trenes y redes ferroviarias - Etapa 2 +railway-mk03=Trenes y redes ferroviarias - Etapa 3 +railway-mk04=Trenes y redes ferroviarias - Etapa 4 +fission-reactor-equipment=Reactor de fusión portátil +radars-mk01=Radares - Etapa 1 +radars-mk02=Radares - Etapa 2 + +[technology-description] +py-storage-tanks=Desbloquea cisternas de mayor tamaño. +py-asphalt=Crea nuevas baldosas. +py-burner=Permite destruir cualquier material solido no deseado. Quemar objetos generara cenizas. +railway=Desbloquea los trenes y la red logística ferroviaria. +railway-mk02=Permite fabricar trenes avanzados con una alta fuerza de frenado. +railway-mk03=Permite fabricar trenes avanzados impulsados por nexelit con una gran aceleración. +railway-mk04=Permite fabricar trenes espaciales hipersónicos potenciados por energía cuántica. + +[tile-name] +py-asphalt=Asfalto +py-coal-tile=Baldosa de carbón +lab-white=Baldosa de cuarzo purificado +py-limestone=Baldosa de arenisca +py-iron-oxide=Baldosa de óxido de hierro +py-iron=Baldosa de hierro +py-steel=Baldosa de acero +py-aluminium=Baldosa de aluminio +py-nexelit=Baldosa de nexelit + +[wall-name] +poorman-wood-fence=Cerca de madera básica + +[mod-setting-name] +py-tank-adjust=Ajustar la capacidad de las cisternas de los Pymods +py-braided-pipes=Activar tuberías trenzadas + +[mod-setting-description] +py-tank-adjust=Hace que la capacidad de las cisternas sea consistente con su tamaño real +py-braided-pipes=Esta opción hace que las tuberías normales, las tuberías de niobio, y las tuberías multipropósito no se conecten entre si. Esto también hace que sus versiones subterráneas tampoco se conecten entre si, lo que permite trenzarlas. + +[recipe-name] +py-void=Drenar __1__ + +[equipment-name] +portable-gasoline-generator=Generador a gasolina portátil +fission-reactor-equipment=Reactor de fusión portátil + +[equipment-description] +portable-gasoline-generator=Generador compacto que consume cilindros de gas para generar energía. Se recarga automáticamente usando combustible en tu inventario. + +[fuel-category-name] +personal-fusion-cell=Célula de fusión diff --git a/locale/nl/locale.cfg b/locale/nl/locale.cfg new file mode 100644 index 0000000..4923c26 --- /dev/null +++ b/locale/nl/locale.cfg @@ -0,0 +1,232 @@ +[item-group-name] +py-industry=Py Industriën + +[item-name] +py-asphalt=Asfalt +py-iron-oxide=Ijzeroxidetegel +py-limestone=Kalksteentegel +py-coal-tile=Steenkooltegel +py-iron=Ijzertegel +py-steel=Staaltegel +py-aluminium=Aluminiumtegel +py-nexelit=Nexelittegel +py-quartz=Gezuiverd-kwartstegel +personal-fusion-cell=Persoonlijke fusiecel +personal-fusion-cell-used=Persoonlijke fusiecel (Opgebruikt) +fission-reactor-equipment=Draagbare fusiereactor + +[item-description] +py-aluminium=Slechtere versie van de kalksteentegel. +py-asphalt=I heb de benodigdheid voor snelheid. +py-coal-tile=Donker en mysterieus... +py-iron-oxide=Tetanusparadijs. +py-steel=Zeshoeken zijn besthoeken. +py-nexelit=Buig voor mij. +py-limestone=Loop als een Egyptenaar. +py-iron=Voor diegene die van een raster houden. +py-quartz=Flitsknal! +hazard-concrete=Voor die OSHA-conforme uitstraling. Vertraagt mensen en voertuigen. +refined-hazard-concrete=Voor die chique OSHA-conforme uitstraling. Vertraagt mensen en vertraagt voertuigen enorm. +personal-fusion-cell=A technologisch wonder. De kracht van fusie in de palm van je hand. +personal-fusion-cell-used=De deuterium-tritiumfusiecel is opgebruikt. + +[entity-name] +py-tank-1000=PyTank (10 kL) +py-tank-1500=PyTank (15 kL) +py-tank-3000=PyTank (30 kL) +py-tank-4000=PyTank (40 kL) +py-tank-5000=PyTank (50 kL) +py-tank-6500=PyTank (65 kL) +py-tank-7000=PyTank (70 kL) +py-tank-8000=PyTank (80 kL) + +py-tank-3000-adjust=PyTank (10 kL) +py-tank-4000-adjust=PyTank (27.5 kL) +py-tank-5000-adjust=PyTank (65 kL) +py-tank-6500-adjust=PyTank (75 kL) +py-tank-8000-adjust=PyTank (125 kL) + +py-check-valve=Meetventiel +py-overflow-valve=Overloopventiel +py-underflow-valve=Onderloopventiel + +niobium-pipe=Niobiumpijp +niobium-pipe-to-ground=Niobiumkoppeling-ondergrondse-pijplijn + +poorman-wood-fence=Arme mans houten hek +wood-fence=Houten hek +concrete-wall=Betonnen muur + +accumulator-mk01=Nexelit-aangedreven accumulator MK 01 +accumulator-mk02=Nexelit-aangedreven accumulator MK 02 +py-local-radar=Locale radar +megadar=Megadar +py-burner=Verbrander +py-sinkhole=Zinkgat +py-gas-vent=Uitlaatpijp + +py-warehouse-basic=Warenhuis +py-warehouse-passive-provider=Passieve-aanleverwarenhuis +py-warehouse-storage=Opslagwarenhouse +py-warehouse-active-provider=Actieve-aanleverwarenhuis +py-warehouse-requester=Aanvraagwarenhouse +py-warehouse-buffer=Bufferwarenhouse + +py-storehouse-basic=Pakhuis +py-storehouse-passive-provider=Passieve-aanleverpakhuis +py-storehouse-storage=Opslagpakhuis +py-storehouse-active-provider=Actieve-aanleverpakhuis +py-storehouse-requester=Aanvraagpakhuis +py-storehouse-buffer=Bufferpakhuis + +py-shed-basic=Schuur +py-shed-passive-provider=Passieve-aanleverschuur +py-shed-storage=Opslagschuur +py-shed-active-provider=Actieve-aanleverschuur +py-shed-requester=Aanvraagschuur +py-shed-buffer=Bufferschuur + +py-deposit-basic=Depot +py-deposit-passive-provider=Passieve-aanleverdepot +py-deposit-storage=Opslagdepot +py-deposit-active-provider=Actieve-aanleverdepot +py-deposit-requester=Aanvraagdepot +py-deposit-buffer=Bufferdepot + +py-construction-robot-mk01=Constructiepynobot MK 01 +py-logistic-robot-mk01=Logistiekpynobot MK 01 +py-recharge-station-mk01=Droneoplaadstation +py-roboport-mk01=Py robothaven MK 01 +py-roboport-mk02=Py robothaven MK 02 +py-ze=Py Bouwterreinzonevergroter MK01 +py-ze-mk02=Py Bouwterreinzonevergroter MK02 +py-ze-mk03=Py Bouwterreinzonevergroter MK03 +py-ze-mk04=Py Bouwterreinzonevergroter MK04 +barrel-machine-mk01=Vattenmachine + +mk02-locomotive=Geavanceerde locomotief +mk02-wagon=Geavanceerde goederenwagon +mk02-fluid-wagon=Geavanceerde vloeistofwagon + +[entity-description] +py-tank-1000=Soms wil je niet zo veel opslaan. +py-tank-1500=Goedkope, lage-capaciteitstank. +py-tank-3000=Compacte, lage-capaciteitstank. +py-tank-4000=Gemiddelde capaciteitstank. +py-tank-5000=Gemiddelde capaciteitstank. +py-tank-6500=Goede capaciteitstank. +py-tank-7000=Lange tank. +py-tank-8000=Hoge capaciteitstank. +py-tank-9000=Zeer hoge capaciteitstank. +py-tank-10000=Voor diegenen die het probleem liever voor zich uitschuiven dan het oplossen. + +py-check-valve=Staat het schakelnetwerk toe de hoeveelheid vloeistof in de pijplijn te lezen. +py-overflow-valve=Staat stroming toe als de invoer meer dan 80% is. +py-underflow-valve=Staat stroming toe als de uitvoer meer dan 80% is. + +poorman-wood-fence=Ten minste heb je iets. +wood-fence=Gemaakt van puur hout. +concrete-wall=Hard en breekbaar. + +accumulator-mk01=Nexelit-aangedreven accumulator om grote hoeveelheden energie in op te slaan. +accumulator-mk02=De volgende fase voor Nexelit-aangedreven accumulatoren om enorme hoeveelheden energie in op te slaan. +py-local-radar=Heeft geen lange-afstandsscanmogelijkheden. +megadar=Grote radar constructie. +py-burner=De eindbestemming van alles wat je niet langer nodig hebt. Je kan het as verzamelen. +py-sinkhole=Je hebt een enorme ondergrondse grot gevonden. Waarom dump je niet wat van je ongewilde vloeistoffen? +py-gas-vent=Ontdoe jezelf van ongewilde gassen. + +py-warehouse-basic=Slaat vele, vele voorwerpen op. +py-warehouse-passive-provider=Passieve-aanleverwarenhuis +py-warehouse-storage=Opslagwarenhouse +py-warehouse-active-provider=Actieve-aanleverwarenhuis +py-warehouse-requester=Aanvraagwarenhouse +py-warehouse-buffer=Bufferwarenhouse + +py-deposit-basic=Voor diegenen die echt ruimte nodig hebben. +py-deposit-passive-provider=Passieve-aanleverdepot +py-deposit-storage=Opslagdepot +py-deposit-active-provider=Actieve-aanleverdepot +py-deposit-requester=Aanvraagdepot +py-deposit-buffer=Bufferdepot + +py-storehouse-basic=Slaat wat spullen op. +py-storehouse-passive-provider=Passieve-aanleverpakhuis +py-storehouse-storage=Opslagpakhuis +py-storehouse-active-provider=Actieve-aanleverpakhuis +py-storehouse-requester=Aanvraagpakhuis +py-storehouse-buffer=Bufferpakhuis + +py-shed-basic=Slaat wat spullen op. +py-shed-passive-provider=Passieve-aanleverschuur +py-shed-storage=Opslagschuur +py-shed-active-provider=Actieve-aanleverschuur +py-shed-requester=Aanvraagschuur +py-shed-buffer=Bufferschuur + +mk02-locomotive=Gemaakt met sterkere materialen en een strak ontwerp. +mk02-wagon=Compact ontwerp, betere ruimte. +mk02-fluid-wagon=Compact ontwerp, betere ruimte. + +[technology-name] +py-accumulator-mk01=Nexelit-aangedreven accumulatoren +py-accumulator-mk02=Geavanceerde Nexelit-aangedreven accumulatoren +py-accumulator-mk03=Ultime Nexelit-aangedreven accumulatoren +py-asphalt-mk03=Vloertegels - Fase 3 +py-asphalt-mk02=Vloertegels - Fase 2 +py-asphalt=Vloertegels - Fase 1 +py-burner=Verbrander +py-storage-tanks=Opslagtanks +py-warehouse-logistics-research=Logistieke opslag van voorwerpen +py-warehouse-research=Opslag van voorwerpen +railway=Treinen & spoorweg - Fase 1 +railway-mk02=Treinen & spoorweg - Fase 2 +railway-mk03=Treinen & spoorweg - Fase 3 +railway-mk04=Treinen & spoorweg - Fase 4 +fission-reactor-equipment=Draagbare fusiereactor +radars-mk01=Radar - Fase 1 +radars-mk02=Radar - Fase 2 + +[technology-description] +py-storage-tanks=Voegt meer maten aan opslagtanks toe. +py-asphalt=Maak nieuwe tegels. +py-burner=Ontgrendelt structuren om ongewilde vaste stoffen te vernietigen. Voorwerpen verbranden creëert as. +railway=Ontgrendelt treinen en eenvoudige treinlogistieksystemen. +railway-mk02=Ontgrendelt geavanceerde treinen met een hoge remkracht. +railway-mk03=Ontgrendelt hightech nexelit treinen met een enorme versnelling. +railway-mk04=Ontgrendelt kwantumenergiehypersonischeruimtetreinen. + +[tile-name] +py-asphalt=Asfalt +py-coal-tile=Steenkooltegel +lab-white=Gezuiverd-kwartstegel +py-limestone=Kalksteentegel +py-iron-oxide=Ijzeroxidetegel +py-iron=Ijzertegel +py-steel=Staaltegel +py-aluminium=Aluminiumtegel +py-nexelit=Nexelittegel + +[wall-name] +poorman-wood-fence=Arme mans houten hek + +[mod-setting-name] +py-tank-adjust=Verander Pymods' opslagtankcapaciteit +py-braided-pipes=Maakt gevlochte pijpen mogelijk + +[mod-setting-description] +py-tank-adjust=Maakt tankcapaciteit consistent met hun fysieke grootte. +py-braided-pipes=Deze instelling zorgt ervoor basisspelpijpen, niobiumpijpen en multifunctionele pijpen niet met elkaar verbinden. Het zorgt er ook voor dat hun ondergrondse versies niet met elkaar verbinden, wat je toe staat ondergronds pijpen te vlechten. + +[recipe-name] +py-void=Verwijder __1__ + +[equipment-name] +portable-gasoline-generator=Draagbare benzinegenerator +fission-reactor-equipment=Draagbare fusiereactor + +[equipment-description] +portable-gasoline-generator=Een compacte uitrustingsroostergenerator die gastanks consumeert. Vult zichzelf automatisch weer aan vanuit je inventaris. + +[fuel-category-name] +personal-fusion-cell=Fusiecel diff --git a/prototypes/buildings/megadar.lua b/prototypes/buildings/megadar.lua index 26c82cb..65fa00e 100644 --- a/prototypes/buildings/megadar.lua +++ b/prototypes/buildings/megadar.lua @@ -5,7 +5,6 @@ TECHNOLOGY { icon_size = 128, order = "c-a", prerequisites = {"radars-mk01"}, - dependencies = {"radars-mk01"}, effects = {}, unit = { count = 35, diff --git a/prototypes/equipment/portable-gasoline-generator.lua b/prototypes/equipment/portable-gasoline-generator.lua index de0725c..d89ff5c 100644 --- a/prototypes/equipment/portable-gasoline-generator.lua +++ b/prototypes/equipment/portable-gasoline-generator.lua @@ -63,4 +63,4 @@ data.raw.recipe["personal-roboport-equipment"].ingredients = { data.raw.technology["personal-roboport-equipment"].prerequisites = {"construction-robotics"} data.raw.technology["personal-roboport-equipment"].unit.count = 300 ---data.raw.technology['personal-roboport-equipment'].unit.ingredients = {{"automation-science-pack",1}, {"logistic-science-pack",1}} +data.raw.technology["personal-roboport-mk2-equipment"]:remove_prereq("solar-panel-equipment") diff --git a/prototypes/technologies/accumulators.lua b/prototypes/technologies/accumulators.lua index d95a4a3..b85f988 100644 --- a/prototypes/technologies/accumulators.lua +++ b/prototypes/technologies/accumulators.lua @@ -24,8 +24,7 @@ TECHNOLOGY { icon = "__pyindustrygraphics__/graphics/technology/accumulator-mk03.png", icon_size = 128, effects = {}, - prerequisites = {"production-science-pack", "py-accumulator-mk01"}, - dependencies = {"py-accumulator-mk01"}, + prerequisites = {"py-accumulator-mk01"}, unit = { count = 200, ingredients = { @@ -47,8 +46,7 @@ if mods["pyalternativeenergy"] then icon = "__pyindustrygraphics__/graphics/technology/accumulator-mk04.png", icon_size = 128, effects = {}, - prerequisites = {"production-science-pack", "py-accumulator-mk01"}, - dependencies = {"py-accumulator-mk02"}, + prerequisites = {"py-accumulator-mk02"}, unit = { count = 200, ingredients = { diff --git a/prototypes/technologies/asphalt.lua b/prototypes/technologies/asphalt.lua index fdc52d5..6b9b47a 100644 --- a/prototypes/technologies/asphalt.lua +++ b/prototypes/technologies/asphalt.lua @@ -23,8 +23,7 @@ if mods["pyrawores"] then icon = "__pyindustrygraphics__/graphics/technology/tiles-mk02.png", icon_size = 128, order = "c-a", - prerequisites = {"nexelit-mk01"}, - dependencies = {"py-asphalt"}, + prerequisites = {"py-asphalt"}, effects = {}, unit = { count = 10, @@ -45,7 +44,6 @@ if mods.pyalternativeenergy then icon_size = 128, order = "c-a", prerequisites = {"py-asphalt-mk02"}, - dependencies = {"py-asphalt-mk02"}, effects = {}, unit = { count = 10, diff --git a/prototypes/technologies/railway.lua b/prototypes/technologies/railway.lua index 38d1e33..6737eaf 100644 --- a/prototypes/technologies/railway.lua +++ b/prototypes/technologies/railway.lua @@ -25,8 +25,7 @@ if mods["pycoalprocessing"] then icon = "__pyindustrygraphics__/graphics/technology/railway-mk02.png", icon_size = 128, order = "c-a", - prerequisites = {"railway", "niobium", "nexelit"}, - dependencies = {"railway"}, + prerequisites = {"railway"}, effects = {}, unit = { count = 250, @@ -47,7 +46,6 @@ if mods["pyhightech"] then icon_size = 128, order = "c-a", prerequisites = {"railway-mk02"}, - dependencies = {"railway-mk02"}, effects = {}, unit = { count = 250, @@ -68,8 +66,7 @@ if mods["pyalternativeenergy"] then icon = "__pyindustrygraphics__/graphics/technology/railway-mk04.png", icon_size = 128, order = "c-a", - prerequisites = {"railway-mk03", "intermetallics-mk03", "battery-mk04"}, - dependencies = {"railway-mk03"}, + prerequisites = {"railway-mk03"}, effects = {}, unit = { count = 400, diff --git a/prototypes/technologies/warehouses.lua b/prototypes/technologies/warehouses.lua index 9e68be6..c8ba3c8 100644 --- a/prototypes/technologies/warehouses.lua +++ b/prototypes/technologies/warehouses.lua @@ -19,8 +19,7 @@ TECHNOLOGY { icon = "__pyindustrygraphics__/graphics/technology/warehouse-logistics-research.png", icon_size = 128, effects = {}, - prerequisites = {"py-warehouse-research", "logistic-system", "chemical-science-pack"}, - dependencies = {"py-warehouse-research"}, + prerequisites = {"py-warehouse-research"}, unit = { count = 25, ingredients = { diff --git a/prototypes/void-recipes/fluid-void.lua b/prototypes/void-recipes/fluid-void.lua index d0d6111..13f0839 100644 --- a/prototypes/void-recipes/fluid-void.lua +++ b/prototypes/void-recipes/fluid-void.lua @@ -13,7 +13,7 @@ local function make_fluid_recipe(name, locale, icons, category, ing, subgroup) icons = icons, icon_size = 32, subgroup = subgroup or "py-void", - ignore_for_dependencies = true + autotech_ignore = true } end diff --git a/prototypes/void-recipes/item-void.lua b/prototypes/void-recipes/item-void.lua index f9ee9e5..69db90b 100644 --- a/prototypes/void-recipes/item-void.lua +++ b/prototypes/void-recipes/item-void.lua @@ -25,7 +25,7 @@ local function make_void_recipe(name, newicons, ing_name, place_result) ingredients = {{type = "item", name = ing_name, amount = 1}}, results = {void_result}, subgroup = "py-void-items", - ignore_for_dependencies = true + autotech_ignore = true } end From e835c5c8b2566f591332ba0bef2e1f308dc3dfa0 Mon Sep 17 00:00:00 2001 From: Zachary Picco Date: Fri, 3 Oct 2025 09:54:23 -0500 Subject: [PATCH 3/6] Storage tank rewrite (#142) * Storage tank rewrite * Fix icon sizes. * Fixed wrong volume amount on 1k tank. * Correctly ordered all tanks in recipe groups. * Change all the fluid tank recipes. * Decopule py tank internal names from their fluid values. * Implement suggestions from Kino --- changelog.txt | 6 ++ data-updates.lua | 9 -- data.lua | 32 +++---- locale/de/locale.cfg | 46 +++++----- locale/en/locale.cfg | 46 +++++----- locale/es-ES/locale.cfg | 46 +++++----- locale/fr/locale.cfg | 46 +++++----- locale/nl/locale.cfg | 46 +++++----- locale/ru/locale.cfg | 45 +++++----- locale/uk/locale.cfg | 46 +++++----- locale/zh-CN/pyindustry.cfg | 36 ++++---- migrations/fluid-tank-sizes.json | 38 +++++++++ .../{tanks-1000.lua => py-tank-1.lua} | 31 ++++--- .../buildings/fluid-tanks/py-tank-10.lua | 83 ++++++++++++++++++ .../{tanks-3000.lua => py-tank-2.lua} | 31 ++++--- .../{tanks-1500.lua => py-tank-3.lua} | 28 +++---- .../{tanks-4000.lua => py-tank-4.lua} | 30 +++---- .../{tanks-5000.lua => py-tank-5.lua} | 30 +++---- .../{tanks-7000.lua => py-tank-6.lua} | 36 ++++---- .../{tanks-6500.lua => py-tank-7.lua} | 28 +++---- .../{tanks-8000.lua => py-tank-8.lua} | 32 +++---- .../buildings/fluid-tanks/py-tank-9.lua | 84 +++++++++++++++++++ .../updates/pyalternativeenergy-updates.lua | 6 +- prototypes/updates/pyfusionenergy-updates.lua | 4 +- scripts/tank-rotation.lua | 14 ++-- settings.lua | 8 -- 26 files changed, 510 insertions(+), 377 deletions(-) create mode 100644 migrations/fluid-tank-sizes.json rename prototypes/buildings/fluid-tanks/{tanks-1000.lua => py-tank-1.lua} (77%) create mode 100644 prototypes/buildings/fluid-tanks/py-tank-10.lua rename prototypes/buildings/fluid-tanks/{tanks-3000.lua => py-tank-2.lua} (75%) rename prototypes/buildings/fluid-tanks/{tanks-1500.lua => py-tank-3.lua} (77%) rename prototypes/buildings/fluid-tanks/{tanks-4000.lua => py-tank-4.lua} (77%) rename prototypes/buildings/fluid-tanks/{tanks-5000.lua => py-tank-5.lua} (77%) rename prototypes/buildings/fluid-tanks/{tanks-7000.lua => py-tank-6.lua} (77%) rename prototypes/buildings/fluid-tanks/{tanks-6500.lua => py-tank-7.lua} (80%) rename prototypes/buildings/fluid-tanks/{tanks-8000.lua => py-tank-8.lua} (79%) create mode 100644 prototypes/buildings/fluid-tanks/py-tank-9.lua diff --git a/changelog.txt b/changelog.txt index 52f2da8..2420f66 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,12 @@ Version: 4.0.0 Date: ??? Changes: + - Removed startup setting "fluid tank rebalance". + - Rebalanced fluid tank volumes per tier to the following values: 1k, 5k, 15k, 27.5k, 65k, 70k, 75k, 125k, 180k, 250k. + - The 180k and 250k fluid tanks are no longer located within pypetrolemhandling. All tanks are now stored inside pyindustry. + - New entity graphics for all updated fluid tanks. Huge thanks to JigSaW_3 for providing these! + - Rebalanced recipes for all py storage tanks. + - Upscaled all fluid tank item icons from 32p to 64p. - Removed niobium pipes from hydrocyclone recipe. Resolves https://github.com/pyanodon/pybugreports/issues/851 --------------------------------------------------------------------------------------------------- Version: 3.0.19 diff --git a/data-updates.lua b/data-updates.lua index dd5f330..c799c74 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -1,12 +1,3 @@ -if settings.startup["py-tank-adjust"].value then - if mods["pypetroleumhandling"] then - data.raw["storage-tank"]["py-tank-9000"].fluid_box.volume = 180000 - data.raw["storage-tank"]["py-tank-9000"].localised_name = {"entity-name.py-tank-9000-adjust"} - data.raw["storage-tank"]["py-tank-10000"].fluid_box.volume = 250000 - data.raw["storage-tank"]["py-tank-10000"].localised_name = {"entity-name.py-tank-10000-adjust"} - end -end - --Tiles require "prototypes/tiles/py-asphalt" require "prototypes/tiles/py-limestone" diff --git a/data.lua b/data.lua index ba21889..7c6132c 100644 --- a/data.lua +++ b/data.lua @@ -29,33 +29,21 @@ require "prototypes/buildings/containers/warehouse" require "prototypes/buildings/containers/deposit" --Storage Tanks -require "prototypes/buildings/fluid-tanks/tanks-1000" -require "prototypes/buildings/fluid-tanks/tanks-1500" -require "prototypes/buildings/fluid-tanks/tanks-3000" -require "prototypes/buildings/fluid-tanks/tanks-4000" -require "prototypes/buildings/fluid-tanks/tanks-5000" -require "prototypes/buildings/fluid-tanks/tanks-7000" -require "prototypes/buildings/fluid-tanks/tanks-6500" -require "prototypes/buildings/fluid-tanks/tanks-8000" +require "prototypes/buildings/fluid-tanks/py-tank-1" +require "prototypes/buildings/fluid-tanks/py-tank-2" +require "prototypes/buildings/fluid-tanks/py-tank-3" +require "prototypes/buildings/fluid-tanks/py-tank-4" +require "prototypes/buildings/fluid-tanks/py-tank-5" +require "prototypes/buildings/fluid-tanks/py-tank-6" +require "prototypes/buildings/fluid-tanks/py-tank-7" +require "prototypes/buildings/fluid-tanks/py-tank-8" +require "prototypes/buildings/fluid-tanks/py-tank-9" +require "prototypes/buildings/fluid-tanks/py-tank-10" require "prototypes/buildings/valves/check-valve" require "prototypes/buildings/valves/overflow-valve" require "prototypes/buildings/valves/underflow-valve" ---tank size settings check -if settings.startup["py-tank-adjust"].value then - data.raw["storage-tank"]["py-tank-3000"].fluid_box.volume = 10000 - data.raw["storage-tank"]["py-tank-3000"].localised_name = {"entity-name.py-tank-3000-adjust"} - data.raw["storage-tank"]["py-tank-4000"].fluid_box.volume = 27500 - data.raw["storage-tank"]["py-tank-4000"].localised_name = {"entity-name.py-tank-4000-adjust"} - data.raw["storage-tank"]["py-tank-5000"].fluid_box.volume = 65000 - data.raw["storage-tank"]["py-tank-5000"].localised_name = {"entity-name.py-tank-5000-adjust"} - data.raw["storage-tank"]["py-tank-6500"].fluid_box.volume = 75000 - data.raw["storage-tank"]["py-tank-6500"].localised_name = {"entity-name.py-tank-6500-adjust"} - data.raw["storage-tank"]["py-tank-8000"].fluid_box.volume = 125000 - data.raw["storage-tank"]["py-tank-8000"].localised_name = {"entity-name.py-tank-8000-adjust"} -end - -- Armor if mods["pycoalprocessing"] then require "prototypes/equipment/armor-updates" diff --git a/locale/de/locale.cfg b/locale/de/locale.cfg index ba63b40..2275b57 100644 --- a/locale/de/locale.cfg +++ b/locale/de/locale.cfg @@ -31,20 +31,16 @@ personal-fusion-cell=Ein Wunder der Technik. Die Kraft der Fusion in Ihrer Hand. personal-fusion-cell-used=Die Deuterium-Tritium-Fusionszelle ist erschöpft. [entity-name] -py-tank-1000=PyTank 10.000L -py-tank-1500=PyTank 15.000L -py-tank-3000=PyTank 30.000L -py-tank-4000=PyTank 40.000L -py-tank-5000=PyTank 50.000L -py-tank-6500=PyTank 65.000L -py-tank-7000=PyTank 70.000L -py-tank-8000=PyTank 80.000L - -py-tank-3000-adjust=PyTank 10.000L -py-tank-4000-adjust=PyTank 27.500L -py-tank-5000-adjust=PyTank 65.000L -py-tank-6500-adjust=PyTank 75.000L -py-tank-8000-adjust=PyTank 125.000L +py-tank-1=PyTank 5.000L +py-tank-2=PyTank 10.000L +py-tank-3=PyTank 15.000L +py-tank-4=PyTank 27.500L +py-tank-5=PyTank 65.000L +py-tank-6=PyTank 70.000L +py-tank-7=PyTank 75.000L +py-tank-8=PyTank 125.000L +py-tank-9=PyTank 180.000L +py-tank-10=PyTank 250.000L py-check-valve=Prüf-Ventil py-overflow-valve=Überfluss-Ventil @@ -109,16 +105,16 @@ mk02-wagon=Fortschrittliche Güterwaggon mk02-fluid-wagon=Fortschrittliche Tankwaggon [entity-description] -py-tank-1000=Manchmal muss man nicht so viel lagern. -py-tank-1500=Günstiger Tank mit niedriegem Fassungsvermögen. -py-tank-3000=Compact, low-capacity tank. -py-tank-4000=Normales Fassungsvermögen. -py-tank-5000=Etwas höheres Fassungsvermögen. -py-tank-6500=Gutes Fassungsvermögen. -py-tank-7000=Langer Tank. -py-tank-8000=Tank mit großem Fassungsvermögen. -py-tank-9000=Tank mit sehr großem Fassungsvermögen. -py-tank-10000=Für diejenigen, die das Problem lieber auf die lange Bank schieben, anstatt es zu lösen. +py-tank-1=Manchmal muss man nicht so viel lagern. +py-tank-2=Günstiger Tank mit niedriegem Fassungsvermögen. +py-tank-3=Compact, low-capacity tank. +py-tank-4=Normales Fassungsvermögen. +py-tank-5=Etwas höheres Fassungsvermögen. +py-tank-6=Langer Tank. +py-tank-7=Gutes Fassungsvermögen. +py-tank-8=Tank mit großem Fassungsvermögen. +py-tank-9=Tank mit sehr großem Fassungsvermögen. +py-tank-10=Für diejenigen, die das Problem lieber auf die lange Bank schieben, anstatt es zu lösen. py-check-valve=Ermöglicht das Ablesen des Flüssigkeitsstands in einer Rohrleitung durch das Schaltungssnetz. py-overflow-valve=Erlaubt Durchfluss bei einem Füllstand des Eingangsrohrs über 80%. @@ -212,11 +208,9 @@ py-nexelit=Nexelit Kachel poorman-wood-fence=Billiger Holzzaun [mod-setting-name] -py-tank-adjust=Passt das Fassungsvermögen der PyTanks an. py-braided-pipes=Ermöglicht verschachtelte Rohre [mod-setting-description] -py-tank-adjust=Macht das Fassungsvermögen der Tanks mit ihrer physischen Größe konsistent py-braided-pipes=Diese Einstellung bewirkt, dass Vanille-Rohre, Niob-Rohre und Mehrzweck-Rohre sich nicht miteinander verbinden. Gleiches gilt für ihre unterirdischen Varianten, so dass unterirdische Rohre verschachtelt werden können. [recipe-name] diff --git a/locale/en/locale.cfg b/locale/en/locale.cfg index c628dbb..1016823 100644 --- a/locale/en/locale.cfg +++ b/locale/en/locale.cfg @@ -31,20 +31,16 @@ personal-fusion-cell=A miracle of technology. The power of fusion in the palm of personal-fusion-cell-used=The deuterium tritium fusion fuel has been exhausted. [entity-name] -py-tank-1000=PyTank (10 kL) -py-tank-1500=PyTank (15 kL) -py-tank-3000=PyTank (30 kL) -py-tank-4000=PyTank (40 kL) -py-tank-5000=PyTank (50 kL) -py-tank-6500=PyTank (65 kL) -py-tank-7000=PyTank (70 kL) -py-tank-8000=PyTank (80 kL) - -py-tank-3000-adjust=PyTank (10 kL) -py-tank-4000-adjust=PyTank (27.5 kL) -py-tank-5000-adjust=PyTank (65 kL) -py-tank-6500-adjust=PyTank (75 kL) -py-tank-8000-adjust=PyTank (125 kL) +py-tank-1=PyTank (5 kL) +py-tank-2=PyTank (10 kL) +py-tank-3=PyTank (15 kL) +py-tank-4=PyTank (27.5 kL) +py-tank-5=PyTank (65 kL) +py-tank-6=PyTank (70 kL) +py-tank-7=PyTank (75 kL) +py-tank-8=PyTank (125 kL) +py-tank-9=PyTank (180 kL) +py-tank-10=PyTank (250 kL) py-check-valve=Check valve py-overflow-valve=Overflow valve @@ -109,16 +105,16 @@ mk02-wagon=Advanced cargo wagon mk02-fluid-wagon=Advanced fluid wagon [entity-description] -py-tank-1000=Sometimes you don't want to store that much. -py-tank-1500=Cheap, low-capacity tank. -py-tank-3000=Compact, low-capacity tank. -py-tank-4000=Medium capacity tank. -py-tank-5000=Medium capacity tank. -py-tank-6500=Good capacity tank. -py-tank-7000=Long tank. -py-tank-8000=High capacity tank. -py-tank-9000=Very high capacity tank. -py-tank-10000=For those who would rather kick the problem down the road instead of solving it. +py-tank-1=Sometimes you don't want to store that much. +py-tank-2=Cheap, low-capacity tank. +py-tank-3=Compact, low-capacity tank. +py-tank-4=Medium capacity tank. +py-tank-5=Medium capacity tank. +py-tank-6=Long tank. +py-tank-7=Good capacity tank. +py-tank-8=High capacity tank. +py-tank-9=Very high capacity tank. +py-tank-10=For those who would rather kick the problem down the road instead of solving it. py-check-valve=Allows the circuit network to read the level of fluid in a pipeline. py-overflow-valve=Allows flow when input is over 80%. @@ -212,11 +208,9 @@ py-nexelit=Nexelit tile poorman-wood-fence=Poor man's wooden fence [mod-setting-name] -py-tank-adjust=Adjust Pymods' storage tanks capacity py-braided-pipes=Enable braided pipes [mod-setting-description] -py-tank-adjust=Makes tank capacity consistent with their physical size py-braided-pipes=This setting makes vanilla pipes, niobium pipes, and multipurpose pipes not connect with each other. It also makes their underground versions not connect with each other, allowing for underground pipe braiding. [recipe-name] diff --git a/locale/es-ES/locale.cfg b/locale/es-ES/locale.cfg index 8e19720..f96d050 100644 --- a/locale/es-ES/locale.cfg +++ b/locale/es-ES/locale.cfg @@ -31,20 +31,16 @@ personal-fusion-cell=Un milagro tecnológico. El poder de un sol en la palma de personal-fusion-cell-used=La célula de fusión de deuterio y tritio se ha gastado. [entity-name] -py-tank-1000=Cisterna Py (10 kL) -py-tank-1500=Cisterna Py (15 kL) -py-tank-3000=Cisterna Py (30 kL) -py-tank-4000=Cisterna Py (40 kL) -py-tank-5000=Cisterna Py (50 kL) -py-tank-6500=Cisterna Py (65 kL) -py-tank-7000=Cisterna Py (70 kL) -py-tank-8000=Cisterna Py (80 kL) - -py-tank-3000-adjust=Cisterna Py (10 kL) -py-tank-4000-adjust=Cisterna Py (27.5 kL) -py-tank-5000-adjust=Cisterna Py (65 kL) -py-tank-6500-adjust=Cisterna Py (75 kL) -py-tank-8000-adjust=Cisterna Py (125 kL) +py-tank-1=Cisterna Py (5 kL) +py-tank-2=Cisterna Py (10 kL) +py-tank-3=Cisterna Py (15 kL) +py-tank-4=Cisterna Py (27.5 kL) +py-tank-5=Cisterna Py (65 kL) +py-tank-6=Cisterna Py (70 kL) +py-tank-7=Cisterna Py (75 kL) +py-tank-8=Cisterna Py (125 kL) +py-tank-9=Cisterna Py (180 kL) +py-tank-10=Cisterna Py (250 kL) py-check-valve=Válvula de control py-overflow-valve=Válvula de desbordamiento @@ -109,16 +105,16 @@ mk02-wagon=Vagón de carga avanzado mk02-fluid-wagon=Vagón cisterna avanzado [entity-description] -py-tank-1000=A veces no quieres almacenar mucho. -py-tank-1500=Barato y de baja capacidad. -py-tank-3000=Compacto y de baja capacidad. -py-tank-4000=Cisterna de capacidad mediana. -py-tank-5000=Cisterna de capacidad mediana. -py-tank-6500=Cisterna de buena capacidad. -py-tank-7000=Cisterna larga. -py-tank-8000=Cisterna de alta capacidad. -py-tank-9000=Cisterna de muy alta capacidad. -py-tank-10000=Para los que prefieren patear el problema en vez de solucionarlo. +py-tank-1=A veces no quieres almacenar mucho. +py-tank-2=Barato y de baja capacidad. +py-tank-3=Compacto y de baja capacidad. +py-tank-4=Cisterna de capacidad mediana. +py-tank-5=Cisterna de capacidad mediana. +py-tank-6=Cisterna larga. +py-tank-7=Cisterna de buena capacidad. +py-tank-8=Cisterna de alta capacidad. +py-tank-9=Cisterna de muy alta capacidad. +py-tank-10=Para los que prefieren patear el problema en vez de solucionarlo. py-check-valve=Permite a la red de circuitos leer el nivel de fluido en una tubería. py-overflow-valve=Permite el flujo cuando la entrada supera el 80%. @@ -212,11 +208,9 @@ py-nexelit=Baldosa de nexelit poorman-wood-fence=Cerca de madera básica [mod-setting-name] -py-tank-adjust=Ajustar la capacidad de las cisternas de los Pymods py-braided-pipes=Activar tuberías trenzadas [mod-setting-description] -py-tank-adjust=Hace que la capacidad de las cisternas sea consistente con su tamaño real py-braided-pipes=Esta opción hace que las tuberías normales, las tuberías de niobio, y las tuberías multipropósito no se conecten entre si. Esto también hace que sus versiones subterráneas tampoco se conecten entre si, lo que permite trenzarlas. [recipe-name] diff --git a/locale/fr/locale.cfg b/locale/fr/locale.cfg index 9081e6c..99c020a 100644 --- a/locale/fr/locale.cfg +++ b/locale/fr/locale.cfg @@ -31,20 +31,16 @@ personal-fusion-cell=Un miracle de la technologie. Le pouvoir de la fusion dans personal-fusion-cell-used=Le combustible de fusion au tritium et au deutérium est épuisé. [entity-name] -py-tank-1000=Réservoir (10 kL) -py-tank-1500=Réservoir (15 kL) -py-tank-3000=Réservoir (30 kL) -py-tank-4000=Réservoir (40 kL) -py-tank-5000=Réservoir (50 kL) -py-tank-6500=Réservoir (65 kL) -py-tank-7000=Réservoir (70 kL) -py-tank-8000=Réservoir (80 kL) - -py-tank-3000-adjust=Réservoir (10 kL) -py-tank-4000-adjust=Réservoir (27.5 kL) -py-tank-5000-adjust=Réservoir (65 kL) -py-tank-6500-adjust=Réservoir (75 kL) -py-tank-8000-adjust=Réservoir (125 kL) +py-tank-1=Réservoir (5 kL) +py-tank-2=Réservoir (10 kL) +py-tank-3=Réservoir (15 kL) +py-tank-4=Réservoir (27.5 kL) +py-tank-5=Réservoir (65 kL) +py-tank-6=Réservoir (70 kL) +py-tank-7=Réservoir (75 kL) +py-tank-8=Réservoir (125 kL) +py-tank-9=Réservoir (180 kL) +py-tank-10=Réservoir (250 kL) py-check-valve=Clapet anti-retour py-overflow-valve=Vanne de trop-plein @@ -109,16 +105,16 @@ mk02-wagon=Wagon de marchandises avancé mk02-fluid-wagon=Wagon citerne avancé [entity-description] -py-tank-1000=Parfois, vous ne voulez pas stocker autant. -py-tank-1500=Bon marché, réservoir de faible capacité. -py-tank-3000=Réservoir compact de faible capacité. -py-tank-4000=Réservoir de capacité moyenne. -py-tank-5000=Réservoir de capacité moyenne. -py-tank-6500=Réservoir de bonne capacité. -py-tank-7000=Réservoir long. -py-tank-8000=Réservoir de grande capacité. -py-tank-9000=Réservoir de très grande capacité. -py-tank-10000=Pour ceux qui préfèrent jeter le problème par la fenêtre au lieu de le résoudre. +py-tank-1=Parfois, vous ne voulez pas stocker autant. +py-tank-2=Bon marché, réservoir de faible capacité. +py-tank-3=Réservoir compact de faible capacité. +py-tank-4=Réservoir de capacité moyenne. +py-tank-5=Réservoir de capacité moyenne. +py-tank-6=Réservoir long. +py-tank-7=Réservoir de bonne capacité. +py-tank-8=Réservoir de grande capacité. +py-tank-9=Réservoir de très grande capacité. +py-tank-10=Pour ceux qui préfèrent jeter le problème par la fenêtre au lieu de le résoudre. py-check-valve=Permet l’écoulement uniquement dans la direction de la flèche. py-overflow-valve=Permet le flux lorsque l’entrée est supérieure à 80%. @@ -212,11 +208,9 @@ py-nexelit=Tuile de nexelit poorman-wood-fence=Clôture en bois du pauvre [mod-setting-name] -py-tank-adjust=Ajuster la capacité des réservoirs de stockage des mods Py py-braided-pipes=Activer les tuyaux tressés [mod-setting-description] -py-tank-adjust=Rend la capacité du réservoir compatible avec leur taille physique py-braided-pipes=Ce paramètre empêche les tuyaux de la version de base du jeux, les tuyaux de niobium et les tuyaux polyvalents de se connecter entre eux. Cela rend également leurs versions souterraines non connectées les unes aux autres, permettant le tressage de tuyaux souterrains. [recipe-name] diff --git a/locale/nl/locale.cfg b/locale/nl/locale.cfg index 4923c26..fb9d0f9 100644 --- a/locale/nl/locale.cfg +++ b/locale/nl/locale.cfg @@ -31,20 +31,16 @@ personal-fusion-cell=A technologisch wonder. De kracht van fusie in de palm van personal-fusion-cell-used=De deuterium-tritiumfusiecel is opgebruikt. [entity-name] -py-tank-1000=PyTank (10 kL) -py-tank-1500=PyTank (15 kL) -py-tank-3000=PyTank (30 kL) -py-tank-4000=PyTank (40 kL) -py-tank-5000=PyTank (50 kL) -py-tank-6500=PyTank (65 kL) -py-tank-7000=PyTank (70 kL) -py-tank-8000=PyTank (80 kL) - -py-tank-3000-adjust=PyTank (10 kL) -py-tank-4000-adjust=PyTank (27.5 kL) -py-tank-5000-adjust=PyTank (65 kL) -py-tank-6500-adjust=PyTank (75 kL) -py-tank-8000-adjust=PyTank (125 kL) +py-tank-1=PyTank (5 kL) +py-tank-2=PyTank (10 kL) +py-tank-3=PyTank (15 kL) +py-tank-4=PyTank (27.5 kL) +py-tank-5=PyTank (65 kL) +py-tank-6=PyTank (70 kL) +py-tank-7=PyTank (75 kL) +py-tank-8=PyTank (125 kL) +py-tank-9=PyTank (180 kL) +py-tank-10=PyTank (250 kL) py-check-valve=Meetventiel py-overflow-valve=Overloopventiel @@ -109,16 +105,16 @@ mk02-wagon=Geavanceerde goederenwagon mk02-fluid-wagon=Geavanceerde vloeistofwagon [entity-description] -py-tank-1000=Soms wil je niet zo veel opslaan. -py-tank-1500=Goedkope, lage-capaciteitstank. -py-tank-3000=Compacte, lage-capaciteitstank. -py-tank-4000=Gemiddelde capaciteitstank. -py-tank-5000=Gemiddelde capaciteitstank. -py-tank-6500=Goede capaciteitstank. -py-tank-7000=Lange tank. -py-tank-8000=Hoge capaciteitstank. -py-tank-9000=Zeer hoge capaciteitstank. -py-tank-10000=Voor diegenen die het probleem liever voor zich uitschuiven dan het oplossen. +py-tank-1=Soms wil je niet zo veel opslaan. +py-tank-2=Goedkope, lage-capaciteitstank. +py-tank-3=Compacte, lage-capaciteitstank. +py-tank-4=Gemiddelde capaciteitstank. +py-tank-5=Gemiddelde capaciteitstank. +py-tank-6=Lange tank. +py-tank-7=Goede capaciteitstank. +py-tank-8=Hoge capaciteitstank. +py-tank-9=Zeer hoge capaciteitstank. +py-tank-10=Voor diegenen die het probleem liever voor zich uitschuiven dan het oplossen. py-check-valve=Staat het schakelnetwerk toe de hoeveelheid vloeistof in de pijplijn te lezen. py-overflow-valve=Staat stroming toe als de invoer meer dan 80% is. @@ -211,11 +207,9 @@ py-nexelit=Nexelittegel poorman-wood-fence=Arme mans houten hek [mod-setting-name] -py-tank-adjust=Verander Pymods' opslagtankcapaciteit py-braided-pipes=Maakt gevlochte pijpen mogelijk [mod-setting-description] -py-tank-adjust=Maakt tankcapaciteit consistent met hun fysieke grootte. py-braided-pipes=Deze instelling zorgt ervoor basisspelpijpen, niobiumpijpen en multifunctionele pijpen niet met elkaar verbinden. Het zorgt er ook voor dat hun ondergrondse versies niet met elkaar verbinden, wat je toe staat ondergronds pijpen te vlechten. [recipe-name] diff --git a/locale/ru/locale.cfg b/locale/ru/locale.cfg index 877bc21..2400341 100644 --- a/locale/ru/locale.cfg +++ b/locale/ru/locale.cfg @@ -31,19 +31,16 @@ hazard-concrete=По требованиям службы охраны труда refined-hazard-concrete=По требованиям службы охраны труда. Замедляет людей и сильно замедляет транспорт. [entity-name] -py-tank-1000=Цистерна (10 м³) -py-tank-1500=Цистерна (15 м³) -py-tank-3000=Цистерна (30 м³) -py-tank-4000=Цистерна (40 м³) -py-tank-5000=Цистерна (50 м³) -py-tank-6500=Цистерна (65 м³) -py-tank-7000=Цистерна (70 м³) -py-tank-8000=Цистерна (80 м³) -py-tank-3000-adjust=Цистерна (10 м³) -py-tank-4000-adjust=Цистерна (27,5 м³) -py-tank-5000-adjust=Цистерна (65 м³) -py-tank-6500-adjust=Цистерна (75 м³) -py-tank-8000-adjust=Цистерна (125 м³) +py-tank-1=Цистерна (5 м³) +py-tank-2=Цистерна (10 м³) +py-tank-3=Цистерна (15 м³) +py-tank-4=Цистерна (27,5 м³) +py-tank-5=Цистерна (65 м³) +py-tank-6=Цистерна (70 м³) +py-tank-7=Цистерна (75 м³) +py-tank-8=Цистерна (125 м³) +py-tank-9=Цистерна (180 м³) +py-tank-10=Цистерна (250 м³) py-check-valve=Проверочный клапан py-overflow-valve=Перепускной клапан py-underflow-valve=Подводной клапан @@ -98,14 +95,16 @@ mk02-wagon=Продвинутый грузовой вагон mk02-fluid-wagon=Продвинутый вагон-цистерна [entity-description] -py-tank-1000=Иногда не хочется хранить настолько много. -py-tank-1500=Дешёвая ёмкость с низкой вместительностью. -py-tank-3000=Компактный резервуар малой ёмкости. -py-tank-4000=Ёмкость средней вместительности. -py-tank-5000=Ёмкость средней вместительности. -py-tank-6500=Ёмкость повышенной вместительности. -py-tank-7000=Длинный резервуар. -py-tank-8000=Резервуар высокой ёмкости. +py-tank-1=Иногда не хочется хранить настолько много. +py-tank-2=Дешёвая ёмкость с низкой вместительностью. +py-tank-3=Компактный резервуар малой ёмкости. +py-tank-4=Ёмкость средней вместительности. +py-tank-5=Ёмкость средней вместительности. +py-tank-6=Длинный резервуар. +py-tank-7=Ёмкость повышенной вместительности. +py-tank-8=Резервуар высокой ёмкости. +py-tank-9=Резервуар очень высокой ёмкости. +py-tank-10=Для тех, кто предпочитает отложить проблему в сторону, а не решать её. py-check-valve=Позволяет считывать уровень жидкости в трубопроводе. py-overflow-valve=Обеспечивает движение жидкости только когда вход заполнен на 80% и более. py-underflow-valve=Обеспечивает движение жидкости только когда выход заполнен менее чем на 80%. @@ -147,8 +146,6 @@ barrel-machine-mk01=Наполняет и опустошает бочки. mk02-locomotive=Изготовлен из прочных материалов и имеет стильный дизайн. mk02-wagon=Компактный дизайн, больше вместимость. mk02-fluid-wagon=Компактный дизайн, больше вместимость. -py-tank-9000=Резервуар очень высокой ёмкости. -py-tank-10000=Для тех, кто предпочитает отложить проблему в сторону, а не решать её. [technology-name] py-accumulator-mk01=Некселитовые аккумуляторы @@ -193,11 +190,9 @@ py-nexelit=Отсыпка некселитом poorman-wood-fence=Деревянный забор бедняка [mod-setting-name] -py-tank-adjust=Настроить вместимость резервуаров PY модов py-braided-pipes=Включить переплетение труб [mod-setting-description] -py-tank-adjust=Делает ёмкость резервуара соответствующей их физическому размеру py-braided-pipes=Благодаря этой настройке ванильные трубы, ниобиевые трубы и многоцелевые трубы не соединяются друг с другом. Их подземные версии также не соединяются друг с другом, что позволяет использовать чередование подземных труб. [recipe-name] diff --git a/locale/uk/locale.cfg b/locale/uk/locale.cfg index 5a5d565..dcd4a18 100644 --- a/locale/uk/locale.cfg +++ b/locale/uk/locale.cfg @@ -31,20 +31,16 @@ personal-fusion-cell=Чудо техніки. Сила синтезу у ваш personal-fusion-cell-used=Дейтерій-тритієве термоядерне паливо вичерпано. [entity-name] -py-tank-1000=Резервуар (10 м³) -py-tank-1500=Резервуар (15 м³) -py-tank-3000=Резервуар (30 м³) -py-tank-4000=Резервуар (40 м³) -py-tank-5000=Резервуар (50 м³) -py-tank-6500=Резервуар (65 м³) -py-tank-7000=Резервуар (70 м³) -py-tank-8000=Резервуар (80 м³) - -py-tank-3000-adjust=Резервуар (10 м³) -py-tank-4000-adjust=Резервуар (27.5 м³) -py-tank-5000-adjust=Резервуар (65 м³) -py-tank-6500-adjust=Резервуар (75 м³) -py-tank-8000-adjust=Резервуар (125 м³) +py-tank-1=Резервуар (5 м³) +py-tank-2=Резервуар (10 м³) +py-tank-3=Резервуар (15 м³) +py-tank-4=Резервуар (27.5 м³) +py-tank-5=Резервуар (65 м³) +py-tank-6=Резервуар (70 м³) +py-tank-7=Резервуар (75 м³) +py-tank-8=Резервуар (125 м³) +py-tank-9=Резервуар (180 м³) +py-tank-10=Резервуар (250 м³) py-check-valve=Зворотний клапан py-overflow-valve=Переливний клапан @@ -109,16 +105,16 @@ mk02-wagon=Вдосконалений вантажний вагон mk02-fluid-wagon=Вдосконалений вагон-цистерна [entity-description] -py-tank-1000=Іноді не хочеться зберігати так багато. -py-tank-1500=Дешевий резервувар малої ємності. -py-tank-3000=Компактний резервуар малої ємності. -py-tank-4000=Резервуар середньої ємності. -py-tank-5000=Резервуар середньої ємності. -py-tank-6500=Резервуар хорошої ємності. -py-tank-7000=Довгий резервувар. -py-tank-8000=Резервуар великої ємності. -py-tank-9000=Резервуар дуже великої ємності. -py-tank-10000=Для тих, хто радше забуде про проблему, а не вирішить її. +py-tank-1=Іноді не хочеться зберігати так багато. +py-tank-2=Дешевий резервувар малої ємності. +py-tank-3=Компактний резервуар малої ємності. +py-tank-4=Резервуар середньої ємності. +py-tank-5=Резервуар середньої ємності. +py-tank-6=Довгий резервувар. +py-tank-7=Резервуар хорошої ємності. +py-tank-8=Резервуар великої ємності. +py-tank-9=Резервуар дуже великої ємності. +py-tank-10=Для тих, хто радше забуде про проблему, а не вирішить її. py-check-valve=Пропускає рідину лише в напрямку стрілки. py-overflow-valve=Відкриває потік, коли вхід перевищує 80%. @@ -212,11 +208,9 @@ py-nexelit=Некселітова плитка poorman-wood-fence=Дерев'яний паркан бідняка [mod-setting-name] -py-tank-adjust=Налаштуйте ємність резервуарів Pymods py-braided-pipes=Увімкнути плетені труби [mod-setting-description] -py-tank-adjust=Робить ємність резервуару відповідною до фізичного розміру py-braided-pipes=Завдяки цьому параметру труби з ванільної версії гри, ніобієві труби та багатоцільові труби не з’єднуються одна з одною. Це також робить їх підземні версії несумісними між собою, дозволяючи підземне переплетення труб. [recipe-name] diff --git a/locale/zh-CN/pyindustry.cfg b/locale/zh-CN/pyindustry.cfg index b591096..668b04e 100644 --- a/locale/zh-CN/pyindustry.cfg +++ b/locale/zh-CN/pyindustry.cfg @@ -30,20 +30,16 @@ personal-fusion-cell=技术奇迹。核聚变的力量在您的掌心。 personal-fusion-cell-used=氘氚聚变电池已经耗尽。 [entity-name] -py-tank-1000=储液罐 10k -py-tank-1500=储液罐 15k -py-tank-3000=储液罐 30k -py-tank-4000=储液罐 40k -py-tank-5000=储液罐 50k -py-tank-6500=储液罐 65k -py-tank-7000=储液罐 70k -py-tank-8000=储液罐 80k - -py-tank-3000-adjust=储液罐 10k -py-tank-4000-adjust=储液罐 27.5k -py-tank-5000-adjust=储液罐 65k -py-tank-6500-adjust=储液罐 75k -py-tank-8000-adjust=储液罐 125k +py-tank-1=储液罐 5k +py-tank-2=储液罐 10k +py-tank-3=储液罐 15k +py-tank-4=储液罐 27.5k +py-tank-5=储液罐 65k +py-tank-6=储液罐 70k +py-tank-7=储液罐 75k +py-tank-8=储液罐 125k +py-tank-9=储液罐 180k +py-tank-10=储液罐 250k py-check-valve=止回阀 py-overflow-valve=溢流阀 @@ -111,11 +107,11 @@ mk02-wagon=高级货运车厢 mk02-fluid-wagon=高级流体车厢 [entity-description] -py-tank-1000=有时您不想储存那么多。 -py-tank-1500=小型储液罐 -py-tank-4000=中型储液罐 -py-tank-5000=大型储液罐 -py-tank-6500=超大型储液罐 +py-tank-1=有时您不想储存那么多。 +py-tank-2=小型储液罐 +py-tank-4=中型储液罐 +py-tank-5=大型储液罐 +py-tank-7=超大型储液罐 py-check-valve=仅允许液体朝箭头方向流动。 py-overflow-valve=当流入端大于80%时允许流动。 @@ -205,10 +201,8 @@ py-nexelit=蓝坷垃地砖 poorman-wood-fence=穷汉的木栅栏 [mod-setting-name] -py-tank-adjust=针对Py系列调整储液罐容量 [mod-setting-description] -py-tank-adjust=使储液罐容量与其物理尺寸一致 [recipe-name] py-void=清空__1__ diff --git a/migrations/fluid-tank-sizes.json b/migrations/fluid-tank-sizes.json new file mode 100644 index 0000000..40c1957 --- /dev/null +++ b/migrations/fluid-tank-sizes.json @@ -0,0 +1,38 @@ +{ + "entity": [ + ["py-tank-1000", "py-tank-1"], + ["py-tank-1500", "py-tank-2"], + ["py-tank-3000", "py-tank-3"], + ["py-tank-4000", "py-tank-4"], + ["py-tank-5000", "py-tank-5"], + ["py-tank-6500", "py-tank-6"], + ["py-tank-7000", "py-tank-7"], + ["py-tank-8000", "py-tank-8"], + ["py-tank-9000", "py-tank-9"], + ["py-tank-10000", "py-tank-10"] + ], + "item": [ + ["py-tank-1000", "py-tank-1"], + ["py-tank-1500", "py-tank-2"], + ["py-tank-3000", "py-tank-3"], + ["py-tank-4000", "py-tank-4"], + ["py-tank-5000", "py-tank-5"], + ["py-tank-6500", "py-tank-6"], + ["py-tank-7000", "py-tank-7"], + ["py-tank-8000", "py-tank-8"], + ["py-tank-9000", "py-tank-9"], + ["py-tank-10000", "py-tank-10"] + ], + "recipe": [ + ["py-tank-1000", "py-tank-1"], + ["py-tank-1500", "py-tank-2"], + ["py-tank-3000", "py-tank-3"], + ["py-tank-4000", "py-tank-4"], + ["py-tank-5000", "py-tank-5"], + ["py-tank-6500", "py-tank-6"], + ["py-tank-7000", "py-tank-7"], + ["py-tank-8000", "py-tank-8"], + ["py-tank-9000", "py-tank-9"], + ["py-tank-10000", "py-tank-10"] + ] +} \ No newline at end of file diff --git a/prototypes/buildings/fluid-tanks/tanks-1000.lua b/prototypes/buildings/fluid-tanks/py-tank-1.lua similarity index 77% rename from prototypes/buildings/fluid-tanks/tanks-1000.lua rename to prototypes/buildings/fluid-tanks/py-tank-1.lua index e27d94a..9debb94 100644 --- a/prototypes/buildings/fluid-tanks/tanks-1000.lua +++ b/prototypes/buildings/fluid-tanks/py-tank-1.lua @@ -1,44 +1,43 @@ RECIPE { type = "recipe", - name = "py-tank-1000", + name = "py-tank-1", energy_required = 5, enabled = false, ingredients = { - {type = "item", name = "iron-plate", amount = 5}, - {type = "item", name = "pipe", amount = 10}, + {type = "item", name = "pipe", amount = 15}, {type = "item", name = "steel-plate", amount = 10} }, results = { - {type = "item", name = "py-tank-1000", amount = 1} + {type = "item", name = "py-tank-1", amount = 1} } }:add_unlock("py-storage-tanks") ITEM { type = "item", - name = "py-tank-1000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-1000.png", - icon_size = 32, + name = "py-tank-1", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-1.png", + icon_size = 64, flags = {}, subgroup = "py-storage-tanks", - order = "a-c[py-items]", - place_result = "py-tank-1000", + order = "a-a[py-items]", + place_result = "py-tank-1", stack_size = 10 } ENTITY { type = "storage-tank", - name = "py-tank-1000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-1000.png", - icon_size = 32, + name = "py-tank-1", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-1.png", + icon_size = 64, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 3, result = "py-tank-1000"}, + minable = {mining_time = 3, result = "py-tank-1"}, max_health = 500, corpse = "medium-remnants", collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, two_direction_only = true, fluid_box = { - volume = 10000, + volume = 5000, pipe_covers = _G.pipecoverspictures(), pipe_connections = { { @@ -56,7 +55,7 @@ ENTITY { picture = { sheets = { { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-1000/py-tank-1000.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-1/py-tank-1.png", priority = "extra-high", frames = 2, width = 96, @@ -64,7 +63,7 @@ ENTITY { shift = util.by_pixel(0, -128), }, { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-1000/py-tank-1000-sh.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-1/py-tank-1-sh.png", priority = "extra-high", frames = 2, width = 160, diff --git a/prototypes/buildings/fluid-tanks/py-tank-10.lua b/prototypes/buildings/fluid-tanks/py-tank-10.lua new file mode 100644 index 0000000..48f0373 --- /dev/null +++ b/prototypes/buildings/fluid-tanks/py-tank-10.lua @@ -0,0 +1,83 @@ +RECIPE { + type = "recipe", + name = "py-tank-10", + energy_required = 5, + enabled = false, + ingredients = { + {type = "item", name = "py-tank-4", amount = 2}, + {type = "item", name = "iron-plate", amount = 45}, + {type = "item", name = "steel-plate", amount = 55}, + }, + results = { + {type = "item", name = "py-tank-10", amount = 1} + } +}:add_unlock("py-storage-tanks") + +ITEM { + type = "item", + name = "py-tank-10", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-10.png", + icon_size = 64, + flags = {}, + subgroup = "py-storage-tanks", + order = "a-j[py-items]", + place_result = "py-tank-10", + stack_size = 10 +} + +ENTITY { + type = "storage-tank", + name = "py-tank-10", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-10.png", + icon_size = 64, + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 3, result = "py-tank-10"}, + max_health = 500, + corpse = "medium-remnants", + collision_box = {{-3.9, -3.9}, {3.9, 3.9}}, + selection_box = {{-4.0, -4.0}, {4.0, 4.0}}, + two_direction_only = true, + fluid_box = { + volume = 250000, + pipe_covers = _G.pipecoverspictures(), + pipe_connections = { + {position = {1.5, -3.5}, direction = defines.direction.north}, + {position = {-1.5, -3.5}, direction = defines.direction.north}, + {position = {3.5, 1.5}, direction = defines.direction.east}, + {position = {3.5, -1.5}, direction = defines.direction.east}, + {position = {1.5, 3.5}, direction = defines.direction.south}, + {position = {-1.5, 3.5}, direction = defines.direction.south}, + {position = {-3.5, 1.5}, direction = defines.direction.west}, + {position = {-3.5, -1.5}, direction = defines.direction.west} + } + }, + window_bounding_box = {{-0.0, 0.0}, {0.0, 0.0}}, + pictures = { + picture = { + sheet = { + filename = "__pyindustrygraphics__/graphics/entity/py-tank-10/py-tank-10.png", + priority = "extra-high", + frames = 1, + width = 272, + height = 295, + shift = util.by_pixel(8, -19) + } + }, + fluid_background = py.empty_image(), + window_background = py.empty_image(), + flow_sprite = py.empty_image(), + gas_flow = py.empty_image() + }, + flow_length_in_ticks = 360, + impact_category = "metal-large", + working_sound = { + sound = { + filename = "__base__/sound/storage-tank.ogg", + volume = 0.8 + }, + apparent_volume = 1.5, + max_sounds_per_prototype = 3 + }, + circuit_wire_max_distance = 9, + circuit_connector = table.deepcopy(data.raw["storage-tank"]["storage-tank"].circuit_connector), +} diff --git a/prototypes/buildings/fluid-tanks/tanks-3000.lua b/prototypes/buildings/fluid-tanks/py-tank-2.lua similarity index 75% rename from prototypes/buildings/fluid-tanks/tanks-3000.lua rename to prototypes/buildings/fluid-tanks/py-tank-2.lua index b1ee356..9ddc490 100644 --- a/prototypes/buildings/fluid-tanks/tanks-3000.lua +++ b/prototypes/buildings/fluid-tanks/py-tank-2.lua @@ -1,44 +1,43 @@ RECIPE { type = "recipe", - name = "py-tank-3000", + name = "py-tank-2", energy_required = 5, enabled = false, ingredients = { - {type = "item", name = "iron-plate", amount = 15}, - {type = "item", name = "pipe", amount = 20}, - {type = "item", name = "steel-plate", amount = 10}, + {type = "item", name = "pipe", amount = 5}, + {type = "item", name = "steel-plate", amount = 15}, }, results = { - {type = "item", name = "py-tank-3000", amount = 1} + {type = "item", name = "py-tank-2", amount = 1} } }:add_unlock("py-storage-tanks") ITEM { type = "item", - name = "py-tank-3000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-3000.png", - icon_size = 32, + name = "py-tank-2", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-2.png", + icon_size = 64, flags = {}, subgroup = "py-storage-tanks", - order = "a-c[py-items]", - place_result = "py-tank-3000", + order = "a-b[py-items]", + place_result = "py-tank-2", stack_size = 10 } ENTITY { type = "storage-tank", - name = "py-tank-3000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-3000.png", - icon_size = 32, + name = "py-tank-2", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-2.png", + icon_size = 64, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 3, result = "py-tank-3000"}, + minable = {mining_time = 3, result = "py-tank-2"}, max_health = 100, corpse = "medium-remnants", collision_box = {{-0.9, -0.9}, {0.9, 0.9}}, selection_box = {{-1.0, -1.0}, {1.0, 1.0}}, two_direction_only = true, fluid_box = { - volume = 30000, + volume = 10000, pipe_covers = _G.pipecoverspictures(), pipe_connections = { { @@ -63,7 +62,7 @@ ENTITY { pictures = { picture = { sheet = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-3000/py-tank-3000.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-2/py-tank-2.png", priority = "extra-high", frames = 2, width = 133, diff --git a/prototypes/buildings/fluid-tanks/tanks-1500.lua b/prototypes/buildings/fluid-tanks/py-tank-3.lua similarity index 77% rename from prototypes/buildings/fluid-tanks/tanks-1500.lua rename to prototypes/buildings/fluid-tanks/py-tank-3.lua index d4a5a2c..8c4e0a5 100644 --- a/prototypes/buildings/fluid-tanks/tanks-1500.lua +++ b/prototypes/buildings/fluid-tanks/py-tank-3.lua @@ -1,37 +1,37 @@ RECIPE { type = "recipe", - name = "py-tank-1500", + name = "py-tank-3", energy_required = 5, enabled = false, ingredients = { - {type = "item", name = "iron-plate", amount = 20}, - {type = "item", name = "pipe", amount = 10}, - {type = "item", name = "steel-plate", amount = 10} + {type = "item", name = "pipe", amount = 6}, + {type = "item", name = "iron-plate", amount = 10}, + {type = "item", name = "steel-plate", amount = 20} }, results = { - {type = "item", name = "py-tank-1500", amount = 1} + {type = "item", name = "py-tank-3", amount = 1} } }:add_unlock("py-storage-tanks") ITEM { type = "item", - name = "py-tank-1500", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-1500.png", - icon_size = 32, + name = "py-tank-3", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-3.png", + icon_size = 64, flags = {}, subgroup = "py-storage-tanks", order = "a-c[py-items]", - place_result = "py-tank-1500", + place_result = "py-tank-3", stack_size = 10 } ENTITY { type = "storage-tank", - name = "py-tank-1500", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-1500.png", - icon_size = 32, + name = "py-tank-3", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-3.png", + icon_size = 64, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 3, result = "py-tank-1500"}, + minable = {mining_time = 3, result = "py-tank-3"}, max_health = 500, corpse = "medium-remnants", collision_box = {{-1.3, -1.3}, {1.3, 1.3}}, @@ -63,7 +63,7 @@ ENTITY { pictures = { picture = { sheet = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-1500/py-tank-1500.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-3/py-tank-3.png", priority = "extra-high", frames = 1, width = 119, diff --git a/prototypes/buildings/fluid-tanks/tanks-4000.lua b/prototypes/buildings/fluid-tanks/py-tank-4.lua similarity index 77% rename from prototypes/buildings/fluid-tanks/tanks-4000.lua rename to prototypes/buildings/fluid-tanks/py-tank-4.lua index 7918a37..cb2b138 100644 --- a/prototypes/buildings/fluid-tanks/tanks-4000.lua +++ b/prototypes/buildings/fluid-tanks/py-tank-4.lua @@ -1,44 +1,44 @@ RECIPE { type = "recipe", - name = "py-tank-4000", + name = "py-tank-4", energy_required = 3, enabled = false, ingredients = { - {type = "item", name = "iron-stick", amount = 40}, {type = "item", name = "pipe", amount = 8}, - {type = "item", name = "steel-plate", amount = 30} + {type = "item", name = "iron-stick", amount = 15}, + {type = "item", name = "steel-plate", amount = 25} }, results = { - {type = "item", name = "py-tank-4000", amount = 1} + {type = "item", name = "py-tank-4", amount = 1} } }:add_unlock("py-storage-tanks") ITEM { type = "item", - name = "py-tank-4000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-4000.png", - icon_size = 32, + name = "py-tank-4", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-4.png", + icon_size = 64, flags = {}, subgroup = "py-storage-tanks", - order = "a-c[py-items]", - place_result = "py-tank-4000", + order = "a-d[py-items]", + place_result = "py-tank-4", stack_size = 10 } ENTITY { type = "storage-tank", - name = "py-tank-4000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-4000.png", - icon_size = 32, + name = "py-tank-4", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-4.png", + icon_size = 64, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 3, result = "py-tank-4000"}, + minable = {mining_time = 3, result = "py-tank-4"}, max_health = 500, corpse = "medium-remnants", collision_box = {{-1.3, -1.3}, {1.3, 1.3}}, selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, two_direction_only = true, fluid_box = { - volume = 40000, + volume = 27500, pipe_covers = _G.pipecoverspictures(), pipe_connections = { { @@ -63,7 +63,7 @@ ENTITY { pictures = { picture = { sheet = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-4000/py-tank-4000.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-4/py-tank-4.png", priority = "extra-high", frames = 1, width = 165, diff --git a/prototypes/buildings/fluid-tanks/tanks-5000.lua b/prototypes/buildings/fluid-tanks/py-tank-5.lua similarity index 77% rename from prototypes/buildings/fluid-tanks/tanks-5000.lua rename to prototypes/buildings/fluid-tanks/py-tank-5.lua index bebd5f1..9650207 100644 --- a/prototypes/buildings/fluid-tanks/tanks-5000.lua +++ b/prototypes/buildings/fluid-tanks/py-tank-5.lua @@ -1,45 +1,45 @@ RECIPE { type = "recipe", - name = "py-tank-5000", + name = "py-tank-5", energy_required = 5, enabled = false, ingredients = { - {type = "item", name = "py-tank-1500", amount = 1}, - {type = "item", name = "iron-stick", amount = 40}, + {type = "item", name = "py-tank-2", amount = 1}, {type = "item", name = "pipe", amount = 8}, + {type = "item", name = "iron-stick", amount = 20}, {type = "item", name = "steel-plate", amount = 30} }, results = { - {type = "item", name = "py-tank-5000", amount = 1} + {type = "item", name = "py-tank-5", amount = 1} } }:add_unlock("py-storage-tanks") ITEM { type = "item", - name = "py-tank-5000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-5000.png", - icon_size = 32, + name = "py-tank-5", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-5.png", + icon_size = 64, flags = {}, subgroup = "py-storage-tanks", - order = "a-c[py-items]", - place_result = "py-tank-5000", + order = "a-e[py-items]", + place_result = "py-tank-5", stack_size = 10 } ENTITY { type = "storage-tank", - name = "py-tank-5000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-5000.png", - icon_size = 32, + name = "py-tank-5", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-5.png", + icon_size = 64, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 3, result = "py-tank-5000"}, + minable = {mining_time = 3, result = "py-tank-5"}, max_health = 500, corpse = "medium-remnants", two_direction_only = true, collision_box = {{-2.45, -2.45}, {2.45, 2.45}}, selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, fluid_box = { - volume = 50000, + volume = 65000, pipe_covers = _G.pipecoverspictures(), pipe_connections = { { @@ -64,7 +64,7 @@ ENTITY { pictures = { picture = { sheet = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-5000/py-tank-5000.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-5/py-tank-5.png", priority = "extra-high", frames = 1, width = 187, diff --git a/prototypes/buildings/fluid-tanks/tanks-7000.lua b/prototypes/buildings/fluid-tanks/py-tank-6.lua similarity index 77% rename from prototypes/buildings/fluid-tanks/tanks-7000.lua rename to prototypes/buildings/fluid-tanks/py-tank-6.lua index b6c69f2..a829522 100644 --- a/prototypes/buildings/fluid-tanks/tanks-7000.lua +++ b/prototypes/buildings/fluid-tanks/py-tank-6.lua @@ -1,38 +1,38 @@ RECIPE { type = "recipe", - name = "py-tank-7000", + name = "py-tank-6", energy_required = 5, enabled = false, ingredients = { - {type = "item", name = "storage-tank", amount = 1}, - {type = "item", name = "iron-plate", amount = 20}, + {type = "item", name = "py-tank-1", amount = 1}, {type = "item", name = "pipe", amount = 10}, - {type = "item", name = "steel-plate", amount = 10} + {type = "item", name = "iron-plate", amount = 25}, + {type = "item", name = "steel-plate", amount = 35} }, results = { - {type = "item", name = "py-tank-7000", amount = 1} + {type = "item", name = "py-tank-6", amount = 1} } }:add_unlock("py-storage-tanks") ITEM { type = "item", - name = "py-tank-7000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-7000.png", - icon_size = 32, + name = "py-tank-6", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-6.png", + icon_size = 64, flags = {}, subgroup = "py-storage-tanks", - order = "a-c[py-items]", - place_result = "py-tank-7000", + order = "a-f[py-items]", + place_result = "py-tank-6", stack_size = 10 } ENTITY { type = "storage-tank", - name = "py-tank-7000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-7000.png", - icon_size = 32, + name = "py-tank-6", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-6.png", + icon_size = 64, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 3, result = "py-tank-7000"}, + minable = {mining_time = 3, result = "py-tank-6"}, max_health = 100, corpse = "medium-remnants", collision_box = {{-1.3, -3.3}, {1.3, 3.3}}, @@ -55,28 +55,28 @@ ENTITY { pictures = { picture = { north = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-7000/north.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-6/north.png", width = 253, height = 585, shift = {0.5, -1.0}, scale = 0.5 }, east = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-7000/east.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-6/east.png", width = 499, height = 299, shift = {0.35, -0.15}, scale = 0.5 }, south = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-7000/south.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-6/south.png", width = 239, height = 477, shift = {0.34, -0.0}, scale = 0.5 }, west = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-7000/west.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-6/west.png", width = 499, height = 299, shift = {0.35, -0.15}, diff --git a/prototypes/buildings/fluid-tanks/tanks-6500.lua b/prototypes/buildings/fluid-tanks/py-tank-7.lua similarity index 80% rename from prototypes/buildings/fluid-tanks/tanks-6500.lua rename to prototypes/buildings/fluid-tanks/py-tank-7.lua index dacaf50..4391a06 100644 --- a/prototypes/buildings/fluid-tanks/tanks-6500.lua +++ b/prototypes/buildings/fluid-tanks/py-tank-7.lua @@ -1,45 +1,45 @@ RECIPE { type = "recipe", - name = "py-tank-6500", + name = "py-tank-7", energy_required = 05, enabled = false, ingredients = { - {type = "item", name = "py-tank-4000", amount = 1}, + {type = "item", name = "py-tank-4", amount = 1}, {type = "item", name = "pipe", amount = 8}, {type = "item", name = "iron-stick", amount = 30}, {type = "item", name = "steel-plate", amount = 30} }, results = { - {type = "item", name = "py-tank-6500", amount = 1} + {type = "item", name = "py-tank-7", amount = 1} } }:add_unlock("py-storage-tanks") ITEM { type = "item", - name = "py-tank-6500", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-6500.png", - icon_size = 32, + name = "py-tank-7", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-7.png", + icon_size = 64, flags = {}, subgroup = "py-storage-tanks", - order = "a-c[py-items]", - place_result = "py-tank-6500", + order = "a-g[py-items]", + place_result = "py-tank-7", stack_size = 10 } ENTITY { type = "storage-tank", - name = "py-tank-6500", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-6500.png", - icon_size = 32, + name = "py-tank-7", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-7.png", + icon_size = 64, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 3, result = "py-tank-6500"}, + minable = {mining_time = 3, result = "py-tank-7"}, max_health = 500, corpse = "medium-remnants", collision_box = {{-2.3, -2.3}, {2.3, 2.3}}, selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, two_direction_only = true, fluid_box = { - volume = 65000, + volume = 75000, pipe_covers = _G.pipecoverspictures(), pipe_connections = { { @@ -64,7 +64,7 @@ ENTITY { pictures = { picture = { sheet = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-6500/py-tank-6500.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-7/py-tank-7.png", priority = "extra-high", frames = 1, width = 182, diff --git a/prototypes/buildings/fluid-tanks/tanks-8000.lua b/prototypes/buildings/fluid-tanks/py-tank-8.lua similarity index 79% rename from prototypes/buildings/fluid-tanks/tanks-8000.lua rename to prototypes/buildings/fluid-tanks/py-tank-8.lua index 44bacdf..3fad933 100644 --- a/prototypes/buildings/fluid-tanks/tanks-8000.lua +++ b/prototypes/buildings/fluid-tanks/py-tank-8.lua @@ -1,45 +1,45 @@ RECIPE { type = "recipe", - name = "py-tank-8000", + name = "py-tank-8", energy_required = 5, enabled = false, ingredients = { - {type = "item", name = "py-tank-4000", amount = 1}, + {type = "item", name = "py-tank-4", amount = 1}, {type = "item", name = "pipe", amount = 12}, - {type = "item", name = "iron-stick", amount = 40}, - {type = "item", name = "steel-plate", amount = 40} + {type = "item", name = "iron-stick", amount = 35}, + {type = "item", name = "steel-plate", amount = 45} }, results = { - {type = "item", name = "py-tank-8000", amount = 1} + {type = "item", name = "py-tank-8", amount = 1} } }:add_unlock("py-storage-tanks") ITEM { type = "item", - name = "py-tank-8000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-8000.png", - icon_size = 32, + name = "py-tank-8", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-8.png", + icon_size = 64, flags = {}, subgroup = "py-storage-tanks", - order = "a-c[py-items]", - place_result = "py-tank-8000", + order = "a-h[py-items]", + place_result = "py-tank-8", stack_size = 10 } ENTITY { type = "storage-tank", - name = "py-tank-8000", - icon = "__pyindustrygraphics__/graphics/icons/py-tank-8000.png", - icon_size = 32, + name = "py-tank-8", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-8.png", + icon_size = 64, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 3, result = "py-tank-8000"}, + minable = {mining_time = 3, result = "py-tank-8"}, max_health = 500, corpse = "medium-remnants", collision_box = {{-2.9, -2.9}, {2.9, 2.9}}, selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, two_direction_only = true, fluid_box = { - volume = 80000, + volume = 125000, pipe_covers = _G.pipecoverspictures(), pipe_connections = { { @@ -80,7 +80,7 @@ ENTITY { pictures = { picture = { sheet = { - filename = "__pyindustrygraphics__/graphics/entity/py-tank-8000/py-tank-8000.png", + filename = "__pyindustrygraphics__/graphics/entity/py-tank-8/py-tank-8.png", priority = "extra-high", frames = 1, width = 231, diff --git a/prototypes/buildings/fluid-tanks/py-tank-9.lua b/prototypes/buildings/fluid-tanks/py-tank-9.lua new file mode 100644 index 0000000..2e0f2b3 --- /dev/null +++ b/prototypes/buildings/fluid-tanks/py-tank-9.lua @@ -0,0 +1,84 @@ +RECIPE { + type = "recipe", + name = "py-tank-9", + energy_required = 5, + enabled = false, + ingredients = { + {type = "item", name = "py-tank-5", amount = 1}, + {type = "item", name = "py-tank-3", amount = 1}, + {type = "item", name = "iron-plate", amount = 40}, + {type = "item", name = "steel-plate", amount = 50}, + }, + results = { + {type = "item", name = "py-tank-9", amount = 1} + } +}:add_unlock("py-storage-tanks") + +ITEM { + type = "item", + name = "py-tank-9", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-9.png", + icon_size = 64, + flags = {}, + subgroup = "py-storage-tanks", + order = "a-i[py-items]", + place_result = "py-tank-9", + stack_size = 10 +} + +ENTITY { + type = "storage-tank", + name = "py-tank-9", + icon = "__pyindustrygraphics__/graphics/icons/py-tank-9.png", + icon_size = 64, + flags = {"placeable-player", "player-creation"}, + minable = {mining_time = 3, result = "py-tank-9"}, + max_health = 500, + corpse = "medium-remnants", + collision_box = {{-3.4, -3.4}, {3.4, 3.4}}, + selection_box = {{-3.5, -3.5}, {3.5, 3.5}}, + two_direction_only = true, + fluid_box = { + volume = 180000, + pipe_covers = _G.pipecoverspictures(), + pipe_connections = { + {position = {1.0, -3.0}, direction = defines.direction.north}, + {position = {-1.0, -3.0}, direction = defines.direction.north}, + {position = {3.0, 1.0}, direction = defines.direction.east}, + {position = {3.0, -1.0}, direction = defines.direction.east}, + {position = {1.0, 3.0}, direction = defines.direction.south}, + {position = {-1.0, 3.0}, direction = defines.direction.south}, + {position = {-3.0, 1.0}, direction = defines.direction.west}, + {position = {-3.0, -1.0}, direction = defines.direction.west} + } + }, + window_bounding_box = {{-0.0, 0.0}, {0.0, 0.0}}, + pictures = { + picture = { + sheet = { + filename = "__pyindustrygraphics__/graphics/entity/py-tank-9/py-tank-9.png", + priority = "extra-high", + frames = 1, + width = 252, + height = 293, + shift = util.by_pixel(14, -33) + } + }, + fluid_background = py.empty_image(), + window_background = py.empty_image(), + flow_sprite = py.empty_image(), + gas_flow = py.empty_image() + }, + flow_length_in_ticks = 360, + impact_category = "metal-large", + working_sound = { + sound = { + filename = "__base__/sound/storage-tank.ogg", + volume = 0.8 + }, + apparent_volume = 1.5, + max_sounds_per_prototype = 3 + }, + circuit_wire_max_distance = 9, + circuit_connector = table.deepcopy(data.raw["storage-tank"]["storage-tank"].circuit_connector), +} diff --git a/prototypes/updates/pyalternativeenergy-updates.lua b/prototypes/updates/pyalternativeenergy-updates.lua index a218031..e16e006 100644 --- a/prototypes/updates/pyalternativeenergy-updates.lua +++ b/prototypes/updates/pyalternativeenergy-updates.lua @@ -1,3 +1,3 @@ -RECIPE("py-heat-exchanger-mk02"):add_ingredient {type = "item", name = "py-tank-8000", amount = 1} -RECIPE("py-heat-exchanger-mk03"):add_ingredient {type = "item", name = "py-tank-9000", amount = 1} -RECIPE("py-heat-exchanger-mk04"):add_ingredient {type = "item", name = "py-tank-10000", amount = 1} +RECIPE("py-heat-exchanger-mk02"):add_ingredient {type = "item", name = "py-tank-8", amount = 1} +RECIPE("py-heat-exchanger-mk03"):add_ingredient {type = "item", name = "py-tank-9", amount = 1} +RECIPE("py-heat-exchanger-mk04"):add_ingredient {type = "item", name = "py-tank-10", amount = 1} diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index 75f4ed3..93f88e9 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -4,6 +4,6 @@ -- RECIPE CHANGES -RECIPE("mixer-mk01"):replace_ingredient("storage-tank", "py-tank-8000") +RECIPE("mixer-mk01"):replace_ingredient("storage-tank", "py-tank-8") -RECIPE("py-heat-exchanger"):replace_ingredient("storage-tank", "py-tank-7000") +RECIPE("py-heat-exchanger"):replace_ingredient("storage-tank", "py-tank-6") diff --git a/scripts/tank-rotation.lua b/scripts/tank-rotation.lua index d960289..a1cd30b 100644 --- a/scripts/tank-rotation.lua +++ b/scripts/tank-rotation.lua @@ -1,13 +1,13 @@ -- https://github.com/pyanodon/pybugreports/issues/920 local tanks_to_reset_rotation = table.invert { - "py-tank-1500", - "py-tank-4000", - "py-tank-5000", - "py-tank-6500", - "py-tank-8000", - "py-tank-9000", - "py-tank-10000", + "py-tank-2", + "py-tank-4", + "py-tank-5", + "py-tank-7", + "py-tank-8", + "py-tank-9", + "py-tank-10", "tailings-pond", } diff --git a/settings.lua b/settings.lua index 8fd4712..da4c200 100644 --- a/settings.lua +++ b/settings.lua @@ -1,11 +1,3 @@ -data:extend {{ - type = "bool-setting", - name = "py-tank-adjust", - setting_type = "startup", - default_value = false, - order = "e", -}} - data:extend {{ type = "bool-setting", name = "py-braided-pipes", From b422d21b18f1e366390cdd6a391218a95719b967 Mon Sep 17 00:00:00 2001 From: Zachary Picco Date: Fri, 3 Oct 2025 10:01:45 -0500 Subject: [PATCH 4/6] Fix changelog --- changelog.txt | 2 +- info.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 2420f66..03608ee 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,7 +3,7 @@ Version: 4.0.0 Date: ??? Changes: - Removed startup setting "fluid tank rebalance". - - Rebalanced fluid tank volumes per tier to the following values: 1k, 5k, 15k, 27.5k, 65k, 70k, 75k, 125k, 180k, 250k. + - Rebalanced fluid tank volumes per tier to the following values: 5k, 10k, 15k, 27.5k, 65k, 70k, 75k, 125k, 180k, 250k. - The 180k and 250k fluid tanks are no longer located within pypetrolemhandling. All tanks are now stored inside pyindustry. - New entity graphics for all updated fluid tanks. Huge thanks to JigSaW_3 for providing these! - Rebalanced recipes for all py storage tanks. diff --git a/info.json b/info.json index 18cc529..3eca439 100644 --- a/info.json +++ b/info.json @@ -9,8 +9,8 @@ "description": "Control the means of production with new logistic and storage structures. Works either as a standalone mod or alongside the rest of the pY modpack.", "dependencies": [ "base >= 2.0.48", + "pyindustrygraphics >= 4.0.0", "~ pypostprocessing >= 3.0.35", - "~ pyindustrygraphics >= 3.0.0", "? pycoalprocessing >= 1.0.6", "? pyfusionenergy >= 1.0.3", "! wret-beacon-rebalance-mod", From d90fc4028ed85cef0d288831557bbd4a673572b7 Mon Sep 17 00:00:00 2001 From: Lemon <55360995+lemonlambda@users.noreply.github.com> Date: Sun, 19 Oct 2025 14:23:48 -0400 Subject: [PATCH 5/6] Linearilized up to pyrawores (#141) * Linearilized Dependencies * Linearized PyCoal and PyIndustry Linearized PyCoal and PyIndustry * PyFusionEnergy Linearization Updates to linearize PyIndustry with PyFusionEnergy * Linearization with RawOres Linearized pyIndustry with pyRawOres * Fix dependencies * Final Linearization Tweaks --------- Co-authored-by: Alyssa Doubrovsky --- changelog.txt | 1 + data-final-fixes.lua | 20 +++++++++++++++++++ data-updates.lua | 19 +++--------------- data.lua | 7 ------- info.json | 2 -- prototypes/buildings/accumulator-mk01.lua | 5 ++++- prototypes/buildings/accumulator-mk02.lua | 10 +++++++++- prototypes/buildings/megadar.lua | 4 ++-- .../py-roboport-construction-mk03.lua | 6 +++++- .../py-roboport-construction-mk04.lua | 6 +++++- prototypes/equipment/armor-updates.lua | 1 + .../equipment/portable-gasoline-generator.lua | 1 + prototypes/pipes/niobium-pipes.lua | 12 +++++++++-- prototypes/robots/py-logistic-robot-mk01.lua | 4 +++- prototypes/tiles/py-iron-oxide.lua | 5 +++-- prototypes/tiles/py-nexelit.lua | 1 + .../updates/pycoalprocessing-updates.lua | 1 + prototypes/updates/pyfusionenergy-updates.lua | 1 + prototypes/updates/pyrawores-updates.lua | 7 ++++--- prototypes/wall/wood-fence.lua | 6 +++++- 20 files changed, 79 insertions(+), 40 deletions(-) diff --git a/changelog.txt b/changelog.txt index 03608ee..03c6dc7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,7 @@ Date: ??? - New entity graphics for all updated fluid tanks. Huge thanks to JigSaW_3 for providing these! - Rebalanced recipes for all py storage tanks. - Upscaled all fluid tank item icons from 32p to 64p. + - Linearilized dependencies. - Removed niobium pipes from hydrocyclone recipe. Resolves https://github.com/pyanodon/pybugreports/issues/851 --------------------------------------------------------------------------------------------------- Version: 3.0.19 diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 5fea254..b5b48f5 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -1,3 +1,23 @@ +for f, _ in pairs(data.raw.fluid) do + for i, recipe_name in pairs { + "empty-" .. f .. "-canister", + "empty-" .. f .. "-barrel", + "fill-" .. f .. "-canister", + f .. "-barrel" + } do + local recipe = data.raw.recipe[recipe_name] and RECIPE(recipe_name) + if recipe ~= nil then + recipe:set_fields {hide_from_player_crafting = true, hide_from_stats = true} + -- This is backwards, I blame king + if recipe_name:match("^empty") then + recipe.category = "py-barreling" + else + recipe.category = "py-unbarreling" + end + end + end +end + require "prototypes/void-recipes/fluid-void" require "prototypes/void-recipes/item-void" diff --git a/data-updates.lua b/data-updates.lua index c799c74..a65d188 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -1,3 +1,4 @@ +require "prototypes/buildings/megadar" --Tiles require "prototypes/tiles/py-asphalt" require "prototypes/tiles/py-limestone" @@ -13,20 +14,6 @@ end require "prototypes/updates/base-updates" -if mods["pycoalprocessing"] then - require "prototypes/updates/pycoalprocessing-updates" - require "prototypes/tiles/py-iron-oxide" - require "prototypes/tiles/py-nexelit" -end - -if mods["pyfusionenergy"] then - require "prototypes/updates/pyfusionenergy-updates" -end - -if mods["pyrawores"] then - require "prototypes/updates/pyrawores-updates" -end - if mods["pyalternativeenergy"] then require "prototypes/updates/pyalternativeenergy-updates" end @@ -35,7 +22,7 @@ if mods.pyrawores then RECIPE("accumulator-mk02"):replace_ingredient("copper-cable", "tinned-cable"):replace_ingredient("iron-plate", "stainless-steel") end -for f, _ in pairs(data.raw.fluid) do +--[[for f, _ in pairs(data.raw.fluid) do for i, recipe_name in pairs { "empty-" .. f .. "-canister", "empty-" .. f .. "-barrel", @@ -53,7 +40,7 @@ for f, _ in pairs(data.raw.fluid) do end end end -end +end]] -- if mods["valves"] then data.raw.valve["valves-top_up"].next_upgrade = "py-underflow-valve" diff --git a/data.lua b/data.lua index 7c6132c..acce99a 100644 --- a/data.lua +++ b/data.lua @@ -44,17 +44,10 @@ require "prototypes/buildings/valves/check-valve" require "prototypes/buildings/valves/overflow-valve" require "prototypes/buildings/valves/underflow-valve" --- Armor -if mods["pycoalprocessing"] then - require "prototypes/equipment/armor-updates" - require "prototypes/equipment/portable-gasoline-generator" -end - --Other require "prototypes/buildings/accumulator-mk01" require "prototypes/buildings/accumulator-mk02" require "prototypes/buildings/radar" -require "prototypes/buildings/megadar" require "prototypes/buildings/barrel-machine" require "prototypes/buildings/py-roboport-mk01" diff --git a/info.json b/info.json index 3eca439..a204a1f 100644 --- a/info.json +++ b/info.json @@ -11,8 +11,6 @@ "base >= 2.0.48", "pyindustrygraphics >= 4.0.0", "~ pypostprocessing >= 3.0.35", - "? pycoalprocessing >= 1.0.6", - "? pyfusionenergy >= 1.0.3", "! wret-beacon-rebalance-mod", "! BigBags", "! ResearchFog", diff --git a/prototypes/buildings/accumulator-mk01.lua b/prototypes/buildings/accumulator-mk01.lua index 5757d2c..7e81c5e 100644 --- a/prototypes/buildings/accumulator-mk01.lua +++ b/prototypes/buildings/accumulator-mk01.lua @@ -13,8 +13,11 @@ RECIPE { results = { {type = "item", name = "accumulator-mk01", amount = 1} } -}:replace_ingredient("steel-plate", "nexelit-plate"):add_ingredient {type = "item", name = "niobium-plate", amount = 10}:add_unlock {"py-accumulator-mk01"} +} +if mods.pycoalprocessing then + RECIPE("accumulator-mk01"):replace_ingredient_unsafe("steel-plate", "nexelit-plate"):add_ingredient_unsafe {type = "item", name = "niobium-plate", amount = 10}:add_unlock {"py-accumulator-mk01"} +end ITEM { type = "item", diff --git a/prototypes/buildings/accumulator-mk02.lua b/prototypes/buildings/accumulator-mk02.lua index 1148bc2..7454d73 100644 --- a/prototypes/buildings/accumulator-mk02.lua +++ b/prototypes/buildings/accumulator-mk02.lua @@ -14,7 +14,15 @@ RECIPE { results = { {type = "item", name = "accumulator-mk02", amount = 1} } -}:replace_ingredient("steel-plate", "nexelit-plate"):add_ingredient {type = "item", name = "optical-fiber", amount = 30}:add_unlock("py-accumulator-mk02") +} + +if mods.pycoalprocessing then + RECIPE("accumulator-mk02"):replace_ingredient_unsafe("steel-plate", "nexelit-plate"):add_ingredient_unsafe {type = "item", name = "optical-fiber", amount = 30}:add_unlock("py-accumulator-mk02") +end + +if mods.pyrawores then + RECIPE("accumulator-mk02"):add_ingredient_unsafe {type = "fluid", name = "liquid-nitrogen", amount = 50} +end ITEM { type = "item", diff --git a/prototypes/buildings/megadar.lua b/prototypes/buildings/megadar.lua index 65fa00e..2d98c33 100644 --- a/prototypes/buildings/megadar.lua +++ b/prototypes/buildings/megadar.lua @@ -30,10 +30,10 @@ RECIPE { {type = "item", name = "megadar", amount = 1} }, enabled = false -}:add_unlock("radars-mk02") +}:add_unlock("radars-mk02"):replace_ingredient("steel-plate", "nexelit-plate"):add_ingredient {type = "item", name = "niobium-plate", amount = 10} if mods["pycoalprocessing"] then - RECIPE("megadar"):replace_ingredient("steel-plate", "nexelit-plate"):add_ingredient {type = "item", name = "niobium-plate", amount = 10} + --RECIPE("megadar"):replace_ingredient("steel-plate", "nexelit-plate"):add_ingredient {type = "item", name = "niobium-plate", amount = 10} end ITEM { diff --git a/prototypes/buildings/py-roboport-construction-mk03.lua b/prototypes/buildings/py-roboport-construction-mk03.lua index 81bb2b4..5c1037c 100644 --- a/prototypes/buildings/py-roboport-construction-mk03.lua +++ b/prototypes/buildings/py-roboport-construction-mk03.lua @@ -12,7 +12,11 @@ RECIPE { results = { {type = "item", name = "py-ze-mk03", amount = 1} } -}:add_unlock("py-accumulator-mk03"):add_ingredient {type = "item", name = "niobium-plate", amount = 10}:add_ingredient {type = "item", name = "nexelit-plate", amount = 20} +}:add_unlock("py-accumulator-mk03") + +if mods.pycoalprocessing then + RECIPE("py-ze-mk03"):add_ingredient_unsafe {type = "item", name = "niobium-plate", amount = 10}:add_ingredient_unsafe {type = "item", name = "nexelit-plate", amount = 20} +end ITEM { type = "item", diff --git a/prototypes/buildings/py-roboport-construction-mk04.lua b/prototypes/buildings/py-roboport-construction-mk04.lua index 0f2033e..dddb190 100644 --- a/prototypes/buildings/py-roboport-construction-mk04.lua +++ b/prototypes/buildings/py-roboport-construction-mk04.lua @@ -10,7 +10,11 @@ RECIPE { results = { {type = "item", name = "py-ze-mk04", amount = 1} } -}:add_ingredient {type = "item", name = "nbfe-alloy", amount = 10}:add_ingredient {type = "item", name = "kevlar", amount = 30} +} + +if mods.pycoalprocessing then + RECIPE("py-ze-mk04"):add_ingredient_unsafe {type = "item", name = "nbfe-alloy", amount = 10}:add_ingredient_unsafe {type = "item", name = "kevlar", amount = 30} +end ITEM { type = "item", diff --git a/prototypes/equipment/armor-updates.lua b/prototypes/equipment/armor-updates.lua index 6170cb0..2af880e 100644 --- a/prototypes/equipment/armor-updates.lua +++ b/prototypes/equipment/armor-updates.lua @@ -1,3 +1,4 @@ +--DEPRECIATED-- data:extend {{ name = "light-armor-equipment-grid", type = "equipment-grid", diff --git a/prototypes/equipment/portable-gasoline-generator.lua b/prototypes/equipment/portable-gasoline-generator.lua index d89ff5c..d6ffe6b 100644 --- a/prototypes/equipment/portable-gasoline-generator.lua +++ b/prototypes/equipment/portable-gasoline-generator.lua @@ -1,3 +1,4 @@ +--DEPRECIATED-- data:extend {{ type = "generator-equipment", name = "portable-gasoline-generator", diff --git a/prototypes/pipes/niobium-pipes.lua b/prototypes/pipes/niobium-pipes.lua index f024d50..8044470 100644 --- a/prototypes/pipes/niobium-pipes.lua +++ b/prototypes/pipes/niobium-pipes.lua @@ -302,7 +302,11 @@ RECIPE { results = { {type = "item", name = "niobium-pipe", amount = 2} } -}:add_unlock {"py-storage-tanks"}:replace_ingredient("copper-plate", "niobium-plate") +}:add_unlock {"py-storage-tanks"} + +if mods.pycoalprocessing then + RECIPE("niobium-pipe"):replace_ingredient_unsafe("copper-plate", "niobium-plate") +end ITEM { type = "item", @@ -329,7 +333,11 @@ RECIPE { results = { {type = "item", name = "niobium-pipe-to-ground", amount = 2} } -}:add_unlock {"py-storage-tanks"}:replace_ingredient("copper-plate", "niobium-plate") +}:add_unlock {"py-storage-tanks"} + +if mods.pycoalprocessing then + RECIPE("niobium-pipe-to-ground"):replace_ingredient_unsafe("copper-plate", "niobium-plate") +end ITEM { type = "item", diff --git a/prototypes/robots/py-logistic-robot-mk01.lua b/prototypes/robots/py-logistic-robot-mk01.lua index 3bdf92d..a796b7d 100644 --- a/prototypes/robots/py-logistic-robot-mk01.lua +++ b/prototypes/robots/py-logistic-robot-mk01.lua @@ -19,8 +19,10 @@ local cargo_bot = {type = "item", name = "py-logistic-robot-mk01", amount = 1} } }:add_ingredient {type = "fluid", name = "fish-oil", amount = 50} -cargo_bot:replace_ingredient("copper-plate", {type = "item", name = "nichrome", amount = 2}):replace_ingredient("iron-plate", "niobium-plate") cargo_bot:add_unlock {"logistic-robotics"} +if mods.pycoalprocessing then + cargo_bot:replace_ingredient_unsafe("copper-plate", {type = "item", name = "nichrome", amount = 2}):replace_ingredient_unsafe("iron-plate", "niobium-plate") +end local bot_item = ITEM { type = "item", diff --git a/prototypes/tiles/py-iron-oxide.lua b/prototypes/tiles/py-iron-oxide.lua index 408c649..83c97d1 100644 --- a/prototypes/tiles/py-iron-oxide.lua +++ b/prototypes/tiles/py-iron-oxide.lua @@ -1,11 +1,12 @@ +--DEPRECIATED-- 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 = "item", name = "iron-oxide", amount = 4}, + {type = "item", name = "pipe", amount = 1}, {type = "fluid", name = "muddy-sludge", amount = 20} }, results = { diff --git a/prototypes/tiles/py-nexelit.lua b/prototypes/tiles/py-nexelit.lua index 7407f8b..ec7d0ef 100644 --- a/prototypes/tiles/py-nexelit.lua +++ b/prototypes/tiles/py-nexelit.lua @@ -1,3 +1,4 @@ +--DEPRECIATED-- RECIPE { type = "recipe", name = "py-nexelit", diff --git a/prototypes/updates/pycoalprocessing-updates.lua b/prototypes/updates/pycoalprocessing-updates.lua index f46fdb2..7c6bc32 100644 --- a/prototypes/updates/pycoalprocessing-updates.lua +++ b/prototypes/updates/pycoalprocessing-updates.lua @@ -1,3 +1,4 @@ +--DEPRECIATED -- RECIPE UPDATES -- if not mods["pyrawores"] then RECIPE("automated-factory-mk01"):replace_ingredient("advanced-circuit", "electronic-circuit"):remove_unlock("advanced-circuit"):add_unlock("fast-inserter") diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index 93f88e9..e20513e 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -1,3 +1,4 @@ +--DEPRECIATED -- TECH CHANGES -- RECIPE UNLOCKS diff --git a/prototypes/updates/pyrawores-updates.lua b/prototypes/updates/pyrawores-updates.lua index 080b3dd..6e4f2a9 100644 --- a/prototypes/updates/pyrawores-updates.lua +++ b/prototypes/updates/pyrawores-updates.lua @@ -1,3 +1,4 @@ -RECIPE("accumulator-mk02"):add_ingredient {type = "fluid", name = "liquid-nitrogen", amount = 50} -RECIPE("ball-mill-mk01"):add_ingredient {type = "item", name = "py-asphalt", amount = 50} -RECIPE("py-heat-exchanger"):replace_ingredient("stone-brick", "py-asphalt") +--DEPRECIATED-- +--RECIPE("accumulator-mk02"):add_ingredient {type = "fluid", name = "liquid-nitrogen", amount = 50} +--RECIPE("ball-mill-mk01"):add_ingredient {type = "item", name = "py-asphalt", amount = 50} +--RECIPE("py-heat-exchanger"):replace_ingredient("stone-brick", "py-asphalt") diff --git a/prototypes/wall/wood-fence.lua b/prototypes/wall/wood-fence.lua index 6453c9d..a43c282 100644 --- a/prototypes/wall/wood-fence.lua +++ b/prototypes/wall/wood-fence.lua @@ -9,7 +9,11 @@ RECIPE { results = { {type = "item", name = "wood-fence", amount = 1} } -}:add_unlock("py-asphalt"):replace_ingredient("wood", "treated-wood") +}:add_unlock("py-asphalt") + +if mods.pycoalprocessing then + RECIPE("wood-fence"):replace_ingredient_unsafe("wood", "treated-wood") +end ITEM { type = "item", From 7f608afdab786f996a0c88e4a772e5a28835deeb Mon Sep 17 00:00:00 2001 From: Alyssa Doubrovsky Date: Sat, 25 Oct 2025 20:48:04 -0700 Subject: [PATCH 6/6] Added dependency to enforce load order Added a hidden dependency on the quality mod to enforce load order when loading mod sets that include space age. --- info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/info.json b/info.json index a204a1f..9b07f65 100644 --- a/info.json +++ b/info.json @@ -10,6 +10,7 @@ "dependencies": [ "base >= 2.0.48", "pyindustrygraphics >= 4.0.0", + "(?) quality >= 2.0", "~ pypostprocessing >= 3.0.35", "! wret-beacon-rebalance-mod", "! BigBags",