diff --git a/Boss.java b/Boss.java index c6e3156..b4386c7 100644 --- a/Boss.java +++ b/Boss.java @@ -7,12 +7,12 @@ public class Boss extends Monster { public Boss(){ imageLoc = "monster-red.png"; - health=1000; - dropTime = 50; + health=281; //four red fireballs and one + dropTime = 40; damage=15; - speed=(float)0.5; - angularSpeed = 5; - range = 5; + speed=(float)0.005; + angularSpeed = 3; + range = 10; } /** diff --git a/FBlue.java b/FBlue.java index a50af6d..7124f2c 100644 --- a/FBlue.java +++ b/FBlue.java @@ -8,7 +8,8 @@ public class FBlue extends Fireball public FBlue(float direction){ super(direction); imageLoc = "fireball-blue.png"; - damage = 70; - maxAge = 15; + damage = 49; + maxAge = 40; + speed = 3; } } diff --git a/FPurple.java b/FPurple.java index 3fae1cf..aa3a3a8 100644 --- a/FPurple.java +++ b/FPurple.java @@ -8,7 +8,8 @@ public class FPurple extends Fireball public FPurple(float direction){ super(direction); imageLoc = "fireball-purple.png"; - damage=90; - maxAge=100; + damage=49; + maxAge=25; + speed=5; } } diff --git a/FRed.java b/FRed.java index a4238da..bed2a6c 100644 --- a/FRed.java +++ b/FRed.java @@ -8,7 +8,7 @@ public class FRed extends Fireball public FRed(float direction){ super(direction); imageLoc = "fireball.png"; - damage = 40; + damage = 70; maxAge = 90; } } diff --git a/Monster1.java b/Monster1.java index c9e9e5e..a64bb25 100644 --- a/Monster1.java +++ b/Monster1.java @@ -7,11 +7,11 @@ public class Monster1 extends Monster { public Monster1(){ imageLoc = "monster-brown.png"; // choose image - health=300; + health=100; damage=10; - dropTime = 75; + dropTime = 150; angularSpeed = 2; - speed = (float)0.1; + speed = (float)0.05; range = 8; } diff --git a/Monster2.java b/Monster2.java index dbe3218..32c5077 100644 --- a/Monster2.java +++ b/Monster2.java @@ -6,7 +6,7 @@ public class Monster2 extends Monster { public Monster2(){ - health=300; + health=100; damage=1; speed=(float)0.8; angularSpeed=6; diff --git a/Player.java b/Player.java index c0a230c..0f21b00 100644 --- a/Player.java +++ b/Player.java @@ -11,7 +11,7 @@ public Player(){ damage=5; space=false; dropTime = 50; - speed=1; + speed=2; angularSpeed=3; imageLoc = "player.png"; // choose image visibleAlways = true; //players are visible by default diff --git a/Welt.txt b/Welt.txt index 05bbb34..ae566fe 100644 --- a/Welt.txt +++ b/Welt.txt @@ -6,13 +6,13 @@ ooooooooo++++++++----++------+ ooooooooo+-----------++---x--+ ooooooooo+----------c+++++++++ -ooooooooo+#+++++++++#+ -oooooo++++#++++oooo+#+++++++ -oooooo+-------+oooo+-------+ -oooooo+-------+oooo+---x---+ -oooooo+-------+oooo+++++++++ -oooooo+---b---+ -oooooo+-------+ -oooooo+-------+ -oooooo+-------+ -oooooo+++++++++ +ooooooooo+-+++++++++#+ +++++++++++-++++oooo+#+++++++ ++--------+----+oooo+-------+ ++--------++++-+oooo+---x---+ ++-------------+oooo+++++++++ ++---b---------+ ++-------------+ ++-------------+ ++-------------+ ++++++++++++++++