Add setting for assembler recipe progression and move some lumber mill recipes to a setting

lignumis/locale/en/strings.cfg

@@ -169,6 +169,8 @@ lignumis-ammo-progression=Enable progressive ammo recipes
 lignumis-technology-progression=Enable progressive technologies
 lignumis-basic-circuit-board=Enable basic circuit board
 lignumis-circuit-progression=Enable progressive circuit recipes
+lignumis-assembler-progression=Enable progressive assembler recipes
+lignumis-lumber-mill-more-recipes=Enable more recipes for the lumber mill
 
 [mod-setting-description]
 lignumis-belt-progression=Yellow belts will require wood belts to craft.
@@ -177,6 +179,8 @@ lignumis-ammo-progression=Firearm magazines will require wooden darts magazines
 lignumis-technology-progression=Adds wood and steam science packs to most late game technologies. Disabling this removes the relevance of Lignumis' science packs in the late game.
 lignumis-basic-circuit-board=Recipes use basic circuit boards instead of gold cables and gold plates where appropriate. Both gold and copper recipes will be added.
 lignumis-circuit-progression=Electric circuits will require basic circuit boards to craft.
+lignumis-assembler-progression=Assembling machine 1 will require burner assembling machines to craft.
+lignumis-lumber-mill-more-recipes=The lumber mill can also craft basic turrets, burner assemblers and burner inserters. Improves balancing wood usage when all progressive recipes are enabled and helps with marathon games.
 
 [entity-status]
 no-quality-catalyst=No quality catalyst

lignumis/prototypes/content/basic-gun-turret.lua

@@ -48,7 +48,6 @@ local turret_item = {
 local turret_recipe = {
     type = "recipe",
     name = "basic-gun-turret",
-    category = "wood-processing-or-assembling",
     enabled = false,
     energy_required = 8,
     ingredients = {
@@ -58,6 +57,9 @@ 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"
+end
 
 local turret_technology = {
     type = "technology",

lignumis/prototypes/content/burner-assembling-machine.lua

@@ -50,6 +50,8 @@ 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,
@@ -68,7 +70,7 @@ data:extend({
     {
         type = "recipe",
         name = "burner-assembling-machine",
-        category = "wood-processing-or-assembling",
+        category = crafting_category,
         enabled = false,
         ingredients = {
             { type = "item", name = "wooden-gear-wheel", amount = 5 },
@@ -109,11 +111,11 @@ if not basic_circuit_board then
         {
             type = "recipe",
             name = "burner-assembling-machine-electronic-circuit",
-            category = "wood-processing-or-assembling",
+            category = crafting_category,
             localised_name = { "entity-name.burner-assembling-machine" },
             icons = {
                 { icon = Lignumis.graphics .. "icons/burner-assembling-machine.png" },
-                { icon = "__base__/graphics/icons/electronic-circuit.png",           scale = 0.25, shift = { 8, 8 } }
+                { icon = "__base__/graphics/icons/electronic-circuit.png",          scale = 0.25, shift = { 8, 8 } }
             },
             enabled = false,
             ingredients = {

lignumis/prototypes/content/burner-long-handed-inserter.lua

@@ -44,6 +44,8 @@ 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,
@@ -63,7 +65,7 @@ data:extend({
     {
         type = "recipe",
         name = "burner-long-handed-inserter",
-        category = "wood-processing-or-assembling",
+        category = crafting_category,
         enabled = false,
         ingredients = {
             { type = "item", name = "wooden-gear-wheel", amount = 1 },

lignumis/prototypes/integrations/vanilla.lua

@@ -41,12 +41,14 @@ burner_inserter.energy_source.initial_fuel_percent = 0.15
 
 data.raw.item["burner-inserter"].icon = Lignumis.graphics .. "icons/burner-inserter.png"
 
-local burner_inesrter_recipe = data.raw.recipe["burner-inserter"]
-burner_inesrter_recipe.ingredients = {
+local burner_inserter_recipe = data.raw.recipe["burner-inserter"]
+burner_inserter_recipe.ingredients = {
     { type = "item", name = "wooden-gear-wheel", amount = 1 },
     { type = "item", name = "lumber",            amount = 1 }
 }
-burner_inesrter_recipe.category = "wood-processing-or-assembling"
+if settings.startup["lignumis-lumber-mill-more-recipes"].value then
+    burner_inserter_recipe.category = "wood-processing-or-assembling"
+end
 
 
 -- Stone furnace
@@ -149,10 +151,11 @@ if settings.startup["lignumis-belt-progression"].value then
 end
 
 if settings.startup["lignumis-inserter-progression"].value then
-    table.insert(
-        data.raw.recipe["inserter"].ingredients,
-        { type = "item", name = "burner-inserter", amount = 1 }
-    )
+    Recipe:new("inserter"):addIngredient("burner-inserter", 1)
+end
+
+if settings.startup["lignumis-assembler-progression"].value then
+    Recipe:new("assembling-machine-1"):addIngredient("burner-assembling-machine", 1)
 end
 
 

lignumis/settings.lua

@@ -40,12 +40,28 @@ data:extend({
         setting_type = "startup",
         default_value = false,
         order = "f"
+    },
+    {
+        type = "bool-setting",
+        name = "lignumis-assembler-progression",
+        setting_type = "startup",
+        default_value = false,
+        order = "g"
+    },
+    {
+        type = "bool-setting",
+        name = "lignumis-lumber-mill-more-recipes",
+        setting_type = "startup",
+        default_value = false,
+        order = "h"
     }
 })
 
 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
 end
 
 if mods["wood-military"] then