From c2e49d22f2c445c92ca6ce8a5586ad2d8d27dbc7 Mon Sep 17 00:00:00 2001
From: Kilian Dumsky <kiliandumsky@MacBookPro.local>
Date: Mon, 25 May 2020 10:17:11 +0200
Subject: [PATCH 1/3] Ich bin zu dumm Git zu benutzen

---
 core/src/com/dungeoncrawler/model/entities/Archer.java      | 4 ++--
 core/src/com/dungeoncrawler/model/entities/Earthwizard.java | 6 +++---
 core/src/com/dungeoncrawler/model/entities/Firearcher.java  | 6 +++---
 .../com/dungeoncrawler/model/entities/Fireswordsman.java    | 4 ++--
 core/src/com/dungeoncrawler/model/entities/Firewizard.java  | 4 ++--
 core/src/com/dungeoncrawler/model/entities/Icearcher.java   | 4 ++--
 .../src/com/dungeoncrawler/model/entities/Iceswordsman.java | 4 ++--
 core/src/com/dungeoncrawler/model/entities/Icewizard.java   | 2 +-
 core/src/com/dungeoncrawler/model/entities/Swordsman.java   | 2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java
index b169d3a..8c0b24d 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 = 7*lvl;
+        this.dmg = 6*lvl;
         this.id = 0;
         this.type = 1;
         minRange = 64;
         maxRange = 184;
