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

Merged Flag Escort Fix

Browse source
This commit is contained in:
ChocoTaco 2020-03-16 12:52:20 -04:00
parent 2f319c4c1e
commit 5dfa92a067
2 changed files with 37 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,41 +0,0 @@
package FlagEscortFix
{
function CTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
%clAttacker.dmgdFlagTime = getSimTime();
}
function CTFGame::testEscortAssist(%game, %victimID, %killerID){
if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT)
return true;
return false;
}
function SCtFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
%clAttacker.dmgdFlagTime = getSimTime();
}
function SCtFGame::testEscortAssist(%game, %victimID, %killerID){
if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT)
return true;
return false;
}
function PracticeCTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
%clAttacker.dmgdFlagTime = getSimTime();
}
function PracticeCTFGame::testEscortAssist(%game, %victimID, %killerID){
if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT)
return true;
return false;
}
};
// Prevent package from being activated if it is already
if (!isActivePackage(FlagEscortFix))
activatePackage(FlagEscortFix);

42
Classic/scripts/autoexec/zDarkTigerStats.cs
View file

@ -6,8 +6,8 @@
// Version 2.0 - Code refactor / optimizing/fixes // Version 2.0 - Code refactor / optimizing/fixes
// Version 3.0 - DM / LCTF added // Version 3.0 - DM / LCTF added
// Version 4.0 - Code refactor / optimizing / fixes // Version 4.0 - Code refactor / optimizing / fixes
// Version 5.0 - DuleMod and Arena support / optimizing / fixes / misc stuff // Version 5.0 - DuleMod and Arena support / optimizing / fixes / misc stuff
// Version 6.0 - Lan & Bot Support / Leaderboard / Stats Storage Overhaul / Optimization / Fixes // Version 6.0 - Lan & Bot Support / Leaderboard / Stats Storage Overhaul / Optimization / Fixes
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//ChangeLog //ChangeLog
// 4.0 // 4.0
@ -1222,7 +1222,7 @@ package dtStats{
if(!$dtStats::Enable) if(!$dtStats::Enable)
parent::resetScore(%game, %client); parent::resetScore(%game, %client);
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function DefaultGame::forceObserver( %game, %client, %reason ){ function DefaultGame::forceObserver( %game, %client, %reason ){
parent::forceObserver( %game, %client, %reason ); parent::forceObserver( %game, %client, %reason );
if($dtStats::Enable){ if($dtStats::Enable){
@ -1246,7 +1246,7 @@ package dtStats{
} }
} }
} }
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
function DefaultGame::activatePackages(%game){ function DefaultGame::activatePackages(%game){
parent::activatePackages(%game); parent::activatePackages(%game);
if(isActivePackage(dtStatsGame)){ if(isActivePackage(dtStatsGame)){
@ -1262,7 +1262,39 @@ package dtStats{
if(isActivePackage(dtStatsGame)) if(isActivePackage(dtStatsGame))
deactivatePackage(dtStatsGame); deactivatePackage(dtStatsGame);
} }
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
// Flag Escort Fixes
function CTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
%clAttacker.dmgdFlagTime = getSimTime();
}
function CTFGame::testEscortAssist(%game, %victimID, %killerID){
if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT && %killerID.player.holdingFlag $= "")
return true;
return false;
}
function SCtFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
%clAttacker.dmgdFlagTime = getSimTime();
}
function SCtFGame::testEscortAssist(%game, %victimID, %killerID){
if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT && %killerID.player.holdingFlag $= "")
return true;
return false;
}
function PracticeCTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc){
parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc);
if ((%clVictim.player.holdingFlag !$= "") && (%clVictim.team != %clAttacker.team))
%clAttacker.dmgdFlagTime = getSimTime();
}
function PracticeCTFGame::testEscortAssist(%game, %victimID, %killerID){
if((getSimTime() - %victimID.dmgdFlagTime) < %game.TIME_CONSIDERED_FLAGCARRIER_THREAT && %killerID.player.holdingFlag $= "")
return true;
return false;
}
//////////////////////////////////////////////////////////////////////////////////
}; };
//helps with game types that override functions and dont use parent //helps with game types that override functions and dont use parent
// that way we get called first then the gametype can do whatever // that way we get called first then the gametype can do whatever