From 2c5cbf5c72d248d97d28dfe5485741ffe4101d0b Mon Sep 17 00:00:00 2001
From: bob <lol@lol.com>
Date: Wed, 1 Jun 2022 14:39:10 -0400
Subject: [PATCH] Merge time

---
 .idea/misc.xml                           |   2 +-
 out/production/final/GamePanel.class     | Bin 4695 -> 4848 bytes
 out/production/final/GenericSprite.class | Bin 2252 -> 2290 bytes
 src/GamePanel.java                       |  14 ++++++++------
 src/GenericSprite.java                   |   8 ++++----
 src/Tile.java                            |  15 +++++++++++++++
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1ce6e7f..d15472f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-18" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="openjdk-18" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/out/production/final/GamePanel.class b/out/production/final/GamePanel.class
index 5a72dbcc3e97ea5a5c739ea2949ab87c98f5fd4b..c4d26fae6d52027905be72ea7f27f1fbff20f0b3 100644
GIT binary patch
delta 1797
zcmah~X>3$g6#nikeKT)fr=6yD328_uRcVV=5wInxZAwbjR;0u!jY}A&4;VYn)V3mH
zh!YWhSQ9}XhM>_(fFOd(beR?kiYtqv;D-BNK~V%jr4^~)ooS~{6JnD$@0@eb{qA?p
z`R?nn$*1$wLl<|y0-#iwBWjWoR#A%QHEhER0*W{2_xl=jfwU{D=jZ{w+2@_#)a+~3
zXH9Y2aSe88coCX_2ubf{4LcDLu!r2bKj`(fhPX0Yu5@bXisda=5k-%JUJbjjTOjpr
z&oWPu-xF9;G(XhRs^4QQRtl%Trr~uY2{^q=b#G&ZB+=pv22|MariQoVlG3a<d3=FZ
zmFW959Kb<izjF1ocQm|<g9465Jyfgvbx(`lpx`|LEq0JESXAlr>naZ8hz2W;3S4F!
z5$R61iVyLTf{!(Pf@4OttuFg>Rz1qD_P#*Cv&gS2__A}4E!C9w8NPsuY<vX`0$;O(
zCVWHx+cExk#u>GI;`gz&AK+k~6-oU4k;ysq&48#f<~g?A*@2Qil-9dUdt9akJt&K!
zqHZK+KH(DQ#>JQ?){cwGyuxuY=HY;G)-hM<CyM|k7&mI=;k}rFqnL?)T#o@1i)56D
zG|Up2R6#B(#C50?Wtb!8pb9^6Up_3T#AF=D304`P_cMN>m4QV#8LO9d;8*;{+*5oq
zVHx70Nr6oOf5WYy&@#y41%5|6%<O=1UaKgVoH7^&YT(2z?A~1D;Z}~cHg+x{xOVL@
zvb0X)L4pXZ!fM$^V?}aR%_xc+X{f_gEWk9>v&P#K?5DEtCvk?%!Mfv2r4`4M)<dkr
zgj0sgnHA=IxLckB*z&tDBZ}uDv`y?7ICaTtAryFG_;UWt8%7mUx{@1bTf_--#@He;
z%-z_;kw&qmx?mR!fepx_u|Z%TN^1(^$86m?)Sn+_b{Dok1IO^b?efit%hbLRIntrk
zjab;(jhAG^Lil)E$LPk6OGZ+w7P^wK5y>$$Yi~C?WQAr~VVJ{q(a~Ad5=_EU3c$y<
zHnL5A+&}?TBM3K|a2M{yVzkg|#d0jeO5Be&gzyv|z-FvS3~>^XWcy{~wu})<DwGRI
zQLt_hIj+lHu532$58OP`zchBz!7UBF=q^h~-%aV*J0)0bbrvg(%(Q1I8TN^KTb4EG
zEv8wPrKGHXdgyq56tD8x$L9@WAf+fQr&fv-{;s3~9wwPp^j1?Xk5H>^RQ98|0*~P;
ztf9u%a`um-1W%v>>!`*jsiXC=QcB5(Y=#T4Py=Uij+AY<1AijI?xo;1{6))3>{=>6
zLX~8yl=pci+9|I{>Vz;qR&jx#oE?!pvCAnGMDg}`l|4)B_Cy<*n9#1BcW{6(LVoZr
z0e5IT+$O?p4*w6{U;=MCsY!Zb6i1E*{O=$?3-RkI5|l)OQa%c}QC_1mHbp{ceK=fS
z(1Z7T5&mE&1M#~Qhubj*PD{XP_y-qw+`r7W@Lfpq7f0?Ea$~T7qYty|d+=!|N+e4W
dyP|Q}T%J87k7Ac3YY8$>n4C0KY4Xj#{{XN|ghBuS

delta 1551
zcmai!X>3$=6vcmUI_;a~(S_93jx;8g#yACw7-`zXN|lgW#Zc55gb$Q-FojZ(O;F>A
zOR9;A^7I1<4JpP{s#Ho>thTri1w?TJcdMc(idJ#0m3rQr>2&<$OlIcZ`|khTbI-l=
zA1*vTHE`(c^8-LRV;zAs^ISid@U+D)ECXYc<2_^XEW7P$GduS=i#_gxjRE%3Y0_oU
zO^<!2d4=~yivfGk%nj|gc!@Lvb4_G*ZGGdqfG}RMc$EY8usLJKYZk9_z#zCHvS~r2
zAyT_GQfG3=z*=6rp|-ewRq@>VhDd;eykU{b5qrKb6nu-LCU0B3!@Kr+-%Z9b`-m^s
z`+-5oUYru@^!U#hh3|8m0C{|fg~3Pa$-~F;KS}aGwL`&*^FMQ+eNIq$sif(92#lxX
zr|8KE`}W{2yUD6FzmRt`IrcHDBHGR@Iw@sPN*$#_s8{k8SMjBC!g!g>RQV@Vvr*pH
zd?PD|rJQuD3zcvAPPwP_$;CUShaMB30e?_qGR-?8DhA)PBSwb}@;yqP84hQqVYf}1
zS>f=>Q5Y&o=W6v<MIqNn-+3+%K{^NGl^p8_?h>5AecbQB+WF~~%O+5&nal#Fb3K=G
zgZisUbTeJ5oaD4RfszDXNgU6KZB}0%x0@iIQSwY4A7P4$?2HL&A5PDUI;8?GsYRG9
zcHy1jfG-YeFpwBPiR5<%&=u}tR!TQd?xn1UE!P(9!#3DPri^U{`zfE-I(FJg>Y}xo
zU_8Aw9?A0TXkm@xL}hmKpLo6#p9rUS)8<6Hsunxm-i({0`t6Cxc!}{yX5|viq=iW?
zT56wiJ48GMr{OB83QN>tbSW25rx7iqm|G-TJ#$#jb*x|!4MbR}cO&arO_W<{Vl9uc
zPMzMS|KCQf+Z{=YbtNrO25F;YxRRffb$LOaB>gcV<78PuF{tayrek(Cy;a%lyJ%Hu
zYI>>JM~A&KbBez|+`|j{4BA^Wi`_Amlc6(rYvP;5{2qDts*fh^>I2&B2f2`kxR{5v
zQ;%p<wot~S+WxJ~$5t~>xJ1iUS#{$?z0%+(hQ-aN(f`bD>65{Y{30vW-MllhOmYKS
z-(QvJ=agNQbzY5b3LP2}RE2iOS!utcb5Rd3J1Tozm1AqQUD(ZT?bz=76T9lyfABZK
z7|w0uz}XF1p`?Xu(aD|vbMp5Dk;~k=x+EqDIM)WWCP5g9;zpu)m?9A#Qs!*6A9b3s
z`Z>6;sF%Ziytzkyte+TMTN0d=fU|T*{Hbz(Dch^xY2rRIK5q(y;JkwU%vspWd!3Xy
eEDcwt7;J%R|E*ZQhf)5K;h<D=R#w2ZWWc}i_(lK#

diff --git a/out/production/final/GenericSprite.class b/out/production/final/GenericSprite.class
index 87a5e2dbc21f306bc7a33f74a3e794fd38328bf6..859f6dfc75bca06aa70680101f1bdaefbe39fa82 100644
GIT binary patch
literal 2290
zcmb7FTT@$A6#fo`1i~&58fYu&jow1AP<x@Yw9pz5QlX`Urg!ZjIVGnYa$<6T^5ReM
zRh{WLee+qz;OK+XCm$SraQqwo2FGvhoSp=9obk+LU%tK8Uh7+zonQX?@h1S2s6^3%
z)(AohZ3r9aePM2zqvn=3x@6@&v$X112Ey0ulI=|zh$J)ohH~K>7pcv!15tEFpcM9@
z%fP-_t7KK|e70P%Ju0?k7iVUs4H(nm8}Wulufl#2Z?BdutB^L!a!sE?KMqjmer9@k
zjyf4Z4=KDOXn1ZWGds5|P(tA_ju=oCd$s5-R;+5(Dp3BB93E3RE{C0t_5AIb;3pJL
z3f{3%_B8}Ot#C$57u>B<6F#Jn5<F^GXDjYTsbCeNco%0Q7*QC-IRgiRI9Z!k$s7I9
z+MbaGbyh8pyL8d47-&rnrK2=-Uf}{R8VIesn~V$LoY)^zxGe09ZP{H>xGG`k*v?sw
zo3}lUUQ@WPWnPNRl)?=y^YX1s_|3_BWW!T`{wm*Z;i*3^=ua%qDP+WQd)_Q(CEVdR
zK_(V(JAyk3i@0l`D`1p%9hbhhtvF_W%|Orm?vsfqvRIDbo<a`y4a9=u*@{^%+WD$v
z*7E#o_9yr159Q>BhYF9R;@Y3vj&o<zbXY!Vw^U`(c{$VBV3<N_x4@};-Y!|UH`Z6I
z%Cfm41=&0A=1nJOR&3e(V8|=lG~GSFs|Y7pJ4H(>g^afBf>&gU)~xNIZW2xY?at-I
zP>!jgxkC*GdnD*{)?<_w%(CxAC+}Xe9Lv;2sn*?%sukEe@()`Ja;_^!TN~JGsp*{Y
zC{)ZX1N}|6ybXEX*Hr`i8#e@JWSn(3DtYSzTSsqKfJP*JY#Mn8fKC`vgj^X?Xq;ox
z+T1<nx&;yL*}K8Mn=7`hmS>~tncb;pHlm){czR~5>6xv?IYLc7IUJvG_cPaRoaa&l
ziNk%N?_s3kh}6)*sk??)swZAUT#pA+tu+kDa8!mt8BWQNO!b9C=x_}Ozu{dic*^lS
z6vsn+s=CmFZu;26_alZA=tYuT&LU2kJ~m=Mu2F8556(x_xLEfGALAK!^i0~2-pYzi
ztD`jsldD#Zt#B3Mc^(Cy(+`x9m}Z7|Fx*pk4V9vQ1F0RnrxDXfjt0n<j|>J#)kjVV
zBBWY1sWB!6I7U*(No$Z)PGSJ3h@9psNm4^3mBJWbttsxNF+#V`X=43#rvhRbSa?pC
zS9xO?q25?5#$EBhXfW7&Xb{;$gUB8lME;e=CDIrpjmxBQg*2{`#sq0xr{j~PF~!rH
z9N#C6G-=HI4;nUJ_}REbdXf#JQ5sTwz<kqnMi3Q)QCZ`;ArH5I#qTT$(I}@<-{BH}
z<DWgNalzFDf0MG4#X#sa_N5*Y>CV?MN#tk)S*;_3M3bL>i6{&FW)0(7JdX6598+~X
zju|SCGw-vFyw{6)k-@r)1eO@2EHitL0m`vmACSvKB9F=93B7*`m)xY7Ro!o&on*QV
zts}8s!u)se={dT7!9JqrY`f3DA`9JqlV78+4&M6Wm3H|S-E6qkuY1Mh>#@R4%HtS|
z=M0OgVLI7lI)s)!DKQ7@zU2qhm)s<Vzs39xmWF9e0x2<$^LKCu4;pFf(jDjU1zBgc
Wl$z3)2-24z?(%j6W!~F@PyPnu+@QPw

literal 2252
zcmb7FT~ixX7=9K)0%7?GgfF286<Y`v3I$4w1=>I%Hnfz`)Ygx7Ne*PolFcLwlpBA7
zx9W`JbjAy>bp%H*oL)P6;rKWF4UW&dSvCP3XUxo=bKd7Y=e+Opew_UB*H1qKn1>xk
z4QfLO=%_<bL)#1Ez!*0Uo$(Eoag6+qr8ETJHS?x3uOT#?;BO=yT%6)*{u&TQV+gvA
zCNyhkT2XmbG&89}(R6sQF15bAyre-}3NH3lPPFN0m+keXf>PPIQIKmobabLigI+Xu
za?W~Dl}akhqfbTIqvH)xHd<=?R3~_!jthb}>=(Qfg1)I^z}=m-5A#*{MICPm9yUuW
zMSDM=RoO7!#-$K0>lns}hAyAJI#79M{GK{mmIcr3D2Gx!XB0Km4v)mcG&HK?9bC~6
z*s~8vmvCC_kL$RK3HpA-FCoY^9aF-%;V7*vJ7YRWg3jo;?(Taj(hVIq-90Z)_XJ-L
zm4g;s`14o!{T5vK<C^;u>vwd-#d>|lD5NBk!PkC}SFjpFLdSc!r=i(r6}K&${?~0;
zMrKz-Yx1mSE{rwY58;81bv)D%@zpCuqmVN*B}tlcyldKr&z~Pj%MB?Vn^H{m+ookb
zI4~?$M%>PqSWiycu=b@g9w(MIS8GWx%KBPePOPkMGLCUOOJz&a%&YtRdt0iwX>3Ua
zwk7S1VWo|tDY6F!oSaFAT9Rj~ZjSfml++Nd9GY1t$K>s*Bfp~hs=Pj%<++hG6Gn4A
z6<+6dkV(p6?ADBe=S3s$-cXh@+;Y|T?ERARZT0`d)|%+unsTl6p0`w`XFRe+<4{9q
z)h(xqDEqpjp}lg0uOs7>y<g0zyQUkxGXWZtq+*Z-RKxH$LX*<uN|W;A9Fbn8^oZ*k
zgebFFeYpiaNMpj6A5(t+j7)#g<=)4Zb!WDyJF_X>nN7$!#5?%raC}1PYp&}!PsDor
zE_4KbfEJ4)bc_a0Eysw&YL5|>p<9Mt8Tw@y{FaAm@RZ{vK1ZNC4Rp5^Ei}@GJ~}^$
zD0LkerDIq5j(osfQ)OfL5Fb&ZS?NT&A}jW;8=47x%$3yW1fKB=Q2!i;=kSl*BLPf|
zo?xgo`wDt2ATFLD<|2lNbo<DmhxGbL$wT@D5hArNkr`$He8L*&dNVGP#t?e>Pz{jA
z5Fe^57{MfBnBnWQKxqkMSf$%Sth4NtPb`5gWax61x*!5=kw}D+`Y#%c>Ny%j&e0%p
zjs}r`r7=w!Go*2yG;WZ_P12Ynjazhlo-`Jyz0L6sX~aom`G3&Z#*UYbY0{HyXq9r1
z$^w#A*J*xKG)5&yy(aIscg6242{}=S#lFWFzsXOZA9KOgG{0GqWDyO#LR0Jsk(SIc
zW{GrHkexEpOLXv)FA!$+&K+aY-5$lQT~YJsWE2ZLJjuM@uH=0ZI_<ABSPxma8w^s4
znSI0nrLo8^OR`f^<nxR?c3HSK3siEhm;LtGNv7*iI~Hjp%s&W^p5@jrFf3fyQ=ffB
z7H)6NeuIuOxb*p#uFFewv*K2#+bag2iY<0g1_Lan%h;|mJzQlvfSL{|F%vI5%bPqe
zx#=GL4tGzG9HlV{<XCI8HF|=LO3IquZnO9_?6G_ERjKRtQ`b%E7H`(LM{=J38^48@
ADgXcg

diff --git a/src/GamePanel.java b/src/GamePanel.java
index 3b6c3c7..c66acc8 100644
--- a/src/GamePanel.java
+++ b/src/GamePanel.java
@@ -50,6 +50,11 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
     }
     player = new Player(GAME_WIDTH/2, GAME_HEIGHT/2, 'W', 'A', 'S', 'D', spriteArray); //create a player controlled player, set start location to middle of screen
     map.add(new Tile(1000, 700));
+    map.add(new Tile(700, 600));
+    map.add(new Tile(1000, 500));
+    map.add(new Tile(700, 400));
+    map.add(new Tile(1000, 300));
+    map.add(new Tile(700, 200));
     this.setFocusable(true); //make everything in this class appear on the screen
     this.addKeyListener(this); //start listening for keyboard input
 
@@ -96,31 +101,28 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
     player.isGrounded = false;
 
     for (Tile i : map) {
-
+      i.collide(player);
     }
     //force player to remain on screen
     if (player.y <= 0) {
       player.y = 0;
     }
     if (player.y >= GAME_HEIGHT - Player.PLAYER_HEIGHT) {
-      player.y = GAME_HEIGHT - Player.PLAYER_HEIGHT;
-      if (player.y >= GAME_HEIGHT - Player.PLAYER_HEIGHT) {
         player.y = GAME_HEIGHT - Player.PLAYER_HEIGHT;
         player.yVelocity = 0;
         player.isGrounded = true;
       }
       if (player.x <= 0) {
         player.x = 0;
-
+      }
         if (player.x <= 0) {
           player.x = 0;
         }
-      }
       if (player.x + Player.PLAYER_WIDTH >= GAME_WIDTH) {
         player.x = GAME_WIDTH - Player.PLAYER_WIDTH;
       }
     }
-  }
+
 
   //run() method is what makes the game continue running without end. It calls other methods to move objects,  check for collision, and update the screen
   public void run(){
diff --git a/src/GenericSprite.java b/src/GenericSprite.java
index e508a8b..31a62e7 100644
--- a/src/GenericSprite.java
+++ b/src/GenericSprite.java
@@ -12,9 +12,9 @@ public class GenericSprite extends Rectangle{
   public double yVelocity;
   public double xVelocity;
   public final double SPEED = 20; //movement speed of ball
-  public final double speedCap = 7; //Speed cap of ball
-  public static final int WIDTH = 20; //size of ball
-  public static final int HEIGHT = 20; //size of ball
+  public final double speedCap = 5; //Speed cap of ball
+  public int WIDTH = 20; //size of ball
+  public int HEIGHT = 20; //size of ball
   public boolean rightPressed = false;
   public boolean leftPressed = false;
   public boolean upPressed= false;
@@ -22,7 +22,7 @@ public class GenericSprite extends Rectangle{
   public boolean isGrounded = false;
   //constructor creates ball at given location with given dimensions
   public GenericSprite(int x, int y, int height, int width){
-    super(x, y, height, width);
+    super(x, y, height, width);WIDTH = width; HEIGHT = height;
   }
 
   //called from GamePanel when any keyboard input is detected
diff --git a/src/Tile.java b/src/Tile.java
index 06b7153..62e667f 100644
--- a/src/Tile.java
+++ b/src/Tile.java
@@ -9,6 +9,21 @@ public class Tile {
         this.y = y;
     }
 
+    //Actions when tile interacts with sprites
+    public void collide(GenericSprite s){
+        if(s.x+s.WIDTH>x&&s.x<x+length&&s.y+s.HEIGHT>=y&&s.y<=y+length){
+        if(s.x+s.WIDTH>x+20&&s.x<x+length-20&&y-s.y-s.HEIGHT<4){
+            s.isGrounded = true;
+            s.yVelocity = 0;
+            s.y = y-s.HEIGHT;
+        }
+        if(s.x+s.WIDTH<x+length/2){
+            s.x = x-s.WIDTH;
+        } else if(s.x>x+length-length/2){
+            s.x = x+length;
+        }
+        }
+    }
     public void draw(Graphics g){
         g.setColor(Color.black);
         g.fillRect(x, y, length, length);