Merge Damage and Source types.

src/engine/Enum.java

@@ -774,58 +774,6 @@ 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,
@@ -837,7 +785,7 @@ public class Enum {
         Beastcraft,
         Benediction,
         BladeWeaving,
-        Bleed,
+        Bleeding,
         Blind,
         Block,
         Bloodcraft,
@@ -846,11 +794,10 @@ public class Enum {
         Channeling,
         Charm,
         Cold,
-        COLD,
         Constitution,
         Corruption,
         Crossbow,
-        Crush,
+        Crushing,
         Dagger,
         DaggerMastery,
         DeBuff,
@@ -864,16 +811,13 @@ public class Enum {
         Exorcism,
         Fear,
         Fire,
-        FIRE,
         Fly,
         Giant,
         GreatAxeMastery,
         GreatSwordMastery,
         Hammer,
-        Heal,
         Healing,
         Holy,
-        HOLY,
         ImmuneToAttack,
         ImmuneToPowers,
         Intelligence,
@@ -882,15 +826,12 @@ public class Enum {
         LIGHTNING,
         Liturgy,
         Magic,
-        MAGIC,
         Mental,
-        MENTAL,
         NatureLore,
         Necromancy,
         Parry,
-        Pierce,
+        Piercing,
         Poison,
-        POISON,
         PoleArm,
         Powerblock,
         Rat,
@@ -899,13 +840,14 @@ public class Enum {
         Root,
         Shadowmastery,
         Siege,
-        Slash,
+        Slashing,
         Snare,
         Sorcery,
         Spear,
         SpearMastery,
         Spirit,
         Staff,
+        Steal,
         Stormcalling,
         Strength,
         Stun,
@@ -918,7 +860,6 @@ public class Enum {
         UnarmedCombat,
         UnarmedCombatMastery,
         Unholy,
-        UNHOLY,
         Unknown,
         Warding,
         Warlockry,