diff --git a/Decursive/Changelog-Decursive-2.5.1-6-gd3885c5.txt b/Decursive/Changelog-Decursive-2.5.1-6-gd3885c5.txt
deleted file mode 100644
index 282ff02..0000000
--- a/Decursive/Changelog-Decursive-2.5.1-6-gd3885c5.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Archarodim:
- - - Added X-Max-Interface and X-Min-Interface to toc
- - - fix "Dcr_lists.lua:140: attempt to index local 'frame' (a nil value)" introduced in b03f6b93f98
- - - Added Fear (rank 1) for Warlocks to use on charmed units
- - WoW 4.0: Added support for 'Singe Magic' imp spell for Warlocks and changed 'Devour Magic' to 'enemy magic' only.
- - WoW 4.0: Removed rank for Polymorph
- - - fixed changelog in .pkgmeta
- - - Fix missing spell reporting in WoW 4.0
- - WoW 4.0 basic compatibility (this --> self, etc...)
diff --git a/Decursive/DCR_init.lua b/Decursive/DCR_init.lua
index ea3b705..669dedb 100644
--- a/Decursive/DCR_init.lua
+++ b/Decursive/DCR_init.lua
@@ -127,16 +127,9 @@ DC.FailedSound = "Interface\\AddOns\\Decursive\\Sounds\\FailedSpell.wav";
DC.IconON = "Interface\\AddOns\\Decursive\\iconON.tga";
DC.IconOFF = "Interface\\AddOns\\Decursive\\iconOFF.tga";
-DC.CLASS_DRUID = 'DRUID';
-DC.CLASS_HUNTER = 'HUNTER';
-DC.CLASS_MAGE = 'MAGE';
-DC.CLASS_PALADIN = 'PALADIN';
-DC.CLASS_PRIEST = 'PRIEST';
-DC.CLASS_ROGUE = 'ROGUE';
-DC.CLASS_SHAMAN = 'SHAMAN';
-DC.CLASS_WARLOCK = 'WARLOCK';
-DC.CLASS_WARRIOR = 'WARRIOR';
-DC.CLASS_DEATHKNIGHT = 'DEATHKNIGHT';
+for class in pairs(RAID_CLASS_COLORS) do
+ DC["CLASS_"..class] = class
+end
DC.MyClass = "NOCLASS";
DC.MyName = "NONAME";
@@ -529,16 +522,6 @@ function D:OnInitialize() -- Called on ADDON_LOADED -- {{{
};
end
- --[=[ this exception is no longer required since Consume magic no longer exists: http://www.wowwiki.com/Consume_Magic
- -- Thanks to Chinese localization team of WoW we have to make anOTHER exception.... ://///
- -- They found the way to call two different spells the same (Devour Magic and Consume Magic... (both are called "吞噬魔法" )
- if ((select(2, UnitClass("player"))) == "PRIEST") then
- DC.SpellsToUse[DS["PET_FEL_CAST"]] = nil; -- so we remove PET_FEL_CAST.
- end
- --]=]
-
- -- // }}}
-
-- New Comm Part used for version checking
-- only if AceComm is here
diff --git a/Decursive/Dcr_Raid.lua b/Decursive/Dcr_Raid.lua
index 3cc2fa7..78f413e 100644
--- a/Decursive/Dcr_Raid.lua
+++ b/Decursive/Dcr_Raid.lua
@@ -191,6 +191,7 @@ DC.ClassNumToLName = {
[18] = LC[DC.CLASS_WARLOCK],
[19] = LC[DC.CLASS_WARRIOR],
[20] = LC[DC.CLASS_DEATHKNIGHT],
+ [21] = LC[DC.CLASS_HERO],
}
DC.ClassLNameToNum = D:tReverse(DC.ClassNumToLName);
@@ -206,6 +207,7 @@ DC.ClassNumToUName = {
[18] = DC.CLASS_WARLOCK,
[19] = DC.CLASS_WARRIOR,
[20] = DC.CLASS_DEATHKNIGHT,
+ [21] = DC.CLASS_HERO,
}
DC.ClassUNameToNum = D:tReverse(DC.ClassNumToUName);
diff --git a/Decursive/Dcr_lists.xml b/Decursive/Dcr_lists.xml
index 47198fa..26b957d 100644
--- a/Decursive/Dcr_lists.xml
+++ b/Decursive/Dcr_lists.xml
@@ -86,7 +86,7 @@
-
+
@@ -416,7 +416,7 @@
-
+
@@ -878,6 +878,28 @@
+