From 544a069f65689193eef848c9e97b640cc322d764 Mon Sep 17 00:00:00 2001
From: bob <lol@lol.com>
Date: Mon, 6 Jun 2022 11:24:46 -0400
Subject: [PATCH] Added finish block

---
 img/tiles/boxes/finish.png | Bin 0 -> 956 bytes
 saves/Level1.txt           |  10 +++++-----
 src/MapReader.java         |   4 ++++
 src/Player.java            |   4 ++++
 src/Tile.java              |   3 +++
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 img/tiles/boxes/finish.png

diff --git a/img/tiles/boxes/finish.png b/img/tiles/boxes/finish.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f7e90b23aaa57d6a9cd71ff1bfc1dc2bb06fcca
GIT binary patch
literal 956
zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1|$ph9<=}|#^NA%Cx&(BWL`2bFqe6{IEGZj
zy`6Qp=(Pby%hK=l&pgr-7!#M;H?KW+^60NcrAarPR`;`(--^!OY->~XI(OU6s`t5m
zm2+w@e~h*}{k>@K$<p7dmrr$ETV7}TEF-s!*Yo|9VA<k#8!`<1w=ey@Gw#dJ`5cp#
zx3#|t-&ir*h2`?rhs%#_PKr2mhVi07(Kfrcc9KO-(lf8mYyEpz=7z+X1;)Q->@Gfb
z@72j1V~$3)Uy;fm8icgeggY7ol6gcOO0O<dV7LAqBjwMVb5BUq>`=>xo9~tjP1)!?
zT_8qd;y=%_xN>&SMb@GWmZF<`uNzD%G%owTY0mEI9Za7m=ziP7GRIzR*>*Y0hf+5d
zUw*brVxmtMQ;26CQ&P`5oeY~-mIe{qo=!TJs<O&C%jZVS-6Ph|x@QYN%#%2%P{e4r
zG002U`P0o!k(YB`UU^{nZNl8&%qvsQwFU{ke8o3kC}WmGsGXvZp00(v>dh<PJl8O-
zxcPQ>;`L+RP0=%DUC*5PEnu=*Af@WE<(^Mrp}W$anfjiw54&i(E5=0o<tzEsJ>3`m
zG_T*3xH{YK#=B>$0xiUErs<m9%uOt)XW1L7(2`i&@lAh)$#iAGH`9+rB(I&@am6Zl
zx=x=#>5|=f6D#|+armF!%DtiI%Brj-tIeyf?S3=$LC~>1G3#3j<yS2G<^OnXZDei8
z7GAwTqlc4)_a{$`EjfIQ=T2$OO8-iK5z|K={KAE-RdEZ~Obp4tqy6l@=I7Uw_udz@
z`citxt8&Zy#H;7me%F=Foqu6>#ODdSAIC5LznF1X$bFTMOBg?YEsLEbo9t)VqyHpo
z)??YDw!i8^tyWA~CaiU>rqf_G&)jLs+c|gNbhF&D^sdhJ<t>qyPtPpb7q@qh?RE2S
z&3cnFziiL`F)N(y{mHzqhRa(%K3||bjg5b9<(FgX_ov*utF`xsn|e;f-}IzO2lhTx
zHL5z-JLUPk-2xY`3mKcg&nya_w#cIQz}n{z`(x%8*6<ld^=h1%9uY7je^cwBfElwU
zPLdFEPRin%Fk@ES7pzSAr-q-K7hSA({XJoE@Qn54O^0fnHCh)Mn0{6=RB1bMMMS~S
ibngplFqgTVv42xkJ#W^tr8dCq$l&Sf=d#Wzp$PzvXv)t3

literal 0
HcmV?d00001

diff --git a/saves/Level1.txt b/saves/Level1.txt
index f75a3e8..24775f3 100644
--- a/saves/Level1.txt
+++ b/saves/Level1.txt
@@ -6,13 +6,13 @@ sssssssssssssssssd
 sssssssssssssssssd         1       1         1      1      1
 sssssssssssssssssd                                                  1
 sssssssssssssssssd
-sssssssssssssssssd
-sssssssssssssssssd
-sssssssssssssssssd                                                        qwe  qwe
-sssssssssssssssssd                                                        asd  asd
+sssssssssssssssssd                                                                     qe   qe
+sssssssssssssssssd                                                                     ad ! ad
+sssssssssssssssssd                                                        qwe  qwe     atwwwrd
+sssssssssssssssssd                                                        asd  asd     zxxxxxc
 sssssssssssssssssd                                                  1     zxc  zxc
 sssssssssssssssssd
 sssssssssssssssssd                                   qwwwwwwwwe
 sssssssssssssssssd                                  qrsssssssstwe
-sssssssssssssssssd                               qwwrssssssssssstwe                !!!           qwe
+sssssssssssssssssd                               qwwrssssssssssstwe                !!!           qwe      +
 ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrsssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrstwwwwww3
\ No newline at end of file
diff --git a/src/MapReader.java b/src/MapReader.java
index 18b6466..ae0f330 100644
--- a/src/MapReader.java
+++ b/src/MapReader.java
@@ -44,6 +44,7 @@ public class MapReader {
               map.add(new SingleTile(x,y, GamePanel.getImage("img/tiles/terrain/grassMiddleLeft.png")));
           } else if(file.charAt(i)=='s'){
               map.add(new SingleTile(x,y, GamePanel.getImage("img/tiles/terrain/grassCenter.png")));
+              map.get(map.size()-1).collision = false;
           } else if(file.charAt(i)=='d'){
               map.add(new SingleTile(x,y, GamePanel.getImage("img/tiles/terrain/grassMiddleRight.png")));
           } else if(file.charAt(i)=='z'){
@@ -66,6 +67,9 @@ public class MapReader {
           } else if(file.charAt(i)=='!'){
               enemy.add(new NonPlayer(x, y, GamePanel.slimeSpriteArray, 50, 28));
 
+          } else if(file.charAt(i)=='+') {
+              map.add(new SingleTile(x,y, GamePanel.getImage("img/tiles/boxes/finish.png")));
+              map.get(map.size()-1).isFinish = true;
           }
           x+=Tile.length;
       }
diff --git a/src/Player.java b/src/Player.java
index 750d8d1..fbceffd 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -89,6 +89,10 @@ public class Player extends GenericSprite {
     boolean canUpdate = true;
     for(int i=0; i<GamePanel.map.size(); i++) {
       if(collide(GamePanel.map.get(i),this.x+x,this.y+y)){
+        if(GamePanel.map.get(i).isFinish){
+          LevelManager.nextLevel();
+          return true;
+        }
         canUpdate = false;
         break;
       }
diff --git a/src/Tile.java b/src/Tile.java
index 66242cb..200d3d4 100644
--- a/src/Tile.java
+++ b/src/Tile.java
@@ -6,9 +6,12 @@ public class Tile {
     public int y;
 
     public boolean collision;
+
+    public boolean isFinish;
     public int realX;
     public static final int length = 35;
     public Tile(int x, int y){
+        isFinish = false;
         collision = true;
         this.x = x;
         this.y = y;