diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java index 20996a1..000acfe 100644 --- a/core/src/com/dungeoncrawler/model/entities/Archer.java +++ b/core/src/com/dungeoncrawler/model/entities/Archer.java @@ -16,12 +16,12 @@ public class Archer extends Entity{ this.maxhp = 75*lvl; this.hp = this.maxhp; this.direction = 1; - this.dmg = 6*lvl; + this.dmg = 5*lvl; this.id = 0; this.type = 1; minRange = 70; maxRange = 210; - attackSpeed = 65; + attackSpeed = 70; counter = 0; // TODO: Sinnvolle Werte finden diff --git a/core/src/com/dungeoncrawler/model/entities/Firearcher.java b/core/src/com/dungeoncrawler/model/entities/Firearcher.java index d3070f3..bef2554 100644 --- a/core/src/com/dungeoncrawler/model/entities/Firearcher.java +++ b/core/src/com/dungeoncrawler/model/entities/Firearcher.java @@ -16,10 +16,10 @@ public class Firearcher extends Entity{ this.maxhp = 80*lvl; this.hp = this.maxhp; this.direction = 1; - this.dmg = 9*lvl; + this.dmg = 8*lvl; this.id = 13; this.type = 1; - minRange = 65; + minRange = 60; maxRange = 200; attackSpeed = 55; counter = 0; diff --git a/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java b/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java index 0ed9400..3025fe1 100644 --- a/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java +++ b/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java @@ -8,10 +8,10 @@ public class Fireswordsman extends Entity { public Fireswordsman(float xPos, float yPos, int lvl) { super(xPos, yPos, lvl); - this.maxhp = 120*lvl; + this.maxhp = 100*lvl; this.hp = this.maxhp; this.direction = 1; - this.dmg = 17*lvl; + this.dmg = 15*lvl; this.id = 10; this.type = 0; @@ -24,8 +24,8 @@ public class Fireswordsman extends Entity { if(!isToDelete()){ double alpha = StaticMath.calculateAngle((int) this.xPos, (int) this.yPos, xPosPlayer, yPosPlayer); - movementX = (int) (4 * Math.cos(alpha)); - movementY = (int) (4 * Math.sin(alpha)); + movementX = (int) (5 * Math.cos(alpha)); + movementY = (int) (5 * Math.sin(alpha)); xPos += movementX; yPos += movementY; diff --git a/core/src/com/dungeoncrawler/model/entities/Icearcher.java b/core/src/com/dungeoncrawler/model/entities/Icearcher.java index 41e43b1..facbb9c 100644 --- a/core/src/com/dungeoncrawler/model/entities/Icearcher.java +++ b/core/src/com/dungeoncrawler/model/entities/Icearcher.java @@ -16,12 +16,12 @@ public class Icearcher extends Entity{ this.maxhp = 100*lvl; this.hp = this.maxhp; this.direction = 1; - this.dmg = 8*lvl; + this.dmg = 7*lvl; this.id = 11; this.type = 1; - minRange = 70; - maxRange = 230; - attackSpeed = 75; + minRange = 80; + maxRange = 240; + attackSpeed = 100; counter = 0; // TODO: Sinnvolle Werte finden diff --git a/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java b/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java index d224a1e..9a7df54 100644 --- a/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java +++ b/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java @@ -8,10 +8,10 @@ public class Iceswordsman extends Entity { public Iceswordsman(float xPos, float yPos, int lvl) { super(xPos, yPos, lvl); - this.maxhp = 120*lvl; + this.maxhp = 130*lvl; this.hp = this.maxhp; this.direction = 1; - this.dmg = 18*lvl; + this.dmg = 14*lvl; this.id = 15; this.type = 0; diff --git a/core/src/com/dungeoncrawler/model/entities/Icewizard.java b/core/src/com/dungeoncrawler/model/entities/Icewizard.java index f97f231..ec49a02 100644 --- a/core/src/com/dungeoncrawler/model/entities/Icewizard.java +++ b/core/src/com/dungeoncrawler/model/entities/Icewizard.java @@ -29,7 +29,7 @@ public class Icewizard extends Entity{ this.id = 16; this.type = 1; minRange = 70; - maxRange = 170; + maxRange = 190; attackSpeed = 80; counter = 0; // TODO: Sinnvolle Werte finden diff --git a/core/src/com/dungeoncrawler/model/entities/Swordsman.java b/core/src/com/dungeoncrawler/model/entities/Swordsman.java index c30a71a..b92d74b 100644 --- a/core/src/com/dungeoncrawler/model/entities/Swordsman.java +++ b/core/src/com/dungeoncrawler/model/entities/Swordsman.java @@ -8,10 +8,10 @@ public class Swordsman extends Entity { public Swordsman(float xPos, float yPos, int lvl) { super(xPos, yPos, lvl); - this.maxhp = 110*lvl; + this.maxhp = 120*lvl; this.hp = this.maxhp; this.direction = 1; - this.dmg = 15*lvl; + this.dmg = 12*lvl; this.id = 1; this.type = 0; diff --git a/core/src/com/dungeoncrawler/model/entities/Waterwizard.java b/core/src/com/dungeoncrawler/model/entities/Waterwizard.java index ca579ce..9326876 100644 --- a/core/src/com/dungeoncrawler/model/entities/Waterwizard.java +++ b/core/src/com/dungeoncrawler/model/entities/Waterwizard.java @@ -28,9 +28,9 @@ public class Waterwizard extends Entity{ this.dmg = 12*lvl; this.id = 18; this.type = 1; - minRange = 64; - maxRange = 124; - attackSpeed = 60; + minRange = 65; + maxRange = 130; + attackSpeed = 50; counter = 0; // TODO: Sinnvolle Werte finden diff --git a/core/src/com/dungeoncrawler/model/entities/Wizard.java b/core/src/com/dungeoncrawler/model/entities/Wizard.java index 86d70f3..08135fd 100644 --- a/core/src/com/dungeoncrawler/model/entities/Wizard.java +++ b/core/src/com/dungeoncrawler/model/entities/Wizard.java @@ -28,9 +28,9 @@ public class Wizard extends Entity{ this.dmg = 10*lvl; this.id = 3; this.type = 1; - minRange = 144; - maxRange = 164; - attackSpeed = 75; // higher = slower + minRange = 140; + maxRange = 170; + attackSpeed = 70; // higher = slower counter = 0; // TODO: Sinnvolle Werte finden diff --git a/core/src/com/dungeoncrawler/model/items/Amulet.java b/core/src/com/dungeoncrawler/model/items/Amulet.java index 9d1fbec..ca9eede 100644 --- a/core/src/com/dungeoncrawler/model/items/Amulet.java +++ b/core/src/com/dungeoncrawler/model/items/Amulet.java @@ -15,7 +15,7 @@ public class Amulet extends Item { public Amulet(int lvl) { super(lvl); - this.dmg = 10 * lvl; + this.dmg = 8 * lvl; this.heal = 0 * lvl; this.id = 2; } diff --git a/core/src/com/dungeoncrawler/model/items/Potion.java b/core/src/com/dungeoncrawler/model/items/Potion.java index 8567011..e933d1b 100644 --- a/core/src/com/dungeoncrawler/model/items/Potion.java +++ b/core/src/com/dungeoncrawler/model/items/Potion.java @@ -15,7 +15,7 @@ public class Potion extends Item { public Potion(int lvl) { super(lvl); - this.heal = lvl * 40; + this.heal = lvl * 25; this.dmg = 0; this.id = 1; }