Add extra methods to map and battle interface

src/main/java/InteractableEntity/Enemy.java

@@ -3,9 +3,30 @@
 public class Enemy extends InteractableEntity{
     protected int damage;
     protected int defence;
+    protected int health;
 
-    public Enemy(int dmg, int def){
+    public Enemy(int dmg, int def, int hp){
         this.damage = dmg;
         this.defence = def;
+        this.health = hp;
+    }
+
+    public int getHealth(){
+        return health;
+    }
+    public void setDamage(int dmg){
+        damage = dmg;
+    }
+
+    public void harmHealth(int dmg){
+        health -= dmg;
+    }
+
+    public int getDefence(){
+        return defence;
+    }
+
+    public int getDamage() {
+        return damage;
     }
 }

src/main/java/command/fight/FightingCommand.java

@@ -1,8 +1,6 @@
 package command.fight;
-
 import command.Command;
-import map.AMap;
-import map.FirstMap;
+
 
 public class FightingCommand extends Command {
     public FightingCommand() {

src/main/java/command/mapmove/InteractingCommand.java

@@ -5,14 +5,18 @@
 import map.BattleInterface.BattleInterface;
 
 public class InteractingCommand extends MapMoveCommand {
+
+    public InteractingCommand(){
+        commandDescription = "interact";
+    }
     @Override
     public void execute() {
         String entityInteractedWith = currentMap.handleInteract();
         System.out.println(entityInteractedWith);
         AMap battleMap;
         switch (entityInteractedWith) {
         case "@":
-            InteractableEntity monster = new Enemy(10, 10);
+            InteractableEntity monster = new Enemy(10, 10, 10);
             battleMap = new BattleInterface(playerStatus, textBox, monster);
             battleMap.initMap(30, 10);
             currentMap = battleMap;

src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java

@@ -43,7 +43,6 @@ public void startGame() {
                 ui.printPlayerStatus(playerStatus);
                 ui.printMap(map);
             }
-            textBox.nextTextBoxBasedOnMapAndCommand(userCommand, map);
         }
     }
 

src/main/java/map/BattleInterface/BattleInterface.java

@@ -2,9 +2,12 @@
 
 import InteractableEntity.Enemy;
 import InteractableEntity.InteractableEntity;
+import command.Command;
 import map.AMap;
+import parser.Parser;
 import textbox.PlayerStatus;
 import textbox.TextBox;
+import ui.Ui;
 
 import java.lang.management.PlatformLoggingMXBean;
 import java.util.ArrayList;
@@ -14,10 +17,12 @@ public class BattleInterface extends AMap {
     protected TextBox currentTextBox;
     protected InteractableEntity currentEntity;
 
+
     public BattleInterface(PlayerStatus player, TextBox text, InteractableEntity entity) {
         this.currentPlayer = player;
         this.currentTextBox = text;
         this.currentEntity = entity;
+
     }
 
     public void initMap(int givenWidth, int givenHeight) {
@@ -45,4 +50,28 @@ public void initMap(int givenWidth, int givenHeight) {
         }
     }
 
+
+    public void playerHitEnemy(){
+        if (currentEntity instanceof Enemy){
+            int dmgDone = 10 - (10 * ((Enemy) currentEntity).getDefence());
+            ((Enemy) currentEntity).harmHealth(dmgDone);
+        }
+    }
+
+    public void enemyHitPlayer(){
+        if (currentEntity instanceof Enemy){
+            int dmgDone = ((Enemy) currentEntity).getDamage();
+            currentPlayer.harmHealth(dmgDone);
+        }
+    }
+
+
+    public InteractableEntity getCurrentEntity(){
+        return currentEntity;
+    }
+
+    public PlayerStatus getCurrentPlayer(){
+        return currentPlayer;
+    }
+
 }

src/main/java/textbox/PlayerStatus.java

@@ -35,4 +35,8 @@ public void setPlayerHealth(int playerHealth) {
     public void setPlayerMoney(int playerMoney) {
         this.playerMoney = playerMoney;
     }
+
+    public void harmHealth(int dmg){
+        playerHealth -= dmg;
+    }
 }