diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java index 0e5832b84..ccb4614f1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java @@ -21,9 +21,12 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Barkskin; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Drowsy; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Slow; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Vertigo; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; @@ -58,10 +61,13 @@ public class FrozenCarpaccio extends Food { break; case 2: GLog.i( "Refreshing!" ); - Buff.detach( hero, Poison.class ); - Buff.detach( hero, Cripple.class ); - Buff.detach( hero, Weakness.class ); - Buff.detach( hero, Bleeding.class ); + Buff.detach( hero, Poison.class ); + Buff.detach( hero, Cripple.class ); + Buff.detach( hero, Weakness.class ); + Buff.detach( hero, Bleeding.class ); + Buff.detach( hero, Drowsy.class ); + Buff.detach( hero, Slow.class ); + Buff.detach( hero, Vertigo.class); break; case 3: GLog.i( "You feel better!" ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java index c6b8ddd69..04600bed0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java @@ -18,8 +18,14 @@ package com.shatteredpixel.shatteredpixeldungeon.plants; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Drowsy; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicalSleep; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Slow; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Vertigo; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; @@ -30,8 +36,9 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class Dreamfoil extends Plant { private static final String TXT_DESC = - "The Dreamfoil's prickly flowers contain a toxin " + - "which renders most weaker beings unconscious."; + "The Dreamfoil's prickly flowers contain a strange chemical which is known for its " + + "properties as a strong neutralizing agent. Most weaker creatures are overwhelmed " + + "and knocked unconscious, giving the plant its name."; { image = 10; @@ -46,9 +53,15 @@ public class Dreamfoil extends Plant { if (ch instanceof Mob) Buff.affect(ch, MagicalSleep.class); else if (ch instanceof Hero){ - GLog.w("The poison isn't strong enough to put you to sleep, you are weakened instead."); - Buff.affect(ch, Weakness.class, Weakness.duration(ch)); - } + GLog.i( "You feel refreshed." ); + Buff.detach( ch, Poison.class ); + Buff.detach( ch, Cripple.class ); + Buff.detach( ch, Weakness.class ); + Buff.detach( ch, Bleeding.class ); + Buff.detach( ch, Drowsy.class ); + Buff.detach( ch, Slow.class ); + Buff.detach( ch, Vertigo.class); + } } }