From a55410c122e0a7d46b0bf1db8ab78d033b7d2f21 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Mon, 2 May 2022 16:42:55 -0400
Subject: [PATCH] Update some graphics

There's now a proper idle animation for units (although only the player
has one at the moment). The new tilemap size is 16x16 and everything
has been adjusted for it.
---
 assets/main.tsx                               |  53 ++++++++++---
 assets/player-idle.atlas                      |  27 +++++++
 assets/player-idle.png                        | Bin 0 -> 889 bytes
 assets/test.tmx                               |  74 ++++++++++++------
 assets/world-map.png                          | Bin 0 -> 1695 bytes
 .../watersymbol/screens/GameScreen.java       |  50 +++++++-----
 6 files changed, 153 insertions(+), 51 deletions(-)
 create mode 100644 assets/player-idle.atlas
 create mode 100644 assets/player-idle.png
 create mode 100644 assets/world-map.png

diff --git a/assets/main.tsx b/assets/main.tsx
index 7649ac0..57890e4 100644
--- a/assets/main.tsx
+++ b/assets/main.tsx
@@ -1,16 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.4" name="main" tilewidth="32" tileheight="32" tilecount="2" columns="0">
- <grid orientation="orthogonal" width="1" height="1"/>
- <tile id="0" type="grass">
-  <properties>
-   <property name="walkable" type="bool" value="true"/>
-  </properties>
-  <image width="32" height="32" source="grass.png"/>
- </tile>
- <tile id="1" type="fake grass (real)">
+<tileset version="1.8" tiledversion="1.8.4" name="world-map" tilewidth="16" tileheight="16" tilecount="10" columns="2">
+ <image source="../../world-map.png" width="32" height="80"/>
+ <tile id="0" type="null">
   <properties>
    <property name="walkable" type="bool" value="false"/>
   </properties>
-  <image width="32" height="32" source="grass.png"/>
+ </tile>
+ <tile id="1" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="2" type="village">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="3" type="background">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="4" type="background">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="5" type="background">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="6" type="background">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="7" type="mountain">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="8" type="forest">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
  </tile>
 </tileset>
