v1.4.0: disintegration no longer harms undiscovered passive chars
This commit is contained in:
+7
-1
@@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
|
|||||||
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
|
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Web;
|
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Web;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
|
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
|
||||||
|
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.effects.Beam;
|
import com.shatteredpixel.shatteredpixeldungeon.effects.Beam;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
|
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle;
|
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle;
|
||||||
@@ -86,7 +87,12 @@ public class WandOfDisintegration extends DamageWand {
|
|||||||
terrainBonus += terrainPassed/3;
|
terrainBonus += terrainPassed/3;
|
||||||
terrainPassed = terrainPassed%3;
|
terrainPassed = terrainPassed%3;
|
||||||
|
|
||||||
chars.add( ch );
|
if (ch instanceof Mob && ((Mob) ch).state == ((Mob) ch).PASSIVE
|
||||||
|
&& !(Dungeon.level.mapped[c] || Dungeon.level.visited[c])){
|
||||||
|
//avoid harming undiscovered passive chars
|
||||||
|
} else {
|
||||||
|
chars.add(ch);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Dungeon.level.solid[c]) {
|
if (Dungeon.level.solid[c]) {
|
||||||
|
|||||||
Reference in New Issue
Block a user