Mark Any planet start and Planet picker as incompatible

lignumis/info.json

@@ -24,11 +24,12 @@
         "?wood-military >= 2.3.3",
         "?metal-and-stars",
         "?aai-industry",
-        "?planet-picker",
         "?Diversitree",
         "?aai-loaders",
         "?atan-nuclear-science",
         "?lane-splitters",
+        "!planet-picker",
+        "!any-planet-start",
         "!apm_power_ldinc",
         "!wood-logistics",
         "!early-agriculture",

lignumis/prototypes/compatibility/aai-industry.lua

@@ -8,9 +8,7 @@ local burner_mechanics = Technology:new("burner-mechanics")
 burner_mechanics:removeRecipe("burner-inserter")
 burner_mechanics:removeRecipe("burner-mining-drill")
 burner_mechanics:removeRecipe("burner-assembling-machine")
-if not mods["planet-picker"] and not mods["any-planet-start"] then
 burner_mechanics:addPrerequisite("iron-processing")
-end
 
 data.raw.recipe["burner-inserter"].enabled = true
 data.raw.recipe["burner-mining-drill"].enabled = true

lignumis/prototypes/compatibility/data.lua

@@ -2,7 +2,6 @@ require("hot-metals")
 require("wood-military")
 require("metal-and-stars")
 require("alien-biomes")
-require("planet-picker")
 require("aai-loaders")
 require("nuclear-science")
 require("lane-splitters")

lignumis/prototypes/compatibility/planet-picker.lua

@@ -1,7 +0,0 @@
-local Technology = require("__cf-lib__/data/Technology")
-
-if not mods["planet-picker"] and not mods["any-planet-start"] then return end
-
-local technology = Technology:new("planet-discovery-lignumis")
-technology:setPrerequisites({ "space-platform-thruster" })
-technology:addIngredients({ "logistic-science-pack", "chemical-science-pack", "space-science-pack" })

lignumis/prototypes/content/basic-circuit-board.lua

@@ -51,11 +51,7 @@ data:extend({
     }
 })
 
-if not mods["planet-picker"] and not mods["any-planet-start"] then
 Technology:new("copper-processing"):addRecipe("basic-circuit-board-copper")
-else
-    Technology:new("electronics"):addRecipe("basic-circuit-board-copper")
-end
 
 if settings.startup["lignumis-circuit-progression"].value then
     table.insert(data.raw.recipe["electronic-circuit"].ingredients, { type = "item", name = "basic-circuit-board", amount = 1 })

lignumis/prototypes/content/burner-agricultural-tower.lua

@@ -132,8 +132,4 @@ data:extend({
     }
 })
 
-if not mods["planet-picker"] and not mods["any-planet-start"] then
 Technology:new("copper-processing"):addRecipe("burner-agricultural-tower-copper")
-else
-    Technology:new("electronics"):addRecipe("burner-agricultural-tower-copper")
-end

lignumis/prototypes/content/technology.lua

@@ -83,7 +83,6 @@ data:extend({
     }
 })
 
-if not mods["planet-picker"] and not mods["any-planet-start"] then
 data:extend({
     {
         type = "technology",
@@ -162,4 +161,3 @@ if not mods["planet-picker"] and not mods["any-planet-start"] then
         }
     }
 })
-end

lignumis/prototypes/integrations/vanilla.lua

@@ -129,14 +129,12 @@ table.insert(data.raw["assembling-machine"]["assembling-machine-3"].crafting_cat
 
 -- Disable vanilla early game recipes
 
-if not mods["planet-picker"] and not mods["any-planet-start"] then
 data.raw.recipe["iron-plate"].enabled = false
 data.raw.recipe["iron-gear-wheel"].enabled = false
 data.raw.recipe["iron-chest"].enabled = false
 data.raw.recipe["copper-plate"].enabled = false
 data.raw.recipe["copper-cable"].enabled = false
 data.raw.recipe["transport-belt"].enabled = false
-end
 
 
 -- Progressive recipes
@@ -157,7 +155,6 @@ end
 
 -- Adjust vanilla technologies
 
-if not mods["planet-picker"] and not mods["any-planet-start"] then
 local automation_science_pack_technology = data.raw.technology["automation-science-pack"]
 automation_science_pack_technology.enabled = false
 automation_science_pack_technology.visible_when_disabled = true
@@ -294,7 +291,6 @@ if not mods["planet-picker"] and not mods["any-planet-start"] then
 if settings.startup["lignumis-technology-progression"].value then
     utility_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack" })
 end
-end
 
 if not mods["planet-muluna"] then -- Muluna does the same
     Technology:new("logistic-robotics"):addRecipe("requester-chest")

lignumis/scripts/init-existing.lua

@@ -15,11 +15,11 @@ InitExisting.on_init = function()
     end
 
     for _, force in pairs(game.forces) do
-        force.technologies["iron-processing"].researched = true
-        force.technologies["copper-processing"].researched = true
         if force.is_space_location_unlocked("nauvis") then
             force.technologies["planet-discovery-nauvis"].researched = true
         end
+        force.technologies["iron-processing"].researched = true
+        force.technologies["copper-processing"].researched = true
     end
 
     game.print { "", { "lignumis.start-new-game" } }

lignumis/scripts/init-new.lua

@@ -62,7 +62,6 @@ end
 
 InitNew.on_init = function()
     if game.tick > 0 then return end
-    if script.active_mods["planet-picker"] or script.active_mods["any-planet-start"] then return end
 
     init_intro()
     init_space_locations()

lignumis/scripts/init.lua

@@ -37,7 +37,6 @@ end
 
 -- Initialize the freeplay scenario
 local function init_freeplay(event)
-    if script.active_mods["planet-picker"] or script.active_mods["any-planet-start"] then return end
     if storage.crashed_ship_lignumis then return end
 
     local player = game.get_player(event.player_index)

lignumis/settings.lua

@@ -52,12 +52,3 @@ if mods["wood-military"] then
     data.raw["bool-setting"]["lignumis-ammo-progression"].forced_value = false
     data.raw["bool-setting"]["lignumis-ammo-progression"].hidden = true
 end
-
-if mods["planet-picker"] or mods["any-planet-start"] then
-    data.raw["bool-setting"]["lignumis-belt-progression"].forced_value = false
-    data.raw["bool-setting"]["lignumis-belt-progression"].hidden = true
-    data.raw["bool-setting"]["lignumis-inserter-progression"].forced_value = false
-    data.raw["bool-setting"]["lignumis-inserter-progression"].hidden = true
-    data.raw["bool-setting"]["lignumis-ammo-progression"].forced_value = false
-    data.raw["bool-setting"]["lignumis-ammo-progression"].hidden = true
-end