Accuracy hit moves

src/main/java/dk/sdu/mmmi/modulemon/Monster/BattleMonsterProcessor.java

@@ -4,6 +4,8 @@
 import dk.sdu.mmmi.modulemon.CommonMonster.IMonster;
 import dk.sdu.mmmi.modulemon.CommonMonster.IMonsterMove;
 
+import java.util.Random;
+
 public class BattleMonsterProcessor implements IBattleMonsterProcessor {
 
     @Override
@@ -22,6 +24,7 @@ public int calculateDamage(IMonster iSource, IMonsterMove iMove, IMonster iTarge
         float sourceAttack = (float) source.getAttack();
         float targetDefence = (float) target.getDefence();
 
+        if (!doAccuracyHit(move.getAccuracy())) { return 0; }
         // Same type attack bonus. Effectively the same as STAB in that other game
         boolean same_attack_type = source.getMonsterType() == move.getType();
         float attack_bonus = 1;
@@ -92,4 +95,10 @@ public float calculateTypeAdvantage(MonsterType source, MonsterType target) {
         }
     }
 
+    public boolean doAccuracyHit(float factor) {
+        //Generates a random value
+        Random random = new Random();
+        //Ensures that the next move will always be below our factor and between(0-1)
+        return random.nextFloat() <= factor;
+    }
 }

src/main/java/dk/sdu/mmmi/modulemon/Monster/MonsterMove.java

@@ -11,18 +11,13 @@ public class MonsterMove implements IMonsterMove {
     private MonsterType type;
     private String soundPath;
 
-    public MonsterMove(String name, int damage, MonsterType type, String soundPath) {
+    private float accuracy = 1f;
+    public MonsterMove(String name, int damage, MonsterType type, String soundPath, float accuracy) {
         this.name = name;
         this.damage = damage;
         this.type = type;
         this.soundPath = soundPath;
-    }
-
-    public MonsterMove(String name, int damage, MonsterType type) {
-        this.name = name;
-        this.damage = damage;
-        this.type = type;
-        this.soundPath = "sounds/tackle.ogg";
+        this.accuracy = accuracy;
     }
 
     @Override
@@ -59,4 +54,8 @@ public String getSummaryScreenDescription() {
     public String toString() {
         return this.getName();
     }
+
+    public float getAccuracy() {
+        return accuracy;
+    }
 }

src/main/java/dk/sdu/mmmi/modulemon/Monster/MonsterParser.java

@@ -49,16 +49,20 @@ private static HashMap<String, IMonsterMove> instantiateMoves(JSONArray jsonMove
         for (int i = 0; i < jsonMoves.length(); i++) {
             JSONObject JSONMove = jsonMoves.getJSONObject(i);
             String soundPath;
+            float accuracy = 1f;
             if (JSONMove.has("sound")) {
                 soundPath = JSONMove.getString("sound");
             }
             else {
                 soundPath = "sounds/tackle.ogg";
             }
+            if (JSONMove.has("accuracy")) {
+                accuracy = JSONMove.getFloat("accuracy");
+            }
             IMonsterMove move = new MonsterMove(JSONMove.getString("name"),
                     JSONMove.getInt("damage"),
                     monsterTypeHashMap.get(JSONMove.getString("type").toLowerCase()),
-                    soundPath);
+                    soundPath, accuracy);
             moves.put(JSONMove.getString("id"), move);
         }
         return moves;

src/main/resources/json/monsters.json

@@ -44,7 +44,7 @@
     "moves" : [
       "slam",
       "tornado",
-      "zap",
+      "kamikaze",
       "spit"
     ],
     "front": "/images/bird_front.png",

src/main/resources/json/moves.json

@@ -124,5 +124,13 @@
     "damage": 60,
     "type": "AIR",
     "sound": "/sounds/screech.ogg"
+  },
+  {
+    "id": "kamikaze",
+    "name": "Kamikaze",
+    "damage": 120,
+    "type": "AIR",
+    "sound": "/sounds/screech.ogg",
+    "accuracy": 0.4
   }
 ]