From da1d2571d625e2816328f68b86478961bc2dba25 Mon Sep 17 00:00:00 2001
From: 3009594 <obay.albek@stud.hs-mannheim.de>
Date: Thu, 19 Sep 2024 17:36:13 +0200
Subject: [PATCH] test

---
 .../src/Übungen/Flappy_Bird/GamePanel.java    |  25 +++++++++++++++---
 .../src/Übungen/Flappy_Bird/bottompipe.png    | Bin 0 -> 13924 bytes
 .../src/Übungen/Flappy_Bird/toppipe.png       | Bin 0 -> 13787 bytes
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 Programmierung2/src/Übungen/Flappy_Bird/bottompipe.png
 create mode 100644 Programmierung2/src/Übungen/Flappy_Bird/toppipe.png

diff --git a/Programmierung2/src/Übungen/Flappy_Bird/GamePanel.java b/Programmierung2/src/Übungen/Flappy_Bird/GamePanel.java
index 359e056..234d4dd 100644
--- a/Programmierung2/src/Übungen/Flappy_Bird/GamePanel.java
+++ b/Programmierung2/src/Übungen/Flappy_Bird/GamePanel.java
@@ -8,12 +8,13 @@ import javax.swing.*;
 public class GamePanel extends JPanel implements Runnable {
     
     final static int WIDTH_WINDOW = 600;
-    final static int HEIGH_WINDOW = 900;
+    final static int HEIGH_WINDOW = 800;
     Dimension fensterSize = new Dimension(WIDTH_WINDOW, HEIGH_WINDOW);
     
     DrawImages world;
     DrawImages flappy;
     DrawImages ground1,ground2;
+    DrawImages bottompipe,toppipe;
     
     Thread game;
     
@@ -32,6 +33,11 @@ public class GamePanel extends JPanel implements Runnable {
     public void drawImage() {
         world = new DrawImages(0, 0, WIDTH_WINDOW, HEIGH_WINDOW, new ImageIcon("C:\\Users\\obaya\\git\\Programmierung2\\Programmierung2\\src\\Übungen\\Flappy_Bird\\world.png").getImage());
         flappy = new DrawImages(50, HEIGH_WINDOW / 2, 50, 50, new ImageIcon("C:\\Users\\obaya\\git\\Programmierung2\\Programmierung2\\src\\Übungen\\Flappy_Bird\\flappy Bird.png").getImage());
+       
+        
+        toppipe = new DrawImages(WIDTH_WINDOW/2,0,40,HEIGH_WINDOW - 300,new ImageIcon("C:\\Users\\obaya\\git\\Programmierung2\\Programmierung2\\src\\Übungen\\Flappy_Bird\\toppipe.png").getImage());
+        bottompipe = new DrawImages(WIDTH_WINDOW/2,HEIGH_WINDOW - 200,40,300,new ImageIcon("C:\\Users\\obaya\\git\\Programmierung2\\Programmierung2\\src\\Übungen\\Flappy_Bird\\bottompipe.png").getImage());
+        
         // Zwei Bodenbilder nebeneinander zeichnen
         ground1 = new DrawImages(0, HEIGH_WINDOW - 100, WIDTH_WINDOW, 200, new ImageIcon("C:\\Users\\obaya\\git\\Programmierung2\\Programmierung2\\src\\Übungen\\Flappy_Bird\\ground.png").getImage());
         ground2 = new DrawImages(WIDTH_WINDOW, HEIGH_WINDOW - 100, WIDTH_WINDOW, 200, new ImageIcon("C:\\Users\\obaya\\git\\Programmierung2\\Programmierung2\\src\\Übungen\\Flappy_Bird\\ground.png").getImage());
@@ -41,13 +47,16 @@ public class GamePanel extends JPanel implements Runnable {
         super.paint(g); 
         world.draw(g);
         flappy.draw(g);
+        toppipe.draw(g);
+        bottompipe.draw(g);
         ground1.draw(g); 
-        ground2.draw(g);  
-    }
+        ground2.draw(g); 
+     }
     
     public void move() {
         flappy.move();
         move_ground(); 
+        move_pips();
     }
     
     public void move_ground() {
@@ -65,9 +74,19 @@ public class GamePanel extends JPanel implements Runnable {
         }
     }
     
+    public void move_pips() {
+    	toppipe.x -= 1;
+    	bottompipe.x -= 1;
+    }
+    
     public void checkKollision() {
     	if(flappy.intersects(ground1))
     		gameOver = true;
+    	
+    	if (flappy.intersects(toppipe)) 
+    		gameOver = true;
+    	
+    		
     }
     
     
diff --git a/Programmierung2/src/Übungen/Flappy_Bird/bottompipe.png b/Programmierung2/src/Übungen/Flappy_Bird/bottompipe.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c57b32ab1b1556d0c3dff85140856b836a2be6c
GIT binary patch
literal 13924
zcmeI3Ye-XJ7{{M;a;7b12@Q#$QFeh?_X{!7DO0nHSp-p%*~P5bSYl)v>QDj&VSOlq
zuqHy~mo!Z#BzcT3v%)P4s&RA+B{g)j;iWmxJiYUBB1YT#)R*VOcsV<4@7Z&EfA9Z!
zSDBHX8ntNIA^?a=+oL)RK<NM$Lqs@vhplOUNCqnZaB33No0oql7h$=H2ND4q^<wUn
zh+Icr+H)))Ao_*xMVYj9X92cPrl}H-T+MQHcRq?!6eV}9Jto^)^rgR}dP{2mSjM^L
zg&xW#OL<k>QRJ?BCcRM+YpaTLrtCK}oXfO=A5T~Tr>Dm)>tQnulGOl*0u5}YGGW@K
zEwxdb-sl;A)Y5vgFA8LP0cyhn4;QbA2lc#rbeXG9Yt)zYn@XJ;JuqDiU+7J?1^>Kn
z3S*0|ggf(Thk3+S+b9~#Z?*6R2?tpf&p7TG?8Wh>yF4@E-5uh$sVVsv+OsQDxqrfA
zv~0*!0vAI;MGWZH1sXDyVxz9aER~erzre=#nHjkZO0EN_B0+gG&>*i75$olOE8b+;
zC#*T*2;Iq*LCj5Dkt06;T>9Q(rF$E;Y1rKE$re#qdxIp%Ly{lRBx=qU4-TlQ&DJ3{
zzEw?8KlTOjk<Z40Rk&LZG*eXy-lzlj(m*jWch9Jkswr=^T(;&~F`IkaXO+r8=9s%D
zScUn}tTE&b*rgI+l7h#>Tj~2Ud5z(T=;hf4?bL7+vC76J|6mo@(K|-RRwu{O^w*;i
zL0m_kRih;a<jZ#kpMnHX9p6KHdel)AXXifgT_FbKYYpXfn;385&KG)~8!!|wCOy;X
zX=7ODDA!{dDB#<;Zs&-?!3}#{KOLjzNC-`Z>e8q0q>{B+_Gq7>B0_a%PmZ{v;d4vz
z6)R0=hXu-txqCCo;cODUto+<kPC{-|S*RgUKq7o-Tw^#v;w_fcykPZY*8e1|^Lob}
zGLpPivQU$WOyMq?i_w&jGl>+4>Z`?y4icZMLWmbDef+WLGD(BB`D|Z;u0mJ&iX>*0
zZ-Jd%pD?S)(lfILVgVHJ1J^16{BW)E@i=0|{O$s=LfB>^0SbHdnY|Zc1!Bb?Dg<JM
zu#22gH4rNhEB?^;5GxQX{6rbV3d9Qk1^}uRLURML0<prcfiT;qLbU?b3ZYJr&JU^;
zs8;wNDL}PC*o7cg2;~B?0<i+ILZ}S>$B<C1K(zwZioYLGM63{s2Vw<ch5wmcY=X=e
z4^%6DA7e$VK&(Kln6C_|R{X9Ee&@XrD-bIXD}?swe^e{tye?Deg7(O79~BV(jQleU
N(vs6v^-0-fzW@Z8O5*?k

literal 0
HcmV?d00001

diff --git a/Programmierung2/src/Übungen/Flappy_Bird/toppipe.png b/Programmierung2/src/Übungen/Flappy_Bird/toppipe.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b0a96757dc5e6f2c90c639d82b0a45cd8a8bbc0
GIT binary patch
literal 13787
zcmeI3Ur19?9LLXHo2W~(41*|?Kn-j}4@Q5?J7wV(XeJSbq*+p$E)795%RA~J!-oZi
zhNv4AC`c})W`sILL^5lJhT4>oma}5oa{lS=ZtHB`YkP=IUwZmI9Ddxv9p}&Ye9rg&
zIKTU;DM>+rI|C6yK{BZ%4Ix5-&}QWChkr4syBl#Jiqeu2QOo;X-|z$fN<wl1Laj<6
zlO@2<0fo|YMF<7=x*E}6(3Fi(Y@tk&aQa4ud7|gpK3Vno4|^hW4%|FDm0Gv`-qgtR
zzMLRwh&1FNea3HM(AG8oGHULLSQ4jf&#GD=9hOlWNo6=i6!U|0blCD3OQzFqn$($;
z&Rb=qMx$>T)y+5S=u+FH{iCi%wRGEI(VO(P8i&%MqB4kztw^z#Ko#4(gaJ9x*|ys%
z*D8v~d9T|9{O&j(Z{UAxnh1L!4^P?XJ3}#s1mk64PK`(%lP*Ssp<epM_8E6?eCc!c
zM&E%U!76dm$6^KHxiA2G$t?*W-YVb$;_j0X@Bl|GcT}*H1or^$fs+K_0r0?S0r0?T
z0r0>{0`LHM;IsgE06chVVU?1Qdw|@-S_&3&50HECNXLVF0QcZ|VgMch4}b@kU-;`J
z!9A?a2H*kk;IT8nJ%D=v_u#Q1*n<P_3%H%)zN7=W2XGJI9y}Sjnv(-O03JN|1za(7
z-wuO&4}b>_mhf=_9~Yb!SQ7<!06cJ#06egGps(Xf28Plq(4%OCPVrDkq?fShERM=w
zMEt`9k^~^}L*zXiD<JF^jdNvTPGjk(?8~YWX9MY2Fx#0Iqo(CwbX*7BtkT!&=;f8+
zE+^^uy;NF{&|^M|IN>9dyD!DZGxhm|Jp;GeP~W}59Uf5{cyz8IUVHb@IFIfe<I%Cv
zzKb|q+a|nSU>(qIp`z2px*fR9@V(CzJBy3cT1ELMt<oHUt4+%H<MuAV_vr8heD8M^
zwwQa3Z^DM=`@)7a>zs1?E0J2IHD5YfQ6*9vD@E$eBHo%+WY_$k!6gJuzU^m8o4{Ju
zDzN6Ic+r7}M#yWz*+#i-EO;tgIJ<mNI6GSBW9``G{qIX?5~(R>p44<7!RuFTn4vRq
zaZ>U+hpA5&Q_R~X|L&94e$uE_u5*wL?FzKww?2(MrI=|auP68G@TM=7S8+iWk{wTx
Jv?N}*^9PO}41xdv

literal 0
HcmV?d00001