Merge Damage and Source types.

src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java

@@ -8,8 +8,7 @@
 
 
 package engine.powers.effectmodifiers;
-
-import engine.Enum.DamageType;
+import engine.Enum;
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
 import engine.powers.DamageShield;
@@ -49,7 +48,8 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
                 amount *= (1 + mod);
         }
 
-        DamageType dt = DamageType.valueOf(this.type);
+        Enum.SourceType dt = Enum.SourceType.valueOf(this.type);
+
         if (dt != null) {
             DamageShield ds = new DamageShield(dt, amount, usePercent);
             PlayerBonuses bonus = ac.getBonuses();