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..6bb42db 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", @@ -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 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 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