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 0000000..bcb29ed Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/little_bug_25x25.png differ diff --git a/HeatUp/src/de/heatup/resources/images/little_bug_25x25_1.png b/HeatUp/src/de/heatup/resources/images/little_bug_25x25_1.png new file mode 100644 index 0000000..a0c03fb Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/little_bug_25x25_1.png differ 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 0000000..5a9d15a Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/little_bug_25x25_2.png differ 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 0000000..8457e82 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/little_bug_25x25_3.png differ 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 0000000..6358b7d Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/red_bug_25x25.png differ