From de634497ff34532ac48ed550eaf7572a7707b275 Mon Sep 17 00:00:00 2001 From: Brevven Date: Sun, 20 Apr 2025 00:09:17 -0700 Subject: [PATCH] cerys updates --- changelog.txt | 1 + data-updates.lua | 21 +-------------------- ruins.lua | 28 ++++++++++++++++++++++++++++ tin-recipe-updates.lua | 7 ++++++- 4 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 ruins.lua diff --git a/changelog.txt b/changelog.txt index eb765bd..d2a00ef 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Version: 2.1.11 Date: 2025-04-08 Changes: - Space Age: Asteroid crushing recipe now affected by productivity research + - Integrate better into Cerys recyling and ruins --------------------------------------------------------------------------------------------------- Version: 2.1.10 Date: 2025-03-22 diff --git a/data-updates.lua b/data-updates.lua index 0eab13a..7aaee32 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -6,6 +6,7 @@ require("strange-matter") require("compatibility/248k") require("compatibility/sciencecosttweakerm") +require("ruins") local util = require("data-util"); if mods.Asteroid_Mining and not data.raw.item["asteroid-tin-ore"] then @@ -14,26 +15,6 @@ end util.redo_recycling() --- Helps with fulgora clean starts -util.add_minable_result("simple-entity", "fulgoran-ruin-vault", {type="item", name="bronze-plate", amount_min=79, amount_max=103}) -util.add_minable_result("simple-entity", "fulgoran-ruin-colossal", {type="item", name="bronze-plate", amount_min=15, amount_max=41}) -util.add_minable_result("simple-entity", "fulgoran-ruin-huge", {type="item", name="bronze-plate", amount_min=7, amount_max=31}) -util.add_minable_result("simple-entity", "fulgoran-ruin-big", {type="item", name="bronze-plate", amount_min=7, amount_max=15}) -util.add_minable_result("simple-entity", "fulgoran-ruin-stonehenge", {type="item", name="bronze-plate", amount_min=7, amount_max=13}) -util.add_minable_result("simple-entity", "fulgoran-ruin-medium", {type="item", name="bronze-plate", amount_min=1, amount_max=7}) -util.add_minable_result("simple-entity", "fulgoran-ruin-small", {type="item", name="bronze-plate", amount_min=0, amount_max=2}) - -util.add_minable_result("simple-entity", "fulgoran-ruin-vault", {type="item", name="lead-expansion-bolt", amount_min=69, amount_max=93}) -util.add_minable_result("simple-entity", "fulgoran-ruin-colossal", {type="item", name="lead-expansion-bolt", amount_min=15, amount_max=25}) -util.add_minable_result("simple-entity", "fulgoran-ruin-huge", {type="item", name="lead-expansion-bolt", amount_min=7, amount_max=17}) -util.add_minable_result("simple-entity", "fulgoran-ruin-big", {type="item", name="lead-expansion-bolt", amount_min=3, amount_max=9}) -util.add_minable_result("simple-entity", "fulgoran-ruin-stonehenge", {type="item", name="lead-expansion-bolt", amount_min=2, amount_max=6}) -util.add_minable_result("simple-entity", "fulgoran-ruin-medium", {type="item", name="lead-expansion-bolt", amount_min=1, amount_max=3}) -util.add_minable_result("simple-entity", "fulgoran-ruin-small", {type="item", name="lead-expansion-bolt", amount_min=0, amount_max=2}) - -util.add_minable_result("simple-entity", "big-fulgora-rock", {type="item", name="tin-ore", amount_min=10, amount_max=22}) -util.add_minable_result("simple-entity", "big-fulgora-rock", {type="item", name="lead-ore", amount_min=10, amount_max=22}) - util.add_shiftite_recipe("tin-plate", {"delta"}, 1) -- Must be last diff --git a/ruins.lua b/ruins.lua new file mode 100644 index 0000000..3a90dd0 --- /dev/null +++ b/ruins.lua @@ -0,0 +1,28 @@ +local util = require("data-util"); + +-- Helps with fulgora clean starts +util.add_minable_result("simple-entity", "fulgoran-ruin-vault", {type="item", name="bronze-plate", amount_min=79, amount_max=103}) +util.add_minable_result("simple-entity", "fulgoran-ruin-colossal", {type="item", name="bronze-plate", amount_min=15, amount_max=41}) +util.add_minable_result("simple-entity", "fulgoran-ruin-huge", {type="item", name="bronze-plate", amount_min=7, amount_max=31}) +util.add_minable_result("simple-entity", "fulgoran-ruin-big", {type="item", name="bronze-plate", amount_min=7, amount_max=15}) +util.add_minable_result("simple-entity", "fulgoran-ruin-stonehenge", {type="item", name="bronze-plate", amount_min=7, amount_max=13}) +util.add_minable_result("simple-entity", "fulgoran-ruin-medium", {type="item", name="bronze-plate", amount_min=1, amount_max=7}) +util.add_minable_result("simple-entity", "fulgoran-ruin-small", {type="item", name="bronze-plate", amount_min=0, amount_max=2}) + +util.add_minable_result("simple-entity", "fulgoran-ruin-vault", {type="item", name="lead-expansion-bolt", amount_min=69, amount_max=93}) +util.add_minable_result("simple-entity", "fulgoran-ruin-colossal", {type="item", name="lead-expansion-bolt", amount_min=15, amount_max=25}) +util.add_minable_result("simple-entity", "fulgoran-ruin-huge", {type="item", name="lead-expansion-bolt", amount_min=7, amount_max=17}) +util.add_minable_result("simple-entity", "fulgoran-ruin-big", {type="item", name="lead-expansion-bolt", amount_min=3, amount_max=9}) +util.add_minable_result("simple-entity", "fulgoran-ruin-stonehenge", {type="item", name="lead-expansion-bolt", amount_min=2, amount_max=6}) +util.add_minable_result("simple-entity", "fulgoran-ruin-medium", {type="item", name="lead-expansion-bolt", amount_min=1, amount_max=3}) +util.add_minable_result("simple-entity", "fulgoran-ruin-small", {type="item", name="lead-expansion-bolt", amount_min=0, amount_max=2}) + +util.add_minable_result("simple-entity", "big-fulgora-rock", {type="item", name="tin-ore", amount_min=10, amount_max=22}) +util.add_minable_result("simple-entity", "big-fulgora-rock", {type="item", name="lead-ore", amount_min=10, amount_max=22}) + +util.add_minable_result("simple-entity", "cerys-ruin-colossal", {type="item", name="bronze-plate", amount_min=5, amount_max=7}) +util.add_minable_result("simple-entity", "cerys-ruin-huge", {type="item", name="bronze-plate", amount_min=4, amount_max=6}) +util.add_minable_result("simple-entity", "cerys-ruin-medium", {type="item", name="bronze-plate", amount_min=3, amount_max=5}) +util.add_minable_result("simple-entity", "cerys-ruin-big", {type="item", name="bronze-plate", amount_min=2, amount_max=4}) +util.add_minable_result("simple-entity", "cerys-ruin-small", {type="item", name="bronze-plate", amount_min=1, amount_max=3}) +-- Cerys diff --git a/tin-recipe-updates.lua b/tin-recipe-updates.lua index 4ae906d..63a6392 100644 --- a/tin-recipe-updates.lua +++ b/tin-recipe-updates.lua @@ -10,9 +10,14 @@ else end if mods["space-age"] then + util.add_to_ingredient("tinned-cable", "tin-plate", 1) util.replace_product("scrap-recycling", "copper-cable", "tinned-cable") util.set_product_probability("scrap-recycling", "tinned-cable", 0.12) - util.add_to_ingredient("tinned-cable", "tin-plate", 1) + + -- Cerys + util.replace_product("cerys-nuclear-scrap-recycling", "copper-cable", "tinned-cable") + util.set_product_probability("scrap-recycling", "tinned-cable", 0.28) + util.add_prerequisite("moon-discovery-cerys", "alloy-separation") end if mods.bztitanium then