From ca860b07c3089a865d663eaeb17ca90673abb772 Mon Sep 17 00:00:00 2001 From: notnotmelon Date: Sat, 13 Jan 2024 12:32:24 -0600 Subject: [PATCH] updated recipes for mounts to fit progression --- changelog.txt | 1 + locale/en/techs.cfg | 2 +- prototypes/creatures/crawdad.lua | 7 ++++-- prototypes/creatures/dingrido.lua | 9 +++++-- prototypes/creatures/phadaisus.lua | 27 ++++++++++++++------ prototypes/technologies/mounts.lua | 11 +++++---- prototypes/updates/base-updates.lua | 38 ++++++++++++++++++++++++++++- 7 files changed, 77 insertions(+), 18 deletions(-) diff --git a/changelog.txt b/changelog.txt index 8b0d56eb..047b80a1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,6 +4,7 @@ Date: ? Changes: - Buffed fawogae path 3. No longer replaces the fawogae -> raw coal recipe and instead lets you have both. - Fixed that antelopes had no blood. + - Fixed a crash when loading certian old saves --------------------------------------------------------------------------------------------------- Version: 2.1.14 Date: 2024-1-10 diff --git a/locale/en/techs.cfg b/locale/en/techs.cfg index 4381d323..77279cbb 100644 --- a/locale/en/techs.cfg +++ b/locale/en/techs.cfg @@ -602,7 +602,7 @@ biofluid-mk03=Biofluid network - Stage 3 [technology-description] mounts-mk01=Crawdads are big armored arthropods that are domesticated for riding. Their strong shell can easily ram and destroy trees and rocks. Can be equiped with modular equipment and supports logistic requests. mounts-mk02=Dingridos are a strain of dingrits optimized for high-speed riding. At full speed, they can run even faster than a train. Can be equiped with modular equipment and supports logistic requests. -spidertron=Through extensive (obsessive) experimentation you have finally discovered a way to calm and tame the zungrors... by blocking its movements in a mecha suit. These cyborgs have a huge inventory and grid. Can be equiped with modular equipment and supports logistic requests. +spidertron=Through intensive (obsessive) experimentation you have finally discovered a way to calm and tame the zungrors... by blocking its movements in a mecha suit. These cyborgs have a huge inventory and grid. Can be equiped with modular equipment and supports logistic requests. mounts-mk04=The phadaisus is the final upgrade in personal transportation. It flies at mach speed over all terrain and has a massive equipment grid. Can be equiped with modular equipment and supports logistic requests. xenobiology=A form of biology that is not (yet) familiar to Earth science. zoology=Branch of biology that studies the animal kingdom. In this case, GMO creatures and aliens. diff --git a/prototypes/creatures/crawdad.lua b/prototypes/creatures/crawdad.lua index 600b84db..2feacbb9 100644 --- a/prototypes/creatures/crawdad.lua +++ b/prototypes/creatures/crawdad.lua @@ -3,14 +3,17 @@ local util = require('util') RECIPE { type = 'recipe', name = 'crawdad', - energy_required = 120, + energy_required = 60, category = 'creature-chamber', enabled = false, ingredients = { + {type = 'item', name = 'py-shed-basic', amount = 1}, + {type = 'item', name = 'heavy-armor', amount = 1}, + {type = 'item', name = 'vrauks', amount = 1}, {type = 'item', name = 'alien-sample01', amount = 10}, {type = 'item', name = 'cdna', amount = 10}, {type = 'item', name = 'moss-gen', amount = 30}, - {type = 'item', name = 'bio-sample', amount = 100}, + {type = 'item', name = 'bio-sample', amount = 50}, {type = 'item', name = 'earth-generic-sample', amount = 20}, {type = 'fluid', name = 'blood', amount = 300}, {type = 'fluid', name = 'water-saline', amount = 500} diff --git a/prototypes/creatures/dingrido.lua b/prototypes/creatures/dingrido.lua index e9702532..665cdc10 100644 --- a/prototypes/creatures/dingrido.lua +++ b/prototypes/creatures/dingrido.lua @@ -3,14 +3,19 @@ local util = require('util') RECIPE { type = 'recipe', name = 'dingrido', - energy_required = 90, + energy_required = 60, category = 'creature-chamber', enabled = false, ingredients = { + {type = 'item', name = 'modular-armor', amount = 1}, + {type = 'item', name = 'py-shed-basic', amount = 1}, + {type = 'item', name = 'dingrits', amount = 1}, {type = 'item', name = 'alien-sample-02', amount = 10}, {type = 'item', name = 'cdna', amount = 30}, + {type = 'item', name = 'retrovirus', amount = 10}, + {type = 'item', name = 'propeptides', amount = 5}, {type = 'item', name = 'cbp', amount = 10}, - {type = 'item', name = 'bio-sample', amount = 100}, + {type = 'item', name = 'bio-sample', amount = 50}, {type = 'item', name = 'dingrits-codex', amount = 5}, {type = 'item', name = 'earth-wolf-sample', amount = 10}, {type = 'fluid', name = 'fetal-serum', amount = 100}, diff --git a/prototypes/creatures/phadaisus.lua b/prototypes/creatures/phadaisus.lua index 05f2e1b9..b7cf6f2f 100644 --- a/prototypes/creatures/phadaisus.lua +++ b/prototypes/creatures/phadaisus.lua @@ -3,18 +3,31 @@ local util = require('util') RECIPE { type = 'recipe', name = 'phadaisus', - energy_required = 120, + energy_required = 60, category = 'creature-chamber', enabled = false, ingredients = { + {type = 'item', name = 'py-shed-basic', amount = 1}, + {type = 'item', name = 'bioartificial-guts', amount = 1}, + {type = 'item', name = 'biomimetic-skin', amount = 1}, + {type = 'item', name = 'in-vitro-meat', amount = 1}, + {type = 'item', name = 'laboratory-grown-brain', amount = 1}, + {type = 'item', name = 'scafold-free-bones', amount = 1}, + {type = 'item', name = 'tissue-engineered-fat', amount = 1}, + {type = 'item', name = 'perfect-samples', amount = 10}, + {type = 'item', name = 'power-armor-mk2', amount = 1}, {type = 'item', name = 'enzyme-pks', amount = 1}, {type = 'item', name = 'zymogens', amount = 5}, - {type = 'item', name = 'phadai', amount = 1}, - {type = 'item', name = 'bio-sample', amount = 100}, - {type = 'item', name = 'earth-generic-sample', amount = 50}, - {type = 'item', name = 'earth-tiger-sample', amount = 2}, - {type = 'fluid', name = 'artificial-blood', amount = 300}, - {type = 'fluid', name = 'water-saline', amount = 500} + {type = 'item', name = 'resilin', amount = 5}, + {type = 'item', name = 'strorix-unknown-sample', amount = 5}, + {type = 'item', name = 'purine-analogues', amount = 15}, + {type = 'item', name = 'pheromones', amount = 100}, + {type = 'item', name = 'phadai-mk04', amount = 1}, + {type = 'item', name = mods.pyalternativeenergy and 'metastable-quasicrystal' or 'bio-sample', amount = 10}, + {type = 'item', name = 'phadai-codex-mk04', amount = 5}, + {type = 'item', name = 'earth-tiger-sample', amount = 4}, + {type = 'fluid', name = 'artificial-blood', amount = 400}, + {type = 'fluid', name = 'gta', amount = 500} }, result = 'phadaisus' }:add_unlock('mounts-mk04') diff --git a/prototypes/technologies/mounts.lua b/prototypes/technologies/mounts.lua index 0292b8d5..3c3d7bfc 100644 --- a/prototypes/technologies/mounts.lua +++ b/prototypes/technologies/mounts.lua @@ -3,7 +3,7 @@ TECHNOLOGY { name = 'mounts-mk01', icon = '__pyalienlifegraphics__/graphics/technology/mounts-mk01.png', icon_size = 128, - order = 'c-a', + order = 'a-a', prerequisites = {'logistic-science-pack'}, effects = {}, unit = { @@ -21,8 +21,8 @@ TECHNOLOGY { name = 'mounts-mk02', icon = '__pyalienlifegraphics__/graphics/technology/mounts-mk02.png', icon_size = 128, - order = 'c-a', - prerequisites = {'genetics-mk03', 'dingrits'}, + order = 'b-a', + prerequisites = {'dingrits'}, effects = {}, unit = { count = 350, @@ -49,6 +49,7 @@ TECHNOLOGY { {'automation-science-pack', 2}, {'logistic-science-pack', 2}, {'chemical-science-pack', 2}, + {'military-science-pack', 2}, {'py-science-pack-3', 2}, }, time = 50 @@ -60,8 +61,8 @@ TECHNOLOGY { name = 'mounts-mk04', icon = '__pyalienlifegraphics__/graphics/technology/mounts-mk04.png', icon_size = 128, - order = 'c-a', - prerequisites = {mods.pyalternativeenergy and 'phadai-upgrade' or 'domestication-mk05', 'phadai-mk04'}, + order = 'd-a', + prerequisites = {mods.pyalternativeenergy and 'phadai-upgrade' or 'domestication-mk05', 'phadai-mk04', 'power-armor-mk2'}, effects = {}, unit = { count = 350, diff --git a/prototypes/updates/base-updates.lua b/prototypes/updates/base-updates.lua index 1c48423c..fc4d4b92 100644 --- a/prototypes/updates/base-updates.lua +++ b/prototypes/updates/base-updates.lua @@ -114,4 +114,40 @@ data.raw['spidertron-remote']['spidertron-remote'].subgroup = 'py-alienlife-spec data.raw['spidertron-remote']['spidertron-remote'].order = 'z-c' RECIPE('spidertron'):add_unlock('spidertron') -RECIPE('spidertron-remote'):add_unlock('mounts-mk01') \ No newline at end of file +RECIPE('spidertron-remote'):add_unlock('mounts-mk01') + +RECIPE('spidertron-remote').ingredients = { + {mods.pyalternativeenergy and 'electronics-mk01' or 'copper-plate', 5}, + {'electronic-circuit', 5} +} + +RECIPE { + name = 'spidertron', + type = 'recipe', + category = 'creature-chamber', + enabled = false, + energy_required = 60, + ingredients = { + {type = 'item', name = 'py-shed-basic', amount = 1}, + {mods.pyalternativeenergy and 'zungror' or 'auog', 1}, + {'power-armor', 1}, + {mods.pyalternativeenergy and 'hydraulic-system-mk01' or 'copper-plate', 8}, + {'energy-shield-mk2-equipment', 2}, + {'processing-unit', 8}, + {'alien-sample-03', 10}, + {mods.pyalternativeenergy and 'mechanical-parts-03' or 'gastrocapacitor', 8}, + {'earth-spider-sample', 8}, + {type = 'fluid', name = 'molten-nexelit', amount = 800}, + {type = 'fluid', name = 'artificial-blood', amount = 300}, + {'small-parts-03', 80}, + {'neuromorphic-chip', 4}, + {'nanofibrils', 8}, + {mods.pyalternativeenergy and 'dieletric-layer' or 'iron-plate', 8}, + {'high-grade-lead', 8}, + {'zungror-codex', 1} + }, + results = { + {type = 'item', name = 'spidertron', amount = 1}, + }, + main_product = 'spidertron', +} \ No newline at end of file