From 6dc602ad7cdd8168af7ba221ab1fa52bde30b874 Mon Sep 17 00:00:00 2001
From: FlaminSarge <FlaminSarge@users.noreply.github.com>
Date: Tue, 26 Apr 2016 20:18:34 -0700
Subject: [PATCH] Update TFCond and tf2_stocks enums (#499)
* Update tf2_stocks DmgCustom and TFWeapon defines
* Update tf2 TFCond defines
---
plugins/include/tf2.inc | 4 ++++
plugins/include/tf2_stocks.inc | 18 ++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc
index ecec0a93..6189d7cb 100644
--- a/plugins/include/tf2.inc
+++ b/plugins/include/tf2.inc
@@ -192,6 +192,10 @@ enum TFCond
TFCond_Plague,
TFCond_KingAura,
TFCond_SpawnOutline, //114
+ TFCond_KnockedIntoAir,
+ TFCond_CompetitiveWinner,
+ TFCond_CompetitiveLoser,
+ TFCond_NoTaunting,
};
const Float:TFCondDuration_Infinite = -1.0;
diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc
index 21dc13b4..b0a589cc 100644
--- a/plugins/include/tf2_stocks.inc
+++ b/plugins/include/tf2_stocks.inc
@@ -144,6 +144,21 @@ enum {
TF_CUSTOM_MERASMUS_DECAPITATION,
TF_CUSTOM_CANNONBALL_PUSH,
TF_CUSTOM_TAUNT_ALLCLASS_GUITAR_RIFF,
+ TF_CUSTOM_THROWABLE,
+ TF_CUSTOM_THROWABLE_KILL,
+ TF_CUSTOM_SPELL_TELEPORT,
+ TF_CUSTOM_SPELL_SKELETON,
+ TF_CUSTOM_SPELL_MIRV,
+ TF_CUSTOM_SPELL_METEOR,
+ TF_CUSTOM_SPELL_LIGHTNING,
+ TF_CUSTOM_SPELL_FIREBALL,
+ TF_CUSTOM_SPELL_MONOCULUS,
+ TF_CUSTOM_SPELL_BLASTJUMP,
+ TF_CUSTOM_SPELL_BATS,
+ TF_CUSTOM_SPELL_TINY,
+ TF_CUSTOM_KART,
+ TF_CUSTOM_GIANT_HAMMER,
+ TF_CUSTOM_RUNE_REFLECT,
};
// Weapon codes as used in some events, such as player_death
@@ -250,6 +265,9 @@ enum {
TF_WEAPON_SPELLBOOK_PROJECTILE,
TF_WEAPON_SNIPERRIFLE_CLASSIC,
TF_WEAPON_PARACHUTE,
+ TF_WEAPON_GRAPPLINGHOOK,
+ TF_WEAPON_PASSTIME_GUN,
+ TF_WEAPON_CHARGED_SMG,
};
// TF2 Weapon Loadout Slots