From 49c6973b65d8a10d4f019bc2ec9578042e0fbc44 Mon Sep 17 00:00:00 2001 From: c7h-alb-u1 <ibrahim.zakari@stud.hs-hannover.de> Date: Thu, 14 Oct 2021 20:19:06 +0200 Subject: [PATCH] Update res/walls1.txt, res/walls2.txt, res/walls3.txt, res/walls4.txt, res/walls5.txt, res/walls6.txt, src/GameFrame.java, src/GamePanel.java, src/Main.java, src/ReadFile.java, src/Walls.java, Built Jars/MazeGame.jar files Deleted bin/GameFrame.class, bin/GamePanel.class, bin/Main.class, bin/ReadFile.class, bin/Walls.class, bin/walls1.txt, bin/walls2.txt, bin/walls3.txt, bin/walls4.txt, bin/walls5.txt, bin/walls6.txt, .classpath, .project, BuiltArtifacts/MazeGame.jar files --- .classpath | 7 ---- .project | 17 -------- {BuiltArtifacts => Built Jars}/MazeGame.jar | Bin 78083 -> 78009 bytes bin/GameFrame.class | Bin 2803 -> 0 bytes bin/GamePanel.class | Bin 3781 -> 0 bytes bin/Main.class | Bin 439 -> 0 bytes bin/ReadFile.class | Bin 2137 -> 0 bytes bin/Walls.class | Bin 2158 -> 0 bytes bin/walls1.txt | 16 -------- bin/walls2.txt | 16 -------- bin/walls3.txt | 16 -------- bin/walls4.txt | 16 -------- bin/walls5.txt | 16 -------- bin/walls6.txt | 16 -------- res/walls1.txt | 20 ++++----- res/walls3.txt | 30 +++++++------- res/walls4.txt | 28 ++++++------- res/walls5.txt | 30 +++++++------- res/walls6.txt | 2 +- src/GameFrame.java | 8 ++-- src/GamePanel.java | 12 ++---- src/ReadFile.java | 43 +++++++++++--------- src/Walls.java | 4 +- 23 files changed, 87 insertions(+), 210 deletions(-) delete mode 100644 .classpath delete mode 100644 .project rename {BuiltArtifacts => Built Jars}/MazeGame.jar (94%) delete mode 100644 bin/GameFrame.class delete mode 100644 bin/GamePanel.class delete mode 100644 bin/Main.class delete mode 100644 bin/ReadFile.class delete mode 100644 bin/Walls.class delete mode 100644 bin/walls1.txt delete mode 100644 bin/walls2.txt delete mode 100644 bin/walls3.txt delete mode 100644 bin/walls4.txt delete mode 100644 bin/walls5.txt delete mode 100644 bin/walls6.txt diff --git a/.classpath b/.classpath deleted file mode 100644 index 74f62e7..0000000 --- a/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="res"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/.project b/.project deleted file mode 100644 index 86872b1..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>MazeGame</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/BuiltArtifacts/MazeGame.jar b/Built Jars/MazeGame.jar similarity index 94% rename from BuiltArtifacts/MazeGame.jar rename to Built Jars/MazeGame.jar index e8db1da81174e44eb1c25bed670e6bed81dd0281..152cef8544c046dbe306d23055e2ab1f066e229d 100644 GIT binary patch delta 1905 zcmZpE#Io}t3r~PIGm8iV2L}g(*`kd+KbUy4C;A1)RESEZa4;~WY!+nx&thoEz{<eP zz`)2Qy^4W>fq{_&L@+QgurV+&s53Ay_%bjs6f-a|%w%9-*w4Vg@N}{qhh*d_-%Sjr zLe|?DY?m|a)7s4-6REY0L2es^l92N@2CeN323r}7moqFuQZ)lbl`E2}IwVy^ljn0t z8b%<A_@L<XMAB!3P&N4rhi1J7gFS;2gD-<0Ln=cCgD*n~LpMVogD=A@hK&qc7<?HH zFkEN2#o){EjNvaM$Y0D1VhjunX$+DK3=G^18Vr04_6+<C&I|$!-VA~aeheZEsSKhF znG9kKg$&{hB@9vw-3-zU{R}b;(-~wLW-%x*Y-CVm*vg>9u$MuZ;Xplu8pCx4b%xsv z8VrvaG#Q>T=rH_c&}C#~&|~CeFk%pAU|<Mh-~a_Rg9O-821YIhe+CW)Mh0gF4u$}R zKn5m;OgO6_&e{rR-G;Fk8DT7jAO;2oMFw6CsYrGPUv8|#WD_n+R#OH(2D8aUTy>&W z49pDH3>*wL45AFy3~~%s3>pmflUcc=Se+Qy8Js7laI1k+3RC2vKkGOc7}iam&iz`G zmrDT(ipw)gk~1`N6ASz_6{->9$%)0O3Wipb_X!kEX6DUeuI1&L%oCx&4i-0pi1YEG zi5o-2CHc|BO(5bb0%+o<Ao1I%W}AV;3MX3$!PKfuelM)J`HD~tBX9d8zu=7BlO0!a zF)*x}94jKvID2!g$a`juAO=+~h9HJ49)@fNbw&p6;?xqK{N%)v%=|nq21bS?5Ru2j zkUyDSay@4?LoGW)4I_ip<cr2qtUL^L4E2-mNvc~l@-Xl)@Pd>!^Dwk97&9`k6{Y6p zm!+~Zv@tSpx+mtQ1|;UC=5R5zGIa1TNHFMgF?2EXurqW|wwID;?42AhCBxRr(9gp# zVRECCu<#^C23EiPqLK`dkyCgWk{PB>J}05W&d9)+%E%xy`GT>`<fBqEIb|7`8CVz? z7#%04OaJy^-o}uswVNR*ayvuFR)#dKEevU!7{a$P#DZATGTRt3Kn!N)Z48+phSnAa zw`~lG;aVWhHin#VEtYKzxf>Z67?>CeCU2GLu9s!7WK?6YVl-l~X0&FoVRT@yV<==` zV9<hC%1{I@5*QdA8A=$$85lthVJKw~XJ7)e${5NSm>C!uDi|sm7#XA(7#L48uz=-w zwYM=;X>DOJU&f#Zvb|v&LzC8ShSo@}Eevwo8QQlpG=PNb8^EsG!O*F-g`r^^LmyO| z+cE}QkbD|Q8_QM(IV^fZg(hxem<&>d!w|1!42~e{1lSfaSU}Y^X+>^fkYh=J8mWxt z9&9E}PLvb20J|ToH3h1bfKE^#Gcy!SUL)7+2MSOzNU*>Il$T)|!*m8lh8YYD3_J`h zX1^I+elvLdW^iX<1ed@}46{ImIu`?|AOR(9hhM=TqInn?qBqydyRuE@QI?o|Q#E+< zDn-f3{%WS1XR7`DGyR4NqvZ6}%8ZiRxl|c-8K-|#VU*b(ti~wFIDL{bqvUjRHAczp zN0b>w7`LaWGv=}|nJt=rS(|Y)xDbF>7t<%}FzU;LY7lt2z`?-43#v5WxNG`D9Yz^> zki+14j*EeTAFcqzNS-dE%P0p{1b00T0|OsO4vwv+N9r<KGab~PK24X=n$c?dB@op) zollR^f>Ck0yB?!C<EH8LdW@!w4%4@Sc)`=(>M@!znod{IXEbHpG(Ae6(VXjtA|pe2 zVopx6(e%sujCx#l%22-XbZ!GiJ+2lNDBooIY<)&Orc<iZtqmB>7zL&m88DhNhD~2( pz-X>?Rg;lHub?PDD>b<!z?&6RH8O}Zh%;!gGB8wYGcqtR003*A#p?h7 delta 2049 zcmdn_kfr$%3r~PIGm8iV2L}g3d-Fz~A56UZm43mtF-jFt91ILmn+2Kwv+$`iure?+ zFfcMovn*iHob1RUY5T-?6N9Oc^)?3E<qS8ZSr;&9YVBr_iPYN0Ah(S{NyvE{gVuHi zgRKn4%NceeDP1eg1~Q?SLo&S&Nw`Ux9o+<XBomU6l!i-lpeyx6Qfh&uR7YBXZNcQf z9Gdm43^EMz489Bo4DJkG489D}3`Gp3489C)409P4F!(ZTWH`Zan!%UhF2fgw?+m^S z%nV`-3=C-uk_-$CTnwxXJPa}nybKBqd<+^40t^NWLJaN<!VKOFA`HO{Vhqs?5)4HQ zk_=@GQVewrG7N1Datw1B<QWz+C@`#KP-56v&!EC^f<cwx41*fO6$TB4y9`<kUl_C* zelX}TGBD^fh%+!S1Tk=cLYP4UY$*dHBZEH!2LmI60s{v_07D=H6N5LLRR(7*gtN}T zSwG;cAO;2o1qPmYNp=Qb?l>$&{A4>WOI9NWJ_h5-HC%O~<_ydX77QE=mJFf{77TI> z<_sDPHk0|eqgd@3*cluq=W(ln)5mG&slR7)Ffh!Xypa1fM`oIWMs8w(-{gZKVw2DE zB~Mo4&6*q^DkY|nnp2#r0Fzd*wN)_ERH&Z3pRaJTHXkk}#t<d9ahPBNkuIEUDuBxb zQ<xGfL0n4AU`p(TKuQ!Q%ZdnW{wP$#$jjF37kqGQdD&+!28Pd*t3>1(mu{XV@}4<~ zks*_ZA&ViKk%1#UwIn<<r6hxqfmuV-lZ%0oA(w|C4<yBzo?7COnwg$a!o?88pb8=i zc^HZq)EODLi&IN{@{<!wGV}8|7)lr!*ql@IN>YnJYRY&Rk{QY;2TJMif=o*S5mh`4 z)sr_$tmkZJ=wxT;U}TV*>?kS4%EQpb&^@_BQr)VThk=IytiGRzVFH6OBLiDeYHog6 zDm%j@Mg~sz#N5<?#JtoTE{2H=Q+OC881%UqrZLQ5XP7?urKCLL%*mWmGU^i<X7e!2 zVUT5H;3-NiEKMygam!CGE#_dD$H>6ymtRzp0dh;(<XWjcoGJ{=3@i)`j2@Gnq<=HA zOtzDeG1J<{kfF7WA!i#yzSb6oG-l>)3<V&D))odgq2g@}rCK1~Hin9DEtYKzl^Yot z7?>DpCU?qo*DEtvGU_l`F<LTMGdeNYFuF6?G1M|JFla$6VW?xMXJ7zX$I!qa&cFy} zH8O}ZFo9W349yJ842%pd46O`|3{ngXjHek`z;e9W+ZfukwlJ74W6%TH-m{INPir^B z#7M0z4078UCU0fv0SVXlfL*nNVXD>^hMsK<v!L4CmND3Z<kLXfShh0AVbL2ZG<O@r ze2^*}hIlPwa0FQ=z_y6N0;;Z0D{>2i97_V!$UHRn;4sN=8G{4JB$g%U2Bkm^B47?E z$e9^xCO616`+<U23=&B2;N@jlz_5^kkzo-70|O5Oi`j1mm){H?zZu*a7#S9WqiYGM zj^JVd6;PnuF>TiW$(1||43(P$<z3mBONvS-&r(gFT<oYkSxU`RR7b%nzbGZO$S1Kf zzqCZp+0`$^HE6TH+Rs1Juc$IgPES;3l-$my#wfx#-9wpCa{6)=Mw#uk%8Xi!)8DEx zN^U=(!YIPHT}quXmxZald3vWd<7RM~V+*U3rhDoz>eqv+DR?o&!N9-^N-J>Oz|FuA zl$x00mYI{Pmz7wS7~svw#KnN{1U!p#F);AMwSgFJA`A?myyI4sn47AXoRe5wjIMdw ztp5^_AmCwO-~(xb<Fx7gx{TIL+&a^JbQ!G~Tc&q_sLRuj=rUR`W>5dC%V^H{XS%5# zqbXz8^lUvwbH=&T7wa*aG1gDN1rq!-T|l4FoXbgxk)b>>C#TqG`ayk0J;sjd4f>$4 z(`S_9I;R4aGnwA0>FqBi}bKBF09)N~C4Msvmm(-RCB&6VV}7#Z{mit@8klS=}; XS=m4?6lV};&|qa?II7Laz`y_i+&%T) diff --git a/bin/GameFrame.class b/bin/GameFrame.class deleted file mode 100644 index 7ddad53284790d0e768677b4b4d4c385702466ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2803 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 diff --git a/bin/GamePanel.class b/bin/GamePanel.class deleted file mode 100644 index f97b802e1acc2a824a8fe6aa934476c6883e1644..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3781 zcmX^0Z`VEs1_l#`^Xv>vj0~LaiMgo(iFv6x><lc73_@9nWr-E~#pRiK>H1z!aW+N< zS&+DXVtI*vYFTPtiN0fUNoIbYPiApRYF=s)I|BzJgA|$)@6<||JR^fZacWU!Voq3U zQE_H|UZ|%FBLkxsBLlB<eqM1&VqQsDVoqr)D+2^DGBU8Fr<WHnGKl+t428MJGdD3k z)iXIi&zg~eExjneG%tmbfwj0KwJep9fwd$vH?@e7K^R3#2uRSHk%6&-k%7^Zk%6(2 zk%6TwH75c>MKUt5mZj#TL_q0CMh32eoW#o1qTtM`R7M7#-2AfK)Vz}5g4EO$Mh5P* z#LS$OAdtnyj0~*hi8(pNj125P;UI=JBLjO;X<lAtUOFQKV-zC;dtPcqiEm;7BLkaF zW?p8A9U}vahNos2BLj<beo87A12cm<4}&s;1|tKrhGrN$gBBx$AhLhKj^|>~WY7UA z(`95(*6;-T4rfGIYld+$Ff!=#FbFXSgII<<3?dAoAeJ!?gBXNm%EKTIVVUzVNI+PY zJPeW$mNgH96oh5V!ypY|+4C^SKv<4E3`z`&AU8SlFt~u6&RSfOSX9Erz{udn!{E-~ z!N|aun394L`SKd*u11o!)(it__TpjiX7FKT;3-Zmam!CGEly0zNd*O16hz*Shru5t zF9VYgDM~C$Eh<jT@lLHQcFhARPXYNekcUBmL6Myyn2~`M94}l9K@6dw08{}<hx0JV zG03wsL^3jnB8N3RZE-O~GsLnp#4s`lfaLXa67$ma{gbj%lS_CQ;uzu?8935YOPq5O zi;Ec<gf%oFUIVKF3tDqABr+tkGbAxG@FNTWOYtzIFr+dv@WJ%^<R_+plB^`ADG(`Z z4u*7)ed*-|dIfpuTnw2E+3XBiP^Uwj1~wU@oQENYA(xSXJ3X}|D784hv?w{1kwFO> z_+S?XmlS2@rCUQCotIjo9~$Ii&BYMGkPix>0!9WwsB)MbBtaGNFz_+(gW{=#hoO|A zjFEx8IJE?lM_4sHJt1*a!NX7qlH)E;E%C`uP6QPZAU)MQ3^fe3j0`+QsfDGf#gO=g z#BCHK1HVsZUaDVdZc=Jd2q+dA8H7NZbHWmfGC_Q(AWKO`W-%iJw-3C)vSwsp$xSTq zV`ShfNX*PDan8>z$j?j7D`8|1gZctgV7V717Gz{57lRWTGea8>Lo-7QCqoBA7dt~I zBLg2el0XWb^K<fxco@1FdKej4k}DJQ7#Rd0u?v^A=3?k$n841^56!9Ij0m%UhhZYa zBt`~~;?xqbQK003t{)OmQ+ODrGE4)-Y-&k(W=cs0xCHP789sxDVJ5>YMh1?w%$%H{ z)Z`LI26hckPe>34G0fp%n9DGak%1+pD6yQ8K?}*BaPM0qEQL7@TrPAlEZ|{S2=-l4 zPH8GAUo7TfSi-QBk%13flsV_;<Ya=%XSkhFAVtf07*>E3iKJ!bWfo_EGZkDZD1KM* zFsx>1VPxO|myB*;RjG^&jOnn_7$umj85wwkOA?c_eG?17aSMuz4Ll4RK`vuW%1KPl z1{u1UhhYmSj5yO%OFU9D(=$py$#feJ!*+%pj0~LM7zfn_j0`%&1_CG$L1n-$9tK$k zQAP%??9|GDqSWGIP}wenWD2B?^G>aF1yy$7gtL#~06W8eMh0<sazRzZ!*CGfTCVie z67SSXQ2EZtz?jO&Ac=?!R1Kg?DVdRhJ3F;9C^aWF5$p*5L~y+tkXn?MUz7`S7G~KA zsd^DEV`MnV!*B{z6tfqlf`f&TK?dDcWKE0=9NDRrA(aIn^SOe-<%C-%sI=vS=Pf;u zHyIQe7#Wxum>5_Y*ck*Fq!>6EKrzG3z`(%7z{9`*Digppwg3Y^m==W6LJY!Sz6gUT zm==T5;!s)wN=rg%DJU%srDdSBESP3ukYkVs+o`~y2&R?5G&=($gEE5(10#bf0|O&B z11kd)0|Uc!t?dkITDuuEBRRCTGiYyR(9;s&+R9)6CXKY1w=$T32s0320V1rl1f;hz z*l4kDWv~PB9kjME=xt+g($d<-;Ht&4jlolkc^iYT7Ry$K0Il5&L6Oqi8A7%)glX+& zh=|nM#t^lQAwei@8$-r+hP<r|g<68lhJwr<+Zc+q1X7r{F_eRhs0!Z*c6c2F1A`lb zAOiz~Bm)ZrKZ78H0D~ceAcHxB5Q7baID;dD6oUtYG=ndL3_}ouEJHYh977C)JVOS9 z0z*B6B10#G62k-rWrk@CstolE3=CorFEcbSG=c+qIztnKC<7w{BdCmn28<v)V6?Y0 zv}$i+Xy3-rtIf=;wT)pi2ybJUuC;|BOiOzk!)&cB3;{D4<g_<2%m*pb+QML<wS~b* zYYT%72*Z?O2rrt+zz+^!STKVO#89<tCIbg3gabg<%wpgGS-BDvFw6{~fUyIo9t{Ro z25kl&1|0?|27Lx)1|tS724e<81``HX1~Z0u26Ki~1`CF41}lbE25W{c23v-S40a6D z7#wi~$Qp*V42%rx7#J8h7+8KYxT?x=Gcbb6D@gD#On?TDHN;V7+M5{GgZvH;piK~8 z7iwt>GD-+C{MyE_RV#7}!%mijtqeOsslox_1vv(G1_lNf26hHl20jKi1{nr-25klp z22%!41}g?1Bqv(K<II`?;Y4NzMk@wJhTRN%psu^Yz{J4Jz`zi%y^Ue7Ey#&88A4?Q zROd5r$_O|vVBpcx+QML0vX#L?MnD}b=(2!;8!Wh$!9+$t4J;Opq|i!6Km#loj8JHX z@PQr!D0>GmurdTP@Gt~1NH7F5C^CdF=rV*dm@<ShI5LDYcripUgfT=i#4*HxeWU<! zBHTyu42KvFGcYo+GDI;PVGw0t0tY`Y1IHf*2}TZXc5V)CP~JTX_vI<5F9VT$>5k+} zaH>J}Ay@#}dtd=%uYm<H{FT7K%8<yw!;r)v!H~=#%aFpL$&kvR$B@Qg#gNWm&yd03 z&5+3uz>tIFuRyrJ0^$Dh!SojkHyAQ7G8|(#4v9TRZUz=`2JHuBq&W<{pu`U@eL%U& z0F?PaxhiD|gD6A>E&?jAwlEk$wSdbiP$o3e+QzU6S&JE{kb;P8WiSFIOOVMXT3Z+_ z5)wd$L_%_}nbsBtE074tgcFF^c481<U|=X@U}q>|;9)3c5M(H2P-G}$P-7@(FlMM^ zuwtlUuxF@daABxr2w|vWh-9c|NMmSXs9<Pj=wfJL=woODhZLk7>W7C^Kf@u0)6i_k y#=s(|C;+NT&cGww6kHlIFff9g!UWF!Yz&MH3=CaJ#xcT;V}u4gBg0v+#&ZC<vQJ(B diff --git a/bin/Main.class b/bin/Main.class deleted file mode 100644 index fe4dcc691dedccd7463f01b4e0ba6bd0eb82d839..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 439 zcmX^0Z`VEs1_l!bX?6xCMg|t&#LPT)1{OvJfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk- z5<5l)W)00SMg|t={FGEK24)6M9tKthHbw@1pUk{eztY^K)S{5Yq?}Yn1|gsP<iwn? z#G*_PA1cUFl95@=$iU_Uvdfy0fh9LFGmnu$Oe5L{VP|kjQD$DcwPqMQgCHXVr+Z>< zs#{TFZYl?ZFe3w}Z(>!d0!WODL4ZLNWW5+8gSdvLCpHrp8CVjF(u)}xgt1t_$iNkx zUs{x$>Xr#|Fek`OdLU;oC^9fIFf)Jv69Xg2gA9xe><kPH`V5Q=j0_A6tXkU{I5sjc zFfcK2F)%Q&fdv^ExEUB2c))B{1|9}p1_lOB20jLUsAgLR7O))uZUzBCW)nf?Y$2iT i3?c|)xEPo~W;5_Hup=48&mhhq!N9=4$RG)}PznIrk5A_S diff --git a/bin/ReadFile.class b/bin/ReadFile.class deleted file mode 100644 index e7ab8f9608e4e81c3c5c16f156bc9309c428c037..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2137 zcmX^0Z`VEs1_l#`9CijKMh1?c)Wj6G%$!tq1{OvJfvm)`ME#t^ymWp4q^#8B5=I90 z;^f4<ywoB_24NqtY-vemj(#vi(3+8fIXORvk%7^Zk%2ikv4D|5I2xi1Y)EiPQD$Dc zH6sI?O=ezZi5(*Yvxa6EBLj<beo87A12Y3Z4+A#?4<`d7gCGwBI|BzhgD{FKAO?Ws zMR^!F8Mqi3_<b_-QvFJElTwR95|eUL85x9p@{<#D!V-%zL42qnOG!p%F(U()56pko zj0_z41*v%;zcMngXn1Odu`|drG6-UL3gj+%9tH&lMMegW^wbjPoW$Z{Mh0OGO(dUz z1+BRllo?dn8B`b<_`$}2Jq?!PVNhdGXJp`m>G#P`OaTR=B&I14DQgY}O-2T;^2D5+ zVne->iV`jcZ3bO-1|3EQQ8cq58h9A=81xw#gws<?f>Mj~ON)|I9gBlYic%AE85uM+ zklYFhL~E$?GxPO5^9o8!AWE&d7-Sd>L9t-O$RGjLg{DL^3={z-JPfQ1Y@7^c3>NGR z=BTk$SzMBu%fn#FV8zJ5oL^eP$RG-_KQmuHpeQpBW*G;A4I_haa(-z}ib7s~i9%Xt zUWx)JMz|R47#!Fc>=_w^!Jb9c$HU;r;KazlUH~#GCy$Xq6zWiLc*DFG#=+nM3qd1L z2y!sE!T81yz6XqN0^xhX_@)rP4~%aH;<GdO!Q2D3$h9IlwV)(3KaY`tB{#9akCA~f z74B1171oRlyul@j$=SY%1<(}9o}O9~k_k$%Vj7;F(8vJmf_i|9L5LxYhasFHgpq-> zxHPF4oOu`-7%LbV7%LeWSTpldQY%2|9UMf+S{WHQilF%z6rXWC4Dk#Jj0`M!sTC!R z3?e9L4sM$aLlO@|GD8X@1A9hdu^(6|vxa6ABLib5BLio0PJVGJByMCFGI$s=8F&~O zSiz!<3|ztB1P794WZ;G6F+GsO7!(;88JHOu7?>HDKq-cSfq@Z}wHZKwlYxtYfq|8Q z5tQv27#VmO7#KVmm>3ut7#M`LwlnZ)v20}!&=L^X%OJFsL1ZHX0|OI-7y|=?5CaPX z0|N^K3j-SiCj&c}FV4Wgzys0BAi*FBwn&OW8e%MyIs+@n8H|k5EDIPkwRSVeL~3ng zklV(fB&4y8L2EmM!Bz(2<qS`JH!+wBS#M*oUCwYrniXBCGm_GsNJ`gAv!N?>MN-;_ zq_jzz9bKtAlG0=(rQy;X=t@12lv*Gu)sYrpTfm@(;xBI`wLEaO8yVObSQ%s(<QaS! z3>e%Qycm2Lq8W-9N*R0^+8E|CEMV|u*vN2#;WUFU!(E0i4Br`i8JNL=o(2w7E(TTx z9tIf(UIqmQJ_Zd20R{sGAqIB_VFqso5r$v}F@|Uc35FsDNro~8DTX=*8HP3nIfl6m z@(c?Z6c|=AC^2kgP+>U1pvrKDL5<-Gg9gK01}%m!4B8AoK&2alJ_9HsgBUm%7#JC$ z5eZ`XGjK34GAJ-`Fa$6JGB7cC!&zl;)<QVz44m}?&I)2+U{GM-iDzf<<&MKbfFwY6 z1T%y{5)DHPIEgVZ2xx6#5RoyGmS#!V#t`bKy8)gMxfqxj7#NHg_!x}A?$!b)OaYj? z83Y(2!0u*X5MYR8;9y{4;A3E7h+>FlU}j)shyf>9P^xbN=MM%3&E*Vo%r?szgh4h+ zYi(gL-o_9c+``BxEg-P)|67Pa;;jGoKzRWYEm90@3=9nB49pA`3>*xW45ADc3~~(S z3>pkJU?+)zou~<Q5-WowLn_!wpy1$UU}65lz{1G?3!Dqn;O;SFU<79+4v3BEAnPDm a58`8c26hGqu<?*A#{o5-ks%8lHrW8C4ZimP diff --git a/bin/Walls.class b/bin/Walls.class deleted file mode 100644 index 2fc35d2197f20890fe5155e7b6f4c008e56a08c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2158 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 diff --git a/bin/walls1.txt b/bin/walls1.txt deleted file mode 100644 index 5070330..0000000 --- a/bin/walls1.txt +++ /dev/null @@ -1,16 +0,0 @@ -gwwwwwwwwwwwwwww -gggggggggggggggw -gggggggggggggggw -gggggggggggggggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwwggw -wwwwwwwwwwwwwwgw -wwwwwwwwwwwwwwgw \ No newline at end of file diff --git a/bin/walls2.txt b/bin/walls2.txt deleted file mode 100644 index 24c9985..0000000 --- a/bin/walls2.txt +++ /dev/null @@ -1,16 +0,0 @@ -gwwwwwwwwwwwwwww -ggwwwwwwwwwwwwww -wgggggwwwwwwwwww -wwwwwgwwwwwwwwww -wwwwwgggwwwwwwww -wwwwwwwgwwwwwwww -wwwwwwwgwwwwwwww -wwwwwwwgwwwwwwww -wwwwwwwgwwgggwww -wwwwwwwgwwgwgwww -wwwwwwwggggwgwww -wwwwwwwwwwwwgggw -wwwwwwwwwwwwwwgw -wwwwwwwwwwwwwwgw -wwwwwwwwwwwwwwgw -wwwwwwwwwwwwwwgw \ No newline at end of file diff --git a/bin/walls3.txt b/bin/walls3.txt deleted file mode 100644 index d1ab37d..0000000 --- a/bin/walls3.txt +++ /dev/null @@ -1,16 +0,0 @@ -gwwwwwwwwwwwwwww -ggwggggwwwgggwww -wgggwwgggwgwgggw -wwwwwwwwgggwwwgw -wwwwwwwwwwwwgggw -wwwwwwwggggwgwww -wwwwwwwgwwgggwww -wwggggggwwwwwwww -wwgwgwwwwwwwwwww -wwgggwwwwwwwwwww -wwwgwwwggggwwwww -wgggwwwgwwgwgggw -wgwwwwwgwwgwgwgw -wgggwwggwwgwgwgw -wwwggggwwwgggwgw -wwwwwwwwwwwwwwgg \ No newline at end of file diff --git a/bin/walls4.txt b/bin/walls4.txt deleted file mode 100644 index e590ddd..0000000 --- a/bin/walls4.txt +++ /dev/null @@ -1,16 +0,0 @@ -gwwwwwwwwwwwwwww -ggggwwwwwwwwwwww -wwwgwwgggwwwwwww -wwwgwwgwggwwwwww -wwwgwwgwwgwwwwww -wwwggggwwgwwwwww -wwwwwwwwwgwwwwww -wwwwwwwwwgwwwwww -wwwwwwggggwwwwww -wwwwwwgwwwwwwwww -wwwwwwgggwwwwwww -wwwwwwwwgwwwwwww -wwwwwwwwgwwwwwww -wwwwwwwwgggggggw -wwwwwwwwwwwwwwgw -wwwwwwwwwwwwwwgw \ No newline at end of file diff --git a/bin/walls5.txt b/bin/walls5.txt deleted file mode 100644 index 65ab082..0000000 --- a/bin/walls5.txt +++ /dev/null @@ -1,16 +0,0 @@ -gwwwwwwwwwwwwwww -ggggwgggwgggwwww -wwwgwgwgwgwgwwww -wwwgwgwgwgwgwwww -wgggwgwgwgwgwwww -wgwwwgwgwgwgwwww -wgggggwgwgwgwwww -wwwwwwwgwgwgwwww -wgggggggwgwgwwww -wgwwwwwwwgwgwwww -wgggggggggwgwwww -wwwwwwwwwwwgwwww -wgggggggggggwwww -wgwwwwwwwwwwwwww -wggggggggggggggw -wwwwwwwwwwwwwwgw \ No newline at end of file diff --git a/bin/walls6.txt b/bin/walls6.txt deleted file mode 100644 index cb32e5e..0000000 --- a/bin/walls6.txt +++ /dev/null @@ -1,16 +0,0 @@ -gwwwwwwwwwwwwwww -ggwwwgggggggggww -wgwwggwwwwwwwgww -wgwggwwgggwgggww -wgwgwwggwgggwwww -ggwggwgwwwwwwwww -gwwwgwggggggggww -gwwggwwwwwwwwggw -ggwgwwwwwwwwwwgw -wgwggwgggggggggw -ggwwgwgwwwwwwwww -gwwggwgggggggggw -ggwgwwwwwwwwwwgw -wgwgwwgggggggggw -wgggwwgwwwwwwwww -wwwwwwgggggggggw diff --git a/res/walls1.txt b/res/walls1.txt index 5070330..819645a 100644 --- a/res/walls1.txt +++ b/res/walls1.txt @@ -1,16 +1,16 @@ gwwwwwwwwwwwwwww gggggggggggggggw gggggggggggggggw -gggggggggggggggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw -wwwwwwwwwwwwgggw wwwwwwwwwwwwwggw +wwwwwwwwwwwwwggw +wwwwwwwwwwwwwggw +wwwwwwwwwwwwwgww +wwwwwwwwwwwwwgww +wwwwwwwwwwwwwgww +wwwwwwwwwwwwwggw +wwwwwwwwwwwwwwgw +wwwwwwwwwwwwwwgw +wwwwwwwwwwwwwwgw +wwwwwwwwwwwwwwgw wwwwwwwwwwwwwwgw wwwwwwwwwwwwwwgw \ No newline at end of file diff --git a/res/walls3.txt b/res/walls3.txt index d1ab37d..e590ddd 100644 --- a/res/walls3.txt +++ b/res/walls3.txt @@ -1,16 +1,16 @@ gwwwwwwwwwwwwwww -ggwggggwwwgggwww -wgggwwgggwgwgggw -wwwwwwwwgggwwwgw -wwwwwwwwwwwwgggw -wwwwwwwggggwgwww -wwwwwwwgwwgggwww -wwggggggwwwwwwww -wwgwgwwwwwwwwwww -wwgggwwwwwwwwwww -wwwgwwwggggwwwww -wgggwwwgwwgwgggw -wgwwwwwgwwgwgwgw -wgggwwggwwgwgwgw -wwwggggwwwgggwgw -wwwwwwwwwwwwwwgg \ No newline at end of file +ggggwwwwwwwwwwww +wwwgwwgggwwwwwww +wwwgwwgwggwwwwww +wwwgwwgwwgwwwwww +wwwggggwwgwwwwww +wwwwwwwwwgwwwwww +wwwwwwwwwgwwwwww +wwwwwwggggwwwwww +wwwwwwgwwwwwwwww +wwwwwwgggwwwwwww +wwwwwwwwgwwwwwww +wwwwwwwwgwwwwwww +wwwwwwwwgggggggw +wwwwwwwwwwwwwwgw +wwwwwwwwwwwwwwgw \ No newline at end of file diff --git a/res/walls4.txt b/res/walls4.txt index e590ddd..65ab082 100644 --- a/res/walls4.txt +++ b/res/walls4.txt @@ -1,16 +1,16 @@ gwwwwwwwwwwwwwww -ggggwwwwwwwwwwww -wwwgwwgggwwwwwww -wwwgwwgwggwwwwww -wwwgwwgwwgwwwwww -wwwggggwwgwwwwww -wwwwwwwwwgwwwwww -wwwwwwwwwgwwwwww -wwwwwwggggwwwwww -wwwwwwgwwwwwwwww -wwwwwwgggwwwwwww -wwwwwwwwgwwwwwww -wwwwwwwwgwwwwwww -wwwwwwwwgggggggw -wwwwwwwwwwwwwwgw +ggggwgggwgggwwww +wwwgwgwgwgwgwwww +wwwgwgwgwgwgwwww +wgggwgwgwgwgwwww +wgwwwgwgwgwgwwww +wgggggwgwgwgwwww +wwwwwwwgwgwgwwww +wgggggggwgwgwwww +wgwwwwwwwgwgwwww +wgggggggggwgwwww +wwwwwwwwwwwgwwww +wgggggggggggwwww +wgwwwwwwwwwwwwww +wggggggggggggggw wwwwwwwwwwwwwwgw \ No newline at end of file diff --git a/res/walls5.txt b/res/walls5.txt index 65ab082..d1ab37d 100644 --- a/res/walls5.txt +++ b/res/walls5.txt @@ -1,16 +1,16 @@ gwwwwwwwwwwwwwww -ggggwgggwgggwwww -wwwgwgwgwgwgwwww -wwwgwgwgwgwgwwww -wgggwgwgwgwgwwww -wgwwwgwgwgwgwwww -wgggggwgwgwgwwww -wwwwwwwgwgwgwwww -wgggggggwgwgwwww -wgwwwwwwwgwgwwww -wgggggggggwgwwww -wwwwwwwwwwwgwwww -wgggggggggggwwww -wgwwwwwwwwwwwwww -wggggggggggggggw -wwwwwwwwwwwwwwgw \ No newline at end of file +ggwggggwwwgggwww +wgggwwgggwgwgggw +wwwwwwwwgggwwwgw +wwwwwwwwwwwwgggw +wwwwwwwggggwgwww +wwwwwwwgwwgggwww +wwggggggwwwwwwww +wwgwgwwwwwwwwwww +wwgggwwwwwwwwwww +wwwgwwwggggwwwww +wgggwwwgwwgwgggw +wgwwwwwgwwgwgwgw +wgggwwggwwgwgwgw +wwwggggwwwgggwgw +wwwwwwwwwwwwwwgg \ No newline at end of file diff --git a/res/walls6.txt b/res/walls6.txt index 773c783..cb32e5e 100644 --- a/res/walls6.txt +++ b/res/walls6.txt @@ -13,4 +13,4 @@ gwwggwgggggggggw ggwgwwwwwwwwwwgw wgwgwwgggggggggw wgggwwgwwwwwwwww -wwwwwwgggggggggw \ No newline at end of file +wwwwwwgggggggggw diff --git a/src/GameFrame.java b/src/GameFrame.java index cf333e9..2005ed1 100644 --- a/src/GameFrame.java +++ b/src/GameFrame.java @@ -49,13 +49,13 @@ public class GameFrame extends JFrame implements ActionListener { score.add(previousMap); score.add(resetButton); score.add(nextMap); - score.setFocusable(true); + score.setFocusable(false); start = new JPanel(); start.setBackground(Color.black); - start.setSize(getWidth(), getHeight()); + start.setSize(width, height); start.setLocation(0, 0); - start.add(startGame, BorderLayout.CENTER); + start.add(startGame); this.add(start); this.setVisible(true); @@ -91,7 +91,7 @@ public class GameFrame extends JFrame implements ActionListener { } if (e.getSource() == previousMap) { - if (mapN >= 1) { + if (mapN > 1) { this.remove(game); mapN--; game = new GamePanel(mapN); diff --git a/src/GamePanel.java b/src/GamePanel.java index c37e734..7b5ca79 100644 --- a/src/GamePanel.java +++ b/src/GamePanel.java @@ -20,7 +20,7 @@ public class GamePanel extends JPanel implements ActionListener, KeyListener { private Walls walls; private boolean running; - private boolean nextMap = false; + public boolean nextMap = false; public GamePanel(int mapN) { timer.start(); @@ -58,13 +58,6 @@ public class GamePanel extends JPanel implements ActionListener, KeyListener { if (walls.finishWallsCollision(x, y, playerSize, playerSize)) { running = false; } - if (!running) { - RoundFinishe(g); - } - - } - - public void RoundFinishe(Graphics g) { if (!running) { g.setColor(Color.black); g.fillRect(0, 0, getWidth(), getHeight()); @@ -73,8 +66,8 @@ public class GamePanel extends JPanel implements ActionListener, KeyListener { nextMap = true; } - } + } @Override public void keyPressed(KeyEvent e) { int c = e.getKeyCode(); @@ -126,6 +119,7 @@ public class GamePanel extends JPanel implements ActionListener, KeyListener { velY = 0; y = getHeight() - playerSize; } + x += velX + veldX; y += velY + veldY; diff --git a/src/ReadFile.java b/src/ReadFile.java index 4b57897..686e64c 100644 --- a/src/ReadFile.java +++ b/src/ReadFile.java @@ -7,46 +7,49 @@ public class ReadFile { String[] map = new String[16]; public void openFile(int mapN) { - if (mapN == 1) { + + switch(mapN) { + case 1: try { scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls1.txt")); } catch (Exception e) { - System.out.println("could not find File"); - } - } else if (mapN == 2) { + System.out.println("could not find File");} + break; + case 2: try { scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls2.txt")); } catch (Exception e) { - System.out.println("could not find File"); - } - } else if (mapN == 3) { + System.out.println("could not find File");} + break; + case 3: try { scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls3.txt")); } catch (Exception e) { - System.out.println("could not find File"); - } - } else if (mapN == 4) { + System.out.println("could not find File");} + break; + case 4: try { scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls4.txt")); } catch (Exception e) { - System.out.println("could not find File"); - } - } else if (mapN == 5) { + System.out.println("could not find File");} + break; + case 5: try { scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls5.txt")); } catch (Exception e) { - System.out.println("could not find File"); - } - } else if (mapN == 6) { + System.out.println("could not find File");} + break; + case 6: try { scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("walls6.txt")); } catch (Exception e) { - System.out.println("could not find File"); - } + System.out.println("could not find File");} + break; + } } - public String getTile(int x, int y) { + public String getBlock(int x, int y) { String index = map[y].substring(x, x + 1); return index; } @@ -62,4 +65,4 @@ public class ReadFile { public void closeFile() { scanner.close(); } -} \ No newline at end of file +} diff --git a/src/Walls.java b/src/Walls.java index 5ede959..4593e88 100644 --- a/src/Walls.java +++ b/src/Walls.java @@ -17,10 +17,10 @@ public class Walls { for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (r.getTile(x, y).equals("w")) { + if (r.getBlock(x, y).equals("w")) { walls[y][x] = 1; } - if (r.getTile(x, y).equals("g")) { + if (r.getBlock(x, y).equals("g")) { walls[y][x] = 0; } -- GitLab