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

Update LakRabbitGame.cs

Browse source 
Took out disc jump restriction for duelmode and promode
Changed sound for the countdown timer
This commit is contained in:
ChocoTaco1 2020-06-26 13:59:17 -04:00
parent e382ec04f2
commit c8078e0016
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Classic/scripts/LakRabbitGame.cs
View file

@ -303,29 +303,29 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
if(%targetObject.invincible || %targetObject.getState() $= "Dead") if(%targetObject.invincible || %targetObject.getState() $= "Dead")
return; return;
// rabbit can't DJ in duel mode //rabbit can't DJ in duel mode
if(Game.duelMode && %targetObject.holdingFlag && %targetObject == %sourceObject // if(Game.duelMode && %targetObject.holdingFlag && %targetObject == %sourceObject
&& %damageType == $DamageType::Disc // && %damageType == $DamageType::Disc
&& getWord(%targetObject.getMuzzleVector(0),2) < -0.7 // && getWord(%targetObject.getMuzzleVector(0),2) < -0.7
&& !TestForMA(%sourceObject, 5)) // && !TestForMA(%sourceObject, 5))
{ // {
%sound = '~wfx/misc/missed.wav'; // %sound = '~wfx/misc/missed.wav';
%amount = 2.0; // %amount = 2.0;
%targetObject.blowup(); // %targetObject.blowup();
} // }
// Zeph - PubPro no DJ //Zeph - PubPro no DJ
if(Game.PubPro && %targetObject == %sourceObject // if(Game.PubPro && %targetObject == %sourceObject
&& %damageType == $DamageType::Disc // && %damageType == $DamageType::Disc
&& getWord(%targetObject.getMuzzleVector(0),2) < -0.7 // && getWord(%targetObject.getMuzzleVector(0),2) < -0.7
&& !TestForMA(%sourceObject, 5)) // && !TestForMA(%sourceObject, 5))
{ // {
%sound = '~wfx/misc/missed.wav'; // %sound = '~wfx/misc/missed.wav';
%amount = 2.0; // %amount = 2.0;
%targetObject.blowup(); // %targetObject.blowup();
%targetObject.scriptKill(); // %targetObject.scriptKill();
} // }
// hurting yourself, check for free DJ // hurting yourself, check for free DJ
if( isObject(%sourceObject) if( isObject(%sourceObject)
@ -1046,7 +1046,7 @@ function checkDuelTimer(%client)
if(%client.duelSeconds == 10 || %client.duelSeconds == 5 || %client.duelSeconds <= 3) if(%client.duelSeconds == 10 || %client.duelSeconds == 5 || %client.duelSeconds <= 3)
{ {
%plural = (%client.duelSeconds != 1 ? 's' : ""); %plural = (%client.duelSeconds != 1 ? 's' : "");
messageClient(%client, 'MsgDuelTimer', '\c4[Duel Mode] You have %1 second%2 to kill someone, or die!~wfx/misc/red_alert_short.wav', %client.duelSeconds, %plural); messageClient(%client, 'MsgDuelTimer', '\c4You have %1 second%2 to kill someone, or die!~wgui/launchMenuOver.wav', %client.duelSeconds, %plural);
} }
} }
} }