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

Remove tourny restrictions

Browse source
This commit is contained in:
ChocoTaco 2022-02-15 19:41:11 -05:00
parent 640af0ad53
commit d976900efc
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Classic/scripts/CTFGame.cs
View file

@ -466,7 +466,7 @@ function CTFGame::playerTouchEnemyFlag(%game, %player, %flag)
if (%startStalemate) if (%startStalemate)
%game.stalemateSchedule = %game.schedule(%game.stalemateTimeMS, beginStalemate); %game.stalemateSchedule = %game.schedule(%game.stalemateTimeMS, beginStalemate);
if($Host::ClassicEvoStats && !$Host::TournamentMode) if($Host::ClassicEvoStats)
{ {
$stats::grabs[%client]++; $stats::grabs[%client]++;
if($stats::grabs[%client] > $stats::grabs_counter) if($stats::grabs[%client] > $stats::grabs_counter)
@ -480,7 +480,7 @@ function CTFGame::playerTouchEnemyFlag(%game, %player, %flag)
%game.totalFlagHeldTime[%flag] = getSimTime(); %game.totalFlagHeldTime[%flag] = getSimTime();
} }
if($Host::ClassicEvoStats && !%player.flagStatsWait && !$Host::TournamentMode) if($Host::ClassicEvoStats && !%player.flagStatsWait)
{ {
// get the grab speed // get the grab speed
%grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6); %grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6);

4
Classic/scripts/SCtFGame.cs
View file

@ -693,7 +693,7 @@ function SCtFGame::playerTouchEnemyFlag(%game, %player, %flag)
if (%startStalemate) if (%startStalemate)
%game.stalemateSchedule = %game.schedule(%game.stalemateTimeMS, beginStalemate); %game.stalemateSchedule = %game.schedule(%game.stalemateTimeMS, beginStalemate);
if($Host::ClassicEvoStats && !$Host::TournamentMode) if($Host::ClassicEvoStats)
{ {
$stats::grabs[%client]++; $stats::grabs[%client]++;
if($stats::grabs[%client] > $stats::grabs_counter) if($stats::grabs[%client] > $stats::grabs_counter)
@ -707,7 +707,7 @@ function SCtFGame::playerTouchEnemyFlag(%game, %player, %flag)
%game.totalFlagHeldTime[%flag] = getSimTime(); %game.totalFlagHeldTime[%flag] = getSimTime();
} }
if($Host::ClassicEvoStats && !%player.flagStatsWait && !$Host::TournamentMode) if($Host::ClassicEvoStats && !%player.flagStatsWait)
{ {
// get the grab speed // get the grab speed
%grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6); %grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6);

6
Classic/scripts/autoexec/EvoStats.cs
View file

@ -30,7 +30,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
{ {
Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC); Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
// call the function // call the function
if(!$Host::TournamentMode && $Host::ClassicEvoStats) if($Host::ClassicEvoStats)
handleDamageStat(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC); handleDamageStat(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
} }
@ -38,7 +38,7 @@ function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %
{ {
Parent::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation); Parent::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation);
// call the function // call the function
if(!$Host::TournamentMode && $Host::ClassicEvoStats) if($Host::ClassicEvoStats)
handleKillStat(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation); handleKillStat(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation);
} }
@ -47,7 +47,7 @@ function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifie
if(isObject(%targetObject)) // Console spam fix. if(isObject(%targetObject)) // Console spam fix.
{ {
// call the function // call the function
if(!$Host::TournamentMode && $Host::ClassicEvoStats) if($Host::ClassicEvoStats)
handleMAStat(%data, %projectile, %targetObject, %modifier, %position, %normal); handleMAStat(%data, %projectile, %targetObject, %modifier, %position, %normal);
} }
Parent::onCollision( %data, %projectile, %targetObject, %modifier, %position, %normal ); Parent::onCollision( %data, %projectile, %targetObject, %modifier, %position, %normal );

8
Classic/scripts/defaultGame.cs
View file

@ -772,7 +772,7 @@ function DefaultGame::sendDebriefing( %game, %client )
} }
} }
if($Host::ClassicEvoStats) if($Host::ClassicEvoStats && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
sendEvoDebriefing(%client); sendEvoDebriefing(%client);
} }
@ -1751,7 +1751,7 @@ function DefaultGame::clientMissionDropReady(%game, %client)
//displayObserverHud( %client, 0 ); //displayObserverHud( %client, 0 );
// Eolk - flag stats stuff // Eolk - flag stats stuff
//updateObserverFlyHud(%client); //updateObserverFlyHud(%client);
if($Host::ClassicEvoStats && $CurrentMissionType $= "CTF") if($Host::ClassicEvoStats && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
schedule(10000, %client, updateObserverFlyHud, %client); schedule(10000, %client, updateObserverFlyHud, %client);
} }
@ -1774,7 +1774,7 @@ function DefaultGame::clientMissionDropReady(%game, %client)
} }
} }
if( $Host::ClassicEvoStats && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF") ) if( $Host::ClassicEvoStats && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
{ {
%nickTeam1 = ($flagstats::heldTeam1 ? $flagstats::nickTeam1 : "N/A"); %nickTeam1 = ($flagstats::heldTeam1 ? $flagstats::nickTeam1 : "N/A");
%realTeam1 = ($flagstats::heldTeam1 ? $flagstats::realTeam1 : "N/A"); %realTeam1 = ($flagstats::heldTeam1 ? $flagstats::realTeam1 : "N/A");
@ -1833,7 +1833,7 @@ function DefaultGame::clientMissionDropReady(%game, %client)
if(isEventPending(%client.okschedule)) if(isEventPending(%client.okschedule))
cancel(%client.okschedule); cancel(%client.okschedule);
%time = $Host::KickObserverTimeout; %time = $Host::KickObserverTimeout;
//%time = ($Host::KickObserverTimeout) + ($Host::KickObserverTimeout/2); //%time = ($Host::KickObserverTimeout) + ($Host::KickObserverTimeout/2);
//%minutes = %time / 60; //%minutes = %time / 60;
//messageClient(%client, 'MsgNoObservers', '\c2You have %1 minutes to join the game or you will be kicked.', %minutes); //messageClient(%client, 'MsgNoObservers', '\c2You have %1 minutes to join the game or you will be kicked.', %minutes);