diff --git a/src/AuraBubble.java b/src/AuraBubble.java index 72ef504..df4bc62 100644 --- a/src/AuraBubble.java +++ b/src/AuraBubble.java @@ -9,6 +9,7 @@ public class AuraBubble { Fenster window; Random rand = new Random(); boolean won; + boolean nothing = false; boolean popped = false; float x, y; float extent = 100; diff --git a/src/AuraFail.java b/src/AuraFail.java index 045bf03..6c2e6f8 100644 --- a/src/AuraFail.java +++ b/src/AuraFail.java @@ -12,6 +12,13 @@ public class AuraFail extends AuraBubble { color = window.color(255, 0, 0); } + void run_out_check() { + if (extent < 1) { + won = false; + nothing = true; + popped = true; + } + } public void hit_check() { PVector pos = new PVector(x, y); PVector mouse = new PVector(window.mouseX, window.mouseY); @@ -20,5 +27,6 @@ public class AuraFail extends AuraBubble { pop(); won = false; + } } diff --git a/src/AuraFight.java b/src/AuraFight.java index 4befdda..f25a2ef 100644 --- a/src/AuraFight.java +++ b/src/AuraFight.java @@ -40,7 +40,7 @@ public class AuraFight extends Bubble implements Drawable { } boolean getRandomBoolean() { - return Math.random() > 0.1; + return Math.random() > 0.4; //I tried another approaches here, still the same result } @@ -56,8 +56,13 @@ public class AuraFight extends Bubble implements Drawable { enemy.damage(5); window.enemyDamage.play(); } else { - player.damage(5); - window.playerDamage.play(); + if (my_aura.nothing) { + window.noHit.play(); + my_aura.nothing = false; + } else { + player.damage(5); + window.playerDamage.play(); + } } if (getRandomBoolean()) { my_aura = new AuraBubble(window); diff --git a/src/DeathScreen.java b/src/DeathScreen.java index a26f194..0109384 100644 --- a/src/DeathScreen.java +++ b/src/DeathScreen.java @@ -61,6 +61,7 @@ public class DeathScreen implements State { System.out.println("mouse pressed"); if (mouse.dist(rect) < 40) { window.reset(); + window.restart.play(); System.out.println("reset"); } } diff --git a/src/Enemy.java b/src/Enemy.java index 24cf031..50ef061 100644 --- a/src/Enemy.java +++ b/src/Enemy.java @@ -5,7 +5,7 @@ import processing.core.PApplet; */ public class Enemy extends Fightable implements Health, Interactable { int health; - int maxHealth = 20; + int maxHealth = 100; Enemy(Fenster window) { super(window); diff --git a/src/Fenster.java b/src/Fenster.java index 082e8fc..1bcdb4a 100644 --- a/src/Fenster.java +++ b/src/Fenster.java @@ -28,6 +28,9 @@ public class Fenster extends PApplet { SoundFile playerDamage; SoundFile healEffect; SoundFile shrinkEffect; + SoundFile noHit; + SoundFile deathSound; + SoundFile restart; boolean gametitel = true; @@ -76,6 +79,9 @@ public class Fenster extends PApplet { playerDamage = new SoundFile(this, "./assets/Boss hit 1.wav"); healEffect = new SoundFile(this, "./assets/Big Egg collect 1.wav"); shrinkEffect = new SoundFile(this, "./assets/Balloon start riding 2.wav"); + noHit = new SoundFile(this, "./assets/Bubble 1.wav"); + deathSound = new SoundFile(this, "./assets/Block Break 1.wav"); + restart = new SoundFile(this, "./assets/Cancel 1.wav"); } @Override @@ -154,6 +160,8 @@ public class Fenster extends PApplet { } public void dead() { + soundTrack.stop(); + deathSound.play(); gameScreen.isState = false; fightScreen.isState = false; deathScreen.isState = true; @@ -161,6 +169,7 @@ public class Fenster extends PApplet { public void reset() { classSetup(); + soundTrack.play(); deathScreen.isState = false; startScreen.setup(); tiles.settings();