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

v1.4.1: fixed cursed horn of plenty affecting more than food

Browse Source
This commit is contained in:
Evan Debenham
2022-10-05 12:57:57 -04:00
parent 08a77134fc
commit 3d66ee5e86
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,13 +124,6 @@ public class Hunger extends Buff implements Hero.Doom {
}
public void satisfy( float energy ) {
Artifact.ArtifactBuff buff = target.buff( HornOfPlenty.hornRecharge.class );
if (buff != null && buff.isCursed()){
energy *= 0.67f;
GLog.n( Messages.get(this, "cursedhorn") );
}
affectHunger( energy, false );
}

15
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java
View File

@@ -32,6 +32,8 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.HornOfPlenty;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -102,11 +104,18 @@ public class Food extends Item {
}
protected void satisfy( Hero hero ){
float foodVal = energy;
if (Dungeon.isChallenged(Challenges.NO_FOOD)){
Buff.affect(hero, Hunger.class).satisfy(energy/3f);
} else {
Buff.affect(hero, Hunger.class).satisfy(energy);
foodVal /= 3f;
}
Artifact.ArtifactBuff buff = hero.buff( HornOfPlenty.hornRecharge.class );
if (buff != null && buff.isCursed()){
foodVal *= 0.67f;
GLog.n( Messages.get(Hunger.class, "cursedhorn") );
}
Buff.affect(hero, Hunger.class).satisfy(foodVal);
}
@Override