4.3.0

louanfontenele · louanfontenele · commit e400a90ae702 · 2026-03-27T15:57:40.000-03:00
Fixed ammo and turret
diff --git a/changelog.txt b/changelog.txt
@@ -10,6 +10,7 @@ Date: 2026-03-22
     - Added safe clamp for inventory slots bonus values (0 to 65535).
   Bugfixes:
     - Fixed "Convert Inventory to Legendary (Quality)" so equipped armor and armor with equipment grids convert without duplicating armor or losing grid equipment.
+    - Fixed ammo and turret damage sliders to handle Base-only and DLC combinations without errors when Space Age categories/entities are unavailable.
   Translation:
     - Added EN, pt-BR, and external locale names, messages, and tooltip for the new option.
 
diff --git a/control.lua b/control.lua
@@ -7,6 +7,7 @@ local permissions = require("scripts/utils/permissions")
 _G.is_allowed = permissions.is_allowed
 local flib_on_tick_n = require("__flib__.on-tick-n")
 local flib_table = require("__flib__.table")
+local compat = require("scripts/utils/mod_compat")
 
 local function safe_control_call(label, fn, ...)
   local ok, err = pcall(fn, ...)
@@ -141,7 +142,7 @@ local function is_legendary_quality_module_researched(force)
 end
 
 local function update_legendary_shortcut_availability()
