Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-07-14 15:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/NoEvo'

Browse source
This commit is contained in:
ChocoTaco1 2021-01-03 12:42:39 -05:00
commit ebce42a383
2 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Classic/scripts/LakRabbitGame.cs
View file

@ -19,6 +19,7 @@
// //
// v3.38 Nov 2020 // v3.38 Nov 2020
// Added Observer GameOver (Mainly for switching to CTF) // Added Observer GameOver (Mainly for switching to CTF)
// Added Missile Lak Fix
// //
// v3.37 Aug 2020 // v3.37 Aug 2020
// Nerfed Blaster damage (Less spam) // Nerfed Blaster damage (Less spam)
@ -662,6 +663,12 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
%sourceObject.client.totalChainHits++; %sourceObject.client.totalChainHits++;
} }
%weapon = "Chaingun"; %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 +716,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
{ {
missileEveryone(%sourceObject); missileEveryone(%sourceObject);
%sound = '~wfx/Bonuses/horz_straipass2_heist.wav'; %sound = '~wfx/Bonuses/horz_straipass2_heist.wav';
$LakRabbit::MissileHeistTime = getSimTime();
} }
else if(%points >= 100) else if(%points >= 100)
{ {

37
Classic/scripts/autoexec/zDebriefLoadingScreen.cs
View file

@ -60,6 +60,9 @@ $dtLoadingScreen::Delay = 0;
$dtLoadingScreen::ShowFullScreen = 0; $dtLoadingScreen::ShowFullScreen = 0;
// Enable/Disable Images // Enable/Disable Images
$dtLoadingScreen::ShowImages = 0; $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"; if( $Host::LoadScreenColor3 $= " " ) $Host::LoadScreenColor3 = "33CCCC";
// So ServerDefaults wont replace a "" value when meant to be blank // 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! // Keep it in a package to be neat and organized!
package LoadScreenPackage package LoadScreenPackage
@ -229,6 +235,27 @@ function ALTsendModInfoToClient(%client)
$dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " ";
$dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " ";
} }
else if($dtLoadingScreen::ShowLogo)
{
if(%client.dmpVersion $=$DMP::Version)
{
$dtLoadingScreen::LoadScreenMessage[$dmlP++] = "<bitmap:" @ $dtLoadingScreen::LogoName @ ">";
$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++] = "<lmargin:24><Font:univers:18><color:fd3b3b>!! This server uses the DMP Discord Map Pack !!";
$dtLoadingScreen::LoadScreenMessage[$dmlP++] = "<lmargin:24><Font:univers:18><color:fd3b3b>Get the latest here: <a:files.playt2.com/Mappacks>files.playt2.com/Mappacks</a>";
$dtLoadingScreen::LoadScreenMessage[$dmlP++] = " ";
}
}
// Full screen things // Full screen things
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -367,7 +394,7 @@ function NORMALsendModInfoToClient(%client)
if($Host::TimeLimit $= "999" || $Host::TimeLimit $= "unlimited") %timeloadingvar = "Unlimited"; else %timeloadingvar = $Host::TimeLimit; if($Host::TimeLimit $= "999" || $Host::TimeLimit $= "unlimited") %timeloadingvar = "Unlimited"; else %timeloadingvar = $Host::TimeLimit;
%time = "<color:" @ $Host::LoadScreenColor1 @ ">Time limit: <color:" @ $Host::LoadScreenColor2 @ ">" @ %timeloadingvar; %time = "<color:" @ $Host::LoadScreenColor1 @ ">Time limit: <color:" @ $Host::LoadScreenColor2 @ ">" @ %timeloadingvar;
%max = "<color:" @ $Host::LoadScreenColor1 @ ">Max players: <color:" @ $Host::LoadScreenColor2 @ ">" @ $Host::MaxPlayers; %max = "<color:" @ $Host::LoadScreenColor1 @ ">Max players: <color:" @ $Host::LoadScreenColor2 @ ">" @ $Host::MaxPlayers;
%net = "<color:" @ $Host::LoadScreenColor1 @ ">Packets Rate / Size: <color:" @ $Host::LoadScreenColor2 @ ">" @ $pref::Net::PacketRateToClient @ " / " @ $pref::Net::PacketSize; %net = "<color:" @ $Host::LoadScreenColor1 @ ">Packets Rate / Size: <color:" @ $Host::LoadScreenColor2 @ ">" @ $pref::Net::PacketRateToClient @ " / " @ $pref::Net::PacketSize;
%smurf = "<color:" @ $Host::LoadScreenColor1 @ ">Refuse smurfs: <color:" @ $Host::LoadScreenColor2 @ ">" @ ($Host::NoSmurfs ? "On" : "Off"); %smurf = "<color:" @ $Host::LoadScreenColor1 @ ">Refuse smurfs: <color:" @ $Host::LoadScreenColor2 @ ">" @ ($Host::NoSmurfs ? "On" : "Off");