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

Added Speedgrab

Browse source
This commit is contained in:
ChocoTaco1 2020-03-24 23:13:46 -04:00
parent 0af69a7df7
commit 1d166ca1ff
2 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Classic/scripts/CTFGame.cs
View file

@ -507,11 +507,12 @@ function CTFGame::playerTouchEnemyFlag(%game, %player, %flag)
if($Host::ClassicEvoStats && !%player.flagStatsWait && !$Host::TournamentMode) if($Host::ClassicEvoStats && !%player.flagStatsWait && !$Host::TournamentMode)
{ {
%grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6); // get the grab speed
%grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6);
if(%grabspeed > $stats::MaxGrabSpeed || ($stats::MaxGrabSpeed $= "")) if(%grabspeed > $stats::MaxGrabSpeed || ($stats::MaxGrabSpeed $= ""))
{ {
$stats::MaxGrabSpeed = %grabspeed; $stats::MaxGrabSpeed = %grabspeed;
$stats::Grabber = getTaggedString(%client.name); $stats::Grabber = getTaggedString(%client.name);
} }
} }
@ -524,11 +525,22 @@ function CTFGame::playerTouchEnemyFlag(%game, %player, %flag)
$flagStatus[%flag.team] = %client.nameBase; $flagStatus[%flag.team] = %client.nameBase;
%teamName = %game.getTeamName(%flag.team); %teamName = %game.getTeamName(%flag.team);
messageTeamExcept(%client, 'MsgCTFFlagTaken', '\c2Teammate %1 took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase);
messageTeam(%flag.team, 'MsgCTFFlagTaken', '\c2Your flag has been taken by %1!~wfx/misc/flag_taken.wav',%client.name, 0, %flag.team, %client.nameBase); if(%grabspeed)
messageTeam(0, 'MsgCTFFlagTaken', '\c2%1 took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase); {
messageClient(%client, 'MsgCTFFlagTaken', '\c2You took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase); messageTeamExcept(%client, 'MsgCTFFlagTaken', '\c2Teammate %1 took the %2 flag. (speed: %5Kph)~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase, %grabspeed);
logEcho(%client.nameBase@" (pl "@%player@"/cl "@%client@") took team "@%flag.team@" flag ("@%grabspeed@")"); // MP: 6/15/2011 added grabspeed. messageTeam(%flag.team, 'MsgCTFFlagTaken', '\c2Your flag has been taken by %1! (speed: %5Kph)~wfx/misc/flag_taken.wav',%client.name, 0, %flag.team, %client.nameBase, %grabspeed);
messageTeam(0, 'MsgCTFFlagTaken', '\c2%1 took the %2 flag. (speed: %5Kph)~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase, %grabspeed);
messageClient(%client, 'MsgCTFFlagTaken', '\c2You took the %2 flag. (speed: %5Kph)~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase, %grabspeed);
}
else
{
messageTeamExcept(%client, 'MsgCTFFlagTaken', '\c2Teammate %1 took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase);
messageTeam(%flag.team, 'MsgCTFFlagTaken', '\c2Your flag has been taken by %1!~wfx/misc/flag_taken.wav',%client.name, 0, %flag.team, %client.nameBase);
messageTeam(0, 'MsgCTFFlagTaken', '\c2%1 took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase);
messageClient(%client, 'MsgCTFFlagTaken', '\c2You took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase);
}
logEcho(%client.nameBase @ " (pl " @ %player @ "/cl " @ %client @ ") took team " @ %flag.team @ " flag");
//call the AI function //call the AI function
%game.AIplayerTouchEnemyFlag(%player, %flag); %game.AIplayerTouchEnemyFlag(%player, %flag);

40
Classic/scripts/SCtFGame.cs
View file

@ -349,19 +349,7 @@ package SCtFGame
//Take out anything vehicle related //Take out anything vehicle related
function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC) function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC)
{ {
//echo("working");
//Other armors get more damage
if(%targetObject.client.armor $= "Medium")
{
%amount *= 1.3;
}
if(%targetObject.client.armor $= "Heavy")
{
%amount *= 1.5;
}
//error("Armor::damageObject( "@%data@", "@%targetObject@", "@%sourceObject@", "@%position@", "@%amount@", "@%damageType@", "@%momVec@" )"); //error("Armor::damageObject( "@%data@", "@%targetObject@", "@%sourceObject@", "@%position@", "@%amount@", "@%damageType@", "@%momVec@" )");
if(%targetObject.invincible || %targetObject.getState() $= "Dead") if(%targetObject.invincible || %targetObject.getState() $= "Dead")
return; return;
@ -798,11 +786,12 @@ function SCtFGame::playerTouchEnemyFlag(%game, %player, %flag)
if($Host::ClassicEvoStats && !%player.flagStatsWait && !$Host::TournamentMode) if($Host::ClassicEvoStats && !%player.flagStatsWait && !$Host::TournamentMode)
{ {
%grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6); // get the grab speed
%grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6);
if(%grabspeed > $stats::MaxGrabSpeed || ($stats::MaxGrabSpeed $= "")) if(%grabspeed > $stats::MaxGrabSpeed || ($stats::MaxGrabSpeed $= ""))
{ {
$stats::MaxGrabSpeed = %grabspeed; $stats::MaxGrabSpeed = %grabspeed;
$stats::Grabber = getTaggedString(%client.name); $stats::Grabber = getTaggedString(%client.name);
} }
} }
@ -815,11 +804,22 @@ function SCtFGame::playerTouchEnemyFlag(%game, %player, %flag)
$flagStatus[%flag.team] = %client.nameBase; $flagStatus[%flag.team] = %client.nameBase;
%teamName = %game.getTeamName(%flag.team); %teamName = %game.getTeamName(%flag.team);
messageTeamExcept(%client, 'MsgCTFFlagTaken', '\c2Teammate %1 took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase);
messageTeam(%flag.team, 'MsgCTFFlagTaken', '\c2Your flag has been taken by %1!~wfx/misc/flag_taken.wav',%client.name, 0, %flag.team, %client.nameBase); if(%grabspeed)
messageTeam(0, 'MsgCTFFlagTaken', '\c2%1 took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase); {
messageClient(%client, 'MsgCTFFlagTaken', '\c2You took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase); messageTeamExcept(%client, 'MsgCTFFlagTaken', '\c2Teammate %1 took the %2 flag. (speed: %5Kph)~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase, %grabspeed);
logEcho(%client.nameBase@" (pl "@%player@"/cl "@%client@") took team "@%flag.team@" flag"); messageTeam(%flag.team, 'MsgCTFFlagTaken', '\c2Your flag has been taken by %1! (speed: %5Kph)~wfx/misc/flag_taken.wav',%client.name, 0, %flag.team, %client.nameBase, %grabspeed);
messageTeam(0, 'MsgCTFFlagTaken', '\c2%1 took the %2 flag. (speed: %5Kph)~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase, %grabspeed);
messageClient(%client, 'MsgCTFFlagTaken', '\c2You took the %2 flag. (speed: %5Kph)~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase, %grabspeed);
}
else
{
messageTeamExcept(%client, 'MsgCTFFlagTaken', '\c2Teammate %1 took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase);
messageTeam(%flag.team, 'MsgCTFFlagTaken', '\c2Your flag has been taken by %1!~wfx/misc/flag_taken.wav',%client.name, 0, %flag.team, %client.nameBase);
messageTeam(0, 'MsgCTFFlagTaken', '\c2%1 took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase);
messageClient(%client, 'MsgCTFFlagTaken', '\c2You took the %2 flag.~wfx/misc/flag_snatch.wav', %client.name, %teamName, %flag.team, %client.nameBase);
}
logEcho(%client.nameBase @ " (pl " @ %player @ "/cl " @ %client @ ") took team " @ %flag.team @ " flag");
//call the AI function //call the AI function
%game.AIplayerTouchEnemyFlag(%player, %flag); %game.AIplayerTouchEnemyFlag(%player, %flag);