From 9763e7e6e88d835110f4beb260d68efbfd2b4f1e Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 15 Jul 2017 23:21:56 -0400 Subject: [PATCH] v0.6.1: toxic gas no longer applies any damage if target is immune, even though that damage will be negated --- .../actors/blobs/ToxicGas.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java index e92d3a042..9bcf12043 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java @@ -47,12 +47,15 @@ public class ToxicGas extends Blob implements Hero.Doom { for (int j = area.top; j < area.bottom; j++){ cell = i + j*Dungeon.level.width(); if (cur[cell] > 0 && (ch = Actor.findChar( cell )) != null) { - int damage = (ch.HT + levelDamage) / 40; - if (Random.Int( 40 ) < (ch.HT + levelDamage) % 40) { - damage++; - } + if (!ch.immunities().contains(this.getClass())) { - ch.damage( damage, this ); + int damage = (ch.HT + levelDamage) / 40; + if (Random.Int( 40 ) < (ch.HT + levelDamage) % 40) { + damage++; + } + + ch.damage(damage, this); + } } } }