fix Chain Lightning

dbjorge · Oct 13, 2019 · ff2a798 · ff2a798
1 parent 079034d
commit ff2a798
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/stsjorbsmod/actions/ChainLightningAction.java b/src/main/java/stsjorbsmod/actions/ChainLightningAction.java
@@ -29,21 +29,25 @@ public ChainLightningAction(AbstractCreature owner, AbstractMonster initialTarge
     }
 
     public void update() {
-        ArrayList<AbstractMonster> remainingTargets = (ArrayList<AbstractMonster>) allTargets.clone();
+        ArrayList<AbstractMonster> remainingTargets = new ArrayList<>(allTargets);
         int nextTargetIndex = remainingTargets.indexOf(initialTarget);
         int currentDamage = this.damage;
 
-        do {
+        while(true) {
             AbstractMonster nextTarget = remainingTargets.remove(nextTargetIndex);
 
             if (!nextTarget.halfDead && !nextTarget.isDying && !nextTarget.isEscaping) {
-                AbstractDungeon.actionManager.addToTop(
+                AbstractDungeon.actionManager.addToBottom(
                         new DamageAction(nextTarget, new DamageInfo(owner, currentDamage, DamageInfo.DamageType.NORMAL), this.attackEffect));
                 currentDamage += this.extraDamagePerHop;
             }
 
+            if (remainingTargets.isEmpty()) {
+                break;
+            }
+
             nextTargetIndex = AbstractDungeon.cardRandomRng.random(0, remainingTargets.size() - 1);
-        } while (!remainingTargets.isEmpty());
+        }
 
         this.isDone = true;
     }

diff --git a/src/main/java/stsjorbsmod/cards/ChainLightning.java b/src/main/java/stsjorbsmod/cards/ChainLightning.java
@@ -1,5 +1,6 @@
 package stsjorbsmod.cards;
 
+import com.megacrit.cardcrawl.actions.AbstractGameAction;
 import com.megacrit.cardcrawl.actions.common.ApplyPowerAction;
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
@@ -33,7 +34,8 @@ public ChainLightning() {
 
     @Override
     public void use(AbstractPlayer p, AbstractMonster m) {
-        AbstractDungeon.actionManager.addToBottom(new ChainLightningAction(p, m, AbstractDungeon.getMonsters().monsters, damage, magicNumber));
+        AbstractDungeon.actionManager.addToBottom(
+                new ChainLightningAction(p, m, AbstractDungeon.getMonsters().monsters, damage, magicNumber, AbstractGameAction.AttackEffect.SLASH_VERTICAL));
     }
 
     @Override