From e1203e42b0489952c595d02aeb5ec99703d45a6a Mon Sep 17 00:00:00 2001
From: Ritchie Cunningham <ritchie@ritchiecunningham.co.uk>
Date: Mon, 7 Mar 2022 13:45:31 +0000
Subject: [PATCH] [Fix] Animation [Add] Sound.

---
 bin/tfg/Game.class         | Bin 9609 -> 9609 bytes
 bin/tfg/Location.class     | Bin 2689 -> 2708 bytes
 bin/tfg/Map.class          | Bin 3425 -> 3425 bytes
 bin/tfg/Player.class       | Bin 3896 -> 5348 bytes
 bin/tfg/PlayerAction.class | Bin 0 -> 936 bytes
 bin/tfg/Tile.class         | Bin 1755 -> 1742 bytes
 res/stuck.wav              | Bin 0 -> 10188 bytes
 src/tfg/Game.java          |   4 ++
 src/tfg/Location.java      |   5 ++
 src/tfg/Map.java           |   5 ++
 src/tfg/Player.java        |  94 ++++++++++++++++++++++++++++---------
 src/tfg/PlayerAction.java  |   7 +++
 src/tfg/Tile.java          |   6 ++-
 13 files changed, 97 insertions(+), 24 deletions(-)
 create mode 100644 bin/tfg/PlayerAction.class
 create mode 100644 res/stuck.wav
 create mode 100644 src/tfg/PlayerAction.java

