diff --git a/HeatUp/src/de/heatup/objects/ImageLoader.java b/HeatUp/src/de/heatup/objects/ImageLoader.java index a717826..2f0eedd 100644 --- a/HeatUp/src/de/heatup/objects/ImageLoader.java +++ b/HeatUp/src/de/heatup/objects/ImageLoader.java @@ -20,43 +20,40 @@ public class ImageLoader { public BufferedImage getBufferedImage(char key) { String imageFileName; switch (key) { + + // Wall images case Config.wayChar: imageFileName="de/heatup/resources/images/25x25_black.png"; break; case Config.wallChar: - imageFileName="de/heatup/resources/images/25x25_wall_orange_2.png"; + imageFileName="de/heatup/resources/images/grid_1.png"; break; + + // Opponent images w - z with animation. + case 'w': + imageFileName="de/heatup/resources/images/opponent_f1.png"; + break; + case 'x': + imageFileName="de/heatup/resources/images/opponent_f2.png"; + break; + case 'y': + imageFileName="de/heatup/resources/images/opponent_f3.png"; + break; + case 'z': + imageFileName="de/heatup/resources/images/opponent_f4.png"; + break; + + // Image for power up case 'b': imageFileName="de/heatup/resources/images/25x25_powerup.png"; break; - case 'u': - imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png"; - break; - case 'd': - imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png"; - break; - case 'l': - imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png"; - break; - case 'r': - imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png"; - break; + + // Player 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"; + imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png"; break; + + // Default images if no other is found default: imageFileName="de/heatup/resources/images/dummy_image.png"; break; @@ -65,17 +62,27 @@ public class ImageLoader { Random rand = new Random(); switch (rand.nextInt(2)) { case 0: - imageFileName="de/heatup/resources/images/hardware/rectangular_chip.jpg"; + //imageFileName="de/heatup/resources/images/hardware/rectangular_chip.jpg"; + imageFileName="de/heatup/resources/images/hardware/chip_rc_1.png"; break; case 1: - imageFileName="de/heatup/resources/images/hardware/square_chip.jpg"; + //imageFileName="de/heatup/resources/images/hardware/square_chip.jpg"; + imageFileName="de/heatup/resources/images/hardware/chip_sq_1.png"; break; + case 2: + //imageFileName="de/heatup/resources/images/hardware/square_chip.jpg"; + imageFileName="de/heatup/resources/images/hardware/chip_rc_2.png"; + break; + case 3: + //imageFileName="de/heatup/resources/images/hardware/square_chip.jpg"; + imageFileName="de/heatup/resources/images/hardware/chip_sq_2.png"; + break; + default: break; } } BufferedImage loadedBufferedImage = null; - //System.out.println(imageFileName); try { loadedBufferedImage = ImageIO.read(this.getClass().getClassLoader().getResourceAsStream(imageFileName)); diff --git a/HeatUp/src/de/heatup/objects/Opponent.java b/HeatUp/src/de/heatup/objects/Opponent.java index f5fbf95..32cb7ed 100644 --- a/HeatUp/src/de/heatup/objects/Opponent.java +++ b/HeatUp/src/de/heatup/objects/Opponent.java @@ -29,7 +29,9 @@ public class Opponent extends Player { private char charDir; // Direkten Pfad zum Spieler nutzen private char newd; - + // Variablen zur Animation + private int tickCounter = 0; + private int ticker = 0; public Opponent() { CollisionHandler.addMovingObject(this); @@ -37,13 +39,37 @@ public class Opponent extends Player { @Override protected void loadBufferedImage() { try { - super.bf1 = ImageIO.read(this.getClass().getClassLoader().getResourceAsStream("de/heatup/resources/images/little_green_guy_verysmall.png")); + super.bf1 = ImageIO.read(this.getClass().getClassLoader().getResourceAsStream("de/heatup/resources/images/opponent_f1.png")); } catch (IOException e) { e.printStackTrace(); } } @Override public void tick() { + + // Part for Animation + this.tickCounter++; + if ( (this.tickCounter%10) == 0 ) { + this.tickCounter = 0; + if ( ticker == 0 ) { + super.setStaticObjectType('w'); + super.loadBufferedImage(); + ticker = 1; + } else if ( ticker == 1 ) { + super.setStaticObjectType('x'); + super.loadBufferedImage(); + ticker = 2; + } else if ( ticker == 2 ) { + super.setStaticObjectType('y'); + super.loadBufferedImage(); + ticker = 3; + } else if ( ticker == 3 ) { + super.setStaticObjectType('z'); + super.loadBufferedImage(); + ticker = 0; + } + } + if ( redecide ) { while ( true ) { diff --git a/HeatUp/src/de/heatup/objects/StaticObject.java b/HeatUp/src/de/heatup/objects/StaticObject.java index 91501a3..a25503c 100644 --- a/HeatUp/src/de/heatup/objects/StaticObject.java +++ b/HeatUp/src/de/heatup/objects/StaticObject.java @@ -37,7 +37,14 @@ public class StaticObject extends JComponent { public StaticObject(char staticObjectType, Point location) { this(staticObjectType, location, Config.singleTilePixels, Config.singleTilePixels); } - + + public char getStaticObjectType() { + return this.staticObjectType; + } + + public void setStaticObjectType(char staticObjectType) { + this.staticObjectType = staticObjectType; + } public void paintComponent(Graphics g) { this.g2d = (Graphics2D)g; @@ -47,6 +54,25 @@ public class StaticObject extends JComponent { loadBufferedImage(); } + + this.imgcounter++; + if ( staticObjectType == '0' && this.imgcounter > 0 && this.imgcounter < 5 ) { + System.out.println("hit 0"); + staticObjectType = '2'; + loadBufferedImage(); + } + + if ( staticObjectType == '2' && this.imgcounter > 5 && this.imgcounter < 10 ) { + System.out.println("hit 2"); + staticObjectType = '0'; + loadBufferedImage(); + } + if ( staticObjectType == '2' && this.imgcounter > 10 ) { + staticObjectType = '0'; + this.imgcounter=0; + } + + // this.imgcounter++; // if ( staticObjectType == 'p' && this.imgcounter > 0 && this.imgcounter < 5 ) { // System.out.println("hit 1"); diff --git a/HeatUp/src/de/heatup/resources/images/25x25_blue.png b/HeatUp/src/de/heatup/resources/images/25x25_blue.png deleted file mode 100644 index 6bfa88c..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/25x25_blue.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/25x25_orange.png b/HeatUp/src/de/heatup/resources/images/25x25_orange.png deleted file mode 100644 index 1ab0f03..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/25x25_orange.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/25x25_red.png b/HeatUp/src/de/heatup/resources/images/25x25_red.png deleted file mode 100644 index 4dc5d36..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/25x25_red.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/25x25_theGrid.png b/HeatUp/src/de/heatup/resources/images/25x25_theGrid.png deleted file mode 100644 index 5fc705a..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/25x25_theGrid.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/25x25_wall_orange.png b/HeatUp/src/de/heatup/resources/images/25x25_wall_orange.png deleted file mode 100644 index 7615d05..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/25x25_wall_orange.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/25x25_wall_orange_1.png b/HeatUp/src/de/heatup/resources/images/25x25_wall_orange_1.png deleted file mode 100644 index ed5763c..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/25x25_wall_orange_1.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/bg_gray.png b/HeatUp/src/de/heatup/resources/images/bg_gray.png deleted file mode 100644 index bde7b11..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/bg_gray.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/bg_orange.png b/HeatUp/src/de/heatup/resources/images/bg_orange.png deleted file mode 100644 index b3e8253..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/bg_orange.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/grid_1.png b/HeatUp/src/de/heatup/resources/images/grid_1.png new file mode 100644 index 0000000..48db0c2 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/grid_1.png differ diff --git a/HeatUp/src/de/heatup/resources/images/hardware/chip_lg_1.png b/HeatUp/src/de/heatup/resources/images/hardware/chip_lg_1.png new file mode 100644 index 0000000..be7ab50 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/hardware/chip_lg_1.png differ diff --git a/HeatUp/src/de/heatup/resources/images/hardware/chip_lg_2.png b/HeatUp/src/de/heatup/resources/images/hardware/chip_lg_2.png new file mode 100644 index 0000000..f2432d5 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/hardware/chip_lg_2.png differ diff --git a/HeatUp/src/de/heatup/resources/images/hardware/chip_rc_1.png b/HeatUp/src/de/heatup/resources/images/hardware/chip_rc_1.png new file mode 100644 index 0000000..3df7107 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/hardware/chip_rc_1.png differ diff --git a/HeatUp/src/de/heatup/resources/images/hardware/chip_rc_2.png b/HeatUp/src/de/heatup/resources/images/hardware/chip_rc_2.png new file mode 100644 index 0000000..9204698 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/hardware/chip_rc_2.png differ diff --git a/HeatUp/src/de/heatup/resources/images/hardware/chip_sq_1.png b/HeatUp/src/de/heatup/resources/images/hardware/chip_sq_1.png new file mode 100644 index 0000000..b357339 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/hardware/chip_sq_1.png differ diff --git a/HeatUp/src/de/heatup/resources/images/hardware/chip_sq_2.png b/HeatUp/src/de/heatup/resources/images/hardware/chip_sq_2.png new file mode 100644 index 0000000..b7c3521 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/hardware/chip_sq_2.png differ diff --git a/HeatUp/src/de/heatup/resources/images/little_black_guy.png b/HeatUp/src/de/heatup/resources/images/little_black_guy.png deleted file mode 100644 index 1debcce..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_black_guy.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/little_blue_guy.png b/HeatUp/src/de/heatup/resources/images/little_blue_guy.png deleted file mode 100644 index 5ff5d8e..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_blue_guy.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/little_blue_guy_verysmall.png b/HeatUp/src/de/heatup/resources/images/little_blue_guy_verysmall.png deleted file mode 100644 index 504317c..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_blue_guy_verysmall.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/little_bug_25x25.png b/HeatUp/src/de/heatup/resources/images/little_bug_25x25.png deleted file mode 100644 index bcb29ed..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_bug_25x25.png and /dev/null 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 deleted file mode 100644 index a0c03fb..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_bug_25x25_1.png and /dev/null 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 deleted file mode 100644 index 5a9d15a..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_bug_25x25_2.png and /dev/null 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 deleted file mode 100644 index 8457e82..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_bug_25x25_3.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/little_green_guy.png b/HeatUp/src/de/heatup/resources/images/little_green_guy.png deleted file mode 100644 index 83c301b..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_green_guy.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/little_green_guy_left.png b/HeatUp/src/de/heatup/resources/images/little_green_guy_left.png deleted file mode 100644 index 20e72c9..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_green_guy_left.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/little_green_guy_right.png b/HeatUp/src/de/heatup/resources/images/little_green_guy_right.png deleted file mode 100644 index a771714..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_green_guy_right.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/little_green_guy_up.png b/HeatUp/src/de/heatup/resources/images/little_green_guy_up.png deleted file mode 100644 index 1c44ae7..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/little_green_guy_up.png and /dev/null differ diff --git a/HeatUp/src/de/heatup/resources/images/opponent_f1.png b/HeatUp/src/de/heatup/resources/images/opponent_f1.png new file mode 100644 index 0000000..3673a5a Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/opponent_f1.png differ diff --git a/HeatUp/src/de/heatup/resources/images/opponent_f2.png b/HeatUp/src/de/heatup/resources/images/opponent_f2.png new file mode 100644 index 0000000..9c6887c Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/opponent_f2.png differ diff --git a/HeatUp/src/de/heatup/resources/images/opponent_f3.png b/HeatUp/src/de/heatup/resources/images/opponent_f3.png new file mode 100644 index 0000000..0721124 Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/opponent_f3.png differ diff --git a/HeatUp/src/de/heatup/resources/images/opponent_f4.png b/HeatUp/src/de/heatup/resources/images/opponent_f4.png new file mode 100644 index 0000000..394953f Binary files /dev/null and b/HeatUp/src/de/heatup/resources/images/opponent_f4.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 deleted file mode 100644 index 6358b7d..0000000 Binary files a/HeatUp/src/de/heatup/resources/images/red_bug_25x25.png and /dev/null differ