From 5106a205368f2b69e489e8ac620d9fb4efd68556 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Tue, 25 Feb 2020 16:59:46 +0100
Subject: [PATCH 01/20] Legger til halvveis fungerende knapper for zoom og
 kamerabevegelse

---
 .../inf112/fiasko/roborally/GameLauncher.java     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/inf112/fiasko/roborally/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
index d3bd843..8ed17dd 100644
--- a/src/main/java/inf112/fiasko/roborally/GameLauncher.java
+++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
@@ -2,6 +2,7 @@ package inf112.fiasko.roborally;
 
 import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
@@ -26,6 +27,9 @@ public class GameLauncher extends ApplicationAdapter {
     private Texture textureSheet;
 
     private final int tileDimensions = 64;
+    private float cameraZoom = 1;
+    private int cameraX = 0;
+    private int cameraY = 0;
 
     @Override
     public void create() {
@@ -51,6 +55,8 @@ public class GameLauncher extends ApplicationAdapter {
         camera.update();
         batch.setProjectionMatrix(camera.combined);
         batch.begin();
+        camera.translate(cameraX, cameraY);
+        camera.zoom = cameraZoom;
         //Draws all elements the game wants to draw
         List<IDrawableObject> elementsToDraw = IOUtil.getDrawableObjectsFromGame(game, tileDimensions, tileDimensions);
         for (IDrawableObject object : elementsToDraw) {
@@ -63,6 +69,15 @@ public class GameLauncher extends ApplicationAdapter {
                     object.flipX(), object.flipY());
         }
         batch.end();
+        if (Gdx.input.isKeyPressed(Input.Keys.CONTROL_LEFT) && Gdx.input.isKeyPressed(Input.Keys.PLUS) && cameraZoom > 0) {
+            cameraZoom -= 0.1;
+        }
+        if (Gdx.input.isKeyPressed(Input.Keys.CONTROL_LEFT) && Gdx.input.isKeyPressed(Input.Keys.MINUS) && cameraZoom < 2) {
+            cameraZoom += 0.1;
+        }
+        if (Gdx.input.isKeyJustPressed(Input.Keys.RIGHT)) {
+            cameraX += 1;
+        }
     }
 
     @Override

From c8179b8e27dd69a0e3728c98ef32aecc6123df88 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 09:17:06 +0100
Subject: [PATCH 02/20] Gjenoppretter elementer fjernet under opprydding

---
 .../inf112/fiasko/roborally/GameLauncher.java | 17 ++++++++++++++--
 .../roborally/element_properties/Action.java  | 14 +++++++++++++
 .../roborally/objects/ICardWithoutSuit.java   | 20 +++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/inf112/fiasko/roborally/element_properties/Action.java
 create mode 100644 src/main/java/inf112/fiasko/roborally/objects/ICardWithoutSuit.java

diff --git a/src/main/java/inf112/fiasko/roborally/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
index f2d71b5..c95c235 100644
--- a/src/main/java/inf112/fiasko/roborally/GameLauncher.java
+++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
@@ -42,6 +42,8 @@ public class GameLauncher extends ApplicationAdapter {
         camera.setToOrtho(false, game.getWidth() * tileDimensions,
                 game.getHeight() * tileDimensions);
         batch = new SpriteBatch();
+        /*MyTextInputListener listener = new MyTextInputListener();
+        Gdx.input.getTextInput(listener, "Input name", "", "Name");*/
     }
 
     /**
@@ -67,10 +69,10 @@ public class GameLauncher extends ApplicationAdapter {
                     object.flipX(), object.flipY());
         }
         batch.end();
-        if (Gdx.input.isKeyPressed(Input.Keys.CONTROL_LEFT) && Gdx.input.isKeyPressed(Input.Keys.PLUS) && cameraZoom > 0) {
+        if (Gdx.input.isKeyJustPressed(Input.Keys.CONTROL_LEFT) && Gdx.input.isKeyJustPressed(Input.Keys.PLUS) && cameraZoom > 0) {
             cameraZoom -= 0.1;
         }
-        if (Gdx.input.isKeyPressed(Input.Keys.CONTROL_LEFT) && Gdx.input.isKeyPressed(Input.Keys.MINUS) && cameraZoom < 2) {
+        if (Gdx.input.isKeyJustPressed(Input.Keys.CONTROL_LEFT) && Gdx.input.isKeyJustPressed(Input.Keys.MINUS) && cameraZoom < 2) {
             cameraZoom += 0.1;
         }
         if (Gdx.input.isKeyJustPressed(Input.Keys.RIGHT)) {
@@ -84,4 +86,15 @@ public class GameLauncher extends ApplicationAdapter {
         textureSheet.dispose();
         batch.dispose();
     }
+
+    /*public static class MyTextInputListener implements Input.TextInputListener {
+        @Override
+        public void input (String text) {
+            System.out.println(text);
+        }
+
+        @Override
+        public void canceled () {
+        }
+    }*/
 }
\ No newline at end of file
diff --git a/src/main/java/inf112/fiasko/roborally/element_properties/Action.java b/src/main/java/inf112/fiasko/roborally/element_properties/Action.java
new file mode 100644
index 0000000..5c42c89
--- /dev/null
+++ b/src/main/java/inf112/fiasko/roborally/element_properties/Action.java
@@ -0,0 +1,14 @@
+package inf112.fiasko.roborally.element_properties;
+
+/**
+ * This enum represents an action on a programming card
+ */
+public enum Action {
+    ROTATE_RIGHT,
+    ROTATE_LEFT,
+    U_TURN,
+    MOVE_1,
+    MOVE_2,
+    MOVE_3,
+    BACK_UP
+}
\ No newline at end of file
diff --git a/src/main/java/inf112/fiasko/roborally/objects/ICardWithoutSuit.java b/src/main/java/inf112/fiasko/roborally/objects/ICardWithoutSuit.java
new file mode 100644
index 0000000..b146361
--- /dev/null
+++ b/src/main/java/inf112/fiasko/roborally/objects/ICardWithoutSuit.java
@@ -0,0 +1,20 @@
+package inf112.fiasko.roborally.objects;
+
+/**
+ * This Interface describes a card without a card suit
+ * @param <S> The value type
+ * @param <T> The symbol type
+ */
+public interface ICardWithoutSuit<S,T> {
+    /**
+     * Gets the value of the card
+     * @return The card value
+     */
+    S getValue();
+
+    /**
+     * Gets the symbol of the card
+     * @return The card symbol
+     */
+    T getSymbol();
+}

From 7b63bb97f9b4707ea0d8eb30a33bce2480829c3b Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 19:36:03 +0100
Subject: [PATCH 03/20] Legger til/endrer robot teksturer

Legger til tekstur for robot 3
Endrer tekstur for robot 2
---
 src/main/resources/assets/Robot2.png | Bin 743 -> 769 bytes
 src/main/resources/assets/Robot3.png | Bin 0 -> 750 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/resources/assets/Robot3.png

diff --git a/src/main/resources/assets/Robot2.png b/src/main/resources/assets/Robot2.png
index 3540ab74fa8f18efd2f0e6b02cf6013f5e3a1523..480b56244e1008c90483a8247a2841c1381f0dc7 100644
GIT binary patch
delta 695
zcmV;o0!aPm1%U>TR)3aBL_t(|UhSF7QNu70hGQB4Du4=r3umAa#%To7Njx+HoVfrM
zqy%Vyu)njL5w<12Bt^{Xo7q`8QEcsRy;do<+wDR#N9@(2UI6D1D2jqhZOXE|A-5vC
ztv`s*3)!lws@L769cPRl1h^vGkbRNG;Dqd)?42wL0nng|41W!Z0R%6}Ab1i2fYti*
z8eK9t%ZoP*x&3qJ3XoR;_G$?x0Cm;930<EZnjiu+1MCVq6%mpg0$qZIB8ULAB5=vh
zkUB94)&pDt_63jcV+j;=2y_JzE3lyip99Q*QwttMnFJAdiot^@0;G&D0qjXb;`k5%
z!T;Ny<RcqAC4YM&LpuCJCO1U7x}mW@>70NzLX!8xn|Mu!eZ09dvU{=zvPUwA0z)Ga
zz*O*C+(Yi?>%M=O(*rKy$nZu?<jvufXwE^2ylJ^tvnS!c)B&oG-K8C8j57o{CWpq^
zx~Q$;L+KN;9%3ZG_wLe85CLo$bAzwL(!qzHHe500eSZLZwWt@sIR`A4ON?h>(4=$d
zIiPEDUa!~I-}d!@VC!!{&_=Y?Y`c}d9$<c1ue<DB$THa6A53NFbA{IPsRvk>voQkH
zLx8;tS-+e6gQ*OCuF!hEOMpBH<{{t~;F*h{ZV2Jrdnd38v~m;@;Esze#;gK(3mA*3
zBe{dwc7H3*9*}bZ1!Mu(t0ja0*sx&5fT1kc7|SlR)tAqM5MmOPWCW8SmLo7`{{YPT
z2!7DXj}2#xz6B7B)d2L);$!QNA+G`svH<MWk_BL|mMj2!wPXR<t0fD-UM*Pw_G*cl
z4kNd3rL|-0Pa$?Th+q&14CUr^ld<)^5<&p{B`}4<4H(MJ>n3CCdnHeT?A79&1T~O{
d0DGk@7QfGeTS9&t;dKB2002ovPDHLkV1lc}KT-ey

delta 669
zcmV;O0%HAv2ImEkR)2g+L_t(|UhSFDQNu6{h8q?DCV&Zm7oLGdxO5TdCdsh~@XQM^
zK}UcEDEd>W7aZ)yi5<d8-<?i2n8f~LTb3y{o6SNq2kh0NUVz{dD2jqhUCOe&BDW&D
zZhkO5Ph_jQuAjG6Kfy635a5DrP4+=H1xIA3WUpki5C9#j$$!wHDS+T583dn&0AN+U
zUt&sTXL<I5CAWL;SOF{wuvd!-z&;zaW_LD6vI^i1x~~XR3T8`yeHJJ*a%qcO_knhO
z+m0ps43NQ0HK15*39wg-3BZ0V{-j~%q!0ju|F<(KMK*X$_CSVo_=`*)h;(&LyZ@kj
z0y+pu-Vfg<X@5GL;>(?o-ICpr-IGBS7&?go3<ZCSXUOwXJ@*G=X23Zd8NNsx`Es}=
z8go%1Us|5!&LljSCP4kRt@;U$afASe<j^_a6!mqyFZ+aSmKX`}xvl!iB7l$9-jM3D
zwD;wwkI)$H9Kc>J>IDey0n6nQ>sjcv>HPH`@Z08GRezQDZ}-iBZ1FcE=p*{t?z@+L
zGoby;ChoEiAz{!x9}K1Mdxg&XX$E-1S&RV95?~)f;<tM~7)syw3Z3_d1h7remOxm5
zM=pY<BSi4*J%cFF$x%pv8!mQ;i30cvSc`K<a))-`y#!}~<pK&Y0obc0hX6RRAY#B!
zmO9pQ$bWq8<>y(*u?b2tf=v+N2*jKpK)XE#-|ObbM{ta(1rS=%0PNkxW824IQ6PW`
zz+NpT0DHBV0PNLb0<c$$3BX=0CIEZ2OqmWNx9_C2vF(R2bvB5>U?4D*-MUL``=sO$
z0RNK0<pvC8x9$?#J}I^dvR6xR6V!k$0rpB+EEc{2J2Ol|f=MCD00000NkvXXu0mjf
D+&VQ?

diff --git a/src/main/resources/assets/Robot3.png b/src/main/resources/assets/Robot3.png
new file mode 100644
index 0000000000000000000000000000000000000000..e51b15b4792c625ac7f94bc9be950ce3258c7f9d
GIT binary patch
literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0)t6JK~#8N?U;>G
z!!Qhm8y0{KU<25oun3nf0^OwE1iArizy`nsMK6)TIQ35wJ9W?c?sQ7rTw_1WR^;Yz
zIIL>sf_=4AFMxLmG)==-ZrZk8liQNrcMZ$)O14!>?fcsy-Z3T=;EwEr?2Bv(uE=i4
z-pGm&03A|f=+F{C@RkgM7a;)Hs@)zTnVojC#*+Jc??eG43$QN&n$=&^9BWI7L;(BZ
z$T{mKiwF=q7}`KPvvIYjK$Zaeti;ZsD^g-3XbQzfK+do?ktM*s2=uI*Gk>ftB@zMb
z&yjGU62UnOfWFTbVTp1W<?08m;YsHNl>T(x4-e2O3?Ak1BiSce5!E0%iTWI3n1(j|
zHWmASpUIxcF!*b-S)_=7TR1Yzh>4y#oD$7BDA5NW`oHW*!v9hLsQ3PMh<A($1h^!J
z&gl@<ggPEeNXUMPDfQjo4#_Hj3uA9cbyyla{B+?P<2h%6B!~d)tHrwqY&QRD(BNic
za;iPx*rvSOxeJL<1nArgo14#<0(~^U8(>aC5n%q<<y-bK=rm}5A510o{e$;X1US>#
z7y-H^z&-|@zwPgXsl>j2@Lrz)vI)u(@C)$5m!Rta;r!+{IbjwU)Fvdr178jplLeqY
z)?n%An!)V56K@1aEl>d>0Q+jmDF8lLkU6k+VYo({-R?5`d3~RhoSUFsl<52n#^iH=
z=OIdTF=pZ&V=e(~jI01+^7*LeeMlDYAOf(j77>7bwTJ-ht3?E0Uo9d4`)UyZ*jG#T
zYS1W)aW)t%Z^u3#!>Ox53<d*%;o82p8T<S!mJk33A~@WD;o82p8T<S!WD{gxE#6JA
g24o4auawp52b*PHLLU!aWB>pF07*qoM6N<$f_dmmHUIzs

