[0125] Fix SpellShapeshiftEntry

Remove unexistant moveflags2
Fix spell 68992

Signed-off-by: Yaki Khadafi <ElSolDolLo@gmail.com>
This commit is contained in:
Yaki Khadafi 2012-08-17 18:59:55 +03:00 committed by Antz
parent cb28ee2736
commit 455f9d0aac
6 changed files with 10 additions and 14 deletions

View file

@ -1810,9 +1810,9 @@ struct SpellScalingEntry
struct SpellShapeshiftEntry struct SpellShapeshiftEntry
{ {
//uint32 Id; // 0 m_ID //uint32 Id; // 0 m_ID
uint32 Stances; // 13 m_shapeshiftMask uint32 StancesNot; // 13 m_shapeshiftMask
// uint32 unk_320_2; // 14 3.2.0 // uint32 unk_320_2; // 14 3.2.0
uint32 StancesNot; // 15 m_shapeshiftExclude uint32 Stances; // 15 m_shapeshiftExclude
// uint32 unk_320_3; // 16 3.2.0 // uint32 unk_320_3; // 16 3.2.0
// uint32 StanceBarOrder; // 155 m_stanceBarOrder not used // uint32 StanceBarOrder; // 155 m_stanceBarOrder not used
}; };

View file

@ -3389,6 +3389,8 @@ void Spell::cast(bool skipCheck)
// Stoneskin // Stoneskin
else if (m_spellInfo->Id == 20594) else if (m_spellInfo->Id == 20594)
AddTriggeredSpell(65116); // Stoneskin - armor 10% for 8 sec AddTriggeredSpell(65116); // Stoneskin - armor 10% for 8 sec
else if (m_spellInfo->Id == 68992) // Darkflight
AddPrecastSpell(96223); // Run Speed Marker
// Chaos Bane strength buff // Chaos Bane strength buff
else if (m_spellInfo->Id == 71904) else if (m_spellInfo->Id == 71904)
AddTriggeredSpell(73422); AddTriggeredSpell(73422);

View file

@ -410,7 +410,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS] =
&Aura::HandleUnused, //355 0 spells in 4.3.4 &Aura::HandleUnused, //355 0 spells in 4.3.4
&Aura::HandleNULL, //356 SPELL_AURA_MOD_DAMAGE_DONE_FROM_PCT_POWER 2 spells in 4.3.4 &Aura::HandleNULL, //356 SPELL_AURA_MOD_DAMAGE_DONE_FROM_PCT_POWER 2 spells in 4.3.4
&Aura::HandleNULL, //357 1 spells in 4.3.4 Enable Tower Assault Unit Frame &Aura::HandleNULL, //357 1 spells in 4.3.4 Enable Tower Assault Unit Frame
&Aura::HandleNULL, //358 5 spells in 4.3.4 worgen form/mount related &Aura::HandleNULL, //358 5 spells in 4.3.4 forces client-side transformation to worgen form
&Aura::HandleNULL, //359 1 spells in 4.3.4 healing done vs aurastate? &Aura::HandleNULL, //359 1 spells in 4.3.4 healing done vs aurastate?
&Aura::HandleNULL, //360 SPELL_AURA_PROC_DUPLICATE_SPELLS 2 spells in 4.3.4 &Aura::HandleNULL, //360 SPELL_AURA_PROC_DUPLICATE_SPELLS 2 spells in 4.3.4
&Aura::HandleNULL, //361 4 spells in 4.3.4 some damage spells &Aura::HandleNULL, //361 4 spells in 4.3.4 some damage spells

View file

