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

v0.3.1: allowed resting while hungry

Browse Source
This commit is contained in:
Evan Debenham 2015-07-13 01:03:25 -04:00 committed by Evan Debenham
parent 79c12e11b5
commit 272d4834b3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@ public class Hunger extends Buff implements Hero.Doom {
if (newLevel >= STARVING) { if (newLevel >= STARVING) {
GLog.n( TXT_STARVING ); GLog.n( TXT_STARVING );
hero.restoreHealth = false;
hero.damage( 1, this ); hero.damage( 1, this );
statusUpdated = true; statusUpdated = true;

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

@ -430,7 +430,7 @@ public class Hero extends Char {
if (curAction == null) { if (curAction == null) {
if (restoreHealth) { if (restoreHealth) {
if (isStarving() || HP >= HT || Dungeon.level.locked) { if (HP >= HT || Dungeon.level.locked) {
restoreHealth = false; restoreHealth = false;
} else { } else {
spend( TIME_TO_REST ); next(); spend( TIME_TO_REST ); next();
@ -909,10 +909,10 @@ public class Hero extends Char {
if (buff(TimekeepersHourglass.timeStasis.class) != null) if (buff(TimekeepersHourglass.timeStasis.class) != null)
return; return;
restoreHealth = false; if (!(src instanceof Hunger || src instanceof Viscosity.DeferedDamage) && damageInterrupt) {
if (!(src instanceof Hunger || src instanceof Viscosity.DeferedDamage) && damageInterrupt)
interrupt(); interrupt();
restoreHealth = false;
}
if (this.buff(Drowsy.class) != null){ if (this.buff(Drowsy.class) != null){
Buff.detach(this, Drowsy.class); Buff.detach(this, Drowsy.class);

2
src/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java
View File

@ -103,7 +103,7 @@ public class HeroSprite extends CharSprite {
@Override @Override
public void update() { public void update() {
sleeping = ((Hero)ch).restoreHealth; sleeping = ch.isAlive() && ((Hero)ch).restoreHealth;
super.update(); super.update();
} }