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

Various Tournament mode fixes

Browse source 
-Issues with antipack not turning off in tournament mode
-No teamkill warnings in tournament mode
This commit is contained in:
ChocoTaco 2022-01-19 12:46:10 -05:00
parent 7063b5f09d
commit 4f5b21dc6c
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classic/scripts/autoexec/EnableLogs.cs
View file

@ -37,7 +37,7 @@ function connectLog(%client, %isDisconnect)
{
// get the client info
%authInfo = %client.getAuthInfo();
%ip = getField(strreplace(%client.getAddress(),":","\t"),1);
%ip = getField(strreplace(%client.getAddress(),":","\t"),1);
// net tournament client present?
if (!%client.t2csri_sentComCertDone)
@ -177,7 +177,7 @@ function teamkillLog(%victimID, %killerID, %damageType)
//Stage in warnings
%s = "";
if(!%killerID.isAdmin) //Admins dont get warnings
if(!%killerID.isAdmin && !$Host::TournamentMode) //Admins dont get warnings. No warnings in Tournament Mode
{
if(%ktk >= $Host::TKWarn1 && %ktk < $Host::TKWarn2)
%s = "[Warned] ";

14
Classic/scripts/autoexec/MissionTypeOptions.cs
View file

@ -52,6 +52,20 @@ function loadMissionStage2()
$Host::HiVisibility = "0"; //always SPEED
}
//Disable Antipack in tournament mode
if($Host::TournamentMode)
{
if($InvBanList[CTF, "CloakingPack"])
$InvBanList[CTF, "CloakingPack"] = 0;
if(isActivePackage(AntiPackCloak))
deactivatePackage(AntiPackCloak);
if($InvBanList[CTF, "ShieldPack"])
$InvBanList[CTF, "ShieldPack"] = 0;
if(isActivePackage(AntiPackShield))
deactivatePackage(AntiPackShield);
}
//Siege NoBaseRape Fix
if($CurrentMissionType $= "Siege")
$Host::NoBaseRapeEnabled = 0;

10
Classic/scripts/autoexec/TKwarn.cs
View file

@ -14,18 +14,22 @@ function DefaultGame::testTeamKill(%game, %victimID, %killerID, %damageType)
return false; // is not a tk
// No Bots
if(%killerID.isAIcontrolled() || %victimID.isAIcontrolled())
return true;
//if(%killerID.isAIcontrolled() || %victimID.isAIcontrolled())
// return true;
// Log TeamKill
teamkillLog(%victimID, %killerID, %damageType);
//No warnings in tournament mode
if($Host::TournamentMode)
return true;
// No Admins
if(%killerID.isAdmin)
return true;
// Ignore this map
if($CurrentMission $= "Mac_FlagArena" || $CurrentMission $= "Machineeggs" || $CurrentMission $= "DMP_SimpleFlagArena")
if($CurrentMission $= "Mac_FlagArena" || $CurrentMission $= "Machineeggs")
return true;
// warn the player of the imminent kick vote