@ -612,7 +612,7 @@ enum NPCFlags
UNIT_NPC_FLAG_SPELLCLICK = 0x01000000, // cause client to send 1015 opcode (spell click), dynamic, set at loading and don't must be set in DB UNIT_NPC_FLAG_SPELLCLICK = 0x01000000, // cause client to send 1015 opcode (spell click), dynamic, set at loading and don't must be set in DB
}; };
// used in most movement packets (send and received) // used in most movement packets (send and received), 30 bits in client
enum MovementFlags enum MovementFlags
{ {
MOVEFLAG_NONE = 0x00000000, MOVEFLAG_NONE = 0x00000000,
@ -660,6 +660,7 @@ MovementFlags const movementOrTurningFlagsMask = MovementFlags(
movementFlagsMask | MOVEFLAG_TURN_LEFT | MOVEFLAG_TURN_RIGHT movementFlagsMask | MOVEFLAG_TURN_LEFT | MOVEFLAG_TURN_RIGHT
); );
// 12 bits in client
enum MovementFlags2 enum MovementFlags2
{ {
MOVEFLAG2_NONE = 0x0000, MOVEFLAG2_NONE = 0x0000,
@ -675,10 +676,6 @@ enum MovementFlags2
MOVEFLAG2_INTERP_MOVEMENT = 0x0200, MOVEFLAG2_INTERP_MOVEMENT = 0x0200,
MOVEFLAG2_INTERP_TURNING = 0x0400, MOVEFLAG2_INTERP_TURNING = 0x0400,
MOVEFLAG2_INTERP_PITCHING = 0x0800, MOVEFLAG2_INTERP_PITCHING = 0x0800,
MOVEFLAG2_UNK8 = 0x1000,
MOVEFLAG2_UNK9 = 0x2000,
MOVEFLAG2_UNK10 = 0x4000,
MOVEFLAG2_UNK11 = 0x8000,
MOVEFLAG2_INTERP_MASK = MOVEFLAG2_INTERP_MOVEMENT | MOVEFLAG2_INTERP_TURNING | MOVEFLAG2_INTERP_PITCHING MOVEFLAG2_INTERP_MASK = MOVEFLAG2_INTERP_MOVEMENT | MOVEFLAG2_INTERP_TURNING | MOVEFLAG2_INTERP_PITCHING
}; };

View file

@ -153,7 +153,7 @@ namespace Movement
STR(Unk11), // 0x8000 STR(Unk11), // 0x8000
}; };
const char* g_SplineFlag_names[32] = const char* g_SplineFlag_names[29] =
{ {
STR(AnimBit1), // 0x00000001, STR(AnimBit1), // 0x00000001,
STR(AnimBit2), // 0x00000002, STR(AnimBit2), // 0x00000002,
@ -174,7 +174,7 @@ namespace Movement
STR(TransportExit),// 0x00010000, STR(TransportExit),// 0x00010000,
STR(Unknown3), // 0x00020000, STR(Unknown3), // 0x00020000,
STR(Unknown4), // 0x00040000, STR(Unknown4), // 0x00040000,
STR(OrientationInversed), // 0x00080000, // Appears With Runmode Flag, Nodes ),// 1, Handles Orientation STR(OrientationInversed), // 0x00080000, // Appears With Runmode Flag, Nodes ),// 1, Handles Orientation
STR(SmoothGroundPath), // 0x00100000 STR(SmoothGroundPath), // 0x00100000
STR(Walkmode), // 0x00200000, STR(Walkmode), // 0x00200000,
STR(UncompressedPath), // 0x00400000 STR(UncompressedPath), // 0x00400000
@ -184,9 +184,6 @@ namespace Movement
STR(Final_Point), // 0x04000000, STR(Final_Point), // 0x04000000,
STR(Final_Target), // 0x08000000, STR(Final_Target), // 0x08000000,
STR(Final_Angle), // 0x10000000, STR(Final_Angle), // 0x10000000,
STR(Unknown7), // 0x20000000,
STR(Unknown8), // 0x40000000,
STR(Unknown9), // 0x80000000,
}; };
template<class Flags, int N> template<class Flags, int N>

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "0125" #define REVISION_NR "0126"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__