From 97b1e857b018d4af25c9d3e5ef0fee4042bb8165 Mon Sep 17 00:00:00 2001
From: Ritchie Cunningham <ritchie@ritchiecunningham.co.uk>
Date: Mon, 7 Mar 2022 13:58:36 +0000
Subject: [PATCH] [Add] Collision Detection

---
 bin/tfg/Map.class  | Bin 3425 -> 3653 bytes
 bin/tfg/Tile.class | Bin 1742 -> 1943 bytes
 src/tfg/Map.java   |   8 +++++++-
 src/tfg/Tile.java  |  16 ++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/bin/tfg/Map.class b/bin/tfg/Map.class
index 76fe33cef1cec1cc8d46c25e4aa7f702a2017bb5..c409f3e31b2dc991cbeb1b49fa16f5d0dd7e8dde 100644
GIT binary patch
delta 420
zcmX|*O-lk%7=_Q(v6;jo$y``OEeaj2$W~<u(bkI6u(TE;Dv~%s?)?$cLS1FwWl<y|
zEuu}E{zaR9MMUS$fQ$Ry_w$_R+xI!){Q7%)2e5{x7iUkMQ46_BqFBla`24X-zOWE8
zvYATJC`STjDQA(|k9styofxM@IjMc9{zZXn7wTv@afn+N?r<;QqSi*HoXnJtx61-U
zmY}H+NY&Q0xEOdn)51zM4;vIhc!OOuH}wwYLmkY98T9bh+%qRO>@W_)&bSK);_x8B
z4A8Ahb`q?pfjyi<aL0`nG+ui6lGx|1zy&TD-P~)iE7hXGZk49eu!$vU*+fWI#PIQJ
zVNy1&N^fCAC*)NRH+49aw!KXWy9wu|C1~To0Y;I+G}2gME+MBZt3G7354ns7j7!Qi
R*EEP<tg09zqZGE`@gJ<4RUiNW

delta 177
zcmX>q^H7TG)W2Q(7#J9A8J2G3+QB~ApF?f(OZMo=D>wofSvUXUFk&(5XJBGr1}ZVu
z-o`N7S7!@@+H3|5Af+{%K@r5$+QJ|Oq!uv<g9ITwtwoa`@{0NgF|aZOGYB(;FeoyF
zGUx!=K|q5PAjScCAwV9`V4&PW21cM-J%&XL96;-$fubA?jDHvm*%?HEGK+zHCWa*d
DP;@1f

diff --git a/bin/tfg/Tile.class b/bin/tfg/Tile.class
index 002062d1accc02c7dcb223f108862fb0c68c8561..32013b13d8df15377337c64bdf12615afcde1981 100644
GIT binary patch
delta 481
zcmYLEOD_Xa7(I7p+A>DG5=lK1ZO|bdudrxYc+*m}RmEl`qaLFh)x^plu#s6<T1v!%
zNTiXlw6O3$`~)I6QwjNU&iA<I-tXMk>hl`)<?G=Iz$i9v)tF>zIjb;X<};?fpU4YT
zcgG9cIU}`eTanPZfMRahmVjXCEt>X`b?9nB8~-X5Gnn&XR-kszESiRG=5t2!_^@Cd
zXqZRLIhA(22@P>9IUiEAVMRj~G!+6V4U?GiVbz(FFGR)NoBSwF&LA;>0XbSiSieVq
z_=+t$2|>t26VXlt<>)0;h2&A9&DZ7A0J#Gd<N)6ZGCCPu2r+t~BaB}3!QdQd{N02I
zyzC^-$NiY#nlZMOP(Be9iXvFjr*q*6NYlN}r^nyINgN9l)={YQrt3_t7kUYc&bwzw
zUCus3xyh7}bVj_!&hia?*TRn$q|r)0A!Z$e7-p8~6m;OeQCaro{@=CG2H&g?nQt^e
UFuRmS?2ov2jVcLQte5k~4+lg|+W-In

delta 238
zcmbQve~y>y)W2Q(7#J9A86q}vc{5F}XOfh2W^iR^aA9N+$Vx0r)Xz!GOV<ysEG|jS
z<zaARaG$)5DTB?MhrxrvXR->jjj$gN12+Q?7Xu?h01tx$gCjdb(Bxv~`HbwFg<1A8
zPR?hOVRV|@!zL@^!Qcs0BnY%ji-8HqVqoABV$|Bf;B|n3adI!4<m7v75?sEK#~4^P
zgzsSRpTw>&<GX=@nL&U-l0k+ckU^F~jX@JgYcUuzm@x!S_GVYq4*t&|%)rRb5DX#$
V8NA^H(1sA84NMH73}Ik89022AE$aXP

diff --git a/src/tfg/Map.java b/src/tfg/Map.java
index 72b1b42..729361c 100644
--- a/src/tfg/Map.java
+++ b/src/tfg/Map.java
@@ -78,11 +78,17 @@ public class Map implements Drawable {
         mapVertexArray.draw(target, newStates);
     }
 
+    public Tile getTile(Location l) {
+        Vector2i position = l.getPosition();
+        Tile t = tileArray[position.x][position.y];
+        return t;
+    }
+
     public boolean isValidLocation(Location l) {
         Vector2i coordinates = l.getPosition();
         return ((coordinates.x >= 0) && (coordinates.y >=0) &&
             (coordinates.x < mapDimensions.x) &&
-            (coordinates.y < mapDimensions.y));
+            (coordinates.y < mapDimensions.y) && Tile.getCanWalkOn(getTile(l)));
     }
     
 }
diff --git a/src/tfg/Tile.java b/src/tfg/Tile.java
index bc5a2ea..b73455d 100644
--- a/src/tfg/Tile.java
+++ b/src/tfg/Tile.java
@@ -30,4 +30,20 @@ public enum Tile {
     public static int getSize() {
         return tileSize;
     }
+
+    public static boolean getCanWalkOn(Tile t) {
+        boolean able = false;
+        switch(t) {
+            case WATER:
+                able = false;
+                break;
+            case SAND:
+                able = true;
+                break;
+            case GRASS:
+                able = true;
+                break;
+        }
+        return able;
+    }
 }