# HG changeset patch
# User Nicholas Hastings <skamonkey@gmail.com>
# Date 1318297476 14400
# Node ID 268844cefc10f3c1ffe377f8d831d8c48cf6247e
# Parent  feacbc05450239eed3e442a3545ba81d927d77c6
Updated tf2 inc files with more condition and custom dmg defs (bug 5118, r=asherkin).

diff -r feacbc054502 -r 268844cefc10 plugins/include/tf2.inc
--- a/plugins/include/tf2.inc	Mon Oct 10 16:02:44 2011 -0400
+++ b/plugins/include/tf2.inc	Mon Oct 10 21:44:36 2011 -0400
@@ -86,7 +86,8 @@
 	TFCond_CloakFlicker = 9,
 	TFCond_Teleporting,
 	TFCond_Kritzkrieged,
-	TFCond_Unknown2,
+	TFCond_Unknown2, //12
+	TFCond_TmpDamageBonus = 12,
 	TFCond_DeadRingered,
 	TFCond_Bonked,
 	TFCond_Dazed,
@@ -105,8 +106,8 @@
 	TFCond_MegaHeal,
 	TFCond_RegenBuffed,
 	TFCond_MarkedForDeath,
-	
-	TFCond_SpeedBuffAlly = 32,
+	TFCond_NoHealingDamageBuff,
+	TFCond_SpeedBuffAlly,
 	TFCond_HalloweenCritCandy,
 	
 	TFCond_CritHype = 36,
diff -r feacbc054502 -r 268844cefc10 plugins/include/tf2_stocks.inc
--- a/plugins/include/tf2_stocks.inc	Mon Oct 10 16:02:44 2011 -0400
+++ b/plugins/include/tf2_stocks.inc	Mon Oct 10 21:44:36 2011 -0400
@@ -129,6 +129,7 @@
 	TF_CUSTOM_PLASMA,
 	TF_CUSTOM_PLASMA_CHARGED,
 	TF_CUSTOM_PLASMA_GIB,
+	TF_CUSTOM_PRACTICE_STICKY,
 };
 
 // Weapon codes as used in some events, such as player_death