Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-01-20 00:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update FlagEscortFix.cs

Browse source
This commit is contained in:
ChocoTaco 2020-02-29 15:45:07 -05:00
parent e1b047e1ac
commit 52ca4b60c1
1 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Classic/scripts/autoexec/FlagEscortFix.cs
View file

@ -1,48 +1,41 @@
package FlagEscortFix package FlagEscortFix
{ {
function CTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc) function CTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
{
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc); parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
//if victim is carrying a flag and is not on the attackers team, mark the attacker as a threat for x seconds(for scoring purposes)
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team)) if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
{ %clAttacker.dmgdFlagTime = getSimTime();
%clAttacker.dmgdFlagCarrier = true; }
cancel(%clAttacker.threatTimer); //restart timer function CTFGame::testEscortAssist(%game, %victimID, %killerID){
%clAttacker.threatTimer = schedule(%game.TIME_CONSIDERED_FLAGCARRIER_THREAT,0,"dmgFlagReset",%clAttacker); if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT)
} return true;
return false;
} }
function SCtFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc) function SCtFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
{
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc); parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
//if victim is carrying a flag and is not on the attackers team, mark the attacker as a threat for x seconds(for scoring purposes)
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team)) if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
{ %clAttacker.dmgdFlagTime = getSimTime();
%clAttacker.dmgdFlagCarrier = true; }
cancel(%clAttacker.threatTimer); //restart timer function SCtFGame::testEscortAssist(%game, %victimID, %killerID){
%clAttacker.threatTimer = schedule(%game.TIME_CONSIDERED_FLAGCARRIER_THREAT,0,"dmgFlagReset",%clAttacker); if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT)
} return true;
return false;
} }
function PracticeCTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc) function PracticeCTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
{
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc); parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
//if victim is carrying a flag and is not on the attackers team, mark the attacker as a threat for x seconds(for scoring purposes)
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team)) if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
{ %clAttacker.dmgdFlagTime = getSimTime();
%clAttacker.dmgdFlagCarrier = true; }
cancel(%clAttacker.threatTimer); //restart timer function PracticeCTFGame::testEscortAssist(%game, %victimID, %killerID){
%clAttacker.threatTimer = schedule(%game.TIME_CONSIDERED_FLAGCARRIER_THREAT,0,"dmgFlagReset",%clAttacker); if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT)
} return true;
return false;
} }
}; };
function dmgFlagReset(%clAttacker){
%clAttacker.dmgdFlagCarrier = false;
}
// Prevent package from being activated if it is already // Prevent package from being activated if it is already
if (!isActivePackage(FlagEscortFix)) if (!isActivePackage(FlagEscortFix))
activatePackage(FlagEscortFix); activatePackage(FlagEscortFix);