From 60f3edb6561e3e5656735deb2dd4d90caa14609a Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sun, 7 Jun 2020 15:21:27 +0200
Subject: [PATCH] made getter for username

---
 .../src/netwerkprog/game/client/MainGame.java | 23 +++++++++++++++++--
 .../game/client/game/characters/Team.java     |  9 ++++++++
 .../client/game/map/GameInputProcessor.java   | 13 ++---------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index 9581f14..b15a289 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -25,6 +25,7 @@ import netwerkprog.game.client.game.map.Map;
 import netwerkprog.game.client.game.map.MapRenderer;
 import netwerkprog.game.util.data.Data;
 import netwerkprog.game.util.data.connection.NameData;
+import netwerkprog.game.util.data.connection.ReadyData;
 import netwerkprog.game.util.data.connection.TeamData;
 import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
@@ -387,13 +388,31 @@ public class MainGame extends Game implements ClientCallback {
 
         } else if (data instanceof ReadyData) {
             ReadyData readyData = (ReadyData) data;
-            if (readyData.getUsername().equals(this.username)) {
-
+            if (!readyData.getUsername().equals(this.username)) {
+                this.enemyReady = true;
+                System.out.println("enemy is ready");
             }
         }
 
     }
 
+    public void chooseHacker() {
+        System.out.println("chose HACKER");
+        setChosenFaction(Faction.HACKER);
+        send(new TeamData(Faction.MEGACORPORATION, getUsername()));
+//                mainGame.initCharacters();
+//                camera.translate(-400, 0);
+//                mainGame.setGamestate(GAMESTATE.PLAYING);
+    }
+
+    public void chooseMegaCorp() {
+        System.out.println("chose MEGA CORP");
+        setChosenFaction(Faction.MEGACORPORATION);
+        send(new TeamData(Faction.MEGACORPORATION, getUsername()));
+//                mainGame.initCharacters();
+//                mainGame.setGamestate(GAMESTATE.PLAYING);
+    }
+
     public String getUsername() {
         return username;
     }
diff --git a/core/src/netwerkprog/game/client/game/characters/Team.java b/core/src/netwerkprog/game/client/game/characters/Team.java
index c419d3d..436fca7 100644
--- a/core/src/netwerkprog/game/client/game/characters/Team.java
+++ b/core/src/netwerkprog/game/client/game/characters/Team.java
@@ -42,6 +42,15 @@ public class Team {
         return null;
     }
 
+    public GameCharacter get(String username) {
+        for (GameCharacter cur : this.members) {
+            if (cur.getName().equals(username)) {
+                return cur;
+            }
+        }
+        return null;
+    }
+
     public GameCharacter get(int position) {
         if (position >= this.members.getSize()) {
             throw new IndexOutOfBoundsException("position out of range");
diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index d7a90b1..c463a53 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -119,19 +119,10 @@ public class GameInputProcessor implements InputProcessor {
             }
         } else if (mainGame.getGamestate() == GAMESTATE.SELECTING_FACTION) {
             if (keycode == Input.Keys.NUM_1) {
-                System.out.println("chose MEGA CORP");
-                mainGame.setChosenFaction(Faction.MEGACORPORATION);
-                mainGame.send(new TeamData(Faction.MEGACORPORATION, mainGame.getUsername()));
-//                mainGame.initCharacters();
-//                mainGame.setGamestate(GAMESTATE.PLAYING);
+                mainGame.chooseMegaCorp();
             }
             if (keycode == Input.Keys.NUM_2) {
-                System.out.println("chose HACKER");
-                mainGame.setChosenFaction(Faction.HACKER);
-                mainGame.send(new TeamData(Faction.MEGACORPORATION, mainGame.getUsername()));
-//                mainGame.initCharacters();
-//                camera.translate(-400, 0);
-//                mainGame.setGamestate(GAMESTATE.PLAYING);
+             mainGame.chooseHacker();
             }
 
         }