diff --git a/space-age-extended/data-updates.lua b/space-age-extended/data-updates.lua deleted file mode 100644 index 6e1aad8..0000000 --- a/space-age-extended/data-updates.lua +++ /dev/null @@ -1 +0,0 @@ -require("planets/tier1/muluna/updates") \ No newline at end of file diff --git a/space-age-extended/locale/en/space-age-extended.cfg b/space-age-extended/locale/en/space-age-extended.cfg deleted file mode 100644 index b050774..0000000 --- a/space-age-extended/locale/en/space-age-extended.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[technology-name] -asteroid-crushing=Asteroid crushing \ No newline at end of file diff --git a/space-age-extended/planets/tier1/lignumis/settings.lua b/space-age-extended/planets/tier1/lignumis/settings.lua index 54ccacf..992871b 100644 --- a/space-age-extended/planets/tier1/lignumis/settings.lua +++ b/space-age-extended/planets/tier1/lignumis/settings.lua @@ -1,12 +1,17 @@ local Settings = require("__cf-lib__/settings/Settings") local force = Settings.force local forceDefault = Settings.forceDefault +local default = Settings.default -- Lignumis force("lignumis-restrict-sciences", true) force("lignumis-technology-progression", true) force("lignumis-basic-circuit-board", true) force("lignumis-circuit-progression", true) +default("lignumis-belt-progression", false) +default("lignumis-inserter-progression", false) +default("lignumis-ammo-progression", false) +default("lignumis-assembler-progression", false) -- Wood Walls forceDefault("wood-walls-fuelvalue") diff --git a/space-age-extended/planets/tier1/muluna/crushing-updates.lua b/space-age-extended/planets/tier1/muluna/crushing-updates.lua deleted file mode 100644 index f6c1272..0000000 --- a/space-age-extended/planets/tier1/muluna/crushing-updates.lua +++ /dev/null @@ -1,11 +0,0 @@ -local Technology = require("__cf-lib__/data/Technology") - --- Crushing productivity -Technology:new("ore-crushing-productivity-1") - :setPrerequisites({ "space-science-pack" }) - :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/crushing.lua b/space-age-extended/planets/tier1/muluna/crushing.lua index da1d77c..72a952d 100644 --- a/space-age-extended/planets/tier1/muluna/crushing.lua +++ b/space-age-extended/planets/tier1/muluna/crushing.lua @@ -3,61 +3,26 @@ 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 Muluna crushers in favor of Crushing Industry crushers +-- Remove steam entities data.raw.technology["muluna-steam-crusher"] = nil -data.raw.technology["crusher-2"] = nil data.raw.recipe["muluna-steam-crusher"] = nil -data.raw.recipe["crusher-2"] = nil data.raw.item["muluna-steam-crusher"] = nil -data.raw.item["crusher-2"] = nil data.raw["assembling-machine"]["muluna-steam-crusher"] = nil -data.raw["assembling-machine"]["crusher-2"] = nil Technology:new("space-science-pack") - :replacePrerequisite("muluna-steam-crusher", "muluna-advanced-boiler") - .prototype.research_trigger.entity = "electric-crusher" + :replacePrerequisite("muluna-steam-crusher", "muluna-advanced-boiler") + .prototype.research_trigger.entity = "electric-crusher" Recipe:new("interstellar-science-pack"):replaceIngredient("muluna-steam-crusher", "electric-crusher") --- Only hide vanilla crusher to not cause problems with compatibility code -local prototypes = { - data.raw["assembling-machine"]["crusher"], - data.raw.item["crusher"], - data.raw.recipe["crusher"] -} -for _, prototype in pairs(prototypes) do - table.assign(prototype, { - hidden = true, - hidden_in_factoriopedia = true - }) -end -data.raw["assembling-machine"]["crusher"].next_upgrade = nil - --- Change vanilla crusher technology so it unlocks all asteroid crushing at once -Technology:new("crusher") - :removeRecipe("crusher") - :addRecipe("electric-crusher") - :addRecipe("carbonic-asteroid-crushing") - :addRecipe("metallic-asteroid-crushing") - :addRecipe("oxide-asteroid-crushing") - :addRecipe("anorthite-crushing") - :assign({ - localised_name = { "asteroid-crushing" }, - prerequisites = { "planet-discovery-muluna" }, - unit = { - count = 500, - time = 30, - ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1} - } - } - -- TODO: icon - }) -Technology:new("carbonic-asteroid-crushing"):removeRecipe("carbonic-asteroid-crushing") -Technology:new("metallic-asteroid-crushing"):removeRecipe("metallic-asteroid-crushing") -Technology:new("oxide-asteroid-crushing"):removeRecipe("oxide-asteroid-crushing") ---Technology:new("anorthite-crushing"):removeRecipe("anorthite-crushing") \ No newline at end of file +-- 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/updates.lua b/space-age-extended/planets/tier1/muluna/updates.lua deleted file mode 100644 index db98250..0000000 --- a/space-age-extended/planets/tier1/muluna/updates.lua +++ /dev/null @@ -1 +0,0 @@ -require("crushing-updates") \ No newline at end of file