-        attackSpeed = 30;
+        attackSpeed = 20;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Earthwizard.java b/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
index 29c5e3f..d9b7602 100644
--- a/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
@@ -22,15 +22,15 @@ public class Earthwizard extends Entity{
     public Earthwizard(float xPos, float yPos, int lvl) {
         super(xPos, yPos, lvl);
         
-        this.maxhp = 80*lvl;
+        this.maxhp = 75*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 12*lvl;
+        this.dmg = 10*lvl;
         this.id = 8;
         this.type = 1;
         minRange = 84;
         maxRange = 144;
-        attackSpeed = 50;
+        attackSpeed = 45;
         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 d6ac9a8..125deae 100644
--- a/core/src/com/dungeoncrawler/model/entities/Firearcher.java
+++ b/core/src/com/dungeoncrawler/model/entities/Firearcher.java
@@ -13,15 +13,15 @@ public class Firearcher extends Entity{
     public Firearcher(float xPos, float yPos, int lvl) {
         super(xPos, yPos, lvl);
         
-        this.maxhp = 85*lvl;
+        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 = 84;
         maxRange = 184;
-        attackSpeed = 40;
+        attackSpeed = 30;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java b/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java
index 14b6b36..23273bd 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 = 130*lvl;
+        this.maxhp = 120*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 20*lvl;
+        this.dmg = 18*lvl;
         this.id = 10;
         this.type = 0;
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Firewizard.java b/core/src/com/dungeoncrawler/model/entities/Firewizard.java
index 8b433c6..793d637 100644
--- a/core/src/com/dungeoncrawler/model/entities/Firewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Firewizard.java
@@ -22,10 +22,10 @@ public class Firewizard extends Entity{
     public Firewizard(float xPos, float yPos, int lvl) {
         super(xPos, yPos, lvl);
         
-        this.maxhp = 80*lvl;
+        this.maxhp = 75*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 12*lvl;
+        this.dmg = 10*lvl;
         this.id = 6;
         this.type = 1;
         minRange = 64;
diff --git a/core/src/com/dungeoncrawler/model/entities/Icearcher.java b/core/src/com/dungeoncrawler/model/entities/Icearcher.java
index af5461f..64c8165 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 = 12*lvl;
+        this.dmg = 10*lvl;
         this.id = 11;
         this.type = 1;
         minRange = 64;
         maxRange = 184;
-        attackSpeed = 50;
+        attackSpeed = 40;
         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 28bfad3..c77a63b 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 = 130*lvl;
+        this.maxhp = 120*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 20*lvl;
+        this.dmg = 18*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 4caed07..45c3f8f 100644
--- a/core/src/com/dungeoncrawler/model/entities/Icewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Icewizard.java
@@ -25,7 +25,7 @@ public class Icewizard extends Entity{
         this.maxhp = 80*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 12*lvl;
+        this.dmg = 10*lvl;
         this.id = 16;
         this.type = 1;
         minRange = 64;
diff --git a/core/src/com/dungeoncrawler/model/entities/Swordsman.java b/core/src/com/dungeoncrawler/model/entities/Swordsman.java
index 52f738d..6453c66 100644
--- a/core/src/com/dungeoncrawler/model/entities/Swordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Swordsman.java
@@ -11,7 +11,7 @@ public class Swordsman extends Entity {
         this.maxhp = 100*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 17*lvl;
+        this.dmg = 16*lvl;
         this.id = 1;
         this.type = 0;
         

From 78dfb62f642f7e3c588ec11b9afa01f208bf432e Mon Sep 17 00:00:00 2001
From: Kilian Dumsky <kiliandumsky@MacBookPro.local>
Date: Mon, 25 May 2020 10:25:43 +0200
Subject: [PATCH 2/3] Ich bin zu dumm Git zu benutzen

---
 core/src/com/dungeoncrawler/model/entities/Archer.java      | 2 +-
 core/src/com/dungeoncrawler/model/entities/Earthwizard.java | 2 +-
 core/src/com/dungeoncrawler/model/entities/Firearcher.java  | 2 +-
 core/src/com/dungeoncrawler/model/entities/Firewizard.java  | 2 +-
 core/src/com/dungeoncrawler/model/entities/Icearcher.java   | 2 +-
 core/src/com/dungeoncrawler/model/entities/Icewizard.java   | 2 +-
 core/src/com/dungeoncrawler/model/entities/Wizard.java      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java
index 8c0b24d..7e3589c 100644
--- a/core/src/com/dungeoncrawler/model/entities/Archer.java
+++ b/core/src/com/dungeoncrawler/model/entities/Archer.java
@@ -21,7 +21,7 @@ public class Archer extends Entity{
         this.type = 1;
         minRange = 64;
         maxRange = 184;
-        attackSpeed = 20;
+        attackSpeed = 45;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Earthwizard.java b/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
index d9b7602..af33114 100644
--- a/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
@@ -30,7 +30,7 @@ public class Earthwizard extends Entity{
         this.type = 1;
         minRange = 84;
         maxRange = 144;
-        attackSpeed = 45;
+        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 125deae..eaf28b1 100644
--- a/core/src/com/dungeoncrawler/model/entities/Firearcher.java
+++ b/core/src/com/dungeoncrawler/model/entities/Firearcher.java
@@ -21,7 +21,7 @@ public class Firearcher extends Entity{
         this.type = 1;
         minRange = 84;
         maxRange = 184;
-        attackSpeed = 30;
+        attackSpeed = 45;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Firewizard.java b/core/src/com/dungeoncrawler/model/entities/Firewizard.java
index 793d637..58f9282 100644
--- a/core/src/com/dungeoncrawler/model/entities/Firewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Firewizard.java
@@ -30,7 +30,7 @@ public class Firewizard extends Entity{
         this.type = 1;
         minRange = 64;
         maxRange = 124;
-        attackSpeed = 60;
+        attackSpeed = 70;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Icearcher.java b/core/src/com/dungeoncrawler/model/entities/Icearcher.java
index 64c8165..ced610e 100644
--- a/core/src/com/dungeoncrawler/model/entities/Icearcher.java
+++ b/core/src/com/dungeoncrawler/model/entities/Icearcher.java
@@ -21,7 +21,7 @@ public class Icearcher extends Entity{
         this.type = 1;
         minRange = 64;
         maxRange = 184;
-        attackSpeed = 40;
+        attackSpeed = 45;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Icewizard.java b/core/src/com/dungeoncrawler/model/entities/Icewizard.java
index 45c3f8f..43a3953 100644
--- a/core/src/com/dungeoncrawler/model/entities/Icewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Icewizard.java
@@ -30,7 +30,7 @@ public class Icewizard extends Entity{
         this.type = 1;
         minRange = 64;
         maxRange = 124;
-        attackSpeed = 60;
+        attackSpeed = 70;
         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 1a0060d..494b9a6 100644
--- a/core/src/com/dungeoncrawler/model/entities/Wizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Wizard.java
@@ -30,7 +30,7 @@ public class Wizard extends Entity{
         this.type = 1;
         minRange = 144;
         maxRange = 164;
-        attackSpeed = 60; // higher = slower
+        attackSpeed = 70; // higher = slower
         counter = 0;
         // TODO: Sinnvolle Werte finden
         

From e194ed5fc4ed3f179be6350e458778b89da63256 Mon Sep 17 00:00:00 2001
From: Kilian Dumsky <kiliandumsky@MacBookPro.fritz.box>
Date: Mon, 25 May 2020 21:23:32 +0200
Subject: [PATCH 3/3] Ich bin zu dumm Git zu benutzen

---
 core/src/com/dungeoncrawler/model/entities/Archer.java    | 6 +++---
 .../com/dungeoncrawler/model/entities/Earthwizard.java    | 8 ++++----
 .../src/com/dungeoncrawler/model/entities/Firearcher.java | 8 ++++----
 .../com/dungeoncrawler/model/entities/Fireswordsman.java  | 6 +++---
 .../src/com/dungeoncrawler/model/entities/Firewizard.java | 8 ++++----
 core/src/com/dungeoncrawler/model/entities/Icearcher.java | 8 ++++----
 .../com/dungeoncrawler/model/entities/Iceswordsman.java   | 4 ++--
 core/src/com/dungeoncrawler/model/entities/Icewizard.java | 6 +++---
 core/src/com/dungeoncrawler/model/entities/Swordsman.java | 8 ++++----
 core/src/com/dungeoncrawler/model/entities/Wizard.java    | 2 +-
 10 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java
index 7e3589c..20996a1 100644
--- a/core/src/com/dungeoncrawler/model/entities/Archer.java
+++ b/core/src/com/dungeoncrawler/model/entities/Archer.java
@@ -19,9 +19,9 @@ public class Archer extends Entity{
         this.dmg = 6*lvl;
         this.id = 0;
         this.type = 1;
-        minRange = 64;
-        maxRange = 184;
-        attackSpeed = 45;
+        minRange = 70;
+        maxRange = 210;
+        attackSpeed = 65;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Earthwizard.java b/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
index af33114..8a04216 100644
--- a/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
@@ -25,12 +25,12 @@ public class Earthwizard extends Entity{
         this.maxhp = 75*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 10*lvl;
+        this.dmg = 8*lvl;
         this.id = 8;
         this.type = 1;
-        minRange = 84;
-        maxRange = 144;
-        attackSpeed = 70;
+        minRange = 60;
+        maxRange = 150;
+        attackSpeed = 80;
         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 eaf28b1..d3070f3 100644
--- a/core/src/com/dungeoncrawler/model/entities/Firearcher.java
+++ b/core/src/com/dungeoncrawler/model/entities/Firearcher.java
@@ -16,12 +16,12 @@ public class Firearcher extends Entity{
         this.maxhp = 80*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 8*lvl;
+        this.dmg = 9*lvl;
         this.id = 13;
         this.type = 1;
-        minRange = 84;
-        maxRange = 184;
-        attackSpeed = 45;
+        minRange = 65;
+        maxRange = 200;
+        attackSpeed = 55;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java b/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java
index 23273bd..0ed9400 100644
--- a/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java
@@ -11,7 +11,7 @@ public class Fireswordsman extends Entity {
         this.maxhp = 120*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 18*lvl;
+        this.dmg = 17*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) (3 * Math.cos(alpha));
-            movementY = (int) (3 * Math.sin(alpha));
+            movementX = (int) (4 * Math.cos(alpha));
+            movementY = (int) (4 * Math.sin(alpha));
 
             xPos += movementX;
             yPos += movementY;
diff --git a/core/src/com/dungeoncrawler/model/entities/Firewizard.java b/core/src/com/dungeoncrawler/model/entities/Firewizard.java
index 58f9282..d6e15d2 100644
--- a/core/src/com/dungeoncrawler/model/entities/Firewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Firewizard.java
@@ -25,12 +25,12 @@ public class Firewizard extends Entity{
         this.maxhp = 75*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 10*lvl;
+        this.dmg = 9*lvl;
         this.id = 6;
         this.type = 1;
-        minRange = 64;
-        maxRange = 124;
-        attackSpeed = 70;
+        minRange = 50;
+        maxRange = 130;
+        attackSpeed = 60;
         counter = 0;
         // TODO: Sinnvolle Werte finden
         
diff --git a/core/src/com/dungeoncrawler/model/entities/Icearcher.java b/core/src/com/dungeoncrawler/model/entities/Icearcher.java
index ced610e..41e43b1 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 = 10*lvl;
+        this.dmg = 8*lvl;
         this.id = 11;
         this.type = 1;
-        minRange = 64;
-        maxRange = 184;
-        attackSpeed = 45;
+        minRange = 70;
+        maxRange = 230;
+        attackSpeed = 75;
         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 c77a63b..d224a1e 100644
--- a/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java
@@ -24,8 +24,8 @@ public class Iceswordsman extends Entity {
         if(!isToDelete()){
             double alpha = StaticMath.calculateAngle((int) this.xPos, (int) this.yPos, xPosPlayer, yPosPlayer);
 
-            movementX = (int) (3 * Math.cos(alpha));
-            movementY = (int) (3 * Math.sin(alpha));
+            movementX = (int) (4 * Math.cos(alpha));
+            movementY = (int) (4 * Math.sin(alpha));
 
             xPos += movementX;
             yPos += movementY;
diff --git a/core/src/com/dungeoncrawler/model/entities/Icewizard.java b/core/src/com/dungeoncrawler/model/entities/Icewizard.java
index 43a3953..f97f231 100644
--- a/core/src/com/dungeoncrawler/model/entities/Icewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Icewizard.java
@@ -28,9 +28,9 @@ public class Icewizard extends Entity{
         this.dmg = 10*lvl;
         this.id = 16;
         this.type = 1;
-        minRange = 64;
-        maxRange = 124;
-        attackSpeed = 70;
+        minRange = 70;
+        maxRange = 170;
+        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 6453c66..c30a71a 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 = 100*lvl;
+        this.maxhp = 110*lvl;
         this.hp = this.maxhp;
         this.direction = 1;
-        this.dmg = 16*lvl;
+        this.dmg = 15*lvl;
         this.id = 1;
         this.type = 0;
         
@@ -24,8 +24,8 @@ public class Swordsman extends Entity {
         if(!isToDelete()){
             double alpha = StaticMath.calculateAngle((int) this.xPos, (int) this.yPos, xPosPlayer, yPosPlayer);
 
-            movementX = (int) (3 * Math.cos(alpha));
-            movementY = (int) (3 * Math.sin(alpha));
+            movementX = (int) (4 * Math.cos(alpha));
+            movementY = (int) (4 * Math.sin(alpha));
 
             xPos += movementX;
             yPos += movementY;
diff --git a/core/src/com/dungeoncrawler/model/entities/Wizard.java b/core/src/com/dungeoncrawler/model/entities/Wizard.java
index 494b9a6..86d70f3 100644
--- a/core/src/com/dungeoncrawler/model/entities/Wizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Wizard.java
@@ -30,7 +30,7 @@ public class Wizard extends Entity{
         this.type = 1;
         minRange = 144;
         maxRange = 164;
-        attackSpeed = 70; // higher = slower
+        attackSpeed = 75; // higher = slower
         counter = 0;
         // TODO: Sinnvolle Werte finden