Merge pull request #15 from LittleBeasts/LIT-129

Lit 129

Author: BigKahuna7385

calculationEngine.iml

@@ -2,7 +2,18 @@
 
 public enum CeAttacks {
 
-    Punch(CeBeastTypes.Fire, 10, 10, 2, 3, "Punch"), //TODO: Add attacks
+    Punch(CeBeastTypes.PlayerStandard, 10, 10, 2, 20, "Punch"), //TODO: Add attacks
+    Incinerate(CeBeastTypes.Fire, 15, 8, 0, 5,"Incinerate"),
+    Drain(CeBeastTypes.Earth, 10, 10, 3, 10, "Drain Sanity"),
+    Charge(CeBeastTypes.Boss, 20, 5, 2, 5, "Charge Attack"),
+    Whip(CeBeastTypes.Boss, 12, 8, 5, 7, "Water Whip"),
+    Scratch(CeBeastTypes.PlayerStandard, 10, 10, 2, 20, "Scratch"),
+    Swipe(CeBeastTypes.Earth, 15, 10, 1, 15, "Tentacle Swipe"),
+    Arcane(CeBeastTypes.Earth, 20, 7, 2, 5, "Arcane Blast"),
+    Sucker(CeBeastTypes.Earth, 12, 10, 8, 15,  "Sucker Punch"),
+    Acid(CeBeastTypes.Water, 10, 10, 5, 15, "Acid Downpour"),
+    FireBall(CeBeastTypes.Fire, 15, 10, 3, 15, "Fire Ball"),
+    Bite(CeBeastTypes.PlayerStandard, 10, 10, 3, 20, "Bite"),
     Flee(CeBeastTypes.PlayerStandard, 0, 0, 0, 0, "Flee"),
     Catch(CeBeastTypes.PlayerStandard, 10, 10, 2, 3, "Catch");
 

src/main/java/calculationEngine/entities/CeAttacks.java

@@ -5,6 +5,7 @@ public enum CeBeastTypes {
     Fire("Water", "Earth"),
     Water("Earth", "Fire"),
     Earth("Water", "Fire"),
+    Boss("All", "None"),
     PlayerStandard("NONE", "NONE");
 
     private final String resistanceId;