Merge Damage and Source types.

src/engine/objects/ItemBase.java

@@ -10,7 +10,6 @@
 package engine.objects;
 
 import engine.Enum;
-import engine.Enum.DamageType;
 import engine.Enum.GameObjectType;
 import engine.Enum.ItemType;
 import engine.gameManager.DbManager;
@@ -72,7 +71,7 @@ public class ItemBase {
     private final short minDamage;
     private final short maxDamage;
     private final String mastery;
-    private final engine.Enum.DamageType damageType;
+    private final engine.Enum.SourceType damageType;
     private final boolean twoHanded;
     private boolean isConsumable;
     private boolean isStackable;
@@ -133,7 +132,7 @@ public class ItemBase {
         this.requiredDiscs = DbManager.parseEnumSet(rs.getString("disc_required"), Enum.DisciplineType.class);
 
         this.mastery = rs.getString("mastery");
-        damageType = DamageType.valueOf(rs.getString("damageType"));
+        damageType = Enum.SourceType.valueOf(rs.getString("damageType"));
 
         this.twoHanded = (rs.getInt("twoHanded") == 1);
 
@@ -900,7 +899,7 @@ public class ItemBase {
     /**
      * @return the damageType
      */
-    public engine.Enum.DamageType getDamageType() {
+    public Enum.SourceType getDamageType() {
         return damageType;
     }