diff --git a/control.lua b/control.lua index a7fb014..42444d6 100644 --- a/control.lua +++ b/control.lua @@ -68,9 +68,7 @@ script.on_init(function(event) CreateGameSurface() -- MUST be before other stuff, but after surface creation. - if ENABLE_SEPARATE_SPAWNS then - InitSpawnGlobalsAndForces() - end + InitSpawnGlobalsAndForces() if SILO_FIXED_POSITION then SetFixedSiloPosition(SILO_POSITION) @@ -116,9 +114,7 @@ script.on_event(defines.events.on_chunk_generated, function(event) GenerateRocketSiloChunk(event) end - if ENABLE_SEPARATE_SPAWNS then - SeparateSpawnsGenerateChunk(event) - end + SeparateSpawnsGenerateChunk(event) CreateHoldingPen(event.surface, event.area, 16, false) end) @@ -136,26 +132,22 @@ script.on_event(defines.events.on_gui_click, function(event) PlayerListGuiClick(event) end - if ENABLE_SEPARATE_SPAWNS then - WelcomeTextGuiClick(event) - SpawnOptsGuiClick(event) - SpawnCtrlGuiClick(event) - SharedSpwnOptsGuiClick(event) - BuddySpawnOptsGuiClick(event) - BuddySpawnWaitMenuClick(event) - BuddySpawnRequestMenuClick(event) - SharedSpawnJoinWaitMenuClick(event) - end + WelcomeTextGuiClick(event) + SpawnOptsGuiClick(event) + SpawnCtrlGuiClick(event) + SharedSpwnOptsGuiClick(event) + BuddySpawnOptsGuiClick(event) + BuddySpawnWaitMenuClick(event) + BuddySpawnRequestMenuClick(event) + SharedSpawnJoinWaitMenuClick(event) GameOptionsGuiClick(event) end) script.on_event(defines.events.on_gui_checked_state_changed, function (event) - if ENABLE_SEPARATE_SPAWNS then - SpawnOptsRadioSelect(event) - SpawnCtrlGuiOptionsSelect(event) - end + SpawnOptsRadioSelect(event) + SpawnCtrlGuiOptionsSelect(event) end) @@ -188,17 +180,11 @@ script.on_event(defines.events.on_player_created, function(event) GivePlayerLongReach(game.players[event.player_index]) end - if not ENABLE_SEPARATE_SPAWNS then - PlayerSpawnItems(event) - else - SeparateSpawnsPlayerCreated(event.player_index) - end + SeparateSpawnsPlayerCreated(event.player_index) end) script.on_event(defines.events.on_player_respawned, function(event) - if ENABLE_SEPARATE_SPAWNS then - SeparateSpawnsPlayerRespawned(event) - end + SeparateSpawnsPlayerRespawned(event) PlayerRespawnItems(event) @@ -208,9 +194,7 @@ script.on_event(defines.events.on_player_respawned, function(event) end) script.on_event(defines.events.on_player_left_game, function(event) - if ENABLE_SEPARATE_SPAWNS then - FindUnusedSpawns(event) - end + FindUnusedSpawns(event) end) script.on_event(defines.events.on_built_entity, function(event) @@ -240,9 +224,7 @@ script.on_event(defines.events.on_tick, function(event) OarcRegrowthForceRemovalOnTick() end - if ENABLE_SEPARATE_SPAWNS then - DelayedSpawnOnTick() - end + DelayedSpawnOnTick() if global.ocfg.frontier_rocket_silo then DelayedSiloCreationOnTick(game.surfaces[GAME_SURFACE_NAME]) diff --git a/example-config.lua b/example-config.lua index c46ba12..bd4fdfe 100644 --- a/example-config.lua +++ b/example-config.lua @@ -27,14 +27,8 @@ CONTACT_MSG = "Contact: SteamID:Oarc | oarcinae@gmail.com | discord.gg/trnpcen" -------------------------------------------------------------------------------- -- Module Enables --- These enables are not fully tested! For example, disabling separate spawns --- will probably break the frontier rocket silo mode -------------------------------------------------------------------------------- --- Separate spawns --- This is the core of the mod. Probably not a good idea to disable it. -ENABLE_SEPARATE_SPAWNS = true - -- Enable this to have a vanilla style starting spawn. -- This changes the experience pretty drastically. -- If you enable this, you will NOT get the option to spawn using the "pre-fab" diff --git a/lib/game_opts.lua b/lib/game_opts.lua index ba5066c..8efb0ff 100644 --- a/lib/game_opts.lua +++ b/lib/game_opts.lua @@ -45,16 +45,9 @@ local function ExpandGameOptionsGui(player) -- Game Mode: AddLabel(frame, "core_mod_en", "Core game mode (separate spawns) is enabled.", my_longer_label_style) - if (not ENABLE_SEPARATE_SPAWNS) then - frame.core_mod_en.caption="Core game mode (separate spawns) is DISABLED." - frame.core_mod_en.style.font_color=my_color_red - end -- Soft Mods: local soft_mods_string = "Oarc Core" - if (not ENABLE_SEPARATE_SPAWNS) then - soft_mods_string = "Oarc Core [DISABLED!]" - end if (global.ocfg.enable_undecorator) then soft_mods_string = soft_mods_string .. ", Undecorator" end