Make wood-military optional

lignumis/control.lua

@@ -31,6 +31,18 @@ script.on_init(function()
         storage.disable_crashsite = remote.call("freeplay", "get_disable_crashsite")
         remote.call("freeplay", "set_disable_crashsite", true)
         remote.call("freeplay", "set_skip_intro", true)
+
+        if not script.active_mods["wood-military"] then
+            local respawn_items = remote.call("freeplay", "get_respawn_items")
+            respawn_items["wood-darts-magazine"] = respawn_items["firearm-magazine"]
+            respawn_items["firearm-magazine"] = nil
+            remote.call("freeplay", "set_respawn_items", respawn_items)
+
+            local created_items = remote.call("freeplay", "get_created_items")
+            created_items["wood-darts-magazine"] = created_items["firearm-magazine"]
+            created_items["firearm-magazine"] = nil
+            remote.call("freeplay", "set_created_items", created_items)
+        end
     end
 
     correct_space_locations()
@@ -70,16 +82,6 @@ script.on_event(e.on_player_created, function(event)
                 storage.crashed_ship_parts = remote.call("freeplay", "get_ship_parts")
                 storage.starting_message = remote.call("freeplay", "get_custom_intro_message")
 
-                local respawn_items = remote.call("freeplay", "get_respawn_items")
-                respawn_items["wood-darts-magazine"] = respawn_items["firearm-magazine"]
-                respawn_items["firearm-magazine"] = nil
-                remote.call("freeplay", "set_respawn_items", respawn_items)
-
-                local created_items = remote.call("freeplay", "get_created_items")
-                created_items["wood-darts-magazine"] = created_items["firearm-magazine"]
-                created_items["firearm-magazine"] = nil
-                remote.call("freeplay", "set_created_items", created_items)
-
                 local ship_items = { ["wood-darts-magazine"] = 2 }
                 local debris_items = { ["lumber"] = 8 }
 

lignumis/info.json

@@ -17,9 +17,9 @@
         "mf-logistics >= 1.0.1",
         "Wood-Walls >= 1.2.0",
         "?hot-metals >= 1.1.0",
+        "?wood-military >= 2.3.3",
         "!apm_power_ldinc",
         "!alien-biomes",
-        "!wood-military",
         "!wood-logistics",
         "!wood-industry",
         "!early-agriculture",

lignumis/prototypes/compatibility/data.lua

@@ -1 +1,2 @@
-require("hot-metals")
+require("hot-metals")
+require("wood-military")

lignumis/prototypes/compatibility/wood-military.lua

@@ -1 +1,5 @@
+if not mods["wood-military"] then
+    return
+end
+
 data.raw.armor["wood-armor"].equipment_grid = "tiny-equipment-grid"

lignumis/prototypes/content/wood-military.lua

@@ -1,3 +1,8 @@
+-- Wooden military mod replaces the content here
+if mods["wood-military"] then
+    return
+end
+
 local item_sounds = require("__base__.prototypes.item_sounds")
 local simulations = require("__base__.prototypes.factoriopedia-simulations")
 

lignumis/settings-updates.lua

@@ -1,7 +1 @@
---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
+require("settings/updates")

lignumis/settings.lua

@@ -13,11 +13,16 @@ data:extend({
         default_value = true,
         order = "b"
     },
-    {
-        type = "bool-setting",
-        name = "lignumis-ammo-progression",
-        setting_type = "startup",
-        default_value = true,
-        order = "c"
-    }
 })
+
+if not mods["wood-military"] then
+    data:extend({
+        {
+            type = "bool-setting",
+            name = "lignumis-ammo-progression",
+            setting_type = "startup",
+            default_value = true,
+            order = "c"
+        }
+    })
+end

lignumis/settings/updates.lua

@@ -0,0 +1 @@
+require("wood-military")

lignumis/settings/wood-military.lua

@@ -0,0 +1,11 @@
+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