From b94f11af1dc52c8f01635bcc7722447a97e0b307 Mon Sep 17 00:00:00 2001 From: protocol_1903 Date: Mon, 25 Nov 2024 22:01:22 -0700 Subject: [PATCH] remove early auog tech --- ...industry+pypetroleumhandling+pyrawores.lua | 3 +-- changelog.txt | 2 ++ data.lua | 18 ------------------ graphics/{hr-basic-ddc.png => ddc-mk00.png} | Bin locale/en/locale.cfg | 1 - prototypes/buildings/cultivator.lua | 2 +- prototypes/buildings/ddc-mk00.lua | 4 ++-- prototypes/updates/pyalienlife-updates.lua | 15 --------------- 8 files changed, 6 insertions(+), 39 deletions(-) rename graphics/{hr-basic-ddc.png => ddc-mk00.png} (100%) diff --git a/cached-configs/PyBlock+pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua b/cached-configs/PyBlock+pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua index 981311c..178f404 100644 --- a/cached-configs/PyBlock+pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua +++ b/cached-configs/PyBlock+pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua @@ -394,7 +394,7 @@ fix_tech("drill-head-mk01",{order="000026",prerequisites={"chromium-mk01"},unit= fix_tech("drill-head-mk02",{order="000068",prerequisites={"drill-head-mk01","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("drill-head-mk03",{order="000083",prerequisites={"drill-head-mk02","super-alloy","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("aerogel",{order="000069",prerequisites={"epoxy","quartz-mk03"},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("auog",{order="000031",prerequisites={"ralesia","auog-mk00"},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("auog",{order="000031",prerequisites={"ralesia"},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("basic-electronics",{order="000064",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="000083",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="000007",prerequisites={"botany-mk01","optics"},unit={count=36,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}}) @@ -863,7 +863,6 @@ fix_tech("ammonium-oxalate",{order="000076",prerequisites={"py-science-pack-mk03 fix_tech("electric-energy-distribution-3",{order="000063",prerequisites={"electric-energy-distribution-2","stainless-steel-mk01"},unit={count=1400,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("electric-energy-distribution-4",{order="000070",prerequisites={"electric-energy-distribution-3","super-steel-mk01"},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=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"}},time=120}}) fix_tech("electric-energy-distribution-5",{order="000082",prerequisites={"electric-energy-distribution-4","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("auog-mk00",{order="000016",prerequisites={"biotech-machines-mk01","fluid-handling"},unit={count=100,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}}) fix_tech("kicalk-mk02",{order="000056",prerequisites={"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("kicalk-mk03",{order="000076",prerequisites={"kicalk-mk02","py-science-pack-mk03"},unit={count=1100,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("kicalk-mk04",{order="000092",prerequisites={"kicalk-mk03","py-science-pack-mk04","parametric-oscilator"},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}}) diff --git a/changelog.txt b/changelog.txt index f6d4e3d..0dc6761 100644 --- a/changelog.txt +++ b/changelog.txt @@ -11,6 +11,8 @@ Date: ???? - Increased logs collected from driftwood from 1 -> 4, but halved driftwood spawn chance - Moved Fawogae Mk01 closer to the beginning of the tech tree, since manure is no longer required - Moved fungal substrate from Yaedol Mk01 to Fawogae Mk01 + - Changed "Burner" and "Steampowered" machines to Mk00 + - Removed unneeded Auog technology, since Fawogae Mk01 doesn't use manure anymore --------------------------------------------------------------------------------------------------- Version: 3.1.0 Date: 2024-11-11 diff --git a/data.lua b/data.lua index 1b8d596..b9b8e7f 100644 --- a/data.lua +++ b/data.lua @@ -1,21 +1,3 @@ -TECHNOLOGY { - type = "technology", - name = "auog-mk00", - icon = "__pyalienlifegraphics__/graphics/technology/auog.png", - icon_size = 128, - order = "c-a", - prerequisites = {}, - effects = {}, - unit = { - count = 100, - ingredients = { - {"automation-science-pack", 1}, - }, - time = 50 - } -} - - TECHNOLOGY { type = "technology", name = "atomizer-mk00", diff --git a/graphics/hr-basic-ddc.png b/graphics/ddc-mk00.png similarity index 100% rename from graphics/hr-basic-ddc.png rename to graphics/ddc-mk00.png diff --git a/locale/en/locale.cfg b/locale/en/locale.cfg index f7ca5f8..1ea69fa 100644 --- a/locale/en/locale.cfg +++ b/locale/en/locale.cfg @@ -94,7 +94,6 @@ early-concrete=Basic Concrete alloying-mk01=Alloying 1 alloying-mk02=Alloying 2 atomizer-mk00=Early Molecular Decohesion -auog-mk00=Auogs - Stage 0 [controls] recipe-selector=Recipe Selector diff --git a/prototypes/buildings/cultivator.lua b/prototypes/buildings/cultivator.lua index 0dd09f3..3486597 100644 --- a/prototypes/buildings/cultivator.lua +++ b/prototypes/buildings/cultivator.lua @@ -9,7 +9,7 @@ RECIPE { {type = "item", name = "iron-plate", amount = 20}, {type = "item", name = "steam-engine", amount = 1}, {type = "item", name = "inductor1", amount = 5}, - {type = "item", name = "burner-soil-extractor", amount = 1}, + {type = "item", name = "soil-extractor-mk00", amount = 1}, }, results = { {type = "item", name = "flora-cultivator-mk01", amount = 1} diff --git a/prototypes/buildings/ddc-mk00.lua b/prototypes/buildings/ddc-mk00.lua index 40c29ff..3844a8d 100644 --- a/prototypes/buildings/ddc-mk00.lua +++ b/prototypes/buildings/ddc-mk00.lua @@ -144,7 +144,7 @@ ENTITY { graphics_set = { animation = make_2way_animation_from_spritesheet({ layers = { { - filename = "__PyBlock__/graphics/hr-ddc-mk00.png", + filename = "__PyBlock__/graphics/ddc-mk00.png", priority = "extra-high", width = 219, height = 215, @@ -153,7 +153,7 @@ ENTITY { scale = 0.5, hr_version = { - filename = "__PyBlock__/graphics/hr-ddc-mk00.png", + filename = "__PyBlock__/graphics/ddc-mk00.png", priority = "extra-high", width = 219, height = 215, diff --git a/prototypes/updates/pyalienlife-updates.lua b/prototypes/updates/pyalienlife-updates.lua index f0eecf2..5636f6e 100644 --- a/prototypes/updates/pyalienlife-updates.lua +++ b/prototypes/updates/pyalienlife-updates.lua @@ -84,21 +84,6 @@ RECIPE("stone-wool"):remove_unlock("zipir"):add_unlock("cadaveric-arum") RECIPE("cadaveric-arum-mk01"):remove_ingredient("hydrocyclone-mk01"):remove_ingredient("electronic-circuit"):remove_ingredient("plastic-bar"):remove_ingredient("intermetallics"):remove_ingredient("steel-plate"):add_ingredient({name = "steel-plate", amount = 5}):add_ingredient({name = "pipe", amount = 4}):add_ingredient({name = "soil", amount = 20}):remove_ingredient("botanical-nursery") ---move foodless auogs to auog zero -RECIPE("auog-paddock-mk01"):remove_unlock("auog"):add_unlock("auog-mk00"):remove_ingredient("intermetallics") - -RECIPE("auog"):remove_unlock("auog"):add_unlock("auog-mk00"):remove_ingredient("cdna") - -RECIPE("earth-bear-sample"):remove_unlock("auog"):add_unlock("auog-mk00") - -RECIPE("auog-codex"):remove_unlock("auog"):add_unlock("auog-mk00") - -RECIPE("auog-pup-breeding-1"):remove_unlock("auog"):add_unlock("auog-mk00") - -RECIPE("auog-maturing-1"):remove_unlock("auog"):add_unlock("auog-mk00") - -RECIPE("auog-pooping-1"):remove_unlock("auog"):add_unlock("auog-mk00") - --move fawogae with manure up TECHNOLOGY("fawogae-mk01"):remove_pack("py-science-pack-1"):set_fields{prerequisites = {}}