From b2a5890e240ca21644424f548b6e59087d929523 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sat, 26 Dec 2020 12:33:42 -0500 Subject: [PATCH 1/4] Server Logo/DMP Version check --- .../scripts/autoexec/zDebriefLoadingScreen.cs | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs index 00506fd..85e54df 100644 --- a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs +++ b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs @@ -60,6 +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"; @@ -70,14 +73,17 @@ if( $Host::LoadScreenColor2 $= " " ) $Host::LoadScreenColor2 = "29DEE7"; if( $Host::LoadScreenColor3 $= " " ) $Host::LoadScreenColor3 = "33CCCC"; // So ServerDefaults wont replace a "" value when meant to be blank -for(%x = 1; %x <= 4; %x++) +function DLSBlank() { - if( $Host::LoadScreenMOTD[%x] $= "") + for(%x = 1; %x <= 4; %x++) { - $Host::LoadScreenMOTD[%x] = " "; + if( $Host::LoadScreenMOTD[%x] $= "") + { + $Host::LoadScreenMOTD[%x] = " "; + } } } - +DLSBlank(); // Keep it in a package to be neat and organized! package LoadScreenPackage @@ -229,6 +235,27 @@ function ALTsendModInfoToClient(%client) $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; } + else if($dtLoadingScreen::ShowLogo) + { + if(%client.dmpVersion $=$DMP::Version) + { + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = ""; + + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + } + else if(%client.dmpVersion $="" || %client.dmpVersion < $DMP::Version) + { + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "!! This server uses the DMP Discord Map Pack !!"; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "Get the latest here: files.playt2.com/Testing"; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + } + } // Full screen things //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -367,7 +394,7 @@ function NORMALsendModInfoToClient(%client) if($Host::TimeLimit $= "999" || $Host::TimeLimit $= "unlimited") %timeloadingvar = "Unlimited"; else %timeloadingvar = $Host::TimeLimit; %time = "Time limit: " @ %timeloadingvar; - %max = "Max players: " @ $Host::MaxPlayers; + %max = "Max players: " @ $Host::MaxPlayers; %net = "Packets Rate / Size: " @ $pref::Net::PacketRateToClient @ " / " @ $pref::Net::PacketSize; %smurf = "Refuse smurfs: " @ ($Host::NoSmurfs ? "On" : "Off"); From 310d117d26f3adb7eeafd317fecef20c759157d4 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 28 Dec 2020 18:10:43 -0500 Subject: [PATCH 2/4] Update zDebriefLoadingScreen.cs --- Classic/scripts/autoexec/zDebriefLoadingScreen.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs index 85e54df..ea903fd 100644 --- a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs +++ b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs @@ -252,7 +252,7 @@ function ALTsendModInfoToClient(%client) { $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "!! This server uses the DMP Discord Map Pack !!"; - $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "Get the latest here: files.playt2.com/Testing"; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "Get the latest here: files.playt2.com/Mappacks"; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; } } From fba059820e0d19debe3baddbead472a173781a6a Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Wed, 30 Dec 2020 12:48:13 -0500 Subject: [PATCH 3/4] Lak Missile Fix --- Classic/scripts/LakRabbitGame.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs index 83821f2..23df4da 100644 --- a/Classic/scripts/LakRabbitGame.cs +++ b/Classic/scripts/LakRabbitGame.cs @@ -662,6 +662,12 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am %sourceObject.client.totalChainHits++; } %weapon = "Chaingun"; + case $DamageType::Missile: + // doesn't matter if it's MA + %ma = 0; + if((getSimTime() - $LakRabbit::MissileHeistTime > 10000) || !$LakRabbit::MissileHeistTime) + return; + %weapon = "Missile"; } } @@ -709,6 +715,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am { missileEveryone(%sourceObject); %sound = '~wfx/Bonuses/horz_straipass2_heist.wav'; + $LakRabbit::MissileHeistTime = getSimTime(); } else if(%points >= 100) { From aac90d5408ea80c07c3bf749436893733b68f59b Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Wed, 30 Dec 2020 13:28:38 -0500 Subject: [PATCH 4/4] Update LakRabbitGame.cs --- Classic/scripts/LakRabbitGame.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs index 23df4da..939a0a9 100644 --- a/Classic/scripts/LakRabbitGame.cs +++ b/Classic/scripts/LakRabbitGame.cs @@ -19,6 +19,7 @@ // // v3.38 Nov 2020 // Added Observer GameOver (Mainly for switching to CTF) +// Added Missile Lak Fix // // v3.37 Aug 2020 // Nerfed Blaster damage (Less spam)