From e03f85422254b6572cfbbc0435987b0320c973ef Mon Sep 17 00:00:00 2001 From: Jvella94 Date: Mon, 24 Nov 2025 18:26:49 +0100 Subject: [PATCH 01/46] Added order to subgroup Fixes an issue with Recycling in Factoriopedia that expects all subgroups to have an order. https://mods.factorio.com/mod/recycling-factoriopedia --- lignumis/prototypes/content/item-subgroups.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lignumis/prototypes/content/item-subgroups.lua b/lignumis/prototypes/content/item-subgroups.lua index 48c03fe..3a14724 100644 --- a/lignumis/prototypes/content/item-subgroups.lua +++ b/lignumis/prototypes/content/item-subgroups.lua @@ -2,6 +2,7 @@ data:extend({ { type = "item-subgroup", name = "lignumis-bioprocessing", - group = "bioprocessing" + group = "bioprocessing", + order = "lignumis-bioprocessing" } }) \ No newline at end of file From 3c222237ce55f710f21686d46cf0aa02b89e46de Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 9 Dec 2025 00:09:32 +0100 Subject: [PATCH 02/46] Use additional_categories for quality assembling --- .../prototypes/content/quality-assembler.lua | 88 +++++++------------ 1 file changed, 34 insertions(+), 54 deletions(-) diff --git a/lignumis/prototypes/content/quality-assembler.lua b/lignumis/prototypes/content/quality-assembler.lua index 0b94e6b..be95a71 100644 --- a/lignumis/prototypes/content/quality-assembler.lua +++ b/lignumis/prototypes/content/quality-assembler.lua @@ -77,7 +77,8 @@ QualityAssembler.EntityBuilder:new() crafting_speed = 4, module_slots = 6, allowed_effects = { "consumption", "pollution", "quality" }, - effect_receiver = { base_effect = { quality = 3.5 } } + effect_receiver = { base_effect = { quality = 3.5 } }, + crafting_categories = { "quality-assembling" } }) QualityAssembler.ItemBuilder:new():apply() @@ -91,7 +92,8 @@ QualityAssembler.RecipeBuilder:new() { type = "item", name = "quantum-processor", amount = 10 } }) :apply({ - category = "electromagnetics-or-quality-assembling", + category = "electromagnetics", + additional_categories = { "quality-assembling" } }) QualityAssembler.TechnologyBuilder:new() @@ -147,71 +149,49 @@ data:extend({ }, research_trigger = { type = "craft-item", item = "gold-quality-catalyst", count = 10000 }, prerequisites = { "experienced-quality-assembling-1" } + }, + { + type = "recipe-category", + name = "quality-assembling" } }) -local function convert_category(name) - local quality_name = name .. "-or-quality-assembling" - data:extend({ - { - type = "recipe-category", - name = quality_name - } - }) - - for _, assembler in pairs(data.raw["assembling-machine"]) do - if assembler.crafting_categories and table.contains(assembler.crafting_categories, name) then - table.insert(assembler.crafting_categories, quality_name) - end - end - for _, character in pairs(data.raw["character"]) do - if character.crafting_categories and table.contains(character.crafting_categories, name) then - table.insert(character.crafting_categories, quality_name) - end - end - table.insert(data.raw["assembling-machine"]["quality-assembler"].crafting_categories, quality_name) +local function qa(recipeName) + local recipe = data.raw.recipe[recipeName] + recipe.additional_categories = recipe.additional_categories or {} + table.insert(recipe.additional_categories, "quality-assembling") end -convert_category("wood-processing-or-assembling") -convert_category("metallurgy-or-assembling") -convert_category("metallurgy") -convert_category("electronics") -convert_category("electronics-or-assembling") -convert_category("electromagnetics") -convert_category("organic-or-assembling") -convert_category("crafting") -convert_category("cryogenics-or-assembling") - -- Lignumis -data.raw.recipe["lumber-mill"].category = "wood-processing-or-assembling-or-quality-assembling" +qa("lumber-mill") -- Nauvis -data.raw.recipe["logistic-robot"].category = "crafting-or-quality-assembling" -data.raw.recipe["construction-robot"].category = "crafting-or-quality-assembling" -data.raw.recipe["roboport"].category = "crafting-or-quality-assembling" -data.raw.recipe["speed-module-3"].category = "electronics-or-quality-assembling" -data.raw.recipe["productivity-module-3"].category = "electronics-or-quality-assembling" -data.raw.recipe["efficiency-module-3"].category = "electronics-or-quality-assembling" -data.raw.recipe["rocket-silo"].category = "crafting-or-quality-assembling" -data.raw.recipe["cargo-bay"].category = "crafting-or-quality-assembling" -data.raw.recipe["asteroid-collector"].category = "crafting-or-quality-assembling" -data.raw.recipe["thruster"].category = "crafting-or-quality-assembling" +qa("logistic-robot") +qa("construction-robot") +qa("roboport") +qa("speed-module-3") +qa("productivity-module-3") +qa("efficiency-module-3") +qa("rocket-silo") +qa("cargo-bay") +qa("asteroid-collector") +qa("thruster") -- Vulcanus -data.raw.recipe["foundry"].category = "metallurgy-or-assembling-or-quality-assembling" -data.raw.recipe["big-mining-drill"].category = "metallurgy-or-quality-assembling" +qa("foundry") +qa("big-mining-drill") -- Fulgora -data.raw.recipe["electromagnetic-plant"].category = "electronics-or-assembling-or-quality-assembling" -data.raw.recipe["lightning-collector"].category = "electromagnetics-or-quality-assembling" -data.raw.recipe["mech-armor"].category = "crafting-or-quality-assembling" -data.raw.recipe["quality-module-3"].category = "electronics-or-quality-assembling" -data.raw.recipe["recycler"].category = "crafting-or-quality-assembling" +qa("electromagnetic-plant") +qa("lightning-collector") +qa("mech-armor") +qa("quality-module-3") +qa("recycler") -- Gleba -data.raw.recipe["biochamber"].category = "organic-or-assembling-or-quality-assembling" -data.raw.recipe["stack-inserter"].category = "crafting-or-quality-assembling" -data.raw.recipe["spidertron"].category = "crafting-or-quality-assembling" +qa("biochamber") +qa("stack-inserter") +qa("spidertron") -- Aquilo -data.raw.recipe["cryogenic-plant"].category = "cryogenics-or-assembling-or-quality-assembling" \ No newline at end of file +qa("cryogenic-plant") \ No newline at end of file From bb52fad493afa3f248611a1813479c16246ec4ea Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 9 Dec 2025 00:13:47 +0100 Subject: [PATCH 03/46] Remove default item weights as the code has been moved to PlanetsLib --- lignumis/prototypes/integrations/vanilla.lua | 34 +------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index dd7af70..92ae192 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -335,36 +335,4 @@ if settings.startup["lignumis-fulgora-wood"].value then if recycler.result_inventory_size < recycling_result_count then recycler.result_inventory_size = recycling_result_count end -end - - --- Fix item weights - -local function set_default_weight(item, items_per_rocket, type) - data.raw[type or "item"][item].weight = data.raw[type or "item"][item].weight or 1000 * kg / items_per_rocket -end -set_default_weight("electronic-circuit", 2000) -set_default_weight("advanced-circuit", 1000) -set_default_weight("processing-unit", 300) -set_default_weight("low-density-structure", 200) -set_default_weight("rocket-fuel", 100) -set_default_weight("inserter", 50) -set_default_weight("fast-inserter", 50) -set_default_weight("electric-mining-drill", 50) -set_default_weight("pumpjack", 20) -set_default_weight("repair-pack", 100, "repair-tool") -set_default_weight("big-electric-pole", 50) -set_default_weight("assembling-machine-1", 50) -set_default_weight("assembling-machine-2", 50) -set_default_weight("oil-refinery", 10) -set_default_weight("accumulator", 50) -set_default_weight("steam-engine", 10) -set_default_weight("substation", 50) -set_default_weight("radar", 50) -set_default_weight("storage-tank", 50) -set_default_weight("fast-transport-belt", 100) -set_default_weight("fast-underground-belt", 50) -set_default_weight("fast-splitter", 50) -set_default_weight("steel-plate", 400) -set_default_weight("steam-turbine", 10) -set_default_weight("battery", 400) \ No newline at end of file +end \ No newline at end of file From df7c8bac98d32071b52299d1a56876de7aa15a7d Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 9 Dec 2025 00:20:16 +0100 Subject: [PATCH 04/46] 1.0.75 --- lignumis/changelog.txt | 9 +++++++++ lignumis/info.json | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index 0fe9c1d..48e6a61 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,13 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.75 +Date: 09.12.2025 + Changes: + - Add is_satellite to PlanetsLib:extend + - Remove default item weights as the code has been moved to PlanetsLib + Bug Fixes: + - Recycling in Factoriopedia: Add order to bioprocessing subgroup for compatibility (thanks jvella94) + - Crushing Industry: Use additional_categories for quality assembling so the rocket silo recipe will use concrete mix again +--------------------------------------------------------------------------------------------------- Version: 1.0.74 Date: 18.11.2025 Bug Fixes: diff --git a/lignumis/info.json b/lignumis/info.json index 2e43e9b..eaa09c2 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,6 +1,6 @@ { "name": "lignumis", - "version": "1.0.74", + "version": "1.0.75", "title": "Lignumis", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis planet mod effects other planets and space ships. Make sure to read the description on the mod portal and check the mod settings.", "author": "cackling fiend", @@ -19,7 +19,7 @@ "mf-buildings >= 1.0.7", "mf-core >= 1.0.3", "mf-logistics >= 1.0.1", - "PlanetsLib >= 1.1.26", + "PlanetsLib >= 1.14.7", "pollution-as-surface-property", "Wood-Walls >= 1.2.0", "vulcanus-sulfuric-bacteria", From 14badb6b6fc8209f2eee7c99694ba92dafb6e6ca Mon Sep 17 00:00:00 2001 From: Jurgen Date: Sun, 7 Dec 2025 14:18:35 +0100 Subject: [PATCH 05/46] Canal excavator compatibility --- lignumis/info.json | 1 + .../prototypes/compatibility/canal-excavator.lua | 14 ++++++++++++++ lignumis/prototypes/compatibility/data.lua | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 lignumis/prototypes/compatibility/canal-excavator.lua diff --git a/lignumis/info.json b/lignumis/info.json index eaa09c2..6bb42db 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -40,6 +40,7 @@ "(?)Wood_Gasification_updated", "?wood-industry", "?wood-military >= 2.3.3", + "?canal-excavator >= 1.9.0", "!apm_power_ldinc", "!early-agriculture", "!planet-picker", diff --git a/lignumis/prototypes/compatibility/canal-excavator.lua b/lignumis/prototypes/compatibility/canal-excavator.lua new file mode 100644 index 0000000..5a34a27 --- /dev/null +++ b/lignumis/prototypes/compatibility/canal-excavator.lua @@ -0,0 +1,14 @@ +if not mods["canal-excavator"] then return end + +data:extend({{ + type = "mod-data", + name = "canex-lignumis-config", + data_type = "canex-surface-config", + data = { + surfaceName = "lignumis", + localisation = {"space-location-name.lignumis"}, + mineResult = "stone", + oreStartingAmount = 10, + tint = {r = 102, g = 78, b = 6} + }, +}}) \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua index 6d649e2..cd63065 100644 --- a/lignumis/prototypes/compatibility/data.lua +++ b/lignumis/prototypes/compatibility/data.lua @@ -6,4 +6,5 @@ require("aai-loaders") require("nuclear-science") require("lane-splitters") require("wood-industry") -require("crushing-industry") \ No newline at end of file +require("crushing-industry") +require("canal-excavator") \ No newline at end of file From c6432920cfe5c07a4a6cc5e419d976286e9ef47d Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 10 Dec 2025 22:06:22 +0100 Subject: [PATCH 06/46] Use cf-lib Settings --- lignumis/settings/wood-military.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lignumis/settings/wood-military.lua b/lignumis/settings/wood-military.lua index 75ee975..01765eb 100644 --- a/lignumis/settings/wood-military.lua +++ b/lignumis/settings/wood-military.lua @@ -2,10 +2,12 @@ if not mods["wood-military"] then return end -data.raw["bool-setting"]["wood-military-rockets"].default_value = false -data.raw["bool-setting"]["wood-military-artillery"].default_value = false -data.raw["bool-setting"]["wood-military-damage-buff"].default_value = false -data.raw["bool-setting"]["wood-military-armor"].hidden = true -data.raw["bool-setting"]["wood-military-armor"].forced_value = true -data.raw["bool-setting"]["wood-military-nerf-start"].hidden = true -data.raw["bool-setting"]["wood-military-nerf-start"].forced_value = true \ No newline at end of file +local Settings = require("__cf-lib__/settings/Settings") +local force = Settings.force +local default = Settings.default + +default("wood-military-rockets", false) +default("wood-military-artillery", false) +default("wood-military-damage-buff", false) +force("wood-military-armor", true) +force("wood-military-nerf-start", true) \ No newline at end of file From 663779901d6fb270c2d95143f4e201bdd2a81916 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 10 Dec 2025 22:11:29 +0100 Subject: [PATCH 07/46] Use additional_categories for wood processing --- lignumis/prototypes/compatibility/aai-loaders.lua | 2 +- .../prototypes/compatibility/crushing-industry.lua | 7 +++---- lignumis/prototypes/compatibility/lane-splitters.lua | 2 +- lignumis/prototypes/content/basic-circuit-board.lua | 6 ++++-- lignumis/prototypes/content/basic-gun-turret.lua | 2 +- .../prototypes/content/burner-agricultural-tower.lua | 6 ++++-- .../prototypes/content/burner-assembling-machine.lua | 6 ++---- .../prototypes/content/burner-long-handed-inserter.lua | 5 ++--- lignumis/prototypes/content/lumber-mill.lua | 10 ++++------ lignumis/prototypes/content/lumber.lua | 3 ++- .../prototypes/content/steam-assembling-machine.lua | 1 - lignumis/prototypes/content/wood-lab.lua | 3 ++- lignumis/prototypes/content/wood-logistics.lua | 8 ++++---- lignumis/prototypes/content/wood-military.lua | 3 ++- lignumis/prototypes/content/wooden-gearwheel.lua | 3 ++- lignumis/prototypes/integrations/Wood-Walls.lua | 2 +- lignumis/prototypes/integrations/vanilla.lua | 8 +++----- 17 files changed, 38 insertions(+), 39 deletions(-) diff --git a/lignumis/prototypes/compatibility/aai-loaders.lua b/lignumis/prototypes/compatibility/aai-loaders.lua index 2137280..da3c063 100644 --- a/lignumis/prototypes/compatibility/aai-loaders.lua +++ b/lignumis/prototypes/compatibility/aai-loaders.lua @@ -46,7 +46,7 @@ AAILoaders.make_tier({ order = "d[loader]-a00[aai-wood-loader]" }) -data.raw.recipe["aai-wood-loader"].category = "wood-processing-or-assembling" +data.raw.recipe["aai-wood-loader"].additional_categories = { "wood-processing" } if not basic_circuit_board then local nauvis_recipe = Recipe:new("aai-wood-loader"):clone("wood-loader-electronic-circuit") diff --git a/lignumis/prototypes/compatibility/crushing-industry.lua b/lignumis/prototypes/compatibility/crushing-industry.lua index 9a88705..5b035c3 100644 --- a/lignumis/prototypes/compatibility/crushing-industry.lua +++ b/lignumis/prototypes/compatibility/crushing-industry.lua @@ -90,10 +90,9 @@ end local gold_recipe = Recipe:new("burner-crusher") :replaceIngredient("iron-gear-wheel", "wooden-gear-wheel") :replaceIngredient("iron-plate", "gold-plate") - :assign({ - category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or - "crafting" - }) +if settings.startup["lignumis-lumber-mill-more-recipes"].value then + gold_recipe.prototype.additional_categories = { "wood-processing" } +end gold_recipe:clone("burner-crusher-copper") :replaceIngredient("gold-plate", "copper-plate") diff --git a/lignumis/prototypes/compatibility/lane-splitters.lua b/lignumis/prototypes/compatibility/lane-splitters.lua index 5493840..075cc68 100644 --- a/lignumis/prototypes/compatibility/lane-splitters.lua +++ b/lignumis/prototypes/compatibility/lane-splitters.lua @@ -23,7 +23,7 @@ lane_splitter.prototype.structure_patch.west.filename = data.raw.splitter["wood- lane_splitter.prototype.structure_patch.north.filename = data.raw.splitter["wood-splitter"].structure_patch.north.filename lane_splitter.item.icon = Lignumis.graphics .. "icons/wood-lane-splitter.png" lane_splitter.item.order = "d[lane-splitter]-0[wood-lane-splitter]" -lane_splitter.recipe.category = "wood-processing-or-assembling" +lane_splitter.recipe.additional_categories = { "wood-processing" } data:extend({ lane_splitter.prototype, diff --git a/lignumis/prototypes/content/basic-circuit-board.lua b/lignumis/prototypes/content/basic-circuit-board.lua index 04dbf0a..8858fdf 100644 --- a/lignumis/prototypes/content/basic-circuit-board.lua +++ b/lignumis/prototypes/content/basic-circuit-board.lua @@ -19,7 +19,8 @@ data:extend({ { type = "recipe", name = "basic-circuit-board", - category = "wood-processing-or-assembling", + category = "crafting", + additional_categories = { "wood-processing" }, icons = { { icon = Lignumis.graphics .. "icons/basic-circuit-board.png" }, { icon = Lignumis.graphics .. "icons/gold-cable.png", scale = 0.25, shift = { 8, 8 } } @@ -36,7 +37,8 @@ data:extend({ type = "recipe", name = "basic-circuit-board-copper", localised_name = { "item-name.basic-circuit-board" }, - category = "wood-processing-or-assembling", + category = "crafting", + additional_categories = { "wood-processing" }, icons = { { icon = Lignumis.graphics .. "icons/basic-circuit-board.png" }, { icon = "__base__/graphics/icons/copper-cable.png", scale = 0.25, shift = { 8, 8 } } diff --git a/lignumis/prototypes/content/basic-gun-turret.lua b/lignumis/prototypes/content/basic-gun-turret.lua index 335010b..3935386 100644 --- a/lignumis/prototypes/content/basic-gun-turret.lua +++ b/lignumis/prototypes/content/basic-gun-turret.lua @@ -58,7 +58,7 @@ local turret_recipe = { results = { { type = "item", name = "basic-gun-turret", amount = 1 } } } if settings.startup["lignumis-lumber-mill-more-recipes"].value then - turret_recipe.category = "wood-processing-or-assembling" + turret_recipe.additional_categories = { "wood-processing" } end local turret_technology = { diff --git a/lignumis/prototypes/content/burner-agricultural-tower.lua b/lignumis/prototypes/content/burner-agricultural-tower.lua index e76a2da..dc5a31e 100644 --- a/lignumis/prototypes/content/burner-agricultural-tower.lua +++ b/lignumis/prototypes/content/burner-agricultural-tower.lua @@ -84,7 +84,8 @@ data:extend({ { type = "recipe", name = "burner-agricultural-tower", - category = "wood-processing-or-assembling", + category = "crafting", + additional_categories = { "wood-processing" }, energy_required = 10, ingredients = { { type = "item", name = "stone-brick", amount = 5 }, @@ -116,7 +117,8 @@ data:extend({ { type = "recipe", name = "burner-agricultural-tower-copper", - category = "wood-processing-or-assembling", + category = "crafting", + additional_categories = { "wood-processing" }, localised_name = { "entity-name.burner-agricultural-tower" }, icons = { { icon = Lignumis.graphics .. "icons/burner-agricultural-tower.png" }, diff --git a/lignumis/prototypes/content/burner-assembling-machine.lua b/lignumis/prototypes/content/burner-assembling-machine.lua index 58cd14b..0c46bad 100644 --- a/lignumis/prototypes/content/burner-assembling-machine.lua +++ b/lignumis/prototypes/content/burner-assembling-machine.lua @@ -17,7 +17,6 @@ assembling_machine.crafting_categories = { "crafting", "electronics", "pressing", - "wood-processing-or-assembling", "organic-or-assembling", "electronics-or-assembling", "metallurgy-or-assembling" @@ -50,8 +49,6 @@ remnants.animation[2].filename = gfx .. "burner-assembling-machine-remnants.png" remnants.animation[3].filename = gfx .. "burner-assembling-machine-remnants.png" remnants.order = "0[burner-assembling-machine]" -local crafting_category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or "crafting" - data:extend({ assembling_machine, remnants, @@ -70,7 +67,8 @@ data:extend({ { type = "recipe", name = "burner-assembling-machine", - category = crafting_category, + category = "crafting", + additional_categories = settings.startup["lignumis-lumber-mill-more-recipes"].value and { "wood-processing" } or nil, enabled = false, ingredients = { { type = "item", name = "wooden-gear-wheel", amount = 5 }, diff --git a/lignumis/prototypes/content/burner-long-handed-inserter.lua b/lignumis/prototypes/content/burner-long-handed-inserter.lua index de8a785..b6dffcf 100644 --- a/lignumis/prototypes/content/burner-long-handed-inserter.lua +++ b/lignumis/prototypes/content/burner-long-handed-inserter.lua @@ -44,8 +44,6 @@ remnants.animation[3].filename = gfx .. "burner-long-handed-inserter-remnants.pn remnants.animation[4].filename = gfx .. "burner-long-handed-inserter-remnants.png" remnants.order = "a-c-0" -local crafting_category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or "crafting" - data:extend({ long_handed_inserter, remnants, @@ -65,7 +63,8 @@ data:extend({ { type = "recipe", name = "burner-long-handed-inserter", - category = crafting_category, + category = "crafting", + additional_categories = settings.startup["lignumis-lumber-mill-more-recipes"].value and { "wood-processing" } or nil, enabled = false, ingredients = { { type = "item", name = "wooden-gear-wheel", amount = 1 }, diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 0bb904c..8419fbd 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -7,19 +7,17 @@ local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].val data:extend({ { type = "recipe-category", - name = "wood-processing-or-assembling" + name = "wood-processing" } }) -table.insert(data.raw["character"]["character"].crafting_categories, "wood-processing-or-assembling") - local has_oxygen = data.raw["surface-property"]["oxygen"] ~= nil LumberMill.EntityBuilder:new() :burnerEnergySource({ emissions_per_minute = { noise = 100 } }) :baseProductivity(0.5) :apply({ - crafting_categories = { "wood-processing-or-assembling" }, + crafting_categories = { "wood-processing" }, crafting_speed = 2, energy_usage = "1000kW", surface_conditions = { @@ -50,7 +48,7 @@ LumberMill.RecipeBuilder:new() { type = "item", name = "burner-assembling-machine", amount = 2 } })) :apply({ - category = "wood-processing-or-assembling" + additional_categories = { "wood-processing" } }) LumberMill.TechnologyBuilder:new() @@ -72,7 +70,7 @@ LumberMill.RecipeBuilder:new() :apply({ name = "lumber-mill-copper", localised_name = { "entity-name.lumber-mill" }, - category = "wood-processing-or-assembling", + additional_categories = { "wood-processing" }, icons = { { icon = lumber_mill_item.icon }, { icon = basic_circuit_board and "__base__/graphics/icons/copper-plate.png" or "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } diff --git a/lignumis/prototypes/content/lumber.lua b/lignumis/prototypes/content/lumber.lua index 8cb9b14..2d0d1de 100644 --- a/lignumis/prototypes/content/lumber.lua +++ b/lignumis/prototypes/content/lumber.lua @@ -23,7 +23,8 @@ data:extend({ { type = "recipe", name = "lumber", - category = "wood-processing-or-assembling", + category = "crafting", + additional_categories = { "wood-processing" }, allow_productivity = true, allow_as_intermediate = true, ingredients = { { type = "item", name = "wood", amount = 2 } }, diff --git a/lignumis/prototypes/content/steam-assembling-machine.lua b/lignumis/prototypes/content/steam-assembling-machine.lua index da5ef2d..687ed02 100644 --- a/lignumis/prototypes/content/steam-assembling-machine.lua +++ b/lignumis/prototypes/content/steam-assembling-machine.lua @@ -20,7 +20,6 @@ assembling_machine.crafting_categories = { "crafting", "electronics", "pressing", - "wood-processing-or-assembling", "organic-or-assembling", "electronics-or-assembling", "metallurgy-or-assembling", diff --git a/lignumis/prototypes/content/wood-lab.lua b/lignumis/prototypes/content/wood-lab.lua index 7db5aec..2010910 100644 --- a/lignumis/prototypes/content/wood-lab.lua +++ b/lignumis/prototypes/content/wood-lab.lua @@ -144,7 +144,8 @@ data:extend({ { type = "recipe", name = "wood-lab", - category = "wood-processing-or-assembling", + category = "crafting", + additional_categories = { "wood-processing" }, energy_required = 2, ingredients = { { type = "item", name = "lumber", amount = 6 }, diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua index 78cb353..36048d4 100644 --- a/lignumis/prototypes/content/wood-logistics.lua +++ b/lignumis/prototypes/content/wood-logistics.lua @@ -58,13 +58,13 @@ Belt.RecipeBuilder:new() }) :apply({ transportBelt = { - category = "wood-processing-or-assembling" + additional_categories = { "wood-processing" } }, undergroundBelt = { - category = "wood-processing-or-assembling" + additional_categories = { "wood-processing" } }, splitter = { - category = "wood-processing-or-assembling" + additional_categories = { "wood-processing" } } }) @@ -91,7 +91,7 @@ if not basic_circuit_board then { icon = splitter_item.icon }, { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } }, - category = "wood-processing-or-assembling" + additional_categories = { "wood-processing" } } }) .splitter diff --git a/lignumis/prototypes/content/wood-military.lua b/lignumis/prototypes/content/wood-military.lua index 1dd775f..6c3e312 100644 --- a/lignumis/prototypes/content/wood-military.lua +++ b/lignumis/prototypes/content/wood-military.lua @@ -82,7 +82,8 @@ data:extend({ { type = "recipe", name = "wood-darts-magazine", - category = "wood-processing-or-assembling", + category = "crafting", + additional_categories = { "wood-processing" }, energy_required = 1, ingredients = { { type = "item", name = "wood", amount = 2 } }, results = { { type = "item", name = "wood-darts-magazine", amount = 1 } } diff --git a/lignumis/prototypes/content/wooden-gearwheel.lua b/lignumis/prototypes/content/wooden-gearwheel.lua index 229b175..0d57a98 100644 --- a/lignumis/prototypes/content/wooden-gearwheel.lua +++ b/lignumis/prototypes/content/wooden-gearwheel.lua @@ -17,7 +17,8 @@ data:extend({ { type = "recipe", name = "wooden-gear-wheel", - category = "wood-processing-or-assembling", + category = "crafting", + additional_categories = { "wood-processing" }, ingredients = { { type = "item", name = "lumber", amount = 1 } }, results = { { type = "item", name = "wooden-gear-wheel", amount = 2 } }, allow_productivity = true diff --git a/lignumis/prototypes/integrations/Wood-Walls.lua b/lignumis/prototypes/integrations/Wood-Walls.lua index d1f11d5..884dfdd 100644 --- a/lignumis/prototypes/integrations/Wood-Walls.lua +++ b/lignumis/prototypes/integrations/Wood-Walls.lua @@ -1,4 +1,4 @@ local recipe = data.raw.recipe["wooden-wall"] recipe.ingredients = { { type = "item", name = "lumber", amount = 4 } } recipe.results = { { type = "item", name = "wooden-wall", amount = 1 } } -recipe.category = "wood-processing-or-assembling" \ No newline at end of file +recipe.additional_categories = { "wood-processing" } \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index 92ae192..9c51438 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -21,7 +21,8 @@ local drill_item = data.raw["item"]["burner-mining-drill"] drill_item.icon = Lignumis.graphics .. "icons/burner-mining-drill.png" local drill_recipe = data.raw["recipe"]["burner-mining-drill"] -drill_recipe.category = "wood-processing-or-assembling" +drill_recipe.category = "crafting" +drill_recipe.additional_categories = { "wood-processing" } drill_recipe.ingredients = { { type = "item", name = "stone-furnace", amount = 1 }, { type = "item", name = "wooden-gear-wheel", amount = basic_circuit_board and 2 or 3 }, @@ -48,7 +49,7 @@ burner_inserter_recipe.ingredients = { { type = "item", name = "lumber", amount = 1 } } if settings.startup["lignumis-lumber-mill-more-recipes"].value then - burner_inserter_recipe.category = "wood-processing-or-assembling" + burner_inserter_recipe.additional_categories = { "wood-processing" } end @@ -131,10 +132,7 @@ if mods["Diversitree"] then data.raw.plant["s6xdvt-fake-tree"].surface_conditions[1].min = 900 end -table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "wood-processing-or-assembling") table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "organic-or-assembling") -table.insert(data.raw["assembling-machine"]["assembling-machine-2"].crafting_categories, "wood-processing-or-assembling") -table.insert(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories, "wood-processing-or-assembling") -- Disable vanilla early game recipes From 996fd2f7c489e93a48e43505d68d5539fb5cc551 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Fri, 12 Dec 2025 18:25:42 +0100 Subject: [PATCH 08/46] Add support for wood logistics --- lignumis/info.json | 50 ++-- lignumis/prototypes/content/lumber-mill.lua | 140 ++++++++--- lignumis/prototypes/content/lumber.lua | 67 +++--- lignumis/prototypes/content/noise.lua | 6 +- .../prototypes/content/wood-logistics.lua | 225 +++++++++++------- lignumis/settings/updates.lua | 1 + lignumis/settings/wood-logistics.lua | 20 ++ 7 files changed, 326 insertions(+), 183 deletions(-) create mode 100644 lignumis/settings/wood-logistics.lua diff --git a/lignumis/info.json b/lignumis/info.json index 6bb42db..2e01294 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -12,7 +12,7 @@ "space-age >= 2.0.53", "astroponics >= 1.2.0", "bioprocessing-tab", - "cf-lib >= 0.0.13", + "cf-lib >= 1.1.0", "flib", "gleba-water-cane", "lignumis-assets >= 1.0.3", @@ -23,29 +23,29 @@ "pollution-as-surface-property", "Wood-Walls >= 1.2.0", "vulcanus-sulfuric-bacteria", - "?aai-industry", - "?aai-loaders", - "?aai-loaders-sane", - "?any-planet-start", - "?atan-nuclear-science", - "?crushing-industry", - "?Diversitree", - "?fulgora-coralmium-agriculture", - "?gleba-reborn", - "?hot-metals >= 1.1.0", - "?Krastorio2-spaced-out", - "?lane-splitters", - "?metal-and-stars", - "(?)secretas", - "(?)Wood_Gasification_updated", - "?wood-industry", - "?wood-military >= 2.3.3", - "?canal-excavator >= 1.9.0", - "!apm_power_ldinc", - "!early-agriculture", - "!planet-picker", - "!wood-logistics", - "!wood-universe-modpack", - "!rso-mod" + "? aai-industry", + "? aai-loaders", + "? aai-loaders-sane", + "? any-planet-start", + "? crushing-industry", + "? fulgora-coralmium-agriculture", + "? hot-metals >= 1.1.0", + "? lane-splitters", + "? wood-industry", + "? wood-military >= 2.3.3", + "? canal-excavator >= 1.9.0", + "? wood-logistics", + "(?) atan-nuclear-science", + "(?) Diversitree", + "(?) gleba-reborn", + "(?) Krastorio2-spaced-out", + "(?) metal-and-stars", + "(?) secretas", + "(?) Wood_Gasification_updated", + "! apm_power_ldinc", + "! early-agriculture", + "! planet-picker", + "! wood-universe-modpack", + "! rso-mod" ] } \ No newline at end of file diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 8419fbd..ac57acb 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -1,3 +1,4 @@ +local Recipe = require("__cf-lib__/data/Recipe") local Technology = require("__cf-lib__/data/Technology") local LumberMillFactory = require(MF.buildings .. "LumberMill") local LumberMill = LumberMillFactory() @@ -13,68 +14,137 @@ data:extend({ local has_oxygen = data.raw["surface-property"]["oxygen"] ~= nil -LumberMill.EntityBuilder:new() - :burnerEnergySource({ emissions_per_minute = { noise = 100 } }) - :baseProductivity(0.5) - :apply({ - crafting_categories = { "wood-processing" }, +if not mods["wood-logistics"] then + LumberMill.EntityBuilder:new() + :burnerEnergySource({ emissions_per_minute = { noise = 100 } }) + :baseProductivity(0.5) + :apply({ + crafting_categories = { "wood-processing" }, crafting_speed = 2, energy_usage = "1000kW", surface_conditions = { { - property = has_oxygen and "oxygen" or "pressure", - min = 3 + property = has_oxygen and "oxygen" or "pressure", + min = 3 }, { - property = "gravity", - min = 1 + property = "gravity", + min = 1 } - } + } }) -local lumber_mill_item = LumberMill.ItemBuilder:new() - :apply({ + local lumber_mill_item = LumberMill.ItemBuilder:new() + :apply({ default_import_location = "lignumis", order = "2[lumber-mill]" }) -LumberMill.RecipeBuilder:new() - :ingredients(table.trim({ - { type = "item", name = "stone-brick", amount = 40 }, - { type = "item", name = "lumber", amount = 50 }, + LumberMill.RecipeBuilder:new() + :ingredients(table.trim({ + { type = "item", name = "stone-brick", amount = 40 }, + { type = "item", name = "lumber", amount = 50 }, { type = "item", name = "wooden-gear-wheel", amount = 50 }, - { type = "item", name = "gold-plate", amount = basic_circuit_board and 20 or 40 }, + { type = "item", name = "gold-plate", amount = basic_circuit_board and 20 or 40 }, basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 20 } or nil, { type = "item", name = "burner-assembling-machine", amount = 2 } })) - :apply({ - additional_categories = { "wood-processing" } + :apply({ + additional_categories = { "wood-processing" } }) -LumberMill.TechnologyBuilder:new() - :prerequisites({ "steam-science-pack" }) - :count(250) - :time(15) - :ingredients({ { "wood-science-pack", 1 }, { "steam-science-pack", 1 } }) - :apply() + LumberMill.TechnologyBuilder:new() + :prerequisites({ "steam-science-pack" }) + :count(250) + :time(15) + :ingredients({ { "wood-science-pack", 1 }, { "steam-science-pack", 1 } }) + :apply() -LumberMill.RecipeBuilder:new() - :ingredients({ - { type = "item", name = "stone-brick", amount = 40 }, - { type = "item", name = "lumber", amount = 50 }, - { type = "item", name = "wooden-gear-wheel", amount = 50 }, - { type = "item", name = "copper-plate", amount = basic_circuit_board and 20 or 40 }, + LumberMill.RecipeBuilder:new() + :ingredients({ + { type = "item", name = "stone-brick", amount = 40 }, + { type = "item", name = "lumber", amount = 50 }, + { type = "item", name = "wooden-gear-wheel", amount = 50 }, + { type = "item", name = "copper-plate", amount = basic_circuit_board and 20 or 40 }, { type = "item", name = basic_circuit_board and "basic-circuit-board" or "electronic-circuit", amount = 20 }, - { type = "item", name = "assembling-machine-1", amount = 2 } + { type = "item", name = "assembling-machine-1", amount = 2 } }) - :apply({ + :apply({ name = "lumber-mill-copper", localised_name = { "entity-name.lumber-mill" }, - additional_categories = { "wood-processing" }, + additional_categories = { "wood-processing" }, icons = { { icon = lumber_mill_item.icon }, { icon = basic_circuit_board and "__base__/graphics/icons/copper-plate.png" or "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } } }) -Technology:new(basic_circuit_board and "copper-processing" or "electronics"):addRecipe("lumber-mill-copper") + Technology:new(basic_circuit_board and "copper-processing" or "electronics"):addRecipe("lumber-mill-copper") +else + table.assign(data.raw["assembling-machine"]["lumber-mill"], { + energy_source = { + type = "burner", + fuel_categories = { "chemical" }, + effectivity = 1, + fuel_inventory_size = 3, + emissions_per_minute = { pollution = 10, noise = 100 }, + }, + crafting_categories = { "wood-processing" }, + energy_usage = "1000kW", + module_slots = 4, + max_health = 500, + surface_conditions = { + { + property = has_oxygen and "oxygen" or "pressure", + min = 3 + }, + { + property = "gravity", + min = 1 + } + } + }) + + data.raw.item["lumber-mill"].default_import_location = "lignumis" + + table.assign(data.raw.recipe["lumber-mill"], { + additional_categories = { "wood-processing" }, + ingredients = table.trim({ + { type = "item", name = "stone-brick", amount = 40 }, + { type = "item", name = "lumber", amount = 50 }, + { type = "item", name = "wooden-gear-wheel", amount = 50 }, + { type = "item", name = "gold-plate", amount = basic_circuit_board and 20 or 40 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 20 } or nil, + { type = "item", name = "burner-assembling-machine", amount = 2 } + }) + }) + + table.assign(data.raw.technology["advanced-carpentry"], { + prerequisites = { "steam-science-pack" }, + unit = { + count = 250, + time = 15, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + } + } + }) + + Recipe:new("lumber-mill") + :clone("lumber-mill-copper") + :assign({ + localised_name = { "entity-name.lumber-mill" }, + icons = { + { icon = data.raw.item["lumber-mill"].icon }, + { icon = basic_circuit_board and "__base__/graphics/icons/copper-plate.png" or "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + } + }) + :replaceIngredient("gold-plate", "copper-plate") + :apply() + + Technology:new(basic_circuit_board and "copper-processing" or "electronics"):addRecipe("lumber-mill-copper") +end + +Recipe:new("wooden-chest"):addCategory("wood-processing") +Recipe:new("small-electric-pole"):addCategory("wood-processing") \ No newline at end of file diff --git a/lignumis/prototypes/content/lumber.lua b/lignumis/prototypes/content/lumber.lua index 2d0d1de..f3a46f1 100644 --- a/lignumis/prototypes/content/lumber.lua +++ b/lignumis/prototypes/content/lumber.lua @@ -1,34 +1,39 @@ local item_sounds = require("__base__.prototypes.item_sounds") +local Recipe = require("__cf-lib__/data/Recipe") -data:extend({ - { - type = "item", - name = "lumber", - icon = Lignumis.graphics .. "icons/lumber.png", - pictures = { - { filename = Lignumis.graphics .. "icons/lumber.png", size = 64, scale = 0.5 }, - { filename = Lignumis.graphics .. "icons/lumber-1.png", size = 64, scale = 0.5 }, - { filename = Lignumis.graphics .. "icons/lumber-2.png", size = 64, scale = 0.5 }, +if not mods["wood-logistics"] then + data:extend({ + { + type = "item", + name = "lumber", + icon = Lignumis.graphics .. "icons/lumber.png", + pictures = { + { filename = Lignumis.graphics .. "icons/lumber.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/lumber-1.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/lumber-2.png", size = 64, scale = 0.5 }, + }, + subgroup = "intermediate-product", + order = "A[basic-intermediates]-c[lumber]", + inventory_move_sound = item_sounds.wood_inventory_move, + pick_sound = item_sounds.wood_inventory_pickup, + drop_sound = item_sounds.wood_inventory_move, + stack_size = 100, + random_tint_color = { 1.0, 0.95, 0.9, 1.0 }, + fuel_category = "wood", + fuel_value = "4MJ" }, - subgroup = "intermediate-product", - order = "A[basic-intermediates]-c[lumber]", - inventory_move_sound = item_sounds.wood_inventory_move, - pick_sound = item_sounds.wood_inventory_pickup, - drop_sound = item_sounds.wood_inventory_move, - stack_size = 100, - random_tint_color = { 1.0, 0.95, 0.9, 1.0 }, - fuel_category = "wood", - fuel_value = "4MJ" - }, - { - type = "recipe", - name = "lumber", - category = "crafting", - additional_categories = { "wood-processing" }, - allow_productivity = true, - allow_as_intermediate = true, - ingredients = { { type = "item", name = "wood", amount = 2 } }, - results = { { type = "item", name = "lumber", amount = 1 } }, - energy_required = 1 - } -}) + { + type = "recipe", + name = "lumber", + category = "crafting", + additional_categories = { "wood-processing" }, + allow_productivity = true, + allow_as_intermediate = true, + ingredients = { { type = "item", name = "wood", amount = 2 } }, + results = { { type = "item", name = "lumber", amount = 1 } }, + energy_required = 1 + } + }) +else + Recipe:new("lumber"):addCategory("wood-processing") +end \ No newline at end of file diff --git a/lignumis/prototypes/content/noise.lua b/lignumis/prototypes/content/noise.lua index 4474df5..0505138 100644 --- a/lignumis/prototypes/content/noise.lua +++ b/lignumis/prototypes/content/noise.lua @@ -100,17 +100,17 @@ emit("lab", "biolab", 20) emit("locomotive", "locomotive", 200) emit_constant("locomotive", "locomotive", 10) ---emit_constant("transport-belt", "wood-transport-belt", 2) +emit_constant("transport-belt", "wood-transport-belt", 2) emit_constant("transport-belt", "transport-belt", 3) emit_constant("transport-belt", "fast-transport-belt", 4) emit_constant("transport-belt", "express-transport-belt", 6) emit_constant("transport-belt", "turbo-transport-belt", 8) ---emit_constant("underground-belt", "wood-underground-belt", 7.5) +emit_constant("underground-belt", "wood-underground-belt", 7.5) emit_constant("underground-belt", "underground-belt", 10) emit_constant("underground-belt", "fast-underground-belt", 20) emit_constant("underground-belt", "express-underground-belt", 30) emit_constant("underground-belt", "turbo-underground-belt", 40) ---emit_constant("splitter", "wood-splitter", 20) +emit_constant("splitter", "wood-splitter", 20) emit_constant("splitter", "splitter", 30) emit_constant("splitter", "fast-splitter", 40) emit_constant("splitter", "express-splitter", 50) diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua index 36048d4..a2eef43 100644 --- a/lignumis/prototypes/content/wood-logistics.lua +++ b/lignumis/prototypes/content/wood-logistics.lua @@ -1,104 +1,151 @@ local BeltFactory = require(MF.logistics .. "Belts") local Belt = BeltFactory("wood", "brown", "slow") +local Recipe = require("__cf-lib__/data/Recipe") +local Item = require("__cf-lib__/data/Item") local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value -Belt.EntityBuilder:new() - :itemsPerSecond(7.5) - :nextTier("") - :undergroundDistance(4) - :animationSpeedMultiplier(1.01) - :apply({ - transportBelt = { - emissions_per_second = { noise = 2 / 60 } - }, - undergroundBelt = { - emissions_per_second = { noise = 7.5 / 60 }, - factoriopedia_simulation = { - init = - [[ - game.simulation.camera_position = {0, 0.5} - game.simulation.camera_zoom = 1.8 - game.surfaces[1].create_entities_from_blueprint_string - { - string = "0eNqVUNsKgzAM/Zc81+FEBfsrYwwvQQKaltpuivjvS3Wwh8HGnkKSc0tWaIaA1hF70CtMXNvEm6R31MV+Bl0oWECfNwXUGp5AXwRGPddDBHA9Imh4GNMlgTt0vTNSkwYHD5EjsznSrwqQPXnCQ2JvlhuHsUEnAPVdSoE1k7ANv2KlpyOYVLHpyGF7bHMFfrFRidiGGOLDLPvXLP9tZoLf3eRO8jjK5P1YBXd0004oyqzKq6ooqzLNinLbnvlmf6E=", - position = {-0.5, 0} +if not mods["wood-logistics"] then + Belt.EntityBuilder:new() + :itemsPerSecond(7.5) + :nextTier("") + :undergroundDistance(4) + :animationSpeedMultiplier(1.01) + :apply({ + transportBelt = { + emissions_per_second = { noise = 2 / 60 } + }, + undergroundBelt = { + emissions_per_second = { noise = 7.5 / 60 }, + factoriopedia_simulation = { + init = + [[ + game.simulation.camera_position = {0, 0.5} + game.simulation.camera_zoom = 1.8 + game.surfaces[1].create_entities_from_blueprint_string + { + string = "0eNqVUNsKgzAM/Zc81+FEBfsrYwwvQQKaltpuivjvS3Wwh8HGnkKSc0tWaIaA1hF70CtMXNvEm6R31MV+Bl0oWECfNwXUGp5AXwRGPddDBHA9Imh4GNMlgTt0vTNSkwYHD5EjsznSrwqQPXnCQ2JvlhuHsUEnAPVdSoE1k7ANv2KlpyOYVLHpyGF7bHMFfrFRidiGGOLDLPvXLP9tZoLf3eRO8jjK5P1YBXd0004oyqzKq6ooqzLNinLbnvlmf6E=", + position = {-0.5, 0} + } + ]] } - ]] + }, + splitter = { + emissions_per_second = { noise = 20 / 60 } } - }, - splitter = { - emissions_per_second = { noise = 20 / 60 } - } - }) + }) -local splitter_item = Belt.ItemBuilder:new() - :itemsPerRocket("transportBelt", 200) - :itemsPerRocket("undergroundBelt", 100) - :itemsPerRocket("splitter", 100) - :order("0") - :apply() - .splitter + local splitter_item = Belt.ItemBuilder:new() + :itemsPerRocket("transportBelt", 200) + :itemsPerRocket("undergroundBelt", 100) + :itemsPerRocket("splitter", 100) + :order("0") + :apply() + .splitter -Belt.RecipeBuilder:new() - :beltAmount(2) - :ingredients("transportBelt", { - { type = "item", name = "lumber", amount = 1 }, - { type = "item", name = "wooden-gear-wheel", amount = 1 } - }) - :ingredients("undergroundBelt", { - { type = "item", name = "lumber", amount = 1 }, - { type = "item", name = "wood-transport-belt", amount = 4 }, - }) - :ingredients("splitter", { - { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or - { type = "item", name = "gold-cable", amount = 10 } - }) - :apply({ - transportBelt = { + Belt.RecipeBuilder:new() + :beltAmount(2) + :ingredients("transportBelt", { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "wooden-gear-wheel", amount = 1 } + }) + :ingredients("undergroundBelt", { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "wood-transport-belt", amount = 4 }, + }) + :ingredients("splitter", { + { type = "item", name = "wood-transport-belt", amount = 2 }, + { type = "item", name = "lumber", amount = 2 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or + { type = "item", name = "gold-cable", amount = 10 } + }) + :apply({ + transportBelt = { + additional_categories = { "wood-processing" } + }, + undergroundBelt = { + additional_categories = { "wood-processing" } + }, + splitter = { + additional_categories = { "wood-processing" } + } + }) + + Belt.TechnologyBuilder:new() + :prerequisites({ "wood-science-pack" }) + :ingredients({ { "wood-science-pack", 1 } }) + :count(10) + :time(10) + :apply() + + if not basic_circuit_board then + data:extend({ + Belt.RecipeBuilder:new() + :ingredients("splitter", { + { type = "item", name = "wood-transport-belt", amount = 2 }, + { type = "item", name = "lumber", amount = 2 }, + { type = "item", name = "electronic-circuit", amount = 2 } + }) + :build({ + splitter = { + name = "wood-splitter-electronic-circuit", + localised_name = { "entity-name.wood-splitter" }, + icons = { + { icon = splitter_item.icon }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + }, + additional_categories = { "wood-processing" } + } + }) + .splitter + }) + + table.insert(data.raw.technology["electronics"].effects, { + type = "unlock-recipe", + recipe = "wood-splitter-electronic-circuit" + }) + end + +else + Recipe:new("wood-transport-belt") + :replaceIngredient("copper-cable", "wooden-gear-wheel", 1) + :assign({ additional_categories = { "wood-processing" } - }, - undergroundBelt = { - additional_categories = { "wood-processing" } - }, - splitter = { - additional_categories = { "wood-processing" } - } - }) + }) -Belt.TechnologyBuilder:new() - :prerequisites({ "wood-science-pack" }) - :ingredients({ { "wood-science-pack", 1 } }) - :count(10) - :time(10) - :apply() + Recipe:new("wood-underground-belt") + :assign({ + additional_categories = { "wood-processing" } + }) -if not basic_circuit_board then - data:extend({ - Belt.RecipeBuilder:new() - :ingredients("splitter", { - { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - { type = "item", name = "electronic-circuit", amount = 2 } - }) - :build({ - splitter = { - name = "wood-splitter-electronic-circuit", - localised_name = { "entity-name.wood-splitter" }, - icons = { - { icon = splitter_item.icon }, - { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } - }, - additional_categories = { "wood-processing" } + Recipe:new("wood-splitter") + :replaceIngredient("copper-cable", basic_circuit_board and "basic-circuit-board" or "gold-cable", basic_circuit_board and 5 or nil) + :assign({ + additional_categories = { "wood-processing" } + }) + + if not basic_circuit_board then + Recipe:new("wood-splitter") + :clone("wood-splitter-electronic-circuit") + :replaceIngredient(basic_circuit_board and "gold-cable" or "basic-circuit-board", "electronic-circuit", 2) + :assign({ + localised_name = { "entity-name.wood-splitter" }, + icons = { + { icon = data.raw.item["wood-splitter"].icon }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } } }) - .splitter - }) + :unlockedByTechnology("electronics") + :apply() + end - table.insert(data.raw.technology["electronics"].effects, { - type = "unlock-recipe", - recipe = "wood-splitter-electronic-circuit" - }) -end + Item:new("wood-transport-belt") + :itemsPerRocket(200) + :defaultImportLocation("lignumis") + Item:new("wood-underground-belt") + :itemsPerRocket(100) + :defaultImportLocation("lignumis") + Item:new("wood-splitter") + :itemsPerRocket(100) + :defaultImportLocation("lignumis") +end \ No newline at end of file diff --git a/lignumis/settings/updates.lua b/lignumis/settings/updates.lua index aedfdff..37ac7b9 100644 --- a/lignumis/settings/updates.lua +++ b/lignumis/settings/updates.lua @@ -1 +1,2 @@ +require("wood-logistics") require("wood-military") \ No newline at end of file diff --git a/lignumis/settings/wood-logistics.lua b/lignumis/settings/wood-logistics.lua new file mode 100644 index 0000000..a4627a8 --- /dev/null +++ b/lignumis/settings/wood-logistics.lua @@ -0,0 +1,20 @@ +if not mods["wood-logistics"] then + return +end + +local Settings = require("__cf-lib__/settings/Settings") +local force = Settings.force +local default = Settings.default + +force("wood-logistics-lumber", true) +force("wood-logistics-lumber-mill", true) +force("wood-logistics-woodtronics", false) +force("wood-logistics-belts", true) +force("wood-logistics-belts-modify", false) +default("wood-logistics-belts-circuits", true) +force("wood-logistics-inserter", false) +default("wood-logistics-rail-cost", 0) +default("wood-logistics-cargo-wagon", false) +force("wood-logistics-assembling-machine", false) +default("wood-logistics-nerf-small-electric-pole", false) +force("wood-logistics-repair-pack-cost", 0) \ No newline at end of file From 61c2d30dd79ab7c11532596972fa41a1ec9796f1 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Fri, 12 Dec 2025 22:14:31 +0100 Subject: [PATCH 09/46] Diversitree: Improve compatibility --- lignumis/prototypes/compatibility/data.lua | 3 ++- lignumis/prototypes/compatibility/diversitree.lua | 12 ++++++++++++ lignumis/prototypes/integrations/vanilla.lua | 6 +----- 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 lignumis/prototypes/compatibility/diversitree.lua diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua index cd63065..0ed7173 100644 --- a/lignumis/prototypes/compatibility/data.lua +++ b/lignumis/prototypes/compatibility/data.lua @@ -7,4 +7,5 @@ require("nuclear-science") require("lane-splitters") require("wood-industry") require("crushing-industry") -require("canal-excavator") \ No newline at end of file +require("canal-excavator") +require("diversitree") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/diversitree.lua b/lignumis/prototypes/compatibility/diversitree.lua new file mode 100644 index 0000000..af5e8f1 --- /dev/null +++ b/lignumis/prototypes/compatibility/diversitree.lua @@ -0,0 +1,12 @@ +if not mods["Diversitree"] then + return +end + +data.raw.plant["s6xdvt-fake-tree"].surface_conditions[1].min = 900 + +local tree_plant = data.raw.plant["s6xdvt-fake-tree"] +tree_plant.growth_ticks = 5 * minute +tree_plant.minable.results = { { type = "item", name = "wood", amount = 5 } } +tree_plant.minable.count = nil +tree_plant.surface_conditions[1].min = 900 +table.insert(tree_plant.autoplace.tile_restriction, "natural-gold-soil") \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index 9c51438..61b17a5 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -111,7 +111,7 @@ for _, tree in pairs(data.raw.tree) do if not isRegularTree then goto continue end tree.minable.result = nil tree.minable.count = nil - local woodResult = { type = "item", name = "wood", amount = nil, amount_min = 2, amount_max = 10 } + local woodResult = { type = "item", name = "wood", amount = nil, amount_min = 2, amount_max = 8 } if minable.results and #woodResults > 0 then table.assign(woodResults[1], woodResult) woodResults[1].amount = nil @@ -128,10 +128,6 @@ tree_plant.minable.count = nil tree_plant.surface_conditions[1].min = 900 table.insert(tree_plant.autoplace.tile_restriction, "natural-gold-soil") -if mods["Diversitree"] then - data.raw.plant["s6xdvt-fake-tree"].surface_conditions[1].min = 900 -end - table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "organic-or-assembling") From aca569cc584478b049f873d19070e1b5190ccb5e Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Fri, 12 Dec 2025 23:25:55 +0100 Subject: [PATCH 10/46] 1.0.76 --- lignumis/changelog.txt | 10 +++++++++- lignumis/info.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index 48e6a61..48c8bca 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,12 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.76 +Date: 12.12.2025 + Changes: + - Add compatibility for "Canal Excavator" (thanks jurgy) + - Add compatibility for "Wood Logistics" + - Diversitree: Improve compatibility + - Use additional_categories for wood processing +--------------------------------------------------------------------------------------------------- Version: 1.0.75 Date: 09.12.2025 Changes: @@ -92,7 +100,7 @@ Version: 1.0.62 Date: 02.09.2025 Changes: - Add spanish locales (thanks DFOXpro) - - Add compatibility for Alien Biomes (thanks Chromebomb) + - Add compatibility for "Alien Biomes" (thanks Chromebomb) - The lumber mill can be built on Vulcanus again --------------------------------------------------------------------------------------------------- Version: 1.0.61 diff --git a/lignumis/info.json b/lignumis/info.json index 2e01294..c3a157d 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,6 +1,6 @@ { "name": "lignumis", - "version": "1.0.75", + "version": "1.0.76", "title": "Lignumis", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis planet mod effects other planets and space ships. Make sure to read the description on the mod portal and check the mod settings.", "author": "cackling fiend", From 15a857e689046a3b6d9ec4a3a0e2b91f892a5b46 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Fri, 12 Dec 2025 23:33:14 +0100 Subject: [PATCH 11/46] Correct description of quality assembler --- lignumis/locale/de/strings.cfg | 2 +- lignumis/locale/en/strings.cfg | 2 +- lignumis/locale/es-ES/strings.cfg | 2 +- lignumis/locale/ru/strings.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lignumis/locale/de/strings.cfg b/lignumis/locale/de/strings.cfg index 3c723c8..63a519a 100644 --- a/lignumis/locale/de/strings.cfg +++ b/lignumis/locale/de/strings.cfg @@ -52,7 +52,7 @@ lignumis-medium-wriggler-pentapod=Mittelgroßer Lignumis Fünfbein-Zapler [entity-description] lumber-mill=Fortschrittliche Maschine zur Holzbearbeitung. -quality-assembler=High-End-Montagemaschine, die nur die besten Maschinen herstellt. Verleiht 25% zusätzliche Qualität durch den Verbrauch von [item=gold-quality-catalyst]. Die Oberflächenbedingungen und Zutaten bleiben ansonsten unverändert. +quality-assembler=High-End-Montagemaschine, die nur die besten Maschinen herstellt. Verleiht 35% zusätzliche Qualität durch den Verbrauch von [item=gold-quality-catalyst]. Die Oberflächenbedingungen und Zutaten bleiben ansonsten unverändert. gold-stromatolite-plant=Sammle Gold-Stromatolithen für Bakterien, die Gold aus dem Boden anreichern.\n__REMARK_COLOR_BEGIN__Erwarteter Ertrag:__REMARK_COLOR_END__ 1.5 [item=gold-ore]/m [equipment-name] diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index 262ef96..ef74696 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -53,7 +53,7 @@ burner-lamp=Burner lamp [entity-description] lumber-mill=Advanced machine to process wood. -quality-assembler=High-end assembler to craft only the finest quality machines. It gives 25% additional quality by consuming [item=gold-quality-catalyst]. Surface conditions and ingredients are otherwise unchanged. +quality-assembler=High-end assembler to craft only the finest quality machines. It gives 35% additional quality by consuming [item=gold-quality-catalyst]. Surface conditions and ingredients are otherwise unchanged. gold-stromatolite-plant=Harvest gold stromatolites for bacteria that enrich gold from the ground.\n__REMARK_COLOR_BEGIN__Expected yield:__REMARK_COLOR_END__ 1.5 [item=gold-ore]/m [equipment-name] diff --git a/lignumis/locale/es-ES/strings.cfg b/lignumis/locale/es-ES/strings.cfg index 5131da5..3d78c3f 100644 --- a/lignumis/locale/es-ES/strings.cfg +++ b/lignumis/locale/es-ES/strings.cfg @@ -52,7 +52,7 @@ lignumis-medium-wriggler-pentapod=Pentápodo reptante mediano de Lignumis [entity-description] lumber-mill=Máquina avanzada para procesar madera. -quality-assembler=Ensamblador de alta gama para fabricar solo máquinas de la mejor calidad. Da un 25% de calidad adicional al consumir [item=gold-quality-catalyst]. Por lo demás, las condiciones de la superficie y los ingredientes no cambian. +quality-assembler=Ensamblador de alta gama para fabricar solo máquinas de la mejor calidad. Da un 35% de calidad adicional al consumir [item=gold-quality-catalyst]. Por lo demás, las condiciones de la superficie y los ingredientes no cambian. gold-stromatolite-plant=Recolecte estromatolitos de oro en busca de bacterias que enriquezcan el oro del suelo.\n__REMARK_COLOR_BEGIN__Rendimiento esperado:__REMARK_COLOR_END__ 1.5 [item=gold-ore]/m [equipment-name] diff --git a/lignumis/locale/ru/strings.cfg b/lignumis/locale/ru/strings.cfg index 1d8c517..03b9dc4 100644 --- a/lignumis/locale/ru/strings.cfg +++ b/lignumis/locale/ru/strings.cfg @@ -52,7 +52,7 @@ lignumis-medium-wriggler-pentapod=Средний пятиног-ползун Л [entity-description] lumber-mill=Продвинутая машина для обработки древесины. -quality-assembler=Высококачественный сборочный автомат, создающий только лучшие механизмы. Добавляет 25% дополнительного качества предмету, потребляя [item=gold-quality-catalyst]. Условия поверхности и ингредиенты остаются неизменными. +quality-assembler=Высококачественный сборочный автомат, создающий только лучшие механизмы. Добавляет 35% дополнительного качества предмету, потребляя [item=gold-quality-catalyst]. Условия поверхности и ингредиенты остаются неизменными. gold-stromatolite-plant=Собирайте золотой строматолит для получения бактерий, обогащающих золото из почвы.\n__REMARK_COLOR_BEGIN__Ожидаемая добыча:__REMARK_COLOR_END__ 1.5 [item=gold-ore]/m [equipment-name] From 141aa9a12432db408cadc16429afece37bfbb090 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 14 Dec 2025 01:14:39 +0100 Subject: [PATCH 12/46] Add Ko-fi to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0db4bfb..c8d614e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/ufvFUJtVwk)[![Forgejo](https://img.shields.io/badge/source%20code-%23f4f4f5?style=for-the-badge&logo=forgejo&logoColor=%23c2410c)](https://git.cacklingfiend.info/cacklingfiend/lignumis)[![Downloads](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fmods.factorio.com%2Fapi%2Fmods%2Flignumis&query=%24.downloads_count&suffix=%20Downloads&style=for-the-badge&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI%2FPgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI%2BCjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiB3aWR0aD0iMTIxNnB0IiBoZWlnaHQ9IjEyODBwdCIgdmlld0JveD0iMCAwIDEyMTYgMTI4MCIKIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiPgo8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLDEyODApIHNjYWxlKDAuMSwtMC4xKSIKZmlsbD0iI2ZmZmZmZiIgc3Ryb2tlPSJub25lIj4KPHBhdGggZD0iTTM0NzAgOTYwMCBsMCAtMzIwMCAtMTczMSAwIGMtOTUyIDAgLTE3MjkgLTQgLTE3MjcgLTggNCAtMTIgNjA2MgotNjM5MCA2MDY4IC02MzkwIDYgMCA2MDY0IDYzNzggNjA2OCA2MzkwIDIgNCAtNzc1IDggLTE3MjcgOCBsLTE3MzEgMCAwIDMyMDAKMCAzMjAwIC0yNjEwIDAgLTI2MTAgMCAwIC0zMjAweiIvPgo8L2c%2BCjwvc3ZnPgo%3D&label=&labelColor=%23e39827&color=%23e39827)](https://mods.factorio.com/mod/lignumis/metrics?range=last_two_months&type=mod_downloads) +[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/ufvFUJtVwk)[![Forgejo](https://img.shields.io/badge/source%20code-%23f4f4f5?style=for-the-badge&logo=forgejo&logoColor=%23c2410c)](https://git.cacklingfiend.info/cacklingfiend/lignumis)[![Downloads](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fmods.factorio.com%2Fapi%2Fmods%2Flignumis&query=%24.downloads_count&suffix=%20Downloads&style=for-the-badge&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI%2FPgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI%2BCjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiB3aWR0aD0iMTIxNnB0IiBoZWlnaHQ9IjEyODBwdCIgdmlld0JveD0iMCAwIDEyMTYgMTI4MCIKIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiPgo8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLDEyODApIHNjYWxlKDAuMSwtMC4xKSIKZmlsbD0iI2ZmZmZmZiIgc3Ryb2tlPSJub25lIj4KPHBhdGggZD0iTTM0NzAgOTYwMCBsMCAtMzIwMCAtMTczMSAwIGMtOTUyIDAgLTE3MjkgLTQgLTE3MjcgLTggNCAtMTIgNjA2MgotNjM5MCA2MDY4IC02MzkwIDYgMCA2MDY0IDYzNzggNjA2OCA2MzkwIDIgNCAtNzc1IDggLTE3MjcgOCBsLTE3MzEgMCAwIDMyMDAKMCAzMjAwIC0yNjEwIDAgLTI2MTAgMCAwIC0zMjAweiIvPgo8L2c%2BCjwvc3ZnPgo%3D&label=&labelColor=%23e39827&color=%23e39827)](https://mods.factorio.com/mod/lignumis/metrics?range=last_two_months&type=mod_downloads)[![Ko-fi](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/cacklingfiend) _________________ ![Lignumis poster](https://git.cacklingfiend.info/cacklingfiend/lignumis-assets/raw/branch/main/sources/readme/poster.jpg) From 377a703ed83c3448092aef612ffdee9edf438161 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 13 Dec 2025 01:10:11 +0100 Subject: [PATCH 13/46] Integrate deep miner code into this mod --- lignumis/prototypes/content/deep-miner.lua | 235 +++++++++++++++++---- 1 file changed, 194 insertions(+), 41 deletions(-) diff --git a/lignumis/prototypes/content/deep-miner.lua b/lignumis/prototypes/content/deep-miner.lua index 8f8db39..4671960 100644 --- a/lignumis/prototypes/content/deep-miner.lua +++ b/lignumis/prototypes/content/deep-miner.lua @@ -1,44 +1,197 @@ -local DeepMinerFactory = require(MF.buildings .. "CoreExtractor") -local DeepMiner = DeepMinerFactory("deep-miner") +local hit_effects = require("__base__.prototypes.entity.hit-effects") +local item_sounds = require("__base__.prototypes.item_sounds") +local sounds = require("__base__.prototypes.entity.sounds") +local Entity = require("__cf-lib__/data/Entity") -local entity = DeepMiner.EntityBuilder:new():build({ - resource_searching_radius = 0.49, - energy_usage = "25MW", - mining_speed = 7.5, - energy_source = { - emissions_per_minute = { noise = 2000 } +local gfx = Lignumis.graphics .. "entity/deep-miner/" +local techGfx = Lignumis.graphics .. "technology/" +local name = "deep-miner" + +local function animationLayer() + return { + priority = "high", + width = 704, + height = 704, + frame_count = 120, + lines_per_file = 8, + animation_speed = 0.3, + scale = 0.5, + stripes = { + { + filename = gfx .. "core-extractor-animation-1.png", + width_in_frames = 8, + height_in_frames = 8 + }, + { + filename = gfx .. "core-extractor-animation-2.png", + width_in_frames = 8, + height_in_frames = 7 + } + } + } +end + +data:extend({ + { + type = "mining-drill", + name = name, + icon = gfx .. "core-extractor-icon.png", + flags = { "placeable-neutral", "player-creation" }, + minable = { mining_time = 0.2, result = name }, + fast_replaceable_group = name, + max_health = 500, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = Entity.collisionBox(11, 11), + selection_box = Entity.selectionBox(11, 11), + damaged_trigger_effect = hit_effects.entity(), + drawing_box_vertical_extension = 1.3, + module_slots = 4, + icon_draw_specification = { scale = 2, shift = { 0, -0.3 } }, + icons_positioning = { + { inventory_index = defines.inventory.assembling_machine_modules, shift = { 0, 1.25 } } + }, + allowed_effects = { "consumption", "speed", "pollution", "quality", "productivity" }, + mining_speed = 7.5, + resource_categories = { "deep-mining" }, + drops_full_belt_stacks = true, + resource_searching_radius = 0.49, + vector_to_place_result = { 0, -5.85 }, + resource_drain_rate_percent = 75, + energy_source = { + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = { noise = 2000 } + }, + energy_usage = "25MW", + perceived_performance = { minimum = 0.25, performance_to_activity_rate = 0.25, maximum = 2 }, + graphics_set = { + animation = { + layers = { + { + filename = gfx .. "core-extractor-shadow.png", + priority = "high", + width = 1400, + height = 1400, + frame_count = 1, + line_length = 1, + repeat_count = 120, + animation_speed = 0.3, + draw_as_shadow = true, + scale = 0.5 + }, + animationLayer() + } + }, + working_visualisations = { + { + fadeout = true, + animation = { + layers = { + animationLayer(), + { + priority = "high", + draw_as_glow = true, + blend_mode = "additive", + width = 704, + height = 704, + frame_count = 120, + lines_per_file = 8, + animation_speed = 0.3, + scale = 0.5, + stripes = { + { + filename = gfx .. "core-extractor-emission-1.png", + width_in_frames = 8, + height_in_frames = 8 + }, + { + filename = gfx .. "core-extractor-emission-2.png", + width_in_frames = 8, + height_in_frames = 7 + } + } + } + } + } + } + } + }, + open_sound = sounds.drill_open, + close_sound = sounds.drill_close, + working_sound = { + main_sounds = { + { + sound = { filename = "__space-age__/sound/entity/big-mining-drill/big-mining-drill-loop.ogg", volume = 0.4, audible_distance_modifier = 1 }, + fade_in_ticks = 4, + fade_out_ticks = 30 + }, + { + sound = { filename = Lignumis.sound .. "entity/deep-miner/deep-miner-gears.ogg", volume = 0.3, audible_distance_modifier = 0.6 }, + fade_in_ticks = 15, + fade_out_ticks = 60 + } + }, + sound_accents = { + { sound = { + filename = Lignumis.sound .. "entity/deep-miner/deep-miner-drop.ogg", + volume = 2, + audible_distance_modifier = 10, + advanced_volume_control = { + attenuation = "logarithmic", + fades = { fade_in = { curve_type = "linear", from = { control = 0.25, volume_percentage = 70.0 }, to = { 1, 100.0 } } } + } + }, frame = 16 } + }, + max_sounds_per_prototype = 4 + } }, - resource_drain_rate_percent = 75 -}) -entity.resource_categories = { "deep-mining" } -data:extend({ entity }) - -DeepMiner.ItemBuilder:new() - :itemsPerRocket(1) - :apply({ + { + type = "item", + name = name, + icon = gfx .. "core-extractor-icon.png", subgroup = "extraction-machine", - order = "a[items]-d[deep-miner]" - }) - -DeepMiner.RecipeBuilder:new() - :ingredients({ - { type = "item", name = "processing-unit", amount = 100 }, - { type = "item", name = "electric-engine-unit", amount = 100 }, - { type = "item", name = "steel-plate", amount = 200 }, - { type = "item", name = "concrete", amount = 50 } - }) - :apply({ - category = "metallurgy-or-assembling" - }) - -DeepMiner.TechnologyBuilder:new() - :prerequisites({ "space-science-pack" }) - :count(500) - :ingredients({ - { "automation-science-pack", 1 }, - { "logistic-science-pack", 1 }, - { "chemical-science-pack", 1 }, - { "space-science-pack", 1 } - }) - :time(60) - :apply() + order = "a[items]-d[deep-miner]", + inventory_move_sound = item_sounds.mechanical_large_inventory_move, + pick_sound = item_sounds.mechanical_large_inventory_pickup, + drop_sound = item_sounds.mechanical_large_inventory_move, + place_result = name, + stack_size = 20, + default_import_location = "nauvis", + weight = 1000 * kg + }, + { + type = "recipe", + name = name, + category = "metallurgy-or-assembling", + enabled = false, + ingredients = { + { type = "item", name = "processing-unit", amount = 100 }, + { type = "item", name = "electric-engine-unit", amount = 100 }, + { type = "item", name = "steel-plate", amount = 200 }, + { type = "item", name = "concrete", amount = 50 } + }, + energy_required = 60, + results = { { type = "item", name = name, amount = 1 } } + }, + { + type = "technology", + name = name, + icon = techGfx .. "core-extractor.png", + icon_size = 256, + effects = { + { type = "unlock-recipe", recipe = name } + }, + prerequisites = { "space-science-pack" }, + unit = { + count = 500, + ingredients = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "space-science-pack", 1 } + }, + time = 60 + } + } +}) \ No newline at end of file From 31be99bdec942567a690fc87c29fe34a2075d091 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 14 Dec 2025 18:18:29 +0100 Subject: [PATCH 14/46] Wood logistics: Correct lumber mill technology --- lignumis/locale/en/strings.cfg | 2 ++ lignumis/prototypes/content/lumber-mill.lua | 12 ------------ lignumis/prototypes/content/technology-updates.lua | 13 +++++++++++++ lignumis/prototypes/content/updates.lua | 3 ++- 4 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 lignumis/prototypes/content/technology-updates.lua diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index ef74696..f165a69 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -126,6 +126,7 @@ planet-discovery-lignumis=Moon discovery Lignumis iron-processing=Iron processing copper-processing=Copper processing lumber-mill=Lumber mill +advanced-carpentry=Lumber mill deep-miner=Deep miner gold-fluid-handling=Gold fluid handling steam-automation=Steam automation @@ -153,6 +154,7 @@ burner-automation=Technology for basic automation using burner machines. planet-discovery-nauvis=A temperate planet offering all the common resources. planet-discovery-lignumis=A moon orbiting Nauvis that has not much to offer besides some vegetation and a metal that might be useful. lumber-mill=Advanced machine to process wood. +advanced-carpentry=Advanced machine to process wood. deep-miner=Gives access to huge gold deposits that were previously unreachable. steam-automation=Allows research of more sophisticated technologies based on wood products and gold. wood-liquefaction=Converting wood into a liquid offers new possibilities. diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index ac57acb..264b6a0 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -119,18 +119,6 @@ else }) }) - table.assign(data.raw.technology["advanced-carpentry"], { - prerequisites = { "steam-science-pack" }, - unit = { - count = 250, - time = 15, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 } - } - } - }) - Recipe:new("lumber-mill") :clone("lumber-mill-copper") :assign({ diff --git a/lignumis/prototypes/content/technology-updates.lua b/lignumis/prototypes/content/technology-updates.lua new file mode 100644 index 0000000..386ddf2 --- /dev/null +++ b/lignumis/prototypes/content/technology-updates.lua @@ -0,0 +1,13 @@ +if mods["wood-logistics"] then + table.assign(data.raw.technology["advanced-carpentry"], { + prerequisites = { "steam-science-pack" }, + unit = { + count = 250, + time = 15, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + } + } + }) +end \ No newline at end of file diff --git a/lignumis/prototypes/content/updates.lua b/lignumis/prototypes/content/updates.lua index 7087806..640ef0c 100644 --- a/lignumis/prototypes/content/updates.lua +++ b/lignumis/prototypes/content/updates.lua @@ -1,2 +1,3 @@ require("fuel-category-updates") -require("lignumis/planet-updates") \ No newline at end of file +require("lignumis/planet-updates") +require("technology-updates") \ No newline at end of file From 52725edc467fe1be57c9ec980b0f6b28d3c0edf6 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 14 Dec 2025 18:24:09 +0100 Subject: [PATCH 15/46] 1.0.77 --- lignumis/changelog.txt | 8 ++++++++ lignumis/info.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index 48c8bca..86a87ca 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,12 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.77 +Date: 14.12.2025 + Changes: + - Integrate deep miner code into this mod + Bug Fixes: + - Correct description of quality assembler + - Wood logistics: Correct lumber mill technology +--------------------------------------------------------------------------------------------------- Version: 1.0.76 Date: 12.12.2025 Changes: diff --git a/lignumis/info.json b/lignumis/info.json index c3a157d..b0d72f2 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,6 +1,6 @@ { "name": "lignumis", - "version": "1.0.76", + "version": "1.0.77", "title": "Lignumis", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis planet mod effects other planets and space ships. Make sure to read the description on the mod portal and check the mod settings.", "author": "cackling fiend", From 3115b51e4e8ac525ecde830fe7bdd68a04096417 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 15 Dec 2025 22:26:42 +0100 Subject: [PATCH 16/46] Wooden logistics: Change compatibility to stick closer to how wooden logistics does things (breaking change) --- lignumis/prototypes/compatibility/data.lua | 3 +- .../compatibility/wood-logistics.lua | 125 ++++++++++ lignumis/prototypes/content/lumber-mill.lua | 58 +---- lignumis/prototypes/content/lumber.lua | 71 +++--- .../prototypes/content/wood-logistics.lua | 225 +++++++----------- lignumis/prototypes/integrations/vanilla.lua | 4 +- lignumis/settings/wood-logistics.lua | 13 +- 7 files changed, 261 insertions(+), 238 deletions(-) create mode 100644 lignumis/prototypes/compatibility/wood-logistics.lua diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua index 0ed7173..8450277 100644 --- a/lignumis/prototypes/compatibility/data.lua +++ b/lignumis/prototypes/compatibility/data.lua @@ -8,4 +8,5 @@ require("lane-splitters") require("wood-industry") require("crushing-industry") require("canal-excavator") -require("diversitree") \ No newline at end of file +require("diversitree") +require("wood-logistics") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/wood-logistics.lua b/lignumis/prototypes/compatibility/wood-logistics.lua new file mode 100644 index 0000000..31cf9ed --- /dev/null +++ b/lignumis/prototypes/compatibility/wood-logistics.lua @@ -0,0 +1,125 @@ +local Item = require("__cf-lib__/data/Item") +local Recipe = require("__cf-lib__/data/Recipe") +local Technology = require("__cf-lib__/data/Technology") + +if not mods["wood-logistics"] then + return +end + +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value + + +-- Lumber +if settings.startup["wood-logistics-lumber"].value then + Recipe:new("lumber"):addCategory("wood-processing") +end + + +-- Lumber mill +if settings.startup["wood-logistics-lumber-mill"].value then + local lumberMill = data.raw["assembling-machine"]["lumber-mill"] + table.assign(lumberMill, { + energy_source = { + type = "burner", + fuel_categories = { "chemical" }, + effectivity = 1, + fuel_inventory_size = 3, + emissions_per_minute = { pollution = 10, noise = 100 }, + }, + surface_conditions = { + { + property = has_oxygen and "oxygen" or "pressure", + min = 3 + }, + { + property = "gravity", + min = 1 + } + } + }) + table.insert(lumberMill.crafting_categories, "wood-processing") + + data.raw.item["lumber-mill"].default_import_location = "lignumis" + + table.assign(data.raw.recipe["lumber-mill"], { + additional_categories = { "wood-processing" }, + ingredients = table.trim({ + { type = "item", name = "stone-brick", amount = 40 }, + { type = "item", name = "lumber", amount = 50 }, + { type = "item", name = "wooden-gear-wheel", amount = 50 }, + { type = "item", name = "gold-plate", amount = basic_circuit_board and 20 or 40 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 20 } or nil, + { type = "item", name = "burner-assembling-machine", amount = 2 } + }) + }) + + Recipe:new("lumber-mill") + :clone("lumber-mill-copper") + :assign({ + localised_name = { "entity-name.lumber-mill" }, + icons = { + { icon = data.raw.item["lumber-mill"].icon }, + { icon = basic_circuit_board and "__base__/graphics/icons/copper-plate.png" or "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + } + }) + :replaceIngredient("gold-plate", "copper-plate") + :apply() + + Technology:new(basic_circuit_board and "copper-processing" or "electronics"):addRecipe("lumber-mill-copper") +end + + +-- Wooden belts +if settings.startup["wood-logistics-belts"].value then + Recipe:new("wood-transport-belt") + :replaceIngredient("copper-cable", "wooden-gear-wheel", 1) + :assign({ + additional_categories = { "wood-processing" } + }) + + Recipe:new("wood-underground-belt") + :assign({ + additional_categories = { "wood-processing" } + }) + + Recipe:new("wood-splitter") + :replaceIngredient("copper-cable", basic_circuit_board and "basic-circuit-board" or "gold-cable", basic_circuit_board and 5 or nil) + :assign({ + additional_categories = { "wood-processing" } + }) + + if not basic_circuit_board then + Recipe:new("wood-splitter") + :clone("wood-splitter-electronic-circuit") + :replaceIngredient(basic_circuit_board and "gold-cable" or "basic-circuit-board", "electronic-circuit", 2) + :assign({ + localised_name = { "entity-name.wood-splitter" }, + icons = { + { icon = data.raw.item["wood-splitter"].icon }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + } + }) + :unlockedByTechnology("electronics") + :apply() + end + + Item:new("wood-transport-belt") + :itemsPerRocket(200) + :defaultImportLocation("lignumis") + Item:new("wood-underground-belt") + :itemsPerRocket(100) + :defaultImportLocation("lignumis") + Item:new("wood-splitter") + :itemsPerRocket(100) + :defaultImportLocation("lignumis") + + Technology:new("wood-logistics"):assign({ + prerequisites = { "wood-science-pack" }, + unit = { + count = 10, + ingredients = { { "wood-science-pack", 1 } }, + time = 10 + } + }) + Technology:new("logistics"):setPrerequisites({ "automation-science-pack" }) +end \ No newline at end of file diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 264b6a0..1e21aa4 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -14,7 +14,10 @@ data:extend({ local has_oxygen = data.raw["surface-property"]["oxygen"] ~= nil -if not mods["wood-logistics"] then +if mods["wood-logistics"] then + return +end + LumberMill.EntityBuilder:new() :burnerEnergySource({ emissions_per_minute = { noise = 100 } }) :baseProductivity(0.5) @@ -80,59 +83,6 @@ if not mods["wood-logistics"] then }) Technology:new(basic_circuit_board and "copper-processing" or "electronics"):addRecipe("lumber-mill-copper") -else - table.assign(data.raw["assembling-machine"]["lumber-mill"], { - energy_source = { - type = "burner", - fuel_categories = { "chemical" }, - effectivity = 1, - fuel_inventory_size = 3, - emissions_per_minute = { pollution = 10, noise = 100 }, - }, - crafting_categories = { "wood-processing" }, - energy_usage = "1000kW", - module_slots = 4, - max_health = 500, - surface_conditions = { - { - property = has_oxygen and "oxygen" or "pressure", - min = 3 - }, - { - property = "gravity", - min = 1 - } - } - }) - - data.raw.item["lumber-mill"].default_import_location = "lignumis" - - table.assign(data.raw.recipe["lumber-mill"], { - additional_categories = { "wood-processing" }, - ingredients = table.trim({ - { type = "item", name = "stone-brick", amount = 40 }, - { type = "item", name = "lumber", amount = 50 }, - { type = "item", name = "wooden-gear-wheel", amount = 50 }, - { type = "item", name = "gold-plate", amount = basic_circuit_board and 20 or 40 }, - basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 20 } or nil, - { type = "item", name = "burner-assembling-machine", amount = 2 } - }) - }) - - Recipe:new("lumber-mill") - :clone("lumber-mill-copper") - :assign({ - localised_name = { "entity-name.lumber-mill" }, - icons = { - { icon = data.raw.item["lumber-mill"].icon }, - { icon = basic_circuit_board and "__base__/graphics/icons/copper-plate.png" or "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } - } - }) - :replaceIngredient("gold-plate", "copper-plate") - :apply() - - Technology:new(basic_circuit_board and "copper-processing" or "electronics"):addRecipe("lumber-mill-copper") -end Recipe:new("wooden-chest"):addCategory("wood-processing") Recipe:new("small-electric-pole"):addCategory("wood-processing") \ No newline at end of file diff --git a/lignumis/prototypes/content/lumber.lua b/lignumis/prototypes/content/lumber.lua index f3a46f1..bc6f985 100644 --- a/lignumis/prototypes/content/lumber.lua +++ b/lignumis/prototypes/content/lumber.lua @@ -1,39 +1,38 @@ local item_sounds = require("__base__.prototypes.item_sounds") -local Recipe = require("__cf-lib__/data/Recipe") -if not mods["wood-logistics"] then - data:extend({ - { - type = "item", - name = "lumber", - icon = Lignumis.graphics .. "icons/lumber.png", - pictures = { - { filename = Lignumis.graphics .. "icons/lumber.png", size = 64, scale = 0.5 }, - { filename = Lignumis.graphics .. "icons/lumber-1.png", size = 64, scale = 0.5 }, - { filename = Lignumis.graphics .. "icons/lumber-2.png", size = 64, scale = 0.5 }, - }, - subgroup = "intermediate-product", - order = "A[basic-intermediates]-c[lumber]", - inventory_move_sound = item_sounds.wood_inventory_move, - pick_sound = item_sounds.wood_inventory_pickup, - drop_sound = item_sounds.wood_inventory_move, - stack_size = 100, - random_tint_color = { 1.0, 0.95, 0.9, 1.0 }, - fuel_category = "wood", - fuel_value = "4MJ" +if mods["wood-logistics"] and settings.startup["wood-logistics-lumber"].value then + return +end + +data:extend({ + { + type = "item", + name = "lumber", + icon = Lignumis.graphics .. "icons/lumber.png", + pictures = { + { filename = Lignumis.graphics .. "icons/lumber.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/lumber-1.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/lumber-2.png", size = 64, scale = 0.5 }, }, - { - type = "recipe", - name = "lumber", - category = "crafting", - additional_categories = { "wood-processing" }, - allow_productivity = true, - allow_as_intermediate = true, - ingredients = { { type = "item", name = "wood", amount = 2 } }, - results = { { type = "item", name = "lumber", amount = 1 } }, - energy_required = 1 - } - }) -else - Recipe:new("lumber"):addCategory("wood-processing") -end \ No newline at end of file + subgroup = "intermediate-product", + order = "A[basic-intermediates]-c[lumber]", + inventory_move_sound = item_sounds.wood_inventory_move, + pick_sound = item_sounds.wood_inventory_pickup, + drop_sound = item_sounds.wood_inventory_move, + stack_size = 100, + random_tint_color = { 1.0, 0.95, 0.9, 1.0 }, + fuel_category = "wood", + fuel_value = "4MJ" + }, + { + type = "recipe", + name = "lumber", + category = "crafting", + additional_categories = { "wood-processing" }, + allow_productivity = true, + allow_as_intermediate = true, + ingredients = { { type = "item", name = "wood", amount = 2 } }, + results = { { type = "item", name = "lumber", amount = 1 } }, + energy_required = 1 + } +}) \ No newline at end of file diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua index a2eef43..31f3809 100644 --- a/lignumis/prototypes/content/wood-logistics.lua +++ b/lignumis/prototypes/content/wood-logistics.lua @@ -1,151 +1,108 @@ local BeltFactory = require(MF.logistics .. "Belts") local Belt = BeltFactory("wood", "brown", "slow") -local Recipe = require("__cf-lib__/data/Recipe") -local Item = require("__cf-lib__/data/Item") local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value -if not mods["wood-logistics"] then - Belt.EntityBuilder:new() - :itemsPerSecond(7.5) - :nextTier("") - :undergroundDistance(4) - :animationSpeedMultiplier(1.01) - :apply({ - transportBelt = { - emissions_per_second = { noise = 2 / 60 } - }, - undergroundBelt = { - emissions_per_second = { noise = 7.5 / 60 }, - factoriopedia_simulation = { - init = - [[ - game.simulation.camera_position = {0, 0.5} - game.simulation.camera_zoom = 1.8 - game.surfaces[1].create_entities_from_blueprint_string - { - string = "0eNqVUNsKgzAM/Zc81+FEBfsrYwwvQQKaltpuivjvS3Wwh8HGnkKSc0tWaIaA1hF70CtMXNvEm6R31MV+Bl0oWECfNwXUGp5AXwRGPddDBHA9Imh4GNMlgTt0vTNSkwYHD5EjsznSrwqQPXnCQ2JvlhuHsUEnAPVdSoE1k7ANv2KlpyOYVLHpyGF7bHMFfrFRidiGGOLDLPvXLP9tZoLf3eRO8jjK5P1YBXd0004oyqzKq6ooqzLNinLbnvlmf6E=", - position = {-0.5, 0} - } - ]] +if mods["wood-logistics"] and settings.startup["wood-logistics-belts"].value then + return +end + +Belt.EntityBuilder:new() + :itemsPerSecond(7.5) + :nextTier("") + :undergroundDistance(4) + :animationSpeedMultiplier(1.01) + :apply({ + transportBelt = { + emissions_per_second = { noise = 2 / 60 } + }, + undergroundBelt = { + emissions_per_second = { noise = 7.5 / 60 }, + factoriopedia_simulation = { + init = + [[ + game.simulation.camera_position = {0, 0.5} + game.simulation.camera_zoom = 1.8 + game.surfaces[1].create_entities_from_blueprint_string + { + string = "0eNqVUNsKgzAM/Zc81+FEBfsrYwwvQQKaltpuivjvS3Wwh8HGnkKSc0tWaIaA1hF70CtMXNvEm6R31MV+Bl0oWECfNwXUGp5AXwRGPddDBHA9Imh4GNMlgTt0vTNSkwYHD5EjsznSrwqQPXnCQ2JvlhuHsUEnAPVdSoE1k7ANv2KlpyOYVLHpyGF7bHMFfrFRidiGGOLDLPvXLP9tZoLf3eRO8jjK5P1YBXd0004oyqzKq6ooqzLNinLbnvlmf6E=", + position = {-0.5, 0} } - }, - splitter = { - emissions_per_second = { noise = 20 / 60 } + ]] } - }) + }, + splitter = { + emissions_per_second = { noise = 20 / 60 } + } + }) - local splitter_item = Belt.ItemBuilder:new() - :itemsPerRocket("transportBelt", 200) - :itemsPerRocket("undergroundBelt", 100) - :itemsPerRocket("splitter", 100) - :order("0") - :apply() - .splitter +local splitter_item = Belt.ItemBuilder:new() + :itemsPerRocket("transportBelt", 200) + :itemsPerRocket("undergroundBelt", 100) + :itemsPerRocket("splitter", 100) + :order("0") + :apply() + .splitter - Belt.RecipeBuilder:new() - :beltAmount(2) - :ingredients("transportBelt", { - { type = "item", name = "lumber", amount = 1 }, - { type = "item", name = "wooden-gear-wheel", amount = 1 } - }) - :ingredients("undergroundBelt", { - { type = "item", name = "lumber", amount = 1 }, - { type = "item", name = "wood-transport-belt", amount = 4 }, - }) - :ingredients("splitter", { - { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or - { type = "item", name = "gold-cable", amount = 10 } - }) - :apply({ - transportBelt = { - additional_categories = { "wood-processing" } - }, - undergroundBelt = { - additional_categories = { "wood-processing" } - }, - splitter = { - additional_categories = { "wood-processing" } - } - }) - - Belt.TechnologyBuilder:new() - :prerequisites({ "wood-science-pack" }) - :ingredients({ { "wood-science-pack", 1 } }) - :count(10) - :time(10) - :apply() - - if not basic_circuit_board then - data:extend({ - Belt.RecipeBuilder:new() - :ingredients("splitter", { - { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - { type = "item", name = "electronic-circuit", amount = 2 } - }) - :build({ - splitter = { - name = "wood-splitter-electronic-circuit", - localised_name = { "entity-name.wood-splitter" }, - icons = { - { icon = splitter_item.icon }, - { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } - }, - additional_categories = { "wood-processing" } - } - }) - .splitter - }) - - table.insert(data.raw.technology["electronics"].effects, { - type = "unlock-recipe", - recipe = "wood-splitter-electronic-circuit" - }) - end - -else - Recipe:new("wood-transport-belt") - :replaceIngredient("copper-cable", "wooden-gear-wheel", 1) - :assign({ +Belt.RecipeBuilder:new() + :beltAmount(2) + :ingredients("transportBelt", { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "wooden-gear-wheel", amount = 1 } + }) + :ingredients("undergroundBelt", { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "wood-transport-belt", amount = 4 }, + }) + :ingredients("splitter", { + { type = "item", name = "wood-transport-belt", amount = 2 }, + { type = "item", name = "lumber", amount = 2 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or + { type = "item", name = "gold-cable", amount = 10 } + }) + :apply({ + transportBelt = { additional_categories = { "wood-processing" } - }) - - Recipe:new("wood-underground-belt") - :assign({ + }, + undergroundBelt = { additional_categories = { "wood-processing" } - }) - - Recipe:new("wood-splitter") - :replaceIngredient("copper-cable", basic_circuit_board and "basic-circuit-board" or "gold-cable", basic_circuit_board and 5 or nil) - :assign({ + }, + splitter = { additional_categories = { "wood-processing" } - }) + } + }) - if not basic_circuit_board then - Recipe:new("wood-splitter") - :clone("wood-splitter-electronic-circuit") - :replaceIngredient(basic_circuit_board and "gold-cable" or "basic-circuit-board", "electronic-circuit", 2) - :assign({ - localised_name = { "entity-name.wood-splitter" }, - icons = { - { icon = data.raw.item["wood-splitter"].icon }, - { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } +Belt.TechnologyBuilder:new() + :prerequisites({ "wood-science-pack" }) + :ingredients({ { "wood-science-pack", 1 } }) + :count(10) + :time(10) + :apply() + +if not basic_circuit_board then + data:extend({ + Belt.RecipeBuilder:new() + :ingredients("splitter", { + { type = "item", name = "wood-transport-belt", amount = 2 }, + { type = "item", name = "lumber", amount = 2 }, + { type = "item", name = "electronic-circuit", amount = 2 } + }) + :build({ + splitter = { + name = "wood-splitter-electronic-circuit", + localised_name = { "entity-name.wood-splitter" }, + icons = { + { icon = splitter_item.icon }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + }, + additional_categories = { "wood-processing" } } }) - :unlockedByTechnology("electronics") - :apply() - end + .splitter + }) - Item:new("wood-transport-belt") - :itemsPerRocket(200) - :defaultImportLocation("lignumis") - Item:new("wood-underground-belt") - :itemsPerRocket(100) - :defaultImportLocation("lignumis") - Item:new("wood-splitter") - :itemsPerRocket(100) - :defaultImportLocation("lignumis") + table.insert(data.raw.technology["electronics"].effects, { + type = "unlock-recipe", + recipe = "wood-splitter-electronic-circuit" + }) end \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index 61b17a5..65f2028 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -70,7 +70,9 @@ if settings.startup["lignumis-vanilla-lab"].value then Recipe:new("transport-belt"):unlockedByTechnology("iron-processing") else Recipe:new("lab"):replaceIngredient("transport-belt", "wood-transport-belt") - Recipe:new("transport-belt"):unlockedByTechnology("logistics") + if not mods["wood-logistics"] or not settings.startup["wood-logistics-belts"].value then + Recipe:new("transport-belt"):unlockedByTechnology("logistics") + end end diff --git a/lignumis/settings/wood-logistics.lua b/lignumis/settings/wood-logistics.lua index a4627a8..ab0a231 100644 --- a/lignumis/settings/wood-logistics.lua +++ b/lignumis/settings/wood-logistics.lua @@ -6,15 +6,4 @@ local Settings = require("__cf-lib__/settings/Settings") local force = Settings.force local default = Settings.default -force("wood-logistics-lumber", true) -force("wood-logistics-lumber-mill", true) -force("wood-logistics-woodtronics", false) -force("wood-logistics-belts", true) -force("wood-logistics-belts-modify", false) -default("wood-logistics-belts-circuits", true) -force("wood-logistics-inserter", false) -default("wood-logistics-rail-cost", 0) -default("wood-logistics-cargo-wagon", false) -force("wood-logistics-assembling-machine", false) -default("wood-logistics-nerf-small-electric-pole", false) -force("wood-logistics-repair-pack-cost", 0) \ No newline at end of file +force("wood-logistics-woodtronics", false) \ No newline at end of file From bb624c1159b748f90f1a7431cfd018697e10f5a0 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 15 Dec 2025 23:11:31 +0100 Subject: [PATCH 17/46] Add setting to make the lumber mill electric --- lignumis/locale/en/strings.cfg | 2 + lignumis/prototypes/compatibility/data.lua | 3 +- lignumis/prototypes/compatibility/updates.lua | 3 +- .../compatibility/wood-logistics.lua | 62 ++++++++++---- lignumis/prototypes/content/lumber-mill.lua | 81 +++++++++++-------- .../prototypes/content/technology-updates.lua | 13 --- lignumis/prototypes/content/updates.lua | 3 +- lignumis/settings.lua | 9 ++- lignumis/settings/wood-logistics.lua | 1 - 9 files changed, 108 insertions(+), 69 deletions(-) delete mode 100644 lignumis/prototypes/content/technology-updates.lua diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index f165a69..bf7d502 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -195,6 +195,7 @@ lignumis-vanilla-lab=[color=orange][font=heading-2]Overhaul[/font][/color] Keep lignumis-double-rocket=[color=green][font=heading-2]Easy[/font][/color] Double provisional rocket cargo capacity lignumis-sciences-spoil=[color=red][font=heading-2]Hard[/font][/color] Lignumis science packs spoil lignumis-infinite-astroponics-productivity-research=[color=green][font=heading-2]Easy[/font][/color] Infinite productivity research for Astroponics +lignumis-electric-lumber-mill=[color=green][font=heading-2]Easy[/font][/color] Electric lumber mill [mod-setting-description] lignumis-belt-progression=Yellow belts will require wood belts to craft. @@ -211,6 +212,7 @@ lignumis-vanilla-lab=Moves the transport belt recipe to Iron processing so the l lignumis-double-rocket=The provisional rocket can carry 80 instead of 40 slots. lignumis-sciences-spoil=Both wood science packs and steam science packs spoil for additional difficulty. lignumis-infinite-astroponics-productivity-research=Productivity research for Astroponics is infinite instead of being capped to level 5 (which results in 50% productivity). +lignumis-electric-lumber-mill=The lumber mill will consume electricity instead of burner fuel and will be unlocked after researching electricity. [autoplace-control-names] lignumis_enemy_base=Lignumis enemy bases diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua index 8450277..0ed7173 100644 --- a/lignumis/prototypes/compatibility/data.lua +++ b/lignumis/prototypes/compatibility/data.lua @@ -8,5 +8,4 @@ require("lane-splitters") require("wood-industry") require("crushing-industry") require("canal-excavator") -require("diversitree") -require("wood-logistics") \ No newline at end of file +require("diversitree") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/updates.lua b/lignumis/prototypes/compatibility/updates.lua index 56e0bbe..2042d0d 100644 --- a/lignumis/prototypes/compatibility/updates.lua +++ b/lignumis/prototypes/compatibility/updates.lua @@ -1,4 +1,5 @@ require("aai-industry") require("gleba-reborn") require("crushing-industry-updates") -require("k2so") \ No newline at end of file +require("k2so") +require("wood-logistics") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/wood-logistics.lua b/lignumis/prototypes/compatibility/wood-logistics.lua index 31cf9ed..98ea43f 100644 --- a/lignumis/prototypes/compatibility/wood-logistics.lua +++ b/lignumis/prototypes/compatibility/wood-logistics.lua @@ -7,6 +7,7 @@ if not mods["wood-logistics"] then end local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value +local electric_lumber_mill = settings.startup["lignumis-electric-lumber-mill"].value -- Lumber @@ -18,26 +19,29 @@ end -- Lumber mill if settings.startup["wood-logistics-lumber-mill"].value then local lumberMill = data.raw["assembling-machine"]["lumber-mill"] - table.assign(lumberMill, { - energy_source = { + lumberMill.surface_conditions = { + { + property = has_oxygen and "oxygen" or "pressure", + min = 3 + }, + { + property = "gravity", + min = 1 + } + } + table.insert(lumberMill.crafting_categories, "wood-processing") + + if electric_lumber_mill then + lumberMill.energy_source.emissions_per_minute.noise = 100 + else + lumberMill.energy_source = { type = "burner", fuel_categories = { "chemical" }, effectivity = 1, fuel_inventory_size = 3, emissions_per_minute = { pollution = 10, noise = 100 }, - }, - surface_conditions = { - { - property = has_oxygen and "oxygen" or "pressure", - min = 3 - }, - { - property = "gravity", - min = 1 - } } - }) - table.insert(lumberMill.crafting_categories, "wood-processing") + end data.raw.item["lumber-mill"].default_import_location = "lignumis" @@ -63,9 +67,37 @@ if settings.startup["wood-logistics-lumber-mill"].value then } }) :replaceIngredient("gold-plate", "copper-plate") + :unlockedByTechnology( + electric_lumber_mill and "advanced-carpentry" + or basic_circuit_board and "copper-processing" + or "electronics" + ) :apply() - Technology:new(basic_circuit_board and "copper-processing" or "electronics"):addRecipe("lumber-mill-copper") + if electric_lumber_mill then + table.assign(data.raw.technology["advanced-carpentry"], { + prerequisites = { "automation-science-pack" }, + unit = { + count = 250, + time = 15, + ingredients = { + { "automation-science-pack", 1 } + } + } + }) + else + table.assign(data.raw.technology["advanced-carpentry"], { + prerequisites = { "steam-science-pack" }, + unit = { + count = 250, + time = 15, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + } + } + }) + end end diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 1e21aa4..c10aac5 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -3,8 +3,6 @@ local Technology = require("__cf-lib__/data/Technology") local LumberMillFactory = require(MF.buildings .. "LumberMill") local LumberMill = LumberMillFactory() -local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value - data:extend({ { type = "recipe-category", @@ -12,39 +10,45 @@ data:extend({ } }) +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value local has_oxygen = data.raw["surface-property"]["oxygen"] ~= nil +local electric_lumber_mill = settings.startup["lignumis-electric-lumber-mill"].value if mods["wood-logistics"] then return end - LumberMill.EntityBuilder:new() - :burnerEnergySource({ emissions_per_minute = { noise = 100 } }) - :baseProductivity(0.5) - :apply({ - crafting_categories = { "wood-processing" }, - crafting_speed = 2, - energy_usage = "1000kW", - surface_conditions = { - { - property = has_oxygen and "oxygen" or "pressure", - min = 3 - }, - { - property = "gravity", - min = 1 - } +local lumberMill = LumberMill.EntityBuilder:new() + :baseProductivity(0.5) +if electric_lumber_mill then + lumberMill:electricEnergySource({ emissions_per_minute = { noise = 100 } }) +else + lumberMill:burnerEnergySource({ emissions_per_minute = { noise = 100 } }) +end +lumberMill:apply({ + crafting_categories = { "wood-processing" }, + crafting_speed = 2, + energy_usage = "1000kW", + surface_conditions = { + { + property = has_oxygen and "oxygen" or "pressure", + min = 3 + }, + { + property = "gravity", + min = 1 } - }) + } +}) - local lumber_mill_item = LumberMill.ItemBuilder:new() - :apply({ +local lumber_mill_item = LumberMill.ItemBuilder:new() + :apply({ default_import_location = "lignumis", order = "2[lumber-mill]" }) - LumberMill.RecipeBuilder:new() - :ingredients(table.trim({ +LumberMill.RecipeBuilder:new() + :ingredients(table.trim({ { type = "item", name = "stone-brick", amount = 40 }, { type = "item", name = "lumber", amount = 50 }, { type = "item", name = "wooden-gear-wheel", amount = 50 }, @@ -52,19 +56,24 @@ end basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 20 } or nil, { type = "item", name = "burner-assembling-machine", amount = 2 } })) - :apply({ + :apply({ additional_categories = { "wood-processing" } }) - LumberMill.TechnologyBuilder:new() - :prerequisites({ "steam-science-pack" }) - :count(250) - :time(15) - :ingredients({ { "wood-science-pack", 1 }, { "steam-science-pack", 1 } }) - :apply() +local tech = LumberMill.TechnologyBuilder:new() + :count(250) + :time(15) +if electric_lumber_mill then + tech:prerequisites({ "automation-science-pack" }) + :ingredients({ { "automation-science-pack", 1 } }) +else + tech:prerequisites({ "steam-science-pack" }) + :ingredients({ { "wood-science-pack", 1 }, { "steam-science-pack", 1 } }) +end +tech:apply() - LumberMill.RecipeBuilder:new() - :ingredients({ +LumberMill.RecipeBuilder:new() + :ingredients({ { type = "item", name = "stone-brick", amount = 40 }, { type = "item", name = "lumber", amount = 50 }, { type = "item", name = "wooden-gear-wheel", amount = 50 }, @@ -72,7 +81,7 @@ end { type = "item", name = basic_circuit_board and "basic-circuit-board" or "electronic-circuit", amount = 20 }, { type = "item", name = "assembling-machine-1", amount = 2 } }) - :apply({ + :apply({ name = "lumber-mill-copper", localised_name = { "entity-name.lumber-mill" }, additional_categories = { "wood-processing" }, @@ -82,7 +91,11 @@ end } }) - Technology:new(basic_circuit_board and "copper-processing" or "electronics"):addRecipe("lumber-mill-copper") +Technology:new( + electric_lumber_mill and "lumber-mill" + or basic_circuit_board and "copper-processing" + or "electronics" +):addRecipe("lumber-mill-copper") Recipe:new("wooden-chest"):addCategory("wood-processing") Recipe:new("small-electric-pole"):addCategory("wood-processing") \ No newline at end of file diff --git a/lignumis/prototypes/content/technology-updates.lua b/lignumis/prototypes/content/technology-updates.lua deleted file mode 100644 index 386ddf2..0000000 --- a/lignumis/prototypes/content/technology-updates.lua +++ /dev/null @@ -1,13 +0,0 @@ -if mods["wood-logistics"] then - table.assign(data.raw.technology["advanced-carpentry"], { - prerequisites = { "steam-science-pack" }, - unit = { - count = 250, - time = 15, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 } - } - } - }) -end \ No newline at end of file diff --git a/lignumis/prototypes/content/updates.lua b/lignumis/prototypes/content/updates.lua index 640ef0c..7087806 100644 --- a/lignumis/prototypes/content/updates.lua +++ b/lignumis/prototypes/content/updates.lua @@ -1,3 +1,2 @@ require("fuel-category-updates") -require("lignumis/planet-updates") -require("technology-updates") \ No newline at end of file +require("lignumis/planet-updates") \ No newline at end of file diff --git a/lignumis/settings.lua b/lignumis/settings.lua index 9cc4a5e..f043c65 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -99,11 +99,18 @@ data:extend({ }, { type = "bool-setting", - name = "lignumis-sciences-spoil", + name = "lignumis-electric-lumber-mill", setting_type = "startup", default_value = false, order = "o" }, + { + type = "bool-setting", + name = "lignumis-sciences-spoil", + setting_type = "startup", + default_value = false, + order = "p" + }, { type = "string-setting", name = "lignumis-second-planet", diff --git a/lignumis/settings/wood-logistics.lua b/lignumis/settings/wood-logistics.lua index ab0a231..2595d62 100644 --- a/lignumis/settings/wood-logistics.lua +++ b/lignumis/settings/wood-logistics.lua @@ -4,6 +4,5 @@ end local Settings = require("__cf-lib__/settings/Settings") local force = Settings.force -local default = Settings.default force("wood-logistics-woodtronics", false) \ No newline at end of file From 11d5f65680a94741fc89a7a03ceb2f4f5b1b680b Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 00:03:33 +0100 Subject: [PATCH 18/46] Integrate lumber mill code into this mod --- lignumis/prototypes/content/deep-miner.lua | 17 +- lignumis/prototypes/content/lumber-mill.lua | 301 +++++++++++++++----- 2 files changed, 238 insertions(+), 80 deletions(-) diff --git a/lignumis/prototypes/content/deep-miner.lua b/lignumis/prototypes/content/deep-miner.lua index 4671960..494f1be 100644 --- a/lignumis/prototypes/content/deep-miner.lua +++ b/lignumis/prototypes/content/deep-miner.lua @@ -4,7 +4,6 @@ local sounds = require("__base__.prototypes.entity.sounds") local Entity = require("__cf-lib__/data/Entity") local gfx = Lignumis.graphics .. "entity/deep-miner/" -local techGfx = Lignumis.graphics .. "technology/" local name = "deep-miner" local function animationLayer() @@ -18,12 +17,12 @@ local function animationLayer() scale = 0.5, stripes = { { - filename = gfx .. "core-extractor-animation-1.png", + filename = gfx .. "deep-miner-animation-1.png", width_in_frames = 8, height_in_frames = 8 }, { - filename = gfx .. "core-extractor-animation-2.png", + filename = gfx .. "deep-miner-animation-2.png", width_in_frames = 8, height_in_frames = 7 } @@ -35,7 +34,7 @@ data:extend({ { type = "mining-drill", name = name, - icon = gfx .. "core-extractor-icon.png", + icon = Lignumis.graphics .. "icons/deep-miner.png", flags = { "placeable-neutral", "player-creation" }, minable = { mining_time = 0.2, result = name }, fast_replaceable_group = name, @@ -69,7 +68,7 @@ data:extend({ animation = { layers = { { - filename = gfx .. "core-extractor-shadow.png", + filename = gfx .. "deep-miner-shadow.png", priority = "high", width = 1400, height = 1400, @@ -101,12 +100,12 @@ data:extend({ scale = 0.5, stripes = { { - filename = gfx .. "core-extractor-emission-1.png", + filename = gfx .. "deep-miner-emission-1.png", width_in_frames = 8, height_in_frames = 8 }, { - filename = gfx .. "core-extractor-emission-2.png", + filename = gfx .. "deep-miner-emission-2.png", width_in_frames = 8, height_in_frames = 7 } @@ -149,7 +148,7 @@ data:extend({ { type = "item", name = name, - icon = gfx .. "core-extractor-icon.png", + icon = Lignumis.graphics .. "icons/deep-miner.png", subgroup = "extraction-machine", order = "a[items]-d[deep-miner]", inventory_move_sound = item_sounds.mechanical_large_inventory_move, @@ -177,7 +176,7 @@ data:extend({ { type = "technology", name = name, - icon = techGfx .. "core-extractor.png", + icon = Lignumis.graphics .. "technology/deep-miner.png", icon_size = 256, effects = { { type = "unlock-recipe", recipe = name } diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index c10aac5..816ea8c 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -1,7 +1,10 @@ local Recipe = require("__cf-lib__/data/Recipe") -local Technology = require("__cf-lib__/data/Technology") -local LumberMillFactory = require(MF.buildings .. "LumberMill") -local LumberMill = LumberMillFactory() +local hit_effects = require("__base__.prototypes.entity.hit-effects") +local item_sounds = require("__base__.prototypes.item_sounds") +local Entity = require("__cf-lib__/data/Entity") + +local gfx = Lignumis.graphics .. "entity/lumber-mill/" +local name = "lumber-mill" data:extend({ { @@ -18,84 +21,240 @@ if mods["wood-logistics"] then return end -local lumberMill = LumberMill.EntityBuilder:new() - :baseProductivity(0.5) -if electric_lumber_mill then - lumberMill:electricEnergySource({ emissions_per_minute = { noise = 100 } }) -else - lumberMill:burnerEnergySource({ emissions_per_minute = { noise = 100 } }) -end -lumberMill:apply({ - crafting_categories = { "wood-processing" }, - crafting_speed = 2, - energy_usage = "1000kW", - surface_conditions = { - { - property = has_oxygen and "oxygen" or "pressure", - min = 3 +local energy_source = electric_lumber_mill and { + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = { noise = 100 } +} or { + type = "burner", + fuel_categories = { "chemical" }, + effectivity = 1, + fuel_inventory_size = 3, + emissions_per_minute = { pollution = 10, noise = 100 } +} + +data:extend({ + { + type = "assembling-machine", + name = name, + icon = Lignumis.graphics .. "icons/lumber-mill.png", + flags = { "placeable-neutral", "player-creation" }, + minable = { mining_time = 0.2, result = name }, + fast_replaceable_group = name, + max_health = 500, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = Entity.collisionBox(8, 8), + selection_box = Entity.selectionBox(8, 8), + damaged_trigger_effect = hit_effects.entity(), + drawing_box_vertical_extension = 1.3, + module_slots = 4, + icon_draw_specification = { scale = 2, shift = { 0, -0.3 } }, + icons_positioning = { + { inventory_index = defines.inventory.assembling_machine_modules, shift = { 0, 1.25 } } }, - { - property = "gravity", - min = 1 + allowed_effects = { "consumption", "speed", "pollution", "quality" }, + crafting_categories = { "wood-processing" }, + crafting_speed = 2, + energy_source = energy_source, + energy_usage = "1MW", + effect_receiver = { base_effect = { productivity = 0.5 } }, + surface_conditions = { + { + property = has_oxygen and "oxygen" or "pressure", + min = 3 + }, + { + property = "gravity", + min = 1 + } + }, + perceived_performance = { minimum = 0.25, performance_to_activity_rate = 0.25, maximum = 4 }, + graphics_set = { + animation = { + layers = { + { + filename = gfx .. "lumber-mill-shadow.png", + priority = "high", + width = 800, + height = 700, + frame_count = 1, + line_length = 1, + repeat_count = 80, + animation_speed = 0.32, + shift = util.by_pixel(0, -8), + draw_as_shadow = true, + scale = 0.5 + }, + { + priority = "high", + width = 525, + height = 557, + frame_count = 80, + lines_per_file = 8, + animation_speed = 0.32, + shift = util.by_pixel(0, -8), + scale = 0.5, + stripes = { + { + filename = gfx .. "lumber-mill-animation-1.png", + width_in_frames = 8, + height_in_frames = 8 + }, + { + filename = gfx .. "lumber-mill-animation-2.png", + width_in_frames = 8, + height_in_frames = 2 + } + } + }, + } + }, + working_visualisations = { + { + fadeout = true, + animation = { + layers = { + { + priority = "high", + width = 525, + height = 557, + frame_count = 80, + lines_per_file = 8, + animation_speed = 0.32, + shift = util.by_pixel(0, -8), + scale = 0.5, + stripes = { + { + filename = gfx .. "lumber-mill-animation-1.png", + width_in_frames = 8, + height_in_frames = 8 + }, + { + filename = gfx .. "lumber-mill-animation-2.png", + width_in_frames = 8, + height_in_frames = 2 + } + } + }, + { + priority = "high", + draw_as_glow = true, + blend_mode = "additive", + width = 525, + height = 557, + frame_count = 80, + lines_per_file = 8, + animation_speed = 0.32, + shift = util.by_pixel(0, -8), + scale = 0.5, + stripes = { + { + filename = gfx .. "lumber-mill-emission-1.png", + width_in_frames = 8, + height_in_frames = 8 + }, + { + filename = gfx .. "lumber-mill-emission-2.png", + width_in_frames = 8, + height_in_frames = 2 + } + } + } + } + } + } + } + }, + open_sound = { filename = "__base__/sound/open-close/train-stop-open.ogg", volume = 0.6 }, + close_sound = { filename = "__base__/sound/open-close/train-stop-close.ogg", volume = 0.5 }, + working_sound = { + fade_in_ticks = 4, + fade_out_ticks = 20, + audible_distance_modifier = 0.6, + max_sounds_per_type = 2, + sound = { filename = "__space-age__/sound/entity/foundry/foundry.ogg", volume = 0.6 }, + sound_accents = { + { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-1.ogg", volume = 0.8 }, frame = 26, audible_distance_modifier = 0.5 }, + { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-fall.ogg", volume = 1.2 }, frame = 42, audible_distance_modifier = 0.5 }, + { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-2.ogg", volume = 0.8 }, frame = 53, audible_distance_modifier = 0.4 }, + { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-split.ogg", volume = 0.4 }, frame = 62, audible_distance_modifier = 0.3 }, + { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 14, audible_distance_modifier = 0.3 }, + { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 34, audible_distance_modifier = 0.3 }, + { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 54, audible_distance_modifier = 0.3 }, + { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 74, audible_distance_modifier = 0.3 }, + } + } + }, + { + type = "item", + name = name, + icon = Lignumis.graphics .. "icons/lumber-mill.png", + subgroup = "production-machine", + order = "eb[lumber-mill]", + inventory_move_sound = item_sounds.mechanical_large_inventory_move, + pick_sound = item_sounds.mechanical_large_inventory_pickup, + drop_sound = item_sounds.mechanical_large_inventory_move, + place_result = name, + stack_size = 20, + default_import_location = "lignumis", + weight = 200 * kg + }, + { + type = "recipe", + name = name, + category = "crafting", + additional_categories = { "wood-processing" }, + enabled = false, + ingredients = table.trim({ + { type = "item", name = "stone-brick", amount = 40 }, + { type = "item", name = "lumber", amount = 50 }, + { type = "item", name = "wooden-gear-wheel", amount = 50 }, + { type = "item", name = "gold-plate", amount = basic_circuit_board and 20 or 40 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 20 } or nil, + { type = "item", name = "burner-assembling-machine", amount = 2 } + }), + energy_required = 60, + results = { { type = "item", name = name, amount = 1 } } + }, + { + type = "technology", + name = name, + icon = Lignumis.graphics .. "technology/lumber-mill.png", + icon_size = 256, + prerequisites = electric_lumber_mill and { "automation-science-pack" } or { "steam-science-pack" }, + unit = { + count = 250, + ingredients = electric_lumber_mill and {{ "automation-science-pack", 1 }} or {{ "wood-science-pack", 1 }, { "steam-science-pack", 1 }}, + time = 15 } } }) -local lumber_mill_item = LumberMill.ItemBuilder:new() - :apply({ - default_import_location = "lignumis", - order = "2[lumber-mill]" - }) - -LumberMill.RecipeBuilder:new() - :ingredients(table.trim({ - { type = "item", name = "stone-brick", amount = 40 }, - { type = "item", name = "lumber", amount = 50 }, - { type = "item", name = "wooden-gear-wheel", amount = 50 }, - { type = "item", name = "gold-plate", amount = basic_circuit_board and 20 or 40 }, - basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 20 } or nil, - { type = "item", name = "burner-assembling-machine", amount = 2 } - })) - :apply({ - additional_categories = { "wood-processing" } - }) - -local tech = LumberMill.TechnologyBuilder:new() - :count(250) - :time(15) -if electric_lumber_mill then - tech:prerequisites({ "automation-science-pack" }) - :ingredients({ { "automation-science-pack", 1 } }) -else - tech:prerequisites({ "steam-science-pack" }) - :ingredients({ { "wood-science-pack", 1 }, { "steam-science-pack", 1 } }) -end -tech:apply() - -LumberMill.RecipeBuilder:new() - :ingredients({ - { type = "item", name = "stone-brick", amount = 40 }, - { type = "item", name = "lumber", amount = 50 }, - { type = "item", name = "wooden-gear-wheel", amount = 50 }, - { type = "item", name = "copper-plate", amount = basic_circuit_board and 20 or 40 }, - { type = "item", name = basic_circuit_board and "basic-circuit-board" or "electronic-circuit", amount = 20 }, - { type = "item", name = "assembling-machine-1", amount = 2 } - }) - :apply({ - name = "lumber-mill-copper", +Recipe:new("lumber-mill") + :unlockedByTechnology("lumber-mill") + :clone("lumber-mill-copper") + :assign({ + ingredients = { + { type = "item", name = "stone-brick", amount = 40 }, + { type = "item", name = "lumber", amount = 50 }, + { type = "item", name = "wooden-gear-wheel", amount = 50 }, + { type = "item", name = "copper-plate", amount = basic_circuit_board and 20 or 40 }, + { type = "item", name = basic_circuit_board and "basic-circuit-board" or "electronic-circuit", amount = 20 }, + { type = "item", name = "assembling-machine-1", amount = 2 } + }, localised_name = { "entity-name.lumber-mill" }, - additional_categories = { "wood-processing" }, icons = { - { icon = lumber_mill_item.icon }, + { icon = Lignumis.graphics .. "icons/lumber-mill.png" }, { icon = basic_circuit_board and "__base__/graphics/icons/copper-plate.png" or "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } } }) - -Technology:new( - electric_lumber_mill and "lumber-mill" - or basic_circuit_board and "copper-processing" - or "electronics" -):addRecipe("lumber-mill-copper") + :unlockedByTechnology( + electric_lumber_mill and "lumber-mill" + or basic_circuit_board and "copper-processing" + or "electronics" + ) + :apply() Recipe:new("wooden-chest"):addCategory("wood-processing") Recipe:new("small-electric-pole"):addCategory("wood-processing") \ No newline at end of file From f39ad8f6fe58847e8e760ce505488d18ba12fe83 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 00:18:53 +0100 Subject: [PATCH 19/46] 1.0.78 --- lignumis/changelog.txt | 7 +++++++ lignumis/info.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index 86a87ca..0d49baa 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.78 +Date: 16.12.2025 + Changes: + - Wooden logistics: Change compatibility to stick closer to how wooden logistics does things (breaking) + - Add setting to make the lumber mill electric + - Integrate lumber mill code into this mod +--------------------------------------------------------------------------------------------------- Version: 1.0.77 Date: 14.12.2025 Changes: diff --git a/lignumis/info.json b/lignumis/info.json index b0d72f2..c35c5f6 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,6 +1,6 @@ { "name": "lignumis", - "version": "1.0.77", + "version": "1.0.78", "title": "Lignumis", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis planet mod effects other planets and space ships. Make sure to read the description on the mod portal and check the mod settings.", "author": "cackling fiend", From 52538eadacf7e29745d41946c871930378d613d6 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 00:34:47 +0100 Subject: [PATCH 20/46] Any planet start: Change description of Lignumis to name the selected parent planet --- lignumis/locale/de/strings.cfg | 2 +- lignumis/locale/en/strings.cfg | 2 +- lignumis/locale/es-ES/strings.cfg | 2 +- lignumis/locale/pl/strings.cfg | 2 +- lignumis/locale/ru/strings.cfg | 2 +- lignumis/prototypes/content/lignumis/planet.lua | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lignumis/locale/de/strings.cfg b/lignumis/locale/de/strings.cfg index 63a519a..f87857e 100644 --- a/lignumis/locale/de/strings.cfg +++ b/lignumis/locale/de/strings.cfg @@ -8,7 +8,7 @@ lignumis=Tauche ein in die Welt von Lignumis, einem Mond von Nauvis, der nur die lignumis=Lignumis [space-location-description] -lignumis=Lignumis ist ein Mond, der Nauvis umkreist. Er ist Nauvis recht ähnlich, scheint aber jünger zu sein und über weniger Ressourcen zu verfügen. +lignumis=Lignumis ist ein Mond, der __1__ umkreist. Er ist Nauvis recht ähnlich, scheint aber jünger zu sein und über weniger Ressourcen zu verfügen. [airborne-pollutant-name] noise=Lärm diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index bf7d502..fc44237 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -8,7 +8,7 @@ lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the mos lignumis=Lignumis [space-location-description] -lignumis=Lignumis is a moon orbiting Nauvis. It is quite similar to Nauvis but seems to be younger and with fewer resources. +lignumis=Lignumis is a moon orbiting __1__. It is quite similar to Nauvis but seems to be younger and with fewer resources. [airborne-pollutant-name] noise=Noise diff --git a/lignumis/locale/es-ES/strings.cfg b/lignumis/locale/es-ES/strings.cfg index 3d78c3f..cfc01ba 100644 --- a/lignumis/locale/es-ES/strings.cfg +++ b/lignumis/locale/es-ES/strings.cfg @@ -8,7 +8,7 @@ lignumis=Sumérgete en el mundo de Lignumis, una luna de Nauvis que ofrece solo lignumis=Lignumis [space-location-description] -lignumis=Lignumis es una luna orbitando Nauvis. Es bastante similar a Nauvis, pero parece ser más joven y con menos recursos. +lignumis=Lignumis es una luna orbitando __1__. Es bastante similar a Nauvis, pero parece ser más joven y con menos recursos. [airborne-pollutant-name] noise=Ruido diff --git a/lignumis/locale/pl/strings.cfg b/lignumis/locale/pl/strings.cfg index 4dfb484..21410af 100644 --- a/lignumis/locale/pl/strings.cfg +++ b/lignumis/locale/pl/strings.cfg @@ -8,7 +8,7 @@ lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the mos lignumis=Lignumis [space-location-description] -lignumis=Lignumis to księżyc orbitujący wokół Nauvis. Jest dość podobny do Nauvis, ale wydaje się być młodszy i ma mniej zasobów. +lignumis=Lignumis to księżyc orbitujący wokół __1__. Jest dość podobny do Nauvis, ale wydaje się być młodszy i ma mniej zasobów. [airborne-pollutant-name] noise=Hałas diff --git a/lignumis/locale/ru/strings.cfg b/lignumis/locale/ru/strings.cfg index 03b9dc4..8b6a72b 100644 --- a/lignumis/locale/ru/strings.cfg +++ b/lignumis/locale/ru/strings.cfg @@ -8,7 +8,7 @@ lignumis=Погрузитесь в мир Лигнумиса — луны Нау lignumis=Лигнумис [space-location-description] -lignumis=Лигнумис — это луна, вращающаяся вокруг Наувиса. Она во многом похожа на Наувис, но кажется моложе и беднее ресурсами. +lignumis=Лигнумис — это луна, вращающаяся вокруг __1__. Она во многом похожа на Наувис, но кажется моложе и беднее ресурсами. [airborne-pollutant-name] noise=Шум diff --git a/lignumis/prototypes/content/lignumis/planet.lua b/lignumis/prototypes/content/lignumis/planet.lua index d94434e..96a32a2 100644 --- a/lignumis/prototypes/content/lignumis/planet.lua +++ b/lignumis/prototypes/content/lignumis/planet.lua @@ -25,6 +25,7 @@ PlanetsLib:extend({ { type = "planet", name = "lignumis", + localised_description = { "space-location-description.lignumis", { "space-location-name." .. target_planet } }, orbit = { parent = { type = "planet", From 44f94db2627c88258cab6a6b825f9e21b833932b Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 14:17:22 +0100 Subject: [PATCH 21/46] Correctly use audible_distance_modifier --- lignumis/prototypes/content/lumber-mill.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 816ea8c..7951185 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -175,14 +175,14 @@ data:extend({ max_sounds_per_type = 2, sound = { filename = "__space-age__/sound/entity/foundry/foundry.ogg", volume = 0.6 }, sound_accents = { - { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-1.ogg", volume = 0.8 }, frame = 26, audible_distance_modifier = 0.5 }, - { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-fall.ogg", volume = 1.2 }, frame = 42, audible_distance_modifier = 0.5 }, - { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-2.ogg", volume = 0.8 }, frame = 53, audible_distance_modifier = 0.4 }, - { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-split.ogg", volume = 0.4 }, frame = 62, audible_distance_modifier = 0.3 }, - { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 14, audible_distance_modifier = 0.3 }, - { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 34, audible_distance_modifier = 0.3 }, - { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 54, audible_distance_modifier = 0.3 }, - { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 74, audible_distance_modifier = 0.3 }, + { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-1.ogg", volume = 0.8, audible_distance_modifier = 0.5 }, frame = 26 }, + { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-fall.ogg", volume = 1.2, audible_distance_modifier = 0.5 }, frame = 42 }, + { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-2.ogg", volume = 0.8, audible_distance_modifier = 0.4 }, frame = 53 }, + { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-split.ogg", volume = 0.4, audible_distance_modifier = 0.3 }, frame = 62 }, + { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5), audible_distance_modifier = 0.3 }, frame = 14 }, + { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5), audible_distance_modifier = 0.3 }, frame = 34 }, + { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5), audible_distance_modifier = 0.3 }, frame = 54 }, + { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5), audible_distance_modifier = 0.3 }, frame = 74 }, } } }, From 5adfc7e044b4731914ce7f6684a2f3b813843d8c Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 01:38:57 +0100 Subject: [PATCH 22/46] Integrate quality assembler code into this mod --- lignumis/prototypes/content/deep-miner.lua | 2 +- lignumis/prototypes/content/lumber-mill.lua | 2 +- .../prototypes/content/quality-assembler.lua | 376 +++++++++++++++--- 3 files changed, 317 insertions(+), 63 deletions(-) diff --git a/lignumis/prototypes/content/deep-miner.lua b/lignumis/prototypes/content/deep-miner.lua index 494f1be..8585062 100644 --- a/lignumis/prototypes/content/deep-miner.lua +++ b/lignumis/prototypes/content/deep-miner.lua @@ -3,8 +3,8 @@ local item_sounds = require("__base__.prototypes.item_sounds") local sounds = require("__base__.prototypes.entity.sounds") local Entity = require("__cf-lib__/data/Entity") -local gfx = Lignumis.graphics .. "entity/deep-miner/" local name = "deep-miner" +local gfx = Lignumis.graphics .. "entity/" .. name .. "/" local function animationLayer() return { diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 7951185..26bb3f7 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -3,8 +3,8 @@ local hit_effects = require("__base__.prototypes.entity.hit-effects") local item_sounds = require("__base__.prototypes.item_sounds") local Entity = require("__cf-lib__/data/Entity") -local gfx = Lignumis.graphics .. "entity/lumber-mill/" local name = "lumber-mill" +local gfx = Lignumis.graphics .. "entity/" .. name .. "/" data:extend({ { diff --git a/lignumis/prototypes/content/quality-assembler.lua b/lignumis/prototypes/content/quality-assembler.lua index be95a71..938080a 100644 --- a/lignumis/prototypes/content/quality-assembler.lua +++ b/lignumis/prototypes/content/quality-assembler.lua @@ -1,9 +1,55 @@ +local hit_effects = require("__base__.prototypes.entity.hit-effects") local item_sounds = require("__base__.prototypes.item_sounds") +local sounds = require("__base__.prototypes.entity.sounds") +local Entity = require("__cf-lib__/data/Entity") +local Technology = require("__cf-lib__/data/Technology") +local machinepipes = require("prototypes/content/gold/machinepipes") -local QualityAssemblerFactory = require(MF.buildings .. "GravityAssembler") -local QualityAssembler = QualityAssemblerFactory("quality-assembler") +local function assemblerpipepicturesfrozen() + return { + north = { + filename = "__space-age__/graphics/entity/frozen/assembling-machine/assembling-machine-pipe-N-frozen.png", + priority = "extra-high", + width = 71, + height = 38, + shift = util.by_pixel(2.25, 13.5), + scale = 0.5 + }, + east = { + filename = "__space-age__/graphics/entity/frozen/assembling-machine/assembling-machine-pipe-E-frozen.png", + priority = "extra-high", + width = 42, + height = 76, + shift = util.by_pixel(-24.5, 1), + scale = 0.5 + }, + south = { + filename = "__space-age__/graphics/entity/frozen/assembling-machine/assembling-machine-pipe-S-frozen.png", + priority = "extra-high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5 + }, + west = { + filename = "__space-age__/graphics/entity/frozen/assembling-machine/assembling-machine-pipe-W-frozen.png", + priority = "extra-high", + width = 39, + height = 73, + shift = util.by_pixel(25.75, 1.25), + scale = 0.5 + } + } +end + +local name = "quality-assembler" +local gfx = Lignumis.graphics .. "entity/" .. name .. "/" data:extend({ + { + type = "recipe-category", + name = "quality-assembling" + }, { type = "burner-usage", name = "quality-catalyst", @@ -60,64 +106,272 @@ data:extend({ allow_productivity = true, allow_quality = false, enabled = false - } -}) - -QualityAssembler.EntityBuilder:new() - :allowProductivity(false) - :burnerEnergySource({ - burner_usage = "quality-catalyst", - fuel_categories = { "quality-catalyst" }, - fuel_inventory_size = 1, - emissions_per_minute = { noise = 100, pollution = 6 } - }) - :pipes() - :apply({ - energy_usage = "1MW", - crafting_speed = 4, + }, + { + type = "assembling-machine", + name = name, + icon = Lignumis.graphics .. "icons/quality-assembler.png", + flags = { "placeable-neutral", "player-creation" }, + minable = { mining_time = 0.2, result = name }, + fast_replaceable_group = name, + max_health = 500, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = Entity.collisionBox(4, 4), + selection_box = Entity.selectionBox(4, 4), + damaged_trigger_effect = hit_effects.entity(), + drawing_box_vertical_extension = 1.3, module_slots = 6, - allowed_effects = { "consumption", "pollution", "quality" }, effect_receiver = { base_effect = { quality = 3.5 } }, - crafting_categories = { "quality-assembling" } - }) - -QualityAssembler.ItemBuilder:new():apply() - -QualityAssembler.RecipeBuilder:new() - :ingredients({ - { type = "item", name = "gold-plate", amount = 60 }, - { type = "item", name = "tungsten-plate", amount = 40 }, - { type = "item", name = "superconductor", amount = 50 }, - { type = "item", name = "carbon-fiber", amount = 100 }, - { type = "item", name = "quantum-processor", amount = 10 } - }) - :apply({ + icon_draw_specification = {shift = {0, -0.25}}, + icons_positioning = { + { inventory_index = defines.inventory.assembling_machine_modules, shift = { 0, 1 }, max_icons_per_row = 4 } + }, + allowed_effects = { "consumption", "pollution", "quality" }, + crafting_categories = { "quality-assembling" }, + crafting_speed = 4, + energy_source = { + type = "burner", + burner_usage = "quality-catalyst", + fuel_categories = { "quality-catalyst" }, + effectivity = 1, + fuel_inventory_size = 1, + emissions_per_minute = { noise = 100, pollution = 6 }, + }, + energy_usage = "1MW", + heating_energy = "200kW", + perceived_performance = { minimum = 0.25, performance_to_activity_rate = 0.25, maximum = 4 }, + graphics_set = { + animation = { + layers = { + { + filename = gfx .. "quality-assembler-shadow.png", + priority = "high", + width = 500, + height = 350, + frame_count = 1, + line_length = 1, + repeat_count = 64, + animation_speed = 0.32, + draw_as_shadow = true, + scale = 0.5 + }, + { + priority = "high", + width = 270, + height = 310, + frame_count = 64, + lines_per_file = 8, + animation_speed = 0.32, + scale = 0.5, + stripes = { + { + filename = gfx .. "quality-assembler-animation-1.png", + width_in_frames = 8, + height_in_frames = 8 + } + } + } + } + }, + working_visualisations = { + { + fadeout = true, + animation = { + layers = { + { + priority = "high", + width = 270, + height = 310, + frame_count = 64, + lines_per_file = 8, + animation_speed = 0.32, + scale = 0.5, + stripes = { + { + filename = gfx .. "quality-assembler-animation-1.png", + width_in_frames = 8, + height_in_frames = 8 + } + } + }, + { + priority = "high", + draw_as_glow = true, + blend_mode = "additive", + width = 270, + height = 310, + frame_count = 64, + lines_per_file = 8, + animation_speed = 0.32, + scale = 0.5, + stripes = { + { + filename = gfx .. "quality-assembler-emission-1.png", + width_in_frames = 8, + height_in_frames = 8 + } + } + } + } + } + } + }, + frozen_patch = { + priority = "high", + filename = gfx .. "quality-assembler-frozen-1.png", + width = 270, + height = 310, + scale = 0.5 + } + }, + open_sound = sounds.machine_open, + close_sound = sounds.machine_close, + fluid_boxes = { + { + production_type = "input", + pipe_picture = machinepipes(), + pipe_picture_frozen = assemblerpipepicturesfrozen(), + pipe_covers = pipecoverspictures(), + volume = 200, + secondary_draw_orders = { north = -1 }, + pipe_connections = {{ flow_direction="input-output", direction = defines.direction.west, position = {-1.5, 0.5} }} + }, + { + production_type = "input", + pipe_picture = machinepipes(), + pipe_picture_frozen = assemblerpipepicturesfrozen(), + pipe_covers = pipecoverspictures(), + volume = 200, + secondary_draw_orders = { north = -1 }, + pipe_connections = {{ flow_direction="input-output", direction = defines.direction.east, position = {1.5, -0.5} }} + }, + { + production_type = "output", + pipe_picture = machinepipes(), + pipe_picture_frozen = assemblerpipepicturesfrozen(), + pipe_covers = pipecoverspictures(), + volume = 100, + secondary_draw_orders = { north = -1 }, + pipe_connections = {{ flow_direction="input-output", direction = defines.direction.south, position = {0.5, 1.5} }} + }, + { + production_type = "output", + pipe_picture = machinepipes(), + pipe_picture_frozen = assemblerpipepicturesfrozen(), + pipe_covers = pipecoverspictures(), + volume = 100, + secondary_draw_orders = { north = -1 }, + pipe_connections = {{ flow_direction="input-output", direction = defines.direction.north, position = {-0.5, -1.5} }} + } + }, + fluid_boxes_off_when_no_fluid_recipe = true, + forced_symmetry = "horizontal", + working_sound = { + fade_in_ticks = 4, + fade_out_ticks = 20, + audible_distance_modifier = 0.6, + max_sounds_per_type = 2, + main_sounds = { + { + sound = { filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-working-loop.ogg", volume = 0.6, audible_distance_modifier = 0.8 }, + probability = 1.0 + }, + { + sound = { + filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-ai.ogg", + volume = 0.5, + audible_distance_modifier = 0.4, + advanced_volume_control = { + attenuation = "exponential", + fades = { fade_in = { curve_type = "linear", from = { control = 0.75, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } } + } + }, + probability = 1 / (7 * 60) + }, + { + sound = { + filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-ai-long.ogg", + volume = 0.3, + audible_distance_modifier = 0.2, + advanced_volume_control = { + attenuation = "exponential", + fades = { fade_in = { curve_type = "linear", from = { control = 0.75, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } } + } + } + } + }, + sound_accents = { + { sound = { filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-welding.ogg", min_volume = 0.6, max_volume = 1.0, audible_distance_modifier = 0.8 }, frame = 12 }, + { sound = { + filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-click.ogg", + min_volume = 0.3, + max_volume = 0.6, + advanced_volume_control = { + attenuation = "exponential", + fades = { fade_in = { curve_type = "linear", from = { control = 0.75, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } } + }, + audible_distance_modifier = 0.2 + }, frame = 48 } + } + } + }, + { + type = "item", + name = name, + icon = Lignumis.graphics .. "icons/quality-assembler.png", + subgroup = "production-machine", + order = "a[" .. name .. "]", + inventory_move_sound = item_sounds.mechanical_large_inventory_move, + pick_sound = item_sounds.mechanical_large_inventory_pickup, + drop_sound = item_sounds.mechanical_large_inventory_move, + place_result = name, + stack_size = 20, + default_import_location = "nauvis", + weight = 200 * kg + }, + { + type = "recipe", + name = name, category = "electromagnetics", - additional_categories = { "quality-assembling" } - }) - -QualityAssembler.TechnologyBuilder:new() - :prerequisites({ "legendary-quality", "quantum-processor" }) - :count(5000) - :ingredients({ - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 }, - { "automation-science-pack", 1 }, - { "logistic-science-pack", 1 }, - { "chemical-science-pack", 1 }, - { "space-science-pack", 1 }, - { "production-science-pack", 1 }, - { "utility-science-pack", 1 }, - { "metallurgic-science-pack", 1 }, - { "agricultural-science-pack", 1 }, - { "electromagnetic-science-pack", 1 }, - { "cryogenic-science-pack", 1 } - }) - :time(60) - :additionalRecipes({ "gold-quality-catalyst" }) - :apply() - -data:extend({ + additional_categories = { "quality-assembling" }, + enabled = false, + ingredients = { + { type = "item", name = "gold-plate", amount = 60 }, + { type = "item", name = "tungsten-plate", amount = 40 }, + { type = "item", name = "superconductor", amount = 50 }, + { type = "item", name = "carbon-fiber", amount = 100 }, + { type = "item", name = "quantum-processor", amount = 10 } + }, + energy_required = 60, + results = { { type = "item", name = name, amount = 1 } }, + }, + { + type = "technology", + name = name, + icon = Lignumis.graphics .. "technology/quality-assembler.png", + icon_size = 256, + effects = {}, + prerequisites = { "legendary-quality", "quantum-processor" }, + unit = { + count = 5000, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 }, + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "space-science-pack", 1 }, + { "production-science-pack", 1 }, + { "utility-science-pack", 1 }, + { "metallurgic-science-pack", 1 }, + { "agricultural-science-pack", 1 }, + { "electromagnetic-science-pack", 1 }, + { "cryogenic-science-pack", 1 } + }, + time = 60 + } + }, { type = "technology", name = "experienced-quality-assembling-1", @@ -149,13 +403,13 @@ data:extend({ }, research_trigger = { type = "craft-item", item = "gold-quality-catalyst", count = 10000 }, prerequisites = { "experienced-quality-assembling-1" } - }, - { - type = "recipe-category", - name = "quality-assembling" } }) +Technology:new(name) + :addRecipe(name) + :addRecipe("gold-quality-catalyst") + local function qa(recipeName) local recipe = data.raw.recipe[recipeName] recipe.additional_categories = recipe.additional_categories or {} From 414ccf59a4a0b020b603790ada36f37954edb183 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 18:41:19 +0100 Subject: [PATCH 23/46] Quality assembler has module slots dependant on quality (1-6) --- lignumis/prototypes/content/quality-assembler.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lignumis/prototypes/content/quality-assembler.lua b/lignumis/prototypes/content/quality-assembler.lua index 938080a..69bdf88 100644 --- a/lignumis/prototypes/content/quality-assembler.lua +++ b/lignumis/prototypes/content/quality-assembler.lua @@ -121,7 +121,8 @@ data:extend({ selection_box = Entity.selectionBox(4, 4), damaged_trigger_effect = hit_effects.entity(), drawing_box_vertical_extension = 1.3, - module_slots = 6, + module_slots = 1, + quality_affects_module_slots = true, effect_receiver = { base_effect = { quality = 3.5 } }, icon_draw_specification = {shift = {0, -0.25}}, icons_positioning = { From 8974981d07ec320bb2008a23964a73f75165dd89 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 20:23:34 +0100 Subject: [PATCH 24/46] Add golden module --- lignumis/data-final-fixes.lua | 18 ++++++ lignumis/locale/en/strings.cfg | 4 ++ .../prototypes/content/quality-assembler.lua | 55 ++++++++++++++++++- 3 files changed, 76 insertions(+), 1 deletion(-) diff --git a/lignumis/data-final-fixes.lua b/lignumis/data-final-fixes.lua index bbdacb8..452d38d 100644 --- a/lignumis/data-final-fixes.lua +++ b/lignumis/data-final-fixes.lua @@ -4,4 +4,22 @@ require("prototypes/compatibility/final") if not mods["Burner-Leech-Fork"] and not mods["Burner-Leech"] and not mods["InserterFuelLeech"] then data.raw["inserter"]["burner-inserter"].allow_burner_leech = true data.raw["inserter"]["burner-long-handed-inserter"].allow_burner_leech = true +end + +-- disable gold module from everything where it's not manually added +local moduled_building_types = { "beacon", "assembling-machine", "rocket-silo", "furnace", "lab", "mining-drill" } + +for _, moduled_building_type in pairs(moduled_building_types) do + for _,moduled_building in pairs(data.raw[moduled_building_type]) do + if moduled_building then + if not moduled_building.allowed_module_categories then + moduled_building.allowed_module_categories = {} + for _, module_cat in pairs(data.raw["module-category"]) do + if not (module_cat.name == "quality-assembling") then + table.insert(moduled_building.allowed_module_categories, module_cat.name) + end + end + end + end + end end \ No newline at end of file diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index fc44237..f8449a5 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -83,12 +83,14 @@ wood-darts-magazine=Wood darts magazine basic-circuit-board=Basic circuit board crushed-gold-ore=Crushed gold ore steam-science-pack-spoiled=Science flask with water +gold-module-3=Golden module 3 [item-description] wooden-wall=Use wooden walls to protect your base from the locals and to reduce noise levels. stone-wall=Better acoustic and physical protection than the wooden counterpart. gold-stromatolite-seed=Plant the seed to grow gold stromatolites. They house bacteria that enrich gold from the ground.\n__REMARK_COLOR_BEGIN__Expected yield:__REMARK_COLOR_END__ 1.5 [item=gold-ore]/m steam-science-pack-spoiled=Spoiled steam science pack. Put it in a furnace to bring it to the right temperature. +gold-module-3=When you mastered quality assembling, this pristine module is unlocked, enabling you to craft the finest items available. [fluid-name] wood-pulp=Wood pulp @@ -147,6 +149,7 @@ aai-wood-loader=Wood loader basic-ore-crushing=Basic ore crushing astroponics-productivity=Astroponics productivity experienced-quality-assembling=Experienced quality assembling +gold-module=Golden module [technology-description] wood-science-pack=Allows research of basic technologies based on wood products. @@ -167,6 +170,7 @@ tree-seeding=[entity=burner-agricultural-tower] allows planting seeds into seeda active-noise-cancelling=Helps handling noise. quality-assembler=High-end assembler to craft only the finest quality machines using a special resource only found on Lignumis. automation-science-pack=Leave Lignumis to enable advanced technology research. +gold-module=Master quality assembling, to unlock a pristine module, enabling you to craft the finest items available. [modifier-description] basic-gun-turret-attack-bonus=Basic gun turret damage: +__1__ diff --git a/lignumis/prototypes/content/quality-assembler.lua b/lignumis/prototypes/content/quality-assembler.lua index 69bdf88..67fcced 100644 --- a/lignumis/prototypes/content/quality-assembler.lua +++ b/lignumis/prototypes/content/quality-assembler.lua @@ -50,6 +50,10 @@ data:extend({ type = "recipe-category", name = "quality-assembling" }, + { + type = "module-category", + name = "quality-assembling" + }, { type = "burner-usage", name = "quality-catalyst", @@ -129,6 +133,7 @@ data:extend({ { inventory_index = defines.inventory.assembling_machine_modules, shift = { 0, 1 }, max_icons_per_row = 4 } }, allowed_effects = { "consumption", "pollution", "quality" }, + allowed_module_categories = { "efficiency", "quality", "quality-assembling" }, crafting_categories = { "quality-assembling" }, crafting_speed = 4, energy_source = { @@ -373,6 +378,38 @@ data:extend({ time = 60 } }, + { + type = "module", + name = "gold-module-3", + localised_description = { "item-description.gold-module" }, + icon = Lignumis.graphics .. "icons/gold-module-3.png", + subgroup = "module", + color_hint = { text = "Q" }, + category = "quality-assembling", + tier = 3, + order = "e[gold]-c[gold-module-3]", + inventory_move_sound = item_sounds.module_inventory_move, + pick_sound = item_sounds.module_inventory_pickup, + drop_sound = item_sounds.module_inventory_move, + stack_size = 50, + weight = 20 * kg, + effect = { quality = 0.75, speed = -0.1 } + }, + { + type = "recipe", + name = "gold-module-3", + category = "electromagnetics", + additional_categories = { "quality-assembling" }, + enabled = false, + ingredients = + { + {type = "item", name = "quality-module-3", amount = 4}, + {type = "item", name = "quantum-processor", amount = 5}, + {type = "item", name = "gold-quality-catalyst", amount = 20} + }, + energy_required = 60, + results = {{type="item", name="gold-module-3", amount=1}} + }, { type = "technology", name = "experienced-quality-assembling-1", @@ -386,7 +423,7 @@ data:extend({ effects = { { type = "change-recipe-productivity", recipe = "gold-quality-catalyst", change = 0.25 } }, - research_trigger = { type = "craft-item", item = "gold-quality-catalyst", count = 1000 }, + research_trigger = { type = "craft-item", item = "gold-quality-catalyst", count = 2000 }, prerequisites = { "quality-assembler" } }, { @@ -404,6 +441,22 @@ data:extend({ }, research_trigger = { type = "craft-item", item = "gold-quality-catalyst", count = 10000 }, prerequisites = { "experienced-quality-assembling-1" } + }, + { + type = "technology", + name = "experienced-quality-assembling-3", + icons = { + { icon = "__quality__/graphics/technology/legendary-quality.png", icon_size = 256 }, + { icon = Lignumis.graphics .. "icons/quality-gold-catalyst.png", icon_size = 64, scale = 1, shift = { 50, 50 }, draw_background = true } + }, + level = 3, + max_level = 3, + show_levels_info = true, + effects = { + { type = "unlock-recipe", recipe = "gold-module-3" } + }, + research_trigger = { type = "craft-item", item = "gold-quality-catalyst", count = 40000 }, + prerequisites = { "experienced-quality-assembling-2" } } }) From 709c834ebd43de57f79f385e4b0865c71dfa7816 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 20:33:04 +0100 Subject: [PATCH 25/46] Only move yellow and purple science after space science when progressive technologies are enabled --- lignumis/prototypes/integrations/vanilla.lua | 21 +++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index 65f2028..5d79f97 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -283,19 +283,22 @@ table.insert(physical_damage_technology_4.effects, { local weapon_speed_technology_4 = data.raw.technology["weapon-shooting-speed-4"] weapon_speed_technology_4.prerequisites = { "weapon-shooting-speed-3", "military-science-pack" } -local production_science_pack_technology = Technology:new("production-science-pack") -production_science_pack_technology:replacePrerequisite("advanced-material-processing-2", "space-platform-thruster") -production_science_pack_technology:addIngredients({ "space-science-pack" }) if settings.startup["lignumis-technology-progression"].value then + local production_science_pack_technology = Technology:new("production-science-pack") + production_science_pack_technology:replacePrerequisite("advanced-material-processing-2", "space-platform-thruster") + production_science_pack_technology:addIngredients({ "space-science-pack" }) production_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack" }) + + local utility_science_pack_technology = Technology:new("utility-science-pack") + utility_science_pack_technology:setPrerequisites({ "space-platform-thruster" }) + utility_science_pack_technology:addIngredients({ "space-science-pack" }) + utility_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack" }) +else + Technology:new("deep-miner") + :addPrerequisite("production-science-pack") + :addIngredient("production-science-pack") end -local utility_science_pack_technology = Technology:new("utility-science-pack") -utility_science_pack_technology:setPrerequisites({ "space-platform-thruster" }) -utility_science_pack_technology:addIngredients({ "space-science-pack" }) -if settings.startup["lignumis-technology-progression"].value then - utility_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack" }) -end if not mods["planet-muluna"] then -- Muluna does the same Technology:new("logistic-robotics"):addRecipe("requester-chest") From e213ae9f2f0ee895dad0007daad62c264dd232aa Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 21:07:23 +0100 Subject: [PATCH 26/46] Integrate wood logistics code into this mod --- .../prototypes/compatibility/aai-loaders.lua | 2 + .../compatibility/lane-splitters.lua | 1 + .../prototypes/content/wood-logistics.lua | 555 +++++++++++++++--- 3 files changed, 463 insertions(+), 95 deletions(-) diff --git a/lignumis/prototypes/compatibility/aai-loaders.lua b/lignumis/prototypes/compatibility/aai-loaders.lua index da3c063..2874aef 100644 --- a/lignumis/prototypes/compatibility/aai-loaders.lua +++ b/lignumis/prototypes/compatibility/aai-loaders.lua @@ -48,6 +48,8 @@ AAILoaders.make_tier({ data.raw.recipe["aai-wood-loader"].additional_categories = { "wood-processing" } +data.raw["loader-1x1"]["aai-wood-loader"].animation_speed_coefficient = 1.01 * 32 + if not basic_circuit_board then local nauvis_recipe = Recipe:new("aai-wood-loader"):clone("wood-loader-electronic-circuit") nauvis_recipe:replaceIngredient("gold-cable", "electronic-circuit") diff --git a/lignumis/prototypes/compatibility/lane-splitters.lua b/lignumis/prototypes/compatibility/lane-splitters.lua index 075cc68..a627a27 100644 --- a/lignumis/prototypes/compatibility/lane-splitters.lua +++ b/lignumis/prototypes/compatibility/lane-splitters.lua @@ -21,6 +21,7 @@ lane_splitter.prototype.structure_patch.east.filename = data.raw.splitter["wood- lane_splitter.prototype.structure_patch.south.filename = data.raw.splitter["wood-splitter"].structure_patch.south.filename lane_splitter.prototype.structure_patch.west.filename = data.raw.splitter["wood-splitter"].structure_patch.west.filename lane_splitter.prototype.structure_patch.north.filename = data.raw.splitter["wood-splitter"].structure_patch.north.filename +lane_splitter.prototype.animation_speed_coefficient = 1.01 * 32 lane_splitter.item.icon = Lignumis.graphics .. "icons/wood-lane-splitter.png" lane_splitter.item.order = "d[lane-splitter]-0[wood-lane-splitter]" lane_splitter.recipe.additional_categories = { "wood-processing" } diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua index 31f3809..4475b8f 100644 --- a/lignumis/prototypes/content/wood-logistics.lua +++ b/lignumis/prototypes/content/wood-logistics.lua @@ -1,108 +1,473 @@ -local BeltFactory = require(MF.logistics .. "Belts") -local Belt = BeltFactory("wood", "brown", "slow") - -local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value +local meld = require("meld") +local hit_effects = require("__base__.prototypes.entity.hit-effects") +local sounds = require("__base__.prototypes.entity.sounds") +local item_sounds = require("__base__.prototypes.item_sounds") +local Recipe = require("__cf-lib__/data/Recipe") if mods["wood-logistics"] and settings.startup["wood-logistics-belts"].value then return end -Belt.EntityBuilder:new() - :itemsPerSecond(7.5) - :nextTier("") - :undergroundDistance(4) - :animationSpeedMultiplier(1.01) - :apply({ - transportBelt = { - emissions_per_second = { noise = 2 / 60 } - }, - undergroundBelt = { - emissions_per_second = { noise = 7.5 / 60 }, - factoriopedia_simulation = { - init = - [[ - game.simulation.camera_position = {0, 0.5} - game.simulation.camera_zoom = 1.8 - game.surfaces[1].create_entities_from_blueprint_string - { - string = "0eNqVUNsKgzAM/Zc81+FEBfsrYwwvQQKaltpuivjvS3Wwh8HGnkKSc0tWaIaA1hF70CtMXNvEm6R31MV+Bl0oWECfNwXUGp5AXwRGPddDBHA9Imh4GNMlgTt0vTNSkwYHD5EjsznSrwqQPXnCQ2JvlhuHsUEnAPVdSoE1k7ANv2KlpyOYVLHpyGF7bHMFfrFRidiGGOLDLPvXLP9tZoLf3eRO8jjK5P1YBXd0004oyqzKq6ooqzLNinLbnvlmf6E=", - position = {-0.5, 0} - } - ]] +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value +local speed = 7.5 / 480 +local name = "wood" +local transportBeltName = name .. "-transport-belt" +local undergroundBeltName = name .. "-underground-belt" +local splitterName = name .. "-splitter" +local gfx = Lignumis.graphics .. "entity/wood-logistics/" + +local function createAnimation() + return meld({ + animation_set = { + filename = gfx .. "wood-transport-belt.png", + priority = "extra-high", + size = 128, + scale = 0.5, + frame_count = 16, + direction_count = 20 + } + }, belt_reader_gfx) +end + +data:extend({ + { + type = "transport-belt", + name = transportBeltName, + icon = Lignumis.graphics .. "icons/wood-transport-belt.png", + flags = { "placeable-neutral", "player-creation" }, + minable = { mining_time = 0.1, result = transportBeltName }, + max_health = 150, + next_upgrade = "transport-belt", + corpse = transportBeltName .. "-remnants", + dying_explosion = "transport-belt-explosion", + resistances = { + { + type = "fire", + percent = 90 } }, - splitter = { - emissions_per_second = { noise = 20 / 60 } - } - }) - -local splitter_item = Belt.ItemBuilder:new() - :itemsPerRocket("transportBelt", 200) - :itemsPerRocket("undergroundBelt", 100) - :itemsPerRocket("splitter", 100) - :order("0") - :apply() - .splitter - -Belt.RecipeBuilder:new() - :beltAmount(2) - :ingredients("transportBelt", { - { type = "item", name = "lumber", amount = 1 }, - { type = "item", name = "wooden-gear-wheel", amount = 1 } - }) - :ingredients("undergroundBelt", { - { type = "item", name = "lumber", amount = 1 }, - { type = "item", name = "wood-transport-belt", amount = 4 }, - }) - :ingredients("splitter", { - { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or - { type = "item", name = "gold-cable", amount = 10 } - }) - :apply({ - transportBelt = { - additional_categories = { "wood-processing" } + emissions_per_second = { noise = 2 / 60 }, + collision_box = { { -0.4, -0.4 }, { 0.4, 0.4 } }, + selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + damaged_trigger_effect = hit_effects.entity(), + open_sound = sounds.transport_belt_open, + close_sound = sounds.transport_belt_close, + working_sound = { + sound = { filename = "__base__/sound/transport-belt.ogg", volume = 0.17 }, + persistent = true }, - undergroundBelt = { - additional_categories = { "wood-processing" } + animation_speed_coefficient = 1.01 * 32, + fast_replaceable_group = "transport-belt", + related_underground_belt = undergroundBeltName, + speed = speed, + belt_animation_set = createAnimation(), + connector_frame_sprites = transport_belt_connector_frame_sprites, + circuit_connector = circuit_connector_definitions["belt"], + circuit_wire_max_distance = transport_belt_circuit_wire_max_distance + }, + { + type = "corpse", + name = transportBeltName .. "-remnants", + icon = Lignumis.graphics .. "icons/wood-transport-belt.png", + hidden_in_factoriopedia = true, + flags = { "placeable-neutral", "not-on-map" }, + subgroup = "belt-remnants", + order = "a-a-a", + selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + tile_width = 1, + tile_height = 1, + selectable_in_game = false, + time_before_removed = 60 * 60 * 15, -- 15 minutes + expires = false, + final_render_layer = "remnants", + animation = make_rotated_animation_variations_from_sheet(2, { + filename = gfx .. "wood-transport-belt-remnants.png", + line_length = 1, + width = 106, + height = 102, + direction_count = 4, + shift = util.by_pixel(1, -0.5), + scale = 0.5 + }) + }, + { + type = "underground-belt", + name = undergroundBeltName, + icon = Lignumis.graphics .. "icons/wood-underground-belt.png", + flags = { "placeable-neutral", "player-creation" }, + minable = { mining_time = 0.1, result = undergroundBeltName }, + max_health = 150, + next_upgrade = "underground-belt", + corpse = undergroundBeltName .. "-remnants", + dying_explosion = "underground-belt-explosion", + factoriopedia_simulation = { + init = + [[ + game.simulation.camera_position = {0, 0.5} + game.simulation.camera_zoom = 1.8 + game.surfaces[1].create_entities_from_blueprint_string + { + string = "0eNqVUNsKgzAM/Zc81+FEBfsrYwwvQQKaltpuivjvS3Wwh8HGnkKSc0tWaIaA1hF70CtMXNvEm6R31MV+Bl0oWECfNwXUGp5AXwRGPddDBHA9Imh4GNMlgTt0vTNSkwYHD5EjsznSrwqQPXnCQ2JvlhuHsUEnAPVdSoE1k7ANv2KlpyOYVLHpyGF7bHMFfrFRidiGGOLDLPvXLP9tZoLf3eRO8jjK5P1YBXd0004oyqzKq6ooqzLNinLbnvlmf6E=", + position = {-0.5, 0} + } + ]] }, - splitter = { - additional_categories = { "wood-processing" } + max_distance = 4, + open_sound = sounds.machine_open, + close_sound = sounds.machine_close, + working_sound = table.deepcopy(data.raw["underground-belt"]["underground-belt"].working_sound), + underground_sprite = table.deepcopy(data.raw["underground-belt"]["underground-belt"].underground_sprite), + resistances = { + { + type = "fire", + percent = 60 + }, + { + type = "impact", + percent = 30 + } + }, + emissions_per_second = { noise = 7.5 / 60 }, + collision_box = { { -0.4, -0.4 }, { 0.4, 0.4 } }, + selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + damaged_trigger_effect = hit_effects.entity(), + animation_speed_coefficient = 1.01 * 32, + fast_replaceable_group = "transport-belt", + speed = speed, + structure = { + direction_in = { + sheet = { + filename = gfx .. "wood-underground-belt-structure.png", + priority = "extra-high", + width = 192, + height = 192, + y = 192, + scale = 0.5 + } + }, + direction_out = { + sheet = { + filename = gfx .. "wood-underground-belt-structure.png", + priority = "extra-high", + width = 192, + height = 192, + scale = 0.5 + } + }, + direction_in_side_loading = { + sheet = { + filename = gfx .. "wood-underground-belt-structure.png", + priority = "extra-high", + width = 192, + height = 192, + y = 192 * 3, + scale = 0.5 + } + }, + direction_out_side_loading = { + sheet = { + filename = gfx .. "wood-underground-belt-structure.png", + priority = "extra-high", + width = 192, + height = 192, + y = 192 * 2, + scale = 0.5 + } + }, + back_patch = { + sheet = { + filename = + "__base__/graphics/entity/underground-belt/underground-belt-structure-back-patch.png", + priority = "extra-high", + width = 192, + height = 192, + scale = 0.5 + } + }, + front_patch = { + sheet = { + filename = + "__base__/graphics/entity/underground-belt/underground-belt-structure-front-patch.png", + priority = "extra-high", + width = 192, + height = 192, + scale = 0.5 + } + } + }, + belt_animation_set = createAnimation() + }, + { + type = "corpse", + name = undergroundBeltName .. "-remnants", + icon = Lignumis.graphics .. "icons/wood-underground-belt.png", + hidden_in_factoriopedia = true, + flags = { "placeable-neutral", "not-on-map", "building-direction-8-way" }, + subgroup = "belt-remnants", + order = "a-d-a", + selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + tile_width = 1, + tile_height = 1, + selectable_in_game = false, + time_before_removed = 60 * 60 * 15, -- 15 minutes + expires = false, + final_render_layer = "remnants", + remove_on_tile_placement = false, + animation = { + filename = gfx .. "wood-underground-belt-remnants.png", + line_length = 1, + width = 156, + height = 144, + direction_count = 8, + shift = util.by_pixel(10.5, 3), + scale = 0.5 } - }) - -Belt.TechnologyBuilder:new() - :prerequisites({ "wood-science-pack" }) - :ingredients({ { "wood-science-pack", 1 } }) - :count(10) - :time(10) - :apply() + }, + { + type = "splitter", + name = splitterName, + icon = Lignumis.graphics .. "icons/wood-splitter.png", + flags = { "placeable-neutral", "player-creation" }, + minable = { mining_time = 0.1, result = splitterName }, + max_health = 170, + next_upgrade = "splitter", + corpse = splitterName .. "-remnants", + dying_explosion = "splitter-explosion", + resistances = { + { + type = "fire", + percent = 60 + } + }, + emissions_per_second = { noise = 20 / 60 }, + collision_box = { { -0.9, -0.4 }, { 0.9, 0.4 } }, + selection_box = { { -0.9, -0.5 }, { 0.9, 0.5 } }, + damaged_trigger_effect = hit_effects.entity(), + animation_speed_coefficient = 1.01 * 32, + structure_animation_speed_coefficient = 0.7, + structure_animation_movement_cooldown = 10, + icon_draw_specification = { scale = 0.5 }, + fast_replaceable_group = "transport-belt", + speed = speed, + open_sound = sounds.machine_open, + close_sound = sounds.machine_close, + working_sound = sounds.splitter, + related_transport_belt = transportBeltName, + structure = { + north = { + filename = gfx .. "wood-splitter-north.png", + frame_count = 32, + line_length = 8, + priority = "extra-high", + width = 160, + height = 70, + shift = util.by_pixel(7, 0), + scale = 0.5 + }, + east = { + filename = gfx .. "wood-splitter-east.png", + frame_count = 32, + line_length = 8, + priority = "extra-high", + width = 90, + height = 84, + shift = util.by_pixel(4, 13), + scale = 0.5 + }, + south = { + filename = gfx .. "wood-splitter-south.png", + frame_count = 32, + line_length = 8, + priority = "extra-high", + width = 164, + height = 64, + shift = util.by_pixel(4, 0), + scale = 0.5 + }, + west = { + filename = gfx .. "wood-splitter-west.png", + frame_count = 32, + line_length = 8, + priority = "extra-high", + width = 90, + height = 86, + shift = util.by_pixel(6, 12), + scale = 0.5 + } + }, + structure_patch = { + north = util.empty_sprite(), + east = { + filename = gfx .. "wood-splitter-east-top_patch.png", + frame_count = 32, + line_length = 8, + priority = "extra-high", + width = 90, + height = 104, + shift = util.by_pixel(4, -20), + scale = 0.5 + }, + south = util.empty_sprite(), + west = { + filename = gfx .. "wood-splitter-west-top_patch.png", + frame_count = 32, + line_length = 8, + priority = "extra-high", + width = 90, + height = 96, + shift = util.by_pixel(6, -18), + scale = 0.5 + } + }, + belt_animation_set = createAnimation() + }, + { + type = "corpse", + name = splitterName .. "-remnants", + icon = Lignumis.graphics .. "icons/wood-splitter.png", + hidden_in_factoriopedia = true, + flags = { "placeable-neutral", "not-on-map" }, + subgroup = "belt-remnants", + order = "a-g-a", + selection_box = { { -0.9, -0.5 }, { 0.9, 0.5 } }, + tile_width = 2, + tile_height = 1, + selectable_in_game = false, + time_before_removed = 60 * 60 * 15, -- 15 minutes + expires = false, + final_render_layer = "remnants", + remove_on_tile_placement = false, + animation = { + filename = gfx .. "wood-splitter-remnants.png", + line_length = 1, + width = 190, + height = 190, + direction_count = 4, + shift = util.by_pixel(3.5, 1.5), + scale = 0.5 + } + }, + { + type = "item", + name = transportBeltName, + icon = Lignumis.graphics .. "icons/wood-transport-belt.png", + subgroup = "belt", + color_hint = { text = "1" }, + order = "a[transport-belt]-0[" .. transportBeltName .. "]", + inventory_move_sound = item_sounds.transport_belt_inventory_move, + pick_sound = item_sounds.transport_belt_inventory_pickup, + drop_sound = item_sounds.transport_belt_inventory_move, + place_result = transportBeltName, + stack_size = 100, + weight = 5 * kg + }, + { + type = "item", + name = undergroundBeltName, + icon = Lignumis.graphics .. "icons/wood-underground-belt.png", + subgroup = "belt", + color_hint = { text = "1" }, + order = "b[underground-belt]-0[" .. undergroundBeltName .. "]", + inventory_move_sound = item_sounds.mechanical_inventory_move, + pick_sound = item_sounds.mechanical_inventory_pickup, + drop_sound = item_sounds.mechanical_inventory_move, + place_result = undergroundBeltName, + stack_size = 50, + weight = 10 * kg + }, + { + type = "item", + name = splitterName, + icon = Lignumis.graphics .. "icons/wood-splitter.png", + subgroup = "belt", + color_hint = { text = "1" }, + order = "c[splitter]-0[" .. splitterName .. "]", + inventory_move_sound = item_sounds.mechanical_inventory_move, + pick_sound = item_sounds.mechanical_inventory_pickup, + drop_sound = item_sounds.mechanical_inventory_move, + place_result = splitterName, + stack_size = 50, + weight = 10 * kg + }, + { + type = "recipe", + name = transportBeltName, + enabled = false, + energy_required = 0.5, + results = { { type = "item", name = transportBeltName, amount = 2 } }, + ingredients = { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "wooden-gear-wheel", amount = 1 } + } + }, + { + type = "recipe", + name = undergroundBeltName, + category = "crafting", + additional_categories = { "wood-processing" }, + enabled = false, + energy_required = 1, + ingredients = { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "wood-transport-belt", amount = 4 }, + }, + results = { { type = "item", name = undergroundBeltName, amount = 2 } } + }, + { + type = "recipe", + name = splitterName, + category = "crafting", + additional_categories = { "wood-processing" }, + enabled = false, + energy_required = 1, + ingredients = { + { type = "item", name = "wood-transport-belt", amount = 2 }, + { type = "item", name = "lumber", amount = 2 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or + { type = "item", name = "gold-cable", amount = 10 } + }, + results = { { type = "item", name = splitterName, amount = 1 } } + }, + { + type = "technology", + name = name .. "-logistics", + category = "crafting", + additional_categories = { "wood-processing" }, + icon = Lignumis.graphics .. "technology/wood-logistics.png", + icon_size = 256, + effects = { + { + type = "unlock-recipe", + recipe = "wood-transport-belt" + }, + { + type = "unlock-recipe", + recipe = "wood-underground-belt" + }, + { + type = "unlock-recipe", + recipe = "wood-splitter" + } + }, + prerequisites = { "wood-science-pack" }, + unit = { + count = 10, + ingredients = { { "wood-science-pack", 1 } }, + time = 10 + } + } +}) if not basic_circuit_board then - data:extend({ - Belt.RecipeBuilder:new() - :ingredients("splitter", { - { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - { type = "item", name = "electronic-circuit", amount = 2 } - }) - :build({ - splitter = { - name = "wood-splitter-electronic-circuit", - localised_name = { "entity-name.wood-splitter" }, - icons = { - { icon = splitter_item.icon }, - { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } - }, - additional_categories = { "wood-processing" } - } - }) - .splitter - }) - - table.insert(data.raw.technology["electronics"].effects, { - type = "unlock-recipe", - recipe = "wood-splitter-electronic-circuit" - }) + Recipe:new("wood-splitter"):clone("wood-splitter-electronic-circuit") + :replaceIngredient("gold-cable", "electronic-circuit", 2) + :assign({ + localised_name = { "entity-name.wood-splitter" }, + icons = { + { icon = gfx .. "wood-splitter-icon.png" }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + } + }) + :unlockedByTechnology("electronics") + :apply() end \ No newline at end of file From acbf072771f6edaba27a79feb8d1aa1a43b64263 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 21:12:38 +0100 Subject: [PATCH 27/46] Remove Mod Framework --- lignumis/info.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lignumis/info.json b/lignumis/info.json index c35c5f6..998fce9 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -16,9 +16,6 @@ "flib", "gleba-water-cane", "lignumis-assets >= 1.0.3", - "mf-buildings >= 1.0.7", - "mf-core >= 1.0.3", - "mf-logistics >= 1.0.1", "PlanetsLib >= 1.14.7", "pollution-as-surface-property", "Wood-Walls >= 1.2.0", @@ -46,6 +43,11 @@ "! early-agriculture", "! planet-picker", "! wood-universe-modpack", - "! rso-mod" + "! rso-mod", + "! mf-core", + "! mf-buildings", + "! mf-buildings-graphics-1", + "! mf-logistics", + "! mf-logistics-graphics-1" ] } \ No newline at end of file From 2cd984c35e37bf5da2357f8ffb2a60614df28acd Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 21:42:38 +0100 Subject: [PATCH 28/46] 1.1.0 --- lignumis/changelog.txt | 13 +++++++++++++ lignumis/info.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index 0d49baa..b67e036 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,17 @@ --------------------------------------------------------------------------------------------------- +Version: 1.1.0 +Date: 16.12.2025 + Breaking Changes: + - Integrate quality assembler with new graphics into this mod (changes from 5x5 to 4x4) + - Quality assembler has module slots dependant on quality (1-6) + Changes: + - Add golden module unlocked by "Experienced quality assembling 3" + - Only move yellow and purple science after space science when progressive technologies are enabled + - Integrate wood logistics code into this mod + - Remove Mod Framework (uninstall the mods please) + Bug Fixes: + - Any planet start: Change description of Lignumis to name the selected parent planet +--------------------------------------------------------------------------------------------------- Version: 1.0.78 Date: 16.12.2025 Changes: diff --git a/lignumis/info.json b/lignumis/info.json index 998fce9..6a84a7a 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,6 +1,6 @@ { "name": "lignumis", - "version": "1.0.78", + "version": "1.1.0", "title": "Lignumis", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis planet mod effects other planets and space ships. Make sure to read the description on the mod portal and check the mod settings.", "author": "cackling fiend", From 2891288a91954a941b5b00ba3ca6f9f41bdad4e6 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 11 Nov 2025 23:58:49 +0100 Subject: [PATCH 29/46] Split mod into mainstream and directors cut --- lignumis-cf/info.json | 19 + lignumis-cf/license.txt | 674 ++++++++++++++++++ lignumis-cf/locale/de/strings.cfg | 5 + lignumis-cf/locale/en/strings.cfg | 5 + lignumis-cf/locale/es-ES/strings.cfg | 5 + lignumis-cf/locale/pl/strings.cfg | 5 + lignumis-cf/locale/ru/strings.cfg | 5 + lignumis-cf/locale/zh-CN/strings.cfg | 5 + lignumis-cf/settings.lua | 31 + lignumis-cf/thumbnail.png | Bin 0 -> 42353 bytes lignumis/info.json | 12 +- lignumis/locale/en/strings.cfg | 4 +- lignumis/locale/es-ES/strings.cfg | 2 +- lignumis/locale/pl/strings.cfg | 2 +- lignumis/locale/ru/strings.cfg | 2 +- lignumis/locale/zh-CN/strings.cfg | 2 +- .../integrations/astroponics-updates.lua | 2 + .../prototypes/integrations/astroponics.lua | 2 + lignumis/settings.lua | 26 +- 19 files changed, 783 insertions(+), 25 deletions(-) create mode 100644 lignumis-cf/info.json create mode 100644 lignumis-cf/license.txt create mode 100644 lignumis-cf/locale/de/strings.cfg create mode 100644 lignumis-cf/locale/en/strings.cfg create mode 100644 lignumis-cf/locale/es-ES/strings.cfg create mode 100644 lignumis-cf/locale/pl/strings.cfg create mode 100644 lignumis-cf/locale/ru/strings.cfg create mode 100644 lignumis-cf/locale/zh-CN/strings.cfg create mode 100644 lignumis-cf/settings.lua create mode 100644 lignumis-cf/thumbnail.png diff --git a/lignumis-cf/info.json b/lignumis-cf/info.json new file mode 100644 index 0000000..aa40a5b --- /dev/null +++ b/lignumis-cf/info.json @@ -0,0 +1,19 @@ +{ + "name": "lignumis-cf", + "version": "1.2.0", + "title": "Lignumis - Directors Cut", + "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis is the version that represents the original idea of the mod author. For a more isolated planet mod experience, install the regular version.", + "author": "cackling fiend", + "homepage": "https://discord.gg/ufvFUJtVwk", + "factorio_version": "2.0", + "space_travel_required": true, + "dependencies": [ + "lignumis", + "aquilo-seabloom-algaculture", + "astroponics >= 1.2.0", + "Diversitree", + "fulgora-coralmium-agriculture", + "gleba-water-cane", + "vulcanus-sulfuric-bacteria" + ] +} \ No newline at end of file diff --git a/lignumis-cf/license.txt b/lignumis-cf/license.txt new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/lignumis-cf/license.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/lignumis-cf/locale/de/strings.cfg b/lignumis-cf/locale/de/strings.cfg new file mode 100644 index 0000000..0e597a9 --- /dev/null +++ b/lignumis-cf/locale/de/strings.cfg @@ -0,0 +1,5 @@ +[mod-name] +lignumis=○ Lignumis - Director's Cut + +[mod-description] +lignumis=Tauche ein in die Welt von Lignumis, einem Mond von Nauvis, der nur die grundlegendsten Technologien bietet.\n\n\Dies ist die Version, die die ursprüngliche Idee des Autors repräsentiert. Für eine eher isolierte Planet-Mod-Erfahrung, installiere die reguläre Version. \ No newline at end of file diff --git a/lignumis-cf/locale/en/strings.cfg b/lignumis-cf/locale/en/strings.cfg new file mode 100644 index 0000000..a3226a6 --- /dev/null +++ b/lignumis-cf/locale/en/strings.cfg @@ -0,0 +1,5 @@ +[mod-name] +lignumis=○ Lignumis - Director's Cut + +[mod-description] +lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. \ No newline at end of file diff --git a/lignumis-cf/locale/es-ES/strings.cfg b/lignumis-cf/locale/es-ES/strings.cfg new file mode 100644 index 0000000..c4440f0 --- /dev/null +++ b/lignumis-cf/locale/es-ES/strings.cfg @@ -0,0 +1,5 @@ +[mod-name] +lignumis=○ Lignumis - Director's Cut + +[mod-description] +lignumis=Sumérgete en el mundo de Lignumis, una luna de Nauvis que ofrece solo las tecnologías más básicas. \ No newline at end of file diff --git a/lignumis-cf/locale/pl/strings.cfg b/lignumis-cf/locale/pl/strings.cfg new file mode 100644 index 0000000..a3226a6 --- /dev/null +++ b/lignumis-cf/locale/pl/strings.cfg @@ -0,0 +1,5 @@ +[mod-name] +lignumis=○ Lignumis - Director's Cut + +[mod-description] +lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. \ No newline at end of file diff --git a/lignumis-cf/locale/ru/strings.cfg b/lignumis-cf/locale/ru/strings.cfg new file mode 100644 index 0000000..e8cfb99 --- /dev/null +++ b/lignumis-cf/locale/ru/strings.cfg @@ -0,0 +1,5 @@ +[mod-name] +lignumis=○ Лигнумис - Director's Cut + +[mod-description] +lignumis=Погрузитесь в мир Лигнумиса — луны Наувиса, предлагающей лишь самые базовые технологии. \ No newline at end of file diff --git a/lignumis-cf/locale/zh-CN/strings.cfg b/lignumis-cf/locale/zh-CN/strings.cfg new file mode 100644 index 0000000..c606bab --- /dev/null +++ b/lignumis-cf/locale/zh-CN/strings.cfg @@ -0,0 +1,5 @@ +[mod-name] +lignumis=○ 愈创星 - Lignumis - Director's Cut + +[mod-description] +lignumis=潜入木木世界的世界，木星的月亮只提供最基本的技术 \ No newline at end of file diff --git a/lignumis-cf/settings.lua b/lignumis-cf/settings.lua new file mode 100644 index 0000000..2e299f7 --- /dev/null +++ b/lignumis-cf/settings.lua @@ -0,0 +1,31 @@ +local Settings = require("__cf-lib__/settings/Settings") +local force = Settings.force +local forceDefault = Settings.forceDefault + +-- Lignumis +force("lignumis-restrict-sciences", true) +force("lignumis-basic-circuit-board", true) +force("lignumis-belt-progression", true) +force("lignumis-ammo-progression", true) +force("lignumis-technology-progression", true) +force("lignumis-circuit-progression", true) +force("lignumis-fulgora-wood", false) +force("lignumis-vanilla-lab", false) +force("lignumis-lumber-mill-more-recipes", true) +force("lignumis-electric-lumber-mill", false) + +if not mods["aai-industry"] then + force("lignumis-inserter-progression", true) + force("lignumis-assembler-progression", true) +end + +if not mods["wood-military"] then + force("lignumis-ammo-progression", true) +end + +-- Wood Walls +forceDefault("wood-walls-fuelvalue") +forceDefault("wood-walls-wall-cost") +forceDefault("wood-walls-wall-output") +forceDefault("wood-walls-hp") +forceDefault("wood-walls-disable-wall") \ No newline at end of file diff --git a/lignumis-cf/thumbnail.png b/lignumis-cf/thumbnail.png new file mode 100644 index 0000000000000000000000000000000000000000..497345415e405b81835db5123699e9a97ba3459b GIT binary patch literal 42353 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 2.0.53", - "astroponics >= 1.2.0", "bioprocessing-tab", "cf-lib >= 1.1.0", "flib", - "gleba-water-cane", "lignumis-assets >= 1.0.3", "PlanetsLib >= 1.14.7", "pollution-as-surface-property", "Wood-Walls >= 1.2.0", - "vulcanus-sulfuric-bacteria", "? aai-industry", "? aai-loaders", "? aai-loaders-sane", "? any-planet-start", + "? astroponics >= 1.2.0", + "? canal-excavator >= 1.9.0", "? crushing-industry", "? fulgora-coralmium-agriculture", + "? gleba-water-cane", "? hot-metals >= 1.1.0", "? lane-splitters", + "? vulcanus-sulfuric-bacteria", "? wood-industry", "? wood-military >= 2.3.3", - "? canal-excavator >= 1.9.0", "? wood-logistics", "(?) atan-nuclear-science", "(?) Diversitree", diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index f8449a5..bc07c1c 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -1,8 +1,8 @@ [mod-name] -lignumis=○ Lignumis +lignumis=○ Lignumis [mod-description] -lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. +lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis is the version that represents the original idea of the mod author. For a more isolated planet mod experience, install the regular version. [space-location-name] lignumis=Lignumis diff --git a/lignumis/locale/es-ES/strings.cfg b/lignumis/locale/es-ES/strings.cfg index cfc01ba..2088df1 100644 --- a/lignumis/locale/es-ES/strings.cfg +++ b/lignumis/locale/es-ES/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis +lignumis=○ Lignumis [mod-description] lignumis=Sumérgete en el mundo de Lignumis, una luna de Nauvis que ofrece solo las tecnologías más básicas. diff --git a/lignumis/locale/pl/strings.cfg b/lignumis/locale/pl/strings.cfg index 21410af..fbf090f 100644 --- a/lignumis/locale/pl/strings.cfg +++ b/lignumis/locale/pl/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis +lignumis=○ Lignumis [mod-description] lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. diff --git a/lignumis/locale/ru/strings.cfg b/lignumis/locale/ru/strings.cfg index 8b6a72b..d578d8b 100644 --- a/lignumis/locale/ru/strings.cfg +++ b/lignumis/locale/ru/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Лигнумис +lignumis=○ Лигнумис [mod-description] lignumis=Погрузитесь в мир Лигнумиса — луны Наувиса, предлагающей лишь самые базовые технологии. diff --git a/lignumis/locale/zh-CN/strings.cfg b/lignumis/locale/zh-CN/strings.cfg index 999dfab..8f9652d 100644 --- a/lignumis/locale/zh-CN/strings.cfg +++ b/lignumis/locale/zh-CN/strings.cfg @@ -2,7 +2,7 @@ surface-condition-too-low=__1__不符合. surface-condition-too-high=__1__不符合. [mod-name] -lignumis=○ 愈创星 - Lignumis +lignumis=○ 愈创星 - Lignumis [mod-description] lignumis=潜入木木世界的世界，木星的月亮只提供最基本的技术 diff --git a/lignumis/prototypes/integrations/astroponics-updates.lua b/lignumis/prototypes/integrations/astroponics-updates.lua index c0ef83f..437bdf1 100644 --- a/lignumis/prototypes/integrations/astroponics-updates.lua +++ b/lignumis/prototypes/integrations/astroponics-updates.lua @@ -1,3 +1,5 @@ +if not mods["astroponics"] then return end + local Technology = require("__cf-lib__/data/Technology") -- This just undoes what astroponics changes to tree seeding diff --git a/lignumis/prototypes/integrations/astroponics.lua b/lignumis/prototypes/integrations/astroponics.lua index 491069f..bee736e 100644 --- a/lignumis/prototypes/integrations/astroponics.lua +++ b/lignumis/prototypes/integrations/astroponics.lua @@ -1,3 +1,5 @@ +if not mods["astroponics"] then return end + local infinite = settings.startup["lignumis-infinite-astroponics-productivity-research"].value local base_levels = { diff --git a/lignumis/settings.lua b/lignumis/settings.lua index f043c65..57bd015 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -1,9 +1,12 @@ +local Settings = require("__cf-lib__/settings/Settings") +local force = Settings.force + data:extend({ { type = "bool-setting", name = "lignumis-restrict-sciences", setting_type = "startup", - default_value = false, + default_value = true, order = "a" }, { @@ -17,35 +20,35 @@ data:extend({ type = "bool-setting", name = "lignumis-belt-progression", setting_type = "startup", - default_value = true, + default_value = false, order = "c" }, { type = "bool-setting", name = "lignumis-inserter-progression", setting_type = "startup", - default_value = true, + default_value = false, order = "d" }, { type = "bool-setting", name = "lignumis-ammo-progression", setting_type = "startup", - default_value = true, + default_value = false, order = "e" }, { type = "bool-setting", name = "lignumis-technology-progression", setting_type = "startup", - default_value = true, + default_value = false, order = "f" }, { type = "bool-setting", name = "lignumis-circuit-progression", setting_type = "startup", - default_value = false, + default_value = true, order = "g" }, { @@ -66,7 +69,7 @@ data:extend({ type = "bool-setting", name = "lignumis-vanilla-lab", setting_type = "startup", - default_value = false, + default_value = true, order = "j" }, { @@ -122,13 +125,10 @@ data:extend({ }) if mods["aai-industry"] then - data.raw["bool-setting"]["lignumis-inserter-progression"].forced_value = false - data.raw["bool-setting"]["lignumis-inserter-progression"].hidden = true - data.raw["bool-setting"]["lignumis-assembler-progression"].forced_value = false - data.raw["bool-setting"]["lignumis-assembler-progression"].hidden = true + force("lignumis-inserter-progression", false) + force("lignumis-assembler-progression", false) 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 + force("lignumis-ammo-progression", false) end From 0ed5d1144dabfc249d05011af5bce5a55da50e40 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 22:46:17 +0100 Subject: [PATCH 30/46] Move quality assembler to the end of the subgroup --- lignumis/prototypes/content/quality-assembler.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lignumis/prototypes/content/quality-assembler.lua b/lignumis/prototypes/content/quality-assembler.lua index 67fcced..dc111c7 100644 --- a/lignumis/prototypes/content/quality-assembler.lua +++ b/lignumis/prototypes/content/quality-assembler.lua @@ -327,7 +327,7 @@ data:extend({ name = name, icon = Lignumis.graphics .. "icons/quality-assembler.png", subgroup = "production-machine", - order = "a[" .. name .. "]", + order = "za[" .. name .. "]", inventory_move_sound = item_sounds.mechanical_large_inventory_move, pick_sound = item_sounds.mechanical_large_inventory_pickup, drop_sound = item_sounds.mechanical_large_inventory_move, From 6c7fb716081b0a9b55e750e4c9dd73a96191ef78 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 23:03:08 +0100 Subject: [PATCH 31/46] Fix mod names/descriptions --- lignumis-cf/locale/de/strings.cfg | 4 ++-- lignumis-cf/locale/en/strings.cfg | 4 ++-- lignumis-cf/locale/es-ES/strings.cfg | 4 ++-- lignumis-cf/locale/pl/strings.cfg | 4 ++-- lignumis-cf/locale/ru/strings.cfg | 4 ++-- lignumis-cf/locale/zh-CN/strings.cfg | 4 ++-- lignumis/locale/de/strings.cfg | 2 +- lignumis/locale/en/strings.cfg | 2 +- lignumis/locale/es-ES/strings.cfg | 2 +- lignumis/locale/pl/strings.cfg | 2 +- lignumis/locale/ru/strings.cfg | 2 +- lignumis/locale/zh-CN/strings.cfg | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lignumis-cf/locale/de/strings.cfg b/lignumis-cf/locale/de/strings.cfg index 0e597a9..cd5d62c 100644 --- a/lignumis-cf/locale/de/strings.cfg +++ b/lignumis-cf/locale/de/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis - Director's Cut +lignumis-cf=○🌐Lignumis - Director's Cut [mod-description] -lignumis=Tauche ein in die Welt von Lignumis, einem Mond von Nauvis, der nur die grundlegendsten Technologien bietet.\n\n\Dies ist die Version, die die ursprüngliche Idee des Autors repräsentiert. Für eine eher isolierte Planet-Mod-Erfahrung, installiere die reguläre Version. \ No newline at end of file +lignumis-cf=Tauche ein in die Welt von Lignumis, einem Mond von Nauvis, der nur die grundlegendsten Technologien bietet.\n\n\Dies ist die Version, die die ursprüngliche Idee des Autors repräsentiert. Für eine eher isolierte Planet-Mod-Erfahrung, installiere die reguläre Version. \ No newline at end of file diff --git a/lignumis-cf/locale/en/strings.cfg b/lignumis-cf/locale/en/strings.cfg index a3226a6..4e2e34f 100644 --- a/lignumis-cf/locale/en/strings.cfg +++ b/lignumis-cf/locale/en/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis - Director's Cut +lignumis-cf=○🌐Lignumis - Director's Cut [mod-description] -lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. \ No newline at end of file +lignumis-cf=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis is the version that represents the original idea of the mod author. For a more isolated planet mod experience, install the regular version. \ No newline at end of file diff --git a/lignumis-cf/locale/es-ES/strings.cfg b/lignumis-cf/locale/es-ES/strings.cfg index c4440f0..390ebc4 100644 --- a/lignumis-cf/locale/es-ES/strings.cfg +++ b/lignumis-cf/locale/es-ES/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis - Director's Cut +lignumis-cf=○🌐Lignumis - Director's Cut [mod-description] -lignumis=Sumérgete en el mundo de Lignumis, una luna de Nauvis que ofrece solo las tecnologías más básicas. \ No newline at end of file +lignumis-cf=Sumérgete en el mundo de Lignumis, una luna de Nauvis que ofrece solo las tecnologías más básicas. \ No newline at end of file diff --git a/lignumis-cf/locale/pl/strings.cfg b/lignumis-cf/locale/pl/strings.cfg index a3226a6..7d1760f 100644 --- a/lignumis-cf/locale/pl/strings.cfg +++ b/lignumis-cf/locale/pl/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis - Director's Cut +lignumis-cf=○🌐Lignumis - Director's Cut [mod-description] -lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. \ No newline at end of file +lignumis-cf=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. \ No newline at end of file diff --git a/lignumis-cf/locale/ru/strings.cfg b/lignumis-cf/locale/ru/strings.cfg index e8cfb99..0588804 100644 --- a/lignumis-cf/locale/ru/strings.cfg +++ b/lignumis-cf/locale/ru/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Лигнумис - Director's Cut +lignumis-cf=○🌐Лигнумис - Director's Cut [mod-description] -lignumis=Погрузитесь в мир Лигнумиса — луны Наувиса, предлагающей лишь самые базовые технологии. \ No newline at end of file +lignumis-cf=Погрузитесь в мир Лигнумиса — луны Наувиса, предлагающей лишь самые базовые технологии. \ No newline at end of file diff --git a/lignumis-cf/locale/zh-CN/strings.cfg b/lignumis-cf/locale/zh-CN/strings.cfg index c606bab..f7ebb5f 100644 --- a/lignumis-cf/locale/zh-CN/strings.cfg +++ b/lignumis-cf/locale/zh-CN/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ 愈创星 - Lignumis - Director's Cut +lignumis-cf=○🌐愈创星 - Lignumis - Director's Cut [mod-description] -lignumis=潜入木木世界的世界，木星的月亮只提供最基本的技术 \ No newline at end of file +lignumis-cf=潜入木木世界的世界，木星的月亮只提供最基本的技术 \ No newline at end of file diff --git a/lignumis/locale/de/strings.cfg b/lignumis/locale/de/strings.cfg index f87857e..6151416 100644 --- a/lignumis/locale/de/strings.cfg +++ b/lignumis/locale/de/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis +lignumis=○🌐Lignumis [mod-description] lignumis=Tauche ein in die Welt von Lignumis, einem Mond von Nauvis, der nur die grundlegendsten Technologien bietet. diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index bc07c1c..e63f760 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis +lignumis=○🌐Lignumis [mod-description] lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis is the version that represents the original idea of the mod author. For a more isolated planet mod experience, install the regular version. diff --git a/lignumis/locale/es-ES/strings.cfg b/lignumis/locale/es-ES/strings.cfg index 2088df1..6675a87 100644 --- a/lignumis/locale/es-ES/strings.cfg +++ b/lignumis/locale/es-ES/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis +lignumis=○🌐Lignumis [mod-description] lignumis=Sumérgete en el mundo de Lignumis, una luna de Nauvis que ofrece solo las tecnologías más básicas. diff --git a/lignumis/locale/pl/strings.cfg b/lignumis/locale/pl/strings.cfg index fbf090f..95cdd7e 100644 --- a/lignumis/locale/pl/strings.cfg +++ b/lignumis/locale/pl/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Lignumis +lignumis=○🌐Lignumis [mod-description] lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. diff --git a/lignumis/locale/ru/strings.cfg b/lignumis/locale/ru/strings.cfg index d578d8b..da69d76 100644 --- a/lignumis/locale/ru/strings.cfg +++ b/lignumis/locale/ru/strings.cfg @@ -1,5 +1,5 @@ [mod-name] -lignumis=○ Лигнумис +lignumis=○🌐Лигнумис [mod-description] lignumis=Погрузитесь в мир Лигнумиса — луны Наувиса, предлагающей лишь самые базовые технологии. diff --git a/lignumis/locale/zh-CN/strings.cfg b/lignumis/locale/zh-CN/strings.cfg index 8f9652d..7e17b25 100644 --- a/lignumis/locale/zh-CN/strings.cfg +++ b/lignumis/locale/zh-CN/strings.cfg @@ -2,7 +2,7 @@ surface-condition-too-low=__1__不符合. surface-condition-too-high=__1__不符合. [mod-name] -lignumis=○ 愈创星 - Lignumis +lignumis=○🌐愈创星 - Lignumis [mod-description] lignumis=潜入木木世界的世界，木星的月亮只提供最基本的技术 From 769759b494391b336f297f39fd6dd68cac737930 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 23:04:37 +0100 Subject: [PATCH 32/46] Remove diversitree --- lignumis-cf/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lignumis-cf/info.json b/lignumis-cf/info.json index aa40a5b..59dd012 100644 --- a/lignumis-cf/info.json +++ b/lignumis-cf/info.json @@ -11,7 +11,6 @@ "lignumis", "aquilo-seabloom-algaculture", "astroponics >= 1.2.0", - "Diversitree", "fulgora-coralmium-agriculture", "gleba-water-cane", "vulcanus-sulfuric-bacteria" From ca3c660e3765006681b0abfc7cc90c14e85db09f Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 23:19:52 +0100 Subject: [PATCH 33/46] Update Readme --- README-cf.md | 14 ++++++++++++++ README.md | 25 ++++++++----------------- 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 README-cf.md diff --git a/README-cf.md b/README-cf.md new file mode 100644 index 0000000..dac3cc8 --- /dev/null +++ b/README-cf.md @@ -0,0 +1,14 @@ +[![foundrygg.com](https://img.shields.io/badge/foundrygg-4a1402?style=for-the-badge&logo=vercel&logoColor=white)](https://foundrygg.com)[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/ufvFUJtVwk)[![Forgejo](https://img.shields.io/badge/source%20code-%23f4f4f5?style=for-the-badge&logo=forgejo&logoColor=%23c2410c)](https://git.cacklingfiend.info/cacklingfiend/lignumis)[![Downloads](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fmods.factorio.com%2Fapi%2Fmods%2Flignumis&query=%24.downloads_count&suffix=%20Downloads&style=for-the-badge&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI%2FPgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI%2BCjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiB3aWR0aD0iMTIxNnB0IiBoZWlnaHQ9IjEyODBwdCIgdmlld0JveD0iMCAwIDEyMTYgMTI4MCIKIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiPgo8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLDEyODApIHNjYWxlKDAuMSwtMC4xKSIKZmlsbD0iI2ZmZmZmZiIgc3Ryb2tlPSJub25lIj4KPHBhdGggZD0iTTM0NzAgOTYwMCBsMCAtMzIwMCAtMTczMSAwIGMtOTUyIDAgLTE3MjkgLTQgLTE3MjcgLTggNCAtMTIgNjA2MgotNjM5MCA2MDY4IC02MzkwIDYgMCA2MDY0IDYzNzggNjA2OCA2MzkwIDIgNCAtNzc1IDggLTE3MjcgOCBsLTE3MzEgMCAwIDMyMDAKMCAzMjAwIC0yNjEwIDAgLTI2MTAgMCAwIC0zMjAweiIvPgo8L2c%2BCjwvc3ZnPgo%3D&label=&labelColor=%23e39827&color=%23e39827)](https://mods.factorio.com/mod/lignumis/metrics?range=last_two_months&type=mod_downloads)[![Ko-fi](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/cacklingfiend) + +_________________ +![Lignumis poster](https://git.cacklingfiend.info/cacklingfiend/lignumis-assets/raw/branch/main/sources/readme/poster.jpg) + +## Lignumis + +This mod extends the early game of Space Age by putting you on the moon "Lignumis" before you escape to Nauvis. It concentrates on wood and steam technologies, giving you some early game production chains for those resources. + +**The is the director's cut of the mod with additional wood mods and most settings enforced. It changes the experience outside of Lignumis by adding the requirement for wood and the Lignumis science packs. For the mainstream experience, install the [Regular version](https://mods.factorio.com/mod/lignumis).** + +## More information + +Please continue reading the description of the [Regular version](https://mods.factorio.com/mod/lignumis). \ No newline at end of file diff --git a/README.md b/README.md index c8d614e..b58cbb3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/ufvFUJtVwk)[![Forgejo](https://img.shields.io/badge/source%20code-%23f4f4f5?style=for-the-badge&logo=forgejo&logoColor=%23c2410c)](https://git.cacklingfiend.info/cacklingfiend/lignumis)[![Downloads](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fmods.factorio.com%2Fapi%2Fmods%2Flignumis&query=%24.downloads_count&suffix=%20Downloads&style=for-the-badge&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI%2FPgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI%2BCjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiB3aWR0aD0iMTIxNnB0IiBoZWlnaHQ9IjEyODBwdCIgdmlld0JveD0iMCAwIDEyMTYgMTI4MCIKIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiPgo8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLDEyODApIHNjYWxlKDAuMSwtMC4xKSIKZmlsbD0iI2ZmZmZmZiIgc3Ryb2tlPSJub25lIj4KPHBhdGggZD0iTTM0NzAgOTYwMCBsMCAtMzIwMCAtMTczMSAwIGMtOTUyIDAgLTE3MjkgLTQgLTE3MjcgLTggNCAtMTIgNjA2MgotNjM5MCA2MDY4IC02MzkwIDYgMCA2MDY0IDYzNzggNjA2OCA2MzkwIDIgNCAtNzc1IDggLTE3MjcgOCBsLTE3MzEgMCAwIDMyMDAKMCAzMjAwIC0yNjEwIDAgLTI2MTAgMCAwIC0zMjAweiIvPgo8L2c%2BCjwvc3ZnPgo%3D&label=&labelColor=%23e39827&color=%23e39827)](https://mods.factorio.com/mod/lignumis/metrics?range=last_two_months&type=mod_downloads)[![Ko-fi](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/cacklingfiend) +[![foundrygg.com](https://img.shields.io/badge/foundrygg-4a1402?style=for-the-badge&logo=vercel&logoColor=white)](https://foundrygg.com)[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/ufvFUJtVwk)[![Forgejo](https://img.shields.io/badge/source%20code-%23f4f4f5?style=for-the-badge&logo=forgejo&logoColor=%23c2410c)](https://git.cacklingfiend.info/cacklingfiend/lignumis)[![Downloads](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fmods.factorio.com%2Fapi%2Fmods%2Flignumis&query=%24.downloads_count&suffix=%20Downloads&style=for-the-badge&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI%2FPgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI%2BCjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiB3aWR0aD0iMTIxNnB0IiBoZWlnaHQ9IjEyODBwdCIgdmlld0JveD0iMCAwIDEyMTYgMTI4MCIKIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiPgo8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLDEyODApIHNjYWxlKDAuMSwtMC4xKSIKZmlsbD0iI2ZmZmZmZiIgc3Ryb2tlPSJub25lIj4KPHBhdGggZD0iTTM0NzAgOTYwMCBsMCAtMzIwMCAtMTczMSAwIGMtOTUyIDAgLTE3MjkgLTQgLTE3MjcgLTggNCAtMTIgNjA2MgotNjM5MCA2MDY4IC02MzkwIDYgMCA2MDY0IDYzNzggNjA2OCA2MzkwIDIgNCAtNzc1IDggLTE3MjcgOCBsLTE3MzEgMCAwIDMyMDAKMCAzMjAwIC0yNjEwIDAgLTI2MTAgMCAwIC0zMjAweiIvPgo8L2c%2BCjwvc3ZnPgo%3D&label=&labelColor=%23e39827&color=%23e39827)](https://mods.factorio.com/mod/lignumis/metrics?range=last_two_months&type=mod_downloads)[![Ko-fi](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/cacklingfiend) _________________ ![Lignumis poster](https://git.cacklingfiend.info/cacklingfiend/lignumis-assets/raw/branch/main/sources/readme/poster.jpg) @@ -7,9 +7,7 @@ _________________ This mod extends the early game of Space Age by putting you on the moon "Lignumis" before you escape to Nauvis. It concentrates on wood and steam technologies, giving you some early game production chains for those resources. -The duration of the stay on Lignumis will be rather short. The impact of the later game will still be substantial. There are several mod settings to alter the experience after leaving Lignumis to make it match your personal taste. - -**Warning:** When playing with default settings, this mod will have an impact on all other planets and how space ships are built. Check out the settings to disable what you don't like. +**The is the mainstream version of the mod with very few changes outside of Lignumis. For the full experience as intended by me, install the [Director's Cut](https://mods.factorio.com/mod/lignumis-cf).** #### Streamers featuring Lignumis @@ -62,21 +60,13 @@ Sources of wood per planet. The following mods can be a great addition for this mod: -#### [Inserter Fuel Leech](https://mods.factorio.com/mod/InserterFuelLeech) - -While optional, the intended way is to use this mod for the burner phase as it improves the fueling experience of burner entities. - -For UPS optimizations, you can disable this mod once the burner phase is over. - -Alternatives: [Burner Leech Fork](https://mods.factorio.com/mod/Burner-Leech-Fork), [Burner Leech](https://mods.factorio.com/mod/Burner-Leech) - #### Optional wood mods - [Wooden Fulgora: Coralmium Agriculture](https://mods.factorio.com/mod/fulgora-coralmium-agriculture) +- [Wooden Gleba: Water Cane](https://mods.factorio.com/mod/gleba-water-cane) - [Wooden Aquilo: Seabloom Algaculture](https://mods.factorio.com/mod/aquilo-seabloom-algaculture) - [Wooden Cerys: Lunaponics](https://mods.factorio.com/mod/cerys-lunaponics) - [Wooden Moshine: Solaponics](https://mods.factorio.com/mod/moshine-solaponics) -- [Wooden Arig](https://mods.factorio.com/mod/wooden-arig) #### [Any Planet Start](https://mods.factorio.com/mod/any-planet-start) @@ -99,6 +89,10 @@ If you want more of it than Lignumis offers, add this mod. It adds ammo for shot If you like go more into the charcoal direction. It has no overlap with Lignumis and starts to get relevant on Nauvis. +#### [Wooden Logistics](https://mods.factorio.com/mod/wood-logistics) + +This mod adds a few more things around wood. It also changes some recipes that Lignumis also adds. The lumber mill will be two tiles smaller with this mod installed. + #### [Crushing Industry](https://mods.factorio.com/mod/crushing-industry) with [Crushing Industry - Productivity Research](https://mods.factorio.com/mod/crushing-industry-productivity-research) Recommended with high science cost settings. It adds crushers and crushed ores to increase productivity. @@ -179,13 +173,9 @@ _________________ ## Todo -- Fix pipe graphics on desiccation furnace and quality assembler - Trees must not die when absorbing noise - https://lua-api.factorio.com/latest/types/TreeVariation.html - Add information in Factoriopedia -- Compatibility with [On Wayward Seas](https://mods.factorio.com/mod/wayward-seas) -- Compatibility with [Exotic Space Industries](https://mods.factorio.com/mod/exotic-space-industries) -- Compatibility with [Noble Metals](https://mods.factorio.com/mod/bzgold) once it's updated _________________ @@ -255,6 +245,7 @@ _________________ [Pixabay](https://pixabay.com) - [AudioPapkin: Forest ambience](https://pixabay.com/sound-effects/forest-ambience-296528/) +- Various sounds for the Lumber Mill, Deep Miner and Quality Assembler [SafTheLamb](https://mods.factorio.com/user/SafTheLamb) From 79a5aa1bcdbe29a4904410bb631d9371bb1cb2c1 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 23:23:17 +0100 Subject: [PATCH 34/46] 1.2.0 --- lignumis/changelog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index b67e036..36cf896 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.0 +Date: 16.12.2025 + Changes: + - This is now considered the "mainstream version" of the mod. Install the "director's cut" for the full experience. This is currently only relevant for new games. + - Move quality assembler to the end of the subgroup +--------------------------------------------------------------------------------------------------- Version: 1.1.0 Date: 16.12.2025 Breaking Changes: From 6e918ca9bdbd7f0d3ea5b5035ad9cd0cc20c539f Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 23:27:57 +0100 Subject: [PATCH 35/46] Correct mod name --- lignumis-cf/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lignumis-cf/info.json b/lignumis-cf/info.json index 59dd012..3b8fde2 100644 --- a/lignumis-cf/info.json +++ b/lignumis-cf/info.json @@ -1,7 +1,7 @@ { "name": "lignumis-cf", "version": "1.2.0", - "title": "Lignumis - Directors Cut", + "title": "Lignumis - Director's Cut", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.\n\nThis is the version that represents the original idea of the mod author. For a more isolated planet mod experience, install the regular version.", "author": "cackling fiend", "homepage": "https://discord.gg/ufvFUJtVwk", From c37af3779148732c70c64beed026a2cdc198642f Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 16 Dec 2025 23:28:05 +0100 Subject: [PATCH 36/46] Readme --- README-cf.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-cf.md b/README-cf.md index dac3cc8..286a129 100644 --- a/README-cf.md +++ b/README-cf.md @@ -3,7 +3,7 @@ _________________ ![Lignumis poster](https://git.cacklingfiend.info/cacklingfiend/lignumis-assets/raw/branch/main/sources/readme/poster.jpg) -## Lignumis +## Lignumis - Director's Cut This mod extends the early game of Space Age by putting you on the moon "Lignumis" before you escape to Nauvis. It concentrates on wood and steam technologies, giving you some early game production chains for those resources. From a0a89a84ae456beae1e9164412a8c533bdd79e16 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 17 Dec 2025 23:33:57 +0100 Subject: [PATCH 37/46] Hide Astroponics setting when the mod is not active --- lignumis/settings.lua | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lignumis/settings.lua b/lignumis/settings.lua index 57bd015..3dd53c4 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -93,13 +93,6 @@ data:extend({ default_value = false, order = "m" }, - { - type = "bool-setting", - name = "lignumis-infinite-astroponics-productivity-research", - setting_type = "startup", - default_value = false, - order = "n" - }, { type = "bool-setting", name = "lignumis-electric-lumber-mill", @@ -124,6 +117,18 @@ data:extend({ } }) +if mods["atroponics"] then + data:extend({ + { + type = "bool-setting", + name = "lignumis-infinite-astroponics-productivity-research", + setting_type = "startup", + default_value = false, + order = "n" + } + }) +end + if mods["aai-industry"] then force("lignumis-inserter-progression", false) force("lignumis-assembler-progression", false) From f99bff84592f79aa101d632d270d0056844d7aff Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 00:14:47 +0100 Subject: [PATCH 38/46] Fix recipe category of the wood belt --- lignumis/prototypes/content/wood-logistics.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua index 4475b8f..0caeb6d 100644 --- a/lignumis/prototypes/content/wood-logistics.lua +++ b/lignumis/prototypes/content/wood-logistics.lua @@ -392,6 +392,8 @@ data:extend({ { type = "recipe", name = transportBeltName, + category = "crafting", + additional_categories = { "wood-processing" }, enabled = false, energy_required = 0.5, results = { { type = "item", name = transportBeltName, amount = 2 } }, @@ -431,8 +433,6 @@ data:extend({ { type = "technology", name = name .. "-logistics", - category = "crafting", - additional_categories = { "wood-processing" }, icon = Lignumis.graphics .. "technology/wood-logistics.png", icon_size = 256, effects = { From ec2f4efc0e8ad54d942ca4106060a88adedda05d Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 00:19:48 +0100 Subject: [PATCH 39/46] 1.2.1 --- lignumis/changelog.txt | 6 ++++++ lignumis/info.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index 36cf896..fcd26c2 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.1 +Date: 18.12.2025 + Bug Fixes: + - Hide Astroponics setting when the mod is not active + - Fix recipe category of the wood belt +--------------------------------------------------------------------------------------------------- Version: 1.2.0 Date: 16.12.2025 Changes: diff --git a/lignumis/info.json b/lignumis/info.json index 5c6e769..7cc2667 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,6 +1,6 @@ { "name": "lignumis", - "version": "1.2.0", + "version": "1.2.1", "title": "Lignumis", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.", "author": "cackling fiend", From 9312e645673fef876b06f71ca5ae60c5b088436c Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 01:07:04 +0100 Subject: [PATCH 40/46] Lumber mill accepts productivity modules again --- lignumis/prototypes/content/lumber-mill.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 26bb3f7..709bb25 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -53,7 +53,7 @@ data:extend({ icons_positioning = { { inventory_index = defines.inventory.assembling_machine_modules, shift = { 0, 1.25 } } }, - allowed_effects = { "consumption", "speed", "pollution", "quality" }, + allowed_effects = { "consumption", "speed", "pollution", "quality", "productivity" }, crafting_categories = { "wood-processing" }, crafting_speed = 2, energy_source = energy_source, From 90d94890f1047dfcbfd8ac95b78e66357116cc2e Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 01:07:12 +0100 Subject: [PATCH 41/46] Fix crash with Astroponics --- lignumis/settings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lignumis/settings.lua b/lignumis/settings.lua index 3dd53c4..114d16e 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -117,7 +117,7 @@ data:extend({ } }) -if mods["atroponics"] then +if mods["astroponics"] then data:extend({ { type = "bool-setting", From b682773d44136d1656c8ada9dcf507b925faa1b6 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 01:08:00 +0100 Subject: [PATCH 42/46] 1.2.2 --- lignumis/changelog.txt | 6 ++++++ lignumis/info.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index fcd26c2..836f6b4 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.2 +Date: 18.12.2025 + Bug Fixes: + - Lumber mill accepts productivity modules again + - Fix crash with Astroponics +--------------------------------------------------------------------------------------------------- Version: 1.2.1 Date: 18.12.2025 Bug Fixes: diff --git a/lignumis/info.json b/lignumis/info.json index 7cc2667..36aca88 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,6 +1,6 @@ { "name": "lignumis", - "version": "1.2.1", + "version": "1.2.2", "title": "Lignumis", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.", "author": "cackling fiend", From 25aa4a1c813edbd84a78a2ccd6180b33571519df Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 13:03:39 +0100 Subject: [PATCH 43/46] Set weight and default import location for gold plate --- lignumis/prototypes/content/gold/intermediates.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lignumis/prototypes/content/gold/intermediates.lua b/lignumis/prototypes/content/gold/intermediates.lua index 3c7c56e..0cf3d85 100644 --- a/lignumis/prototypes/content/gold/intermediates.lua +++ b/lignumis/prototypes/content/gold/intermediates.lua @@ -13,7 +13,9 @@ data:extend({ pick_sound = item_sounds.metal_small_inventory_pickup, drop_sound = item_sounds.metal_small_inventory_move, stack_size = 100, - enabled = true + enabled = true, + weight = 1 * kg, + default_import_location = "lignumis" }, { type = "recipe", @@ -35,6 +37,7 @@ data:extend({ drop_sound = item_sounds.wire_inventory_move, stack_size = 200, weight = 0.25 * kg, + default_import_location = "lignumis", ingredient_to_weight_coefficient = 0.25 }, { From c24016e67b3c15db86d8b0e472417fbf3494cc73 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 13:05:11 +0100 Subject: [PATCH 44/46] Move code for AAI Industry behind Wooden Logistics --- lignumis/prototypes/compatibility/updates.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lignumis/prototypes/compatibility/updates.lua b/lignumis/prototypes/compatibility/updates.lua index 2042d0d..6f41c02 100644 --- a/lignumis/prototypes/compatibility/updates.lua +++ b/lignumis/prototypes/compatibility/updates.lua @@ -1,5 +1,5 @@ -require("aai-industry") require("gleba-reborn") require("crushing-industry-updates") require("k2so") -require("wood-logistics") \ No newline at end of file +require("wood-logistics") +require("aai-industry") From 537e570efeff82faed0e1e4d5165fc01874a712a Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 17:34:12 +0100 Subject: [PATCH 45/46] Add lumber mill from Lignumis if Wooden Logistics is active but lumber mill is disabled in the settings --- lignumis/prototypes/content/lumber-mill.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 709bb25..9ffcafc 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -17,7 +17,7 @@ local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].val local has_oxygen = data.raw["surface-property"]["oxygen"] ~= nil local electric_lumber_mill = settings.startup["lignumis-electric-lumber-mill"].value -if mods["wood-logistics"] then +if mods["wood-logistics"] and settings.startup["wood-logistics-lumber-mill"].value then return end From 7e3f9b4014b2f37c29f9d5927dc691302ed21d9e Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 18 Dec 2025 18:40:21 +0100 Subject: [PATCH 46/46] Remove burner leech hint --- lignumis/scripts/init.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lignumis/scripts/init.lua b/lignumis/scripts/init.lua index 75773e3..694a4cc 100644 --- a/lignumis/scripts/init.lua +++ b/lignumis/scripts/init.lua @@ -67,10 +67,6 @@ Init.events[defines.events.on_player_created] = function(event) storage.init[event.player_index] = true - if not script.active_mods["Burner-Leech-Fork"] and not script.active_mods["Burner-Leech"] and not script.active_mods["InserterFuelLeech"] then - game.print("Lignumis: You are starting a new game without a burner leech mod. The intended experience is to use one of the available options. You can disable such a mod after the burner phase of the game. See the mod page for more details.") - end - if not script.active_mods["any-planet-start"] then init_player(event) init_freeplay(event)