From d741968714bbf742f749140b2b93ec0ba435bbf1 Mon Sep 17 00:00:00 2001 From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Date: Sun, 9 Jun 2024 16:32:10 -0500 Subject: [PATCH] Temporarily update server configs (#28780) * update configs * Update Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml * Update Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml * LF * Apply suggestions from code review Co-authored-by: Julian Giebel * Update Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml Co-authored-by: Julian Giebel --------- Co-authored-by: Pieter-Jan Briers Co-authored-by: Julian Giebel --- .../ConfigPresets/WizardsDen/leviathan.toml | 4 ---- .../ConfigPresets/WizardsDen/lizard.toml | 4 ---- .../ConfigPresets/WizardsDen/salamander.toml | 2 +- .../ConfigPresets/WizardsDen/wizardsDen.toml | 6 ++--- .../WizardsDen/wizardsDenCoreOnly.toml | 22 +++++++++++++++++++ .../WizardsDen/wizardsDenGateway.toml | 20 +++++++++++++++++ .../WizardsDen/wizardsDenLRPTide.toml | 17 ++++++++++++++ 7 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml create mode 100644 Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml create mode 100644 Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml diff --git a/Resources/ConfigPresets/WizardsDen/leviathan.toml b/Resources/ConfigPresets/WizardsDen/leviathan.toml index 7560833f13..a1a0e5b704 100644 --- a/Resources/ConfigPresets/WizardsDen/leviathan.toml +++ b/Resources/ConfigPresets/WizardsDen/leviathan.toml @@ -4,10 +4,6 @@ [game] hostname = "[EN] Wizard's Den Leviathan [US East 1]" -panic_bunker.enabled = false -panic_bunker.disable_with_admins = false -panic_bunker.enable_without_admins = false -panic_bunker.custom_reason = "" [hub] tags = "lang:en,region:am_n_e,rp:low" diff --git a/Resources/ConfigPresets/WizardsDen/lizard.toml b/Resources/ConfigPresets/WizardsDen/lizard.toml index 72688efbf9..2e3809a87d 100644 --- a/Resources/ConfigPresets/WizardsDen/lizard.toml +++ b/Resources/ConfigPresets/WizardsDen/lizard.toml @@ -4,10 +4,6 @@ [game] hostname = "[EN] Wizard's Den Lizard [US West]" -panic_bunker.enabled = false -panic_bunker.disable_with_admins = false -panic_bunker.enable_without_admins = false -panic_bunker.custom_reason = "" [hub] tags = "lang:en,region:am_n_w,rp:low" diff --git a/Resources/ConfigPresets/WizardsDen/salamander.toml b/Resources/ConfigPresets/WizardsDen/salamander.toml index e5948b6ca6..632dcae716 100644 --- a/Resources/ConfigPresets/WizardsDen/salamander.toml +++ b/Resources/ConfigPresets/WizardsDen/salamander.toml @@ -1,7 +1,7 @@ # Configuration preset used on Wizard's Den Salamander [game] -desc = "Official English Space Station 14 servers. Roleplay required, you must be whitelisted through Discord to play if there are more than 15 online players." +desc = "Official English Space Station 14 servers. Medium roleplay ruleset. You must be whitelisted through Discord to play if there are more than 15 online players." hostname = "[EN] Wizard's Den Salamander [US West RP]" soft_max_players = 130 diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml index ed2781f210..7b2897fa20 100644 --- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml +++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml @@ -2,14 +2,14 @@ # Loaded before server-specific config presets by configuration. [game] -desc = "Official English Space Station 14 servers. Vanilla, low roleplay." +desc = "Official English Space Station 14 servers. Vanilla, roleplay ruleset." lobbyenabled = true soft_max_players = 80 panic_bunker.enabled = true -panic_bunker.disable_with_admins = true +panic_bunker.disable_with_admins = false panic_bunker.enable_without_admins = true panic_bunker.show_reason = true -panic_bunker.custom_reason = "You have not played on Wizard's Den server long enough to connect to this server. Please play on Wizard's Den Lizard or Wizard's Den Leviathan until you have more playtime." +panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on another Wizard's Den server for now." [infolinks] bug_report = "https://github.com/space-wizards/space-station-14/issues/new/choose" diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml new file mode 100644 index 0000000000..0adf4c4f6c --- /dev/null +++ b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml @@ -0,0 +1,22 @@ +# Configuration preset layer for "Core Only" Wizard's Den servers. +# Intended to be loaded after wizardsDen.toml + +# hostname is a placeholder +# needs region tag + +[game] +soft_max_players = 50 +hostname = "[EN] Wizard's Den Red Firefly" +desc = "Official English Space Station 14 servers. Vanilla, core ruleset." +panic_bunker.enabled = false +panic_bunker.disable_with_admins = false +panic_bunker.enable_without_admins = false +panic_bunker.custom_reason = "" +panic_bunker.enabled = true +panic_bunker.show_reason = true +panic_bunker.max_overall_minutes = 15 +[server] +rules_file = "CoreRuleset" + +[hub] +tags = "lang:en,rp:none" diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml new file mode 100644 index 0000000000..9fcba254f7 --- /dev/null +++ b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml @@ -0,0 +1,20 @@ +# Configuration preset layer for gateway Wizard's Den servers. +# Intended to be loaded after wizardsDen.toml + +# hostname is a placeholder +# needs region tag + +[game] +hostname = "[EN][New Player Server] Wizard's Den Farm Grass Hopper" +desc = "Official English Space Station 14 servers for new players. Vanilla, roleplay ruleset." +panic_bunker.enabled = false +panic_bunker.disable_with_admins = false +panic_bunker.enable_without_admins = false +panic_bunker.custom_reason = "" +baby_jail.enabled = true +baby_jail.show_reason = true +baby_jail.max_overall_minutes = 15 +baby_jail.custom_reason = "Sorry! Only new players can join the servers, try joining another one instead!" +baby_jail.whitelisted_can_bypass = true +[hub] +tags = "lang:en,rp:low" diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml new file mode 100644 index 0000000000..6019bc2eed --- /dev/null +++ b/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml @@ -0,0 +1,17 @@ +# Configuration preset layer for "Core Only" Wizard's Den servers. +# Intended to be loaded after wizardsDen.toml + +# hostname is a placeholder +# needs region tag + +[game] +soft_max_players = 50 +hostname = "[EN] Wizard's Den Granite Flea" +desc = "Official English Space Station 14 servers. Vanilla, core ruleset." +panic_bunker.enabled = false +panic_bunker.disable_with_admins = false +panic_bunker.enable_without_admins = false +panic_bunker.custom_reason = "" + +[hub] +tags = "lang:en,rp:low" -- 2.51.2