From 9578b9915ae516570f4539b8b22033171a47c6b0 Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 8 Dec 2014 21:02:20 +0100 Subject: [PATCH] Korrekturen und Anpassungen im Bereich Extends Object --- HeatUp/src/de/heatup/objects/ImageLoader.java | 13 +++++++++ HeatUp/src/de/heatup/objects/Opponent.java | 11 +++---- .../src/de/heatup/objects/StaticObject.java | 27 ++++++++++++++++++ .../resources/images/little_bug_25x25.png | Bin 0 -> 240 bytes .../resources/images/little_bug_25x25_1.png | Bin 0 -> 265 bytes .../resources/images/little_bug_25x25_2.png | Bin 0 -> 273 bytes .../resources/images/little_bug_25x25_3.png | Bin 0 -> 272 bytes .../heatup/resources/images/red_bug_25x25.png | Bin 0 -> 852 bytes 8 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 HeatUp/src/de/heatup/resources/images/little_bug_25x25.png create mode 100644 HeatUp/src/de/heatup/resources/images/little_bug_25x25_1.png create mode 100644 HeatUp/src/de/heatup/resources/images/little_bug_25x25_2.png create mode 100644 HeatUp/src/de/heatup/resources/images/little_bug_25x25_3.png create mode 100644 HeatUp/src/de/heatup/resources/images/red_bug_25x25.png diff --git a/HeatUp/src/de/heatup/objects/ImageLoader.java b/HeatUp/src/de/heatup/objects/ImageLoader.java index 95e1ceb..06b0ab2 100644 --- a/HeatUp/src/de/heatup/objects/ImageLoader.java +++ b/HeatUp/src/de/heatup/objects/ImageLoader.java @@ -43,7 +43,20 @@ public class ImageLoader { break; case 'p': imageFileName="de/heatup/resources/images/little_blue_guy_verysmall.png"; + //imageFileName="de/heatup/resources/images/red_bug_25x25.png"; break; + case 'q': + //imageFileName="de/heatup/resources/images/little_blue_guy_verysmall.png"; + imageFileName="de/heatup/resources/images/little_bug_25x25_1.png"; + break; + case 's': + //imageFileName="de/heatup/resources/images/little_blue_guy_verysmall.png"; + imageFileName="de/heatup/resources/images/little_bug_25x25_2.png"; + break; + case 't': + //imageFileName="de/heatup/resources/images/little_blue_guy_verysmall.png"; + imageFileName="de/heatup/resources/images/little_bug_25x25_3.png"; + break; default: imageFileName="de/heatup/resources/images/dummy_image.png"; break; diff --git a/HeatUp/src/de/heatup/objects/Opponent.java b/HeatUp/src/de/heatup/objects/Opponent.java index 78db5d6..f5fbf95 100644 --- a/HeatUp/src/de/heatup/objects/Opponent.java +++ b/HeatUp/src/de/heatup/objects/Opponent.java @@ -8,6 +8,8 @@ import javax.imageio.ImageIO; import de.heatup.mapengine.CollisionHandler; import de.heatup.ui.Main; +//TODO: Magische Nummern entfernen + public class Opponent extends Player { private static final long serialVersionUID = 1L; @@ -63,6 +65,7 @@ public class Opponent extends Player { this.move = false; } } + if ( direction == 'y' ) { if ( CollisionHandler.checkCollision(this, 'l') ) { this.move = false; @@ -101,11 +104,7 @@ public class Opponent extends Player { charDir = playerDirection; this.move = true; } - - /* - * - */ - + // Umentscheiden oder weiter in die vorgegeben Richtung if ( ! this.move ) { //Logger.write("Redeciding..."); @@ -115,11 +114,9 @@ public class Opponent extends Player { if ( redecide && this.direction == this.prevd && this.i != this.previ ) { this.i *= -1; } - } else { //Logger.write("Moving..."); } - this.move = true; // Blockade auflösen, gehe doch in die Richtung aus man gekommen ist diff --git a/HeatUp/src/de/heatup/objects/StaticObject.java b/HeatUp/src/de/heatup/objects/StaticObject.java index 5b21619..91501a3 100644 --- a/HeatUp/src/de/heatup/objects/StaticObject.java +++ b/HeatUp/src/de/heatup/objects/StaticObject.java @@ -24,6 +24,7 @@ public class StaticObject extends JComponent { private char staticObjectType; private int staticObjectWidth; private int staticObjectHeight; + private int imgcounter = 0; public StaticObject(char staticObjectType, Point location, int staticObjectWidth, int staticObjectHeight) { this.staticObjectType = staticObjectType; @@ -45,6 +46,32 @@ public class StaticObject extends JComponent { if ( this.bf1 == null ) { loadBufferedImage(); } + +// this.imgcounter++; +// if ( staticObjectType == 'p' && this.imgcounter > 0 && this.imgcounter < 5 ) { +// System.out.println("hit 1"); +// staticObjectType = 'p'; +// loadBufferedImage(); +// } if ( staticObjectType == 'p' && this.imgcounter > 5 && this.imgcounter < 10 ) { +// System.out.println("hit 2"); +// staticObjectType = 'q'; +// loadBufferedImage(); +// } +// if ( staticObjectType == 'q' && this.imgcounter > 10 && this.imgcounter < 15 ) { +// System.out.println("hit 3"); +// staticObjectType = 's'; +// loadBufferedImage(); +// } +// if ( staticObjectType == 's' && this.imgcounter > 15 && this.imgcounter < 20 ) { +// System.out.println("hit 4"); +// staticObjectType = 't'; +// loadBufferedImage(); +// } +// if ( staticObjectType == 't' && this.imgcounter > 50) { +// System.out.println("hit 5"); +// this.imgcounter = 0; +// staticObjectType = 'p'; +// } /* * Skalieren der Bilder wenn größer als Bounds diff --git a/HeatUp/src/de/heatup/resources/images/little_bug_25x25.png b/HeatUp/src/de/heatup/resources/images/little_bug_25x25.png new file mode 100644 index 0000000000000000000000000000000000000000..bcb29ed285d41fc57a62e2741fa229afa7b58ada GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqx1>0qV(Fr?dq5${64!_l=ltB<)VvY~=c3falGGH1 z^30M91$R&1fbd2>aiF3IPZ!4!kK@S+3z!pBqMr8t|G%*-+rTL3xKNCkK&GJbQ89r; z!OI7Za&BCwekt6iLR3g_<&hQ3y$g8dz1=2%$PkkAJ+#=fqCzb(sm9rXS9qyr`x1qv asz9g3NgbEp-}&@oJssffiHHuTFw7W zURGzq$v;`eCW?!{=9SVhbCxRxfwPJ{xPqdX7=HPvD%;7He*#+0;OXk;vd$@?2>?pT BQThM? literal 0 HcmV?d00001 diff --git a/HeatUp/src/de/heatup/resources/images/little_bug_25x25_2.png b/HeatUp/src/de/heatup/resources/images/little_bug_25x25_2.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9d15a9e1cde57c39c09175d101efdbd2a2b35c GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqw-gt*O5K;2H-SQuC9V-A&iT2ysd*&~&PAz-C8;S2 z<(VZJ3hti10pX2&;y^`}o-U3d9>?EK^X5CCz~Lf$`EbGi%N5dh!h%az%va;pDLo`S zL%`WWV8K++uODL?Oecsnup~-3G(0LdPK@^t6W#5Uw4&#q$L@d38zUnE?&oeQxMXB0 zc-@G5x@a=bPVVdl2bR5eidtL5{afst?w?nS4K5vtd_E&;m$8v+me#7a*6q`Qj$rU~ L^>bP0l+XkK74=@O literal 0 HcmV?d00001 diff --git a/HeatUp/src/de/heatup/resources/images/little_bug_25x25_3.png b/HeatUp/src/de/heatup/resources/images/little_bug_25x25_3.png new file mode 100644 index 0000000000000000000000000000000000000000..8457e8219532ff8c9cc5c1f90a1e06088ff3357c GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqw-gr-Z!!DxBA}3DiEBiObAE1aYF-J0b5UwyNotBh zd1gt5g1e`0KzJjcI8afAr;B5V$MNKZ1YU22 zCAWFbXgxB=C)qo1Lj0wkX@?dsHK_b*ZkRPg!`D)URa2Ld;l~Swzb literal 0 HcmV?d00001 diff --git a/HeatUp/src/de/heatup/resources/images/red_bug_25x25.png b/HeatUp/src/de/heatup/resources/images/red_bug_25x25.png new file mode 100644 index 0000000000000000000000000000000000000000..6358b7d50619c897bcb571429ed72b92be3238f4 GIT binary patch literal 852 zcmV-a1FQUrP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U}NDIUq05%DMmm0^vzS zK~zY`t(Hq{4Pg|=e=~EZy`8Ii^+ml~gXs0lMJo~NnMi6Ok`i5DVPzo}R!A&t*bpm3 zVl@fEMyw==w`fu#AreYba;pzC5!L7YTilX%?#$(ilYGgS?|k3+pL71_%o)g2JW#%G zjC_ngsGO!}gZ=DwN|=~>XEf*W9)Pd&lFH@fDSM)dGkQ%0wM}+I@1_!U!M6H|t7Sr! z!lFoGh*1zg$B2YGgc%ItfjrR19edcIz@VKpZKUZ#5HI0- zZ!aT29D^hlaZKJ04dmA+YTB#9D;F68l2|0Mn2kjP5#I5QX%usxAv#FYj(EZ_3B=t$ z^^H2a&0qU(k#ZRUx!-}UKC@Iiv9olg7~}X*_vZzHgx|x_B^>ReAduiXEP0^$m|40A z=ms&Jr%2C<$pfjY#|1C}Uf5;&PL$QNTt?_)Ep}kEUl7~OQc|R|bZKBq)eK_%U{SP~ zPNHaf?VF6UV(xn{6F%zdb^#s|3ydTVx{M<$Kxcuprcq-va}qm~LM>YT-e24OWi^2y zHmE6p4?vYZP5`=+4dH#Gz55mS^~JB=C=WOX)R^O27Agk=$j!A{Gxzh8wnUwZ{t}>m zwCebm33xmtHRJmO-OdzBsF=A%Y&GHl;DkJ`298duVqNXx-=pHMKwc-;sBCn<>&DHJ zmB9X)E}KVxfKvaFs@!$TzO zLV8;tW!*`y+@On3ZxMy?d2#_uTDvuW0>}1PxvNK5;Wn;16>0v1Ty@HW?WntFj?SE$ e@jpQPy!-^}--a#G3b4rl0000