From 54220882422f19092d70bc6e45b02f9e2dc57049 Mon Sep 17 00:00:00 2001
From: Davy Ling <wholelittle@gmail.com>
Date: Mon, 30 May 2022 01:34:26 -0400
Subject: [PATCH] Mana card queueing works + fixed bugs + goblins still OP

---
 .../Threnody/combat/artes/Arte.class          | Bin 7221 -> 7221 bytes
 .../Threnody/entities/units/Unit.class        | Bin 12220 -> 12844 bytes
 .../Threnody/gamestates/BattleState.class     | Bin 10030 -> 10331 bytes
 out/production/Threnody/gamestates/Game.class | Bin 11623 -> 11623 bytes
 src/combat/artes/support/Elixir.java          |   4 +--
 src/combat/artes/support/Mana.java            |  11 +++----
 src/entities/units/Unit.java                  |  25 +++++++++++++++
 src/entities/units/player/Player.java         |   2 +-
 src/gamestates/BattleState.java               |  29 +++++++++++-------
 src/gamestates/Game.java                      |   2 +-
 10 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/out/production/Threnody/combat/artes/Arte.class b/out/production/Threnody/combat/artes/Arte.class
index 19364dd160a73eafce9133c07f2178b7cb447c68..83b404a0fdc97cab078209395c5c2345059ff3f7 100644
GIT binary patch
delta 16
YcmdmLvDIQj85eWs%vqZ&x%LPG06bI%%>V!Z

delta 16
XcmdmLvDIQj85eT`1H<M@u04VPGeHG$

diff --git a/out/production/Threnody/entities/units/Unit.class b/out/production/Threnody/entities/units/Unit.class
index de32e0c6ce637c3c3fc4bb069fc1d2d135957e42..af2930ea64aaff5350509262f82bad0b2eacf048 100644
GIT binary patch
literal 12844
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
OXtlT(zro#4tA7r5SBpUa

literal 12220
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
AMgRZ+

diff --git a/out/production/Threnody/gamestates/BattleState.class b/out/production/Threnody/gamestates/BattleState.class
index 8e2e63978ecfe0443930b5fb693cef604ee48403..425f0b987cb2f09035d554a3dd62abf6faa07042 100644
GIT binary patch
literal 10331
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
KtH?EuCjT!9?D;1E

literal 10030
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
NaGb~E@p*DF?ms#fwJ`ty

diff --git a/out/production/Threnody/gamestates/Game.class b/out/production/Threnody/gamestates/Game.class
index 6e36f116f17d6c703fda4546c097c2ea4461c4fb..2fae54d172abd82e28a950645f2288404666bd65 100644
GIT binary patch
delta 14
VcmaDJ^*m~Wk}{*nW@Tj;E&wj01k?Zk

delta 14
VcmaDJ^*m~Wk}@OLW@Tj;E&wiP1j+ya

diff --git a/src/combat/artes/support/Elixir.java b/src/combat/artes/support/Elixir.java
index 20de5ef..6017bce 100644
--- a/src/combat/artes/support/Elixir.java
+++ b/src/combat/artes/support/Elixir.java
@@ -29,11 +29,11 @@ public void activation(Unit target) {
 
     @Override
     public void queue() {
-        owner.setManaAdd(owner.getManaAdd() + 1);
+        owner.addManaAdd(manaValue);
     }
 
     @Override
     public void unqueue() {
-        owner.setManaAdd(owner.getManaAdd() - 1);
+        owner.addManaAdd(-manaValue);
     }
 }
