UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update TFCond and customkill enum values (bug 6012, r=psychonic).

Browse Source
This commit is contained in:
FlaminSarge 2014-01-27 10:15:17 -05:00
parent cd58e16d9c
commit 53f53c64fc
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/include/tf2.inc
View File

@ -107,18 +107,18 @@ enum TFCond
TFCond_RegenBuffed, TFCond_RegenBuffed,
TFCond_MarkedForDeath, TFCond_MarkedForDeath,
TFCond_NoHealingDamageBuff, TFCond_NoHealingDamageBuff,
TFCond_SpeedBuffAlly, TFCond_SpeedBuffAlly, //32
TFCond_HalloweenCritCandy, TFCond_HalloweenCritCandy,
TFCond_CritCanteen, TFCond_CritCanteen,
TFCond_CritDemoCharge,
TFCond_CritHype = 36, TFCond_CritHype,
TFCond_CritOnFirstBlood, TFCond_CritOnFirstBlood,
TFCond_CritOnWin, TFCond_CritOnWin,
TFCond_CritOnFlagCapture, TFCond_CritOnFlagCapture,
TFCond_CritOnKill, TFCond_CritOnKill,
TFCond_RestrictToMelee, TFCond_RestrictToMelee,
TFCond_DefenseBuffNoCritBlock,
TFCond_Reprogrammed = 43, TFCond_Reprogrammed,
TFCond_CritMmmph, TFCond_CritMmmph,
TFCond_DefenseBuffMmmph, TFCond_DefenseBuffMmmph,
TFCond_FocusBuff, TFCond_FocusBuff,
@ -140,16 +140,19 @@ enum TFCond
TFCond_SmallBlastResist, TFCond_SmallBlastResist,
TFCond_SmallFireResist, TFCond_SmallFireResist,
TFCond_Stealthed, // 64 TFCond_Stealthed, // 64
TFCond_MedigunDebuff,
TFCond_StealthedUserBuffFade = 66, TFCond_StealthedUserBuffFade,
TFCond_BulletImmune,
TFCond_MVMBotRadiowave = 71, TFCond_BlastImmune,
TFCond_FireImmune,
TFCond_PreventDeath,
TFCond_MVMBotRadiowave,
TFCond_HalloweenSpeedBoost, TFCond_HalloweenSpeedBoost,
TFCond_HalloweenQuickHeal, TFCond_HalloweenQuickHeal,
TFCond_HalloweenGiant, TFCond_HalloweenGiant,
TFCond_HalloweenTiny, // 75 TFCond_HalloweenTiny,
TFCond_HalloweenInHell,
TFCond_HalloweenGhostMode = 77, TFCond_HalloweenGhostMode,
}; };
enum TFHoliday enum TFHoliday

1
plugins/include/tf2_stocks.inc
View File

@ -143,6 +143,7 @@ enum {
TF_CUSTOM_MERASMUS_ZAP, TF_CUSTOM_MERASMUS_ZAP,
TF_CUSTOM_MERASMUS_DECAPITATION, TF_CUSTOM_MERASMUS_DECAPITATION,
TF_CUSTOM_CANNONBALL_PUSH, TF_CUSTOM_CANNONBALL_PUSH,
TF_CUSTOM_TAUNT_ALLCLASS_GUITAR_RIFF,
}; };
// Weapon codes as used in some events, such as player_death // Weapon codes as used in some events, such as player_death