From 4e745511daa13f47b6474b25d3a4bd1b0759b43d Mon Sep 17 00:00:00 2001
From: Jan Ehehalt <GammelJAN>
Date: Thu, 2 Jul 2020 11:37:15 +0200
Subject: [PATCH] lol

---
 core/src/com/dungeoncrawler/control/Controller.java           | 1 +
 core/src/com/dungeoncrawler/model/entities/Archer.java        | 2 +-
 core/src/com/dungeoncrawler/model/entities/Darkarcher.java    | 2 +-
 core/src/com/dungeoncrawler/model/entities/Darkswordsman.java | 2 +-
 core/src/com/dungeoncrawler/model/entities/Darkwizard.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/Fireswordsman.java | 2 +-
 core/src/com/dungeoncrawler/model/entities/Firewizard.java    | 2 +-
 core/src/com/dungeoncrawler/model/entities/Healwizard.java    | 2 +-
 core/src/com/dungeoncrawler/model/entities/Icearcher.java     | 2 +-
 core/src/com/dungeoncrawler/model/entities/Iceswordsman.java  | 2 +-
 core/src/com/dungeoncrawler/model/entities/Icewizard.java     | 2 +-
 core/src/com/dungeoncrawler/model/entities/Naturewizard.java  | 2 +-
 core/src/com/dungeoncrawler/model/entities/Swordsman.java     | 2 +-
 core/src/com/dungeoncrawler/model/entities/Waterwizard.java   | 2 +-
 core/src/com/dungeoncrawler/model/entities/Wizard.java        | 2 +-
 17 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 7f07f46..c953a2b 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -296,6 +296,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
 
                             if(delete || d.getCurrentEntities()[i].isToDelete()){
                                 if(d.getCurrentEntities()[i].getType()== 2){
+                                    d.getPlayer().addExp(d.getCurrentEntities()[i].getExp());
                                     d.getCurrentEntities()[i] = null;
                                     gs.deleteEntitySprite(i);
                                 }
diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java
index fb22883..b069fab 100644
--- a/core/src/com/dungeoncrawler/model/entities/Archer.java
+++ b/core/src/com/dungeoncrawler/model/entities/Archer.java
@@ -19,7 +19,7 @@ public class Archer extends Entity{
         this.dmg = 5*lvl;
         this.id = 0;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 70;
         maxRange = 210;
         attackSpeed = 70;
diff --git a/core/src/com/dungeoncrawler/model/entities/Darkarcher.java b/core/src/com/dungeoncrawler/model/entities/Darkarcher.java
index 3436d7a..7fde455 100644
--- a/core/src/com/dungeoncrawler/model/entities/Darkarcher.java
+++ b/core/src/com/dungeoncrawler/model/entities/Darkarcher.java
@@ -19,7 +19,7 @@ public class Darkarcher extends Entity{
         this.dmg = 7*lvl;
         this.id = 27;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 80;
         maxRange = 240;
         attackSpeed = 100;
diff --git a/core/src/com/dungeoncrawler/model/entities/Darkswordsman.java b/core/src/com/dungeoncrawler/model/entities/Darkswordsman.java
index dc5a924..0d7cdda 100644
--- a/core/src/com/dungeoncrawler/model/entities/Darkswordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Darkswordsman.java
@@ -13,7 +13,7 @@ public class Darkswordsman extends Entity {
         this.direction = 1;
         this.dmg = 12*lvl;
         this.id = 26;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         this.type = 0;
         
         // TODO: Sinnvolle Werte finden
diff --git a/core/src/com/dungeoncrawler/model/entities/Darkwizard.java b/core/src/com/dungeoncrawler/model/entities/Darkwizard.java
index be26dc5..60383ac 100644
--- a/core/src/com/dungeoncrawler/model/entities/Darkwizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Darkwizard.java
@@ -28,7 +28,7 @@ public class Darkwizard extends Entity{
         this.dmg = 10*lvl;
         this.id = 24;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 140;
         maxRange = 170;
         attackSpeed = 70; // higher = slower
diff --git a/core/src/com/dungeoncrawler/model/entities/Earthwizard.java b/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
index 06e95d1..3985cce 100644
--- a/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Earthwizard.java
@@ -28,7 +28,7 @@ public class Earthwizard extends Entity{
         this.dmg = 8*lvl;
         this.id = 8;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 60;
         maxRange = 150;
         attackSpeed = 80;
diff --git a/core/src/com/dungeoncrawler/model/entities/Firearcher.java b/core/src/com/dungeoncrawler/model/entities/Firearcher.java
index 1c073e4..1173eb9 100644
--- a/core/src/com/dungeoncrawler/model/entities/Firearcher.java
+++ b/core/src/com/dungeoncrawler/model/entities/Firearcher.java
@@ -19,7 +19,7 @@ public class Firearcher extends Entity{
         this.dmg = 8*lvl;
         this.id = 13;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 60;
         maxRange = 200;
         attackSpeed = 55;
diff --git a/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java b/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java
index 26c1be3..10261c8 100644
--- a/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Fireswordsman.java
@@ -14,7 +14,7 @@ public class Fireswordsman extends Entity {
         this.dmg = 15*lvl;
         this.id = 10;
         this.type = 0;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         
         // TODO: Sinnvolle Werte finden
         direction = 2;
diff --git a/core/src/com/dungeoncrawler/model/entities/Firewizard.java b/core/src/com/dungeoncrawler/model/entities/Firewizard.java
index d563f92..e55cac5 100644
--- a/core/src/com/dungeoncrawler/model/entities/Firewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Firewizard.java
@@ -28,7 +28,7 @@ public class Firewizard extends Entity{
         this.dmg = 9*lvl;
         this.id = 6;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 50;
         maxRange = 130;
         attackSpeed = 60;
diff --git a/core/src/com/dungeoncrawler/model/entities/Healwizard.java b/core/src/com/dungeoncrawler/model/entities/Healwizard.java
index 2f5590e..18d44c4 100644
--- a/core/src/com/dungeoncrawler/model/entities/Healwizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Healwizard.java
@@ -28,7 +28,7 @@ public class Healwizard extends Entity{
         this.dmg = 12*lvl;
         this.id = 20;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 64;
         maxRange = 124;
         attackSpeed = 60;
diff --git a/core/src/com/dungeoncrawler/model/entities/Icearcher.java b/core/src/com/dungeoncrawler/model/entities/Icearcher.java
index 74e04b8..aea4378 100644
--- a/core/src/com/dungeoncrawler/model/entities/Icearcher.java
+++ b/core/src/com/dungeoncrawler/model/entities/Icearcher.java
@@ -19,7 +19,7 @@ public class Icearcher extends Entity{
         this.dmg = 7*lvl;
         this.id = 11;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 80;
         maxRange = 240;
         attackSpeed = 100;
diff --git a/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java b/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java
index 5e24f27..67143c3 100644
--- a/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Iceswordsman.java
@@ -14,7 +14,7 @@ public class Iceswordsman extends Entity {
         this.dmg = 14*lvl;
         this.id = 15;
         this.type = 0;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         
         // TODO: Sinnvolle Werte finden
         direction = 2;
diff --git a/core/src/com/dungeoncrawler/model/entities/Icewizard.java b/core/src/com/dungeoncrawler/model/entities/Icewizard.java
index d7da874..25a32db 100644
--- a/core/src/com/dungeoncrawler/model/entities/Icewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Icewizard.java
@@ -28,7 +28,7 @@ public class Icewizard extends Entity{
         this.dmg = 10*lvl;
         this.id = 16;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 70;
         maxRange = 190;
         attackSpeed = 80;
diff --git a/core/src/com/dungeoncrawler/model/entities/Naturewizard.java b/core/src/com/dungeoncrawler/model/entities/Naturewizard.java
index 4a9acb5..ad40a74 100644
--- a/core/src/com/dungeoncrawler/model/entities/Naturewizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Naturewizard.java
@@ -28,7 +28,7 @@ public class Naturewizard extends Entity{
         this.dmg = 8*lvl;
         this.id = 22;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 60;
         maxRange = 150;
         attackSpeed = 80;
diff --git a/core/src/com/dungeoncrawler/model/entities/Swordsman.java b/core/src/com/dungeoncrawler/model/entities/Swordsman.java
index bf19e43..0a53db9 100644
--- a/core/src/com/dungeoncrawler/model/entities/Swordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Swordsman.java
@@ -14,7 +14,7 @@ public class Swordsman extends Entity {
         this.dmg = 12*lvl;
         this.id = 1;
         this.type = 0;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         
         // TODO: Sinnvolle Werte finden
         direction = 2;
diff --git a/core/src/com/dungeoncrawler/model/entities/Waterwizard.java b/core/src/com/dungeoncrawler/model/entities/Waterwizard.java
index eac4d58..1a47d34 100644
--- a/core/src/com/dungeoncrawler/model/entities/Waterwizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Waterwizard.java
@@ -28,7 +28,7 @@ public class Waterwizard extends Entity{
         this.dmg = 12*lvl;
         this.id = 18;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 65;
         maxRange = 130;
         attackSpeed = 50;
diff --git a/core/src/com/dungeoncrawler/model/entities/Wizard.java b/core/src/com/dungeoncrawler/model/entities/Wizard.java
index 58769f4..764edd8 100644
--- a/core/src/com/dungeoncrawler/model/entities/Wizard.java
+++ b/core/src/com/dungeoncrawler/model/entities/Wizard.java
@@ -28,7 +28,7 @@ public class Wizard extends Entity{
         this.dmg = 10*lvl;
         this.id = 3;
         this.type = 1;
-        this.exp = lvl * 5;
+        this.exp = (lvl+1) * 5;
         minRange = 140;
         maxRange = 170;
         attackSpeed = 70; // higher = slower