diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 1cbe7578b..28baee591 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -665,13 +665,13 @@ items.potions.brews.causticbrew.name=caustic brew items.potions.brews.causticbrew.desc=This brew will spread corrosive ooze in a wide area around the location it shatters in. Anything caught by the ooze will slowly melt if it can't wash it off in water. items.potions.brews.blizzardbrew.name=blizzard brew -items.potions.brews.blizzardbrew.desc=When shattered, this brew will unleash a swirling blizzard which spreads like a gas. +items.potions.brews.blizzardbrew.desc=When shattered, this brew will unleash a swirling blizzard which quickly spreads like a gas. items.potions.brews.infernalbrew.name=infernal brew -items.potions.brews.infernalbrew.desc=When shattered, this brew will unleash a raging inferno which spreads like a gas. +items.potions.brews.infernalbrew.desc=When shattered, this brew will unleash a raging inferno which quickly spreads like a gas. items.potions.brews.shockingbrew.name=shocking brew -items.potions.brews.shockingbrew.desc=When shattered, this brew will unleash an electrical storm in an area around the location it breaks at. +items.potions.brews.shockingbrew.desc=When shattered, this brew will unleash an electrical storm in an wide area around the location it breaks at. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java index 6263280ae..ea90de09f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java @@ -89,10 +89,14 @@ public class Ooze extends Buff { @Override public boolean act() { if (target.isAlive()) { - if (Dungeon.depth > 4) - target.damage( Dungeon.depth/5, this ); - else if (Random.Int(2) == 0) - target.damage( 1, this ); + if (Dungeon.depth > 5) { + target.damage(1 + Dungeon.depth / 5, this); + } else if (Dungeon.depth == 5){ + target.damage(1, this); //1 dmg per turn vs Goo + } else if (Random.Int(2) == 0) { + target.damage(1, this); //0.5 dmg per turn in sewers + } + if (!target.isAlive() && target == Dungeon.hero) { Dungeon.fail( getClass() ); GLog.n( Messages.get(this, "ondeath") ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java index 993079da0..4b8ebdec6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfFrost; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; +import com.watabou.utils.PathFinder; public class BlizzardBrew extends Brew { @@ -44,8 +45,17 @@ public class BlizzardBrew extends Brew { Sample.INSTANCE.play( Assets.Sounds.SHATTER ); Sample.INSTANCE.play( Assets.Sounds.GAS ); } - - GameScene.add( Blob.seed( cell, 1000, Blizzard.class ) ); + + int centerVolume = 120; + for (int i : PathFinder.NEIGHBOURS8){ + if (!Dungeon.level.solid[cell+i]){ + GameScene.add( Blob.seed( cell+i, 120, Blizzard.class ) ); + } else { + centerVolume += 120; + } + } + + GameScene.add( Blob.seed( cell, centerVolume, Blizzard.class ) ); } @Override @@ -60,7 +70,7 @@ public class BlizzardBrew extends Brew { inputs = new Class[]{PotionOfFrost.class, AlchemicalCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 4; + cost = 3; output = BlizzardBrew.class; outQuantity = 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java index b8ca9a53f..2c1ac4c31 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java @@ -74,7 +74,7 @@ public class CausticBrew extends Brew { inputs = new Class[]{PotionOfToxicGas.class, GooBlob.class}; inQuantity = new int[]{1, 1}; - cost = 3; + cost = 2; output = CausticBrew.class; outQuantity = 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java index abab8cbfa..308371bb4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlam import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; +import com.watabou.utils.PathFinder; public class InfernalBrew extends Brew { @@ -45,8 +46,17 @@ public class InfernalBrew extends Brew { Sample.INSTANCE.play( Assets.Sounds.SHATTER ); Sample.INSTANCE.play( Assets.Sounds.GAS ); } + + int centerVolume = 120; + for (int i : PathFinder.NEIGHBOURS8){ + if (!Dungeon.level.solid[cell+i]){ + GameScene.add( Blob.seed( cell+i, 120, Inferno.class ) ); + } else { + centerVolume += 120; + } + } - GameScene.add( Blob.seed( cell, 1000, Inferno.class ) ); + GameScene.add( Blob.seed( cell, centerVolume, Inferno.class ) ); } @Override @@ -61,7 +71,7 @@ public class InfernalBrew extends Brew { inputs = new Class[]{PotionOfLiquidFlame.class, AlchemicalCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 5; + cost = 4; output = InfernalBrew.class; outQuantity = 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java index abed4503a..73438e39a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java @@ -46,7 +46,7 @@ public class ShockingBrew extends Brew { Sample.INSTANCE.play( Assets.Sounds.SHATTER ); Sample.INSTANCE.play(Assets.Sounds.LIGHTNING); } - PathFinder.buildDistanceMap( cell, BArray.not( Dungeon.level.solid, null ), 2 ); + PathFinder.buildDistanceMap( cell, BArray.not( Dungeon.level.solid, null ), 3 ); for (int i = 0; i < PathFinder.distance.length; i++) { if (PathFinder.distance[i] < Integer.MAX_VALUE) { GameScene.add(Blob.seed(i, 20, Electricity.class));