literal 0
HcmV?d00001


From 5a1b609aa45676c4d5ea7528255beda57ea01a28 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 19:38:02 +0100
Subject: [PATCH 04/20] Legger til resten av Chekcmate brettet og en fil med
 det delte brettet

---
 src/main/resources/boards/Checkmate.txt | 18 +++++++++++++-----
 src/main/resources/boards/SpawnBoard    |  8 ++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/boards/SpawnBoard

diff --git a/src/main/resources/boards/Checkmate.txt b/src/main/resources/boards/Checkmate.txt
index 5d07c25..b9d54fa 100644
--- a/src/main/resources/boards/Checkmate.txt
+++ b/src/main/resources/boards/Checkmate.txt
@@ -1,16 +1,20 @@
-12 12
-01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 21;1
+12 16
+01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 21;7
 01;1 12;3 11;3 11;3 11;3 11;3 11;3 11;3 11;3 11;3 12;5 01;1
 01;1 11;1 05;3 01;1 05;3 01;1 05;7 17;1 05;7 01;1 11;5 01;1
 01;1 11;1 01;1 02;1 01;1 05;3 01;1 05;7 01;1 05;7 11;5 01;1
 01;1 11;1 05;3 01;1 05;3 01;1 02;1 01;1 05;7 01;1 11;5 01;1
