From eef791aad393d1d26e8d95b654b5c6c5a8a55dfe Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Fri, 14 Feb 2025 22:24:59 +0100 Subject: [PATCH] Add compatibility with AAI Industry --- README.md | 2 -- lignumis/data-updates.lua | 3 ++- lignumis/info.json | 4 +-- .../prototypes/compatibility/aai-industry.lua | 19 ++++++++++++++ lignumis/prototypes/compatibility/updates.lua | 1 + lignumis/settings.lua | 25 +++++++++++-------- 6 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 lignumis/prototypes/compatibility/aai-industry.lua create mode 100644 lignumis/prototypes/compatibility/updates.lua diff --git a/README.md b/README.md index a2054a1..9b504b8 100644 --- a/README.md +++ b/README.md @@ -83,8 +83,6 @@ If your modded lab is special and it should not support these science packs, use - Improve transition to Nauvis a bit more - Add late-game recipe for oil from wood pulp - Replace usage of gold cable with basic circuits made of wood and gold cable, add option for progressive circuit recipes and add recipe prod research -- Compatibility with [Amator Phasma's Coal & Steam (forked)](https://mods.factorio.com/mod/apm_power_ldinc) -- Compatibility with [AAI Industry](https://mods.factorio.com/mod/aai-industry) - Compatibility with [On Wayward Seas](https://mods.factorio.com/mod/wayward-seas) - Compatibility with [Planet Picker](https://mods.factorio.com/mod/planet-picker) - Compatibility with [Noble Metals](https://mods.factorio.com/mod/bzgold) once it's updated diff --git a/lignumis/data-updates.lua b/lignumis/data-updates.lua index bac377e..3ab5349 100644 --- a/lignumis/data-updates.lua +++ b/lignumis/data-updates.lua @@ -1,2 +1,3 @@ require("prototypes/content/updates") -require("prototypes/integrations/updates") \ No newline at end of file +require("prototypes/integrations/updates") +require("prototypes/compatibility/updates") \ No newline at end of file diff --git a/lignumis/info.json b/lignumis/info.json index fe60ab8..94f2488 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -21,10 +21,10 @@ "?hot-metals >= 1.1.0", "?wood-military >= 2.3.3", "?metal-and-stars", + "?aai-industry", "!apm_power_ldinc", "!wood-logistics", "!early-agriculture", - "!wood-universe-modpack", - "!aai-industry" + "!wood-universe-modpack" ] } \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/aai-industry.lua b/lignumis/prototypes/compatibility/aai-industry.lua new file mode 100644 index 0000000..35a51c4 --- /dev/null +++ b/lignumis/prototypes/compatibility/aai-industry.lua @@ -0,0 +1,19 @@ +local Technology = require("__cf-lib__/data/Technology") + +if not mods["aai-industry"] then return end + +local burner_mechanics = Technology:new("burner-mechanics") +burner_mechanics:addPrerequisite("iron-processing") +burner_mechanics:removeRecipe("burner-inserter") +burner_mechanics:removeRecipe("burner-mining-drill") +burner_mechanics:removeRecipe("burner-assembling-machine") + +data.raw.recipe["burner-inserter"].enabled = true +data.raw.recipe["burner-mining-drill"].enabled = true + +local burner_automation = Technology:new("burner-automation") +burner_automation:addRecipe("burner-assembling-machine") + +local wall = data.raw["wall"]["concrete-wall"] +wall.emissions_per_second = wall.emissions_per_second or {} +wall.emissions_per_second.noise = -30 / 60 diff --git a/lignumis/prototypes/compatibility/updates.lua b/lignumis/prototypes/compatibility/updates.lua new file mode 100644 index 0000000..7591d8b --- /dev/null +++ b/lignumis/prototypes/compatibility/updates.lua @@ -0,0 +1 @@ +require("aai-industry") \ No newline at end of file diff --git a/lignumis/settings.lua b/lignumis/settings.lua index 3ecebc1..0b6c951 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -13,16 +13,21 @@ data:extend({ default_value = true, order = "b" }, + { + type = "bool-setting", + name = "lignumis-ammo-progression", + setting_type = "startup", + default_value = true, + order = "c" + } }) -if not mods["wood-military"] then - data:extend({ - { - type = "bool-setting", - name = "lignumis-ammo-progression", - setting_type = "startup", - default_value = true, - order = "c" - } - }) +if mods["aai-industry"] then + data.raw["bool-setting"]["lignumis-inserter-progression"].forced_value = false + data.raw["bool-setting"]["lignumis-inserter-progression"].hidden = true end + +if mods["wood-military"] then + data.raw["bool-setting"]["lignumis-ammo-progression"].forced_value = false + data.raw["bool-setting"]["lignumis-ammo-progression"].hidden = true +end \ No newline at end of file