Add more wood setting

lignumis/locale/en/strings.cfg

@@ -194,17 +194,18 @@ lignumis-belt-progression=[color=orange][font=heading-2]Overhaul[/font][/color]
 lignumis-inserter-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=burner-inserter] Enable telescopic inserter recipes
 lignumis-ammo-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=wood-darts-magazine] Enable telescopic ammo recipes
 lignumis-technology-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=wood-science-pack] Enable progressive technologies
-lignumis-basic-circuit-board=[color=gray][font=heading-2]Deprecated (please enable)[/font] Enable basic circuit board[/color]
 lignumis-circuit-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=basic-circuit-board] Enable telescopic circuit recipes
 lignumis-assembler-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=burner-assembling-machine] Enable telescopic assembler recipes
-lignumis-lumber-mill-more-recipes=[color=green][font=heading-2]Easy[/font][/color] Enable more recipes for the lumber mill
 lignumis-fulgora-wood=[color=orange][font=heading-2]Overhaul[/font][/color] [planet=fulgora] Add wood to Fulgora
-lignumis-early-robots=[color=green][font=heading-2]Easy[/font][/color] Even earlier personal robots
 lignumis-lab=[color=orange][font=heading-2]Overhaul[/font][/color] [item=lab] Lab requires wooden belts
+lignumis-more-wood=[color=green][font=heading-2]Easy[/font][/color] Increase wood from all sources
+lignumis-lumber-mill-more-recipes=[color=green][font=heading-2]Easy[/font][/color] Enable more recipes for the lumber mill
+lignumis-early-robots=[color=green][font=heading-2]Easy[/font][/color] Even earlier personal robots
 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
+lignumis-sciences-spoil=[color=red][font=heading-2]Hard[/font][/color] Lignumis science packs spoil
+lignumis-basic-circuit-board=[color=gray][font=heading-2]Deprecated (please enable)[/font] Enable basic circuit board[/color]
 
 [mod-setting-description]
 lignumis-belt-progression=Yellow belts will require wood belts to craft.

lignumis/prototypes/integrations/astroponics.lua

@@ -1,5 +1,7 @@
 if not mods["astroponics"] then return end
 
+-- Astroponics productivity research
+
 local infinite = settings.startup["lignumis-infinite-astroponics-productivity-research"].value
 
 local base_levels = {

lignumis/prototypes/integrations/more-wood.lua

@@ -0,0 +1,43 @@
+local Recipe = require("__cf-lib__/data/Recipe")
+
+if not settings.startup["lignumis-more-wood"].value then return end
+
+if mods["astroponics"] then
+    Recipe:new("tree-astroponics"):replaceResult("wood", 10)
+end
+
+if mods["planet-muluna"] then
+    Recipe:new("muluna-tree-crushing"):replaceResult("wood", 10)
+end
+
+if mods["cerys-lunaponics"] then
+    Recipe:new("cerys-crude-lunaponics"):replaceResult("wood", 8)
+end
+
+if mods["fulgora-coralmium-agriculture"] then
+    Recipe:new("synthetic-wood"):replaceResult("wood", 6)
+end
+
+if mods["gleba-water-cane"] or mods["wayward-seas"] then
+    Recipe:new("water-cane-separation"):replaceResult("wood", 2)
+end
+
+if mods["aquilo-seabloom-algaculture"] then
+    Recipe:new("seaweed-blanching"):replaceResult("wood", 10)
+end
+
+if mods["vulcanus-sulfuric-bacteria"] then
+    Recipe:new("sulfuric-bacteria-cultivation"):replaceResult("sulfuric-bacteria", 8)
+end
+
+if mods["moshine-solaponics"] then
+    Recipe:new("tree-solaponics"):replaceResult("wood", 16)
+end
+
+if mods["planetaris-arig"] then
+    Recipe:new("planetaris-cactus-wood"):replaceResult("wood", 8)
+end
+
+if mods["pelagos"] then
+    data.raw.plant["coconut-palm"].minable.results[2].amount = 10
+end

lignumis/prototypes/integrations/updates.lua

@@ -1,2 +1,3 @@
+require("more-wood")
 require("vanilla-updates")
 require("astroponics-updates")

lignumis/prototypes/integrations/vanilla.lua

@@ -98,6 +98,7 @@ local wood_processing = data.raw.recipe["wood-processing"]
 wood_processing.ingredients[1].amount = 1
 wood_processing.icon = data.raw.item["tree-seed"].icon
 PlanetsLib.relax_surface_conditions(wood_processing, {property = "pressure", min = 900})
+local wood_multiplier = settings.startup["lignumis-more-wood"].value and 2 or 1
 
 for _, tree in pairs(data.raw.tree) do
     local function isWoodResult(result)
@@ -110,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 = 8 }
+    local woodResult = { type = "item", name = "wood", amount = nil, amount_min = 4 * wood_multiplier, amount_max = 6 * wood_multiplier }
     if minable.results and #woodResults > 0 then
         table.assign(woodResults[1], woodResult)
         woodResults[1].amount = nil
