konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.2.2: updated description and behaviour of dreamfoil, updated frozen carpaccio to match.

Browse Source
This commit is contained in:
Evan Debenham
2014-11-03 11:50:04 -05:00
parent eeca1cb7db
commit 6276daf3bc
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java
+10 -4
View File
@@ -21,9 +21,12 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Barkskin;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; 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.Hunger;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; 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.buffs.Weakness;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
@@ -58,10 +61,13 @@ public class FrozenCarpaccio extends Food {
break; break;
case 2: case 2:
GLog.i( "Refreshing!" ); GLog.i( "Refreshing!" );
Buff.detach( hero, Poison.class ); Buff.detach( hero, Poison.class );
Buff.detach( hero, Cripple.class ); Buff.detach( hero, Cripple.class );
Buff.detach( hero, Weakness.class ); Buff.detach( hero, Weakness.class );
Buff.detach( hero, Bleeding.class ); Buff.detach( hero, Bleeding.class );
Buff.detach( hero, Drowsy.class );
Buff.detach( hero, Slow.class );
Buff.detach( hero, Vertigo.class);
break; break;
case 3: case 3:
GLog.i( "You feel better!" ); GLog.i( "You feel better!" );
src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java
+18 -5
View File
@@ -18,8 +18,14 @@
package com.shatteredpixel.shatteredpixeldungeon.plants; package com.shatteredpixel.shatteredpixeldungeon.plants;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; 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.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.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.buffs.Weakness;
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.actors.mobs.Mob;
@@ -30,8 +36,9 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class Dreamfoil extends Plant { public class Dreamfoil extends Plant {
private static final String TXT_DESC = private static final String TXT_DESC =
"The Dreamfoil's prickly flowers contain a toxin " + "The Dreamfoil's prickly flowers contain a strange chemical which is known for its " +
"which renders most weaker beings unconscious."; "properties as a strong neutralizing agent. Most weaker creatures are overwhelmed " +
"and knocked unconscious, giving the plant its name.";
{ {
image = 10; image = 10;
@@ -46,9 +53,15 @@ public class Dreamfoil extends Plant {
if (ch instanceof Mob) if (ch instanceof Mob)
Buff.affect(ch, MagicalSleep.class); Buff.affect(ch, MagicalSleep.class);
else if (ch instanceof Hero){ else if (ch instanceof Hero){
GLog.w("The poison isn't strong enough to put you to sleep, you are weakened instead."); GLog.i( "You feel refreshed." );
Buff.affect(ch, Weakness.class, Weakness.duration(ch)); 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);
}
} }
} }