From 290bfca1578c4ade8075028192c7c4a14506e6d9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 30 Oct 2014 21:17:44 -0400 Subject: [PATCH] v0.2.2: gas changes --- .../actors/blobs/ToxicGas.java | 20 ------------------- .../items/potions/PotionOfPurity.java | 6 +++++- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java index 2ad4aa2b5..49e868d04 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java @@ -49,26 +49,6 @@ public class ToxicGas extends Blob implements Hero.Doom { ch.damage( damage, this ); } } - - Blob blob = Dungeon.level.blobs.get( ParalyticGas.class ); - if (blob != null) { - - int par[] = blob.cur; - - for (int i=0; i < LENGTH; i++) { - - int t = cur[i]; - int p = par[i]; - - if (p >= t) { - volume -= t; - cur[i] = 0; - } else { - blob.volume -= p; - par[i] = 0; - } - } - } } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java index 62b685ffa..fd0d9c72d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java @@ -17,6 +17,8 @@ */ package com.shatteredpixel.shatteredpixeldungeon.items.potions; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ConfusionGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.StenchGas; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; @@ -53,7 +55,9 @@ public class PotionOfPurity extends Potion { Blob[] blobs = { Dungeon.level.blobs.get( ToxicGas.class ), - Dungeon.level.blobs.get( ParalyticGas.class ) + Dungeon.level.blobs.get( ParalyticGas.class ), + Dungeon.level.blobs.get( ConfusionGas.class ), + Dungeon.level.blobs.get( StenchGas.class ) }; for (int j=0; j < blobs.length; j++) {