@@ -122,7 +123,7 @@ end
 
 local tree_plant = data.raw.plant["tree-plant"]
 tree_plant.growth_ticks = 5 * minute
-tree_plant.minable.results = { { type = "item", name = "wood", amount = 5 } }
+tree_plant.minable.results = { { type = "item", name = "wood", amount = 5 * wood_multiplier } }
 tree_plant.minable.count = nil
 PlanetsLib.relax_surface_conditions(tree_plant, {property = "pressure", min = 900})
 table.insert(tree_plant.autoplace.tile_restriction, "natural-gold-soil")

lignumis/settings.lua

@@ -7,105 +7,112 @@ data:extend({
         name = "lignumis-restrict-sciences",
         setting_type = "startup",
         default_value = true,
-        order = "a"
+        order = "a[general]-a"
     },
     {
         type = "bool-setting",
         name = "lignumis-circuit-progression",
         setting_type = "startup",
         default_value = true,
-        order = "b"
+        order = "b[overhaul]-a"
     },
     {
         type = "bool-setting",
         name = "lignumis-belt-progression",
         setting_type = "startup",
         default_value = false,
-        order = "c"
+        order = "b[overhaul]-b"
     },
     {
         type = "bool-setting",
         name = "lignumis-inserter-progression",
         setting_type = "startup",
         default_value = false,
-        order = "d"
+        order = "b[overhaul]-c"
     },
     {
         type = "bool-setting",
         name = "lignumis-ammo-progression",
         setting_type = "startup",
         default_value = false,
-        order = "e"
+        order = "b[overhaul]-d"
     },
     {
         type = "bool-setting",
         name = "lignumis-assembler-progression",
         setting_type = "startup",
         default_value = false,
-        order = "f"
+        order = "b[overhaul]-e"
     },
     {
         type = "bool-setting",
         name = "lignumis-technology-progression",
         setting_type = "startup",
         default_value = false,
-        order = "g"
+        order = "b[overhaul]-f"
     },
     {
         type = "bool-setting",
         name = "lignumis-lab",
         setting_type = "startup",
         default_value = false,
-        order = "h"
+        order = "b[overhaul]-g"
     },
     {
         type = "bool-setting",
         name = "lignumis-fulgora-wood",
         setting_type = "startup",
         default_value = false,
-        order = "i"
+        order = "b[overhaul]-h"
+    },
+    {
+        type = "bool-setting",
+        name = "lignumis-more-wood",
+        setting_type = "startup",
+        default_value = false,
+        order = "c[easy]-a"
     },
     {
         type = "bool-setting",
         name = "lignumis-lumber-mill-more-recipes",
         setting_type = "startup",
         default_value = false,
-        order = "j"
+        order = "c[easy]-b"
     },
     {
         type = "bool-setting",
         name = "lignumis-early-robots",
         setting_type = "startup",
         default_value = false,
-        order = "k"
+        order = "c[easy]-c"
     },
     {
         type = "bool-setting",
         name = "lignumis-double-rocket",
         setting_type = "startup",
         default_value = false,
-        order = "l"
+        order = "c[easy]-d"
     },
     {
         type = "bool-setting",
         name = "lignumis-electric-lumber-mill",
         setting_type = "startup",
         default_value = false,
-        order = "m"
+        order = "c[easy]-e"
     },
     {
         type = "bool-setting",
         name = "lignumis-sciences-spoil",
         setting_type = "startup",
         default_value = false,
-        order = "n"
+        order = "d[hard]-a"
     },
     {
         type = "bool-setting",
         name = "lignumis-basic-circuit-board",
         setting_type = "startup",
         default_value = true,
-        order = "z"
+        order = "z[deprecated]-a"
     },
     {
         type = "string-setting",
@@ -124,7 +131,7 @@ if mods["astroponics"] then
             name = "lignumis-infinite-astroponics-productivity-research",
             setting_type = "startup",
             default_value = false,
-            order = "n"
+            order = "c[easy]-z[mods]-a"
         }
     })
 end

lignumis/settings/astroponics.lua

@@ -0,0 +1,8 @@
+if not mods["astroponics"] then
+    return
+end
+
+local Settings = require("__cf-lib__/settings/Settings")
+local force = Settings.force
+
+force("astroponics-more-wood", false)

lignumis/settings/updates.lua

@@ -1,2 +1,3 @@
 require("wood-logistics")
 require("wood-military")
+require("astroponics")