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

v0.3.0: slight refactor to hunger

Browse Source
This commit is contained in:
Evan Debenham 2015-04-24 03:32:55 -04:00
parent 2367283bf6
commit a222efa406
4 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,7 @@ public class Hunger extends Buff implements Hero.Doom {
GLog.n("The cursed horn steals some of the food energy as you eat."); GLog.n("The cursed horn steals some of the food energy as you eat.");
} }
if (!Dungeon.isChallenged(Challenges.NO_FOOD))
reduceHunger( energy ); reduceHunger( energy );
} }
@ -135,12 +136,12 @@ public class Hunger extends Buff implements Hero.Doom {
else if (level < HUNGRY) else if (level < HUNGRY)
energy *= 0.75f; energy *= 0.75f;
if (!Dungeon.isChallenged(Challenges.NO_FOOD))
reduceHunger( energy ); reduceHunger( energy );
} }
private void reduceHunger( float energy ) { //directly interacts with hunger, no checks.
if (Dungeon.isChallenged(Challenges.NO_FOOD)) public void reduceHunger( float energy ) {
return;
level -= energy; level -= energy;
if (level < 0) { if (level < 0) {

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

@ -798,7 +798,7 @@ public class Hero extends Char {
Hunger hunger = buff( Hunger.class ); Hunger hunger = buff( Hunger.class );
if (hunger != null && !hunger.isStarving()) { if (hunger != null && !hunger.isStarving()) {
hunger.satisfy( -Hunger.STARVING / 10 ); hunger.reduceHunger( -Hunger.STARVING / 10 );
} }
Buff buff = buff(TimekeepersHourglass.timeFreeze.class); Buff buff = buff(TimekeepersHourglass.timeFreeze.class);

2
src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Metabolism.java
View File

@ -48,7 +48,7 @@ public class Metabolism extends Glyph {
if (hunger != null && !hunger.isStarving()) { if (hunger != null && !hunger.isStarving()) {
hunger.satisfy( -Hunger.STARVING / 10 ); hunger.reduceHunger( -Hunger.STARVING / 10 );
BuffIndicator.refreshHero(); BuffIndicator.refreshHero();
defender.HP += healing; defender.HP += healing;

2
src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java
View File

@ -109,7 +109,7 @@ public class Pickaxe extends Weapon {
Hunger hunger = hero.buff( Hunger.class ); Hunger hunger = hero.buff( Hunger.class );
if (hunger != null && !hunger.isStarving()) { if (hunger != null && !hunger.isStarving()) {
hunger.satisfy( -Hunger.STARVING / 10 ); hunger.reduceHunger( -Hunger.STARVING / 10 );
BuffIndicator.refreshHero(); BuffIndicator.refreshHero();
} }