diff --git a/src/combat/artes/support/Mana.java b/src/combat/artes/support/Mana.java
index a5bc0b0..13ec0dd 100644
--- a/src/combat/artes/support/Mana.java
+++ b/src/combat/artes/support/Mana.java
@@ -12,7 +12,7 @@
 
 @SuppressWarnings({"rawtypes"})
 public class Mana extends Arte<Player> {
-    private final int healingValue = 10;
+    private final int manaValue = 2;
 
     public Mana(Player owner) throws SlickException {
         super(owner);
@@ -20,21 +20,18 @@ public Mana(Player owner) throws SlickException {
         arteType = ArteType.SUPPORT;
         aniType = AnimationType.OWNER;
         cost = 0;
-        castDuration = 75;
     }
 
     @Override
-    public void activation(Unit target) {
-        target.generateMana(healingValue);
-    }
+    public void activation(Unit target) {}
 
     @Override
     public void queue() {
-
+        owner.addQueuedManaExtra(manaValue);
     }
 
     @Override
     public void unqueue() {
-
+        owner.addQueuedManaExtra(-manaValue);
     }
 }
diff --git a/src/entities/units/Unit.java b/src/entities/units/Unit.java
index 473aff5..0a7a318 100644
--- a/src/entities/units/Unit.java
+++ b/src/entities/units/Unit.java
@@ -56,6 +56,7 @@ public Unit() {
         this.mana = 1;
         this.turnMana = 1;
         this.queuedManaRemoval = 0;
+        this.queuedManaExtra = 0;
         this.manaAdd = 0;
         this.level = 1;
         this.health = 1;
@@ -285,6 +286,11 @@ public T setManaAdd(int manaAdd) {
         return (T) this;
     }
 
+    public T addManaAdd(int amt) {
+        this.manaAdd += amt;
+        return (T) this;
+    }
+
     public int getQueuedManaRemoval() {
         return queuedManaRemoval;
     }
@@ -294,6 +300,25 @@ public T setQueuedManaRemoval(int queuedManaRemoval) {
         return (T) this;
     }
 
+    public T addQueuedManaRemoval(int amt) {
+        this.queuedManaRemoval += amt;
+        return (T) this;
+    }
+
+    public int getQueuedManaExtra() {
+        return queuedManaExtra;
+    }
+
+    public T setQueuedManaExtra(int queuedManaExtra) {
+        this.queuedManaExtra = queuedManaExtra;
+        return (T) this;
+    }
+
+    public T addQueuedManaExtra(int amt) {
+        this.queuedManaExtra += amt;
+        return (T) this;
+    }
+
     public int calculateDamage(ElementType element) {
         return attack * (1 + eAffinity.get(element) / 100) * (1 + (Math.random() <= critRate ? critDamage : 0));
     }
diff --git a/src/entities/units/player/Player.java b/src/entities/units/player/Player.java
index fcff67a..19bd72b 100644
--- a/src/entities/units/player/Player.java
+++ b/src/entities/units/player/Player.java
@@ -193,7 +193,7 @@ public Arte<? extends Unit> selection(int i) {
         Arte<? extends Unit> selected = null;
         try {
             selected = arteHand.get(i);
-            if (selected.getCost() > mana - queuedManaRemoval) throw new ThrenodyException("Insufficient mana");
+            if (selected.getCost() > mana + queuedManaExtra - queuedManaRemoval) throw new ThrenodyException("Insufficient mana");
             selected.reset();
             queuedManaRemoval += selected.getCost();
             selected.queue();
diff --git a/src/gamestates/BattleState.java b/src/gamestates/BattleState.java
index 2d7018e..4219b1f 100644
--- a/src/gamestates/BattleState.java
+++ b/src/gamestates/BattleState.java
@@ -53,18 +53,17 @@ public void init(GameContainer gc, StateBasedGame sbg) throws SlickException {
     public void render(GameContainer gc, StateBasedGame sbg, Graphics g) throws SlickException {
         g.setFont(gc.getDefaultFont());
         battlefield.render(1000, -600);
-        for(Player p : plrs) {
-            p.battleRender(g, 0,0);
 
-        }
-        for(int i = enemies.size() - 1; i >= 0; i--) {
+        plrs.forEach(p -> p.battleRender(g, 0,0));
+        for (int i = enemies.size() - 1; i >= 0; i--) {
             enemies.get(i).render(g, 0,0);
         }
-        try {
-            result = combat.combat(g, gc);
-        } catch (InterruptedException | IndexOutOfBoundsException e) {
-            e.printStackTrace();
-        }
+
+        // Render the UI
+        try { renderUI(g); } catch (IndexOutOfBoundsException ignored) {}
+
+        try { result = combat.combat(g, gc); }
+        catch (InterruptedException | IndexOutOfBoundsException e) { e.printStackTrace(); }
 
         switch (result) {
             case WIN -> {
@@ -103,12 +102,20 @@ public void render(GameContainer gc, StateBasedGame sbg, Graphics g) throws Slic
             g.drawString("" + combat.getRound(), 0, 0);
         }
         super.render(gc, sbg, g);
+    }
+
+    private void renderUI(Graphics g) {
         Image mana = ImageManager.getImage("mana").getScaledCopy(2f);
         mana.drawCentered(Main.RESOLUTION_X / 17, Main.RESOLUTION_Y / 20 * 17);
         DrawUtilities.drawStringCentered(g, String.valueOf(plrs.get(turn()).getMana()), Main.fonts.VariableWidth.B60, Main.RESOLUTION_X / 17, Main.RESOLUTION_Y / 20 * 17 + 15);
+        if (plrs.get(turn()).getQueuedManaExtra() > 0) {
+            g.setColor(Color.green);
+            DrawUtilities.drawStringCentered(g, "+" + plrs.get(turn()).getQueuedManaExtra(), Main.fonts.VariableWidth.B60, Main.RESOLUTION_X / 17, Main.RESOLUTION_Y / 20 * 17 - 55);
+            g.setColor(Color.white);
+        }
         if (plrs.get(turn()).getQueuedManaRemoval() > 0) {
             g.setColor(Color.red);
-            DrawUtilities.drawStringCentered(g, String.valueOf(-plrs.get(turn()).getQueuedManaRemoval()), Main.fonts.VariableWidth.B60, Main.RESOLUTION_X / 17, Main.RESOLUTION_Y / 20 * 17 + 70);
+            DrawUtilities.drawStringCentered(g, "-" + plrs.get(turn()).getQueuedManaRemoval(), Main.fonts.VariableWidth.B60, Main.RESOLUTION_X / 17, Main.RESOLUTION_Y / 20 * 17 + 70);
             g.setColor(Color.white);
         }
         if (plrs.get(turn()).getManaAdd() > 0) {
@@ -169,7 +176,7 @@ public void keyPressed(int key, char c) {
     @Override
     public void mousePressed(int button, int x, int y) {
         try { for (var i = 0; i < 6; i++) if (plrs.get(turn()).onCard(gc.getInput(), i)) plrs.get(turn()).getClickArteQueue().offer(plrs.get(turn()).selection(i)); }
-        catch (NullPointerException ignored) {};
+        catch (IndexOutOfBoundsException | NullPointerException ignored) {};
     }
 
     public int turn() {
diff --git a/src/gamestates/Game.java b/src/gamestates/Game.java
index e31a7cf..ccd454f 100644
--- a/src/gamestates/Game.java
+++ b/src/gamestates/Game.java
@@ -98,7 +98,7 @@ public void init(GameContainer gc, StateBasedGame sbg) throws SlickException {
         ));
 
         // Initialize the Player
-        plr = (Player) new Player(plrPosition).setAttack(10);
+        plr = (Player) new Player(plrPosition).setAttack(20);
         plrTeam.add(plr);
         System.out.println("[VERBOSE] Player initialized");
         enemy = new Enemy(10, 0);