From 8069033e2bb1197a1a71a436897ed3d8a3b14705 Mon Sep 17 00:00:00 2001 From: Lenz Wiechers <> Date: Thu, 30 Apr 2020 21:18:21 +0200 Subject: [PATCH 1/2] test commit --- .classpath | 6 ++++++ .project | 17 +++++++++++++++ README.txt | 3 --- assets/Map.txt | 52 +++++++++++++++------------------------------- bin/Brick.class | Bin 450 -> 450 bytes bin/Game.class | Bin 3615 -> 3615 bytes bin/Ghost.class | Bin 884 -> 884 bytes bin/Main.class | Bin 558 -> 558 bytes bin/Map.class | Bin 1968 -> 1968 bytes bin/Picture.class | Bin 1415 -> 1415 bytes bin/Player.class | Bin 3510 -> 3510 bytes src/Brick.class | Bin 336 -> 0 bytes src/Game.class | Bin 2085 -> 0 bytes src/Ghost.class | Bin 336 -> 0 bytes src/Ghost.java | 4 ++-- src/Main.class | Bin 558 -> 0 bytes src/Main.java | 6 ++---- src/Map.class | Bin 801 -> 0 bytes src/Map.java | 15 +++++++------ src/Picture.class | Bin 1413 -> 0 bytes src/Picture.java | 2 +- src/Player.class | Bin 1741 -> 0 bytes src/Player.java | 2 +- 23 files changed, 53 insertions(+), 54 deletions(-) create mode 100644 .classpath create mode 100644 .project delete mode 100644 src/Brick.class delete mode 100644 src/Game.class delete mode 100644 src/Ghost.class delete mode 100644 src/Main.class delete mode 100644 src/Map.class delete mode 100644 src/Picture.class delete mode 100644 src/Player.class diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..0cbf9cd --- /dev/null +++ b/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..1d69790 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + Pac-Man + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/README.txt b/README.txt index 397865a..e69de29 100644 --- a/README.txt +++ b/README.txt @@ -1,3 +0,0 @@ -A simple Pac-Man clone. -So far. -About to add Path finding for the Ghosts and an A.I. that controls Pac-Man. \ No newline at end of file diff --git a/assets/Map.txt b/assets/Map.txt index 38f4b8a..6fdea19 100644 --- a/assets/Map.txt +++ b/assets/Map.txt @@ -1,35 +1,17 @@ -################################## -# # 0 # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # ############################ # -# # P 123 # -################################## -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -## \ No newline at end of file +###############################0### +# # ## +# # ############### ############### +# # # ## ### ##### +# # # ########## ### ##### ##### +# # # ################# ##### ##### +# # # # #### ##### +# # # # #################### ###### +# # # # # P####### ###### +# # # # # ################## ###### +# # # # # # ######## ###### +# # # # # # ####### ## ## +# # # # # # ############# ###### ## +# # # # # ############# ## ## +# # # # ##################### ## ## +# # #################### ## +############################123#### \ No newline at end of file diff --git a/bin/Brick.class b/bin/Brick.class index 98f1c69aeacb64cc67c5adfd0911ce8b54b732c9..50ef0edbf9e3ab3e130be745f874a171441c4509 100644 GIT binary patch delta 17 ZcmX@ae2AIj)W2Q(7#J8VH*)M^1OPzQ27mwn delta 17 ZcmX@ae2AIj)W2Q(7#J8#HgfD@1OPz1273Si diff --git a/bin/Game.class b/bin/Game.class index 70373b01bd8d9e466587d8c5649646fc5685ff47..90138455c5c30efa5142e996e3bb3357bb52b4a2 100644 GIT binary patch delta 17 ZcmbO)Ghc?|)W2Q(7#J8VH*$#c0RTQK1=aun delta 17 ZcmbO)Ghc?|)W2Q(7#J8#Hgbsb0RTP`1|N7TPBuX$c8i>_EgxzHG0v69;s!1YZ=M}twXE2DH zZ#X&08NSdAP2=^uJ%IMbxJUL$;@DWEbPie4)W|R<$BaBH3hXFyz~w}VGi9z+cv9u9 u<%c?78WN)^7M{5H63~(Xj*PHnLPw?qGN&sGda_im)wlFX=m+mOjBfsVi5fTn delta 149 zcmWlTy$--z^!1{_ tn?TpeqrM46$WQAQO5rBa}IPS?I3RH$-Iq4TnK;{R4n?8d3lN diff --git a/bin/Picture.class b/bin/Picture.class index 3737254b48ab4d6c68bbddd077d0d3181feadfaa..f720bca0ebe0c6c5649446ce9cce8fd8400937c9 100644 GIT binary patch delta 17 YcmZqYZs+DW^>5cc1_lPpjU4r?06Fso;{X5v delta 17 YcmZqYZs+DW^>5cc1_lO`jU4r?06E$P-T(jq diff --git a/bin/Player.class b/bin/Player.class index 702cafc5f61810a3a154d75d8e94499c4ed3491f..b5fa448688f1fdefe0426cbeedbba754639ffa0f 100644 GIT binary patch delta 17 Zcmdlcy-k|q)W2Q(7#J8VH*&1w1pq=B2ABW< delta 17 Zcmdlcy-k|q)W2Q(7#J8#Hgc@v1pq<-29p2) diff --git a/src/Brick.class b/src/Brick.class deleted file mode 100644 index 28bba176771ff4b2d2b255e9233c14aa912389d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmXYsJx;?w5QX13{)vo3f+2tq4P8P(8mNLO2tooGgcLCK+N{EYvzFFtZa~Q$=&7iX zC^!IzLW~2=n|W`(nbm&(e0~Ag$7UO=AzZ8l=m%IQ^eSnTC{k%ERqC6w69SzRI+IdY zR%n}wqL$vp_VexAYyCp-50zH-h|n4gQ-V7w?axm)Hg P`oqvgj~!u!)j|9Va=t=V diff --git a/src/Game.class b/src/Game.class deleted file mode 100644 index d04c8a9130616d89aea44c4edc899561598209e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2085 zcmZuyTX0il5dKcm=H&7>gqEu<_ls#%q7@ZvL2011Z3>mva;YMx$)P=Ma!yQ6DXk)2 z0PlCycYNT%H--eq3okm3nG}+XA`dfy6PObB=?FtxQOsaAiUNvqqAkRcV@g71 zb-bjbtfBct*(jPCmSty*lg6oZW!|!<(t~}X?dEpLu+73f+asdocBoV^7EFc-XGc6q zbW_t##jQ{`k?j|ex?s^LF<5rkC~+0YyBf4XDhfu$9n%owp?PP1)LJwTb7$ZV%@GZ8 zFUhQvGhEBDX>zB67NH)?w%px3DcL!$p(*3!d8s8?%QpAV6(`N|m@!$Prd5Iz#*MNi z>$+02c<2nh+-Zw>hqC?tA_B(cyC=59>9Zl?|3CucnI5A7q4y#kD!Y;Vgd?}VmmYQi>#2w!wMC+3UfHA zFppCT3s_WmS;#9mEw)CkXxIv`;*7#;IIZwH-cWcGXLX!YIFGk|JuyEpsfq zu!<%J&5E_?18NnQd(9KZT*1v0oQip%WR^XYvQ|m&)cDk0DX&Q0QIFd>*8x#4U0q9% z@qnzc;LNec?G2apb;E{jOw}(O_nP8YzTn7g_h$EGhS;sf@^gnH*utp21ou?gnX}oq zwuZ}0U4tU>}!!lwGG=DvjjJs zPL6$u6&Z2p)||`?b`D?zpQaR_)EIx93{uD(c$`T0I7h+boCETJK+@yHr^h*Z9_RFV zoCD}_&LBDGTPBqBDLNnKlNqFPCUq5BYN>X;ih$38sYJetCXY6!zC-B9Rp?cODMlzp ztB9raAE2sep(;+*k}47umr`u4qAhiW7FW<#!?Hu}jXea_u4_XEp88t?Tu@ zSPd)cVt_nY!^--yiM+XnRkCcVVYTqq`)ZIlVcK;F57n?ncnxc{8rD&aUB>zvHt@XA zMGOUZb&&18jE(JG9bG?Tn{VN*B*XefBAV!GpFS?EgRCpjRl}yU0p|Immu)Te4K`P? zMHnM&F{{{mTgAIl)s{F#y0wP;y~RR(;fG3Iy7dct5X94@=he?X|BN9*7lyb(LJB=%@&?A5xlPwPb=_ArYSvzWya^wLMeU(7EHxR#xV^+>0vzF{N_o6@u3J$;# zI1FNJXx_|w^UbXG>*wPWzy!NpZ2GXV5&F}6*f_tpAGAD%2aFh`2S@9qVVXU;guAi2&yb;TslPE4yJ}dY*`~T23 zD^(G^_lh0ewc zQ!1TJM+x@P;m-ktJveZ=dh9H8x#I`0#u{*P#2In*4kCJk_0mE;R-Xr8+~sbayWkH) Mh(0^Q2CIeW7ugj;+W-In diff --git a/src/Ghost.java b/src/Ghost.java index 6504434..69b0050 100644 --- a/src/Ghost.java +++ b/src/Ghost.java @@ -11,7 +11,7 @@ public class Ghost extends Picture { // Die super("Pinky"); // Aufrufen der übergeordneten Klasse - //xPos = 150 + 40 * index; + // xPos = 150 + 40 * index; if (index == 0) { this.changeSauce("Blinky"); @@ -35,7 +35,7 @@ public class Ghost extends Picture { // Die public void setPos(char coordinate, int newPos) { if (coordinate == 'x') { xPos = newPos; - } else if(coordinate == 'y') { + } else if (coordinate == 'y') { yPos = newPos; } } diff --git a/src/Main.class b/src/Main.class deleted file mode 100644 index ca256d962c6f09bd7d68f70ce376b9d6e39706c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmZuu%TB^j6r5Wgg@QbaBEDZ6Z~=*NVWM$kqMM>77>sdsfty+a#q?pqXSu>?;s^Lq z#wnN(gI%2I%sn&b^!Drf{S&}34h*DFNntI8bpspN)UjnCfr^f89XkTaGsks;bAed3 z))t6gjCx8SZ#k~I4u>7(-O0{?ifN6ya?qBZ6Y*a$9y~cdGpwd`+*7)TM1gYk(dx?= z*%(OIZnOf=aqZJ-y7X-Jm;O1X*_J~NN?KP$h8e9<=ylbl6OB(t6Y5cD7HJp)ML(SJ zqh5XVtXzA*gun}xj@>NwuumEV5hANVVZPB#r?0xfAE`C=12q)L_$s*d80ZCKfs^Xu zcPuKkMTraOy!hzR!0lnMX2=>uK};M@AYP}(S=QuK)Ud?&?5qJf7AA-Vne4K;mJ-8=D8^5Mx79N?iAm(w0I3O$((-fK-au2nGz^wb4!q0UvI7``6A`icq`e81k<#4ylrne_PQI(D@hWE zUY9XuBkD%|%L1)jX$$l#$=y&e-i*58&A|gd?A`YKn3lqSc6H%dn!*Lc`K z@86Hu-)P?O9K)!s207IzmDoDvqL4#y1dusijYjLU>Mo>een!UCNHtf}KR|D}`j8o#(x@Kr zrAF6CLt3tJz_*__^u2?jH45en)U``Rvc>9K7=?PV{vPIY?|cwBjXs3lNWeqVeHYFu~4Mz7fdPrgu$O3PW)XK7Fa=jwrPHaop}RG;o}=1 OHPf0p=}BrC%>4mXCYVP6 diff --git a/src/Map.java b/src/Map.java index f962dae..4d07946 100644 --- a/src/Map.java +++ b/src/Map.java @@ -11,25 +11,24 @@ public class Map { // https://de.wikipedia.org/wiki/Feld_(Datentyp)#Mehrdimensional_/_in-sich-mehrdimensional BufferedReader reader; // reader zum Einlesen der Text Datei - + Player player; Ghost ghosts[]; String line; // String in dem eingelsene Zeilen der Datei gespeichert werden public Map(Player player, Ghost ghosts[]) { // Erstellen des Konstruktors - + this.ghosts = ghosts; this.player = player; } - - public void mapping(){ + + public void mapping() { try { - reader = new BufferedReader(new FileReader("assets/map.txt")); // Einlesen der .txt Datei - + for (int i = 0; i < 35; i++) { // für die ersten 35 Zeilen der Datei: String line = reader.readLine(); // Einlesen der jeweiligen Zeile for (int j = 0; j < 35; j++) { // für die ersten 35 Zeichen der jeweiligen Zeile @@ -52,9 +51,9 @@ public class Map { } else if (line.charAt(j) == '3') { ghosts[3].setPos('x', 10 + 20 * j); ghosts[3].setPos('y', 10 + 20 * i); - } + } } catch (Exception e) { - + } } } diff --git a/src/Picture.class b/src/Picture.class deleted file mode 100644 index b6bc60976c3413f7b07ad9362d184a76bada1000..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1413 zcmbtU+g1}v6x|gPI%yg&0i78yOh&~CQ4>@YG!T`GPA~{F%&-=ZMN=fLp*yR)BlzkE z_!lmpT}#2s(hrzFn4i(v)oHRaUY_Qqy6V(9`|PvNss8)ZyN>`S@P~Qzq;bo@Z4*av$H1(CIe{aA@*UY+ zQ-0uh?qAh;0kJ4BIOn-RDBW;PHrpz7ef`5fPoJHg5lDtA2n9xJ59MQ7k~?9^*_L%x znr&}wDPL_?^{Fh-Kkc|qSP?ju@3=OlTQ9AKzT?)*V`~JO^EQ>h;hN*B2kq?*<^L%+ znzUqVo=rlMw0Mq<3AIb84wB=Qs>=(zwrYi>%v{N^;RFJi+KOX`ZC|HP1+r~NU=h#W zmt@-5uOJ(4cA+`5I|P}Sk54J=x?kD7%OILT6V@NOyCp~b!w0N^p#}7Vw^BmzZ_$He?Eue0PWG4SzUk;s89>t9oqwqv@sgn zqd~*lSyDm3{PTP`UR_|i2W!sTZh5Y9!*Wj*%Nq}s{U1yG5UOKq_=WFtn9n=G&L6{Z zushM|N3NWOXwSytG;c%KZ=$pBb7kkT);}VW5!V)rD>u&*L&G|GNZW y99O#~oIpR*kCNVb+As1Z&oT;_L9t7Jg7h!O^ebKZ6qeXa diff --git a/src/Picture.java b/src/Picture.java index 5569808..3506e27 100644 --- a/src/Picture.java +++ b/src/Picture.java @@ -7,7 +7,7 @@ import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JOptionPane; -// Diese Klasse ist die Grundlagee zum Render von Elementen auf dem Frame, anhand der Javax Swing Bibliothek +// Diese Klasse ist die Grundlage zum Rendern von Elementen auf dem Frame, anhand der Javax Swing Bibliothek public class Picture extends JLabel { // Die übergeordnete Klasse ist JLabel diff --git a/src/Player.class b/src/Player.class deleted file mode 100644 index e333f5af6bc027de67bb42bc389cc025062f77d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1741 zcmah~&r@4f6#j0=FOo+agH6jXrC1=OO0d#urKQ#YEf8oV5G|X|Be{hK;l23sQkoeZ zRxY#)H|h*4*|A}x132SCS8n_p-1|p3_QP#IzDKO5BU$evIdA z6mwC`N05(TA%aDLL|wX;SuIJoZaMbK?393*6X?h}cHJ{=uVhvmGW6T(pM#@+EZ-3b zJ}o$P#>`M{YBf}^Nm&sHxz_rIN7pJ{Rr#1|pi!eyh(w!^hk-;oKukk z=kt~=7aQAa(p@&!s#F ziJ3KbysUg8Z7(}7o6|~}P`LzQyIvZ>W{aL#-dZqgt!!~(FUhJjHF%V_U{D8<}MlWyf(VmTh`WA#&`v!nR{Yr{R|6jHUXC`z4R60tJkMS>877M@xz;16T0C zKo5Ei^eOQgdLt+p_y|i86b&q6C4!QHkMW6t%jh@ox)K9Qyn%iN?!)Ctw}FRvAkf}2 zt&sY7&38}v6Ywh$h!m`{*Kk=}_lvaUt-2>|=?YwEv063l^=#2|Eqh(lnb41XYm>p- zoT<}b-xqw2Ehk%Gu*WCT+~%w_K!E(R&>)WOeVu;iLTta6Wn=~*?? zczJ_m$)edPOH$Lx4}=9Eif*KEk@_WmJOOm^M}Di}*0KO%bd1nnn?sUtDCkN!;X81W1<8cK91aW0cQe}cpTTpcy6 zqG*n*(C4Crj>_w(p|dEB#n4l%S9H{nj!N&N&&SeH6dekc8Iz1seYWX7H%T@4i;>_? zQhJFy+{YCj;F1oL!ZD8JCU28m)f}n3Pcj!sW{KWMWTQeBEb?HJg*tio3~%8JjN&U~ z@ikw6gSWAVYxo}5HFqhWpB8syit(dlFUu;z2#yU74)8X1$|zr{iIC-gM-yfMSd$ZZEGkmhq(Pe5ZCYyQ>n%Ii`x+7xtlpcd=IJ2!y_)v5hDFxZa(G?9bl0+ z<3FA??HQ-%T+0(`y`d*`fNtJ8_Ry)&PCY~m^(3C|qn*y+v%{W5)7L}K4g-fQ!5`ZV zbWp#G2>&X&Ihf0s;-AbkCNP6V+`|e7B{7dJzdPD Z+~8Li(8Gu#+}+icipS}Bm+=9-_Ye1lL7o5r diff --git a/src/Player.java b/src/Player.java index 857f346..6b0879f 100644 --- a/src/Player.java +++ b/src/Player.java @@ -243,4 +243,4 @@ public class Player extends Picture implements KeyListener { // extends Picture } -} +} \ No newline at end of file From c60366420c8ba1be0c8ae33c68093c4be9c92df3 Mon Sep 17 00:00:00 2001 From: Lenz Wiechers <> Date: Thu, 30 Apr 2020 21:26:04 +0200 Subject: [PATCH 2/2] another test commit --- README.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.txt b/README.txt index 1e3feca..9ddd3c6 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= A simple Pac-Man clone. So far. About to add Path finding for the Ghosts and an A.I. that controls Pac-Man. -blob ->>>>>>> 580458bbfd7baf561a1e7de924bcf0e3d50c4b48 +blab \ No newline at end of file