From 2c696c5197c25a2e81214fb0410417e118a32992 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Thu, 23 Sep 2021 11:17:33 -0400 Subject: [PATCH] Updated LoadScreen Info Integrated Loadscreen Logo --- Classic/prefs/serverPrefs.cs | 20 ++++++------ .../scripts/autoexec/zDebriefLoadingScreen.cs | 31 +++++++++---------- Classic/scripts/serverDefaults.cs | 28 +++++++++-------- 3 files changed, 41 insertions(+), 38 deletions(-) diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs index 933cfc7..6a104e1 100644 --- a/Classic/prefs/serverPrefs.cs +++ b/Classic/prefs/serverPrefs.cs @@ -125,16 +125,18 @@ $Host::LoadScreenLine2 = "Game Modes:"; $Host::LoadScreenLine2_Msg = "LakRabbit, Capture the Flag, DeathMatch, (Light Only) Capture the Flag"; $Host::LoadScreenLine3 = "Get Mappacks:"; $Host::LoadScreenLine3_Msg = "playt2.com/mappacks"; -$Host::LoadScreenLine4 = "Server Provided by:"; -$Host::LoadScreenLine4_Msg = "Ravin and Choco"; -$Host::LoadScreenLine5 = "Server Hosted by:"; -$Host::LoadScreenLine5_Msg = "Branzone"; +$Host::LoadScreenLine4 = "Server Location:"; +$Host::LoadScreenLine4_Msg = "Iowa"; +$Host::LoadScreenLine5 = "Server Hosted:"; +$Host::LoadScreenLine5_Msg = "Google Compute Engine"; $Host::LoadScreenLine6 = "Server Github:"; -$Host::LoadScreenLine6_Msg = "github.com/ChocoTaco1/TacoServer"; -$Host::LoadScreenMOTD1 = "Lak crowd early evenings after work during the week."; -$Host::LoadScreenMOTD2 = "Big CTF games Fridays, Saturdays, and Sundays!"; -$Host::LoadScreenMOTD3 = "Please make an effort to keep teams balanced!"; -$Host::LoadScreenMOTD4 = " "; +$Host::LoadScreenLine6_Msg = "https://github.com/ChocoTaco1/TacoServer"; +$Host::LoadScreenMOTD1 = "Celebrating 20 Years of Tribes2!"; +$Host::LoadScreenMOTD2 = "Come play Arena on Wednesday Nights!"; +$Host::LoadScreenMOTD3 = "Lak crowd early evenings after work during the week."; +$Host::LoadScreenMOTD4 = "Big CTF games Fridays, Saturdays, and Sundays!"; +$Host::LoadScreenShowLogo = 0; +$Host::LoadScreenShowLogoName = "dpub/DPUB_logo"; $Host::LogIntentionalQuit = 1; $Host::Map = "VaubanLak"; $Host::MarkDnDObjectives = 1; diff --git a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs index 6b4e758..c247a08 100755 --- a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs +++ b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs @@ -31,23 +31,23 @@ // Lines // $Host::LoadScreenLine1 = "Join Discord:"; -// $Host::LoadScreenLine1_Msg = "https://discord.me/tribes2"; +// $Host::LoadScreenLine1_Msg = "playt2.com/discord"; // $Host::LoadScreenLine2 = "Game Modes:"; // $Host::LoadScreenLine2_Msg = "LakRabbit, Capture the Flag, DeathMatch, (Light Only) Capture the Flag"; -// $Host::LoadScreenLine3 = "Required Mappacks:"; -// $Host::LoadScreenLine3_Msg = "S5, S8, TWL, TWL2"; -// $Host::LoadScreenLine4 = "Server Provided by:"; -// $Host::LoadScreenLine4_Msg = "Ravin"; -// $Host::LoadScreenLine5 = "Server Hosted by:"; -// $Host::LoadScreenLine5_Msg = "Branzone"; +// $Host::LoadScreenLine3 = "Get Mappacks:"; +// $Host::LoadScreenLine3_Msg = "playt2.com/mappacks"; +// $Host::LoadScreenLine4 = "Server Location:"; +// $Host::LoadScreenLine4_Msg = "Iowa"; +// $Host::LoadScreenLine5 = "Server Hosted:"; +// $Host::LoadScreenLine5_Msg = "Google Compute Engine"; // $Host::LoadScreenLine6 = "Server Github:"; -// $Host::LoadScreenLine6_Msg = "https://github.com/ChocoTaco1/TacoServer"; +// $Host::LoadScreenLine6_Msg = "github.com/ChocoTaco1/TacoServer"; // MOTD or EVENTS Messages -// $Host::LoadScreenMOTD1 = "Blaster is here to stay!"; -// $Host::LoadScreenMOTD2 = "Come play Arena on Wednesday Nights!"; -// $Host::LoadScreenMOTD3 = "Lak crowd early evenings after work during the week."; -// $Host::LoadScreenMOTD4 = "Big CTF games Fridays, Saturdays, and Sundays!"; +// $Host::LoadScreenMOTD1 = "Celebrating 20 Years of Tribes2!"; +// $Host::LoadScreenMOTD2 = "Lak crowd early evenings after work during the week."; +// $Host::LoadScreenMOTD3 = "Big CTF games Fridays, Saturdays, and Sundays!"; +// $Host::LoadScreenMOTD4 = "Please make an effort to keep teams balanced!"; // First Screen loading time (Map Screen) // If this is set too low the second screen wont show at all @@ -60,10 +60,9 @@ $dtLoadingScreen::Delay = 0; $dtLoadingScreen::ShowFullScreen = 0; // Enable/Disable Images $dtLoadingScreen::ShowImages = 0; -// Enable/Disable Server Logo -$dtLoadingScreen::ShowLogo = 0; -$dtLoadingScreen::LogoName = "dpub/DPUB_logo"; - +// Enable/Disable Server Logo +$dtLoadingScreen::ShowLogo = $Host::LoadScreenShowLogo; //$dtLoadingScreen::ShowLogo = 0; +$dtLoadingScreen::LogoName = $Host::LoadScreenShowLogoName; //$dtLoadingScreen::LogoName = "dpub/DPUB_logo"; // Color safetynet diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs index 0f70f80..3154496 100755 --- a/Classic/scripts/serverDefaults.cs +++ b/Classic/scripts/serverDefaults.cs @@ -137,19 +137,19 @@ $Host::LoadingScreenUseDebrief = 1; //Enable Debrief Style Loading screen; Gi $Host::LoadScreenColor1 = "05edad"; //Loading Screen color; First Column $Host::LoadScreenColor2 = "29DEE7"; //Loading Screen color; Second Column $Host::LoadScreenColor3 = "33CCCC"; //Loading Screen color; Accents -$Host::LoadScreenLine1 = "Join Discord:"; //Loading screen Line 1 Topic -$Host::LoadScreenLine1_Msg = "https://discord.me/tribes2"; //Loading Screen Line 1 Message -$Host::LoadScreenLine2 = "Game Modes:"; //Loading screen Line 2 Topic +$Host::LoadScreenLine1 = "Join Discord:"; //Loading screen Line 1 Topic +$Host::LoadScreenLine1_Msg = "playt2.com/discord"; //Loading Screen Line 1 Message +$Host::LoadScreenLine2 = "Game Modes:"; //Loading screen Line 2 Topic $Host::LoadScreenLine2_Msg = "LakRabbit, Capture the Flag, DeathMatch, (Light Only) Capture the Flag"; //Loading Screen Line 2 Message -$Host::LoadScreenLine3 = "Required Mappacks:"; //Loading screen Line 3 Topic -$Host::LoadScreenLine3_Msg = "S5, S8, TWL, TWL2"; //Loading Screen Line 3 Message -$Host::LoadScreenLine4 = "Server Provided by:"; //Loading screen Line 4 Topic -$Host::LoadScreenLine4_Msg = "Ravin"; //Loading Screen Line 4 Message -$Host::LoadScreenLine5 = "Server Hosted by:"; //Loading screen Line 5 Topic (Debrief LoadScreen Only) -$Host::LoadScreenLine5_Msg = "Branzone"; //Loading Screen Line 5 Message (Debrief LoadScreen Only) -$Host::LoadScreenLine6 = "Server Github:"; //Loading screen Line 6 Topic (Debrief LoadScreen Only) -$Host::LoadScreenLine6_Msg = "https://github.com/ChocoTaco1/TacoServer"; //Loading Screen Line 6 Message (Debrief LoadScreen Only) -$Host::LoadScreenMOTD1 = "Blaster is here to stay!"; //MOTD or Events Line 1 Message (Debrief LoadScreen Only) +$Host::LoadScreenLine3 = "Get Mappacks:"; //Loading screen Line 3 Topic +$Host::LoadScreenLine3_Msg = "playt2.com/mappacks"; //Loading Screen Line 3 Message +$Host::LoadScreenLine4 = "Server Location:"; //Loading screen Line 4 Topic +$Host::LoadScreenLine4_Msg = "Iowa"; //Loading Screen Line 4 Message +$Host::LoadScreenLine5 = "Server Hosted:"; //Loading screen Line 5 Topic (Debrief LoadScreen Only) +$Host::LoadScreenLine5_Msg = "Google Compute Engine"; //Loading Screen Line 5 Message (Debrief LoadScreen Only) +$Host::LoadScreenLine6 = "Server Github:"; //Loading screen Line 6 Topic (Debrief LoadScreen Only) +$Host::LoadScreenLine6_Msg = "https://github.com/ChocoTaco1/TacoServer"; //Loading Screen Line 6 Message (Debrief LoadScreen Only) +$Host::LoadScreenMOTD1 = "Celebrating 20 Years of Tribes2!"; //MOTD or Events Line 1 Message (Debrief LoadScreen Only) $Host::LoadScreenMOTD2 = "Come play Arena on Wednesday Nights!"; //MOTD or Events Line 2 Message (Debrief LoadScreen Only) $Host::LoadScreenMOTD3 = "Lak crowd early evenings after work during the week."; //MOTD or Events Line 3 Message (Debrief LoadScreen Only) $Host::LoadScreenMOTD4 = "Big CTF games Fridays, Saturdays, and Sundays!"; //MOTD or Events Line 4 Message (Debrief LoadScreen Only) @@ -159,7 +159,7 @@ $Host::ClassicChatLog = 1; $Host::ClassicChatLogPath = "logs/Chat/"; $Host::ClassicConnectLog = 1; $Host::ClassicConnLogPath = "logs/Connect/log.txt"; -$Host::ClassicMOTD = "Discord PUB\nServer Hosted/Provided by Branzone/Ravin\nGet Mappacks at https://playt2.com/"; +$Host::ClassicMOTD = "Discord PUB\nServer brought to you by Ravin and Choco\nCelebrating 20 Years of Tribes2!"; $Host::ClassicMOTDLines = 3; $Host::ClassicMOTDTime = 6; $Host::ClassicRotationCustom = 1; @@ -207,6 +207,8 @@ $Host::ClassicTeamKillLog = 1; $Host::ClassicTeamKillLogPath = "logs/TeamKills/teamkills.log"; //TeamKill Log Path $Host::ClassicDailyHardRestart = 0; //Enable/Disable Daily Hard Restart $Host::ClassicDailyHardRestartTime = "10\t00\tam"; //Hard Restart Server Time Ex:10am +$Host::LoadScreenShowLogo = 0; //Special Logo on LoadScreen +$Host::LoadScreenShowLogoName = "dpub/DPUB_logo"; //Logo location Filename //LakRabbit $Host::LakRabbitUnlimitedDJ = 1; //Unlimited disc-jumps if enabled