From 7fb57a4064db3f0566679473cdd25429abeab8b5 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 30 Sep 2010 23:40:42 -0400 Subject: [PATCH] Updated TF2 includes with more defined identifiers (bug 4640, r=dvander). --- plugins/include/tf2.inc | 4 +- plugins/include/tf2_stocks.inc | 130 +++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-) diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index 6246ccc5..1c6e36e6 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -98,7 +98,9 @@ enum TFCond TFCond_OnFire = 22, TFCond_Overhealed, TFCond_Jarated, - TFCond_Bleeding + TFCond_Bleeding, + TFCond_DefenseBuffed, + TFCond_Milked }; enum TFHoliday diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc index 2a0b8758..fe64473a 100644 --- a/plugins/include/tf2_stocks.inc +++ b/plugins/include/tf2_stocks.inc @@ -62,6 +62,8 @@ #define TF_CONDFLAG_OVERHEALED (1 << 23) #define TF_CONDFLAG_JARATED (1 << 24) #define TF_CONDFLAG_BLEEDING (1 << 25) +#define TF_CONDFLAG_DEFENSEBUFFED (1 << 26) +#define TF_CONDFLAG_MILKED (1 << 27) #define TF_DEATHFLAG_KILLERDOMINATION (1 << 0) #define TF_DEATHFLAG_ASSISTERDOMINATION (1 << 1) @@ -70,6 +72,134 @@ #define TF_DEATHFLAG_FIRSTBLOOD (1 << 4) #define TF_DEATHFLAG_DEADRINGER (1 << 5) +// Custom kill identifiers for the customkill property on the player_death event +enum { + TF_DMG_CUSTOM_HEADSHOT = 1, + TF_DMG_CUSTOM_BACKSTAB, + TF_DMG_CUSTOM_BURNING, + TF_DMG_WRENCH_FIX, + TF_DMG_CUSTOM_MINIGUN, + TF_DMG_CUSTOM_SUICIDE, + TF_DMG_CUSTOM_TAUNTATK_HADOUKEN, + TF_DMG_CUSTOM_BURNING_FLARE, + TF_DMG_CUSTOM_TAUNTATK_HIGH_NOON, + TF_DMG_CUSTOM_TAUNTATK_GRAND_SLAM, + TF_DMG_CUSTOM_PENETRATE_MY_TEAM, + TF_DMG_CUSTOM_PENETRATE_ALL_PLAYERS, + TF_DMG_CUSTOM_TAUNTATK_FENCING, + TF_DMG_CUSTOM_PENETRATE_HEADSHOT, + TF_DMG_CUSTOM_TELEFRAG, + TF_DMG_CUSTOM_TAUNTATK_ARROW_STAB, + TF_DMG_CUSTOM_BURNING_ARROW, + TF_DMG_CUSTOM_FLYINGBURN, + TF_DMG_CUSTOM_PUMPKIN_BOMB, + TF_DMG_CUSTOM_DECAPITATION, + TF_DMG_CUSTOM_TAUNTATK_GRENADE, + TF_DMG_CUSTOM_BASEBALL, + TF_DMG_CUSTOM_CHARGE_IMPACT, + TF_DMG_CUSTOM_TAUNTATK_BARBARIAN_SWING, + TF_DMG_CUSTOM_AIR_STICKY_BURST, + TF_DMG_CUSTOM_DEFENSIVE_STICKY, + TF_DMG_CUSTOM_PICKAXE, + TF_DMG_CUSTOM_ROCKET_DIRECTHIT, + TF_DMG_CUSTOM_TAUNTATK_UBERSLICE, + TF_DMG_CUSTOM_PLAYER_SENTRY, + TF_DMG_CUSTOM_STANDARD_STICKY, + TF_DMG_CUSTOM_SHOTGUN_REVENGE_CRIT, + TF_DMG_CUSTOM_TAUNTATK_ENGINEER_GUITAR_SMASH, + TF_DMG_CUSTOM_BLEEDING, + TF_DMG_CUSTOM_GOLD_WRENCH, + TF_DMG_CUSTOM_CARRIED_BUILDING, + TF_DMG_CUSTOM_COMBO_PUNCH, + TF_DMG_CUSTOM_TAUNTATK_ENGINEER_ARM_KILL, + TF_DMG_CUSTOM_FISH_KILL +}; + +// Weapon codes as used in some events, such as player_death +// (not to be confused with Item Definition Indexes) +enum { + TF_WEAPON_NONE = 0, + TF_WEAPON_BAT, + TF_WEAPON_BAT_WOOD, + TF_WEAPON_BOTTLE, + TF_WEAPON_FIREAXE, + TF_WEAPON_CLUB, + TF_WEAPON_CROWBAR, + TF_WEAPON_KNIFE, + TF_WEAPON_FISTS, + TF_WEAPON_SHOVEL, + TF_WEAPON_WRENCH, + TF_WEAPON_BONESAW, + TF_WEAPON_SHOTGUN_PRIMARY, + TF_WEAPON_SHOTGUN_SOLDIER, + TF_WEAPON_SHOTGUN_HWG, + TF_WEAPON_SHOTGUN_PYRO, + TF_WEAPON_SCATTERGUN, + TF_WEAPON_SNIPERRIFLE, + TF_WEAPON_MINIGUN, + TF_WEAPON_SMG, + TF_WEAPON_SYRINGEGUN_MEDIC, + TF_WEAPON_TRANQ, + TF_WEAPON_ROCKETLAUNCHER, + TF_WEAPON_GRENADELAUNCHER, + TF_WEAPON_PIPEBOMBLAUNCHER, + TF_WEAPON_FLAMETHROWER, + TF_WEAPON_GRENADE_NORMAL, + TF_WEAPON_GRENADE_CONCUSSION, + TF_WEAPON_GRENADE_NAIL, + TF_WEAPON_GRENADE_MIRV, + TF_WEAPON_GRENADE_MIRV_DEMOMAN, + TF_WEAPON_GRENADE_NAPALM, + TF_WEAPON_GRENADE_GAS, + TF_WEAPON_GRENADE_EMP, + TF_WEAPON_GRENADE_CALTROP, + TF_WEAPON_GRENADE_PIPEBOMB, + TF_WEAPON_GRENADE_SMOKE_BOMB, + TF_WEAPON_GRENADE_HEAL, + TF_WEAPON_GRENADE_STUNBALL, + TF_WEAPON_GRENADE_JAR, + TF_WEAPON_PISTOL, + TF_WEAPON_PISTOL_SCOUT, + TF_WEAPON_REVOLVER, + TF_WEAPON_NAILGUN, + TF_WEAPON_PDA, + TF_WEAPON_PDA_ENGINEER_BUILD, + TF_WEAPON_PDA_ENGINEER_DESTROY, + TF_WEAPON_PDA_SPY, + TF_WEAPON_BUILDER, + TF_WEAPON_MEDIGUN, + TF_WEAPON_GRENADE_MIRVBOMB, + TF_WEAPON_FLAMETHROWER_ROCKET, + TF_WEAPON_GRENADE_DEMOMAN, + TF_WEAPON_SENTRY_BULLET, + TF_WEAPON_SENTRY_ROCKET, + TF_WEAPON_DISPENSER, + TF_WEAPON_INVIS, + TF_WEAPON_FLAREGUN, + TF_WEAPON_LUNCHBOX, + TF_WEAPON_JAR, + TF_WEAPON_COMPOUND_BOW, + TF_WEAPON_BUFF_ITEM, + TF_WEAPON_PUMPKIN_BOMB, + TF_WEAPON_SWORD, + TF_WEAPON_ROCKETLAUNCHER_DIRECTHIT, + TF_WEAPON_LIFELINE, + TF_WEAPON_LASER_POINTER, + TF_WEAPON_DISPENSER_GUN, + TF_WEAPON_SENTRY_REVENGE, + TF_WEAPON_JAR_MILK, + TF_WEAPON_HANDGUN_SCOUT_PRIMARY, + TF_WEAPON_BAT_FISH +}; + +// Identifiers for the eventtype property on the teamplay_flag_event event +enum { + TF_FLAGEVENT_PICKEDUP = 1, + TF_FLAGEVENT_CAPTURED, + TF_FLAGEVENT_DEFENDED, + TF_FLAGEVENT_DROPPED +}; + enum TFResourceType { TFResource_Ping,