From 4e039dd1959f1a4e95f763c8475537238e4d5172 Mon Sep 17 00:00:00 2001
From: ChocoTaco <boldfilter@zoho.com>
Date: Thu, 30 Sep 2021 16:22:55 -0400
Subject: [PATCH] Allow TKlogs to know damageType

---
 Classic/scripts/CTFGame.cs             | 2 +-
 Classic/scripts/SCtFGame.cs            | 2 +-
 Classic/scripts/autoexec/EnableLogs.cs | 7 +++++--
 Classic/scripts/autoexec/TKwarn.cs     | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 Classic/scripts/CTFGame.cs
 mode change 100644 => 100755 Classic/scripts/SCtFGame.cs

diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs
old mode 100644
new mode 100755
index 5ac35f8..ccba498
--- a/Classic/scripts/CTFGame.cs
+++ b/Classic/scripts/CTFGame.cs
@@ -1213,7 +1213,7 @@ function CTFGame::updateKillScores(%game, %clVictim, %clKiller, %damageType, %im
       }
       else
       {
-         if (%game.testTeamKill(%clVictim, %clKiller)) //otherwise test for a teamkill
+         if (%game.testTeamKill(%clVictim, %clKiller, %damageType)) //otherwise test for a teamkill
             %game.awardScoreTeamKill(%clVictim, %clKiller);
       }
    }        
diff --git a/Classic/scripts/SCtFGame.cs b/Classic/scripts/SCtFGame.cs
old mode 100644
new mode 100755
index c709310..b4b940a
--- a/Classic/scripts/SCtFGame.cs
+++ b/Classic/scripts/SCtFGame.cs
@@ -1316,7 +1316,7 @@ function SCtFGame::updateKillScores(%game, %clVictim, %clKiller, %damageType, %i
       }
       else
       {
-         if (%game.testTeamKill(%clVictim, %clKiller)) //otherwise test for a teamkill
+         if (%game.testTeamKill(%clVictim, %clKiller, %damageType)) //otherwise test for a teamkill
             %game.awardScoreTeamKill(%clVictim, %clKiller);
       }
    }        
diff --git a/Classic/scripts/autoexec/EnableLogs.cs b/Classic/scripts/autoexec/EnableLogs.cs
index eae4204..670e275 100755
--- a/Classic/scripts/autoexec/EnableLogs.cs
+++ b/Classic/scripts/autoexec/EnableLogs.cs
@@ -158,7 +158,7 @@ function ClassicChatLog(%client, %id, %team, %msg)
 }
 
 // Log Teamkills
-function teamkillLog(%victimID, %killerID)
+function teamkillLog(%victimID, %killerID, %damageType)
 {
    if(!$Host::ClassicTeamKillLog)
       return;
@@ -166,6 +166,9 @@ function teamkillLog(%victimID, %killerID)
    if(!$CurrentMissionType $= "CTF" && !$CurrentMissionType $= "SCTF")
       return;
 
+   //damageType
+   %type = getTaggedString($DamageTypeText[%damageType]);
+
    //Killer tks / Victim tks
    //Note: %killerID.teamkills + 1 as this is added later
    //Tks For this map only
@@ -184,7 +187,7 @@ function teamkillLog(%victimID, %killerID)
          %s = "[Kicked] ";
    }
    
-   $teamkillLog = formatTimeString("M-d") SPC formatTimeString("[hh:nn:a]") SPC %s @ %killerID.nameBase @ "(" @ %killerID.guid @ ")[" @ %ktk @ " tk] teamkilled" SPC %victimID.nameBase @ "[" @ %vtk @ " tk]. #P[" @ $HostGamePlayerCount @ "]" SPC "CM[" @ $CurrentMission @ "]";
+   $teamkillLog = formatTimeString("M-d") SPC formatTimeString("[hh:nn:a]") SPC %s @ %killerID.nameBase @ "(" @ %killerID.guid @ ")[" @ %type @ "][" @ %ktk @ " tk] teamkilled" SPC %victimID.nameBase @ "[" @ %vtk @ " tk]. #P[" @ $HostGamePlayerCount @ "]" SPC "CM[" @ $CurrentMission @ "]";
    $teamkillLog = stripChars($teamkillLog, "\c0\c1\c2\c3\c4\c5\c6\c7\c8\c9\x10\x11\co\cp");
 
 	%logpath = $Host::ClassicTeamKillLogPath;
diff --git a/Classic/scripts/autoexec/TKwarn.cs b/Classic/scripts/autoexec/TKwarn.cs
index a1976a9..beb07ea 100755
--- a/Classic/scripts/autoexec/TKwarn.cs
+++ b/Classic/scripts/autoexec/TKwarn.cs
@@ -4,7 +4,7 @@ package TKwarn
 {
 
 // From Evo
-function DefaultGame::testTeamKill(%game, %victimID, %killerID)
+function DefaultGame::testTeamKill(%game, %victimID, %killerID, %damageType)
 { 
    if(!$countdownStarted && !$MatchStarted)
       return;
@@ -18,7 +18,7 @@ function DefaultGame::testTeamKill(%game, %victimID, %killerID)
      return true;
 
    // Log TeamKill
-   teamkillLog(%victimID, %killerID);
+   teamkillLog(%victimID, %killerID, %damageType);
   
    // No Admins
    if(%killerID.isAdmin)
@@ -92,7 +92,7 @@ function TKkick( %client, %admin, %guid )
                if ( isObject( %cl ) )
                {
                   %client.setDisconnectReason( "You have been kicked out of the game for teamkilling." ); // z0dd - ZOD, 7/13/03. Tell who kicked
-	              %cl.schedule(700, "delete");
+	               %cl.schedule(700, "delete");
                }
 			 // ban by IP as well
 	         BanList::add( %guid, %client.getAddress(), $Host::KickBanTime );