LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.2.3: tweaked hunger slightly, no longer interrupts movement.

Browse Source
This commit is contained in:
Evan Debenham 2014-12-04 16:26:19 -05:00
parent 1de8c8e9bf
commit 9a5f13b656
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java
View File

@ -67,10 +67,8 @@ public class Hunger extends Buff implements Hero.Doom {
if (Random.Float() < 0.3f && (target.HP > 1 || !target.paralysed)) { if (Random.Float() < 0.3f && (target.HP > 1 || !target.paralysed)) {
GLog.n( TXT_STARVING );
hero.damage( 1, this ); hero.damage( 1, this );
hero.interrupt();
} }
} else { } else {
@ -79,6 +77,7 @@ public class Hunger extends Buff implements Hero.Doom {
if (newLevel >= STARVING) { if (newLevel >= STARVING) {
GLog.n( TXT_STARVING ); GLog.n( TXT_STARVING );
hero.damage( 1, this );
statusUpdated = true; statusUpdated = true;
hero.interrupt(); hero.interrupt();

4
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -897,7 +897,9 @@ public class Hero extends Char {
@Override @Override
public void damage( int dmg, Object src ) { public void damage( int dmg, Object src ) {
restoreHealth = false; restoreHealth = false;
if (damageInterrupt) interrupt();
if (!(src instanceof Hunger) && damageInterrupt)
interrupt();
if (this.buff(Drowsy.class) != null){ if (this.buff(Drowsy.class) != null){
Buff.detach(this, Drowsy.class); Buff.detach(this, Drowsy.class);