This commit is contained in:
Sosch 2014-11-04 13:36:13 +01:00
commit 8a77a346e4
22 changed files with 4 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 777 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 946 B

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
res/images/shot02.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 B

BIN
res/images/shot03.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

BIN
res/images/shot04.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

BIN
res/images/shot05.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

View File

@ -60,6 +60,9 @@ public class ExplosionBig extends Explosion {
case 10:
this.setImage("images/explosion2_15.png");
break;
case 1:
this.setImage("images/explosion2_16.png");
break;
}
}

View File

@ -86,14 +86,13 @@ public abstract class LivingEntity extends Entity implements Collidable {
if (this.isAlive() == false) {
if(GameConfig.DEBUG) System.out.println(this + " ist gestorben. RIP");
this.explode();
//Screen.currentScreen.addEntity(new Explosion(this.x, this.y));
this.remove();
}
}
private void explode() {
Random rnd = new Random();
if (rnd.nextInt(10) < 7) {
if (rnd.nextInt(99) < 70) {
Screen.currentScreen.addEntity(new Explosion(this.x, this.y));
} else {
Screen.currentScreen.addEntity(new ExplosionBig(this.x, this.y));