mirror of
https://github.com/Oarcinae/FactorioScenarioMultiplayerSpawn.git
synced 2025-03-03 14:42:27 +02:00
Remove an old setting that is no longer used or needed.
This commit is contained in:
parent
badd4ab018
commit
3357d69d90
18
control.lua
18
control.lua
@ -68,9 +68,7 @@ script.on_init(function(event)
|
|||||||
CreateGameSurface()
|
CreateGameSurface()
|
||||||
|
|
||||||
-- MUST be before other stuff, but after surface creation.
|
-- MUST be before other stuff, but after surface creation.
|
||||||
if ENABLE_SEPARATE_SPAWNS then
|
|
||||||
InitSpawnGlobalsAndForces()
|
InitSpawnGlobalsAndForces()
|
||||||
end
|
|
||||||
|
|
||||||
if SILO_FIXED_POSITION then
|
if SILO_FIXED_POSITION then
|
||||||
SetFixedSiloPosition(SILO_POSITION)
|
SetFixedSiloPosition(SILO_POSITION)
|
||||||
@ -116,9 +114,7 @@ script.on_event(defines.events.on_chunk_generated, function(event)
|
|||||||
GenerateRocketSiloChunk(event)
|
GenerateRocketSiloChunk(event)
|
||||||
end
|
end
|
||||||
|
|
||||||
if ENABLE_SEPARATE_SPAWNS then
|
|
||||||
SeparateSpawnsGenerateChunk(event)
|
SeparateSpawnsGenerateChunk(event)
|
||||||
end
|
|
||||||
|
|
||||||
CreateHoldingPen(event.surface, event.area, 16, false)
|
CreateHoldingPen(event.surface, event.area, 16, false)
|
||||||
end)
|
end)
|
||||||
@ -136,7 +132,6 @@ script.on_event(defines.events.on_gui_click, function(event)
|
|||||||
PlayerListGuiClick(event)
|
PlayerListGuiClick(event)
|
||||||
end
|
end
|
||||||
|
|
||||||
if ENABLE_SEPARATE_SPAWNS then
|
|
||||||
WelcomeTextGuiClick(event)
|
WelcomeTextGuiClick(event)
|
||||||
SpawnOptsGuiClick(event)
|
SpawnOptsGuiClick(event)
|
||||||
SpawnCtrlGuiClick(event)
|
SpawnCtrlGuiClick(event)
|
||||||
@ -145,17 +140,14 @@ script.on_event(defines.events.on_gui_click, function(event)
|
|||||||
BuddySpawnWaitMenuClick(event)
|
BuddySpawnWaitMenuClick(event)
|
||||||
BuddySpawnRequestMenuClick(event)
|
BuddySpawnRequestMenuClick(event)
|
||||||
SharedSpawnJoinWaitMenuClick(event)
|
SharedSpawnJoinWaitMenuClick(event)
|
||||||
end
|
|
||||||
|
|
||||||
GameOptionsGuiClick(event)
|
GameOptionsGuiClick(event)
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
script.on_event(defines.events.on_gui_checked_state_changed, function (event)
|
script.on_event(defines.events.on_gui_checked_state_changed, function (event)
|
||||||
if ENABLE_SEPARATE_SPAWNS then
|
|
||||||
SpawnOptsRadioSelect(event)
|
SpawnOptsRadioSelect(event)
|
||||||
SpawnCtrlGuiOptionsSelect(event)
|
SpawnCtrlGuiOptionsSelect(event)
|
||||||
end
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
||||||
@ -188,17 +180,11 @@ script.on_event(defines.events.on_player_created, function(event)
|
|||||||
GivePlayerLongReach(game.players[event.player_index])
|
GivePlayerLongReach(game.players[event.player_index])
|
||||||
end
|
end
|
||||||
|
|
||||||
if not ENABLE_SEPARATE_SPAWNS then
|
|
||||||
PlayerSpawnItems(event)
|
|
||||||
else
|
|
||||||
SeparateSpawnsPlayerCreated(event.player_index)
|
SeparateSpawnsPlayerCreated(event.player_index)
|
||||||
end
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
script.on_event(defines.events.on_player_respawned, function(event)
|
script.on_event(defines.events.on_player_respawned, function(event)
|
||||||
if ENABLE_SEPARATE_SPAWNS then
|
|
||||||
SeparateSpawnsPlayerRespawned(event)
|
SeparateSpawnsPlayerRespawned(event)
|
||||||
end
|
|
||||||
|
|
||||||
PlayerRespawnItems(event)
|
PlayerRespawnItems(event)
|
||||||
|
|
||||||
@ -208,9 +194,7 @@ script.on_event(defines.events.on_player_respawned, function(event)
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
script.on_event(defines.events.on_player_left_game, function(event)
|
script.on_event(defines.events.on_player_left_game, function(event)
|
||||||
if ENABLE_SEPARATE_SPAWNS then
|
|
||||||
FindUnusedSpawns(event)
|
FindUnusedSpawns(event)
|
||||||
end
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
script.on_event(defines.events.on_built_entity, function(event)
|
script.on_event(defines.events.on_built_entity, function(event)
|
||||||
@ -240,9 +224,7 @@ script.on_event(defines.events.on_tick, function(event)
|
|||||||
OarcRegrowthForceRemovalOnTick()
|
OarcRegrowthForceRemovalOnTick()
|
||||||
end
|
end
|
||||||
|
|
||||||
if ENABLE_SEPARATE_SPAWNS then
|
|
||||||
DelayedSpawnOnTick()
|
DelayedSpawnOnTick()
|
||||||
end
|
|
||||||
|
|
||||||
if global.ocfg.frontier_rocket_silo then
|
if global.ocfg.frontier_rocket_silo then
|
||||||
DelayedSiloCreationOnTick(game.surfaces[GAME_SURFACE_NAME])
|
DelayedSiloCreationOnTick(game.surfaces[GAME_SURFACE_NAME])
|
||||||
|
@ -27,14 +27,8 @@ CONTACT_MSG = "Contact: SteamID:Oarc | oarcinae@gmail.com | discord.gg/trnpcen"
|
|||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
-- Module Enables
|
-- 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.
|
-- Enable this to have a vanilla style starting spawn.
|
||||||
-- This changes the experience pretty drastically.
|
-- This changes the experience pretty drastically.
|
||||||
-- If you enable this, you will NOT get the option to spawn using the "pre-fab"
|
-- If you enable this, you will NOT get the option to spawn using the "pre-fab"
|
||||||
|
@ -45,16 +45,9 @@ local function ExpandGameOptionsGui(player)
|
|||||||
|
|
||||||
-- Game Mode:
|
-- Game Mode:
|
||||||
AddLabel(frame, "core_mod_en", "Core game mode (separate spawns) is enabled.", my_longer_label_style)
|
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:
|
-- Soft Mods:
|
||||||
local soft_mods_string = "Oarc Core"
|
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
|
if (global.ocfg.enable_undecorator) then
|
||||||
soft_mods_string = soft_mods_string .. ", Undecorator"
|
soft_mods_string = soft_mods_string .. ", Undecorator"
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user