diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index 9e5b0eebe..23f456a9f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -606,7 +606,7 @@ public abstract class Char extends Actor { new HashSet( Arrays.asList(Blob.class) )), FIERY ( new HashSet( Arrays.asList(WandOfFireblast.class)), new HashSet( Arrays.asList(Burning.class, Blazing.class))), - ACIDIC ( new HashSet( Arrays.asList(ToxicGas.class, Corrosion.class)), + ACIDIC ( new HashSet( Arrays.asList(Corrosion.class)), new HashSet( Arrays.asList(Ooze.class))), ELECTRIC ( new HashSet( Arrays.asList(WandOfLightning.class, Shocking.class, Potential.class, Electricity.class, ShockingDart.class)), new HashSet()), 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 aa9da3ea3..6e1d0c458 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 @@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; -import com.watabou.utils.Random; public class ToxicGas extends Blob implements Hero.Doom { @@ -38,7 +37,7 @@ public class ToxicGas extends Blob implements Hero.Doom { protected void evolve() { super.evolve(); - int levelDamage = 5 + Dungeon.depth * 5; + int damage = 1 + Dungeon.depth/5; Char ch; int cell; @@ -49,11 +48,6 @@ public class ToxicGas extends Blob implements Hero.Doom { if (cur[cell] > 0 && (ch = Actor.findChar( cell )) != null) { if (!ch.isImmune(this.getClass())) { - int damage = (ch.HT + levelDamage) / 40; - if (Random.Int( 40 ) < (ch.HT + levelDamage) % 40) { - damage++; - } - ch.damage(damage, this); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java index d08979322..f28974e3a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java @@ -82,7 +82,7 @@ public class Burning extends Buff implements Hero.Doom { if (target.isAlive()) { - int damage = Random.NormalIntRange( 1, 3 + target.HT/40 ); + int damage = Random.NormalIntRange( 1, 3 + Dungeon.depth/4 ); Buff.detach( target, Chill.class); //FIXME doesn't work with the sad ghost diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index 16ebdb292..e600cdc15 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -26,9 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; @@ -240,11 +238,6 @@ public class Tengu extends Mob { yell(Messages.get(this, "notice_face", Dungeon.hero.givenName())); } } - - { - resistances.add( ToxicGas.class ); - resistances.add( Poison.class ); - } @Override public void restoreFromBundle(Bundle bundle) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java index a6bde8ae3..b64bf4893 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java @@ -357,10 +357,6 @@ public class Yog extends Mob { if (lock != null) lock.addTime(dmg*0.5f); } - { - resistances.add( ToxicGas.class ); - } - { immunities.add( Amok.class ); immunities.add( Sleep.class );