Skip to content

Commit ff2a798

Browse files
committed
fix Chain Lightning
1 parent 079034d commit ff2a798

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

src/main/java/stsjorbsmod/actions/ChainLightningAction.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,25 @@ public ChainLightningAction(AbstractCreature owner, AbstractMonster initialTarge
2929
}
3030

3131
public void update() {
32-
ArrayList<AbstractMonster> remainingTargets = (ArrayList<AbstractMonster>) allTargets.clone();
32+
ArrayList<AbstractMonster> remainingTargets = new ArrayList<>(allTargets);
3333
int nextTargetIndex = remainingTargets.indexOf(initialTarget);
3434
int currentDamage = this.damage;
3535

36-
do {
36+
while(true) {
3737
AbstractMonster nextTarget = remainingTargets.remove(nextTargetIndex);
3838

3939
if (!nextTarget.halfDead && !nextTarget.isDying && !nextTarget.isEscaping) {
40-
AbstractDungeon.actionManager.addToTop(
40+
AbstractDungeon.actionManager.addToBottom(
4141
new DamageAction(nextTarget, new DamageInfo(owner, currentDamage, DamageInfo.DamageType.NORMAL), this.attackEffect));
4242
currentDamage += this.extraDamagePerHop;
4343
}
4444

45+
if (remainingTargets.isEmpty()) {
46+
break;
47+
}
48+
4549
nextTargetIndex = AbstractDungeon.cardRandomRng.random(0, remainingTargets.size() - 1);
46-
} while (!remainingTargets.isEmpty());
50+
}
4751

4852
this.isDone = true;
4953
}

src/main/java/stsjorbsmod/cards/ChainLightning.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package stsjorbsmod.cards;
22

3+
import com.megacrit.cardcrawl.actions.AbstractGameAction;
34
import com.megacrit.cardcrawl.actions.common.ApplyPowerAction;
45
import com.megacrit.cardcrawl.characters.AbstractPlayer;
56
import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
@@ -33,7 +34,8 @@ public ChainLightning() {
3334

3435
@Override
3536
public void use(AbstractPlayer p, AbstractMonster m) {
36-
AbstractDungeon.actionManager.addToBottom(new ChainLightningAction(p, m, AbstractDungeon.getMonsters().monsters, damage, magicNumber));
37+
AbstractDungeon.actionManager.addToBottom(
38+
new ChainLightningAction(p, m, AbstractDungeon.getMonsters().monsters, damage, magicNumber, AbstractGameAction.AttackEffect.SLASH_VERTICAL));
3739
}
3840

3941
@Override

0 commit comments

Comments
 (0)