From bfe7e6a96f7f78de08f6c6075aa5ad98425cec9d Mon Sep 17 00:00:00 2001 From: Yaki Khadafi Date: Thu, 16 Aug 2012 15:46:23 +0300 Subject: [PATCH] [102] Updated Targets enum, aura interrupt flags, procflags Signed-off-by: Yaki Khadafi --- src/game/SharedDefines.h | 23 +++++++++++++++++++++++ src/game/SpellMgr.h | 14 +++++++++++++- src/game/Unit.h | 9 ++++++++- src/shared/revision_nr.h | 2 +- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 18416ce74..d8816c20b 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -1365,6 +1365,29 @@ enum Targets TARGET_NONCOMBAT_PET = 90, TARGET_91 = 91, TARGET_IN_FRONT_OF_CASTER_30 = 104, + TARGET_105 = 105, + TARGET_106 = 106, + TARGET_107 = 107, + TARGET_GO_IN_FRONT_OF_CASTER_90 = 108, + TARGET_109 = 109, // spell 89008 + TARGET_110 = 110, // front enemy aoe + TARGET_111 = 111, // not used + TARGET_112 = 112, // spell 89549 + TARGET_113 = 113, // not used + TARGET_114 = 114, // not used + TARGET_115 = 115, // not used + TARGET_116 = 116, // not used + TARGET_117 = 117, // test spell 83658 + TARGET_118 = 118, // test spell 79579 + TARGET_119 = 119, // mass ressurection 83968 + TARGET_120 = 120, + TARGET_121 = 121, // spell 95750 + TARGET_122 = 122, // spell 100661 + TARGET_123 = 123, + TARGET_124 = 124, + TARGET_125 = 125, + TARGET_126 = 126, + TARGET_127 = 127, }; enum SpellMissInfo diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 7aa87648d..3f64b7f4a 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -646,7 +646,19 @@ enum ProcFlags PROC_FLAG_ON_TRAP_ACTIVATION = 0x00200000, // 21 On trap activation PROC_FLAG_TAKEN_OFFHAND_HIT = 0x00400000, // 22 Taken off-hand melee attacks(not used) - PROC_FLAG_SUCCESSFUL_OFFHAND_HIT = 0x00800000 // 23 Successful off-hand melee attacks + PROC_FLAG_SUCCESSFUL_OFFHAND_HIT = 0x00800000, // 23 Successful off-hand melee attacks + + PROC_FLAG_ON_DEATH = 0x01000000, // 24 On death + PROC_FLAG_ON_JUMP = 0x02000000, // 25 On jump + + PROC_FLAG_UNK26 = 0x04000000, // 26 not used + PROC_FLAG_UNK27 = 0x08000000, // 27 not used + + PROC_FLAG_UNK28 = 0x10000000, // 28 not used + PROC_FLAG_UNK29 = 0x20000000, // 29 not used + + PROC_FLAG_UNK30 = 0x40000000, // 30 not used + PROC_FLAG_UNK31 = 0x80000000, // 31 not used }; #define MELEE_BASED_TRIGGER_MASK (PROC_FLAG_SUCCESSFUL_MELEE_HIT | \ diff --git a/src/game/Unit.h b/src/game/Unit.h index c6d24fe94..5f9982be4 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -82,7 +82,14 @@ enum SpellAuraInterruptFlags AURA_INTERRUPT_FLAG_UNK21 = 0x00200000, // 21 AURA_INTERRUPT_FLAG_UNK22 = 0x00400000, // 22 AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT = 0x00800000, // 23 removed by entering pvp combat - AURA_INTERRUPT_FLAG_DIRECT_DAMAGE = 0x01000000 // 24 removed by any direct damage + AURA_INTERRUPT_FLAG_DIRECT_DAMAGE = 0x01000000, // 24 removed by any direct damage + AURA_INTERRUPT_FLAG_UNK25 = 0x02000000, // 25 + AURA_INTERRUPT_FLAG_UNK26 = 0x04000000, // 26 + AURA_INTERRUPT_FLAG_DAMAGE2 = 0x08000000, // 27 removed by damage spells + removed by damage, other than .. (diseases, Censure) + AURA_INTERRUPT_FLAG_ENTER_COMBAT2 = 0x10000000, // 28 + AURA_INTERRUPT_FLAG_UNK29 = 0x20000000, // 29 + AURA_INTERRUPT_FLAG_UNK30 = 0x40000000, // 30 + AURA_INTERRUPT_FLAG_UNK31 = 0x80000000, // 31 }; enum SpellModOp diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0bae34f5b..ba49ba625 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "0101" + #define REVISION_NR "0102" #endif // __REVISION_NR_H__