diff -r c605ea76b498 QSW/DBC/DBCStructure.h
--- a/QSW/DBC/DBCStructure.h Sat Apr 06 13:11:01 2013 +0300
+++ b/QSW/DBC/DBCStructure.h Sat Apr 06 13:40:35 2013 +0300
@@ -241,8 +241,8 @@
quint32 AttributesEx6; // 7 m_attributesExF
quint32 AttributesEx7; // 8 3.2.0 (0x20 - totems, 0x4 - paladin auras, etc...)
quint32 AttributesEx8; // 9 m_attributesExH
- // quint32 unk_400_1; // 10 4.0.0
- // quint32 unk_420; // 11 - 4.2.0
+ quint32 AttributesEx9; // 10 m_attributesExI
+ quint32 AttributesEx10; // 11 m_attributesExJ
quint32 CastingTimeIndex; // 12 - m_castingTimeIndex
quint32 DurationIndex; // 13 - m_durationIndex
quint32 PowerType; // 14 - m_powerType
diff -r c605ea76b498 QSW/DBC/DBCfmt.h
--- a/QSW/DBC/DBCfmt.h Sat Apr 06 13:11:01 2013 +0300
+++ b/QSW/DBC/DBCfmt.h Sat Apr 06 13:40:35 2013 +0300
@@ -5,7 +5,7 @@
const char* SkillLineAbilityfmt = "niiiiiiiiiiiii";
const char* SpellCastTimefmt = "nifi";
const char* SpellDurationfmt = "niii";
-const char* SpellEntryfmt = "niiiiiiiiixxiiiifiiiissssiiiiixiiiiiiixiiiiiiiix";
+const char* SpellEntryfmt = "niiiiiiiiiiiiiiifiiiissssiiiiixiiiiiiixiiiiiiiix";
const char* SpellRadiusfmt = "nfxf";
const char* SpellRangefmt = "nffffiss";
const char* SpellIconfmt = "ns";
diff -r c605ea76b498 QSW/Enums.xml
--- a/QSW/Enums.xml Sat Apr 06 13:11:01 2013 +0300
+++ b/QSW/Enums.xml Sat Apr 06 13:40:35 2013 +0300
@@ -227,8 +227,8 @@
<value value="SPELL_ATTR_LEVEL_DAMAGE_CALCULATION" key="0x00080000" />
<value value="SPELL_ATTR_STOP_ATTACK_TARGET" key="0x00100000" />
<value value="SPELL_ATTR_IMPOSSIBLE_DODGE_PARRY_BLOCK" key="0x00200000" />
- <value value="SPELL_ATTR_UNK22" key="0x00400000" />
- <value value="SPELL_ATTR_UNK23" key="0x00800000" />
+ <value value="SPELL_ATTR_SET_TRACKING_TARGET" key="0x00400000" />
+ <value value="SPELL_ATTR_CASTABLE_WHILE_DEAD" key="0x00800000" />
<value value="SPELL_ATTR_CASTABLE_WHILE_MOUNTED" key="0x01000000" />
<value value="SPELL_ATTR_DISABLED_WHILE_ACTIVE" key="0x02000000" />
<value value="SPELL_ATTR_UNK26" key="0x04000000" />
@@ -249,16 +249,16 @@
<value value="SPELL_ATTR_EX_NEGATIVE" key="0x00000080" />
<value value="SPELL_ATTR_EX_NOT_IN_COMBAT_TARGET" key="0x00000100" />
<value value="SPELL_ATTR_EX_UNK9" key="0x00000200" />
- <value value="SPELL_ATTR_EX_NO_INITIAL_AGGRO" key="0x00000400" />
+ <value value="SPELL_ATTR_EX_NO_THREAT" key="0x00000400" />
<value value="SPELL_ATTR_EX_UNK11" key="0x00000800" />
<value value="SPELL_ATTR_EX_UNK12" key="0x00001000" />
- <value value="SPELL_ATTR_EX_UNK13" key="0x00002000" />
- <value value="SPELL_ATTR_EX_UNK14" key="0x00004000" />
+ <value value="SPELL_ATTR_EX_FARSIGHT" key="0x00002000" />
+ <value value="SPELL_ATTR_EX_CHANNEL_TRACKING_TARGET" key="0x00004000" />
<value value="SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY" key="0x00008000" />
<value value="SPELL_ATTR_EX_UNAFFECTED_BY_SCHOOL_IMMUNE" key="0x00010000" />
<value value="SPELL_ATTR_EX_UNK17" key="0x00020000" />
<value value="SPELL_ATTR_EX_UNK18" key="0x00040000" />
- <value value="SPELL_ATTR_EX_UNK19" key="0x00080000" />
+ <value value="SPELL_ATTR_EX_CANT_TARGET_SELF" key="0x00080000" />
<value value="SPELL_ATTR_EX_REQ_TARGET_COMBO_POINTS" key="0x00100000" />
<value value="SPELL_ATTR_EX_UNK21" key="0x00200000" />
<value value="SPELL_ATTR_EX_REQ_COMBO_POINTS" key="0x00400000" />
@@ -273,7 +273,7 @@
<value value="SPELL_ATTR_EX_UNK31" key="0x80000000" />
</AttributesEx1>
- <value value="SPELL_ATTR_EX2_UNK0" key="0x00000001" />
+ <value value="SPELL_ATTR2_ALLOW_DEAD_TARGET" key="0x00000001" />
<value value="SPELL_ATTR_EX2_UNK1" key="0x00000002" />
<value value="SPELL_ATTR_EX2_CANT_REFLECTED" key="0x00000004" />
<value value="SPELL_ATTR_EX2_UNK3" key="0x00000008" />
@@ -290,7 +290,7 @@
<value value="SPELL_ATTR_EX2_UNK14" key="0x00004000" />
<value value="SPELL_ATTR_EX2_UNK15" key="0x00008000" />
<value value="SPELL_ATTR_EX2_UNK16" key="0x00010000" />
- <value value="SPELL_ATTR_EX2_UNK17" key="0x00020000" />
+ <value value="SPELL_ATTR_EX2_NOT_RESET_AUTOSHOT" key="0x00020000" />
<value value="SPELL_ATTR_EX2_UNK18" key="0x00040000" />
<value value="SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT" key="0x00080000" />
<value value="SPELL_ATTR_EX2_UNK20" key="0x00100000" />
@@ -303,7 +303,7 @@
<value value="SPELL_ATTR_EX2_UNK27" key="0x08000000" />
<value value="SPELL_ATTR_EX2_UNK28" key="0x10000000" />
<value value="SPELL_ATTR_EX2_CANT_CRIT" key="0x20000000" />
- <value value="SPELL_ATTR_EX2_UNK30" key="0x40000000" />
+ <value value="SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER_PROC" key="0x40000000" />
<value value="SPELL_ATTR_EX2_FOOD_BUFF" key="0x80000000" />
</AttributesEx2>
@@ -311,21 +311,21 @@
<value value="SPELL_ATTR_EX3_UNK1" key="0x00000002" />
<value value="SPELL_ATTR_EX3_UNK2" key="0x00000004" />
<value value="SPELL_ATTR_EX3_UNK3" key="0x00000008" />
- <value value="SPELL_ATTR_EX3_UNK4" key="0x00000010" />
+ <value value="SPELL_ATTR_EX3_IGNORE_RESURRECTION_TIMER" key="0x00000010" />
<value value="SPELL_ATTR_EX3_UNK5" key="0x00000020" />
<value value="SPELL_ATTR_EX3_UNK6" key="0x00000040" />
- <value value="SPELL_ATTR_EX3_UNK7" key="0x00000080" />
+ <value value="SPELL_ATTR_EX3_STACK_FOR_DIFF_CASTERS" key="0x00000080" />
<value value="SPELL_ATTR_EX3_UNK8" key="0x00000100" />
- <value value="SPELL_ATTR_EX3_UNK9" key="0x00000200" />
+ <value value="SPELL_ATTR_EX3_TRIGGERED_CAN_TRIGGER_PROC_2" key="0x00000200" />
<value value="SPELL_ATTR_EX3_MAIN_HAND" key="0x00000400" />
<value value="SPELL_ATTR_EX3_BATTLEGROUND" key="0x00000800" />
<value value="SPELL_ATTR_EX3_CAST_ON_DEAD" key="0x00001000" />
<value value="SPELL_ATTR_EX3_UNK13" key="0x00002000" />
<value value="SPELL_ATTR_EX3_UNK14" key="0x00004000" />
<value value="SPELL_ATTR_EX3_UNK15" key="0x00008000" />
- <value value="SPELL_ATTR_EX3_UNK16" key="0x00010000" />
- <value value="SPELL_ATTR_EX3_UNK17" key="0x00020000" />
- <value value="SPELL_ATTR_EX3_UNK18" key="0x00040000" />
+ <value value="SPELL_ATTR_EX3_CANT_TRIGGER_PROC" key="0x00010000" />
+ <value value="SPELL_ATTR_EX3_NO_INITIAL_AGGRO" key="0x00020000" />
+ <value value="SPELL_ATTR_EX3_CANT_MISS" key="0x00040000" />
<value value="SPELL_ATTR_EX3_UNK19" key="0x00080000" />
<value value="SPELL_ATTR_EX3_DEATH_PERSISTENT" key="0x00100000" />
<value value="SPELL_ATTR_EX3_UNK21" key="0x00200000" />
@@ -333,7 +333,7 @@
<value value="SPELL_ATTR_EX3_UNK23" key="0x00800000" />
<value value="SPELL_ATTR_EX3_REQ_OFFHAND" key="0x01000000" />
<value value="SPELL_ATTR_EX3_UNK25" key="0x02000000" />
- <value value="SPELL_ATTR_EX3_UNK26" key="0x04000000" />
+ <value value="SPELL_ATTR_EX3_CAN_PROC_WITH_TRIGGERED" key="0x04000000" />
<value value="SPELL_ATTR_EX3_UNK27" key="0x08000000" />
<value value="SPELL_ATTR_EX3_UNK28" key="0x10000000" />
<value value="SPELL_ATTR_EX3_UNK29" key="0x20000000" />
@@ -345,11 +345,11 @@
<value value="SPELL_ATTR_EX4_UNK1" key="0x00000002" />
<value value="SPELL_ATTR_EX4_UNK2" key="0x00000004" />
<value value="SPELL_ATTR_EX4_UNK3" key="0x00000008" />
- <value value="SPELL_ATTR_EX4_UNK4" key="0x00000010" />
+ <value value="SPELL_ATTR_EX4_TRIGGERED" key="0x00000010" />
<value value="SPELL_ATTR_EX4_UNK5" key="0x00000020" />
<value value="SPELL_ATTR_EX4_NOT_STEALABLE" key="0x00000040" />
<value value="SPELL_ATTR_EX4_UNK7" key="0x00000080" />
- <value value="SPELL_ATTR_EX4_UNK8" key="0x00000100" />
+ <value value="SPELL_ATTR_EX4_FIXED_DAMAGE" key="0x00000100" />
<value value="SPELL_ATTR_EX4_UNK9" key="0x00000200" />
<value value="SPELL_ATTR_EX4_SPELL_VS_EXTEND_COST" key="0x00000400" />
<value value="SPELL_ATTR_EX4_UNK11" key="0x00000800" />
@@ -357,7 +357,7 @@
<value value="SPELL_ATTR_EX4_UNK13" key="0x00002000" />
<value value="SPELL_ATTR_EX4_UNK14" key="0x00004000" />
<value value="SPELL_ATTR_EX4_UNK15" key="0x00008000" />
- <value value="SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA" key="0x00010000" />
+ <value value="SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA_OR_RATED_BG" key="0x00010000" />
<value value="SPELL_ATTR_EX4_USABLE_IN_ARENA" key="0x00020000" />
<value value="SPELL_ATTR_EX4_UNK18" key="0x00040000" />
<value value="SPELL_ATTR_EX4_UNK19" key="0x00080000" />
@@ -366,7 +366,7 @@
<value value="SPELL_ATTR_EX4_UNK22" key="0x00400000" />
<value value="SPELL_ATTR_EX4_UNK23" key="0x00800000" />
<value value="SPELL_ATTR_EX4_UNK24" key="0x01000000" />
- <value value="SPELL_ATTR_EX4_UNK25" key="0x02000000" />
+ <value value="SPELL_ATTR_EX4_PET_SCALING_AURA" key="0x02000000" />
<value value="SPELL_ATTR_EX4_CAST_ONLY_IN_OUTLAND" key="0x04000000" />
<value value="SPELL_ATTR_EX4_UNK27" key="0x08000000" />
<value value="SPELL_ATTR_EX4_UNK28" key="0x10000000" />
@@ -385,10 +385,10 @@
<value value="SPELL_ATTR_EX5_UNK7" key="0x00000080" />
<value value="SPELL_ATTR_EX5_UNK8" key="0x00000100" />
<value value="SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY" key="0x00000200" />
- <value value="SPELL_ATTR_EX5_UNK10" key="0x00000400" />
+ <value value="SPELL_ATTR_EX5_HIDE_DURATION" key="0x00000400" />
<value value="SPELL_ATTR_EX5_UNK11" key="0x00000800" />
<value value="SPELL_ATTR_EX5_UNK12" key="0x00001000" />
- <value value="SPELL_ATTR_EX5_UNK13" key="0x00002000" />
+ <value value="SPELL_ATTR_EX5_AFFECTED_BY_HASTE" key="0x00002000" />
<value value="SPELL_ATTR_EX5_UNK14" key="0x00004000" />
<value value="SPELL_ATTR_EX5_UNK15" key="0x00008000" />
<value value="SPELL_ATTR_EX5_UNK16" key="0x00010000" />
@@ -415,13 +415,13 @@
<value value="SPELL_ATTR_EX6_UNK3" key="0x00000008" />
<value value="SPELL_ATTR_EX6_UNK4" key="0x00000010" />
<value value="SPELL_ATTR_EX6_UNK5" key="0x00000020" />
- <value value="SPELL_ATTR_EX6_UNK6" key="0x00000040" />
+ <value value="SPELL_ATTR_EX6_REMOVED_AT_SPEC_SWITCH" key="0x00000040" />
<value value="SPELL_ATTR_EX6_UNK7" key="0x00000080" />
- <value value="SPELL_ATTR_EX6_UNK8" key="0x00000100" />
+ <value value="SPELL_ATTR_EX6_IGNORE_CCED_TARGETS" key="0x00000100" />
<value value="SPELL_ATTR_EX6_UNK9" key="0x00000200" />
<value value="SPELL_ATTR_EX6_UNK10" key="0x00000400" />
<value value="SPELL_ATTR_EX6_NOT_IN_RAID_INSTANCE" key="0x00000800" />
- <value value="SPELL_ATTR_EX6_UNK12" key="0x00001000" />
+ <value value="SPELL_ATTR_EX6_CASTABLE_ON_VEHICLE" key="0x00001000" />
<value value="SPELL_ATTR_EX6_UNK13" key="0x00002000" />
<value value="SPELL_ATTR_EX6_UNK14" key="0x00004000" />
<value value="SPELL_ATTR_EX6_UNK15" key="0x00008000" />
@@ -489,27 +489,95 @@
<value value="SPELL_ATTR_EX8_UNK9" key="0x00000200" />
<value value="SPELL_ATTR_EX8_UNK10" key="0x00000400" />
<value value="SPELL_ATTR_EX8_UNK11" key="0x00000800" />
- <value value="SPELL_ATTR_EX8_UNK12" key="0x00001000" />
+ <value value="SPELL_ATTR_EX8_AURA_SENDS_AMOUNT" key="0x00001000" />
<value value="SPELL_ATTR_EX8_UNK13" key="0x00002000" />
<value value="SPELL_ATTR_EX8_UNK14" key="0x00004000" />
<value value="SPELL_ATTR_EX8_UNK15" key="0x00008000" />
<value value="SPELL_ATTR_EX8_UNK16" key="0x00010000" />
<value value="SPELL_ATTR_EX8_UNK17" key="0x00020000" />
<value value="SPELL_ATTR_EX8_UNK18" key="0x00040000" />
- <value value="SPELL_ATTR_EX8_UNK19" key="0x00080000" />
- <value value="SPELL_ATTR_EX8_UNK20" key="0x00100000" />
+ <value value="SPELL_ATTR_EX8_IGNORE_TARGET_FOR_COMBO_POINTS" key="0x00080000" />
+ <value value="SPELL_ATTR_EX8_ARMOR_SPECIALIZATION" key="0x00100000" />
<value value="SPELL_ATTR_EX8_UNK21" key="0x00200000" />
<value value="SPELL_ATTR_EX8_UNK22" key="0x00400000" />
<value value="SPELL_ATTR_EX8_UNK23" key="0x00800000" />
<value value="SPELL_ATTR_EX8_UNK24" key="0x01000000" />
<value value="SPELL_ATTR_EX8_UNK25" key="0x02000000" />
- <value value="SPELL_ATTR_EX8_UNK26" key="0x04000000" />
+ <value value="SPELL_ATTR_EX8_RAID_MARKER" key="0x04000000" />
<value value="SPELL_ATTR_EX8_UNK27" key="0x08000000" />
- <value value="SPELL_ATTR_EX8_UNK28" key="0x10000000" />
- <value value="SPELL_ATTR_EX8_UNK29" key="0x20000000" />
+ <value value="SPELL_ATTR_EX8_GUILD_PERKS" key="0x10000000" />
+ <value value="SPELL_ATTR_EX8_MASTERY" key="0x20000000" />
<value value="SPELL_ATTR_EX8_UNK30" key="0x40000000" />
<value value="SPELL_ATTR_EX8_UNK31" key="0x80000000" />
</AttributesEx8>
+ <AttributesEx9>
+ <value value="SPELL_ATTR_EX9_UNK0" key="0x00000001" />
+ <value value="SPELL_ATTR_EX9_UNK1" key="0x00000002" />
+ <value value="SPELL_ATTR_EX9_UNK2" key="0x00000004" />
+ <value value="SPELL_ATTR_EX9_UNK3" key="0x00000008" />
+ <value value="SPELL_ATTR_EX9_UNK4" key="0x00000010" />
+ <value value="SPELL_ATTR_EX9_UNK5" key="0x00000020" />
+ <value value="SPELL_ATTR_EX9_UNK6" key="0x00000040" />
+ <value value="SPELL_ATTR_EX9_UNK7" key="0x00000080" />
+ <value value="SPELL_ATTR_EX9_UNK8" key="0x00000100" />
+ <value value="SPELL_ATTR_EX9_NOT_USABLE_IN_ARENA" key="0x00000200" />
+ <value value="SPELL_ATTR_EX9_UNK10" key="0x00000400" />
+ <value value="SPELL_ATTR_EX9_UNK11" key="0x00000800" />
+ <value value="SPELL_ATTR_EX9_UNK12" key="0x00001000" />
+ <value value="SPELL_ATTR_EX9_UNK13" key="0x00002000" />
+ <value value="SPELL_ATTR_EX9_USABLE_IN_RATED_BG" key="0x00004000" />
+ <value value="SPELL_ATTR_EX9_UNK15" key="0x00008000" />
+ <value value="SPELL_ATTR_EX9_UNK16" key="0x00010000" />
+ <value value="SPELL_ATTR_EX9_UNK17" key="0x00020000" />
+ <value value="SPELL_ATTR_EX9_UNK18" key="0x00040000" />
+ <value value="SPELL_ATTR_EX9_UNK19" key="0x00080000" />
+ <value value="SPELL_ATTR_EX9_UNK20" key="0x00100000" />
+ <value value="SPELL_ATTR_EX9_UNK21" key="0x00200000" />
+ <value value="SPELL_ATTR_EX9_UNK22" key="0x00400000" />
+ <value value="SPELL_ATTR_EX9_UNK23" key="0x00800000" />
+ <value value="SPELL_ATTR_EX9_UNK24" key="0x01000000" />
+ <value value="SPELL_ATTR_EX9_UNK25" key="0x02000000" />
+ <value value="SPELL_ATTR_EX9_UNK26" key="0x04000000" />
+ <value value="SPELL_ATTR_EX9_UNK27" key="0x08000000" />
+ <value value="SPELL_ATTR_EX9_UNK28" key="0x10000000" />
+ <value value="SPELL_ATTR_EX9_UNK29" key="0x20000000" />
+ <value value="SPELL_ATTR_EX9_UNK30" key="0x40000000" />
+ <value value="SPELL_ATTR_EX9_UNK31" key="0x80000000" />
+ </AttributesEx9>
+ <AttributesEx10>
+ <value value="SPELL_ATTR_EX10_UNK0" key="0x00000001" />
+ <value value="SPELL_ATTR_EX10_UNK1" key="0x00000002" />
+ <value value="SPELL_ATTR_EX10_UNK2" key="0x00000004" />
+ <value value="SPELL_ATTR_EX10_UNK3" key="0x00000008" />
+ <value value="SPELL_ATTR_EX10_UNK4" key="0x00000010" />
+ <value value="SPELL_ATTR_EX10_UNK5" key="0x00000020" />
+ <value value="SPELL_ATTR_EX10_UNK6" key="0x00000040" />
+ <value value="SPELL_ATTR_EX10_UNK7" key="0x00000080" />
+ <value value="SPELL_ATTR_EX10_UNK8" key="0x00000100" />
+ <value value="SPELL_ATTR_EX10_UNK9" key="0x00000200" />
+ <value value="SPELL_ATTR_EX10_UNK10" key="0x00000400" />
+ <value value="SPELL_ATTR_EX10_UNK11" key="0x00000800" />
+ <value value="SPELL_ATTR_EX10_UNK12" key="0x00001000" />
+ <value value="SPELL_ATTR_EX10_UNK13" key="0x00002000" />
+ <value value="SPELL_ATTR_EX10_UNK14" key="0x00004000" />
+ <value value="SPELL_ATTR_EX10_UNK15" key="0x00008000" />
+ <value value="SPELL_ATTR_EX10_UNK16" key="0x00010000" />
+ <value value="SPELL_ATTR_EX10_UNK17" key="0x00020000" />
+ <value value="SPELL_ATTR_EX10_UNK18" key="0x00040000" />
+ <value value="SPELL_ATTR_EX10_UNK19" key="0x00080000" />
+ <value value="SPELL_ATTR_EX10_UNK20" key="0x00100000" />
+ <value value="SPELL_ATTR_EX10_UNK21" key="0x00200000" />
+ <value value="SPELL_ATTR_EX10_UNK22" key="0x00400000" />
+ <value value="SPELL_ATTR_EX10_UNK23" key="0x00800000" />
+ <value value="SPELL_ATTR_EX10_UNK24" key="0x01000000" />
+ <value value="SPELL_ATTR_EX10_UNK25" key="0x02000000" />
+ <value value="SPELL_ATTR_EX10_UNK26" key="0x04000000" />
+ <value value="SPELL_ATTR_EX10_UNK27" key="0x08000000" />
+ <value value="SPELL_ATTR_EX10_UNK28" key="0x10000000" />
+ <value value="SPELL_ATTR_EX10_UNK29" key="0x20000000" />
+ <value value="SPELL_ATTR_EX10_UNK30" key="0x40000000" />
+ <value value="SPELL_ATTR_EX10_UNK31" key="0x80000000" />
+ </AttributesEx10>
<Target>
<value value="NO_TARGET" key="0" />
<value value="TARGET_SELF" key="1" />
diff -r c605ea76b498 QSW/SWDefines.h
--- a/QSW/SWDefines.h Sat Apr 06 13:11:01 2013 +0300
+++ b/QSW/SWDefines.h Sat Apr 06 13:40:35 2013 +0300
@@ -30,6 +30,8 @@
TYPE_ATTR_EX6,
TYPE_ATTR_EX7,
TYPE_ATTR_EX8,
+ TYPE_ATTR_EX9,
+ TYPE_ATTR_EX10,
TYPE_TARGETS,
TYPE_CREATURE,
TYPE_FORMS,
diff -r c605ea76b498 QSW/SWEnums.h
--- a/QSW/SWEnums.h Sat Apr 06 13:11:01 2013 +0300
+++ b/QSW/SWEnums.h Sat Apr 06 13:40:35 2013 +0300
@@ -35,6 +35,8 @@
Enumerator getAttributesEx6() const { return m_enums["AttributesEx6"]; }
Enumerator getAttributesEx7() const { return m_enums["AttributesEx7"]; }
Enumerator getAttributesEx8() const { return m_enums["AttributesEx8"]; }
+ Enumerator getAttributesEx9() const { return m_enums["AttributesEx9"]; }
+ Enumerator getAttributesEx10() const { return m_enums["AttributesEx10"]; }
Enumerator getTargets() const { return m_enums["Target"]; }
Enumerator getInventoryTypes() const { return m_enums["InventoryType"]; }
Enumerator getItemSubClassMiscs() const { return m_enums["ItemSubClassMisc"]; }
diff -r c605ea76b498 QSW/SWObject.cpp
--- a/QSW/SWObject.cpp Sat Apr 06 13:11:01 2013 +0300
+++ b/QSW/SWObject.cpp Sat Apr 06 13:40:35 2013 +0300
@@ -648,6 +648,8 @@
QString sAttributesEx6(QString("%0").arg(spellInfo->AttributesEx6, 8, 16, QChar('0')));
QString sAttributesEx7(QString("%0").arg(spellInfo->AttributesEx7, 8, 16, QChar('0')));
QString sAttributesEx8(QString("%0").arg(spellInfo->AttributesEx8, 8, 16, QChar('0')));
+ QString sAttributesEx9(QString("%0").arg(spellInfo->AttributesEx9, 8, 16, QChar('0')));
+ QString sAttributesEx10(QString("%0").arg(spellInfo->AttributesEx10, 8, 16, QChar('0')));
QString sTargetMask(QString("%0").arg(spellInfo->getTargets(), 8, 16, QChar('0')));
QString sCreatureTypeMask(QString("%0").arg(spellInfo->getTargetCreatureType(), 8, 16, QChar('0')));
QString sFormMask(QString("%0").arg(spellInfo->getStances(0), 8, 16, QChar('0')));
@@ -750,7 +752,8 @@
if (spellInfo->Attributes || spellInfo->AttributesEx1 || spellInfo->AttributesEx2 ||
spellInfo->AttributesEx3 || spellInfo->AttributesEx4 || spellInfo->AttributesEx5 ||
- spellInfo->AttributesEx6 || spellInfo->AttributesEx7 || spellInfo->AttributesEx8)
+ spellInfo->AttributesEx6 || spellInfo->AttributesEx7 || spellInfo->AttributesEx8 ||
+ spellInfo->AttributesEx9 || spellInfo->AttributesEx10)
{
html.append("<div class='b-box-title'>Attributes</div>"
"<div class='b-box-body'>"
@@ -802,6 +805,16 @@
.arg(sAttributesEx8.toUpper())
.arg(containAttributes(spellInfo, TYPE_ATTR_EX8)));
+ if (spellInfo->AttributesEx9)
+ html.append(QString("<li>AttributesEx9: 0x%0 (%1)</li>")
+ .arg(sAttributesEx9.toUpper())
+ .arg(containAttributes(spellInfo, TYPE_ATTR_EX9)));
+
+ if (spellInfo->AttributesEx10)
+ html.append(QString("<li>AttributesEx10: 0x%0 (%1)</li>")
+ .arg(sAttributesEx10.toUpper())
+ .arg(containAttributes(spellInfo, TYPE_ATTR_EX10)));
+
html.append("</ul>"
"</div>"
"</div>");
@@ -1520,6 +1533,40 @@
return str;
}
break;
+ case TYPE_ATTR_EX9:
+ {
+ EnumIterator itr(m_form->getEnums()->getAttributesEx9());
+ while (itr.hasNext())
+ {
+ itr.next();
+ if (spellInfo->AttributesEx9 & itr.key())
+ {
+ QString tstr(QString("%0, ").arg(itr.value()));
+ str += tstr;
+ }
+ }
+ if (!str.isEmpty())
+ str.chop(2);
+ return str;
+ }
+ break;
+ case TYPE_ATTR_EX10:
+ {
+ EnumIterator itr(m_form->getEnums()->getAttributesEx10());
+ while (itr.hasNext())
+ {
+ itr.next();
+ if (spellInfo->AttributesEx10 & itr.key())
+ {
+ QString tstr(QString("%0, ").arg(itr.value()));
+ str += tstr;
+ }
+ }
+ if (!str.isEmpty())
+ str.chop(2);
+ return str;
+ }
+ break;
case TYPE_TARGETS:
{
EnumIterator itr(m_form->getEnums()->getTargetFlags());
diff -r c605ea76b498 QSW/SWSearch.h
--- a/QSW/SWSearch.h Sat Apr 06 13:11:01 2013 +0300
+++ b/QSW/SWSearch.h Sat Apr 06 13:40:35 2013 +0300
@@ -43,6 +43,8 @@
Q_INVOKABLE QVariant AttributesEx6() { return m_spellInfo->AttributesEx6; }
Q_INVOKABLE QVariant AttributesEx7() { return m_spellInfo->AttributesEx7; }
Q_INVOKABLE QVariant AttributesEx8() { return m_spellInfo->AttributesEx8; }
+ Q_INVOKABLE QVariant AttributesEx9() { return m_spellInfo->AttributesEx9; }
+ Q_INVOKABLE QVariant AttributesEx10() { return m_spellInfo->AttributesEx10; }
Q_INVOKABLE QVariant Stances(quint8 index) { return m_spellInfo->getStances(index); }
Q_INVOKABLE QVariant StancesNot(quint8 index) { return m_spellInfo->getStancesNot(index); }
Q_INVOKABLE QVariant Targets() { return m_spellInfo->getTargets(); }