From 866007bb730ac485a1fd76823411fd27ecd5189d Mon Sep 17 00:00:00 2001 From: Jason Hiatt Date: Wed, 22 Jan 2025 18:17:07 +1300 Subject: [PATCH 1/3] Fix startup crash with metal and stars --- lignumis/prototypes/integrations/vanilla-updates.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lignumis/prototypes/integrations/vanilla-updates.lua b/lignumis/prototypes/integrations/vanilla-updates.lua index 2453157..84abf14 100644 --- a/lignumis/prototypes/integrations/vanilla-updates.lua +++ b/lignumis/prototypes/integrations/vanilla-updates.lua @@ -5,7 +5,7 @@ for _, technology in pairs(data.raw.technology) do if technology.unit and technology.unit.ingredients and not table.contains(Lignumis.science_blacklist, technology.name) then local ingredients = technology.unit.ingredients local noMatches = table.filter(ingredients, function(ingredient) - return table.contains({ "wood-science-pack", "steam-science-pack" }, ingredient[1]) + return table.contains({ "wood-science-pack", "steam-science-pack", "nanite-science-pack", "quantum-science-pack", "ring-science-pack" }, ingredient[1]) end) local yesMatches = table.filter(ingredients, function(ingredient) return table.contains({ "utility-science-pack", "production-science-pack", "space-science-pack" }, ingredient[1]) @@ -15,4 +15,4 @@ for _, technology in pairs(data.raw.technology) do table.insert(technology.unit.ingredients, { "steam-science-pack", 1 }) end end -end \ No newline at end of file +end From 858e67cf9cd9805e75c55989e244718d4dbf3bcd Mon Sep 17 00:00:00 2001 From: Jason Hiatt Date: Wed, 22 Jan 2025 18:40:37 +1300 Subject: [PATCH 2/3] fix metal and stars gold research requirement --- lignumis/info.json | 1 + lignumis/prototypes/compatibility/data.lua | 3 ++- lignumis/prototypes/compatibility/metal-and-stars.lua | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 lignumis/prototypes/compatibility/metal-and-stars.lua diff --git a/lignumis/info.json b/lignumis/info.json index 83ad70b..4be0e28 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -18,6 +18,7 @@ "Wood-Walls >= 1.2.0", "?hot-metals >= 1.1.0", "?wood-military >= 2.3.3", + "?metal-and-stars", "!apm_power_ldinc", "!alien-biomes", "!wood-logistics", diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua index b647a90..4093fa0 100644 --- a/lignumis/prototypes/compatibility/data.lua +++ b/lignumis/prototypes/compatibility/data.lua @@ -1,2 +1,3 @@ require("hot-metals") -require("wood-military") \ No newline at end of file +require("wood-military") +require("metal-and-stars") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/metal-and-stars.lua b/lignumis/prototypes/compatibility/metal-and-stars.lua new file mode 100644 index 0000000..5cdf6d3 --- /dev/null +++ b/lignumis/prototypes/compatibility/metal-and-stars.lua @@ -0,0 +1,6 @@ +if not mods["metal-and-stars"] then + return +end + +data.raw.recipe["gold-plate"].enabled = true +data.raw.recipe["gold-cable"].enabled = true \ No newline at end of file From dfe17995fe0a713c61b0c7eaeb20031db73fa6e9 Mon Sep 17 00:00:00 2001 From: Jason Hiatt Date: Wed, 22 Jan 2025 18:44:34 +1300 Subject: [PATCH 3/3] Reset metal and stars overwritten gold plate icon --- lignumis/prototypes/compatibility/metal-and-stars.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lignumis/prototypes/compatibility/metal-and-stars.lua b/lignumis/prototypes/compatibility/metal-and-stars.lua index 5cdf6d3..34abca4 100644 --- a/lignumis/prototypes/compatibility/metal-and-stars.lua +++ b/lignumis/prototypes/compatibility/metal-and-stars.lua @@ -3,4 +3,6 @@ if not mods["metal-and-stars"] then end data.raw.recipe["gold-plate"].enabled = true -data.raw.recipe["gold-cable"].enabled = true \ No newline at end of file +data.raw.recipe["gold-cable"].enabled = true + +data.raw.item["gold-plate"].icon = "__lignumis__/graphics/icons/gold-plate.png" \ No newline at end of file