From 8888e88dc4243add0ea7a9c0b27a06cae8cb469f Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Mon, 10 Oct 2011 21:44:36 -0400 Subject: [PATCH] Updated tf2 inc files with more condition and custom dmg defs (bug 5118, r=asherkin). --- plugins/include/tf2.inc | 7 ++++--- plugins/include/tf2_stocks.inc | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index a81ca930..ae7c03dc 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -86,7 +86,8 @@ enum TFCond 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 @@ enum TFCond TFCond_MegaHeal, TFCond_RegenBuffed, TFCond_MarkedForDeath, - - TFCond_SpeedBuffAlly = 32, + TFCond_NoHealingDamageBuff, + TFCond_SpeedBuffAlly, TFCond_HalloweenCritCandy, TFCond_CritHype = 36, diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc index 4fe72916..81447f06 100644 --- a/plugins/include/tf2_stocks.inc +++ b/plugins/include/tf2_stocks.inc @@ -129,6 +129,7 @@ enum { 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