diff --git a/assets/player-idle.atlas b/assets/player-idle.atlas
new file mode 100644
index 0000000..d7f7676
--- /dev/null
+++ b/assets/player-idle.atlas
@@ -0,0 +1,27 @@
+
+player-idle.png
+size: 64, 32
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+player-idle1
+  rotate: false
+  xy: 2, 2
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+player-idle2
+  rotate: false
+  xy: 38, 2
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+player-idle3
+  rotate: false
+  xy: 20, 2
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
diff --git a/assets/player-idle.png b/assets/player-idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd64d845709ab09a38f80a30a95ec2969a309d80
GIT binary patch
literal 889
zcmV-<1BU#GP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0009(Nkl<ZcwX(7
z&r4KM6vywMQf6t<!f3SoQDzxhmYAVL$>5I`QDjgdMO2uTmHi;dip+>C2wa5GLM&PZ
zE!?y$4B8|?(4rP?YMS2nI_GlVdH20J@9FY=;c(yFx%cxu=e#>_W|Rui_VT)-Arar>
z3W@k0S1g$TYbdJ?7`P%z5>935MzyA-N|h|j@a;wt4#lEnn^mu@#+Y|RQ9}u*ZdHw1
z?==9$Q*cQ*lnY|fA`qE*N$H?#ZW<;jr!XJc00{?caGJt6Vv(V3kehq0uW2O1OvK%j
za;PBe&t!J`7;!i_O_ayc6W7)3++U88i5tSio7N*;<2~FFyZB-a2;($vYRBIE{_KG2
z?j7(kAStI}#RkJc@rfHyIBE(VrEYsLV~A@Q(Sr-ut_Das*#rGZHvjbbj2bvSl9*Gr
zyi(_a*C_tOmxK+Vhmvi`qfj&z?rcCD4m9(2)_IcRaHs*Fzva}Y`2-DsQMuR2f~on8
z+GdzTv^VXe;!OkWz#Wlrt_|K$Xn@U0l22dPF@2Jt`5!s;{b$aqOdvaX9B%^G*Pry6
z(fH)vW1aZW<@<r+<8Y=YUuuqh0(eL`FP=?l4vO~%_3QUPUShboVM*c60{-WHl{Q7-
zn#>_|9EPJ~Q?C6Y&iL)oz%#%Ru{hIjW_1(93Ns5cqz4bo@WA=_b>Z_CmxG{n_O}3M
z9Le^mBpk7rp&kiLMl{++SbJ$?!hGfM#G^PgZzXSj2Ur}#i{jXRHb*Rpp>4FftWmFn
z5ylWsXaf)z&kdXRUOl{N_QmD!CfXdaT!s|<j^TAheV<xe)fq5i93RV09K|Ch#vkBl
z>lhn8@8d~1t|r<Xv0R1~-4{%<WQw`Uj<ag>?he)7Qpzy_266b&#oVsLL+Z}0LG^C(
zif)3GL&Z}*cgG*;{Z~&NN>)6?8lcu~ZBw=(qN}$@&oy-H)x{TSfRAGz+r@C~e40D^
zeVmaqog5QSWR|J%{(>$*^N4L*yOn3CwzOu=oFsA1IexHhNjP!xNu(WZwdT%HG&QvZ
z=874*ID1-~19M3@N%9ekL!%-}d~H-jiLZ@{RH;&>N|h>As#K{`rIP4B>R2eJtl|iG
P00000NkvXXu0mjf(`v4b

literal 0
HcmV?d00001

diff --git a/assets/test.tmx b/assets/test.tmx
index b8519f0..0fb7de3 100644
--- a/assets/test.tmx
+++ b/assets/test.tmx
@@ -1,28 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="3" nextobjectid="6">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="6">
  <tileset firstgid="1" source="main.tsx"/>
- <layer id="1" name="Tile Layer 1" width="30" height="20">
+ <layer id="1" name="Tile Layer 1" width="50" height="50">
   <data encoding="csv">
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,9,9,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,9,9,9,9,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,9,9,2,2,2,2,2,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,9,9,3,2,2,2,2,8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,8,2,2,2,2,3,9,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,3,2,2,9,9,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,9,9,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,9,9,2,9,2,2,2,2,9,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,4,2,2,2,2,9,9,2,2,2,2,9,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 </data>
  </layer>
 </map>
diff --git a/assets/world-map.png b/assets/world-map.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ee3176d14ccd99f6542bdabd34d31b19f105e6f
GIT binary patch
literal 1695
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

literal 0
HcmV?d00001

diff --git a/core/src/com/redstrate/watersymbol/screens/GameScreen.java b/core/src/com/redstrate/watersymbol/screens/GameScreen.java
index 04bbebd..c7c20c7 100644
--- a/core/src/com/redstrate/watersymbol/screens/GameScreen.java
+++ b/core/src/com/redstrate/watersymbol/screens/GameScreen.java
@@ -5,6 +5,7 @@ import com.badlogic.gdx.Input;
 import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.Animation;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -37,6 +38,8 @@ public class GameScreen implements Screen {
     Texture playerTexture;
     Sprite playerSprite;
 
+    Animation<TextureRegion> playerIdleAnimation;
+
     TextureAtlas arrowAtlas;
 
     // data for in-turn actions
@@ -50,40 +53,42 @@ public class GameScreen implements Screen {
 
         camera = new OrthographicCamera();
         camera.setToOrtho(false, 800, 480);
+        camera.zoom = 2.0f;
 
         tiledMap = new TmxMapLoader().load("test.tmx");
         tiledMapRenderer = new OrthogonalTiledMapRenderer(tiledMap);
 
         Unit player = new Unit();
-        player.positionX = 1;
-        player.positionY = 1;
+        player.positionX = 11;
+        player.positionY = 16;
         player.team = Unit.Team.Player;
 
         units.add(player);
 
         Unit player2 = new Unit();
-        player2.positionX = 1;
-        player2.positionY = 5;
+        player2.positionX = 11;
+        player2.positionY = 20;
         player2.team = Unit.Team.Player;
 
         units.add(player2);
 
         Unit enemy = new Unit();
-        enemy.positionX = 5;
-        enemy.positionY = 1;
+        enemy.positionX = 15;
+        enemy.positionY = 18;
         enemy.team = Unit.Team.Enemy;
 
         units.add(enemy);
 
         Unit enemy2 = new Unit();
         enemy2.positionX = 15;
-        enemy2.positionY = 15;
+        enemy2.positionY = 18;
         enemy2.team = Unit.Team.Enemy;
 
         units.add(enemy2);
 
         playerTexture = new Texture(Gdx.files.internal("player.png"));
         playerSprite = new Sprite(playerTexture);
+        playerIdleAnimation = new Animation<TextureRegion>(0.500f, new TextureAtlas("player-idle.atlas").getRegions(), Animation.PlayMode.LOOP_PINGPONG);
 
         arrowAtlas = new TextureAtlas("test.atlas");
 
@@ -113,7 +118,9 @@ public class GameScreen implements Screen {
 
         getNextUnit();
 
-        smoothlyTransitionCamera(new Vector3(currentUnit.positionX * 32, currentUnit.positionY * 32, 0));
+        if(currentUnit != null) {
+            smoothlyTransitionCamera(new Vector3(currentUnit.positionX * 16, currentUnit.positionY * 16, 0));
+        }
     }
 
     void updateUnits() {
@@ -155,7 +162,7 @@ public class GameScreen implements Screen {
                 startNewTeamTurn(Unit.Team.Player);
             }
         } else {
-            smoothlyTransitionCamera(new Vector3(currentUnit.positionX * 32, currentUnit.positionY * 32, 0));
+            smoothlyTransitionCamera(new Vector3(currentUnit.positionX * 16, currentUnit.positionY * 16, 0));
         }
     }
 
@@ -242,9 +249,12 @@ public class GameScreen implements Screen {
         currentlyTransitionCamera = true;
     }
 
+    private float stateTime = 0.0f;
+
     @Override
     public void render(float delta) {
         ScreenUtils.clear(0, 0, 0.2f, 1);
+        stateTime += delta;
 
         if(currentlyTransitionCamera) {
             camera.position.set(oldCameraPosition.lerp(targetCameraPosition, lerp));
@@ -263,8 +273,9 @@ public class GameScreen implements Screen {
         game.batch.setProjectionMatrix(camera.combined);
 
         for(Unit unit : units) {
-            playerSprite.setPosition(unit.positionX * 32, unit.positionY * 32);
-            playerSprite.draw(game.batch);
+            TextureRegion currentFrame = playerIdleAnimation.getKeyFrame(stateTime, true);
+
+            game.batch.draw(currentFrame, unit.positionX * 16, unit.positionY * 16);
         }
 
         // early exit, since we want the camera to finish its nice transition
@@ -285,8 +296,8 @@ public class GameScreen implements Screen {
                 double newX = Math.floor(mousePos.x);
                 double newY = Math.floor(mousePos.y);
 
-                int newFixedX = (int) (newX / 32.0);
-                int newFixedY = (int) (newY / 32.0);
+                int newFixedX = (int) (newX / 16.0);
+                int newFixedY = (int) (newY / 16.0);
 
                 ArrayList<Vector2> path = AStar.path(new Vector2(currentUnit.positionX, currentUnit.positionY), new Vector2((float) newFixedX, (float) newFixedY), getCollision(), tiledMap);
                 if (path != null) {
@@ -336,7 +347,7 @@ public class GameScreen implements Screen {
                         }
 
                         if (spriteRegion != null) {
-                            game.batch.draw(spriteRegion, newPosition.x * 32, newPosition.y * 32);
+                            game.batch.draw(spriteRegion, newPosition.x * 16, newPosition.y * 16);
                         }
                     }
                 }
@@ -348,7 +359,7 @@ public class GameScreen implements Screen {
                 double newX = Math.floor(mousePos.x);
                 double newY = Math.floor(mousePos.y);
 
-                moveUnitTo((int) (newX / 32.0), (int) (newY / 32.0));
+                moveUnitTo((int) (newX / 16.0), (int) (newY / 16.0));
 
                 hasStartedMoving = false;
             }
@@ -397,7 +408,7 @@ public class GameScreen implements Screen {
                 currentUnit.positionX = (int) nextMove.x;
                 currentUnit.positionY = (int) nextMove.y;
 
-                smoothlyTransitionCamera(new Vector3(currentUnit.positionX * 32, currentUnit.positionY * 32, 0));
+                smoothlyTransitionCamera(new Vector3(currentUnit.positionX * 16, currentUnit.positionY * 16, 0));
             } else {
                 currentlyTakingAction = false;
                 currentlyAwaitingAuxilaryAction = true;
@@ -434,8 +445,8 @@ public class GameScreen implements Screen {
                 double newX = Math.floor(mousePos.x);
                 double newY = Math.floor(mousePos.y);
 
-                int newFixedX = (int) (newX / 32.0);
-                int newFixedY = (int) (newY / 32.0);
+                int newFixedX = (int) (newX / 16.0);
+                int newFixedY = (int) (newY / 16.0);
 
                 List<UnitAction> actions = getAvailableActionsForPosition(newFixedX, newFixedY);
                 for (int i = 0; i < actions.size(); i++) {
@@ -454,7 +465,8 @@ public class GameScreen implements Screen {
 
     @Override
     public void resize(int width, int height) {
-        camera.setToOrtho(false, width, height);
+        camera.viewportWidth = 230;
+        camera.viewportHeight = 230 * ((float)height / (float)width);
     }
 
     @Override