konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.2.0: unaffected arced chars no longer reduce lightning dmg

Browse Source
This commit is contained in:
Evan Debenham
2025-07-24 12:58:09 -04:00
parent 1a4c4ad698
commit 6c4e9b8b05
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java
View File

@@ -71,6 +71,14 @@ public class WandOfLightning extends DamageWand {
@Override @Override
public void onZap(Ballistica bolt) { public void onZap(Ballistica bolt) {
for (Char ch : affected.toArray(new Char[0])){
if (ch != curUser && ch.alignment == curUser.alignment && ch.pos != bolt.collisionPos){
affected.remove(ch);
} else if (ch.buff(LightningCharge.class) != null){
affected.remove(ch);
}
}
//lightning deals less damage per-target, the more targets that are hit. //lightning deals less damage per-target, the more targets that are hit.
float multiplier = 0.4f + (0.6f/affected.size()); float multiplier = 0.4f + (0.6f/affected.size());
//if the main target is in water, all affected take full damage //if the main target is in water, all affected take full damage
@@ -81,12 +89,6 @@ public class WandOfLightning extends DamageWand {
ch.sprite.centerEmitter().burst( SparkParticle.FACTORY, 3 ); ch.sprite.centerEmitter().burst( SparkParticle.FACTORY, 3 );
ch.sprite.flash(); ch.sprite.flash();
//TODO these still reduce DMG, perhaps remove earlier?
if (ch != curUser && ch.alignment == curUser.alignment && ch.pos != bolt.collisionPos){
continue;
} else if (ch.buff(LightningCharge.class) != null){
continue;
}
wandProc(ch, chargesPerCast()); wandProc(ch, chargesPerCast());
if (ch == curUser && ch.isAlive()) { if (ch == curUser && ch.isAlive()) {
ch.damage(Math.round(damageRoll() * multiplier * 0.5f), this); ch.damage(Math.round(damageRoll() * multiplier * 0.5f), this);