diff --git a/space-age-extended/data.lua b/space-age-extended/data.lua index 5da7226..443f596 100644 --- a/space-age-extended/data.lua +++ b/space-age-extended/data.lua @@ -1,3 +1,4 @@ require("__cf-lib__/util/table") +require("planets/tier1/lignumis/data") require("planets/tier1/nauvis/data") require("planets/tier1/muluna/data") \ No newline at end of file diff --git a/space-age-extended/info.json b/space-age-extended/info.json index 0f273ad..509a3c6 100644 --- a/space-age-extended/info.json +++ b/space-age-extended/info.json @@ -11,6 +11,9 @@ "base", "space-age >= 2.0.72", "cf-lib >= 1.0.0", + "crushing-industry", + "crushing-industry-compatibility", + "crushing-industry-productivity-research", "lignumis-base", "planet-muluna", "science-tab" diff --git a/space-age-extended/planets/tier1/lignumis/crushing.lua b/space-age-extended/planets/tier1/lignumis/crushing.lua new file mode 100644 index 0000000..46a6985 --- /dev/null +++ b/space-age-extended/planets/tier1/lignumis/crushing.lua @@ -0,0 +1,10 @@ +local Technology = require("__cf-lib__/data/Technology") + +-- Remove the burner crushing because crushing starts on Muluna +table.insert(Lignumis.science_blacklist, "ore-crushing") +Technology:new("copper-processing"):removeRecipe("burner-crusher-copper") +data.raw.technology["basic-ore-crushing"] = nil +data.raw.recipe["burner-crusher"] = nil +data.raw.recipe["burner-crusher-copper"] = nil +data.raw.item["burner-crusher"] = nil +data.raw["furnace"]["burner-crusher"] = nil diff --git a/space-age-extended/planets/tier1/lignumis/data.lua b/space-age-extended/planets/tier1/lignumis/data.lua new file mode 100644 index 0000000..efdc2a3 --- /dev/null +++ b/space-age-extended/planets/tier1/lignumis/data.lua @@ -0,0 +1 @@ +require("crushing") \ No newline at end of file diff --git a/space-age-extended/planets/tier1/muluna/crushing.lua b/space-age-extended/planets/tier1/muluna/crushing.lua new file mode 100644 index 0000000..72a952d --- /dev/null +++ b/space-age-extended/planets/tier1/muluna/crushing.lua @@ -0,0 +1,28 @@ +local Technology = require("__cf-lib__/data/Technology") +local Recipe = require("__cf-lib__/data/Recipe") + +-- Move crusher to Muluna +Technology:new("engine"):removeRecipe("electric-crusher") +Technology:new("planet-discovery-muluna"):addRecipe("electric-crusher") +Technology:new("ore-crushing") + :setPrerequisites({ "space-science-pack" }) + :addIngredient("space-science-pack") + +-- Remove steam entities +data.raw.technology["muluna-steam-crusher"] = nil +data.raw.recipe["muluna-steam-crusher"] = nil +data.raw.item["muluna-steam-crusher"] = nil +data.raw["assembling-machine"]["muluna-steam-crusher"] = nil +Technology:new("space-science-pack") + :replacePrerequisite("muluna-steam-crusher", "muluna-advanced-boiler") + .prototype.research_trigger.entity = "electric-crusher" +Recipe:new("interstellar-science-pack"):replaceIngredient("muluna-steam-crusher", "electric-crusher") + +-- Crushing productivity +Technology:new("ore-crushing-productivity-1") + :setIngredients({ "wood-science-pack", "steam-science-pack", "automation-science-pack", "logistic-science-pack", "space-science-pack" }) +Technology:new("ore-crushing-productivity-2") + :addPrerequisite("production-science-pack") + :setIngredients({ "wood-science-pack", "steam-science-pack", "automation-science-pack", "logistic-science-pack", "space-science-pack", "production-science-pack" }) +Technology:new("ore-crushing-productivity-3") + :removePrerequisite("production-science-pack") \ No newline at end of file diff --git a/space-age-extended/planets/tier1/muluna/data.lua b/space-age-extended/planets/tier1/muluna/data.lua index e7e2e59..8651722 100644 --- a/space-age-extended/planets/tier1/muluna/data.lua +++ b/space-age-extended/planets/tier1/muluna/data.lua @@ -1 +1,2 @@ -require("uranium") \ No newline at end of file +require("uranium") +require("crushing") \ No newline at end of file diff --git a/space-age-extended/planets/tier1/muluna/settings.lua b/space-age-extended/planets/tier1/muluna/settings.lua index 077bcd6..5b4262f 100644 --- a/space-age-extended/planets/tier1/muluna/settings.lua +++ b/space-age-extended/planets/tier1/muluna/settings.lua @@ -3,10 +3,17 @@ local force = Settings.force local forceDefault = Settings.forceDefault local default = Settings.default +-- Muluna force("muluna-hardcore-classic-wood-gasification", false) force("muluna-hardcore-lock-cargo-drops", false) +force("muluna-hardcore-remove-steam-furnaces", true) forceDefault("space-science-pack-output") forceDefault("space-science-pack-energy") default("muluna-hardcore-remove-starting-cargo-pods", true) default("muluna-easy-vanilla-rocket-part-costs", true) -default("muluna-easy-vanilla-advanced-thruster-fuel-costs", true) \ No newline at end of file +default("muluna-easy-vanilla-advanced-thruster-fuel-costs", true) + +-- Crushing industry +default("crushing-industry-space-crusher", false) +default("crushing-industry-glass", false) +default("crushing-industry-concrete-mix", false) \ No newline at end of file