From a4c788ad22b41183d8337e0eaf1b66e848a398ee Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme Date: Sat, 8 Nov 2014 18:29:10 +0100 Subject: [PATCH] Create image folder for explosions. --- res/images/{ => explosions/01}/explosion1.png | Bin res/images/{ => explosions/01}/explosion2.png | Bin res/images/{ => explosions/01}/explosion3.png | Bin res/images/{ => explosions/01}/explosion4.png | Bin res/images/{ => explosions/01}/explosion5.png | Bin res/images/{ => explosions/01}/explosion6.png | Bin res/images/{ => explosions/01}/explosion7.png | Bin .../{ => explosions/02}/explosion2_1.png | Bin .../{ => explosions/02}/explosion2_10.png | Bin .../{ => explosions/02}/explosion2_11.png | Bin .../{ => explosions/02}/explosion2_12.png | Bin .../{ => explosions/02}/explosion2_13.png | Bin .../{ => explosions/02}/explosion2_14.png | Bin .../{ => explosions/02}/explosion2_15.png | Bin .../{ => explosions/02}/explosion2_16.png | Bin .../{ => explosions/02}/explosion2_2.png | Bin .../{ => explosions/02}/explosion2_3.png | Bin .../{ => explosions/02}/explosion2_4.png | Bin .../{ => explosions/02}/explosion2_5.png | Bin .../{ => explosions/02}/explosion2_6.png | Bin .../{ => explosions/02}/explosion2_7.png | Bin .../{ => explosions/02}/explosion2_8.png | Bin .../{ => explosions/02}/explosion2_9.png | Bin .../{ => explosions}/explosion_proto.png | Bin .../entity/explosion/Explosion.java | 4 +-- .../entity/explosion/ExplosionOne.java | 16 ++++----- .../entity/explosion/ExplosionTwo.java | 34 +++++++++--------- 27 files changed, 27 insertions(+), 27 deletions(-) rename res/images/{ => explosions/01}/explosion1.png (100%) rename res/images/{ => explosions/01}/explosion2.png (100%) rename res/images/{ => explosions/01}/explosion3.png (100%) rename res/images/{ => explosions/01}/explosion4.png (100%) rename res/images/{ => explosions/01}/explosion5.png (100%) rename res/images/{ => explosions/01}/explosion6.png (100%) rename res/images/{ => explosions/01}/explosion7.png (100%) rename res/images/{ => explosions/02}/explosion2_1.png (100%) rename res/images/{ => explosions/02}/explosion2_10.png (100%) rename res/images/{ => explosions/02}/explosion2_11.png (100%) rename res/images/{ => explosions/02}/explosion2_12.png (100%) rename res/images/{ => explosions/02}/explosion2_13.png (100%) rename res/images/{ => explosions/02}/explosion2_14.png (100%) rename res/images/{ => explosions/02}/explosion2_15.png (100%) rename res/images/{ => explosions/02}/explosion2_16.png (100%) rename res/images/{ => explosions/02}/explosion2_2.png (100%) rename res/images/{ => explosions/02}/explosion2_3.png (100%) rename res/images/{ => explosions/02}/explosion2_4.png (100%) rename res/images/{ => explosions/02}/explosion2_5.png (100%) rename res/images/{ => explosions/02}/explosion2_6.png (100%) rename res/images/{ => explosions/02}/explosion2_7.png (100%) rename res/images/{ => explosions/02}/explosion2_8.png (100%) rename res/images/{ => explosions/02}/explosion2_9.png (100%) rename res/images/{ => explosions}/explosion_proto.png (100%) diff --git a/res/images/explosion1.png b/res/images/explosions/01/explosion1.png similarity index 100% rename from res/images/explosion1.png rename to res/images/explosions/01/explosion1.png diff --git a/res/images/explosion2.png b/res/images/explosions/01/explosion2.png similarity index 100% rename from res/images/explosion2.png rename to res/images/explosions/01/explosion2.png diff --git a/res/images/explosion3.png b/res/images/explosions/01/explosion3.png similarity index 100% rename from res/images/explosion3.png rename to res/images/explosions/01/explosion3.png diff --git a/res/images/explosion4.png b/res/images/explosions/01/explosion4.png similarity index 100% rename from res/images/explosion4.png rename to res/images/explosions/01/explosion4.png diff --git a/res/images/explosion5.png b/res/images/explosions/01/explosion5.png similarity index 100% rename from res/images/explosion5.png rename to res/images/explosions/01/explosion5.png diff --git a/res/images/explosion6.png b/res/images/explosions/01/explosion6.png similarity index 100% rename from res/images/explosion6.png rename to res/images/explosions/01/explosion6.png diff --git a/res/images/explosion7.png b/res/images/explosions/01/explosion7.png similarity index 100% rename from res/images/explosion7.png rename to res/images/explosions/01/explosion7.png diff --git a/res/images/explosion2_1.png b/res/images/explosions/02/explosion2_1.png similarity index 100% rename from res/images/explosion2_1.png rename to res/images/explosions/02/explosion2_1.png diff --git a/res/images/explosion2_10.png b/res/images/explosions/02/explosion2_10.png similarity index 100% rename from res/images/explosion2_10.png rename to res/images/explosions/02/explosion2_10.png diff --git a/res/images/explosion2_11.png b/res/images/explosions/02/explosion2_11.png similarity index 100% rename from res/images/explosion2_11.png rename to res/images/explosions/02/explosion2_11.png diff --git a/res/images/explosion2_12.png b/res/images/explosions/02/explosion2_12.png similarity index 100% rename from res/images/explosion2_12.png rename to res/images/explosions/02/explosion2_12.png diff --git a/res/images/explosion2_13.png b/res/images/explosions/02/explosion2_13.png similarity index 100% rename from res/images/explosion2_13.png rename to res/images/explosions/02/explosion2_13.png diff --git a/res/images/explosion2_14.png b/res/images/explosions/02/explosion2_14.png similarity index 100% rename from res/images/explosion2_14.png rename to res/images/explosions/02/explosion2_14.png diff --git a/res/images/explosion2_15.png b/res/images/explosions/02/explosion2_15.png similarity index 100% rename from res/images/explosion2_15.png rename to res/images/explosions/02/explosion2_15.png diff --git a/res/images/explosion2_16.png b/res/images/explosions/02/explosion2_16.png similarity index 100% rename from res/images/explosion2_16.png rename to res/images/explosions/02/explosion2_16.png diff --git a/res/images/explosion2_2.png b/res/images/explosions/02/explosion2_2.png similarity index 100% rename from res/images/explosion2_2.png rename to res/images/explosions/02/explosion2_2.png diff --git a/res/images/explosion2_3.png b/res/images/explosions/02/explosion2_3.png similarity index 100% rename from res/images/explosion2_3.png rename to res/images/explosions/02/explosion2_3.png diff --git a/res/images/explosion2_4.png b/res/images/explosions/02/explosion2_4.png similarity index 100% rename from res/images/explosion2_4.png rename to res/images/explosions/02/explosion2_4.png diff --git a/res/images/explosion2_5.png b/res/images/explosions/02/explosion2_5.png similarity index 100% rename from res/images/explosion2_5.png rename to res/images/explosions/02/explosion2_5.png diff --git a/res/images/explosion2_6.png b/res/images/explosions/02/explosion2_6.png similarity index 100% rename from res/images/explosion2_6.png rename to res/images/explosions/02/explosion2_6.png diff --git a/res/images/explosion2_7.png b/res/images/explosions/02/explosion2_7.png similarity index 100% rename from res/images/explosion2_7.png rename to res/images/explosions/02/explosion2_7.png diff --git a/res/images/explosion2_8.png b/res/images/explosions/02/explosion2_8.png similarity index 100% rename from res/images/explosion2_8.png rename to res/images/explosions/02/explosion2_8.png diff --git a/res/images/explosion2_9.png b/res/images/explosions/02/explosion2_9.png similarity index 100% rename from res/images/explosion2_9.png rename to res/images/explosions/02/explosion2_9.png diff --git a/res/images/explosion_proto.png b/res/images/explosions/explosion_proto.png similarity index 100% rename from res/images/explosion_proto.png rename to res/images/explosions/explosion_proto.png diff --git a/src/de/teamteamteam/spacescooter/entity/explosion/Explosion.java b/src/de/teamteamteam/spacescooter/entity/explosion/Explosion.java index 12ea650..0aa619a 100644 --- a/src/de/teamteamteam/spacescooter/entity/explosion/Explosion.java +++ b/src/de/teamteamteam/spacescooter/entity/explosion/Explosion.java @@ -28,7 +28,7 @@ public class Explosion extends Entity { */ public Explosion(int x, int y) { super(x, y); - this.setImage("images/explosion_proto.png"); + this.setImage("images/explosions/explosion_proto.png"); this.setPosition(x - (this.getWidth()/2), y - (this.getHeight()/2)); Random rand = new Random(); if (rand.nextInt(99) <= 70) { @@ -44,7 +44,7 @@ public class Explosion extends Entity { public Explosion(int x, int y, int count, int width, int height) { super(x, y); System.out.println("Explosion with: " + count); - this.setImage("images/explosion_proto.png"); + this.setImage("images/explosions/explosion_proto.png"); this.setPosition(x, y); this.random = new Random(); this.count = 10; diff --git a/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionOne.java b/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionOne.java index 90de8e2..dc2bd60 100644 --- a/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionOne.java +++ b/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionOne.java @@ -8,7 +8,7 @@ public class ExplosionOne extends Entity { public ExplosionOne(int x, int y) { super(x, y); - this.setImage("images/explosion_proto.png"); + this.setImage("images/explosions/explosion_proto.png"); this.setPosition(x - (this.getWidth()/2), y - (this.getHeight()/2)); } @@ -20,25 +20,25 @@ public class ExplosionOne extends Entity { } switch (count) { case 70: - this.setImage("images/explosion1.png"); + this.setImage("images/explosions/01/explosion1.png"); break; case 60: - this.setImage("images/explosion2.png"); + this.setImage("images/explosions/01/explosion2.png"); break; case 50: - this.setImage("images/explosion3.png"); + this.setImage("images/explosions/01/explosion3.png"); break; case 40: - this.setImage("images/explosion4.png"); + this.setImage("images/explosions/01/explosion4.png"); break; case 30: - this.setImage("images/explosion5.png"); + this.setImage("images/explosions/01/explosion5.png"); break; case 20: - this.setImage("images/explosion6.png"); + this.setImage("images/explosions/01/explosion6.png"); break; case 10: - this.setImage("images/explosion7.png"); + this.setImage("images/explosions/01/explosion7.png"); break; } } diff --git a/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionTwo.java b/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionTwo.java index 403070a..3fa2d5b 100644 --- a/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionTwo.java +++ b/src/de/teamteamteam/spacescooter/entity/explosion/ExplosionTwo.java @@ -8,7 +8,7 @@ public class ExplosionTwo extends Entity { public ExplosionTwo(int x, int y) { super(x, y); - this.setImage("images/explosion_proto.png"); + this.setImage("images/explosions/explosion_proto.png"); this.setPosition(x - (this.getWidth()/2), y - (this.getHeight()/2)); } @@ -20,52 +20,52 @@ public class ExplosionTwo extends Entity { } switch (count) { case 150: - this.setImage("images/explosion2_1.png"); + this.setImage("images/explosions/02/explosion2_1.png"); break; case 140: - this.setImage("images/explosion2_2.png"); + this.setImage("images/explosions/02/explosion2_2.png"); break; case 130: - this.setImage("images/explosion2_3.png"); + this.setImage("images/explosions/02/explosion2_3.png"); break; case 120: - this.setImage("images/explosion2_4.png"); + this.setImage("images/explosions/02/explosion2_4.png"); break; case 110: - this.setImage("images/explosion2_5.png"); + this.setImage("images/explosions/02/explosion2_5.png"); break; case 100: - this.setImage("images/explosion2_6.png"); + this.setImage("images/explosions/02/explosion2_6.png"); break; case 90: - this.setImage("images/explosion2_7.png"); + this.setImage("images/explosions/02/explosion2_7.png"); break; case 80: - this.setImage("images/explosion2_8.png"); + this.setImage("images/explosions/02/explosion2_8.png"); break; case 70: - this.setImage("images/explosion2_9.png"); + this.setImage("images/explosions/02/explosion2_9.png"); break; case 60: - this.setImage("images/explosion2_10.png"); + this.setImage("images/explosions/02/explosion2_10.png"); break; case 50: - this.setImage("images/explosion2_11.png"); + this.setImage("images/explosions/02/explosion2_11.png"); break; case 40: - this.setImage("images/explosion2_12.png"); + this.setImage("images/explosions/02/explosion2_12.png"); break; case 30: - this.setImage("images/explosion2_13.png"); + this.setImage("images/explosions/02/explosion2_13.png"); break; case 20: - this.setImage("images/explosion2_14.png"); + this.setImage("images/explosions/02/explosion2_14.png"); break; case 10: - this.setImage("images/explosion2_15.png"); + this.setImage("images/explosions/02/explosion2_15.png"); break; case 1: - this.setImage("images/explosion2_16.png"); + this.setImage("images/explosions/02/explosion2_16.png"); break; } }