-01;1 11;1 01;1 05;3 01;1 22;1 01;1 05;7 01;1 05;7 11;5 01;1
-01;1 11;1 05;3 01;1 05;3 01;1 22;1 01;1 02;1 01;1 11;5 01;1
+01;1 11;1 01;1 05;3 01;1 22;7 01;1 05;7 01;1 05;7 11;5 01;1
+01;1 11;1 05;3 01;1 05;3 01;1 22;7 01;1 02;1 01;1 11;5 01;1
 01;1 11;1 01;1 05;3 01;1 02;1 01;1 05;7 01;1 05;7 11;5 01;1
 01;1 11;1 05;3 18;1 05;3 01;1 05;7 01;1 05;7 01;1 11;5 01;1
 01;1 11;1 01;1 05;3 01;1 05;3 01;1 05;7 01;1 05;7 11;5 01;1
 01;1 12;1 11;7 11;7 11;7 11;7 11;7 11;7 11;7 11;7 12;7 01;1
-21;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1
+21;7 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1
+01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1
+01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1
+30;1 28;1 01;1 26;1 01;1 24;1 25;1 01;1 27;1 01;1 29;1 31;1
+01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1
 0 0 1;1 0 1;1 0 0 1;1 0 1;1 0 0
 0 0 0 1;5 0 1;5 1;5 0 1;5 0 0 0
 1;7 0 0 0 0 0 0 0 0 0 0 1;3
@@ -22,4 +26,8 @@
 0 1;3 0 0 0 0 0 0 0 0 1;7 0
 1;7 0 0 0 0 0 0 0 0 0 0 1;3
 0 0 0 1;1 0 1;1 1;1 0 1;1 0 0 0
+0 0 1;5 0 1;5 0 0 1;5 0 1;5 0 0
+0 0 1;1 0 1;1 0 0 1;1 0 1;1 0 0
+0 0 0 0 0 0 0 0 0 0 0 0
+0 1;7 0 1;7 0 1;7 1;7 1;7 0 1;7 0 1;7
 0 0 1;5 0 1;5 0 0 1;5 0 1;5 0 0
\ No newline at end of file
diff --git a/src/main/resources/boards/SpawnBoard b/src/main/resources/boards/SpawnBoard
new file mode 100644
index 0000000..d89f926
--- /dev/null
+++ b/src/main/resources/boards/SpawnBoard
@@ -0,0 +1,8 @@
+01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1
+01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1
+30;1 28;1 01;1 26;1 01;1 24;1 25;1 01;1 27;1 01;1 29;1 31;1
+01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1 01;1
+0 0 1;1 0 1;1 0 0 1;1 0 1;1 0 0
+0 0 0 0 0 0 0 0 0 0 0 0
+0 1;7 0 1;7 0 1;7 1;7 1;7 0 1;7 0 1;7
+0 0 1;5 0 1;5 0 0 1;5 0 1;5 0 0
\ No newline at end of file

From 8be7745ae7140bd28c006192b1f0b5feadb26624 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 19:43:56 +0100
Subject: [PATCH 05/20] Legger til tekstur mapping for robot spawn

---
 src/main/resources/texture_sheet_tile_mapping.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/texture_sheet_tile_mapping.txt b/src/main/resources/texture_sheet_tile_mapping.txt
index c9cf235..40338a7 100644
--- a/src/main/resources/texture_sheet_tile_mapping.txt
+++ b/src/main/resources/texture_sheet_tile_mapping.txt
@@ -20,4 +20,12 @@ FLAG_3 6 8
 FLAG_4 6 9
 WRENCH 6 1
 WRENCH_AND_HAMMER 6 0
-DEATH_TILE 3 11
\ No newline at end of file
+DEATH_TILE 3 11
+ROBOT_SPAWN_1 0 15
+ROBOT_SPAWN_2 1 15
+ROBOT_SPAWN_3 2 15
+ROBOT_SPAWN_4 3 15
+ROBOT_SPAWN_5 0 16
+ROBOT_SPAWN_6 1 16
+ROBOT_SPAWN_7 2 16
+ROBOT_SPAWN_8 3 16
\ No newline at end of file

From 054625ad60d3b93949ad58d0cddd8060fb5cd4a8 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 19:44:28 +0100
Subject: [PATCH 06/20] Legger til representasjon av robot tiles