diff --git a/bin/tfg/Game.class b/bin/tfg/Game.class
index 4380cdf3562449d568f9a8e39bbf23aa30163240..7e40da1671b7b2863daad6751813d095a115d02b 100644
GIT binary patch
delta 253
zcmWNMJ4*vm5QV=>5|U`(n%rGBQ6p{$KC2jm5b=SEf(uHFtBoL72=P@}SlXtr@nVtx
zU?HrXU@ce+BG?G24e9KhZssuGIcM5IJ9xS=t|rb9nk+6kCUB^r?VZ_3d!)#dp<utv
zeqxj)MO$?qeP6CijNmgynQ38Gn54-REoQi8_TCK(6|tQYq{<-k0@N_F7g>m|+)y>@
z47128OKh>swoK2g@xnT<Z1N`RyQm)oe6qt2yL8#(S5o?f{BfY-9I7NoYJj>joLI-Z
kRj2mBJI=Nw_DsGxXPgUZb{Qq|nY7YT&i{@nZF}X;KjIxNYXATM

delta 253
zcmWNMy-R{o6o;Qnis`ivyYEFU-pCTAp-cp$2#bn>UMS3jrUao6m!^isRtJ|Z4*d@e
z!P^!z2hBkQEkbkA*49}L9G>(1&N<zn8$4VatBH_gj1erO6d0$Bc0IElHw@zmv+lzj
zMKi?6x{7z7^JRLPDSW9j%rnb6b2P})5&w$ft!-u(Bz94h5}G9u${6W=D&eJVs(O`4
zmf2v1T~^s+jYn!cNzyZ$ys*V9JG=>f7djx|i+#R1;Fmgo9I6Nn72{YXs4ByW^U^n}
j?fU6f>QvUA$v5Y6-33KDVKkGBD;-YcK8KWcKl!_Va`h~W

diff --git a/bin/tfg/Location.class b/bin/tfg/Location.class
index 438f446d14a749c4d170512a84a7b141d0f7d1a6..8832977d161e7ec8810874e22e2c31ae1cd5fb80 100644
GIT binary patch
delta 622
zcmY+B%TE(g6vlruokwT9XlpHzmnLnZVH#0eqLGMCDul*Dq_GyMg6{_i_(({M8kB`=
zuS=uu+*VD{7(-mSaN}RX!i5Vr;+dJ1GnsqNeCIpoeCOQd?8~hG<L{R>V2}sz{oe`S
z$Dpn#QqmiVS?8i+h-tlOb)_yTHlcjdTv1%*nto;FN;ecY@eQo<@rjxzvD=E-5U{Ib
zXKEuMaz`;AQR?N1n#-d8WxcT5@Yt-M+w<uZmiTFTcd(T_8J%<{^&6*MFFCu7PW{#y
z)V*%E{^RVkbJ*l{pIg;G-JE{y?zaOJ1-<O{WZ@{sMEn*o283tJP%GL=K7LYI<?No8
zgp@Sd#xM!COYlfYr4N(65-CcoL_7U-aZm~!;xq${bC{;=W?G8R3A(@u9#Q5gr|6LE
z{<saDk`+EH1cVzjg>g<WQz~bcXo#DT;x?0<mwBgjn^&kbCBYK%a3rKCo*_sw_{4>8
z7%lP5NT?IxqftW@bK-`nq408q)zr_t%Fda_cdS<ZGnd!C`jy}V*H@`JWACu)@^eeC
zdmRtw1af1j@sXL92uMlcZkeoyUG$0#WDf_#hFdr(Hr`e&A{mJ=McR~ndAt#qyBlOM
R#D>QLmH!XXdoP;g{y%-QU&#Of

delta 573
zcmY+AOHWf#6otQgdmr5EQCpP8Qc%+-MoXeLDEI&)kp_|?HPTpHMDYD84`oQSapDi?
zCjJC<ST!-m7<A;oAK}!AQ%5A~zPBS!a?U<y?X}ll`)u|-?+d^G`LqR$v;H>xosht3
zdJBe0uFHm#O)eRBU_w&dG~D90ymE5GcMbOlEu7NCTs6?#1H;1zaAzx*tJ4wEG%UxI
zT4}E8vntz8+YJZ^rR}b!3=Xc+cCw#c<k>B~Uc>5@Wp7NHURu6*huwZ<WaXDPB|p6Z
zsraLA4ntmk_=EDsFUku)C)>UWipq0!f|ewEp0zqy%1W`9DH7~c{ET*h0yaaMIjXs1
zq&ZHOVa{`si;QrIQ!H?rCC;kvG1fT8Qzpo0<%zC3{aO*NmTHCC#a6}@#cWkwr>3_A
z=}^g6sq1(RIT#FC^D+};ir2nkb+puu4S8A&rC8j=_nxkJax(gNWzEaWpnPDl{tc&7
z`^b&0&tbXnjyoTi^(wD%YWld}4l^5%6!E)A{XL5v?VD8H0ah5~5Jxl?bj%TrqdM#b
mjonY_dT?S7wz_HP&J#@gto>yVmd5B<q5S`$b|1%sJoyJu@LPNU

diff --git a/bin/tfg/Map.class b/bin/tfg/Map.class
index dce8fe2c0e70271f2a7c2f4d42e2e70384037e90..76fe33cef1cec1cc8d46c25e4aa7f702a2017bb5 100644
GIT binary patch
delta 210
zcmWO0y=uY$6o%n9ph!Xkh6=@?QjI^@HbrQR&_Xm=L4_#zv$(Wk!7WP%>Ez-a#Cz!A
zB6ttoyE$}mZm+<pXF4C8a~{5vc{2B|YG;UXg+ZDOCKa+c<mhwFj65$Cc%w*2iFeA;
zLfyoxsN6(<YN*?!xR*~`u4;#+_MyxlgmciSlf)IWfyE=YJmJgi;1ST|m6mWGE847i
wW-FUd$ve6n=<y{5j*@@G`4#U>pd=V52E)j|_%=qw8FR@*Do(j$99g>e553hRegFUf

delta 210
zcmWN}y=uZ>7{&2_K#?~nn5t;g7EM)**iUJNScnE&Xaj!CE?O+Oxi}Q3F1>@-dvNGd
z@E*E%b8vCiE9lf`dJYfg{C4)v{%)wtED?^dNOMYt3OVjLCgg;nd`6t{MxGf3<~Vwy
zKBFZRWqnYyge$A6v|Y}rt*7R~c)b$t8j~B6+zL>q$UQY01ahD7=+b1&gK!@2_<Yb}
uNt>1AFFLGw<VTtt$y;&u;{EY##CS0*LLJ0^tu9e|r0C-?;DVkmCj5V0MIw#>

diff --git a/bin/tfg/Player.class b/bin/tfg/Player.class
index 2209abdcc0e8b3db56ee6800e441cf3ce7415072..ce74f69f97524a16b0ad776449868c370af59656 100644
GIT binary patch
literal 5348
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
Y{P(4#c!%(aLcZlMpWAthn!2>?zmE(|?EnA(

literal 3896
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

diff --git a/bin/tfg/PlayerAction.class b/bin/tfg/PlayerAction.class
new file mode 100644
index 0000000000000000000000000000000000000000..33ae85255e2dd1b1a803067539b7acb766b524d9
GIT binary patch
literal 936
zcmZ{i-*3`T6vw}p0)?(_j0tl;bh_b$ZbJ5;FW|CeK|_RMQb$63y3`K4lwwL*!hfag
zVT;DaXa6YUxlJ97!#?!hbM86c^Evn2U%$WI0C<J6j2J`4KkHZCIecPy$EI%&T^VtP
z#dChaD-L)2mAX3~FvRt?UT4TQ{|&D)BwOuHLx01tP}fgeh0byFv~Do0e3%!Us+o@M
z+WsMfR4jE!`DFOfN+F?uVM#>>%cNKfL-NJujKuIg+wE5yrB0e+S5zdBOhFb#UWJUL
z*ga5@LYkzSwrlC*LC^Bu^PXb~_Myq04)<(f2TlbNmI%TBWRIxo1$V|4ZF0rZ9Cihd
zu`S~X-C2ZbGV-l~iX9Xf(%kd-#2kK}FlbTocJJIW{c0o9%wHFE!ypHh+h+{B(X_DP
z(%pL$;6)WrQDS%zO*wJ+XjF~Vxz(64i;2?M6k|B{OzX8RE@wIV1j-_o+A-|D%l)xO
z=Y@!*$gkaHI;<WY&;TTQT+-2+7!E)y%>~G;i>c5_oK^)36sMA<lP$jTcd%~uo^*x9
zOJoD%empR8i63+%O_4Ra@hNh~C04&uMht88Pm&I(!g}BlUV1*E_5qOy7FpZdyu!x(
zBsCP+6p#e?5Rbz2m(+kr&rh-1eJg1<-I^e2NgLPL+W!(1oFTAVgftChH`LGwNB}BX
Wrd{LNPq6>z#h?Y6d)N=w=YIepb-@<^

literal 0
HcmV?d00001

diff --git a/bin/tfg/Tile.class b/bin/tfg/Tile.class
index 4cd68f7246ec56852ab068aed8451c323218b2de..002062d1accc02c7dcb223f108862fb0c68c8561 100644
GIT binary patch
delta 455
zcmX|-yGjE=6o&tCcPG1>iP_v^HtXhwc!_8r1VIqBNF+^)Ktf6zg|v!j<trGb)!N3!
zT~I;97Z4juU&9CR%zBw(&iT&#XZ|zunRriJ9nQ|iJS&hxe)h4{E(#dnCSn#CT!EMZ
zQ^BHu39hn=KmzkBs|i@JWu2|DtQ@duCWmzfW4YU18QFBcArKGW*g4bU5VEH=nUJU2
z@ujWW0H+VCQ!J?q0dg~ughQPvqA7IRf$lTdB%RhCkqJ?VU_p<d6hYaDz~e8Z(*hKR
z6Fop_I57fv!w|kx2~oYLo90lb-7Zr?0lQ@0h|21Sen1(^3%$lHd9AxFC7<*YFG)%V
zO{B4f47N$vBV`{&jNr-xqqDDuZBVaT<XpX@_+!PRs{ij|k>}p;^E&j?8Y%MueEDj$
n$?nT&#p2kE#%OZi^&ZgTgInn1ReBJC@dpKY#5*+R4d3|&n4~?l

delta 463
zcmX|--AV#M6vzML?u?qdX0Ew@wthsE86|{7MI?oR1YHQmUWFGDeP9<Fbk`e%G7k|%
zH?2??QP2zY0zE*l(V3;1i<$YIbLRa2XFkm@bJVrWy{rCU*zFHH-OKBq2B0uLaYfRA
zjnw#kp^`DcAwmd-!H_o)R1i{7Fc5-Jw~~Qr#AJ#sv!vW-=a!8X2EN#AE_J3TziPmo
ze6Sm)nTX15t;(YEOgp{JAPkj{kZb@(tOd#gv5aa*u^<V|AWjt)Q4c!pK;sq6jVH7h
z%ubN@A*=h4^I?wr;D|S>(>$cxuI?e%cDV<qJwfq_ngmdWJk&$Bz%HrG`ymykv6Y^@
z&`XTVJ3Y%R`JfN-5prsvO8z#;-4^*eAZINk(19&CdA*@Lmg%ipTCDI$hf)EAAI$!X
zgh{gTJ5-&1SN(d@Ls5Esoz%X0EofrRci{*p>pY_-j_#o!S7;0Z{s(F4iaNO*iJc!D
CQ$dRW

diff --git a/res/stuck.wav b/res/stuck.wav
new file mode 100644
index 0000000000000000000000000000000000000000..310156ccfae01ce0770861e02e26e19883ddcc07
GIT binary patch
literal 10188
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
RED$UZED$UZEbwzI@IOAr<t+dJ

literal 0
HcmV?d00001

diff --git a/src/tfg/Game.java b/src/tfg/Game.java
index 09a0c23..d9b1aa4 100644
--- a/src/tfg/Game.java
+++ b/src/tfg/Game.java
@@ -8,6 +8,10 @@ import org.jsfml.window.event.Event;
 import java.util.ArrayList;
 import java.util.Collections;
 
+/**
+ * TFG Game's main class.
+ * @author Ritchie Cunningham
+ */
 public class Game {
 	private RenderWindow renderWindow = new RenderWindow();
 	private final String renderWindowTitle = "TFG Game";
diff --git a/src/tfg/Location.java b/src/tfg/Location.java
index d8b5b14..0249f42 100644
--- a/src/tfg/Location.java
+++ b/src/tfg/Location.java
@@ -1,6 +1,10 @@
 package tfg;
 import org.jsfml.system.Vector2i;
 
+/**
+ * Contains a position and direction.
+ * @author Ritchie Cunningham
+ */
 public class Location implements Cloneable {
     private Vector2i locPosition = new Vector2i(0,0);
     private Direction locDirection;
@@ -62,6 +66,7 @@ public class Location implements Cloneable {
                 newLocation.subtractPosition(new Vector2i(1,0));
                 break;
         }
+        newLocation.setDirection(d);
         return newLocation;
     }
 
diff --git a/src/tfg/Map.java b/src/tfg/Map.java
index 7c71e0a..72b1b42 100644
--- a/src/tfg/Map.java
+++ b/src/tfg/Map.java
@@ -14,6 +14,11 @@ import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Arrays;
 
+/**
+ * A map or level for the player to interact in. Can be created
+ * manually or procedurally.
+ * @author Ritchie Cunningham
+ */
 public class Map implements Drawable {
     private Vector2i mapDimensions = new Vector2i(0, 0);
     private Tile[][] tileArray;
diff --git a/src/tfg/Player.java b/src/tfg/Player.java
index cb05f6f..cf091a9 100644
--- a/src/tfg/Player.java
+++ b/src/tfg/Player.java
@@ -1,5 +1,8 @@
 package tfg;
 
+import org.jsfml.audio.Sound;
+import org.jsfml.audio.SoundBuffer;
+import org.jsfml.audio.SoundSource;
 import org.jsfml.graphics.Drawable;
 import org.jsfml.graphics.IntRect;
 import org.jsfml.graphics.RenderStates;
@@ -12,24 +15,34 @@ import org.jsfml.system.Vector2i;
 import java.io.IOException;
 import java.nio.file.Paths;
 
+/**
+ * Player Class
+ * @author Ritchie Cunningham
+ */
 public class Player implements Drawable {
     private Location playerLoc;
     private Texture playerSpritesheetTexture = new Texture();
     private Sprite playerSprite = new Sprite();
     private Map currentMap;
     private final Vector2i playerSize = new Vector2i(32, 48);
-    private int animationCounter = 0;
+    private PlayerAction currentAction = PlayerAction.NONE;
+    private Location newPlayerLoc;
+    private int frameCounter = 0;
+    private final float animationSpeed = 20.f;
     private int animationFrame = 0;
-    private boolean animated = false;
+    private SoundBuffer cannotMoveBuffer = new SoundBuffer();
+    private Sound cannotMove = new Sound();
     
     public Player() {
         playerLoc = new Location(0, 0);
         try {
             playerSpritesheetTexture.loadFromFile(Paths.get("res/player.png"));
+            cannotMoveBuffer.loadFromFile(Paths.get("res/stuck.wav"));
         } catch(IOException ex) {
             ex.printStackTrace();
         }
         playerSprite = new Sprite(playerSpritesheetTexture);
+        cannotMove.setBuffer(cannotMoveBuffer);
     }
 
     public void changeMap(Map m) {
@@ -41,11 +54,15 @@ public class Player implements Drawable {
     }
 
     public void move(Direction d) {
-        Location newLoc = playerLoc.getRelativeLocation(d);
-        if(currentMap.isValidLocation(newLoc)) {
-            animated = true;
-            playerLoc = newLoc;
+        if(currentAction == PlayerAction.NONE) {
+            Location newLoc = playerLoc.getRelativeLocation(d);
             playerLoc.setDirection(d);
+            if(currentMap.isValidLocation(newLoc)) {
+                currentAction = PlayerAction.MOVING;
+                newPlayerLoc = newLoc;
+            } else if(cannotMove.getStatus() != SoundSource.Status.PLAYING) {
+                cannotMove.play();
+            }
         }
     }
 
@@ -55,46 +72,77 @@ public class Player implements Drawable {
 
     public IntRect getTextureCoords() {
         IntRect textureCoordsRect = new IntRect(0,0,0,0);
-        int animationAddition = animationFrame*32;
 
         switch(playerLoc.getDirection()) {
             case NORTH:
                 textureCoordsRect =
-                    new IntRect(0+animationAddition, 144, playerSize.x, playerSize.y);
+                    new IntRect(0+(animationFrame*32), 144, playerSize.x, playerSize.y);
                 break;
             case SOUTH:
                 textureCoordsRect =
-                    new IntRect(0+animationAddition,0,playerSize.x,playerSize.y);
+                    new IntRect(0+(animationFrame*32),0,playerSize.x,playerSize.y);
                 break;
             case EAST:
                 textureCoordsRect =
-                    new IntRect(0+animationAddition,96,playerSize.x,playerSize.y);
+                    new IntRect(0+(animationFrame*32),96,playerSize.x,playerSize.y);
                 break;
             case WEST:
                 textureCoordsRect =
-                    new IntRect(0+animationAddition,48,playerSize.x,playerSize.y);
+                    new IntRect(0+(animationFrame*32),48,playerSize.x,playerSize.y);
                 break;
         }
         return textureCoordsRect;
     }
 
     public void draw(RenderTarget target, RenderStates states) {
-        if(animated) {
-            animationCounter++;
-            if(animationCounter >= 10) {
-                animationCounter = 0;
-                animationFrame++;
-                if(animationFrame >= 4) {
-                    animationFrame = 0;
-                    animated = false;
+        Vector2f spritePosition = new Vector2f(0,0);
+        Vector2i currentPlayerPosition = playerLoc.getPosition();
+        if(currentAction == PlayerAction.MOVING) {
+            if(frameCounter >= animationSpeed) {
+                frameCounter = 0;
+                currentAction = PlayerAction.NONE;
+                playerLoc = newPlayerLoc;
+                newPlayerLoc = null;
+                Vector2i newPlayerPosition = playerLoc.getPosition();
+                spritePosition = new Vector2f(newPlayerPosition.x, newPlayerPosition.y);
+                animationFrame = 0;
+            } else {
+                float additionX = 0.0f;
+                float additionY = 0.0f;
+                switch(playerLoc.getDirection()) {
+                    case NORTH:
+                        additionY = -(1.0f / animationSpeed) * (frameCounter);
+                        break;
+                    case SOUTH:
+                        additionY = (1.0f / animationSpeed) * (frameCounter);
+                    case EAST:
+                        additionX = (1.0f / animationSpeed) * (frameCounter);
+                        break;
+                    case WEST:
+                        additionX = -(1.0f / animationSpeed) * (frameCounter);
+                        break;
                 }
+                float change = Math.abs(additionX + additionY);
+                if(change >= 0.f && change < .25f) {
+                    animationFrame = 0;
+                } else if(change >= .25f && change < .5f) {
+                    animationFrame = 1;
+                } else if(change >= .5f && change < .75f) {
+                    animationFrame = 2;
+                } else if(change >= .75f && change <= 1.0f) {
+                    animationFrame = 3;
+                }
+                spritePosition = new Vector2f(currentPlayerPosition.x + additionX,
+                    currentPlayerPosition.y + additionY);
             }
+            frameCounter++;
+        } else {
+            spritePosition = new Vector2f(currentPlayerPosition.x, currentPlayerPosition.y);
         }
-        Vector2i playerPosition = playerLoc.getPosition();
-        Direction playerDirection = playerLoc.getDirection();
         playerSprite.setPosition(
-            new Vector2f((playerPosition.x*playerSize.x),
-            (playerPosition.y*playerSize.x) - (playerSize.y-playerSize.x)));
+            new Vector2f(spritePosition.x*playerSize.x,
+            (spritePosition.y*playerSize.x) - (playerSize.y - playerSize.x)));
+        
         playerSprite.setTextureRect(getTextureCoords());
         RenderStates newStates = new RenderStates(playerSpritesheetTexture);
         playerSprite.draw(target, newStates);
diff --git a/src/tfg/PlayerAction.java b/src/tfg/PlayerAction.java
new file mode 100644
index 0000000..3628952
--- /dev/null
+++ b/src/tfg/PlayerAction.java
@@ -0,0 +1,7 @@
+package tfg;
+
+/**
+ * Actions the player can carry out.
+ * @author Ritchie Cunningham
+ */
+public enum PlayerAction {NONE, MOVING }
diff --git a/src/tfg/Tile.java b/src/tfg/Tile.java
index dd9fc21..bc5a2ea 100644
--- a/src/tfg/Tile.java
+++ b/src/tfg/Tile.java
@@ -2,10 +2,14 @@ package tfg;
 
 import org.jsfml.system.Vector2f;
 
+/**
+ * Map tiles for the Map class.
+ * @author Ritchie Cunningham
+ */
 public enum Tile {
     WATER, SAND, GRASS;
 
-    private final static int tileSize = 32;
+    private static int tileSize = 32;
 
     public static Vector2f getTextureCoords(Tile t) {
         Vector2f textureCoordinates = new Vector2f(0, 0);