Merge Damage and Source types.

src/engine/powers/DamageShield.java

@@ -8,23 +8,22 @@
 
 
 package engine.powers;
-
-import engine.Enum.DamageType;
+import engine.Enum;
 
 public class DamageShield {
 
-    private final DamageType damageType;
+    private final Enum.SourceType damageType;
     private final float amount;
     private final boolean usePercent;
 
-    public DamageShield(DamageType damageType, float amount, boolean usePercent) {
+    public DamageShield(Enum.SourceType damageType, float amount, boolean usePercent) {
         super();
         this.damageType = damageType;
         this.amount = amount;
         this.usePercent = usePercent;
     }
 
-    public DamageType getDamageType() {
+    public Enum.SourceType getDamageType() {
         return this.damageType;
     }