-  local quality_active = script.active_mods["quality"] ~= nil
+  local quality_active = compat.is_quality_active()
   flib_table.for_each(game.players, function(player)
     if not (player and player.valid) then
       return
@@ -295,7 +296,7 @@ script.on_event(defines.events.on_lua_shortcut, function(e)
     main_gui.toggle_main_gui(player)
   elseif e.prototype_name == "facc_give_legendary_upgrader" then
     if is_allowed(player) then
-      if script.active_mods["quality"] == nil or not is_legendary_quality_module_researched(player.force) then
+      if not compat.is_quality_active() or not is_legendary_quality_module_researched(player.force) then
         player.print({ "facc.legendary-upgrader-research-required" })
         return
       end
diff --git a/scripts/armor/create_full_armor.lua b/scripts/armor/create_full_armor.lua
@@ -16,8 +16,8 @@ function M.run(player)
   end
 
   -- Detect mods
-  local quality_enabled   = compat.is_mod_active("quality")
-  local space_age_enabled = compat.is_mod_active("space-age")
+  local quality_enabled   = compat.is_quality_active()
+  local space_age_enabled = compat.is_space_age_stack_active()
 
   -- Choose armor and layout
   local armor_name, armor_quality, layout
diff --git a/scripts/cheats/add_infinite_research_levels.lua b/scripts/cheats/add_infinite_research_levels.lua
@@ -5,6 +5,7 @@
 local M = {}
 local flib_technology = require("__flib__.technology")
 local research_targets = require("scripts/cheats/research_targets")
+local compat = require("scripts/utils/mod_compat")
 
 local function is_multilevel(tech)
   local ok, result = pcall(flib_technology.is_multilevel, tech)
@@ -18,7 +19,7 @@ function M.run(player)
   end
 
   local force = player.force
-  local space_age_enabled = script.active_mods["space-age"] ~= nil
+  local space_age_enabled = compat.is_space_age_stack_active()
   local tech_names = research_targets.get(space_age_enabled)
 
   local updated = 0
diff --git a/scripts/cheats/high_infinite_research_levels.lua b/scripts/cheats/high_infinite_research_levels.lua
@@ -5,6 +5,7 @@
 local M = {}
 local flib_technology = require("__flib__.technology")
 local research_targets = require("scripts/cheats/research_targets")
+local compat = require("scripts/utils/mod_compat")
 
 local function is_multilevel(tech)
     local ok, result = pcall(flib_technology.is_multilevel, tech)
@@ -23,7 +24,7 @@ function M.run(player)
     end
 
     local force = player.force
-    local space_age_enabled = script.active_mods["space-age"] ~= nil
+    local space_age_enabled = compat.is_space_age_stack_active()
 
     local tech_names = research_targets.get(space_age_enabled)
 
diff --git a/scripts/combat/ammo_to_turrets.lua b/scripts/combat/ammo_to_turrets.lua
@@ -11,7 +11,7 @@ local chunk_jobs = require("scripts/utils/chunk_job_runner")
 local compat = require("scripts/utils/mod_compat")
 
 -- Detect whether the Space Age DLC/mod is active
-local space_age_enabled = compat.is_mod_active("space-age")
+local space_age_enabled = compat.is_space_age_stack_active()
 local JOBS_KEY = "facc_jobs_ammo_to_turrets"
 local CHUNKS_PER_TICK = 8
 local STATUS_OPTIONS = {
diff --git a/scripts/environment/surface_properties.lua b/scripts/environment/surface_properties.lua
@@ -3,6 +3,7 @@
 
 local M = {}
 local math_util = require("scripts/utils/flib_math")
+local compat = require("scripts/utils/mod_compat")
 
 local SPACE_AGE_REQUIRED_KEYS = {
   pressure = true,
@@ -127,7 +128,7 @@ function M.set_property(player, property_name, raw_value)
     return
   end
 
-  if SPACE_AGE_REQUIRED_KEYS[property_name] and script.active_mods["space-age"] == nil then
+  if SPACE_AGE_REQUIRED_KEYS[property_name] and not compat.is_space_age_stack_active() then
     player.print({"facc.surface-property-no-space-age"})
     return
   end
diff --git a/scripts/events/gui_events.lua b/scripts/events/gui_events.lua
@@ -33,6 +33,7 @@ local set_mining_speed       = require("scripts/mining/set_mining_speed")
 local run_faster             = require("scripts/character/run_faster")
 local increase_robot_speed   = require("scripts/logistic-network/increase_robot_speed")
 local set_inventory_slots_bonus = require("scripts/character/set_inventory_slots_bonus")
+local compat                 = require("scripts/utils/mod_compat")
 
 -- Character features
 local ghost_toggle           = require("scripts/character/toggle_ghost_character")
@@ -250,7 +251,7 @@ local features = {
   facc_set_inventory_slots_bonus = set_inventory_slots_bonus,
 }
 
-local quality_enabled = script.active_mods["quality"] ~= nil
+local quality_enabled = compat.is_quality_active()
 if quality_enabled then
   features.facc_convert_inventory    = require("scripts/character/convert_inventory_to_legendary")
   features.facc_upgrade_blueprints   = require("scripts/blueprints/upgrade_blueprints_to_legendary")
diff --git a/scripts/gui/main_gui.lua b/scripts/gui/main_gui.lua
@@ -7,12 +7,13 @@ local M = {}
 local flib_gui = require("__flib__.gui")
 local flib_table = require("__flib__.table")
 local gui_events = require("scripts/events/gui_events")
+local compat = require("scripts/utils/mod_compat")
 
 --------------------------------------------------------------------------------
 -- Mod detection
 --------------------------------------------------------------------------------
-local quality_enabled   = script.active_mods["quality"]   ~= nil
-local space_age_enabled = script.active_mods["space-age"] ~= nil
+local quality_enabled   = compat.is_quality_active()
+local space_age_enabled = compat.is_space_age_stack_active()
 -- Disable “Increase Resources” when infinite resources is active
 local infinite_resources_enabled = settings.startup["facc-infinite-resources"]
     and settings.startup["facc-infinite-resources"].value
diff --git a/scripts/legendary-upgrader/legendary_upgrader.lua b/scripts/legendary-upgrader/legendary_upgrader.lua
@@ -3,6 +3,7 @@
 
 local TOOL_NAME = "facc_legendary_upgrader"
 local QUALITY   = "legendary"  -- hard-coded legendary quality
+local compat = require("scripts/utils/mod_compat")
 
 -- Main upgrader: triggered when player selects an area with our tool
 script.on_event(defines.events.on_player_selected_area, function(event)
@@ -13,7 +14,7 @@ script.on_event(defines.events.on_player_selected_area, function(event)
   if not is_allowed(player) then return end
   if not player then return end
 
-  local quality_active = script.active_mods["quality"] ~= nil
+  local quality_active = compat.is_quality_active()
   local legendary_quality = quality_active
     and player.force
     and player.force.valid
diff --git a/scripts/planets/generate_planet_surfaces.lua b/scripts/planets/generate_planet_surfaces.lua
@@ -11,7 +11,7 @@ function M.run(player)
     return
   end
 
-  if not compat.is_mod_active("space-age") or not game.planets then
+  if not compat.is_space_age_stack_active() or not game.planets then
     player.print({"facc.generate-planet-surfaces-no-space-age"})
     return
   end
diff --git a/scripts/planets/teleport_to_planet.lua b/scripts/planets/teleport_to_planet.lua
@@ -48,7 +48,7 @@ function M.run(player, planet_name)
     display_name = "Nauvis"
     surface = game.surfaces["nauvis"] or (player.surface and player.surface.valid and player.surface) or nil
   else
-    if not compat.is_mod_active("space-age") then
+    if not compat.is_space_age_stack_active() then
       player.print({"facc.teleport-to-planet-no-space-age"})
       return
     end
diff --git a/scripts/remote/public_api.lua b/scripts/remote/public_api.lua
@@ -7,6 +7,7 @@ local teleport_gui = require("scripts/gui/teleport_gui")
 local stats_hud = require("scripts/gui/stats_hud")
 local flib_table = require("__flib__.table")
 local math_util = require("scripts/utils/flib_math")
+local compat = require("scripts/utils/mod_compat")
 
 local clean_pollution = require("scripts/environment/clean_pollution")
 local instant_research = require("scripts/cheats/instant_research")
@@ -68,7 +69,7 @@ local features = {
   facc_non_minable_permanent = require("scripts/mining/non_minable_permanent")
 }
 
-local quality_enabled = script.active_mods["quality"] ~= nil
+local quality_enabled = compat.is_quality_active()
 if quality_enabled then
   features.facc_convert_inventory = require("scripts/character/convert_inventory_to_legendary")
   features.facc_upgrade_blueprints = require("scripts/blueprints/upgrade_blueprints_to_legendary")
@@ -507,6 +508,10 @@ local INTERFACE_NAME = "facc"
 local INTERFACE_ALIAS = "factorio_admin_command_center"
 local INTERFACE_VERSION = 1
 local function list_planets()
+  if not compat.is_space_age_stack_active() or not game.planets then
+    return { "nauvis" }
+  end
+
   local result = {}
   local seen = {}
   local base_order = { "nauvis", "vulcanus", "fulgora", "gleba", "aquilo" }
@@ -518,12 +523,10 @@ local function list_planets()
     end
   end
 
-  if game.planets then
-    for name in pairs(game.planets) do
-      if not seen[name] then
-        seen[name] = true
-        result[#result + 1] = name
-      end
+  for name in pairs(game.planets) do
+    if not seen[name] then
+      seen[name] = true
+      result[#result + 1] = name
     end
   end
 
@@ -541,8 +544,10 @@ local API_FUNCTIONS = {
 
   get_capabilities = function()
     return {
-      quality = script.active_mods["quality"] ~= nil,
-      space_age = script.active_mods["space-age"] ~= nil,
+      quality = compat.is_quality_active(),
+      space_age = compat.is_space_age_active(),
+      elevated_rails = compat.is_elevated_rails_active(),
+      space_age_stack = compat.is_space_age_stack_active(),
       planets = list_planets()
     }
   end,
diff --git a/scripts/transportation/fill_platform_thrusters.lua b/scripts/transportation/fill_platform_thrusters.lua
@@ -5,7 +5,7 @@
 local M = {}
 local compat = require("scripts/utils/mod_compat")
 
-local space_age_enabled = compat.is_mod_active("space-age")
+local space_age_enabled = compat.is_space_age_stack_active()
 
 local function get_required_fluid_name(fluidbox, index)
   local ok_proto, proto = pcall(function() return fluidbox.get_prototype(index) end)
diff --git a/scripts/utils/mod_compat.lua b/scripts/utils/mod_compat.lua
@@ -41,6 +41,27 @@ function M.is_mod_active(mod_name)
     and script.active_mods[mod_name] ~= nil
 end
 
+function M.is_quality_active()
+  return M.is_mod_active("quality")
+end
+
+function M.is_space_age_active()
+  return M.is_mod_active("space-age")
+end
+
+function M.is_elevated_rails_active()
+  return M.is_mod_active("elevated-rails")
+end
+
+-- Space Age gameplay stack as shipped by the base game.
+-- In normal setups, Space Age depends on both Quality and Elevated Rails.
+-- This helper is useful in modded environments that may alter dependencies.
+function M.is_space_age_stack_active()
+  return M.is_space_age_active()
+    and M.is_quality_active()
+    and M.is_elevated_rails_active()
+end
+
 function M.prototype_exists(collection_name, prototype_name)
   if type(collection_name) ~= "string" or type(prototype_name) ~= "string" then
     return false