---
 .../fiasko/roborally/element_properties/TileType.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/inf112/fiasko/roborally/element_properties/TileType.java b/src/main/java/inf112/fiasko/roborally/element_properties/TileType.java
index 5ee031c..f28a2fb 100644
--- a/src/main/java/inf112/fiasko/roborally/element_properties/TileType.java
+++ b/src/main/java/inf112/fiasko/roborally/element_properties/TileType.java
@@ -26,7 +26,15 @@ public enum TileType {
     FLAG_4 (20),
     WRENCH (21),
     WRENCH_AND_HAMMER (22),
-    DEATH_TILE (23);
+    DEATH_TILE (23),
+    ROBOT_SPAWN_1 (24),
+    ROBOT_SPAWN_2 (25),
+    ROBOT_SPAWN_3 (26),
+    ROBOT_SPAWN_4 (27),
+    ROBOT_SPAWN_5 (28),
+    ROBOT_SPAWN_6 (29),
+    ROBOT_SPAWN_7 (30),
+    ROBOT_SPAWN_8 (31);
 
     private final int tileTypeID;
 

From 8315c5ebd0324714ea156181c5cbfd3f9b352466 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 19:45:39 +0100
Subject: [PATCH 07/20] Legger til en ekstra robot til brettet

---
 src/main/java/inf112/fiasko/roborally/game/Game.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/inf112/fiasko/roborally/game/Game.java b/src/main/java/inf112/fiasko/roborally/game/Game.java
index 717a4b2..153cabf 100644
--- a/src/main/java/inf112/fiasko/roborally/game/Game.java
+++ b/src/main/java/inf112/fiasko/roborally/game/Game.java
@@ -24,6 +24,7 @@ public class Game implements IDrawableGame {
             List<Robot> robots = new ArrayList<>();
             robots.add(new Robot(RobotID.ROBOT_1, new Position(1, 1)));
             robots.add(new Robot(RobotID.ROBOT_2, new Position(1, 2)));
+            robots.add(new Robot(RobotID.ROBOT_3, new Position(1, 3)));
             gameBoard = BoardLoaderUtil.loadBoard("boards/Checkmate.txt", robots);
             new Thread(() -> {
                 try {

From 2524b8d585b56afe2fe13311dd9d67805838baea Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 19:46:34 +0100
Subject: [PATCH 08/20] =?UTF-8?q?Gj=C3=B8r=20teksturen=20til=20robot=203?=
 =?UTF-8?q?=20lastbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inf112/fiasko/roborally/utility/TextureConverterUtil.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java b/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java
index f821751..69b55c7 100644
--- a/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java
+++ b/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java
@@ -25,6 +25,7 @@ public final class TextureConverterUtil {
     private static final Texture textureSheet = new Texture(Gdx.files.internal("assets/tiles.png"));
     private static final Texture robot1Texture = new Texture(Gdx.files.internal("assets/Robot.png"));
     private static final Texture robot2Texture = new Texture(Gdx.files.internal("assets/Robot2.png"));
+    private static final Texture robot3Texture = new Texture(Gdx.files.internal("assets/Robot3.png"));
     private static Map<TileType, TextureConverterContainer> tileSheetTileTextureMappings;
     private static Map<TileType, Boolean> tileSheetTileHasRotatedTextureMappings;
     private static Map<WallType, TextureConverterContainer> tileSheetWallTextureMappings;
@@ -87,6 +88,8 @@ public final class TextureConverterUtil {
             return new TextureRegion(robot1Texture, 0, 0, 64, 64);
         } else if (robot.getRobotId() == RobotID.ROBOT_2) {
             return new TextureRegion(robot2Texture, 0, 0, 64, 64);
+        } else if (robot.getRobotId() == RobotID.ROBOT_3) {
+            return new TextureRegion(robot3Texture, 0, 0, 64, 64);
         }
         throw new IllegalArgumentException("Robot has no drawable texture.");
     }

From 6a544086e152bf36e87b42ab0eb6e1f59e5ee4f2 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 19:46:54 +0100
Subject: [PATCH 09/20] Legger til nye visningsfunksjoner

---
 .../inf112/fiasko/roborally/GameLauncher.java | 126 ++++++++++++++++--
 1 file changed, 114 insertions(+), 12 deletions(-)

diff --git a/src/main/java/inf112/fiasko/roborally/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
index c95c235..5ab714e 100644
--- a/src/main/java/inf112/fiasko/roborally/GameLauncher.java
+++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
@@ -3,11 +3,14 @@ package inf112.fiasko.roborally;
 import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
+import com.badlogic.gdx.InputProcessor;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Vector3;
 import inf112.fiasko.roborally.game.Game;
 import inf112.fiasko.roborally.game.IDrawableGame;
 import inf112.fiasko.roborally.objects.IDrawableObject;
@@ -18,7 +21,7 @@ import java.util.List;
 /**
  * This class renders a game using libgdx
  */
-public class GameLauncher extends ApplicationAdapter {
+public class GameLauncher extends ApplicationAdapter implements InputProcessor {
     private OrthographicCamera camera;
     private SpriteBatch batch;
     private IDrawableGame game;
@@ -30,6 +33,9 @@ public class GameLauncher extends ApplicationAdapter {
     private float cameraZoom = 1;
     private int cameraX = 0;
     private int cameraY = 0;
+    private Vector2 lastTouch;
+    private final int viewPortWidth = 12 * tileDimensions;
+    private final int viewPortHeight = 12 * tileDimensions;
 
     @Override
     public void create() {
@@ -39,11 +45,13 @@ public class GameLauncher extends ApplicationAdapter {
 
         game = new Game();
         camera = new OrthographicCamera();
-        camera.setToOrtho(false, game.getWidth() * tileDimensions,
-                game.getHeight() * tileDimensions);
+        camera.setToOrtho(false, viewPortWidth, viewPortHeight);
+        camera.position.set(viewPortWidth/2f, viewPortHeight/2f, 0);
         batch = new SpriteBatch();
         /*MyTextInputListener listener = new MyTextInputListener();
         Gdx.input.getTextInput(listener, "Input name", "", "Name");*/
+        Gdx.input.setInputProcessor(this);
+        lastTouch = new Vector2();
     }
 
     /**
@@ -56,6 +64,8 @@ public class GameLauncher extends ApplicationAdapter {
         batch.setProjectionMatrix(camera.combined);
         batch.begin();
         camera.translate(cameraX, cameraY);
+        cameraX = 0;
+        cameraY = 0;
         camera.zoom = cameraZoom;
         //Draws all elements the game wants to draw
         List<IDrawableObject> elementsToDraw = IOUtil.getDrawableObjectsFromGame(game, tileDimensions, tileDimensions);
@@ -69,15 +79,6 @@ public class GameLauncher extends ApplicationAdapter {
                     object.flipX(), object.flipY());
         }
         batch.end();
-        if (Gdx.input.isKeyJustPressed(Input.Keys.CONTROL_LEFT) && Gdx.input.isKeyJustPressed(Input.Keys.PLUS) && cameraZoom > 0) {
-            cameraZoom -= 0.1;
-        }
-        if (Gdx.input.isKeyJustPressed(Input.Keys.CONTROL_LEFT) && Gdx.input.isKeyJustPressed(Input.Keys.MINUS) && cameraZoom < 2) {
-            cameraZoom += 0.1;
-        }
-        if (Gdx.input.isKeyJustPressed(Input.Keys.RIGHT)) {
-            cameraX += 1;
-        }
     }
 
     @Override
@@ -87,6 +88,107 @@ public class GameLauncher extends ApplicationAdapter {
         batch.dispose();
     }
 
+    @Override
+    public boolean keyDown(int keycode) {
+        return false;
+    }
+
+    @Override
+    public boolean keyUp(int keycode) {
+        switch (keycode) {
+            case Input.Keys.PLUS:
+                if (Gdx.input.isKeyPressed(Input.Keys.CONTROL_LEFT)) {
+                    cameraZoom -= 0.1;
+                    return true;
+                }
+            case Input.Keys.MINUS:
+                if (Gdx.input.isKeyPressed(Input.Keys.CONTROL_LEFT)) {
+                    cameraZoom += 0.1;
+                    return true;
+                }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean keyTyped(char character) {
+        if (character == 'r') {
+            //camera.rotate(-90);
+            camera.rotateAround(
+                    new Vector3(viewPortWidth/2f, viewPortHeight/2f, 0),
+                    new Vector3(0, 0, 1), 90);
+            return true;
+        } else if (character == 'q') {
+            camera.up.x = 0;
+            camera.up.y = 1;
+            cameraZoom = 1;
+            System.out.print((game.getHeight() * tileDimensions) - viewPortHeight/2f);
+            camera.position.set(viewPortWidth/2f, viewPortHeight/2f, 0);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean touchDown(int screenX, int screenY, int pointer, int button) {
+        lastTouch = new Vector2(screenX, screenY);
+        return true;
+    }
+
+    @Override
+    public boolean touchUp(int screenX, int screenY, int pointer, int button) {
+        lastTouch = new Vector2(screenX, screenY);
+        return true;
+    }
+
+    @Override
+    public boolean touchDragged(int screenX, int screenY, int pointer) {
+        Vector2 newTouch = new Vector2(screenX, screenY);
+        Vector2 diff = newTouch.cpy().sub(lastTouch);
+        lastTouch = newTouch;
+        int[] change = translateToDirection(diff.x, diff.y);
+        cameraX = change[0];
+        cameraY = change[1];
+        return true;
+    }
+
+    /**
+     * Translates x and y coordinates according to the camera's direction
+     * @param x The x coordinate to translate
+     * @param y The y coordinate to translate
+     * @return A list containing the translated coordinates of x and y
+     */
+    private int[] translateToDirection(float x, float y) {
+        int outX = 0;
+        int outY = 0;
+        if (Math.round(camera.up.x) == 0 && Math.round(camera.up.y) == 1) {
+            outX = (int)-x;
+            outY = (int)y;
+        } else if (Math.round(camera.up.x) == 0 && Math.round(camera.up.y) == -1) {
+            outX = (int)x;
+            outY = (int)-y;
+        } else if (Math.round(camera.up.x) == -1 && Math.round(camera.up.y) == 0) {
+            outX = (int)-y;
+            outY = (int)-x;
+        } else if (Math.round(camera.up.x) == 1 && Math.round(camera.up.y) == 0) {
+            outX = (int)y;
+            outY = (int)x;
+        }
+        return new int[]{outX, outY};
+    }
+
+    @Override
+    public boolean mouseMoved(int screenX, int screenY) {
+        return false;
+    }
+
+    @Override
+    public boolean scrolled(int amount) {
+        if (amount < 0 && cameraZoom > 0 || amount > 0 && cameraZoom < 2) {
+            cameraZoom += amount / 10.0;
+        }
+        return true;
+    }
+
     /*public static class MyTextInputListener implements Input.TextInputListener {
         @Override
         public void input (String text) {

From aa24075874dccc4370db12718a8bf8d6f36fcba9 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 26 Feb 2020 20:33:43 +0100
Subject: [PATCH 10/20] Forbedrer translateToDirection funksjonen i
 GameLauncher

---
 .../java/inf112/fiasko/roborally/GameLauncher.java     | 10 ++++++----
 .../fiasko/roborally/objects/DrawableObjectTest.java   |  1 -
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/inf112/fiasko/roborally/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
index 5ab714e..740bab8 100644
--- a/src/main/java/inf112/fiasko/roborally/GameLauncher.java
+++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
@@ -160,16 +160,18 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
     private int[] translateToDirection(float x, float y) {
         int outX = 0;
         int outY = 0;
-        if (Math.round(camera.up.x) == 0 && Math.round(camera.up.y) == 1) {
+        int upX = Math.round(camera.up.x);
+        int upY = Math.round(camera.up.y);
+        if (upX == 0 && Math.round(camera.up.y) == 1) {
             outX = (int)-x;
             outY = (int)y;
-        } else if (Math.round(camera.up.x) == 0 && Math.round(camera.up.y) == -1) {
+        } else if (upX == 0 && upY == -1) {
             outX = (int)x;
             outY = (int)-y;
-        } else if (Math.round(camera.up.x) == -1 && Math.round(camera.up.y) == 0) {
+        } else if (upX == -1 && upY == 0) {
             outX = (int)-y;
             outY = (int)-x;
-        } else if (Math.round(camera.up.x) == 1 && Math.round(camera.up.y) == 0) {
+        } else if (upX == 1 && upY == 0) {
             outX = (int)y;
             outY = (int)x;
         }
diff --git a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java
index 44a3599..0ba1e52 100644
--- a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java
+++ b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java
@@ -89,7 +89,6 @@ public class DrawableObjectTest {
         assertEquals(HEIGHT_MAX_ARG, drawableObjectMaximumArguments.getHeight());
     }
 
-
     @Test
     public void getRotationMinArg() {
         assertEquals(0, drawableObjectMinimumArguments.getRotation());

From f292462531711119a68ee8c5621eca5ee1afbf11 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Thu, 27 Feb 2020 09:57:33 +0100
Subject: [PATCH 11/20] Gir noen variabler og metoder klarere navn

---
 .../inf112/fiasko/roborally/GameLauncher.java | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/inf112/fiasko/roborally/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
index 740bab8..a8eda29 100644
--- a/src/main/java/inf112/fiasko/roborally/GameLauncher.java
+++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
@@ -145,9 +145,9 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
         Vector2 newTouch = new Vector2(screenX, screenY);
         Vector2 diff = newTouch.cpy().sub(lastTouch);
         lastTouch = newTouch;
-        int[] change = translateToDirection(diff.x, diff.y);
-        cameraX = change[0];
-        cameraY = change[1];
+        int[] positionChange = translateCoordinateAccountingForCameraRotation(diff.x, diff.y);
+        cameraX = positionChange[0];
+        cameraY = positionChange[1];
         return true;
     }
 
@@ -157,21 +157,21 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
      * @param y The y coordinate to translate
      * @return A list containing the translated coordinates of x and y
      */
-    private int[] translateToDirection(float x, float y) {
+    private int[] translateCoordinateAccountingForCameraRotation(float x, float y) {
         int outX = 0;
         int outY = 0;
-        int upX = Math.round(camera.up.x);
-        int upY = Math.round(camera.up.y);
-        if (upX == 0 && Math.round(camera.up.y) == 1) {
+        int cameraUpX = Math.round(camera.up.x);
+        int cameraUpY = Math.round(camera.up.y);
+        if (cameraUpX == 0 && Math.round(camera.up.y) == 1) {
             outX = (int)-x;
             outY = (int)y;
-        } else if (upX == 0 && upY == -1) {
+        } else if (cameraUpX == 0 && cameraUpY == -1) {
             outX = (int)x;
             outY = (int)-y;
-        } else if (upX == -1 && upY == 0) {
+        } else if (cameraUpX == -1 && cameraUpY == 0) {
             outX = (int)-y;
             outY = (int)-x;
-        } else if (upX == 1 && upY == 0) {
+        } else if (cameraUpX == 1 && cameraUpY == 0) {
             outX = (int)y;
             outY = (int)x;
         }

From 0d90e2047e09ae270448159b6922d8a8f0a0b1d5 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Thu, 27 Feb 2020 16:43:30 +0100
Subject: [PATCH 12/20] Fikser noen feil i texture_sheet_tile_mapping.txt

---
 src/main/resources/texture_sheet_tile_mapping.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/texture_sheet_tile_mapping.txt b/src/main/resources/texture_sheet_tile_mapping.txt
index 40338a7..0d190df 100644
--- a/src/main/resources/texture_sheet_tile_mapping.txt
+++ b/src/main/resources/texture_sheet_tile_mapping.txt
@@ -5,9 +5,9 @@ COGWHEEL_LEFT 4 6
 TRANSPORT_BAND_SLOW 0 6 3 6 1 6 2 6
 TRANSPORT_BAND_SLOW_RIGHT 2 5 2 4 3 4 3 5
 TRANSPORT_BAND_SLOW_LEFT 1 5 0 5 0 4 1 4
-TRANSPORT_BAND_SLOW_SIDE_ENTRANCES 4 8 0 5 0 4 1 4
-TRANSPORT_BAND_SLOW_SIDE_ENTRANCE_RIGHT 0 8 1 8 2 8 3 8
+TRANSPORT_BAND_SLOW_SIDE_ENTRANCES 4 8 4 7 5 7 5 8
 TRANSPORT_BAND_SLOW_SIDE_ENTRANCE_LEFT 0 7 1 7 2 7 3 7
+TRANSPORT_BAND_SLOW_SIDE_ENTRANCE_RIGHT 0 8 1 8 2 8 3 8
 TRANSPORT_BAND_FAST 4 1 5 1 4 2 5 2
 TRANSPORT_BAND_FAST_RIGHT 2 3 2 2 3 2 3 3
 TRANSPORT_BAND_FAST_LEFT 1 3 0 3 0 2 1 2

From a63b0716b724590517d47a883300f9ed3dbebd15 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Thu, 27 Feb 2020 16:44:06 +0100
Subject: [PATCH 13/20] Legger til en debug modus til spillet

---
 .../inf112/fiasko/roborally/GameLauncher.java | 12 ++++++-
 .../inf112/fiasko/roborally/game/Game.java    | 21 ++++++++++++
 .../resources/boards/all_tiles_test_board.txt | 33 +++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/boards/all_tiles_test_board.txt

diff --git a/src/main/java/inf112/fiasko/roborally/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
index a8eda29..baca17f 100644
--- a/src/main/java/inf112/fiasko/roborally/GameLauncher.java
+++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
@@ -25,6 +25,7 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
     private OrthographicCamera camera;
     private SpriteBatch batch;
     private IDrawableGame game;
+    private IDrawableGame debugGame;
 
     private Texture robotTexture;
     private Texture textureSheet;
@@ -36,6 +37,7 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
     private Vector2 lastTouch;
     private final int viewPortWidth = 12 * tileDimensions;
     private final int viewPortHeight = 12 * tileDimensions;
+    private boolean debugging = false;
 
     @Override
     public void create() {
@@ -43,7 +45,8 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
         robotTexture = new Texture(Gdx.files.internal("assets/Robot.png"));
         textureSheet = new Texture(Gdx.files.internal("assets/tiles.png"));
 
-        game = new Game();
+        debugGame = new Game(true);
+        game = new Game(false);
         camera = new OrthographicCamera();
         camera.setToOrtho(false, viewPortWidth, viewPortHeight);
         camera.position.set(viewPortWidth/2f, viewPortHeight/2f, 0);
@@ -101,11 +104,18 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
                     cameraZoom -= 0.1;
                     return true;
                 }
+                break;
             case Input.Keys.MINUS:
                 if (Gdx.input.isKeyPressed(Input.Keys.CONTROL_LEFT)) {
                     cameraZoom += 0.1;
                     return true;
                 }
+                break;
+            case Input.Keys.HOME:
+                IDrawableGame temp = game;
+                this.game = debugGame;
+                this.debugGame = temp;
+                return true;
         }
         return false;
     }
diff --git a/src/main/java/inf112/fiasko/roborally/game/Game.java b/src/main/java/inf112/fiasko/roborally/game/Game.java
index 153cabf..10c9f70 100644
--- a/src/main/java/inf112/fiasko/roborally/game/Game.java
+++ b/src/main/java/inf112/fiasko/roborally/game/Game.java
@@ -19,7 +19,28 @@ import java.util.concurrent.TimeUnit;
 public class Game implements IDrawableGame {
     private Board gameBoard;
 
+    public Game(boolean debug) {
+        if (debug) {
+            initializeDebugMode();
+        } else {
+            initializeGame();
+        }
+    }
+
     public Game() {
+        initializeGame();
+    }
+
+    private void initializeDebugMode() {
+        List<Robot> robots = new ArrayList<>();
+        try {
+            gameBoard = BoardLoaderUtil.loadBoard("boards/all_tiles_test_board.txt", robots);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void initializeGame() {
         try {
             List<Robot> robots = new ArrayList<>();
             robots.add(new Robot(RobotID.ROBOT_1, new Position(1, 1)));
diff --git a/src/main/resources/boards/all_tiles_test_board.txt b/src/main/resources/boards/all_tiles_test_board.txt
new file mode 100644
index 0000000..b188481
--- /dev/null
+++ b/src/main/resources/boards/all_tiles_test_board.txt
@@ -0,0 +1,33 @@
+8 16
+01;1 01;3 01;5 01;7 02;1 02;3 02;5 02;7
+03;1 03;3 03;5 03;7 04;1 04;3 04;5 04;7
+05;1 05;3 05;5 05;7 06;1 06;3 06;5 06;7
+07;1 07;3 07;5 07;7 08;1 08;3 08;5 08;7
+09;1 09;3 09;5 09;7 10;1 10;3 10;5 10;7
+11;1 11;3 11;5 11;7 12;1 12;3 12;5 12;7
+13;1 13;3 13;5 13;7 14;1 14;3 14;5 14;7
+15;1 15;3 15;5 15;7 16;1 16;3 16;5 16;7
+17;1 17;3 17;5 17;7 18;1 18;3 18;5 18;7
+19;1 19;3 19;5 19;7 20;1 20;3 20;5 20;7
+21;1 21;3 21;5 21;7 22;1 22;3 22;5 22;7
+23;1 23;3 23;5 23;7 24;1 24;3 24;5 24;7
+25;1 25;3 25;5 25;7 26;1 26;3 26;5 26;7
+27;1 27;3 27;5 27;7 28;1 28;3 28;5 28;7
+29;1 29;3 29;5 29;7 30;1 30;3 30;5 30;7
+31;1 31;3 31;5 31;7 01;1 01;1 01;1 01;1
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
\ No newline at end of file

From 481db782422874151ae0b78ed10b04786c8f53f7 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Thu, 27 Feb 2020 18:51:02 +0100
Subject: [PATCH 14/20] =?UTF-8?q?Fjerner=20un=C3=B8dvendige=20importeringe?=
 =?UTF-8?q?r=20i=20PositionTest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fiasko/roborally/element_properties/PositionTest.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/inf112/fiasko/roborally/element_properties/PositionTest.java b/src/test/java/inf112/fiasko/roborally/element_properties/PositionTest.java
index b760db9..2b3204f 100644
--- a/src/test/java/inf112/fiasko/roborally/element_properties/PositionTest.java
+++ b/src/test/java/inf112/fiasko/roborally/element_properties/PositionTest.java
@@ -3,7 +3,8 @@ package inf112.fiasko.roborally.element_properties;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 public class PositionTest {
     private Position testPosition1;

From d556f20fbb15e1f4c3188311ea02da2c355aa805 Mon Sep 17 00:00:00 2001
From: GabrielMagnus <Gabriel.Magnus@student.uib.no>
Date: Thu, 27 Feb 2020 18:51:51 +0100
Subject: [PATCH 15/20] Rettet formatering

---
 Deliverables/Oblig2.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Deliverables/Oblig2.md b/Deliverables/Oblig2.md
index 1def67b..25dc3b8 100644
--- a/Deliverables/Oblig2.md
+++ b/Deliverables/Oblig2.md
@@ -74,7 +74,7 @@
 *Akseptansekrav*
 *   Vi har en klasse som lagrer en posisjon for en robot på brettet..
 *   Posisjoner består av x og y koordinater.
-*    Roboten lagrer en instans av positions klassen.
+*   Roboten lagrer en instans av positions klassen.
 
 *Brukerhistorie*
 *   Som spiller trenger jeg en robot for å kunne spille spillet.
@@ -140,7 +140,7 @@
 
 *   Hvis den andre roboten blir blokkert av en vegg så kan den ikke bli dyttet og ingen av robotene flytter på seg.
 
-*    Hvis det er flere roboter på rekke, gitt at det ikke er noen vegg som stopper de, blir alle robotene flyttet.
+*   Hvis det er flere roboter på rekke, gitt at det ikke er noen vegg som stopper de, blir alle robotene flyttet.
 
 *Arbeidsoppgaver*
 *   Legge til funksjonalitet for å sjekke om det er en annen robot i veien.
@@ -164,7 +164,7 @@
 *   Som spiller trenger roboten min liv for å kunne tape.
 
 *Akseptansekrav*
-*    Roboten har en verdi som representerer mengden liv den har.
+*   Roboten har en verdi som representerer mengden liv den har.
 
 *Arbeidsoppgaver*
 *   Legge til en liv-verdi i robot klassen.
@@ -193,13 +193,13 @@
 
 ### Vidre med del 2
 
-*    Vi har prioritert å lage spillet fra bunnen av og opp siden noen deler av spillet avhenger andre.
+*   Vi har prioritert å lage spillet fra bunnen av og opp siden noen deler av spillet avhenger andre.
 
 *Hovedkrav til MVP*
 
 *   Vi føler at alle de syv første kravene er en del av MVP, mens krav 8: Vise hendelser som skjer på skjermen med en
     forsinkelse slik at spilleren ser bevegelsene i spillet, ikke er nødvendig for at spillet skal fungere.
- 
+
 *   Vi har fulgt prioritering av kravene i MVP, men også implementert noen "nice to have" som vi synes er viktig for
     spilleropplevelsen.
 

From 18ba86e3edae7b91467ae238bae68175e3a3dfb3 Mon Sep 17 00:00:00 2001
From: GabrielMagnus <Gabriel.Magnus@student.uib.no>
Date: Thu, 27 Feb 2020 18:54:08 +0100
Subject: [PATCH 16/20] Endret formulering

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4e1bbc7..6fa0ff2 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ vil vi gå over til en fase der målet blir å implementere ting som er gøy, me
 Alle regler er hentet fra 2005 utgaven av spillguiden fra Wizards of the Coast, Inc.
 
 ## Spillstatus
-Ved kjøring av main blir det kjørt en demo, uten mulighet for bruker å bevege robot.
+Ved kjøring av .jar filen blir det kjørt en demo, uten mulighet for bruker å bevege robot.
 
 ## Bygging og kompilering
 

From f4e70c95b6cd618363eb8b68aded50b8e8ee4109 Mon Sep 17 00:00:00 2001
From: GabrielMagnus <Gabriel.Magnus@student.uib.no>
Date: Thu, 27 Feb 2020 18:58:44 +0100
Subject: [PATCH 17/20] Fixet new line problemer

---
 Deliverables/Oblig2.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Deliverables/Oblig2.md b/Deliverables/Oblig2.md
index 7187d05..4e9fb51 100644
--- a/Deliverables/Oblig2.md
+++ b/Deliverables/Oblig2.md
@@ -7,7 +7,9 @@
 ### Tobias 
 #### Kommunikasjonsleder
 ##### Har ansvar for å organisere gruppemøter og parprogrameringsmøter
-*   Rollen innebærer å finne ut hvilke dager folk kan møte og om vi burde møte i person eller utføre møtee digitalt på discord
+*   Rollen innebærer å finne ut hvilke dager folk kan møte og om vi burde møte i person eller 
+    utføre møte digitalt på discord
+
 *   Jeg får også beskjed om noen er syke slik at gruppen kan ta det i betraktning under et møte.
 
 ### Kristian 
@@ -45,7 +47,8 @@
 
 *   Kan bli bedre til å ta initiativet med å begynne på oppgaver.
 
-*   Vi synes det var en god idea å planlegge klassestrukturene felles i et grupperom. Det gav alle en god oversikt over hva de forskjellige klassen måtte inneholde.
+*   Vi synes det var en god idea å planlegge klassestrukturene felles i et grupperom. Det gav alle en god oversikt over
+    hva de forskjellige klassen måtte inneholde.
 
 *   Vi har brukt parprogramering som har gjort at commits har blitt en del forskjøvet.
 
@@ -129,14 +132,16 @@
 
 *   Legge til en metode som fjerner en robot fra brettet.
 
-*   Legge til en metode som sjekker posisjonen til roboten for å se om den er gått i et hull eller om den har gått utenfor brettet.
+*   Legge til en metode som sjekker posisjonen til roboten for å se om den er gått i et hull eller om den har gått 
+    utenfor brettet.
 
 #### Brukerhistorier for krav 4
 *Brukerhistorie*
 *   Som robot må jeg kunne dytte en annen robot hvis det er lovlig å dytte roboten, for å kunne gjøre et gyldig trekk.
 
 *Akseptansekrav*
-*   Hvis en robot beveger seg til en posisjon hvor det er en annen robot, vil den andre roboten bli dyttet så lenge den kan bli dyttet.
+*   Hvis en robot beveger seg til en posisjon hvor det er en annen robot, vil den andre roboten bli dyttet så lenge 
+    den kan bli dyttet.
 
 *   Hvis den andre roboten blir blokkert av en vegg så kan den ikke bli dyttet og ingen av robotene flytter på seg.
 
@@ -211,7 +216,8 @@
 
 *Kjøredetaljer*
 *   Siden vi ikke er ferdig med spillet, blir det nå i stedet kjørt en automatisk demo når main kjøres.
-*   Demoen demonstrerer at roboter kan skyve hverandre, bli stoppet av vegger, falle i hull og dø av å gå utenfor brettet.
+*   Demoen demonstrerer at roboter kan skyve hverandre, bli stoppet av vegger, falle i hull og dø av å gå 
+    utenfor brettet.
 
 ## UML
 ![UML](../Deliverables/Umls/UmlOblig2.png "UML Oblig 2")

From 13df764ed4724ef64f4c6b24d2838c5f28d7173b Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Thu, 27 Feb 2020 19:02:43 +0100
Subject: [PATCH 18/20] Oppdaterer spillversjon

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6fa0ff2..245fa0f 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,6 @@ Dette vil også kjøre alle tester i koden
 ### Kjøreprosedyre
 ```shell script
 cd target
-java -jar roborally-0.1-alpha-jar-with-dependencies.jar
+java -jar roborally-0.2-alpha-jar-with-dependencies.jar
 ```
 Den produserte .jar filen kan alternativt flyttes til en annen mappe og dobbeltklikkes for å kjøres.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e0eeb0d..267c8f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>inf112.fiasko.roborally</groupId>
   <artifactId>roborally</artifactId>
-  <version>0.1-alpha</version>
+  <version>0.2-alpha</version>
 
   <packaging>jar</packaging>
 

From cc94201dc6c1c2aa6bb914f60a2d106b4e3d7770 Mon Sep 17 00:00:00 2001
From: GabrielMagnus <Gabriel.Magnus@student.uib.no>
Date: Thu, 27 Feb 2020 19:04:17 +0100
Subject: [PATCH 19/20] =?UTF-8?q?La=20til=20n=C3=B8dvendig=20new=20line?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Deliverables/Oblig2.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Deliverables/Oblig2.md b/Deliverables/Oblig2.md
index 4e9fb51..de1db98 100644
--- a/Deliverables/Oblig2.md
+++ b/Deliverables/Oblig2.md
@@ -216,6 +216,7 @@
 
 *Kjøredetaljer*
 *   Siden vi ikke er ferdig med spillet, blir det nå i stedet kjørt en automatisk demo når main kjøres.
+
 *   Demoen demonstrerer at roboter kan skyve hverandre, bli stoppet av vegger, falle i hull og dø av å gå 
     utenfor brettet.
 

From 6ba5c058139f1890da29fd3ebf2b6911d0b11327 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Thu, 27 Feb 2020 19:17:03 +0100
Subject: [PATCH 20/20] Fjerner ubrukt debugging variabel

---
 src/main/java/inf112/fiasko/roborally/GameLauncher.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/inf112/fiasko/roborally/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
index baca17f..aaad23f 100644
--- a/src/main/java/inf112/fiasko/roborally/GameLauncher.java
+++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java
@@ -37,7 +37,6 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
     private Vector2 lastTouch;
     private final int viewPortWidth = 12 * tileDimensions;
     private final int viewPortHeight = 12 * tileDimensions;
-    private boolean debugging = false;
 
     @Override
     public void create() {
@@ -116,6 +115,8 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
                 this.game = debugGame;
                 this.debugGame = temp;
                 return true;
+            default:
+                return false;
         }
         return false;
     }