From 7eb171b491beb2a16ee1787713cdea6717b5a5c3 Mon Sep 17 00:00:00 2001
From: Ritchie Cunningham <ritchie@ritchiecunningham.co.uk>
Date: Tue, 8 Mar 2022 22:03:56 +0000
Subject: [PATCH] [Add] Entity class.

---
 bin/tfg/Entity.class | Bin 0 -> 506 bytes
 bin/tfg/Player.class | Bin 3381 -> 3397 bytes
 src/tfg/Entity.java  |  27 +++++++++++++++++++++++++++
 src/tfg/Player.java  |  14 +++++++-------
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 bin/tfg/Entity.class
 create mode 100644 src/tfg/Entity.java

diff --git a/bin/tfg/Entity.class b/bin/tfg/Entity.class
new file mode 100644
index 0000000000000000000000000000000000000000..3934c27627e841ebe4fd4c653dafef7f6a87c6c3
GIT binary patch
literal 506
zcmZut%}&BV5dMZjE2V-(Me*jXKw=+2<zn>I=t0B1#kDS}ZBiB!-%1mWi3cCRhceD?
zF^cgrJ2U<MrXQbg?*NX`cTgj^>Lv|Ob0yV-gF0bj7T?EV7UyYrk<7$Y5t_n$j*2Ov
z9cetbv64l8NU)D&F4dS|1%nBpeo|Zu7ZzF`9IO#Kk<7*U;w};8Rh(pk(ADg05|>iX
z%Vk~N$~nO^@>LubZ>2(gdvUa2u<G6fVbencHbdvXp?<K6)X^y8YcGpMITdG82WeG4
z2l`^{vzEpGg-_6e+*#c730#{zh5Qn~jo~ZYCvIx+xY}lEW1V}i0-%i!Pn;J%*H!W}
vx{rUz{=eicY%j@UwyJ5X;phe3A8Xfa`<!;qDD*1S(q2dFnRtX9<GA|;H%3$z

literal 0
HcmV?d00001

diff --git a/bin/tfg/Player.class b/bin/tfg/Player.class
index 2fd159f03e322e3a0d4340bce78a872dbb39a841..47c06380ec7c0d2ea508a6c3fc972f7aee3d3f83 100644
GIT binary patch
delta 1279
zcmZ8g+jCPz9RBtsIh&kppwm=(nNEjxVCtL{BBK>(5sRfjfhL8tXe-qo!y$&2q@<^X
zTC|Gd1w^sytzPlgf{M~gPAe7PeDSYPpB!HtAAE5f^|wil4i9JdciZp#e!tz5ulcUV
z{Qj>S-vYP?H#sy0!#SFYb`M(<c8<fl;&)`6v@<b(N2^x88GeR<T?p*YCjHndPiW!V
zR)(@;*0>cNwlb+`!pWsGDT6@o<=8GSX;q#!?2yaa9=%;)Cpu)n6FIP(A(XR6qodAP
za%kg8YurF1+70Z*evW+%;R0Yf8|{pDoJ!gwPCA<r=t2#{>JcJv5{{J|>d9G2n<LIp
zEq~<UX`jB@Kn&GtIVg}okG$%+d)*<1a@E?7O!~Ox*hdnC;MfLw@qoZ>=woQQUH-r;
zrhQyCcq_^t6bM2XXu^QNLwH#3^8U_7<ThWMep28RCgd64mX-h*CIvYB1~%bwfhRD=
zAVzIxXF6vmm0|-=;ta=A3|#SdSt9~Z;~Dvj&#Zh_;5n2r=w0zcow40Y%?kqOWJIsi
zUlh22mt<Vu9Jq*Sj#n5Oq@_3b1SDRSuHNi@UEmG*tA3}y7w-zZhxet)>+}x<KEy{d
z#@AE)6M<RG$w}U*_u`7cr}8o%p!gR8U*eh!`8QU?upsamJ|`KDl}p(ULp@ERMyCCP
zY+3%ss^m}pD+60RH_@_$Z7%LJufr_gRr2@D!5`b;qH`IszD0D$Hc&yGiv#8|di#{q
zyomer=qD?x&bl}}PlMZvJ{+do_Fz!{9BA*h=o#JxAFUVg2$Hlb>j-SBRn}3mGz`Ft
z6dt8hX{@8~7+FJ<FNgLw!Ff0sV_+P6<)l$NH9Su_4TH2Aw1fC`?1SPG1zf(u#c&)M
zid0f&J5{P$-Hhasy%pggX-pIl))cEsYIU5zD#BpMVYGlH*92FY*=vMV)Sy!o=>H$T
zuf*?QOvZxso#S0Jq{kvIPSc)kaxpc7T5|zs^H@)j=9Nspi|6N1Ns*|F^9y)+7Dmx|
zO(|AWT?$59RHtjn1A0n2d+;V^NJ$uNcnf~grY0DK_NV$`H~m2ghPP$CsA@kui&jD<
zvUg@+l8UuTg_5B@7nfX&=L?RyUJ86XSCBymF8?dzv}m0AZ{Y1KG8Cm3TB{lfJwIC2
z=;I_+i47G=uSTf<`CD(`9Npdd!VHU@g-V@;@D;8T6agR)mpaq1NM2aO622zGpyWl|
Jz&CBx{{U~!4psmF

delta 1292
zcmZ8fYjYD-7=F$s*%LM=wbKH%1v}6I>!hWzqflrCN&`ZGG?7L$NH0s-hLn<~$+l2$
zRYXNfy&W$U1yr>4E-hqRVRXh1I*z|aKRClMj`*I0c90Ky_Psvu^FHVNT9vQb@W;Q`
ze+IA_*Euu>!|qE4V*}=>mE~|Vl=hn=W^lkvCxg*L{Z_Bdp);(IfAR8}P>mMj@OrV4
zp(JbNf|){JLnfW%X#QVshn-EOlLj8c7LLsf<ptPuYB1QB8nA*f(>{_D*os#9i?&N|
z69{3uyw6qF^f-fGLFeq@-lGl2%@G5&XfqJT9**4$K!g*H?l{qFW$e^oT41jnaxHha
zGgK;~@}kS@kD$^(1WyR;Lx;TT+OXzHhBCG7wsh*4X<LUoGTD@E8HnR4fn|7_q5dKH
zCtphKx~z3CD?K3KgD_B!g94rCl6&2Mvq9PBY1Kyrj^l(p?b-OSfkr$l@EmLgk+baW
zsVvDxv<$p}F^(4*xEdQVGXgK+WqHdJsCY%-6iONNNOXU=eWxPvn!xL_MX%Q15IBQz
z*{wG%nZR2dZ!*-#A-%>U@HXC&zv=7UQs6y#TYtnG$9aK|@Ud*>)%rz&OZY@~@wF8H
zOyDv;m*c!vk7G(;TF&!Mihm>UExwZvcpH{R@PojY_=;%QW;SWj0;@@YDmm)yanGw;
zAJSLIo8HTvO|GA?X&x;Owgs*sP_|>y-#HC$`#J}^ZXlAFL$rMz6;wNj1#TdoP|o@}
z?9U@XR#5dicxDC+n~=akx>Xmt<;^9bSP#9)N8zD!0wxa8Us=64Ots3g$kON%+~`A+
zx>8t!BXqjZPx&%vw+YV0!59PM2+MI}<=D{~%4z7P)1W`F8#?x&hb&RR<#%Q=4B!|=
zDk!ssDpjo>sLLaLFTy_J*ik@OUaVSVt0RLF!eAIewtyuc^pynCR|u=fL8mBi;I8?e
z#rZkdvdgzRJRDJy)j1fYf4bhm^OIN^n8nFF*4~v#ICym$6%+|NI6aHAQ!t9oyNa<=
z^><&exrgjk<bmGTf~s-6j}M4RIa=`{yu?i@=!5nTwsJJyq6EV^*(mN0ot#1oq0+F)
zNd$<+D#b$4P@jVf4u<muM_n%kKAkSmpoT9NXq*+bV~R#m@X#F^YNQ)li;{$1Ae~D3
zC{a~p{l%eQ*U|pp-+KdR2x`2bVR1A6;%0tafqGj6fLUCn%`{viuUtbO4jBd|CoqQ}
HTPyzqy_yrb

diff --git a/src/tfg/Entity.java b/src/tfg/Entity.java
new file mode 100644
index 0000000..b457b36
--- /dev/null
+++ b/src/tfg/Entity.java
@@ -0,0 +1,27 @@
+package tfg;
+
+/**
+ * The base class for all players, NPCs, Monsters, items etc.
+ */
+public class Entity {
+    /**
+     * The entity location.
+     */
+    protected Location entityLoc;
+
+    /**
+     * Get the entity location.
+     * @return Entity location.
+     */
+    public Location getLocation() {
+            return entityLoc;
+    }
+
+    /**
+     * Set the entity location.
+     * @param l New location.
+     */
+    public void setLocation(Location l) {
+        entityLoc = l;
+    }
+}
diff --git a/src/tfg/Player.java b/src/tfg/Player.java
index 6aff622..7b8ae73 100644
--- a/src/tfg/Player.java
+++ b/src/tfg/Player.java
@@ -16,7 +16,7 @@ import java.nio.file.Paths;
  * Holds everything that pertains to the player (you?).
  * @author Ritchie Cunningham
  */
-public class Player implements Drawable {
+public class Player extends Entity implements Drawable {
     /**
      * The players location.
      */
@@ -52,7 +52,7 @@ public class Player implements Drawable {
      * @param y Starting y pos.
      */
     public Player(int x, int y) {
-        playerLoc = new Location(x, y);
+        entityLoc = new Location(x, y);
         /* Load sprite texture and 'stuck' sound. */
         try {
             playerSpritesheetTexture.loadFromFile(Paths.get("res/player.png"));
@@ -63,7 +63,7 @@ public class Player implements Drawable {
         Sprite sprite = new Sprite(); /* Create a new regular sprite. */
         sprite.setTexture(playerSpritesheetTexture);
         /* Create a new animated sprite from the regular sprite. */
-        playerSprite = new AnimatedSprite(sprite, playerLoc);
+        playerSprite = new AnimatedSprite(sprite, entityLoc);
         cannotMove.setBuffer(cannotMoveBuffer);
     }
 
@@ -100,11 +100,11 @@ public class Player implements Drawable {
              * Get the location relative to the current location.
              * e.g. NORTH would return the location above the current location.
              */
-            Location newLoc = playerLoc.getRelativeLocation(d);
+            Location newLoc = entityLoc.getRelativeLocation(d);
             playerLoc.setDirection(d);
             if(currentMap.isValidLocation(newLoc)) {
                 currentAction = PlayerAction.MOVING;
-                playerLoc.setDirection(d);
+                entityLoc.setDirection(d);
                 playerSprite.startWalkingAnimation();
             } else if(cannotMove.getStatus() == SoundSource.Status.STOPPED) {
                 cannotMove.play();
@@ -121,9 +121,9 @@ public class Player implements Drawable {
             if(playerSprite.finishedAnimating()) {
                 currentAction = PlayerAction.NONE;
                 /* Actually move the location. */
-                playerLoc = playerLoc.getRelativeLocation(playerLoc.getDirection());
+                entityLoc = entityLoc.getRelativeLocation(entityLoc.getDirection());
                 /* Update the sprite with new location. */
-                playerSprite.updatePosition(playerLoc);
+                playerSprite.updatePosition(entityLoc);
             } else {
                 playerSprite.animate(); /* Proceed with the animation. */
             }