From 8b4538da3952fd6ea800a98a3fe3ae4a2b5d42f1 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sat, 6 Jun 2020 14:40:22 +0200
Subject: [PATCH 1/7] add square to selected character

---
 core/assets/square.png                        | Bin 0 -> 913 bytes
 .../src/netwerkprog/game/client/MainGame.java |  21 +++++++++-
 .../netwerkprog/game/client/game/Game.java    |  15 -------
 .../game/client/game/Graphics.java            |  14 -------
 .../client/game/map/GameInputProcessor.java   |   7 +++-
 .../game/client/game/map/MapRenderer.java     |  12 +++++-
 .../game/util/graphics/TextRenderer.java      |  38 ++++++++++++++++++
 7 files changed, 75 insertions(+), 32 deletions(-)
 create mode 100644 core/assets/square.png
 delete mode 100644 core/src/netwerkprog/game/client/game/Game.java
 delete mode 100644 core/src/netwerkprog/game/client/game/Graphics.java
 create mode 100644 core/src/netwerkprog/game/util/graphics/TextRenderer.java

diff --git a/core/assets/square.png b/core/assets/square.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b1e50f9add9186437928d2f422574a610776e5f
GIT binary patch
literal 913
zcmV;C18)3@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008wdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=J?lH@21MfaRyj({YD#Bnf~h`B)@e?FLUR%TUq
zM0d=h7iq#amc<w731?L}fBZYbKRBoehot7Y<Q#FNk_uOJJYL6jr<m4t9lT%R`N<yc
z7Yvi&F4to|w||9Q9|J6H`|)fK*0zpsA&O6-Wk#O;?dMxa__EV}4rPz4>C<xd$!*Ji
zEbHYt8IsWzddLx<LK1QH8AYzM;>_0-P9zC^Sr!udK6l~nz9jGNz2q*|ZI|a%gqXKO
ze#z0clfKyH4#Q6~qDSPX7p8ZJFS#3|`xxi7x|%XFmBU`t$5K`gjt5dHYgk4zoQl4!
zR?r+vY#`P_^FV8X3Nf-hC{d?MgU)qt)G)=wCmZg}jb+(fj0-op5TMaulOjEcgHr=F
zftl~Q(284Dyhe`5o#4p?F~W#1EqrJElXeS@F-w;y`kgDxi)T$^8k5|-!V5rX?40V#
z?`q*w-Na8|1q5}a*|ESHk4xfEdeoLI&H_J;Da31Qko7Hq6d|@^GN|H2F_S1|ipFe2
z$fJW##mrd}A0R-g+$jvOLG=TU^Nfu#M$4C#FEc(Z0HN3-1~f$~V5Ov}A4`rJsw$d-
zs%ABHEn2hWlr`sUd48j+i6v9ZX69C`x_EN+?B?#pYvCgJglWmeLh({ctq58nT`{`C
zqt=5DIntp=KJ4(L9JQf*T58&Iv*xX|+PO=|_V2k{=-x}OC!HvzGo5<o(@sCjSqExu
z$Vfv+9yWZGQEzIS>N7QZA@^%)w5d&EY5CcM8q8)N5;Q+2I+=kOCjxPs1W?dCnMJ3R
zc#@mUVqt6wWl$rXa5_z5Aec^K9dxsMkozUKpy{``@z2PGiSGX(7bdz*?kl%%sP(#j
zQDgy{yKv?-%D{)MAC<lGadH~X;_Q2kzk3gVI`A#@7J3W4h2BDMp|{ZADKzj01peI&
z{{aoTl5wPPKZO7Q00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9b^rhX
z2XskIMF->t1`H$%gbJ7f0000mNkl<ZSi|kkK>+|T2n3*Wfec~)PA-NYNI+$Ka_Hrl
nfPjF2fPjF2fPjF2fPlaUFXsWTKSm>y00000NkvXXu0mjf9}1m;

literal 0
HcmV?d00001

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index 65e9ced..c06fdf6 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -7,6 +7,8 @@ import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -18,6 +20,7 @@ import netwerkprog.game.client.game.map.MapRenderer;
 import netwerkprog.game.client.game.map.GameInputProcessor;
 import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.FrameRate;
+import netwerkprog.game.util.graphics.TextRenderer;
 
 public class MainGame extends ApplicationAdapter {
     SpriteBatch batch;
@@ -29,6 +32,10 @@ public class MainGame extends ApplicationAdapter {
     private GameInputProcessor gameInputProcessor;
     private GameCharacter selectedCharacter;
     private Team team;
+    private Team enemyTeam;
+    private TextRenderer textRenderer;
+    private BitmapFont font;
+
 
     private Map map;
     public MapRenderer mapRenderer;
@@ -55,6 +62,8 @@ public class MainGame extends ApplicationAdapter {
         screenHeight = Gdx.graphics.getHeight();
         frameRate = new FrameRate();
         camera = new OrthographicCamera(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+        textRenderer = new TextRenderer();
+        font = new BitmapFont();
 
 
         String[] strings = new String[]{
@@ -80,6 +89,7 @@ public class MainGame extends ApplicationAdapter {
         camera.viewportWidth = screenWidth / 2;
         camera.viewportHeight = screenHeight / 2;
         camera.update();
+
         initCharacters();
 //        this.tree.insert(new Hacker(,new BodySwap()));
 
@@ -93,7 +103,7 @@ public class MainGame extends ApplicationAdapter {
     private void initCharacters() {
         Texture texture = new Texture(Gdx.files.internal("core/assets/characters.png"));
         TextureRegion[][] characters = TextureRegion.split(texture, 32, 32);
-        this.testCharacter = new Hacker("harry",characters[1][0], new BodySwap("test"));
+        this.testCharacter = new Hacker("harryyyyyyyyyy",characters[1][0], new BodySwap("test"));
         GameCharacter character2 = new Hacker("test2",characters[2][0], new BodySwap("test"));
         this.setSelectedCharacter(testCharacter);
         mapRenderer.getGameTiles()[1][1].visit(testCharacter);
@@ -135,6 +145,13 @@ public class MainGame extends ApplicationAdapter {
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
         mapRenderer.render();
         frameRate.render();
+        renderText();
+
+    }
+
+    private void renderText() {
+        String text = "Selected character: " + selectedCharacter.getName();
+        textRenderer.render(text,Gdx.graphics.getWidth() - text.length() * 6.5f,Gdx.graphics.getHeight() - 3);
     }
 
     /**
@@ -153,6 +170,7 @@ public class MainGame extends ApplicationAdapter {
         screenWidth = width;
         frameRate.resize(width, height);
         mapRenderer.resize(width, height);
+        textRenderer.resize(width,height);
     }
 
     @Override
@@ -163,6 +181,7 @@ public class MainGame extends ApplicationAdapter {
     @Override
     public void dispose() {
         batch.dispose();
+        textRenderer.dispose();
     }
 
     public float getScreenWidth() {
diff --git a/core/src/netwerkprog/game/client/game/Game.java b/core/src/netwerkprog/game/client/game/Game.java
deleted file mode 100644
index ddfdc1d..0000000
--- a/core/src/netwerkprog/game/client/game/Game.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package netwerkprog.game.client.game;
-
-import netwerkprog.game.util.application.Controller;
-
-public class Game extends Controller {
-
-
-    public Game() {
-    }
-
-    @Override
-    public void run() {
-
-    }
-}
diff --git a/core/src/netwerkprog/game/client/game/Graphics.java b/core/src/netwerkprog/game/client/game/Graphics.java
deleted file mode 100644
index 29747f0..0000000
--- a/core/src/netwerkprog/game/client/game/Graphics.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package netwerkprog.game.client.game;
-
-import netwerkprog.game.util.application.Controller;
-
-public class Graphics extends Controller {
-    public Graphics() {
-
-    }
-
-    @Override
-    public void run() {
-
-    }
-}
diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index 07ddc6c..9f9aa21 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -108,6 +108,10 @@ public class GameInputProcessor implements InputProcessor {
             }
 
             return true;
+        } else {
+            if (keycode == Input.Keys.ENTER) {
+
+            }
         }
         return false;
     }
@@ -132,7 +136,8 @@ public class GameInputProcessor implements InputProcessor {
                         if (mainGame.hasCharacterSelected() && !gameTile.containsCharacter()) {
 //                            System.out.println(mainGame.getSelectedCharacter());
                             removeCharacterFromTile(mainGame.getSelectedCharacter());
-                            gameTile.visit(mainGame.getSelectedCharacter());
+                            if (gameTile.getSymbol() != '#')
+                                gameTile.visit(mainGame.getSelectedCharacter());
                         }
                         if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
                             mainGame.setSelectedCharacter(gameTile.getCharacter());
diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
index 5baa40d..060e05f 100644
--- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -3,7 +3,9 @@ package netwerkprog.game.client.game.map;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import netwerkprog.game.client.MainGame;
 import netwerkprog.game.util.graphics.Renderable;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -17,8 +19,12 @@ public class MapRenderer implements Renderable {
     private OrthographicCamera cam;
     private static int x = 0;
     private static int y = 0;
+    private BitmapFont font;
+
+    private ShapeRenderer shapeRenderer;
 
     private MainGame mainGame;
+    private Texture square;
 
 
     public static TextureRegion FLOOR_TILE;
@@ -43,6 +49,8 @@ public class MapRenderer implements Renderable {
         cam = new OrthographicCamera(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
         this.camera = camera;
         this.mainGame = MainGame.getInstance();
+        font = new BitmapFont();
+        square = new Texture(Gdx.files.internal("square.png"));
         makeTiles();
     }
 
@@ -100,9 +108,11 @@ public class MapRenderer implements Renderable {
             for (int col = 0; col < gameTiles[0].length; col++) {
                 GameTile cur = gameTileRow[col];
                 batch.draw(cur.getTextureRegion(), cur.x, cur.y);
+
                 if (cur.containsCharacter()) {
                     batch.draw(cur.getCharacter().getTextureRegion(), cur.x, cur.y);
-//                    System.out.println("drawing character at " + cur.x + " " + cur.y);
+                    if (cur.getCharacter().equals(mainGame.getSelectedCharacter()))
+                        batch.draw(square, cur.x, cur.y);
                 }
             }
         }
diff --git a/core/src/netwerkprog/game/util/graphics/TextRenderer.java b/core/src/netwerkprog/game/util/graphics/TextRenderer.java
new file mode 100644
index 0000000..bfb6d19
--- /dev/null
+++ b/core/src/netwerkprog/game/util/graphics/TextRenderer.java
@@ -0,0 +1,38 @@
+package netwerkprog.game.util.graphics;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.utils.Disposable;
+
+public class TextRenderer implements Disposable {
+    private BitmapFont font;
+    private SpriteBatch batch;
+    private OrthographicCamera cam;
+
+    public TextRenderer() {
+        font = new BitmapFont();
+        batch = new SpriteBatch();
+        cam = new OrthographicCamera(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+
+    }
+    @Override
+    public void dispose() {
+        font.dispose();
+        batch.dispose();
+    }
+
+    public void resize(int screenWidth, int screenHeight) {
+        cam = new OrthographicCamera(screenWidth, screenHeight);
+        cam.translate(screenWidth / 2, screenHeight / 2);
+        cam.update();
+        batch.setProjectionMatrix(cam.combined);
+    }
+
+    public void render(String text, float x, float y) {
+        batch.begin();
+        font.draw(batch, text, x, y);
+        batch.end();
+    }
+}
-- 
2.47.2


From 3827098c42c037fb3aadbc3930e124014b11f995 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sat, 6 Jun 2020 15:27:22 +0200
Subject: [PATCH 2/7] added stuff

---
 core/assets/square2.png                       | Bin 0 -> 914 bytes
 .../src/netwerkprog/game/client/MainGame.java |  78 +++++++++++----
 .../game/client/game/GAMESTATE.java           |   6 ++
 .../client/game/map/GameInputProcessor.java   |  89 +++++++++++-------
 .../game/client/game/map/MapRenderer.java     |  48 +++++++++-
 5 files changed, 166 insertions(+), 55 deletions(-)
 create mode 100644 core/assets/square2.png
 create mode 100644 core/src/netwerkprog/game/client/game/GAMESTATE.java

diff --git a/core/assets/square2.png b/core/assets/square2.png
new file mode 100644
index 0000000000000000000000000000000000000000..70d3648d614fe0f1e8056fd920d952d162e0b6a3
GIT binary patch
literal 914
zcmV;D18w|?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008xdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=K7a^xrshTl2G9sx-RiQ`}}ReOUu{{CR%PIod>
zHB<XA4{gc@gpfd=pp$U^_;-YV@K6yBNzHS~IpRqr6|QJ_yq>G3nAUeayob<#l81YM
zArjPbb@RFPE9Cl^U}?*bXL+!;?f5pd2R;nS^gO+7J>Q0eFFEagD0^N_pSH8#(RdB(
zaSgrplOY&gVGl9lQ%EAdKE25GR=oN8LWxAtW|1ZNN$kSid<ov&dWl`ETQ1L`2r+Mk
z{1T%rC;dKlD?*=FL=VqT1E#l&udy55$2hOu)szvb9QLL@wz67KL^zYIX&J@vD%!S6
zL2+!cfmjF41EmEj#EABwM4c)PI#=DOVTp-PHq^|GWyxHO3pbev(kwLCq(~3q;L$)$
zAm)25wEULkuaU!ZCulOk7-7bj6224uNx2P;F;kZ)`W-8*i)T(_8I#=nLJL4>?3n6`
z?<(O_-o#H}1q5}4*|EVIkITfN^vEq)oCSIsQ;65mAnV%zLImH6#gKqN%t&m?6ph)4
z5Jv}}ij}h@K0ts}xl<TmBRC1h&eJ#M7%g2^zQnj%077wS3}}i}z)DGxKb9OhR8=$u
zRn2PZTC`@#DQnKz^1P#}i6v9ZX69C`x_EN+?B?#pYvCfe!nEXKp?E2!RyeINT`{{t
zqt=5DIntp=KJ4(L9JL{RT58&Iv*xX|+PO=|@$b1?=-x}OC!I*8Go5<o(@sCjSqE}$
z$Vfv+9yWZGQEzIS>N7QZA@^%)w5d&EY3bR68pLKFCTLzKI+=kOCjxPs1dz}?nMJ3R
zc#@mUVwo3}GN_SGIGrXj5KJer4!YSr$o-OA(DYl}_-Ew8ME8G?3lrTY_m$f>)OuaN
zD6#;}Q#fN9W#D2PTq=9zW8?~VadmJH{$3s8A5MH5dK-EhdK-EhdK-Eh`a2B?{(!*$
zkKsSFK9cziUZfTP000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4&KXw2B
z00(qQO+^Rf1_lim0OoN{jQ{`uFiAu~R9M69&M^@HFbD*&rzWt8|ADIvmPA1+y^}*P
o#{>if1Ox;G1Ox;G1Ox;GK9ODl#UPVmrvLx|07*qoM6N<$f@u(wH~;_u

literal 0
HcmV?d00001

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index c06fdf6..5702bf6 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -8,16 +8,19 @@ import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import netwerkprog.game.client.game.GAMESTATE;
 import netwerkprog.game.client.game.characters.Hacker;
 import netwerkprog.game.client.game.characters.Team;
 import netwerkprog.game.client.game.characters.abilities.BodySwap;
 import netwerkprog.game.client.game.map.Map;
 import netwerkprog.game.client.game.map.MapRenderer;
 import netwerkprog.game.client.game.map.GameInputProcessor;
+import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.FrameRate;
 import netwerkprog.game.util.graphics.TextRenderer;
@@ -35,11 +38,15 @@ public class MainGame extends ApplicationAdapter {
     private Team enemyTeam;
     private TextRenderer textRenderer;
     private BitmapFont font;
+    private GlyphLayout layout;
+    private GAMESTATE gamestate;
+    private Faction chosenFaction;
 
 
     private Map map;
     public MapRenderer mapRenderer;
 
+
     public GameCharacter testCharacter;
 
     private static MainGame INSTANCE;
@@ -64,17 +71,17 @@ public class MainGame extends ApplicationAdapter {
         camera = new OrthographicCamera(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
         textRenderer = new TextRenderer();
         font = new BitmapFont();
-
+        layout = new GlyphLayout();
 
         String[] strings = new String[]{
                 "#########################",
                 "#xxxx                   #",
                 "#   x                   #",
-                "#   xxxx                #",
-                "#      xx               #",
-                "#       x               #",
-                "#       x               #",
-                "#       x               #",
+                "#   xxxx     xxxxx      #",
+                "#   xxxx     xxxxx      #",
+                "#   xxxx     xx xx      #",
+                "#       x    xxxxx      #",
+                "#       x    xxxx       #",
                 "#       x               #",
                 "#           xxxxxx      #",
                 "#            x          #",
@@ -89,6 +96,7 @@ public class MainGame extends ApplicationAdapter {
         camera.viewportWidth = screenWidth / 2;
         camera.viewportHeight = screenHeight / 2;
         camera.update();
+        setGamestate(GAMESTATE.SELECTING_FACTION);
 
         initCharacters();
 //        this.tree.insert(new Hacker(,new BodySwap()));
@@ -103,8 +111,8 @@ public class MainGame extends ApplicationAdapter {
     private void initCharacters() {
         Texture texture = new Texture(Gdx.files.internal("core/assets/characters.png"));
         TextureRegion[][] characters = TextureRegion.split(texture, 32, 32);
-        this.testCharacter = new Hacker("harryyyyyyyyyy",characters[1][0], new BodySwap("test"));
-        GameCharacter character2 = new Hacker("test2",characters[2][0], new BodySwap("test"));
+        this.testCharacter = new Hacker("harryyyyyyyyyy", characters[1][0], new BodySwap("test"));
+        GameCharacter character2 = new Hacker("test2", characters[2][0], new BodySwap("test"));
         this.setSelectedCharacter(testCharacter);
         mapRenderer.getGameTiles()[1][1].visit(testCharacter);
         mapRenderer.getGameTiles()[1][2].visit(character2);
@@ -139,19 +147,36 @@ public class MainGame extends ApplicationAdapter {
      */
     @Override
     public void render() {
-        update();
-        // clear screen
-        Gdx.gl.glClearColor(0, 0, 0, 1);
-        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-        mapRenderer.render();
-        frameRate.render();
-        renderText();
+        if (this.gamestate == GAMESTATE.PLAYING) {
+            update();
+            // clear screen
+            Gdx.gl.glClearColor(0, 0, 0, 1);
+            Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+            mapRenderer.render();
+            frameRate.render();
+            renderText();
+        } else if (this.gamestate == GAMESTATE.SELECTING_FACTION) {
+            renderString("FACTION SELECT\nPress 1 for mega corporation, press 2 for hackers",Gdx.graphics.getWidth()/2f,Gdx.graphics.getHeight()/2f);
+        }
 
     }
 
     private void renderText() {
-        String text = "Selected character: " + selectedCharacter.getName();
-        textRenderer.render(text,Gdx.graphics.getWidth() - text.length() * 6.5f,Gdx.graphics.getHeight() - 3);
+        String text = "FACION: " + chosenFaction;
+        text += "\nSelected character: " + selectedCharacter.getName();
+        text += "\nHealth: " + selectedCharacter.getHealth();
+        layout.setText(font, text);
+        textRenderer.render(text, Gdx.graphics.getWidth() - layout.width - 5, Gdx.graphics.getHeight() - 3);
+    }
+
+    private void renderString(String text) {
+        layout.setText(font, text);
+        textRenderer.render(text, Gdx.graphics.getWidth() - layout.width - 5, Gdx.graphics.getHeight() - 3);
+    }
+
+    private void renderString(String text, float x, float y) {
+        layout.setText(font, text);
+        textRenderer.render(text, x - layout.width/2f, x - layout.height/2f);
     }
 
     /**
@@ -170,7 +195,7 @@ public class MainGame extends ApplicationAdapter {
         screenWidth = width;
         frameRate.resize(width, height);
         mapRenderer.resize(width, height);
-        textRenderer.resize(width,height);
+        textRenderer.resize(width, height);
     }
 
     @Override
@@ -205,6 +230,22 @@ public class MainGame extends ApplicationAdapter {
         System.out.println("selected character set to : " + character);
     }
 
+    public GAMESTATE getGamestate() {
+        return gamestate;
+    }
+
+    public void setGamestate(GAMESTATE gamestate) {
+        this.gamestate = gamestate;
+    }
+
+    public Faction getChosenFaction() {
+        return chosenFaction;
+    }
+
+    public void setChosenFaction(Faction chosenFaction) {
+        this.chosenFaction = chosenFaction;
+    }
+
     public GameCharacter getSelectedCharacter() {
         return selectedCharacter;
     }
@@ -216,4 +257,5 @@ public class MainGame extends ApplicationAdapter {
     public Team getTeam() {
         return team;
     }
+
 }
diff --git a/core/src/netwerkprog/game/client/game/GAMESTATE.java b/core/src/netwerkprog/game/client/game/GAMESTATE.java
new file mode 100644
index 0000000..8622908
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/GAMESTATE.java
@@ -0,0 +1,6 @@
+package netwerkprog.game.client.game;
+
+public enum GAMESTATE {
+    PLAYING,
+    SELECTING_FACTION
+}
diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index 9f9aa21..d9cc7e7 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -8,6 +8,8 @@ import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.utils.TimeUtils;
 import netwerkprog.game.client.MainGame;
+import netwerkprog.game.client.game.GAMESTATE;
+import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
 
 import java.util.ArrayList;
@@ -89,28 +91,38 @@ public class GameInputProcessor implements InputProcessor {
     @Override
     public boolean keyUp(int keycode) {
 //        System.out.println(camera.position.x + " , " + camera.position.y);
-        if (keysList.contains(keycode)) {
-            if (keycode == keysList.get(0)) {
-                this.isWPressed = false;
-                return true;
-            }
-            if (keycode == keysList.get(1)) {
-                this.isAPressed = false;
-                return true;
-            }
-            if (keycode == keysList.get(2)) {
-                this.isSPressed = false;
-                return true;
-            }
-            if (keycode == keysList.get(3)) {
-                this.isDPressed = false;
-                return true;
-            }
+        if (mainGame.getGamestate() == GAMESTATE.PLAYING) {
 
-            return true;
-        } else {
-            if (keycode == Input.Keys.ENTER) {
+            if (keysList.contains(keycode)) {
+                if (keycode == keysList.get(0)) {
+                    this.isWPressed = false;
+                    return true;
+                }
+                if (keycode == keysList.get(1)) {
+                    this.isAPressed = false;
+                    return true;
+                }
+                if (keycode == keysList.get(2)) {
+                    this.isSPressed = false;
+                    return true;
+                }
+                if (keycode == keysList.get(3)) {
+                    this.isDPressed = false;
+                    return true;
+                }
 
+                return true;
+            }
+        } else if (mainGame.getGamestate() == GAMESTATE.SELECTING_FACTION) {
+            if (keycode == Input.Keys.NUM_1) {
+                System.out.println("MEGA CORP");
+                mainGame.setChosenFaction(Faction.MEGACORPORATION);
+                mainGame.setGamestate(GAMESTATE.PLAYING);
+            }
+            if (keycode == Input.Keys.NUM_2) {
+                System.out.println("HACKER");
+                mainGame.setChosenFaction(Faction.HACKER);
+                mainGame.setGamestate(GAMESTATE.PLAYING);
             }
         }
         return false;
@@ -126,26 +138,31 @@ public class GameInputProcessor implements InputProcessor {
 
         Vector3 touchPoint = new Vector3(Gdx.input.getX(), Gdx.input.getY(), 0);
         camera.unproject(touchPoint);
+        if (mainGame.getGamestate() == GAMESTATE.PLAYING) {
 
-        for (int row = 0; row < mainGame.mapRenderer.getGameTiles().length; row++) {
-            for (int col = 0; col < mainGame.mapRenderer.getGameTiles()[0].length; col++) {
-                GameTile gameTile = mainGame.mapRenderer.getGameTiles()[row][col];
-                if (gameTile.contains(touchPoint.x, touchPoint.y)) {
-                    if (button == Input.Buttons.LEFT) {
+
+            for (int row = 0; row < mainGame.mapRenderer.getGameTiles().length; row++) {
+                for (int col = 0; col < mainGame.mapRenderer.getGameTiles()[0].length; col++) {
+                    GameTile gameTile = mainGame.mapRenderer.getGameTiles()[row][col];
+                    if (gameTile.contains(touchPoint.x, touchPoint.y)) {
+                        if (button == Input.Buttons.LEFT) {
 //                        System.out.println(gameTile + " row: " + row + ", col: " + col);
-                        if (mainGame.hasCharacterSelected() && !gameTile.containsCharacter()) {
+                            if (mainGame.hasCharacterSelected() && !gameTile.containsCharacter()) {
 //                            System.out.println(mainGame.getSelectedCharacter());
-                            removeCharacterFromTile(mainGame.getSelectedCharacter());
-                            if (gameTile.getSymbol() != '#')
-                                gameTile.visit(mainGame.getSelectedCharacter());
+                                if (gameTile.getSymbol() != '#') {
+                                    removeCharacterFromTile(mainGame.getSelectedCharacter());
+                                    gameTile.visit(mainGame.getSelectedCharacter());
+                                    mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
+                                }
+                            }
+                            if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
+                                mainGame.setSelectedCharacter(gameTile.getCharacter());
+                            }
+                            if (gameTile.containsCharacter() && !mainGame.getSelectedCharacter().equals(gameTile.getCharacter())) {
+                                mainGame.setSelectedCharacter(gameTile.getCharacter());
+                            }
+                            return true;
                         }
-                        if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
-                            mainGame.setSelectedCharacter(gameTile.getCharacter());
-                        }
-                        if (gameTile.containsCharacter() && !mainGame.getSelectedCharacter().equals(gameTile.getCharacter())) {
-                            mainGame.setSelectedCharacter(gameTile.getCharacter());
-                        }
-                        return true;
                     }
                 }
             }
diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
index 060e05f..453dcf1 100644
--- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -10,6 +10,9 @@ import netwerkprog.game.client.MainGame;
 import netwerkprog.game.util.graphics.Renderable;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MapRenderer implements Renderable {
     private final OrthographicCamera camera;
     private int tileWidth;
@@ -25,6 +28,7 @@ public class MapRenderer implements Renderable {
 
     private MainGame mainGame;
     private Texture square;
+    private Texture square2;
 
 
     public static TextureRegion FLOOR_TILE;
@@ -32,6 +36,7 @@ public class MapRenderer implements Renderable {
     public static TextureRegion PATH_TILE;
 
     private GameTile[][] gameTiles;
+    private List<GameTile> surroundedTilesOfCurrentCharacter;
 
 
     /**
@@ -51,6 +56,7 @@ public class MapRenderer implements Renderable {
         this.mainGame = MainGame.getInstance();
         font = new BitmapFont();
         square = new Texture(Gdx.files.internal("square.png"));
+        square2 = new Texture(Gdx.files.internal("square2.png"));
         makeTiles();
     }
 
@@ -111,17 +117,53 @@ public class MapRenderer implements Renderable {
 
                 if (cur.containsCharacter()) {
                     batch.draw(cur.getCharacter().getTextureRegion(), cur.x, cur.y);
-                    if (cur.getCharacter().equals(mainGame.getSelectedCharacter()))
+                    if (cur.getCharacter().equals(mainGame.getSelectedCharacter())) {
                         batch.draw(square, cur.x, cur.y);
+
+                    }
                 }
             }
         }
+        if (surroundedTilesOfCurrentCharacter != null && !surroundedTilesOfCurrentCharacter.isEmpty()) {
+            for (GameTile gameTile : surroundedTilesOfCurrentCharacter) {
+                batch.draw(square2, gameTile.x, gameTile.y);
+            }
+        }
 
         batch.end();
         x = 0;
         y = 0;
     }
 
+    private static int[][] directions = new int[][]{{-1, -1}, {-1, 0}, {-1, 1}, {0, 1}, {1, 1}, {1, 0}, {1, -1}, {0, -1}};
+
+    public List<GameTile> setSurroundedTilesOfCurrentCharacter(int x, int y) {
+        List<GameTile> res = new ArrayList<GameTile>();
+        for (int[] direction : directions) {
+            int cx = x + direction[0];
+            int cy = y + direction[1];
+            if (cy >= 0 && cy < gameTiles.length)
+                if (cx >= 0 && cx < gameTiles[cy].length)
+                    res.add(gameTiles[cy][cx]);
+        }
+        surroundedTilesOfCurrentCharacter = res;
+        return res;
+    }
+
+    public int getPos(GameTile tile, String choice) {
+        for (int row = 0; row < this.gameTiles.length; row++) {
+            for (int col = 0; col < this.gameTiles[0].length; col++) {
+                if (gameTiles[row][col].equals(tile)) {
+                    if (choice.toLowerCase().equals("row"))
+                        return row;
+                    else if (choice.toLowerCase().equals("col"))
+                        return col;
+                }
+            }
+        }
+        return -1;
+    }
+
     @Override
     public void update(double deltaTime) {
 
@@ -137,4 +179,8 @@ public class MapRenderer implements Renderable {
     public GameTile[][] getGameTiles() {
         return gameTiles;
     }
+
+    public List<GameTile> getSurroundedTilesOfCurrentCharacter() {
+        return surroundedTilesOfCurrentCharacter;
+    }
 }
-- 
2.47.2


From 737e1ac1cb26b75668a233619cfc79a5a69266d2 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sat, 6 Jun 2020 15:35:01 +0200
Subject: [PATCH 3/7] added character squares he can move

---
 core/assets/square2.png                         | Bin 914 -> 907 bytes
 .../client/game/map/GameInputProcessor.java     |   2 ++
 .../game/client/game/map/MapRenderer.java       |   5 ++++-
 .../game/util/game/GameCharacter.java           |  13 +++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/assets/square2.png b/core/assets/square2.png
index 70d3648d614fe0f1e8056fd920d952d162e0b6a3..155f96c8ab2486d0e75861bb02eb63a9d669bd5b 100644
GIT binary patch
delta 809
zcmV+^1J?YK2a5-gBmv)%B_DrFlH@21hWDIej$la$iQ`}%5q*O>{`_FdS(#Pc5!2I)
zS)>UYEQAF51kMco?;j)lg^RKrA*y-GDIK_Cj+qM@eq7g8(-GHmUA(*S{v;1~2SX&N
z<$6th>leuNF~H)MpU?7Ob=&c6Xm@-Vl<9eT+j_nY314#B?;-DTC4PTe&b~+G)vf2%
z_4*zS!DtG5!hySx9C-TlBG+ATr|StN5=C2<oP@rQUAUVs!Mj^8u{+9^%X28gk+wp5
ziP4smejmFPq0cj-hv%mbliS7D*p236^lNn`CPXTQy{M0+tQHgz&M0eGLNVNmwyly;
z980Vq)<E+_sev*vqCI~oQlmnH`l>5cOfhn2L(N=SmdwRCbCro8&O(Dtva}!$P8HMy
zV!r1>%Wq!(Dmgqif+iD;5k`C|;XC2)l-tl4Gj)j$zhi}Y@yuyVW0IRsXaNX~9aCNL
zT_t?Vo8uE$0YP11b}X<Q=VjtldgPWY&H_C>VmPj?LDsebgb07W6_Y_0M>-M`n-U$y
zY($8ogHOTCSt6exK&sp*46qUG1Y_sv8)J-?E-PPR94!E$*fa(-SqfmqsK_6SjvOi~
z8iT4PHFeEelBAe4rDSQIQN_ffsU<UW%T`=Gx_WYR_v|He793%kQ?`&j=UfV$7MLy=
zU7%6Q$)}w0)H8pbcKVsmQjtD2R;{U8^_pvG+@xXqx6~{&Z@HCD9jVk~*Pgm{@41(O
zTpKdt(2<4>A9<9U+NSzUjb6z8ni_3tlUQ7O_Mir_*@p?5$B9m6AjXkE+$I4eG*4!S
zQ;a;xO=d@CYzk#iBb{&>O=2JzJFyPB**(bpl3URDueeR|&&Y*|?oW^l6Wu2FmD@Me
zT3KHdS%Bs)oH0FQ;9!G7_rhN0H|e+Q@LvtQ4ZRJ$4ZRJ$4ZRJ$4gG%%4g7e(f5-3-
zd~lKe1ZDLNlMn+mOCAfLVJu7l001pXL_t(o!|l#N0RS)v0HM<?>z{Ek{6GSxdL7!1
n2?z)X2nYxW2nYxW2nYy#SWEz9&s{Lg00000NkvXXu0mjf#0GJE

delta 816
zcmV-01JC@62a*SnBmv`*B_DrLa^xrshTl2G9sx-RiQ`}}ReOUu{{CR%PIod>HB<XA
z4{gc@gpfd=pp$U^_;-YV@K6yBNzHS~IpRqr6|QJ_yq>G3nAUeayob<#l81YMArjPb
zb@RFPE9Cl^U}?*bXL+!;?f5pd2R;nS^gO+7J>Q0eFFEagD0^N_pSFLq-_dvt>v0Xe
z_LCtPU11L~;!{W>zCOLk^;W$3`a+3B(Poh)`AO`;-Fyk&-Fk^#tXnS6p$IW=h5Qnu
zEhqgxb}K@kS40obPXng6i?6X8-N!hu-PM#4sT}sEKDM%2P((PBtZ5m=@G9E2N<ndK
zv4L0z%>$(cD#VEPphSP2Dh)bU-Kb%SiBC4v%#CHqT#O4hnF!J>G}xp_58~j_KusX#
zdo8s5mgTRJ!*eHSGQk*O#+MSl6aGoL4UI8VmnixjE3AuWPGcF9-26fdKxpik>Wc3w
z;ZxqkPhbTEb%oin!5WXt#G&-aEm@oedKy!R*U=#B+W<lY-->_5kbpqUNNma!joFA0
zM+cvZm9r#1K!8-aQy5?)I0?qi(>LZAEnQZ=#JE}jLUCveXo^(8N=cDFmK-@$RWt=v
z&1&jev}VaEYtGs7yrZg#B~#00=2on_cyjgZ=I+I7;Uc)gwB%x;cqye;IIS>UF}p&e
z)`Jf@(xFE_?C^i19JL{RT58&Iv*xX|+PO=|@$b1?=-x}OC!I*8Go5<o(@sCjSqE}$
z$Vfv+9yWZGQEzIS>N7QZA@^%)w5d&EY3bR68pLKFCTLzKI+=kOCjxPs1dz}?nMJ3R
zc#@mUVwo3}GN_SGIGrXj5KJer4!YSr$o-OA(DYl}_-9e%!bJCfkP8#tCij)wH`IDv
zzbLW*%~LpI8fD;O8(b=T<zwUucX4%a5B^>q;vY_Y8+sdh8+sdh8+sdh8~Qs93I2e<
z|BvB6vp$mf3|^!blMDkiP8R^?aZZf@001yaL_t(o!|l#75dbg<1hA(ju!;YHs|=Pz
uK`OnILode!1Ox;G1Ox;G1Ox;G1Oz^jUIE1*lVPU-0000<MNUMnLSTaA1bWT@

diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index d9cc7e7..58954d6 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -157,9 +157,11 @@ public class GameInputProcessor implements InputProcessor {
                             }
                             if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
                                 mainGame.setSelectedCharacter(gameTile.getCharacter());
+                                mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
                             }
                             if (gameTile.containsCharacter() && !mainGame.getSelectedCharacter().equals(gameTile.getCharacter())) {
                                 mainGame.setSelectedCharacter(gameTile.getCharacter());
+                                mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
                             }
                             return true;
                         }
diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
index 453dcf1..0d818b9 100644
--- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import netwerkprog.game.client.MainGame;
+import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.Renderable;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 
@@ -144,12 +145,14 @@ public class MapRenderer implements Renderable {
             int cy = y + direction[1];
             if (cy >= 0 && cy < gameTiles.length)
                 if (cx >= 0 && cx < gameTiles[cy].length)
-                    res.add(gameTiles[cy][cx]);
+                    if (gameTiles[cy][cx].getSymbol() != '#')
+                        res.add(gameTiles[cy][cx]);
         }
         surroundedTilesOfCurrentCharacter = res;
         return res;
     }
 
+
     public int getPos(GameTile tile, String choice) {
         for (int row = 0; row < this.gameTiles.length; row++) {
             for (int col = 0; col < this.gameTiles[0].length; col++) {
diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java
index db91787..576c92d 100644
--- a/core/src/netwerkprog/game/util/game/GameCharacter.java
+++ b/core/src/netwerkprog/game/util/game/GameCharacter.java
@@ -5,10 +5,13 @@ import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import netwerkprog.game.client.game.map.GameTile;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 
+import java.util.List;
 import java.util.Objects;
 
 public abstract class GameCharacter extends Actor implements Comparable<GameCharacter> {
@@ -18,6 +21,7 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
     protected boolean override;
     protected TextureRegion textureRegion;
     protected int health;
+    protected List<GameTile> allowedToMove;
 
     public GameCharacter(String name, Faction faction, TextureRegion textureRegion, Ability... abilities) {
         super();
@@ -27,6 +31,7 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
         this.override = false;
         this.textureRegion = textureRegion;
         this.health = 100;
+        this.allowedToMove = new ArrayList<>();
     }
 
     public String getName() {
@@ -106,4 +111,12 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
                 ", y=" + super.getY() +
                 '}';
     }
+
+    public List<GameTile> getAllowedToMove() {
+        return allowedToMove;
+    }
+
+    public void setAllowedToMove(List<GameTile> allowedToMove) {
+        this.allowedToMove = allowedToMove;
+    }
 }
-- 
2.47.2


From 23cf4d120e94fb890a387c958e1aa7e34f464d1a Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sat, 6 Jun 2020 15:44:46 +0200
Subject: [PATCH 4/7] made character only able to move in some position

---
 .../src/netwerkprog/game/client/MainGame.java | 13 +++++++----
 .../client/game/map/GameInputProcessor.java   |  2 +-
 .../game/client/game/map/MapRenderer.java     | 22 ++++++++++++++-----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index 5702bf6..43cd3f4 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -17,6 +17,7 @@ import netwerkprog.game.client.game.GAMESTATE;
 import netwerkprog.game.client.game.characters.Hacker;
 import netwerkprog.game.client.game.characters.Team;
 import netwerkprog.game.client.game.characters.abilities.BodySwap;
+import netwerkprog.game.client.game.map.GameTile;
 import netwerkprog.game.client.game.map.Map;
 import netwerkprog.game.client.game.map.MapRenderer;
 import netwerkprog.game.client.game.map.GameInputProcessor;
@@ -25,6 +26,8 @@ import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.FrameRate;
 import netwerkprog.game.util.graphics.TextRenderer;
 
+import java.awt.*;
+
 public class MainGame extends ApplicationAdapter {
     SpriteBatch batch;
     float screenWidth;
@@ -113,11 +116,11 @@ public class MainGame extends ApplicationAdapter {
         TextureRegion[][] characters = TextureRegion.split(texture, 32, 32);
         this.testCharacter = new Hacker("harryyyyyyyyyy", characters[1][0], new BodySwap("test"));
         GameCharacter character2 = new Hacker("test2", characters[2][0], new BodySwap("test"));
-        this.setSelectedCharacter(testCharacter);
         mapRenderer.getGameTiles()[1][1].visit(testCharacter);
         mapRenderer.getGameTiles()[1][2].visit(character2);
         this.team = new Team();
         this.team.addMember(this.testCharacter, character2);
+        this.setSelectedCharacter(testCharacter);
 
     }
 
@@ -156,7 +159,7 @@ public class MainGame extends ApplicationAdapter {
             frameRate.render();
             renderText();
         } else if (this.gamestate == GAMESTATE.SELECTING_FACTION) {
-            renderString("FACTION SELECT\nPress 1 for mega corporation, press 2 for hackers",Gdx.graphics.getWidth()/2f,Gdx.graphics.getHeight()/2f);
+            renderString("FACTION SELECT\nPress 1 for mega corporation, press 2 for hackers", Gdx.graphics.getWidth() / 2f, Gdx.graphics.getHeight() / 2f);
         }
 
     }
@@ -176,7 +179,7 @@ public class MainGame extends ApplicationAdapter {
 
     private void renderString(String text, float x, float y) {
         layout.setText(font, text);
-        textRenderer.render(text, x - layout.width/2f, x - layout.height/2f);
+        textRenderer.render(text, x - layout.width / 2f, x - layout.height / 2f);
     }
 
     /**
@@ -227,7 +230,9 @@ public class MainGame extends ApplicationAdapter {
 
     public void setSelectedCharacter(GameCharacter character) {
         this.selectedCharacter = character;
-        System.out.println("selected character set to : " + character);
+        GameTile characterTile = mapRenderer.getTile(character);
+        Point pos = mapRenderer.getPos(characterTile);
+        mapRenderer.setSurroundedTilesOfCurrentCharacter(pos.x, pos.y);
     }
 
     public GAMESTATE getGamestate() {
diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index 58954d6..d86a0e7 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -149,7 +149,7 @@ public class GameInputProcessor implements InputProcessor {
 //                        System.out.println(gameTile + " row: " + row + ", col: " + col);
                             if (mainGame.hasCharacterSelected() && !gameTile.containsCharacter()) {
 //                            System.out.println(mainGame.getSelectedCharacter());
-                                if (gameTile.getSymbol() != '#') {
+                                if (gameTile.getSymbol() != '#' && mainGame.mapRenderer.getSurroundedTilesOfCurrentCharacter().contains(gameTile)) {
                                     removeCharacterFromTile(mainGame.getSelectedCharacter());
                                     gameTile.visit(mainGame.getSelectedCharacter());
                                     mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
index 0d818b9..9c84a8e 100644
--- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -11,6 +11,7 @@ import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.Renderable;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -152,19 +153,28 @@ public class MapRenderer implements Renderable {
         return res;
     }
 
+    public GameTile getTile(GameCharacter character) {
+        for (GameTile[] tiles : this.gameTiles) {
+            for (GameTile tile : tiles) {
+                if (tile.containsCharacter())
+                    if (tile.getCharacter().equals(character)) {
+                        return tile;
+                    }
+            }
+        }
+        return null;
+    }
 
-    public int getPos(GameTile tile, String choice) {
+
+    public Point getPos(GameTile tile) {
         for (int row = 0; row < this.gameTiles.length; row++) {
             for (int col = 0; col < this.gameTiles[0].length; col++) {
                 if (gameTiles[row][col].equals(tile)) {
-                    if (choice.toLowerCase().equals("row"))
-                        return row;
-                    else if (choice.toLowerCase().equals("col"))
-                        return col;
+                    return new Point(col, row);
                 }
             }
         }
-        return -1;
+        return new Point(-1, -1);
     }
 
     @Override
-- 
2.47.2


From ab3d57bc7fc9481182900ddba57c4721f4686c44 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sat, 6 Jun 2020 16:07:05 +0200
Subject: [PATCH 5/7] made only possible to select own factions characters

---
 .../src/netwerkprog/game/client/MainGame.java | 32 +++++++++++--------
 .../game/client/game/characters/Agent.java    |  4 +--
 .../client/game/map/GameInputProcessor.java   | 16 +++++++---
 .../game/util/game/GameCharacter.java         |  4 +++
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index 43cd3f4..ffead10 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -9,11 +9,11 @@ import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.GlyphLayout;
-import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import netwerkprog.game.client.game.GAMESTATE;
+import netwerkprog.game.client.game.characters.Agent;
 import netwerkprog.game.client.game.characters.Hacker;
 import netwerkprog.game.client.game.characters.Team;
 import netwerkprog.game.client.game.characters.abilities.BodySwap;
@@ -49,9 +49,6 @@ public class MainGame extends ApplicationAdapter {
     private Map map;
     public MapRenderer mapRenderer;
 
-
-    public GameCharacter testCharacter;
-
     private static MainGame INSTANCE;
 
     private MainGame() {
@@ -100,8 +97,6 @@ public class MainGame extends ApplicationAdapter {
         camera.viewportHeight = screenHeight / 2;
         camera.update();
         setGamestate(GAMESTATE.SELECTING_FACTION);
-
-        initCharacters();
 //        this.tree.insert(new Hacker(,new BodySwap()));
 
 
@@ -111,16 +106,27 @@ public class MainGame extends ApplicationAdapter {
 //        connectToServer();
     }
 
-    private void initCharacters() {
+    public void initCharacters() {
         Texture texture = new Texture(Gdx.files.internal("core/assets/characters.png"));
         TextureRegion[][] characters = TextureRegion.split(texture, 32, 32);
-        this.testCharacter = new Hacker("harryyyyyyyyyy", characters[1][0], new BodySwap("test"));
-        GameCharacter character2 = new Hacker("test2", characters[2][0], new BodySwap("test"));
-        mapRenderer.getGameTiles()[1][1].visit(testCharacter);
-        mapRenderer.getGameTiles()[1][2].visit(character2);
         this.team = new Team();
-        this.team.addMember(this.testCharacter, character2);
-        this.setSelectedCharacter(testCharacter);
+
+        for (int i = 1; i <= 5; i++) {
+            GameCharacter temp =new Hacker("hacker" + i, characters[5][0], new BodySwap("test"));
+            mapRenderer.getGameTiles()[1][i].visit(temp);
+            if (chosenFaction == Faction.HACKER) {
+                this.team.addMember(temp);
+            }
+        }
+
+        for (int i = 1; i <= 5; i++) {
+            GameCharacter temp = new Agent("Agent" + i,characters[11][0],new BodySwap("Test"));
+            mapRenderer.getGameTiles()[3][i].visit(temp);
+            if (chosenFaction == Faction.MEGACORPORATION) {
+                this.team.addMember(temp);
+            }
+        }
+        this.setSelectedCharacter(this.team.get(0));
 
     }
 
diff --git a/core/src/netwerkprog/game/client/game/characters/Agent.java b/core/src/netwerkprog/game/client/game/characters/Agent.java
index 3fe9c68..5e01224 100644
--- a/core/src/netwerkprog/game/client/game/characters/Agent.java
+++ b/core/src/netwerkprog/game/client/game/characters/Agent.java
@@ -6,7 +6,7 @@ import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
 
 public class Agent extends GameCharacter {
-    public Agent(TextureRegion textureRegion, Ability... abilities) {
-        super("Agent", Faction.MEGACORPORATION, textureRegion, abilities);
+    public Agent(String name, TextureRegion textureRegion, Ability... abilities) {
+        super(name, Faction.MEGACORPORATION, textureRegion, abilities);
     }
 }
diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index d86a0e7..65c6ae6 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -117,11 +117,13 @@ public class GameInputProcessor implements InputProcessor {
             if (keycode == Input.Keys.NUM_1) {
                 System.out.println("MEGA CORP");
                 mainGame.setChosenFaction(Faction.MEGACORPORATION);
+                mainGame.initCharacters();
                 mainGame.setGamestate(GAMESTATE.PLAYING);
             }
             if (keycode == Input.Keys.NUM_2) {
                 System.out.println("HACKER");
                 mainGame.setChosenFaction(Faction.HACKER);
+                mainGame.initCharacters();
                 mainGame.setGamestate(GAMESTATE.PLAYING);
             }
         }
@@ -152,16 +154,20 @@ public class GameInputProcessor implements InputProcessor {
                                 if (gameTile.getSymbol() != '#' && mainGame.mapRenderer.getSurroundedTilesOfCurrentCharacter().contains(gameTile)) {
                                     removeCharacterFromTile(mainGame.getSelectedCharacter());
                                     gameTile.visit(mainGame.getSelectedCharacter());
-                                    mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
+                                    mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
                                 }
                             }
                             if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
-                                mainGame.setSelectedCharacter(gameTile.getCharacter());
-                                mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
+                                if (gameTile.getCharacter().getFaction() == mainGame.getChosenFaction()) {
+                                    mainGame.setSelectedCharacter(gameTile.getCharacter());
+                                    mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
+                                }
                             }
-                            if (gameTile.containsCharacter() && !mainGame.getSelectedCharacter().equals(gameTile.getCharacter())) {
+                            if (gameTile.containsCharacter()
+                                    && !mainGame.getSelectedCharacter().equals(gameTile.getCharacter())
+                                    && gameTile.getCharacter().getFaction() == mainGame.getChosenFaction()) {
                                 mainGame.setSelectedCharacter(gameTile.getCharacter());
-                                mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
+                                mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
                             }
                             return true;
                         }
diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java
index 576c92d..659f9d9 100644
--- a/core/src/netwerkprog/game/util/game/GameCharacter.java
+++ b/core/src/netwerkprog/game/util/game/GameCharacter.java
@@ -119,4 +119,8 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
     public void setAllowedToMove(List<GameTile> allowedToMove) {
         this.allowedToMove = allowedToMove;
     }
+
+    public Faction getFaction() {
+        return faction;
+    }
 }
-- 
2.47.2


From 95a582b91ecb11899dec65e51f898bd2e5714ae7 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sat, 6 Jun 2020 16:19:36 +0200
Subject: [PATCH 6/7] fixed memory leaks

---
 core/src/netwerkprog/game/client/MainGame.java      |  9 +++++++--
 .../game/client/game/map/MapRenderer.java           | 13 ++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index ffead10..e7124eb 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -3,6 +3,7 @@ package netwerkprog.game.client;
 import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Files;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
@@ -45,9 +46,9 @@ public class MainGame extends ApplicationAdapter {
     private GAMESTATE gamestate;
     private Faction chosenFaction;
 
-
     private Map map;
     public MapRenderer mapRenderer;
+    public AssetManager assets;
 
     private static MainGame INSTANCE;
 
@@ -72,6 +73,7 @@ public class MainGame extends ApplicationAdapter {
         textRenderer = new TextRenderer();
         font = new BitmapFont();
         layout = new GlyphLayout();
+        assets = new AssetManager();
 
         String[] strings = new String[]{
                 "#########################",
@@ -107,7 +109,9 @@ public class MainGame extends ApplicationAdapter {
     }
 
     public void initCharacters() {
-        Texture texture = new Texture(Gdx.files.internal("core/assets/characters.png"));
+        assets.load("core/assets/characters.png",Texture.class);
+        assets.finishLoading();
+        Texture texture = assets.get("core/assets/characters.png");
         TextureRegion[][] characters = TextureRegion.split(texture, 32, 32);
         this.team = new Team();
 
@@ -216,6 +220,7 @@ public class MainGame extends ApplicationAdapter {
     public void dispose() {
         batch.dispose();
         textRenderer.dispose();
+        assets.dispose();
     }
 
     public float getScreenWidth() {
diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
index 9c84a8e..f9b6bbf 100644
--- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
+import com.badlogic.gdx.utils.Disposable;
 import netwerkprog.game.client.MainGame;
 import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.Renderable;
@@ -57,8 +58,6 @@ public class MapRenderer implements Renderable {
         this.camera = camera;
         this.mainGame = MainGame.getInstance();
         font = new BitmapFont();
-        square = new Texture(Gdx.files.internal("square.png"));
-        square2 = new Texture(Gdx.files.internal("square2.png"));
         makeTiles();
     }
 
@@ -66,7 +65,14 @@ public class MapRenderer implements Renderable {
      * loads all the images for the tiles and adds all the tiles to the array
      */
     private void makeTiles() {
-        Texture texture = new Texture(Gdx.files.internal(tilePath));
+        mainGame.assets.load("square.png", Texture.class);
+        mainGame.assets.load("square2.png", Texture.class);
+        mainGame.assets.load(tilePath, Texture.class);
+        mainGame.assets.finishLoading();
+        square = mainGame.assets.get("square.png");
+        square2 = mainGame.assets.get("square2.png");
+
+        Texture texture = mainGame.assets.get(tilePath);
         TextureRegion[][] tileTextures = TextureRegion.split(texture, 32, 32);
 
         FLOOR_TILE = tileTextures[1][6];
@@ -196,4 +202,5 @@ public class MapRenderer implements Renderable {
     public List<GameTile> getSurroundedTilesOfCurrentCharacter() {
         return surroundedTilesOfCurrentCharacter;
     }
+
 }
-- 
2.47.2


From c8325ba55c4035df6604387fe35c9efa81ed4d73 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sat, 6 Jun 2020 16:21:00 +0200
Subject: [PATCH 7/7] optimize imports

---
 core/src/netwerkprog/game/client/MainGame.java        |  9 ++++-----
 .../game/client/game/characters/DevTest1.java         |  2 +-
 .../game/client/game/characters/DevTest2.java         |  2 +-
 .../game/client/game/characters/DevTest3.java         |  2 +-
 core/src/netwerkprog/game/client/game/map/Map.java    |  2 --
 .../netwerkprog/game/client/game/map/MapRenderer.java | 11 ++---------
 .../src/netwerkprog/game/util/game/GameCharacter.java |  3 ---
 core/src/netwerkprog/game/util/tree/BST.java          |  2 --
 8 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index e7124eb..b22b32f 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -11,17 +11,16 @@ import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import netwerkprog.game.client.game.GAMESTATE;
 import netwerkprog.game.client.game.characters.Agent;
 import netwerkprog.game.client.game.characters.Hacker;
 import netwerkprog.game.client.game.characters.Team;
 import netwerkprog.game.client.game.characters.abilities.BodySwap;
+import netwerkprog.game.client.game.map.GameInputProcessor;
 import netwerkprog.game.client.game.map.GameTile;
 import netwerkprog.game.client.game.map.Map;
 import netwerkprog.game.client.game.map.MapRenderer;
-import netwerkprog.game.client.game.map.GameInputProcessor;
 import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.FrameRate;
@@ -109,14 +108,14 @@ public class MainGame extends ApplicationAdapter {
     }
 
     public void initCharacters() {
-        assets.load("core/assets/characters.png",Texture.class);
+        assets.load("core/assets/characters.png", Texture.class);
         assets.finishLoading();
         Texture texture = assets.get("core/assets/characters.png");
         TextureRegion[][] characters = TextureRegion.split(texture, 32, 32);
         this.team = new Team();
 
         for (int i = 1; i <= 5; i++) {
-            GameCharacter temp =new Hacker("hacker" + i, characters[5][0], new BodySwap("test"));
+            GameCharacter temp = new Hacker("hacker" + i, characters[5][0], new BodySwap("test"));
             mapRenderer.getGameTiles()[1][i].visit(temp);
             if (chosenFaction == Faction.HACKER) {
                 this.team.addMember(temp);
@@ -124,7 +123,7 @@ public class MainGame extends ApplicationAdapter {
         }
 
         for (int i = 1; i <= 5; i++) {
-            GameCharacter temp = new Agent("Agent" + i,characters[11][0],new BodySwap("Test"));
+            GameCharacter temp = new Agent("Agent" + i, characters[11][0], new BodySwap("Test"));
             mapRenderer.getGameTiles()[3][i].visit(temp);
             if (chosenFaction == Faction.MEGACORPORATION) {
                 this.team.addMember(temp);
diff --git a/core/src/netwerkprog/game/client/game/characters/DevTest1.java b/core/src/netwerkprog/game/client/game/characters/DevTest1.java
index af0f1aa..fdedfe5 100644
--- a/core/src/netwerkprog/game/client/game/characters/DevTest1.java
+++ b/core/src/netwerkprog/game/client/game/characters/DevTest1.java
@@ -1,8 +1,8 @@
 package netwerkprog.game.client.game.characters;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.game.Faction;
+import netwerkprog.game.util.game.GameCharacter;
 
 public class DevTest1 extends GameCharacter {
     public DevTest1() {
diff --git a/core/src/netwerkprog/game/client/game/characters/DevTest2.java b/core/src/netwerkprog/game/client/game/characters/DevTest2.java
index c5d01e5..a8f839f 100644
--- a/core/src/netwerkprog/game/client/game/characters/DevTest2.java
+++ b/core/src/netwerkprog/game/client/game/characters/DevTest2.java
@@ -1,7 +1,7 @@
 package netwerkprog.game.client.game.characters;
 
-import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.game.Faction;
+import netwerkprog.game.util.game.GameCharacter;
 
 public class DevTest2 extends GameCharacter {
     public DevTest2() {
diff --git a/core/src/netwerkprog/game/client/game/characters/DevTest3.java b/core/src/netwerkprog/game/client/game/characters/DevTest3.java
index 401e170..3208678 100644
--- a/core/src/netwerkprog/game/client/game/characters/DevTest3.java
+++ b/core/src/netwerkprog/game/client/game/characters/DevTest3.java
@@ -1,7 +1,7 @@
 package netwerkprog.game.client.game.characters;
 
-import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.game.Faction;
+import netwerkprog.game.util.game.GameCharacter;
 
 public class DevTest3 extends GameCharacter {
     public DevTest3() {
diff --git a/core/src/netwerkprog/game/client/game/map/Map.java b/core/src/netwerkprog/game/client/game/map/Map.java
index 9ca8a1e..4b6affb 100644
--- a/core/src/netwerkprog/game/client/game/map/Map.java
+++ b/core/src/netwerkprog/game/client/game/map/Map.java
@@ -1,7 +1,5 @@
 package netwerkprog.game.client.game.map;
 
-import java.util.Arrays;
-
 /**
  * Map class to hold a 2d array of tiles which will specify the map
  */
diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
index f9b6bbf..5b0cd29 100644
--- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -3,14 +3,11 @@ package netwerkprog.game.client.game.map;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-import com.badlogic.gdx.utils.Disposable;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import netwerkprog.game.client.MainGame;
 import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.Renderable;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -25,9 +22,6 @@ public class MapRenderer implements Renderable {
     private OrthographicCamera cam;
     private static int x = 0;
     private static int y = 0;
-    private BitmapFont font;
-
-    private ShapeRenderer shapeRenderer;
 
     private MainGame mainGame;
     private Texture square;
@@ -57,7 +51,6 @@ public class MapRenderer implements Renderable {
         cam = new OrthographicCamera(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
         this.camera = camera;
         this.mainGame = MainGame.getInstance();
-        font = new BitmapFont();
         makeTiles();
     }
 
@@ -143,7 +136,7 @@ public class MapRenderer implements Renderable {
         y = 0;
     }
 
-    private static int[][] directions = new int[][]{{-1, -1}, {-1, 0}, {-1, 1}, {0, 1}, {1, 1}, {1, 0}, {1, -1}, {0, -1}};
+    public static int[][] directions = new int[][]{{-1, -1}, {-1, 0}, {-1, 1}, {0, 1}, {1, 1}, {1, 0}, {1, -1}, {0, -1}};
 
     public List<GameTile> setSurroundedTilesOfCurrentCharacter(int x, int y) {
         List<GameTile> res = new ArrayList<GameTile>();
diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java
index 659f9d9..4715e86 100644
--- a/core/src/netwerkprog/game/util/game/GameCharacter.java
+++ b/core/src/netwerkprog/game/util/game/GameCharacter.java
@@ -1,8 +1,6 @@
 package netwerkprog.game.util.game;
 
 
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import netwerkprog.game.client.game.map.GameTile;
@@ -10,7 +8,6 @@ import netwerkprog.game.client.game.map.GameTile;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-
 import java.util.List;
 import java.util.Objects;
 
diff --git a/core/src/netwerkprog/game/util/tree/BST.java b/core/src/netwerkprog/game/util/tree/BST.java
index 7e8980b..ea332b7 100644
--- a/core/src/netwerkprog/game/util/tree/BST.java
+++ b/core/src/netwerkprog/game/util/tree/BST.java
@@ -1,7 +1,5 @@
 package netwerkprog.game.util.tree;
 
-import java.util.*;
-
 public class BST<E extends Comparable<E>> extends AbstractTree<E> {
     protected TreeNode<E> root;
     protected int size = 0;
-- 
2.47.2