Merge pull request #33 from BME-MIT-IET/origin/konrad_ManualTest

Kiírhatatlan string karakter + öntámadás javítása + AxeDestroy

src/main/java/virologist/control/Controller.java

@@ -37,7 +37,7 @@ public Controller(Game game) {
      */
     public void attack(Virologist v){
         Virologist currentPlayer = game.GetCurrentPlayer();
-        actionMessage = v.getName() + " might be dead by now▄";
+        actionMessage = v.getName() + " might be dead by now...";
         currentPlayer.Attack(v);
         if(!currentPlayer.equals(game.GetCurrentPlayer())){
             currentPlayer.detach(window);

src/main/java/virologist/model/equipments/Axe.java

@@ -35,6 +35,7 @@ public void Attack(Virologist attacker, Virologist target) {
         attacker.DecreaseActions();
         target.Kill();
         used = true;
+        attacker.RemoveEquipment(this);
         attacker.Reset();
     }
 }

src/main/java/virologist/view/Window.java

@@ -58,16 +58,21 @@ public Window(Controller controller, Game game){
         mainMenu.add(actions);
         frame.setJMenuBar(mainMenu);
 
-        JMenu attack= new JMenu("attack");
+        JMenu attack = new JMenu("attack");
         actions.add(attack);
         attack.addMenuListener(new ViewMenuListener(()->{
-            attack.removeAll();
+           attack.removeAll();
            Virologist v = game.GetCurrentPlayer();
-            for (Virologist vir : v.getField().GetVirologists() ) {
-                JMenuItem item = new JMenuItem(vir.getName());
-                item.addActionListener((e)->controller.attack(vir));
-                attack.add(item);
+           ArrayList<Virologist> playersOnField = v.getField().GetVirologists();
+
+                for (Virologist vir : playersOnField) {
+                    if(vir != game.GetCurrentPlayer()){
+                    JMenuItem item = new JMenuItem(vir.getName());
+                    item.addActionListener((e)->controller.attack(vir));
+                    attack.add(item);
+                }               
             }
+
         }));
 
         JMenu move= new JMenu("move");