Nerfed goblins, nerfed Dual the Sol, fixed mana extra queueing

LittleWhole · May 30, 2022 · 31a591d · 31a591d
1 parent 5422088
commit 31a591d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/out/production/Threnody/gamestates/Game.class b/out/production/Threnody/gamestates/Game.class
diff --git a/src/combat/artes/elemental/DualTheSol.java b/src/combat/artes/elemental/DualTheSol.java
@@ -24,8 +24,8 @@ public DualTheSol(Player owner) throws SlickException {
 
     @Override
     public void activation(Unit target) {
-        if (timer == 24) target.takeDamage((int) (owner.calculateDamage(element) * 2.2), element);
-        if (timer == 34 || timer == 44 || timer == 54 || timer == 64) target.takeDamage((int) (owner.calculateDamage(ElementType.FIRE) * 0.3), ElementType.FIRE);
+        if (timer == 24) target.takeDamage((int) (owner.calculateDamage(element) * 1.8), element);
+        if (timer == 34 || timer == 44 || timer == 54 || timer == 64) target.takeDamage((int) (owner.calculateDamage(ElementType.FIRE) * 0.2), ElementType.FIRE);
     }
 
     @Override

diff --git a/src/combat/artes/elemental/RendingGale.java b/src/combat/artes/elemental/RendingGale.java
@@ -25,7 +25,7 @@ public RendingGale(Player owner) throws SlickException {
 
     @Override
     public void activation(Unit target) {
-        if (timer == 40) target.takeDamage((int) (owner.calculateDamage(element) * 1.8), element);
+        if (timer == 40) target.takeDamage((int) (owner.calculateDamage(element) * 2.1), element);
     }
 
     @Override

diff --git a/src/core/Constants.java b/src/core/Constants.java
@@ -2,7 +2,7 @@
 
 public final class Constants {
 
-    public static final String VERSION = "Alpha v0.4.0";
+    public static final String VERSION = "Alpha v0.5.0";
 
     public static final class LevelingConstants {
         public static final int MAX_LEVEL = 100;

diff --git a/src/entities/units/enemy/Enemy.java b/src/entities/units/enemy/Enemy.java
@@ -49,7 +49,7 @@ public EnemyState getCombatState() {
     public Enemy(float x, float y) throws SlickException {//later change parameters to also change size, level, speed, and sprite
         super();
         this.health = 100;
-        this.attack = 20;
+        this.attack = 5;
         this.defense = 10;
         this.critRate = 0.05;
         this.critDamage = 50;

diff --git a/src/entities/units/enemy/Goblin.java b/src/entities/units/enemy/Goblin.java
@@ -2,8 +2,9 @@
 
 import org.newdawn.slick.SlickException;
 
-public class Goblin extends Enemy {
+public class Goblin<T extends Goblin<?>> extends Enemy<T> {
     public Goblin(float x, float y) throws SlickException {
         super(x, y);
+        this.attack = 9;
     }
 }
diff --git a/src/gamestates/Game.java b/src/gamestates/Game.java
@@ -4,6 +4,7 @@
 import entities.core.Coordinate;
 import entities.core.Entity;
 import entities.core.EntityType;
+import entities.units.enemy.Goblin;
 import entities.units.npc.NPC;
 import entities.units.Unit;
 import entities.units.enemy.Enemy;
@@ -221,10 +222,10 @@ public void enter(GameContainer gc, StateBasedGame sbg) throws SlickException {
         plr.resetHitbox();
         //plrTeam.add(plr);
         System.out.println("[VERBOSE] Player initialized");
-        enemy = new Enemy(10, 0);
+        enemy = new Goblin(10, 0);
         enemyTeam.add(enemy);
-        enemyTeam.add(new Enemy(0,0));
-        enemyTeam.add(new Enemy(0,0));
+        enemyTeam.add(new Goblin(0,0));
+        enemyTeam.add(new Goblin(0,0));
         // Initialize Managers
         keyDown = new KeyManager(gc.getInput(), this);
         System.out.println("[VERBOSE] KeyManager initialized");

diff --git a/src/managers/CombatManager.java b/src/managers/CombatManager.java
@@ -36,6 +36,7 @@ public void roundStart() {
             p.setMana(p.getTurnMana() + p.getManaAdd());
             p.setManaAdd(0);
             p.setQueuedManaRemoval(0);
+            p.setQueuedManaExtra(0);
         });
         enemies.forEach(e -> e.setCombatState(Enemy.EnemyState.CHOOSING));
     }