From ca09025ec19fb7b55c38144ffebd3d27c2bcde4b Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Sun, 30 Jun 2024 00:19:18 -0400 Subject: [PATCH 01/27] Update item.cfg --- locale/en/item.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/en/item.cfg b/locale/en/item.cfg index db570fe8..4f07cec3 100644 --- a/locale/en/item.cfg +++ b/locale/en/item.cfg @@ -328,6 +328,7 @@ mechanical-parts-03=Mechanical Parts 03 mechanical-parts-04=Mechanical Parts 04 quantum-battery=Quantum battery nuclear-artillery-shell=Fat Man +used-nuclear-fuel=Spent nuclear fuel [item-description] vitrified-glass=High-level radioactive waste storage. This waste product is extremely difficult to remove and must be launched into space. From 83a6db622205b5ba36ff920b0874207c91613a63 Mon Sep 17 00:00:00 2001 From: oorzkws <65210810+oorzkws@users.noreply.github.com> Date: Sun, 30 Jun 2024 11:28:09 -0600 Subject: [PATCH 02/27] Fix oopsie in assigning aerial data structure Forgot the sub-key in a few edge case assignments, causing a crash trying to index a LuaEntity. Includes a migration fixing any existing corruption. Resolves pyanodon/pybugreports#542 pending the user uploading a save with the broken structure for verification --- changelog.txt | 5 +++++ info.json | 2 +- migrations/aerial-1.2.37.lua | 19 +++++++++++++++++++ scripts/aerial.lua | 8 ++++---- 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 migrations/aerial-1.2.37.lua diff --git a/changelog.txt b/changelog.txt index f69e3fab..bc456f5d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.37 +Date: ??? + Bugfixes: + - Fixed a rare corruption in aerial data structures +--------------------------------------------------------------------------------------------------- Version: 1.2.36 Date: 2024-6-27 Bugfixes: diff --git a/info.json b/info.json index e21f806a..dc54f9f9 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalternativeenergy", - "version": "1.2.36", + "version": "1.2.37", "factorio_version": "1.1", "title": "Pyanodons Alternative Energy", "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo", diff --git a/migrations/aerial-1.2.37.lua b/migrations/aerial-1.2.37.lua new file mode 100644 index 00000000..3808ac50 --- /dev/null +++ b/migrations/aerial-1.2.37.lua @@ -0,0 +1,19 @@ +--[[ + Fix case where we accidentally placed accumulators in the table without specifying their network +--]] +if global.aerials and global.aerials.accumulators then + for network_id, table_entry in pairs(global.aerials.accumulators) do + if table_entry.type then + global.aerials.accumulators[network_id] = nil + if table_entry.valid and table_entry.electric_network_id then + log('found an oopsie') + -- Migrate to the correct place in the structure if possible + if global.aerials.accumulators[table_entry.electric_network_id][table_entry.name] then + table_entry.destroy() + else + global.aerials.accumulators[table_entry.electric_network_id][table_entry.name] = table_entry + end + end + end + end +end \ No newline at end of file diff --git a/scripts/aerial.lua b/scripts/aerial.lua index db7dd868..bbb59f1c 100644 --- a/scripts/aerial.lua +++ b/scripts/aerial.lua @@ -319,7 +319,7 @@ local function remove_pole(pole_data) local old_accumulator = global.aerials.accumulators[new_id][name] -- if there's no existing accumulator, it just takes that place if not old_accumulator or not old_accumulator.valid then - global.aerials.accumulators[new_id] = accumulator + global.aerials.accumulators[new_id][name] = accumulator network_accumulators[name] = nil goto next_accumulator else -- otherwise we empty our accumulator and yeet it @@ -552,7 +552,7 @@ local function refresh_networks() local new_id = accumulator.electric_network_id if new_id ~= network_id then if new_id then -- migrate any remaining charge - local new_accumulator = global.aerials.accumulators[new_id] + local new_accumulator = global.aerials.accumulators[new_id][accumulator_name] if new_accumulator and new_accumulator.valid then new_accumulator.energy = new_accumulator.energy + accumulator.energy end @@ -652,7 +652,7 @@ local function count_turbines_for_network(electric_network_id) end ---Sums the distance a turbine has travelled and returns the energy it would generate if stopping at its current position ----@param aerial LuaEntity +---@param aerial AerialsTurbineDataTableEntry ---@return number energy amount of energy generated in J ---@return number distance_bonus generation multiplier based on distance travelled local function calc_stored_energy(aerial) @@ -672,7 +672,7 @@ local function calc_stored_energy(aerial) end ---Calculates and stores the energy generated by the current trip of the given turbine ----@param aerial LuaEntity +---@param aerial AerialsTurbineDataTableEntry ---@return number # local function accumulate(aerial) local energy, distance_bonus = calc_stored_energy(aerial) From d347ce259914889f54895aafff66a93894ebc14b Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Sun, 7 Jul 2024 04:55:18 -0400 Subject: [PATCH 03/27] updated the list of things that can use nuclear fuel --- prototypes/updates/pyrawores-updates.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/prototypes/updates/pyrawores-updates.lua b/prototypes/updates/pyrawores-updates.lua index b662c9a8..65fc61bb 100644 --- a/prototypes/updates/pyrawores-updates.lua +++ b/prototypes/updates/pyrawores-updates.lua @@ -250,6 +250,11 @@ ITEM{ table.insert(data.raw.locomotive.locomotive.burner.fuel_categories, "nuke") table.insert(data.raw.locomotive["mk02-locomotive"].burner.fuel_categories, "nuke") +table.insert(data.raw['assembling-machine']['assembling-machine-3'].energy_source.fuel_categories, 'nuke') +table.insert(data.raw['assembling-machine']['atomizer-mk03'].energy_source.fuel_categories, 'nuke') +table.insert(data.raw['assembling-machine']['atomizer-mk04'].energy_source.fuel_categories, 'nuke') +table.insert(data.raw['assembling-machine']['sinter-unit'].energy_source.fuel_categories, 'nuke') +table.insert(data.raw['assembling-machine']['py-burner'].energy_source.fuel_categories, 'nuke') --move uranium ore processing recipes RECIPE("grade-1-u"):remove_unlock('uranium-mk01'):add_unlock('uranium-processing') From 50cad3efad6a54321169fea13e9931a14f4ba9fb Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Sun, 7 Jul 2024 05:01:06 -0400 Subject: [PATCH 04/27] is a furnace and not an assembler --- prototypes/updates/pyrawores-updates.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prototypes/updates/pyrawores-updates.lua b/prototypes/updates/pyrawores-updates.lua index 65fc61bb..178a451e 100644 --- a/prototypes/updates/pyrawores-updates.lua +++ b/prototypes/updates/pyrawores-updates.lua @@ -254,7 +254,7 @@ table.insert(data.raw['assembling-machine']['assembling-machine-3'].energy_sourc table.insert(data.raw['assembling-machine']['atomizer-mk03'].energy_source.fuel_categories, 'nuke') table.insert(data.raw['assembling-machine']['atomizer-mk04'].energy_source.fuel_categories, 'nuke') table.insert(data.raw['assembling-machine']['sinter-unit'].energy_source.fuel_categories, 'nuke') -table.insert(data.raw['assembling-machine']['py-burner'].energy_source.fuel_categories, 'nuke') +table.insert(data.raw['furnace']['py-burner'].energy_source.fuel_categories, 'nuke') --move uranium ore processing recipes RECIPE("grade-1-u"):remove_unlock('uranium-mk01'):add_unlock('uranium-processing') From be61aeee4abecb1d7b27e8bea68d21e18cfd81c4 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Sun, 7 Jul 2024 05:16:30 -0400 Subject: [PATCH 05/27] version and changelog --- changelog.txt | 3 ++- info.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index bc456f5d..4d319cec 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,9 @@ --------------------------------------------------------------------------------------------------- Version: 1.2.37 -Date: ??? +Date: 2024-7-7 Bugfixes: - Fixed a rare corruption in aerial data structures + - added nuclear fuel to assembling machine 3, atomizer 3/4, sinter plant, and burner --------------------------------------------------------------------------------------------------- Version: 1.2.36 Date: 2024-6-27 diff --git a/info.json b/info.json index dc54f9f9..b8be2452 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalternativeenergy", - "version": "1.2.37", + "version": "1.2.38", "factorio_version": "1.1", "title": "Pyanodons Alternative Energy", "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo", From 5ebd111ae7eaba497ebd2c83f8300e61773db9a4 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Mon, 8 Jul 2024 23:15:52 -0400 Subject: [PATCH 06/27] shut up i can count --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 4d319cec..69ed94b7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------------------------------------------- -Version: 1.2.37 +Version: 1.2.38 Date: 2024-7-7 Bugfixes: - Fixed a rare corruption in aerial data structures From fa7d716211d4550355d667c7aea1c71924d21ae2 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Sat, 13 Jul 2024 03:19:49 -0400 Subject: [PATCH 07/27] moved hydrocyclone and updated cache --- ...+pyindustry+pypetroleumhandling+pyrawores.lua | 16 ++++++++-------- changelog.txt | 7 +++++++ prototypes/updates/pyfusionenergy-updates.lua | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua b/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua index caeccfc8..3f17766e 100644 --- a/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua +++ b/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua @@ -180,7 +180,7 @@ fix_tech("effectivity-module-3",{order="000094",prerequisites={"effectivity-modu fix_tech("defender",{order="000038",prerequisites={"military-science-pack"},unit={count=80,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="military-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("distractor",{order="000069",prerequisites={"chemical-science-pack","defender"},unit={count=1000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="military-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("destroyer",{order="000094",prerequisites={"military-4","distractor"},unit={count=1200,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=30,name="py-science-pack-1",type="item"}},time=450}}) -fix_tech("uranium-processing",{order="000066",prerequisites={"ethanol","basic-electronics","electric-engine","iron-mk02"},unit={count=1750,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) +fix_tech("uranium-processing",{order="000066",prerequisites={"ethanol","basic-electronics","electric-engine"},unit={count=1750,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("nuclear-power",{order="000077",prerequisites={"uranium-mk01","boron-mk02","lithium-processing","aluminium-mk03"},unit={count=2500,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=6,name="py-science-pack-1",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=1,name="chemical-science-pack",type="item"}},time=120}}) fix_tech("mining-productivity-1",{order="000037",prerequisites={"logistic-science-pack"},unit={count=175,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("mining-productivity-2",{order="000069",prerequisites={"mining-productivity-1","chemical-science-pack"},unit={count=1000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) @@ -212,7 +212,7 @@ fix_tech("crusher",{order="000004",prerequisites={"steel-processing","soil-washi fix_tech("separation",{order="000022",prerequisites={"intermetallics-mk01","ash-separation"},unit={count=75,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) fix_tech("fluid-separation",{order="000041",prerequisites={"organic-solvent"},unit={count=250,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("fuel-production",{order="000042",prerequisites={"microbiology-mk02","fluid-separation"},unit={count=300,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) -fix_tech("fine-electronics",{order="000063",prerequisites={"iron-mk01","aramid","trits"},unit={count=1200,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) +fix_tech("fine-electronics",{order="000063",prerequisites={"aramid","trits"},unit={count=1200,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("fluid-processing-machines-1",{order="000007",prerequisites={"tar-processing"},unit={count=33,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}}) fix_tech("fluid-processing-machines-2",{order="000042",prerequisites={"niobium"},unit={count=300,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("ralesia",{order="000028",prerequisites={"genetics-mk02"},unit={count=150,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) @@ -249,7 +249,7 @@ fix_tech("fusion-mk03",{order="000097",prerequisites={"utility-science-pack"},un fix_tech("fusion-mk04",{order="000098",prerequisites={"fusion-mk03","nucleo-mk03"},unit={count=800,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) fix_tech("diamond-mining",{order="000072",prerequisites={"heavy-oil-mk02","machines-mk03"},unit={count=1400,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("regolite-mining",{order="000084",prerequisites={"super-alloy","machine-components-mk03"},unit={count=1000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) -fix_tech("molybdenum-processing",{order="000047",prerequisites={"advanced-mining-facilities"},unit={count=500,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) +fix_tech("molybdenum-processing",{order="000046",prerequisites={"vanadium-processing","iron-mk02"},unit={count=450,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("nenbit-matrix",{order="000072",prerequisites={"neuro-electronics-mk01","alloys-mk03","cellulose-mk03"},unit={count=1400,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("vanadium-processing",{order="000045",prerequisites={"arqad"},unit={count=400,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("helium-processing",{order="000070",prerequisites={"biofilm"},unit={count=1100,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) @@ -296,7 +296,7 @@ fix_tech("aluminium-mk03",{order="000070",prerequisites={"additives"},unit={coun fix_tech("aluminium-mk04",{order="000083",prerequisites={"production-science-pack"},unit={count=900,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("aluminium-mk05",{order="000097",prerequisites={"aluminium-mk04","utility-science-pack"},unit={count=750,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) fix_tech("chromium-mk01",{order="000023",prerequisites={"ash-separation","casting-mk01"},unit={count=80,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) -fix_tech("chromium-mk02",{order="000047",prerequisites={"advanced-mining-facilities"},unit={count=500,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) +fix_tech("chromium-mk02",{order="000043",prerequisites={"iron-mk02"},unit={count=330,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("chromium-mk03",{order="000070",prerequisites={"chromium-mk02","additives"},unit={count=1100,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("chromium-mk04",{order="000083",prerequisites={"production-science-pack"},unit={count=900,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("chromium-mk05",{order="000097",prerequisites={"chromium-mk04","utility-science-pack"},unit={count=750,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) @@ -306,7 +306,7 @@ fix_tech("copper-mk03",{order="000070",prerequisites={"heavy-oil-mk02","additive fix_tech("copper-mk04",{order="000083",prerequisites={"copper-mk03","production-science-pack"},unit={count=900,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("copper-mk05",{order="000097",prerequisites={"copper-mk04","utility-science-pack"},unit={count=750,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) fix_tech("iron-mk01",{order="000023",prerequisites={"boron","casting-mk01","hot-air-mk01"},unit={count=80,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) -fix_tech("iron-mk02",{order="000047",prerequisites={"iron-mk01","advanced-mining-facilities"},unit={count=500,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) +fix_tech("iron-mk02",{order="000042",prerequisites={"iron-mk01","niobium"},unit={count=300,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("iron-mk03",{order="000070",prerequisites={"additives","heavy-oil-mk02","titanium-mk02"},unit={count=1100,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("iron-mk04",{order="000083",prerequisites={"iron-mk03","production-science-pack"},unit={count=900,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("iron-mk05",{order="000097",prerequisites={"iron-mk04","utility-science-pack"},unit={count=750,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) @@ -399,7 +399,7 @@ fix_tech("aerogel",{order="000070",prerequisites={"epoxy","quartz-mk03"},unit={c fix_tech("auog",{order="000029",prerequisites={"ralesia"},unit={count=160,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) fix_tech("basic-electronics",{order="000065",prerequisites={"integrated-circuits-1","stainless-steel-mk01","aluminium-mk02","fine-electronics"},unit={count=1500,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("biopolymer",{order="000084",prerequisites={"microbiology-mk04"},unit={count=1000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) -fix_tech("cadaveric-arum",{order="000058",prerequisites={"advanced-mining-facilities","yotoi"},unit={count=700,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) +fix_tech("cadaveric-arum",{order="000058",prerequisites={"iron-mk02","yotoi"},unit={count=700,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) fix_tech("carbon-nanotube",{order="000085",prerequisites={"biopolymer"},unit={count=1100,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("ceramic",{order="000005",prerequisites={"mining-with-fluid"},unit={count=27,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}}) fix_tech("collagen",{order="000069",prerequisites={"chemical-science-pack","epoxy"},unit={count=1000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) @@ -729,7 +729,7 @@ fix_tech("biotech-machines-mk02",{order="000069",prerequisites={"chemical-scienc fix_tech("biotech-machines-mk03",{order="000086",prerequisites={"biotech-machines-mk02","bio-implants","carbon-nanotube","superconductor","super-alloy","alloys-mk04"},unit={count=1200,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("biotech-machines-mk04",{order="000101",prerequisites={"biotech-machines-mk03","quantum"},unit={count=1200,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=60,name="py-science-pack-1",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"}},time=600}}) fix_tech("seaweed-mk01",{order="000005",prerequisites={"mining-with-fluid"},unit={count=27,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}}) -fix_tech("seaweed-mk02",{order="000048",prerequisites={"molybdenum-processing","fertilizer-mk01"},unit={count=550,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"},{amount=1,name="logistic-science-pack",type="item"}},time=60}}) +fix_tech("seaweed-mk02",{order="000047",prerequisites={"molybdenum-processing","fertilizer-mk01"},unit={count=500,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"},{amount=1,name="logistic-science-pack",type="item"}},time=60}}) fix_tech("seaweed-mk03",{order="000057",prerequisites={"seaweed-mk02","py-science-pack-mk02"},unit={count=650,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) fix_tech("seaweed-mk04",{order="000077",prerequisites={"seaweed-mk03","py-science-pack-mk03"},unit={count=1000,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("seaweed-mk05",{order="000093",prerequisites={"seaweed-mk04","py-science-pack-mk04"},unit={count=1100,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=30,name="py-science-pack-1",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"},{amount=10,name="military-science-pack",type="item"}},time=450}}) @@ -915,7 +915,7 @@ fix_tech("research-upgrade",{order="000071",prerequisites={"biotech-machines-mk0 fix_tech("sap-upgrade",{order="000058",prerequisites={"sap-mk03"},unit={count=7000,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) fix_tech("schrodinger-antelope-upgrade",{order="000103",prerequisites={"simik-digestion-mk06","nuclear-power-mk04"},unit={count=1000,ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=100,name="py-science-pack-1",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=30,name="py-science-pack-2",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=10,name="py-science-pack-3",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=3,name="py-science-pack-4",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"}},time=1200}}) fix_tech("scrondrix-upgrade",{order="000073",prerequisites={"scrondrix"},unit={count=10000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) -fix_tech("seaweed-upgrade",{order="000049",prerequisites={"seaweed-mk02"},unit={count=5000,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) +fix_tech("seaweed-upgrade",{order="000048",prerequisites={"seaweed-mk02"},unit={count=5000,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("simik-digestion-mk01",{order="000079",prerequisites={"simik-mk01"},unit={count=7000,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("simik-digestion-mk02",{order="000080",prerequisites={"simik-digestion-mk01"},unit={count=7000,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("simik-digestion-mk03",{order="000084",prerequisites={"simik-mk02","simik-digestion-mk02"},unit={count=5000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) diff --git a/changelog.txt b/changelog.txt index 69ed94b7..2d08935c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.39 +Date: 2024-7-13 + Bugfixes: + - Fixed that 1.2.38 changelog was labeled as 1.2.37 as that version got microsofted + - Fixed iron processing mk02 tech required a number of unneeded prereqs due to the hydrocyclone being in vanadium processing + - Moved hydrocyclone to iron processing mk02 +--------------------------------------------------------------------------------------------------- Version: 1.2.38 Date: 2024-7-7 Bugfixes: diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index ea53c1ed..04dcf111 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -25,7 +25,7 @@ RECIPE("nmf-mk01"):add_ingredient({type = "item", name = "intermetallics", amoun RECIPE("secondary-crusher-mk01"):remove_unlock("machines-mk01"):add_unlock("crusher-2")--:add_ingredient({type = "item", name = "intermetallics", amount = 8}) RECIPE("thickener-mk01"):add_ingredient({type = "item", name = "intermetallics", amount = 7}) RECIPE("gas-separator-mk01"):add_ingredient({type = "item", name = "intermetallics", amount = 10}) -RECIPE("hydrocyclone-mk01"):add_ingredient({type = "item", name = "intermetallics", amount = 10}) +RECIPE("hydrocyclone-mk01"):add_ingredient({type = "item", name = "intermetallics", amount = 10}):remove_unlock("vanadium-processing"):add_unlock("iron-mk02") --RECIPE("automated-screener-mk01"):add_ingredient({type = "item", name = "intermetallics", amount = 3}) RECIPE("centrifugal-pan-mk01"):add_ingredient({type = "item", name = "intermetallics", amount = 10}) RECIPE("compressor-mk01"):add_ingredient({type = "item", name = "intermetallics", amount = 6}) From 4e3cef268d852959960ca2d47c7265e95cdf381d Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Sat, 13 Jul 2024 03:21:53 -0400 Subject: [PATCH 08/27] version and changelog --- info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.json b/info.json index b8be2452..f5f93977 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalternativeenergy", - "version": "1.2.38", + "version": "1.2.39", "factorio_version": "1.1", "title": "Pyanodons Alternative Energy", "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo", From d4616f43594a853483dd5af02f4967f74078d17e Mon Sep 17 00:00:00 2001 From: oorzkws <65210810+oorzkws@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:52:30 -0600 Subject: [PATCH 09/27] Fix stutter on clicking electric poles Someone's base is always big enough to make me eat my words --- changelog.txt | 5 +++++ info.json | 2 +- scripts/aerial.lua | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index 2d08935c..b183c978 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.40 +Date: ??? + Bugfixes: + - Fixed stutter on clicking electric poles +--------------------------------------------------------------------------------------------------- Version: 1.2.39 Date: 2024-7-13 Bugfixes: diff --git a/info.json b/info.json index f5f93977..650d53ac 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalternativeenergy", - "version": "1.2.39", + "version": "1.2.40", "factorio_version": "1.1", "title": "Pyanodons Alternative Energy", "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo", diff --git a/scripts/aerial.lua b/scripts/aerial.lua index bbb59f1c..068c5ca2 100644 --- a/scripts/aerial.lua +++ b/scripts/aerial.lua @@ -1360,9 +1360,9 @@ Aerial.events.on_open_gui = function(event) -- If we passed exists_and_valid, we don't need the IDE whining that entity might be nil ---@cast entity LuaEntity - -- If a player clicks for power stats, we refresh the networks - if entity.type == 'power-switch' or entity.type == 'electric-pole' then - global.aerials.refresh_networks = true + -- If a player clicks for power stats, we verify the network + if entity.type == 'electric-pole' then + verify_neighbours(entity) return end From 695166aacb797827af921a837648b2a6d84b5e89 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Mon, 29 Jul 2024 23:13:47 -0400 Subject: [PATCH 10/27] mining prod and release --- ...industry+pypetroleumhandling+pyrawores.lua | 28 +- changelog.txt | 3 +- prototypes/updates/base-updates.lua | 346 ++++++++++++++++++ todo.txt | 8 +- 4 files changed, 373 insertions(+), 12 deletions(-) diff --git a/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua b/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua index 3f17766e..eac157d7 100644 --- a/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua +++ b/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua @@ -182,10 +182,10 @@ fix_tech("distractor",{order="000069",prerequisites={"chemical-science-pack","de fix_tech("destroyer",{order="000094",prerequisites={"military-4","distractor"},unit={count=1200,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=30,name="py-science-pack-1",type="item"}},time=450}}) fix_tech("uranium-processing",{order="000066",prerequisites={"ethanol","basic-electronics","electric-engine"},unit={count=1750,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("nuclear-power",{order="000077",prerequisites={"uranium-mk01","boron-mk02","lithium-processing","aluminium-mk03"},unit={count=2500,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=6,name="py-science-pack-1",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=1,name="chemical-science-pack",type="item"}},time=120}}) -fix_tech("mining-productivity-1",{order="000037",prerequisites={"logistic-science-pack"},unit={count=175,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) -fix_tech("mining-productivity-2",{order="000069",prerequisites={"mining-productivity-1","chemical-science-pack"},unit={count=1000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) -fix_tech("mining-productivity-3",{order="000097",prerequisites={"mining-productivity-2","utility-science-pack"},unit={count=750,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) -fix_tech("mining-productivity-4",{order="000101",prerequisites={"mining-productivity-3","quantum"},unit={ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=3,name="py-science-pack-4",type="item"},{amount=10,name="py-science-pack-3",type="item"},{amount=30,name="py-science-pack-2",type="item"},{amount=100,name="py-science-pack-1",type="item"}},time=1200}}) +fix_tech("mining-productivity-1",{order="000023",prerequisites={"machines-mk01"},unit={count=80,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) +fix_tech("mining-productivity-2",{order="000024",prerequisites={"mining-productivity-1"},unit={count=90,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) +fix_tech("mining-productivity-3",{order="000038",prerequisites={"machines-mk02","mining-productivity-2"},unit={count=175,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) +fix_tech("mining-productivity-4",{order="000039",prerequisites={"mining-productivity-3"},unit={count=200,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("artillery",{order="000070",prerequisites={"tank"},unit={count=1100,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="military-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("spidertron",{order="000085",prerequisites={"zungror","energy-shield-mk2-equipment","py-warehouse-research","lead-mk03"},unit={count=2500,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=3,name="military-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=10,name="py-science-pack-1",type="item"}},time=180}}) fix_tech("circuit-network",{order="000033",prerequisites={"machine-components-mk01"},unit={count=250,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) @@ -484,7 +484,7 @@ fix_tech("drilling-fluid-mk02",{order="000069",prerequisites={"chemical-science- fix_tech("drilling-fluid-mk03",{order="000083",prerequisites={"production-science-pack"},unit={count=900,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("drilling-fluid-mk04",{order="000097",prerequisites={"drilling-fluid-mk03","utility-science-pack"},unit={count=750,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) fix_tech("hot-air-mk01",{order="000019",prerequisites={"coke-mk01"},unit={count=55,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) -fix_tech("hot-air-mk02",{order="000037",prerequisites={"logistic-science-pack","oilplant-mk01"},unit={count=175,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) +fix_tech("hot-air-mk02",{order="000037",prerequisites={"logistic-science-pack","coalplant-mk01"},unit={count=175,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("hot-air-mk03",{order="000071",prerequisites={"coalplant-mk02","coke-mk03","hot-air-mk02"},unit={count=1300,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("oil-distillation",{order="000044",prerequisites={"petroleum-gas-mk01"},unit={count=360,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("vanadium-processing-2",{order="000069",prerequisites={"chemical-science-pack"},unit={count=1000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) @@ -715,7 +715,7 @@ fix_tech("fertilizer-mk02",{order="000047",prerequisites={"fertilizer-mk01","sul fix_tech("fertilizer-mk03",{order="000062",prerequisites={"fish-mk03","salts"},unit={count=1100,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) fix_tech("cellulose-mk01",{order="000012",prerequisites={"electrolysis","plastics"},unit={count=60,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}}) fix_tech("cellulose-mk02",{order="000058",prerequisites={"cellulose-mk01","yotoi"},unit={count=700,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) -fix_tech("cellulose-mk03",{order="000069",prerequisites={"chemical-science-pack","oilplant-mk01"},unit={count=1000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=6,name="py-science-pack-1",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=1,name="chemical-science-pack",type="item"}},time=120}}) +fix_tech("cellulose-mk03",{order="000069",prerequisites={"chemical-science-pack","coalplant-mk01"},unit={count=1000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=6,name="py-science-pack-1",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=1,name="chemical-science-pack",type="item"}},time=120}}) fix_tech("starch-mk01",{order="000032",prerequisites={"fiberboard"},unit={count=225,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) fix_tech("starch-mk02",{order="000058",prerequisites={"salts","guar"},unit={count=700,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) fix_tech("starch-mk03",{order="000082",prerequisites={"starch-mk02","pharmagenomics"},unit={count=1750,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="military-science-pack",type="item"}},time=180}}) @@ -773,7 +773,7 @@ fix_tech("antimony-mk04",{order="000091",prerequisites={"machines-mk04","antimon fix_tech("silicon-mk01",{order="000057",prerequisites={"py-science-pack-mk02"},unit={count=650,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("silicon-mk02",{order="000073",prerequisites={"energy-2","diamond-mining"},unit={count=1600,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("silicon-mk03",{order="000084",prerequisites={"quartz-mk04","casting-mk02"},unit={count=1000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) -fix_tech("thermal-mk01",{order="000070",prerequisites={"solar-power-mk01","oilplant-mk01","energy-2","machine-components-mk02"},unit={count=1100,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) +fix_tech("thermal-mk01",{order="000070",prerequisites={"solar-power-mk01","coalplant-mk01","energy-2","machine-components-mk02"},unit={count=1100,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) fix_tech("thermal-mk02",{order="000084",prerequisites={"thermal-mk01","solar-power-mk02","wind-mk02"},unit={count=1000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"}},time=300}}) fix_tech("thermal-mk03",{order="000094",prerequisites={"solar-power-mk03"},unit={count=1200,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=30,name="py-science-pack-1",type="item"}},time=450}}) fix_tech("thermal-mk04",{order="000098",prerequisites={"thermal-mk03","solar-power-mk04"},unit={count=800,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) @@ -809,11 +809,11 @@ fix_tech("solar-power-mk03",{order="000093",prerequisites={"renewable-mk03","py- fix_tech("solar-power-mk04",{order="000097",prerequisites={"renewable-mk04","utility-science-pack"},unit={count=750,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) fix_tech("thorium",{order="000083",prerequisites={"production-science-pack"},unit={count=900,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("coalplant-mk01",{order="000035",prerequisites={"nonrenewable-mk01"},unit={count=300,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) -fix_tech("coalplant-mk02",{order="000070",prerequisites={"nonrenewable-mk02","coalplant-mk01","oilplant-mk01"},unit={count=2500,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) +fix_tech("coalplant-mk02",{order="000070",prerequisites={"nonrenewable-mk02","coalplant-mk01"},unit={count=2500,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("coalplant-mk03",{order="000084",prerequisites={"nonrenewable-mk03","coalplant-mk02","low-density-structure"},unit={count=2250,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("coalplant-mk04",{order="000095",prerequisites={"nonrenewable-mk04","coalplant-mk03"},unit={count=1400,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=30,name="py-science-pack-1",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"}},time=450}}) fix_tech("oilplant-mk01",{order="000035",prerequisites={"nonrenewable-mk01"},unit={count=300,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) -fix_tech("oilplant-mk02",{order="000071",prerequisites={"nonrenewable-mk02","oilplant-mk01","moondrop-mk03"},unit={count=3000,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) +fix_tech("oilplant-mk02",{order="000071",prerequisites={"nonrenewable-mk02","oilplant-mk01","moondrop-mk03","coalplant-mk01"},unit={count=3000,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("oilplant-mk03",{order="000084",prerequisites={"nonrenewable-mk03","oilplant-mk02","low-density-structure"},unit={count=2250,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("oilplant-mk04",{order="000095",prerequisites={"nonrenewable-mk04","oilplant-mk03"},unit={count=1400,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=30,name="py-science-pack-1",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"}},time=450}}) fix_tech("gasplant-mk01",{order="000044",prerequisites={"petroleum-gas-mk01"},unit={count=360,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) @@ -821,7 +821,7 @@ fix_tech("gasplant-mk02",{order="000070",prerequisites={"nonrenewable-mk02","gas fix_tech("gasplant-mk03",{order="000085",prerequisites={"nonrenewable-mk03","gasplant-mk02","petroleum-gas-mk02","biopolymer"},unit={count=1100,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("gasplant-mk04",{order="000097",prerequisites={"nonrenewable-mk04","gasplant-mk03","utility-science-pack"},unit={count=750,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) fix_tech("biomassplant-mk01",{order="000035",prerequisites={"renewable-mk01","nonrenewable-mk01"},unit={count=300,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) -fix_tech("biomassplant-mk02",{order="000070",prerequisites={"renewable-mk02","nonrenewable-mk02","biomassplant-mk01","oilplant-mk01","neuro-electronics-mk01"},unit={count=2500,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) +fix_tech("biomassplant-mk02",{order="000070",prerequisites={"renewable-mk02","nonrenewable-mk02","biomassplant-mk01","coalplant-mk01","neuro-electronics-mk01"},unit={count=2500,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("biomassplant-mk03",{order="000084",prerequisites={"renewable-mk03","nonrenewable-mk03","biomassplant-mk02"},unit={count=2250,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("biomassplant-mk04",{order="000095",prerequisites={"renewable-mk04","nonrenewable-mk04","biomassplant-mk03"},unit={count=1400,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=30,name="py-science-pack-1",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"}},time=450}}) fix_tech("gadolinium",{order="000078",prerequisites={"rare-earth-tech-mk02","ammonium-oxalate","vanadium-processing-2"},unit={count=1200,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=10,name="py-science-pack-1",type="item"}},time=180}}) @@ -875,6 +875,14 @@ fix_tech("moondrop-mk02",{order="000053",prerequisites={"fertilizer-mk01","biote fix_tech("moondrop-mk03",{order="000070",prerequisites={"botany-mk02","moondrop-mk02","phytomining"},unit={count=2500,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) fix_tech("moondrop-mk04",{order="000080",prerequisites={"pesticides-mk01"},unit={count=1500,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("moondrop-mk05",{order="000093",prerequisites={"moondrop-mk04","phytomining-mk03","py-science-pack-mk04"},unit={count=1100,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=30,name="py-science-pack-1",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"},{amount=10,name="military-science-pack",type="item"}},time=450}}) +fix_tech("mining-productivity-5",{order="000072",prerequisites={"machines-mk03","mining-productivity-4"},unit={count=1400,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) +fix_tech("mining-productivity-6",{order="000073",prerequisites={"mining-productivity-5"},unit={count=1600,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}}) +fix_tech("mining-productivity-7",{order="000091",prerequisites={"machines-mk04","mining-productivity-6"},unit={count=2000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) +fix_tech("mining-productivity-8",{order="000092",prerequisites={"mining-productivity-7"},unit={count=2250,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) +fix_tech("mining-productivity-9",{order="000102",prerequisites={"machines-mk05","mining-productivity-8"},unit={count=1300,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) +fix_tech("mining-productivity-10",{order="000103",prerequisites={"mining-productivity-9"},unit={count=1400,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) +fix_tech("mining-productivity-11",{order="000104",prerequisites={"mining-productivity-10"},unit={count=700,ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=3,name="py-science-pack-4",type="item"},{amount=10,name="py-science-pack-3",type="item"},{amount=30,name="py-science-pack-2",type="item"},{amount=100,name="py-science-pack-1",type="item"}},time=1200}}) +fix_tech("mining-productivity-12",{order="000105",prerequisites={"mining-productivity-11"},unit={count=750,ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=3,name="py-science-pack-4",type="item"},{amount=10,name="py-science-pack-3",type="item"},{amount=30,name="py-science-pack-2",type="item"},{amount=100,name="py-science-pack-1",type="item"}},time=1200}}) fix_tech("arqad-upgrade",{order="000045",prerequisites={"arqad"},unit={count=5000,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("arthurian-upgrade",{order="000087",prerequisites={"arthurian-mk02"},unit={count=5000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"}},time=300}}) fix_tech("atomizer-upgrade",{order="000102",prerequisites={"molecular-decohesion-mk04","biotech-machines-mk04"},unit={count=2000,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=60,name="py-science-pack-1",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=1,name="utility-science-pack",type="item"}},time=600}}) diff --git a/changelog.txt b/changelog.txt index b183c978..60614b7f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,9 @@ --------------------------------------------------------------------------------------------------- Version: 1.2.40 -Date: ??? +Date: 2024-7-29 Bugfixes: - Fixed stutter on clicking electric poles + - Added mining productivity 4-12 and shifted current mining prod techs to be earlier in the tech tree locked behind mining machines tech --------------------------------------------------------------------------------------------------- Version: 1.2.39 Date: 2024-7-13 diff --git a/prototypes/updates/base-updates.lua b/prototypes/updates/base-updates.lua index 4c54f489..a1a85945 100644 --- a/prototypes/updates/base-updates.lua +++ b/prototypes/updates/base-updates.lua @@ -1,6 +1,352 @@ local sounds = require("__base__/prototypes/entity/sounds") -- TECH CHANGES + +TECHNOLOGY{ + type = "technology", + name = "mining-productivity-1", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk01"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"py-science-pack-1", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + +TECHNOLOGY{ + type = "technology", + name = "mining-productivity-2", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"mining-productivity-1"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"py-science-pack-1", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-3", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk02", "mining-productivity-2"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-4", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk02", "mining-productivity-3"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-5", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk03", "mining-productivity-4"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-6", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk03", "mining-productivity-5"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-7", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk04", "mining-productivity-6"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-8", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk04", "mining-productivity-7"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-9", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk05", "mining-productivity-8"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1}, + {"utility-science-pack", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-10", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"machines-mk05", "mining-productivity-9"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1}, + {"utility-science-pack", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-11", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"mining-productivity-10"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1}, + {"utility-science-pack", 1}, + {"space-science-pack", 1} + }, + time = 60 + }, + upgrade = true, + order = "c-k-f-e" + } + + TECHNOLOGY{ + type = "technology", + name = "mining-productivity-12", + icon_size = 256, icon_mipmaps = 4, + icons = util.technology_icon_constant_productivity("__base__/graphics/technology/mining-productivity.png"), + effects = + { + { + type = "mining-drill-productivity-bonus", + modifier = 0.1 + } + }, + prerequisites = {"mining-productivity-11"}, + unit = + { + count = 250, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1}, + {"utility-science-pack", 1}, + {"space-science-pack", 1} + }, + time = 60 + }, + max_level = "infinite", + upgrade = true, + order = "c-k-f-e" + } + data.raw.technology['uranium-processing'].enabled = true data.raw.technology['uranium-processing'].hidden = false diff --git a/todo.txt b/todo.txt index 57cead5e..c5c010f8 100644 --- a/todo.txt +++ b/todo.txt @@ -52,4 +52,10 @@ geothermal from spent bitumen seeps 12847 - nuke tech -12838 - deal with u238 and plutoium by making it into more uf6 \ No newline at end of file +12838 - deal with u238 and plutoium by making it into more uf6 + +18446 - sulfuric acid decompision to sulfur dioxide + +18501 - sulfuric acid + +fix simik boilers being super cheap and using way to many buildings \ No newline at end of file From 6d43fa4c905d9ba1953ed3bf9a489b0832564a69 Mon Sep 17 00:00:00 2001 From: Alex ten Brink Date: Thu, 1 Aug 2024 21:51:52 +0200 Subject: [PATCH 11/27] Fix GitHub workflow files --- .github/workflows/factoriotest-pr.yml | 3 ++- .github/workflows/factoriotest-push.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/factoriotest-pr.yml b/.github/workflows/factoriotest-pr.yml index 9ad14dab..1c2899fa 100644 --- a/.github/workflows/factoriotest-pr.yml +++ b/.github/workflows/factoriotest-pr.yml @@ -12,8 +12,9 @@ permissions: jobs: test-pull-request: name: PR - uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1 + uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1.5.0 with: repository: ${{ github.repository }} ref: ${{ github.event.pull_request.head.sha }} + test_branch: ${{ github.head_ref || github.ref_name }} secrets: inherit diff --git a/.github/workflows/factoriotest-push.yml b/.github/workflows/factoriotest-push.yml index 340aca05..5aacaf89 100644 --- a/.github/workflows/factoriotest-push.yml +++ b/.github/workflows/factoriotest-push.yml @@ -12,8 +12,9 @@ permissions: jobs: test-push: name: Push - uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1 + uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1.5.0 with: repository: ${{ github.repository }} ref: ${{ github.sha }} + test_branch: ${{ github.head_ref || github.ref_name }} secrets: inherit From 9ff0757b9a9c1c800a6dc3db02e793cc76d9b341 Mon Sep 17 00:00:00 2001 From: Alex ten Brink Date: Fri, 2 Aug 2024 21:47:45 +0200 Subject: [PATCH 12/27] Nuclear fuel now correctly burns to spent nuclear fuel --- changelog.txt | 5 +++++ prototypes/updates/pyrawores-updates.lua | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changelog.txt b/changelog.txt index 60614b7f..fc31f30a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.41 +Date: ? + Bugfixes: + - Nuclear fuel now correctly burns to spent nuclear fuel +--------------------------------------------------------------------------------------------------- Version: 1.2.40 Date: 2024-7-29 Bugfixes: diff --git a/prototypes/updates/pyrawores-updates.lua b/prototypes/updates/pyrawores-updates.lua index 178a451e..38292b38 100644 --- a/prototypes/updates/pyrawores-updates.lua +++ b/prototypes/updates/pyrawores-updates.lua @@ -167,8 +167,6 @@ RECIPE("fuelrod-mk04"):replace_ingredient('70-u-powder', 'cm-250'):add_unlock('n RECIPE("fuelrod-mk05"):replace_ingredient('yellow-cake', 'po-210'):add_unlock('nuclear-power-mk02') RECIPE("nuclear-fuel"):remove_unlock('uranium-mk04'):add_unlock('nuclear-power-mk02') -data.raw.item["nuclear-fuel"].burnt_result = "used-nuclear-fuel" - ITEM{ type = "item", name = "nuclear-fuel", @@ -201,7 +199,8 @@ ITEM{ -- fuel_glow_color = {r = 0.1, g = 1, b = 0.1}, subgroup = "intermediate-product", order = "q[uranium-rocket-fuel]", - stack_size = 1 + stack_size = 1, + burnt_result = "used-nuclear-fuel" } ITEM{ From 1766ca83486af4d29ee5a77841819ca9b66c6367 Mon Sep 17 00:00:00 2001 From: Alex ten Brink Date: Sat, 3 Aug 2024 10:39:28 +0200 Subject: [PATCH 13/27] Update caches --- ...+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua b/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua index eac157d7..ea9a1c7d 100644 --- a/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua +++ b/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua @@ -699,7 +699,7 @@ fix_tech("guar-mk04",{order="000093",prerequisites={"guar-mk03","py-science-pack fix_tech("moss-mk01",{order="000007",prerequisites={"botany-mk01","soil-washing"},unit={count=33,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}}) fix_tech("moss-mk02",{order="000064",prerequisites={"organ-printing"},unit={count=1400,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}}) fix_tech("moss-mk03",{order="000071",prerequisites={"moss-mk02","phytomining-mk02"},unit={count=1300,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=6,name="py-science-pack-1",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=1,name="chemical-science-pack",type="item"}},time=120}}) -fix_tech("moss-mk04",{order="000094",prerequisites={"botany-mk03","moss-mk03","organ-printing-mk03"},unit={count=2750,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) +fix_tech("moss-mk04",{order="000094",prerequisites={"botany-mk03","moss-mk03","organ-printing-mk03"},unit={count=1200,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=30,name="py-science-pack-1",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"},{amount=10,name="military-science-pack",type="item"}},time=450}}) fix_tech("wood-processing-4",{order="000087",prerequisites={"botany-mk03","wood-processing-3"},unit={count=1300,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("cottongut-science-mk01",{order="000035",prerequisites={"nonrenewable-mk01","cottongut-mk01"},unit={count=300,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) fix_tech("cottongut-science-mk02",{order="000055",prerequisites={"genetics-mk03"},unit={count=1200,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"},{amount=1,name="logistic-science-pack",type="item"}},time=60}}) @@ -813,7 +813,7 @@ fix_tech("coalplant-mk02",{order="000070",prerequisites={"nonrenewable-mk02","co fix_tech("coalplant-mk03",{order="000084",prerequisites={"nonrenewable-mk03","coalplant-mk02","low-density-structure"},unit={count=2250,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("coalplant-mk04",{order="000095",prerequisites={"nonrenewable-mk04","coalplant-mk03"},unit={count=1400,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=30,name="py-science-pack-1",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"}},time=450}}) fix_tech("oilplant-mk01",{order="000035",prerequisites={"nonrenewable-mk01"},unit={count=300,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}}) -fix_tech("oilplant-mk02",{order="000071",prerequisites={"nonrenewable-mk02","oilplant-mk01","moondrop-mk03","coalplant-mk01"},unit={count=3000,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) +fix_tech("oilplant-mk02",{order="000071",prerequisites={"nonrenewable-mk02","oilplant-mk01","moondrop-mk03","coalplant-mk01","light-oil-mk03"},unit={count=3000,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"},{amount=3,name="py-science-pack-1",type="item"}},time=90}}) fix_tech("oilplant-mk03",{order="000084",prerequisites={"nonrenewable-mk03","oilplant-mk02","low-density-structure"},unit={count=2250,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) fix_tech("oilplant-mk04",{order="000095",prerequisites={"nonrenewable-mk04","oilplant-mk03"},unit={count=1400,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=30,name="py-science-pack-1",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=10,name="py-science-pack-2",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=3,name="py-science-pack-3",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"}},time=450}}) fix_tech("gasplant-mk01",{order="000044",prerequisites={"petroleum-gas-mk01"},unit={count=360,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) @@ -837,7 +837,7 @@ fix_tech("battery-mk03",{order="000078",prerequisites={"kmauts","lithium-niobate fix_tech("battery-mk04",{order="000090",prerequisites={"parametric-oscilator","fusion-mk01","supercapacitor","earnshaw-theorem"},unit={count=1750,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"}},time=300}}) fix_tech("photonics",{order="000091",prerequisites={"solar-mk02","battery-mk04"},unit={count=2000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"}},time=300}}) fix_tech("microwave-receiver",{order="000086",prerequisites={"solar-mk02","machine-components-mk03"},unit={count=1200,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) -fix_tech("nuclear-power-mk02",{order="000084",prerequisites={"uranium-mk02","nonrenewable-mk02","machine-components-mk03"},unit={count=1000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) +fix_tech("nuclear-power-mk02",{order="000084",prerequisites={"uranium-mk02","nonrenewable-mk02","machine-components-mk03","py-burner"},unit={count=1000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}}) fix_tech("nuclear-power-mk03",{order="000098",prerequisites={"uranium-mk03","nonrenewable-mk03","nuclear-power-mk02"},unit={count=800,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=60,name="py-science-pack-1",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"}},time=600}}) fix_tech("nuclear-power-mk04",{order="000102",prerequisites={"uranium-mk04","nonrenewable-mk04","wind-mk04"},unit={count=550,ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=100,name="py-science-pack-1",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=30,name="py-science-pack-2",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"},{amount=3,name="py-science-pack-4",type="item"},{amount=10,name="py-science-pack-3",type="item"}},time=1200}}) fix_tech("carbon-fiber",{order="000078",prerequisites={"ammonium-oxalate"},unit={count=1200,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=10,name="py-science-pack-1",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}}) From 0fce05b3b711816612c9c3d6620c1b23a5ad15f7 Mon Sep 17 00:00:00 2001 From: oorzkws <65210810+oorzkws@users.noreply.github.com> Date: Tue, 6 Aug 2024 15:27:28 -0600 Subject: [PATCH 14/27] the issue was a parent I am once again griefing Vraleth --- changelog.txt | 1 + scripts/thermosolar/solar-updraft-tower.lua | 2 ++ 2 files changed, 3 insertions(+) diff --git a/changelog.txt b/changelog.txt index fc31f30a..ae45c0f7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Version: 1.2.41 Date: ? Bugfixes: - Nuclear fuel now correctly burns to spent nuclear fuel + - Fix tiles being attributed to the wrong solar updraft tower --------------------------------------------------------------------------------------------------- Version: 1.2.40 Date: 2024-7-29 diff --git a/scripts/thermosolar/solar-updraft-tower.lua b/scripts/thermosolar/solar-updraft-tower.lua index de08b91e..7044d290 100644 --- a/scripts/thermosolar/solar-updraft-tower.lua +++ b/scripts/thermosolar/solar-updraft-tower.lua @@ -27,6 +27,8 @@ local function update_parent_tower(position, cover_count) -- Check our last-used tower if parent and is_in_radius(parent.position, position, Thermosolar.tower_range) then goto continue + else + parent = nil end for unit_id, tower_data in pairs(global.solar_updraft_towers) do if is_in_radius(tower_data.entity.position, position, Thermosolar.tower_range) then From 76807e33e968d8d750653507fee2f8398ea1dd21 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Thu, 8 Aug 2024 00:21:02 -0400 Subject: [PATCH 15/27] fix that mining prod infinite research wasnt correctly increasing in cost --- ...tech+pyindustry+pypetroleumhandling+pyrawores.lua | 2 +- prototypes/updates/base-updates.lua | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua b/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua index ea9a1c7d..aa2abfea 100644 --- a/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua +++ b/cached-configs/pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua @@ -882,7 +882,7 @@ fix_tech("mining-productivity-8",{order="000092",prerequisites={"mining-producti fix_tech("mining-productivity-9",{order="000102",prerequisites={"machines-mk05","mining-productivity-8"},unit={count=1300,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) fix_tech("mining-productivity-10",{order="000103",prerequisites={"mining-productivity-9"},unit={count=1400,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}}) fix_tech("mining-productivity-11",{order="000104",prerequisites={"mining-productivity-10"},unit={count=700,ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=3,name="py-science-pack-4",type="item"},{amount=10,name="py-science-pack-3",type="item"},{amount=30,name="py-science-pack-2",type="item"},{amount=100,name="py-science-pack-1",type="item"}},time=1200}}) -fix_tech("mining-productivity-12",{order="000105",prerequisites={"mining-productivity-11"},unit={count=750,ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=3,name="py-science-pack-4",type="item"},{amount=10,name="py-science-pack-3",type="item"},{amount=30,name="py-science-pack-2",type="item"},{amount=100,name="py-science-pack-1",type="item"}},time=1200}}) +fix_tech("mining-productivity-12",{order="000105",prerequisites={"mining-productivity-11"},unit={ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=3,name="py-science-pack-4",type="item"},{amount=10,name="py-science-pack-3",type="item"},{amount=30,name="py-science-pack-2",type="item"},{amount=100,name="py-science-pack-1",type="item"}},time=1200}}) fix_tech("arqad-upgrade",{order="000045",prerequisites={"arqad"},unit={count=5000,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-1",type="item"}},time=60}}) fix_tech("arthurian-upgrade",{order="000087",prerequisites={"arthurian-mk02"},unit={count=5000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"}},time=300}}) fix_tech("atomizer-upgrade",{order="000102",prerequisites={"molecular-decohesion-mk04","biotech-machines-mk04"},unit={count=2000,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=60,name="py-science-pack-1",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=1,name="utility-science-pack",type="item"}},time=600}}) diff --git a/prototypes/updates/base-updates.lua b/prototypes/updates/base-updates.lua index a1a85945..d1b46100 100644 --- a/prototypes/updates/base-updates.lua +++ b/prototypes/updates/base-updates.lua @@ -330,19 +330,19 @@ TECHNOLOGY{ prerequisites = {"mining-productivity-11"}, unit = { - count = 250, + count_formula = "100*(L*1.2)", ingredients = { {"automation-science-pack", 1}, {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"production-science-pack", 1}, - {"utility-science-pack", 1}, - {"space-science-pack", 1} + {"chemical-science-pack", 1}, + {"production-science-pack", 1}, + {"utility-science-pack", 1}, + {"space-science-pack", 1} }, time = 60 }, - max_level = "infinite", + max_level = "infinite", upgrade = true, order = "c-k-f-e" } From 2f2de1a38f160c1cb3326b60ffc3711fba0b42d5 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Thu, 8 Aug 2024 00:23:21 -0400 Subject: [PATCH 16/27] version and changelog --- changelog.txt | 3 ++- info.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index ae45c0f7..d840b292 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,9 +1,10 @@ --------------------------------------------------------------------------------------------------- Version: 1.2.41 -Date: ? +Date: 20-8-8 Bugfixes: - Nuclear fuel now correctly burns to spent nuclear fuel - Fix tiles being attributed to the wrong solar updraft tower + - Fix that minging productivity infinite research didnt correctly increase in costs per level --------------------------------------------------------------------------------------------------- Version: 1.2.40 Date: 2024-7-29 diff --git a/info.json b/info.json index 650d53ac..93c92260 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalternativeenergy", - "version": "1.2.40", + "version": "1.2.41", "factorio_version": "1.1", "title": "Pyanodons Alternative Energy", "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo", From bf318a092ce963ee361c46ad955ecfa64f6064fd Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Thu, 22 Aug 2024 03:25:54 -0400 Subject: [PATCH 17/27] yo momma so fat she underwent stellar fusion --- changelog.txt | 9 +- data.lua | 2 + prototypes/fluids/enriched-water.lua | 16 +++ prototypes/fluids/hydrogen-sulfide.lua | 32 ++++++ prototypes/updates/pyfusionenergy-updates.lua | 97 +++++++++++++++++-- todo.txt | 6 +- 6 files changed, 151 insertions(+), 11 deletions(-) create mode 100644 prototypes/fluids/enriched-water.lua create mode 100644 prototypes/fluids/hydrogen-sulfide.lua diff --git a/changelog.txt b/changelog.txt index d840b292..c00193b7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,13 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.42 +Date: 2024-??-?? + Fusion: + - Changed fusion reactor building recipes and fusion reaction recipes + - reaction recipes no longer contain building parts + - changed deuterium production process to make it longer and stronger +--------------------------------------------------------------------------------------------------- Version: 1.2.41 -Date: 20-8-8 +Date: 2024-8-8 Bugfixes: - Nuclear fuel now correctly burns to spent nuclear fuel - Fix tiles being attributed to the wrong solar updraft tower diff --git a/data.lua b/data.lua index 84cc8938..679f4675 100644 --- a/data.lua +++ b/data.lua @@ -156,6 +156,8 @@ require('prototypes.fluids.antimony-phosphate') require('prototypes.fluids.hydrofluoric-acid') require('prototypes.fluids.molten-fluoride') require('prototypes.fluids.fluorine-gas') +require('prototypes.fluids.hydrogen-sulfide') +require('prototypes.fluids.enriched-water') -- )) diff --git a/prototypes/fluids/enriched-water.lua b/prototypes/fluids/enriched-water.lua new file mode 100644 index 00000000..757e254a --- /dev/null +++ b/prototypes/fluids/enriched-water.lua @@ -0,0 +1,16 @@ + +FLUID { + type = "fluid", + name = "enriched-water", + icon = "__pyfusionenergygraphics__/graphics/icons/heavy-water.png", + icon_size = 32, + default_temperature = 10, + base_color = {r = 0.423, g = 0.678, b = 0.823}, + flow_color = {r = 1, g = 1, b = 1}, + max_temperature = 100, + gas_temperature = 15, + pressure_to_speed_ratio = 0.4, + flow_to_energy_ratio = 0.59, + subgroup = "py-fusion-fluids", + order = "c" +} diff --git a/prototypes/fluids/hydrogen-sulfide.lua b/prototypes/fluids/hydrogen-sulfide.lua new file mode 100644 index 00000000..e43c98ce --- /dev/null +++ b/prototypes/fluids/hydrogen-sulfide.lua @@ -0,0 +1,32 @@ + +FLUID { + type = "fluid", + name = "hydrogen-sulfide", + icon = "__pyalternativeenergygraphics__/graphics/icons/hydrogen-sulfide.png", + icon_size = 64, + default_temperature = 10, -- less than 15 = liquid / equal a 15 = gas + base_color = {r = 0.431, g = 0.556, b = 0.627}, + flow_color = {r = 1, g = 1, b = 1}, + max_temperature = 100, + gas_temperature = 15, + pressure_to_speed_ratio = 0.4, + flow_to_energy_ratio = 0.59, + subgroup = "py-alternativeenergy-fluids", + order = "c" +} + +FLUID { + type = "fluid", + name = "deuterium-sulfide", + icon = "__pyalternativeenergygraphics__/graphics/icons/deuterium-sulfide.png", + icon_size = 64, + default_temperature = 10, -- less than 15 = liquid / equal a 15 = gas + base_color = {r = 0.431, g = 0.556, b = 0.627}, + flow_color = {r = 1, g = 1, b = 1}, + max_temperature = 100, + gas_temperature = 15, + pressure_to_speed_ratio = 0.4, + flow_to_energy_ratio = 0.59, + subgroup = "py-alternativeenergy-fluids", + order = "c" +} diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index 04dcf111..470ca6b3 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -140,22 +140,101 @@ RECIPE { }, } +RECIPE("d2o-distilation"):remove_unlock("fusion-mk01"):set_fields{hidden = true} +RECIPE("heavy-water"):remove_unlock("fusion-mk01"):set_fields{hidden = true} + + +data.raw["assembling-machine"]["fusion-reactor-mk02"].crafting_categories = {"fusion-01", "fusion-02"} +--Girdler sulfide process + --TODO: replace heavy wetter production with new process. hot water and hydrogen sulfide (hydrogen with sulfur: h2s) go in one side to make fat acid gas and fat acid gas will combine with cold water to make enriched water. enriched water with get vacuum distilled into water and heavy water. heavy water can be run though a electrolysiser to seperate deuterium and oxygen +--water + phosphorus pentasulfide = hydrogen sulfide + phosphoric acid +--P4S10 + 16 H2O → 4 H3PO4 + 10 H2S + RECIPE { type = "recipe", - name = "heavy-water", - category = "centrifuging", + name = "hydrogen-sulfide", + category = "chemistry", enabled = false, energy_required = 60, ingredients = { - {type = "item", name = "sulfur", amount = 20}, - {type = "fluid", name = "pressured-water", amount = 4000} + {type = "item", name = "p2s5", amount = 20}, + {type = "fluid", name = "water", amount = 160} }, results = { - {type = "fluid", name = "heavy-water", amount = 40} - } -} + {type = "fluid", name = "phosphoric-acid", amount = 80}, + {type = "fluid", name = "hydrogen-sulfide", amount = 200} + }, + main_product = "hydrogen-sulfide" +}:add_unlock("fusion-mk01") + +RECIPE { + type = "recipe", + name = "deuterium-sulfide", + category = "gas-separator", + enabled = false, + energy_required = 60, + ingredients = { + {type = "fluid", name = "water", amount = 500, minimum_temperature = 150}, + {type = "fluid", name = "hydrogen-sulfide", amount = 400} + }, + results = { + {type = "fluid", name = "water", amount = 480, temperature = 125}, + {type = "fluid", name = "deuterium-sulfide", amount = 400} + }, + main_product = "deuterium-sulfide" +}:add_unlock("fusion-mk01") + +RECIPE { + type = "recipe", + name = "enriched-water", + category = "compressor", + enabled = false, + energy_required = 60, + ingredients = { + {type = "fluid", name = "deuterium-sulfide", amount = 200}, + {type = "fluid", name = "water", amount = 1000, maximum_temperature = 101} + }, + results = { + {type = "fluid", name = "enriched-water", amount = 1000}, + {type = "fluid", name = "hydrogen-sulfide", amount = 200}, + }, + main_product = "enriched-water" +}:add_unlock("fusion-mk01") + +RECIPE { + type = "recipe", + name = "enriched-water-distillation", + category = "distilator", + enabled = false, + energy_required = 60, + ingredients = { + {type = "fluid", name = "vacuum", amount = 400}, + {type = "fluid", name = "enriched-water", amount = 200} + }, + results = { + {type = "fluid", name = "water", amount = 175, temperature = 125}, + {type = "fluid", name = "heavy-water", amount = 25}, + }, + main_product = "heavy-water" +}:add_unlock("fusion-mk01") + +RECIPE { + type = "recipe", + name = "deuterium", + category = "electrolyzer", + enabled = false, + energy_required = 60, + ingredients = { + {type = "fluid", name = "heavy-water", amount = 300}, + }, + results = { + {type = "fluid", name = "deuterium", amount = 200}, + {type = "fluid", name = "oxygen", amount = 100} + }, + main_product = "deuterium" +}:add_unlock("fusion-mk01") RECIPE { type = "recipe", @@ -169,7 +248,7 @@ RECIPE { {type = "fluid", name = "liquid-helium", amount = 30}, }, results = { - {type = "fluid", name = "critical-steam", amount = 20000, temperature = 5000}, + {type = "fluid", name = "critical-steam", amount = 10000, temperature = 5000}, {type = "fluid", name = "helium", amount = 150}, {type = "fluid", name = "tritium", amount = 20}, {type = "fluid", name = "helium3", amount = 30}, @@ -195,7 +274,7 @@ RECIPE { {type = "fluid", name = "water", amount = 3000} }, results = { - {type = "fluid", name = "neutron", amount = 1000, temperature = 2000}, + {type = "fluid", name = "neutron", amount = 3000, temperature = 2000}, {type = "fluid", name = "helium", amount = 200}, {type = "fluid", name = "tritium", amount = 5}, {type = "fluid", name = "steam", amount = 3000, temperature = 500}, diff --git a/todo.txt b/todo.txt index c5c010f8..ca7858b3 100644 --- a/todo.txt +++ b/todo.txt @@ -58,4 +58,8 @@ geothermal from spent bitumen seeps 18501 - sulfuric acid -fix simik boilers being super cheap and using way to many buildings \ No newline at end of file +fix simik boilers being super cheap and using way to many buildings + +6776 - ethanol + +Claus process - reducing hydrogen sulfide to sulfur \ No newline at end of file From ca4c8558f153a14cf1f0312b264244b98f619552 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Fri, 23 Aug 2024 04:43:20 -0400 Subject: [PATCH 18/27] adjustments to fusion mk2 - mk4 --- .../recipes/recipes-nuclear-uranium.lua | 2 +- prototypes/updates/pyfusionenergy-updates.lua | 84 +++++++++++-------- 2 files changed, 51 insertions(+), 35 deletions(-) diff --git a/prototypes/recipes/recipes-nuclear-uranium.lua b/prototypes/recipes/recipes-nuclear-uranium.lua index 61050a9b..5781e8b3 100644 --- a/prototypes/recipes/recipes-nuclear-uranium.lua +++ b/prototypes/recipes/recipes-nuclear-uranium.lua @@ -130,7 +130,7 @@ RECIPE { {type = 'fluid', name = 'hot-molten-salt', amount = 50}, }, results = { - {type = 'fluid', name = 'tritium', amount = 100}, + {type = 'fluid', name = 'tritium', amount = 5}, {type = 'item', name = 'control-rod', amount = 1, probability = 0.5}, {type = 'fluid', name = 'molten-salt', amount = 50}, }, diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index 470ca6b3..f2979ed4 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -145,6 +145,25 @@ RECIPE("heavy-water"):remove_unlock("fusion-mk01"):set_fields{hidden = true} data.raw["assembling-machine"]["fusion-reactor-mk02"].crafting_categories = {"fusion-01", "fusion-02"} + +RECIPE { + type = "recipe", + name = "liquid-helium", + category = "compressor", + enabled = false, + energy_required = 5, + ingredients = { + {type = "fluid", name = "helium", amount = 100}, + {type = "fluid", name = "water", amount = 600}, + {type = "fluid", name = "gasoline", amount = 5} + }, + results = { + {type = "fluid", name = "liquid-helium", amount = 10}, + {type = "fluid", name = "steam", amount = 600, temperature = 150} + }, + main_product = "liquid-helium", +} + --Girdler sulfide process --TODO: replace heavy wetter production with new process. hot water and hydrogen sulfide (hydrogen with sulfur: h2s) go in one side to make fat acid gas and fat acid gas will combine with cold water to make enriched water. enriched water with get vacuum distilled into water and heavy water. heavy water can be run though a electrolysiser to seperate deuterium and oxygen @@ -208,7 +227,7 @@ RECIPE { name = "enriched-water-distillation", category = "distilator", enabled = false, - energy_required = 60, + energy_required = 15, ingredients = { {type = "fluid", name = "vacuum", amount = 400}, {type = "fluid", name = "enriched-water", amount = 200} @@ -238,54 +257,55 @@ RECIPE { RECIPE { type = "recipe", - name = "deuterium-fusion", + name = "dt-fusion", category = "fusion-01", enabled = false, energy_required = 40, ingredients = { - {type = "fluid", name = "deuterium", amount = 100}, - {type = "fluid", name = "pressured-water", amount = 10000}, - {type = "fluid", name = "liquid-helium", amount = 30}, + {type = "item", name = "lithium", amount = 2}, + {type = "fluid", name = "deuterium", amount = 50}, + {type = "fluid", name = "tritium", amount = 50}, + {type = "fluid", name = "liquid-nitrogen", amount = 30}, + {type = "fluid", name = "water", amount = 10000} }, results = { {type = "fluid", name = "critical-steam", amount = 10000, temperature = 5000}, - {type = "fluid", name = "helium", amount = 150}, - {type = "fluid", name = "tritium", amount = 20}, - {type = "fluid", name = "helium3", amount = 30}, + {type = "fluid", name = "helium", amount = 100}, + {type = "fluid", name = "tritium", amount = 60.1}, + {type = "fluid", name = "nitrogen", amount = 250}, }, --main_product= "blanket", - icon = "__pyfusionenergygraphics__/graphics/icons/fusion-deuterium.png", + icon = "__pyfusionenergygraphics__/graphics/icons/fusion-dt.png", icon_size = 32, subgroup = "py-fusion-items", order = "e", show_details_in_recipe_tooltip = false -} +}:remove_unlock("fusion-mk02"):add_unlock("fusion-mk01") RECIPE { type = "recipe", - name = "dt-fusion", + name = "deuterium-fusion", category = "fusion-01", enabled = false, energy_required = 40, ingredients = { - {type = "fluid", name = "deuterium", amount = 80}, - {type = "fluid", name = "tritium", amount = 20}, + {type = "fluid", name = "deuterium", amount = 100}, + {type = "fluid", name = "pressured-water", amount = 10000}, {type = "fluid", name = "liquid-helium", amount = 30}, - {type = "fluid", name = "water", amount = 3000} }, results = { - {type = "fluid", name = "neutron", amount = 3000, temperature = 2000}, - {type = "fluid", name = "helium", amount = 200}, - {type = "fluid", name = "tritium", amount = 5}, - {type = "fluid", name = "steam", amount = 3000, temperature = 500}, + {type = "fluid", name = "neutron", amount = 5000, temperature = 2000}, + {type = "fluid", name = "helium", amount = 150}, + {type = "fluid", name = "tritium", amount = 50}, + {type = "fluid", name = "helium3", amount = 50}, }, --main_product= "blanket", - icon = "__pyfusionenergygraphics__/graphics/icons/fusion-dt.png", + icon = "__pyfusionenergygraphics__/graphics/icons/fusion-deuterium.png", icon_size = 32, subgroup = "py-fusion-items", order = "e", show_details_in_recipe_tooltip = false -} +}:remove_unlock("fusion-mk01"):add_unlock("fusion-mk02") RECIPE { type = "recipe", @@ -294,16 +314,14 @@ RECIPE { enabled = false, energy_required = 40, ingredients = { - {type = "fluid", name = "deuterium", amount = 200}, - {type = "fluid", name = "helium3", amount = 90}, - {type = "fluid", name = "liquid-helium", amount = 35}, - {type = "fluid", name = "water", amount = 5000} + {type = "fluid", name = "deuterium", amount = 50}, + {type = "fluid", name = "helium3", amount = 50}, + {type = "fluid", name = "liquid-helium", amount = 35} }, results = { - {type = "fluid", name = "neutron", amount = 1000, temperature = 3000}, + {type = "fluid", name = "neutron", amount = 7500, temperature = 3000}, {type = "fluid", name = "helium", amount = 175}, - {type = "fluid", name = "proton", amount = 15}, - {type = "fluid", name = "steam", amount = 5000, temperature = 500}, + {type = "fluid", name = "proton", amount = 20}, }, --main_product= "blanket", icon = "__pyfusionenergygraphics__/graphics/icons/fusion-he3.png", @@ -320,15 +338,13 @@ RECIPE { enabled = false, energy_required = 40, ingredients = { - {type = "fluid", name = "proton", amount = 15}, - {type = "item", name = "boron", amount = 15}, - {type = "fluid", name = "liquid-helium", amount = 100}, - {type = "fluid", name = "water", amount = 5000} + {type = "fluid", name = "proton", amount = 20}, + {type = "item", name = "boron", amount = 20}, + {type = "fluid", name = "liquid-helium", amount = 10} }, results = { - {type = "fluid", name = "neutron", amount = 1000, temperature = 4000}, - {type = "fluid", name = "helium", amount = 500}, - {type = "fluid", name = "steam", amount = 5000, temperature = 150}, + {type = "fluid", name = "neutron", amount = 10000, temperature = 4000}, + {type = "fluid", name = "helium", amount = 160} }, --main_product= "blanket", icon = "__pyfusionenergygraphics__/graphics/icons/fusion-bh.png", From e5f1311d5c0db5f9ced33398ead3a2f12d61aab4 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Fri, 23 Aug 2024 05:50:58 -0400 Subject: [PATCH 19/27] tweak the mdh --- prototypes/buildings/mdh.lua | 4 ++-- prototypes/updates/pyfusionenergy-updates.lua | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/prototypes/buildings/mdh.lua b/prototypes/buildings/mdh.lua index df352d62..65df4f59 100644 --- a/prototypes/buildings/mdh.lua +++ b/prototypes/buildings/mdh.lua @@ -41,8 +41,8 @@ ENTITY { max_health = 300, corpse = "big-remnants", effectivity = 1, - fluid_usage_per_tick = 50, - maximum_temperature = 5000, + fluid_usage_per_tick = 400, + maximum_temperature = 4000, destroy_non_fuel_fluid = false, resistances = { { diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index f2979ed4..37c6ceb4 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -354,6 +354,9 @@ RECIPE { show_details_in_recipe_tooltip = false } +RECIPE("antimatter-fusion"):remove_unlock("fusion-mk04") + +--[[ removed for total rebuild in pysex RECIPE { type = 'recipe', name = 'antimatter-fusion', @@ -377,6 +380,7 @@ RECIPE { order = 'e', show_details_in_recipe_tooltip = false } +]]-- --pyFE-- data.raw['assembling-machine']['agitator-mk01'].energy_usage = "1MW" From 70ad537a61846e0dcc9f445581289e5763293ff1 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Sat, 24 Aug 2024 03:53:10 -0400 Subject: [PATCH 20/27] locale keys and added enriched water icon --- changelog.txt | 3 ++- locale/en/fluid.cfg | 5 +++++ prototypes/fluids/enriched-water.lua | 4 ++-- prototypes/updates/pyfusionenergy-updates.lua | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index c00193b7..29fae71f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,7 +4,8 @@ Date: 2024-??-?? Fusion: - Changed fusion reactor building recipes and fusion reaction recipes - reaction recipes no longer contain building parts - - changed deuterium production process to make it longer and stronger + - changed deuterium production process to make it longer and stronger + - added hydrogen sulfide, deuterium sulfide and enriched water fluids --------------------------------------------------------------------------------------------------- Version: 1.2.41 Date: 2024-8-8 diff --git a/locale/en/fluid.cfg b/locale/en/fluid.cfg index 91a13993..ef77ec8f 100644 --- a/locale/en/fluid.cfg +++ b/locale/en/fluid.cfg @@ -109,3 +109,8 @@ sb-phosphate-2=Antimony phosphate 2 sb-phosphate-3=Antimony phosphate 3 void=Void + +enriched-water=Enriched water +deuterium-sulfide=Deuterium sulfide +hydrogen-sulfide=Hydrogen sulfide + diff --git a/prototypes/fluids/enriched-water.lua b/prototypes/fluids/enriched-water.lua index 757e254a..3efdc8ca 100644 --- a/prototypes/fluids/enriched-water.lua +++ b/prototypes/fluids/enriched-water.lua @@ -2,10 +2,10 @@ FLUID { type = "fluid", name = "enriched-water", - icon = "__pyfusionenergygraphics__/graphics/icons/heavy-water.png", + icon = "__pyalternativeenergygraphics__/graphics/icons/enriched-water.png", icon_size = 32, default_temperature = 10, - base_color = {r = 0.423, g = 0.678, b = 0.823}, + base_color = {r = 255, g = 69, b = 0}, flow_color = {r = 1, g = 1, b = 1}, max_temperature = 100, gas_temperature = 15, diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index 37c6ceb4..028f6522 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -217,7 +217,7 @@ RECIPE { }, results = { {type = "fluid", name = "enriched-water", amount = 1000}, - {type = "fluid", name = "hydrogen-sulfide", amount = 200}, + {type = "fluid", name = "hydrogen-sulfide", amount = 160}, }, main_product = "enriched-water" }:add_unlock("fusion-mk01") From a6fb605862340221f14dfb4a2c4245b0ff7beb66 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Mon, 26 Aug 2024 04:53:21 -0400 Subject: [PATCH 21/27] daylight savings time --- changelog.txt | 5 +++++ prototypes/recipes/recipes-intermetallics.lua | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 29fae71f..a8d87b07 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,7 +5,12 @@ Date: 2024-??-?? - Changed fusion reactor building recipes and fusion reaction recipes - reaction recipes no longer contain building parts - changed deuterium production process to make it longer and stronger + - removed antimatter fusion recipe as it didnt fit to reworked fusion reactor recipes. will return in pysex + - adjusted mdh generator consumption per tick from 50->400 and lowered max fluid temp to match the max output of the fusion reactors + - adjusted used control rod tritium output from 100 -> 5 + - changed liquid helium recipe crafting time from 10s to 5s, changed helium input from 20 -> 100 and changed the output from 2 -> 10 - added hydrogen sulfide, deuterium sulfide and enriched water fluids + - moved time crystal recipe from fusion reactor to particle accelerator --------------------------------------------------------------------------------------------------- Version: 1.2.41 Date: 2024-8-8 diff --git a/prototypes/recipes/recipes-intermetallics.lua b/prototypes/recipes/recipes-intermetallics.lua index 789c6779..edfb3531 100644 --- a/prototypes/recipes/recipes-intermetallics.lua +++ b/prototypes/recipes/recipes-intermetallics.lua @@ -458,9 +458,9 @@ RECIPE { RECIPE { type = "recipe", name = "time-crystal", - category = "fusion-01", + category = "pa", enabled = false, - energy_required = 20, + energy_required = 60, ingredients = { {type = "item", name = "diamond", amount = 5}, {type = "item", name = "parametric-oscilator", amount = 1}, -- nv-center From 0781e55f1a3b392b52546fafb0bf6b380dc96538 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Mon, 26 Aug 2024 04:53:51 -0400 Subject: [PATCH 22/27] version and changelog --- changelog.txt | 2 +- info.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index a8d87b07..b58d20b2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 1.2.42 -Date: 2024-??-?? +Date: 2024-8-26 Fusion: - Changed fusion reactor building recipes and fusion reaction recipes - reaction recipes no longer contain building parts diff --git a/info.json b/info.json index 93c92260..3c226cd6 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalternativeenergy", - "version": "1.2.41", + "version": "1.2.42", "factorio_version": "1.1", "title": "Pyanodons Alternative Energy", "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo", From d02df6b01c14fd6d1525fe44d5c74580f9d320ab Mon Sep 17 00:00:00 2001 From: Shadow_Man <56026280+Astorin@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:22:49 +0200 Subject: [PATCH 23/27] RU locale update for PyAE 1.2.42 (#59) --- locale/ru/fluid.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locale/ru/fluid.cfg b/locale/ru/fluid.cfg index d2235adc..d001540b 100644 --- a/locale/ru/fluid.cfg +++ b/locale/ru/fluid.cfg @@ -100,3 +100,6 @@ sb-phosphate-1=Фосфат сурьмы 1 sb-phosphate-2=Фосфат сурьмы 2 sb-phosphate-3=Фосфат сурьмы 3 void=Пустота +enriched-water=Обогащённая вода +deuterium-sulfide=Сульфид дейтерия +hydrogen-sulfide=Сероводород From 6924f8dbc9dab5be979eb07315ae4a6569b53a68 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Mon, 26 Aug 2024 23:22:06 -0400 Subject: [PATCH 24/27] @vraleth is very needy today --- prototypes/buildings/mdh.lua | 2 +- prototypes/updates/pyfusionenergy-updates.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prototypes/buildings/mdh.lua b/prototypes/buildings/mdh.lua index 65df4f59..f59c924c 100644 --- a/prototypes/buildings/mdh.lua +++ b/prototypes/buildings/mdh.lua @@ -75,7 +75,7 @@ ENTITY { }, energy_source = { type = "electric", - usage_priority = "primary-output", + usage_priority = "secondary-output", emissions_per_minute = 0.0, }, horizontal_animation = { diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index 028f6522..0576a25d 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -263,10 +263,10 @@ RECIPE { energy_required = 40, ingredients = { {type = "item", name = "lithium", amount = 2}, + {type = "fluid", name = "water", amount = 10000}, {type = "fluid", name = "deuterium", amount = 50}, {type = "fluid", name = "tritium", amount = 50}, - {type = "fluid", name = "liquid-nitrogen", amount = 30}, - {type = "fluid", name = "water", amount = 10000} + {type = "fluid", name = "liquid-nitrogen", amount = 30} }, results = { {type = "fluid", name = "critical-steam", amount = 10000, temperature = 5000}, From 70f2ad6dee2c217cbc0d191277bb75b83551a804 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Mon, 26 Aug 2024 23:22:25 -0400 Subject: [PATCH 25/27] version and changelog --- changelog.txt | 6 ++++++ info.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index b58d20b2..a19b77ba 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.43 +Date: 2024-8-26 + Fusion: + - moved mdh power output priority down from solar tier to normal + - changed the fluid inputs on deuterium tritium fusion to have 2 water ports instead of deuterium +--------------------------------------------------------------------------------------------------- Version: 1.2.42 Date: 2024-8-26 Fusion: diff --git a/info.json b/info.json index 3c226cd6..9bee60bd 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalternativeenergy", - "version": "1.2.42", + "version": "1.2.43", "factorio_version": "1.1", "title": "Pyanodons Alternative Energy", "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo", From 790f4fcab4a156368e5d95827bc50c52238fea92 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Wed, 4 Sep 2024 04:08:43 -0400 Subject: [PATCH 26/27] version and changelog --- changelog.txt | 5 +++++ info.json | 2 +- prototypes/updates/pycoalprocessing-updates.lua | 2 +- prototypes/updates/pyrawores-updates.lua | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index a19b77ba..fcb39ead 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.44 +Date: 2024-9-4 + Fission: + - Closed the uf6 temperature gap in processing recipes +--------------------------------------------------------------------------------------------------- Version: 1.2.43 Date: 2024-8-26 Fusion: diff --git a/info.json b/info.json index 9bee60bd..a1869514 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalternativeenergy", - "version": "1.2.43", + "version": "1.2.44", "factorio_version": "1.1", "title": "Pyanodons Alternative Energy", "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo", diff --git a/prototypes/updates/pycoalprocessing-updates.lua b/prototypes/updates/pycoalprocessing-updates.lua index 645ca329..9a7400ac 100644 --- a/prototypes/updates/pycoalprocessing-updates.lua +++ b/prototypes/updates/pycoalprocessing-updates.lua @@ -38,7 +38,7 @@ RECIPE("desulfurizator-unit"):add_ingredient({type = "item", name = "intermetall --RECIPE("evaporator"):add_ingredient({type = "item", name = "intermetallics", amount = 4}) RECIPE("fluid-separator"):add_ingredient({type = "item", name = "intermetallics", amount = 5}) RECIPE("fts-reactor"):add_ingredient({type = "item", name = "intermetallics", amount = 10}) ---RECIPE("gasifier"):add_ingredient({type = "item", name = "intermetallics", amount = 5}) +RECIPE("gasifier"):remove_unlock("tar-processing"):add_unlock("acetylene") RECIPE("methanol-reactor"):add_ingredient({type = "item", name = "intermetallics", amount = 4}) --RECIPE("olefin-plant"):add_ingredient({type = "item", name = "intermetallics", amount = 5}) --RECIPE("jaw-crusher"):add_ingredient({type = "item", name = "intermetallics", amount = 8}) diff --git a/prototypes/updates/pyrawores-updates.lua b/prototypes/updates/pyrawores-updates.lua index 38292b38..aada571e 100644 --- a/prototypes/updates/pyrawores-updates.lua +++ b/prototypes/updates/pyrawores-updates.lua @@ -454,7 +454,7 @@ while enrichment < 100 do enabled = false, energy_required = 1, ingredients = { - {type = "fluid", name = "uf6", amount = 400, minimum_temperature = math.floor(enrichment*100), maximum_temperature = math.floor(u235*100) - 1} + {type = "fluid", name = "uf6", amount = 400, minimum_temperature = math.floor(enrichment*100), maximum_temperature = math.floor(u235*100) - 0.000001} }, results = { {type = "fluid", name = "uf6", amount = 200, temperature = math.floor(u235*100)}, @@ -520,7 +520,7 @@ while duf > duf_min do enabled = false, energy_required = 1, ingredients = { - {type = "fluid", name = "uf6", amount = 400, minimum_temperature = math.floor(duf*100), maximum_temperature = math.floor(u235*100) - 1} + {type = "fluid", name = "uf6", amount = 400, minimum_temperature = math.floor(duf*100), maximum_temperature = math.floor(u235*100) - 0.000001} }, results = { {type = "fluid", name = "uf6", amount = 200, temperature = math.floor(u235*100)}, From dc70e3db480c29d3ee137c5f79f07f46afd485cc Mon Sep 17 00:00:00 2001 From: przemo1232 <79700515+przemo1232@users.noreply.github.com> Date: Sun, 8 Sep 2024 00:02:21 +0200 Subject: [PATCH 27/27] no more free water --- changelog.txt | 5 +++++ prototypes/recipes/recipes-eva.lua | 2 +- prototypes/updates/pyfusionenergy-updates.lua | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index fcb39ead..f7d595f5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.45 +Date: in 5 hours + Changes: + - fixed some recipes outputting more steam than input water when using productivity modules +--------------------------------------------------------------------------------------------------- Version: 1.2.44 Date: 2024-9-4 Fission: diff --git a/prototypes/recipes/recipes-eva.lua b/prototypes/recipes/recipes-eva.lua index 549e9c62..82a04e11 100644 --- a/prototypes/recipes/recipes-eva.lua +++ b/prototypes/recipes/recipes-eva.lua @@ -11,7 +11,7 @@ RECIPE { }, results = { {type = "fluid", name = "middle-processed-lard", amount = 20}, - {type = "fluid", name = "steam", amount = 500, temperature = 150}, + {type = "fluid", name = "steam", amount = 500, temperature = 150, catalyst_amount = 500}, {type = "fluid", name = "tar", amount = 50}, }, main_product = "middle-processed-lard", diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua index 0576a25d..739122b3 100644 --- a/prototypes/updates/pyfusionenergy-updates.lua +++ b/prototypes/updates/pyfusionenergy-updates.lua @@ -371,7 +371,7 @@ RECIPE { results = { {type = 'fluid', name = 'neutron', amount = 1000, temperature = 5000}, {type = 'fluid', name = 'helium', amount = 500}, - {type = 'fluid', name = 'steam', amount = 5000, temperature = 150} + {type = 'fluid', name = 'steam', amount = 5000, temperature = 150, catalyst_amount = 5000} }, --main_product= "blanket", icon = '__pyhightechgraphics__/graphics/icons/fusion-antimatter.png',