diff --git a/Classic/scripts/autoexec/EnableLogs.cs b/Classic/scripts/autoexec/EnableLogs.cs index 9587726..e7fd6df 100755 --- a/Classic/scripts/autoexec/EnableLogs.cs +++ b/Classic/scripts/autoexec/EnableLogs.cs @@ -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] "; diff --git a/Classic/scripts/autoexec/MissionTypeOptions.cs b/Classic/scripts/autoexec/MissionTypeOptions.cs index e5bf44d..02dc2bb 100644 --- a/Classic/scripts/autoexec/MissionTypeOptions.cs +++ b/Classic/scripts/autoexec/MissionTypeOptions.cs @@ -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; diff --git a/Classic/scripts/autoexec/TKwarn.cs b/Classic/scripts/autoexec/TKwarn.cs index beb07ea..d53b5a3 100755 --- a/Classic/scripts/autoexec/TKwarn.cs +++ b/Classic/scripts/autoexec/TKwarn.cs @@ -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