Initial refactor of damagetype

src/engine/Enum.java

@@ -724,118 +724,178 @@ public class Enum {
         }
     }
 
+    public enum DamageType {
+        None,
+        Crush,
+        Slash,
+        Siege,
+        Pierce,
+        Magic,
+        Bleed,
+        Poison,
+        Mental,
+        Holy,
+        Unholy,
+        Lightning,
+        Fire,
+        Cold,
+        Healing,
+        Acid,
+        Disease,
+        Unknown,
+        // these added for immunities
+        Attack,
+        Powers,
+        Combat,
+        Spires,
+        Snare,
+        Stun,
+        Blind,
+        Root,
+        Fear,
+        Charm,
+        PowerBlock,
+        DeBuff,
+        Powerblock,
+        Steel,
+        Drain;
+
+        public static DamageType GetDamageType(String modName) {
+            DamageType damageType;
+            if (modName.isEmpty())
+                return DamageType.None;
+
+            try {
+                damageType = DamageType.valueOf(modName.replace(",", ""));
+            } catch (Exception e) {
+                Logger.error(e);
+                return DamageType.None;
+            }
+            return damageType;
+        }
+    }
+
+
     public enum SourceType {
-        NONE,
-        ABJURATION,
-        ACID,
-        ANTISIEGE,
-        ARCHERY,
-        AXE,
-        BARDSONG,
-        BEASTCRAFT,
-        BENEDICTION,
-        BLADEWEAVING,
-        BLEEDING,
-        BLIND,
-        BLOCK,
-        BLOODCRAFT,
-        BOW,
-        BUFF,
-        CHANNELING,
-        CHARM,
+        None,
+        Abjuration,
+        Acid,
+        AntiSiege,
+        Archery,
+        Axe,
+        Bardsong,
+        Beastcraft,
+        Benediction,
+        BladeWeaving,
+        Bleed,
+        Blind,
+        Block,
+        Bloodcraft,
+        Bow,
+        Buff,
+        Channeling,
+        Charm,
+        Cold,
         COLD,
-        CONSTITUTION,
-        CORRUPTION,
-        CROSSBOW,
-        CRUSHING,
-        DAGGER,
-        DAGGERMASTERY,
-        DEBUFF,
-        DEXTERITY,
-        DISEASE,
-        DODGE,
-        DRAGON,
-        DRAIN,
-        EARTH,
-        EFFECT,
-        EXORCISM,
-        FEAR,
+        Constitution,
+        Corruption,
+        Crossbow,
+        Crush,
+        Dagger,
+        DaggerMastery,
+        DeBuff,
+        Dexterity,
+        Disease,
+        Dodge,
+        Dragon,
+        Drain,
+        Earth,
+        Effect,
+        Exorcism,
+        Fear,
+        Fire,
         FIRE,
-        FLY,
-        GIANT,
-        GREATAXEMASTERY,
-        GREATSWORDMASTERY,
-        HAMMER,
-        HEALING,
+        Fly,
+        Giant,
+        GreatAxeMastery,
+        GreatSwordMastery,
+        Hammer,
+        Heal,
+        Healing,
+        Holy,
         HOLY,
-        IMMUNETOATTACK,
-        IMMUNETOPOWERS,
-        INTELLIGENCE,
-        INVISIBLE,
+        ImmuneToAttack,
+        ImmuneToPowers,
+        Intelligence,
+        Invisible,
+        Lightning,
         LIGHTNING,
-        LITURGY,
+        Liturgy,
+        Magic,
         MAGIC,
+        Mental,
         MENTAL,
-        NATURELORE,
-        NECROMANCY,
-        PARRY,
-        PIERCING,
+        NatureLore,
+        Necromancy,
+        Parry,
+        Pierce,
+        Poison,
         POISON,
-        POLEARM,
-        POWERBLOCK,
-        RAT,
-        RESISTDEBUFF,
-        RESTORATION,
-        ROOT,
-        SHADOWMASTERY,
-        SIEGE,
-        SLASHING,
-        SNARE,
-        SORCERY,
-        SPEAR,
-        SPEARMASTERY,
-        SPIRIT,
-        STAFF,
-        STEAL,
-        STORMCALLING,
-        STRENGTH,
-        STUN,
-        SUMMON,
-        SWORD,
-        SWORDMASTERY,
-        THAUMATURGY,
-        THEURGY,
-        TRANSFORM,
-        UNARMEDCOMBAT,
-        UNARMEDCOMBATMASTERY,
+        PoleArm,
+        Powerblock,
+        Rat,
+        ResistDeBuff,
+        Restoration,
+        Root,
+        Shadowmastery,
+        Siege,
+        Slash,
+        Snare,
+        Sorcery,
+        Spear,
+        SpearMastery,
+        Spirit,
+        Staff,
+        Stormcalling,
+        Strength,
+        Stun,
+        Summon,
+        Sword,
+        SwordMastery,
+        Thaumaturgy,
+        Theurgy,
+        Transform,
+        UnarmedCombat,
+        UnarmedCombatMastery,
+        Unholy,
         UNHOLY,
-        UNKNOWN,
-        WARDING,
-        WARLOCKRY,
-        WAYOFTHEGAANA,
-        WEARARMORHEAVY,
-        WEARARMORLIGHT,
-        WEARARMORMEDIUM,
-        WEREFORM,
-        ATHLETICS,
-        AXEMASTERY,
-        BARGAINING,
-        BLADEMASTERY,
-        FLAMECALLING,
-        GREATHAMMERMASTERY,
-        HAMMERMASTERY,
-        LEADERSHIP,
-        POLEARMMASTERY,
-        RUNNING,
-        STAFFMASTERY,
-        THROWING,
-        TOUGHNESS,
-        WAYOFTHEWOLF,
-        WAYOFTHERAT,
-        WAYOFTHEBEAR,
-        ORTHANATOS,
-        SUNDANCING,
-        //POWER CATEGORIES.
+        Unknown,
+        Warding,
+        Warlockry,
+        WayoftheGaana,
+        WearArmorHeavy,
+        WearArmorLight,
+        WearArmorMedium,
+        Wereform,
+        Athletics,
+        AxeMastery,
+        Bargaining,
+        BladeMastery,
+        FlameCalling,
+        GreatHammerMastery,
+        HammerMastery,
+        Leadership,
+        PoleArmMastery,
+        Running,
+        StaffMastery,
+        Throwing,
+        Toughness,
+        WayoftheWolf,
+        WayoftheRat,
+        WayoftheBear,
+        Orthanatos,
+        SunDancing,
+        //Power categories.
         AE,
         AEDAMAGE,
         BEHAVIOR,
@@ -843,8 +903,10 @@ public class Enum {
         BOONCLASS,
         BOONRACE,
         BREAKFLY,
+        BUFF,
         CHANT,
         DAMAGE,
+        DEBUFF,
         DISPEL,
         FLIGHT,
         GROUPBUFF,
@@ -857,24 +919,27 @@ public class Enum {
         SPIREDISABLE,
         SPIREPROOFTELEPORT,
         STANCE,
+        STUN,
+        SUMMON,
         TELEPORT,
         THIEF,
         TRACK,
+        TRANSFORM,
         VAMPDRAIN,
         WEAPON,
-        WIZARDRY;
+        Wizardry;
 
         public static SourceType GetSourceType(String modName) {
             SourceType returnMod;
             if (modName.isEmpty())
-                return SourceType.NONE;
+                return SourceType.None;
 
             try {
-                returnMod = SourceType.valueOf(modName.replace(",", "").toUpperCase());
+                returnMod = SourceType.valueOf(modName.replace(",", ""));
             } catch (Exception e) {
                 Logger.error(modName);
                 Logger.error(e);
-                return SourceType.NONE;
+                return SourceType.None;
             }
             return returnMod;
         }