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

v0.7.0: bugfixes:

Browse Source 
- fixed well fed buff not being reset by eating additional feasts
- fixed prismatic images being corruptable
- fixed exotic scrolls not correctly IDing themselves
This commit is contained in:
Evan Debenham 2018-10-02 22:09:19 -04:00
parent 0eef27efd8
commit 6e3097724a
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WellFed.java
View File

@ -32,8 +32,7 @@ public class WellFed extends Buff {
announced = true; announced = true;
} }
//heals one HP every 10 turns for 450 turns int left;
int left = (int)Hunger.STARVING;
@Override @Override
public boolean act() { public boolean act() {
@ -49,6 +48,11 @@ public class WellFed extends Buff {
return true; return true;
} }
public void reset(){
//heals one HP every 10 turns for 450 turns
left = (int)Hunger.STARVING;
}
@Override @Override
public int icon() { public int icon() {
return BuffIndicator.WELL_FED; return BuffIndicator.WELL_FED;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java
View File

@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.CorrosiveGas;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Corruption;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.PrismaticGuard; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.PrismaticGuard;
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;
@ -231,6 +232,7 @@ public class PrismaticImage extends NPC {
immunities.add( ToxicGas.class ); immunities.add( ToxicGas.class );
immunities.add( CorrosiveGas.class ); immunities.add( CorrosiveGas.class );
immunities.add( Burning.class ); immunities.add( Burning.class );
immunities.add( Corruption.class );
} }
private class Wandering extends Mob.Wandering{ private class Wandering extends Mob.Wandering{

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Feast.java
View File

@ -40,7 +40,7 @@ public class Feast extends Food {
@Override @Override
protected void satisfy(Hero hero) { protected void satisfy(Hero hero) {
super.satisfy( hero ); super.satisfy( hero );
Buff.affect(hero, WellFed.class); Buff.affect(hero, WellFed.class).reset();
} }
@Override @Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ExoticScroll.java
View File

@ -95,7 +95,7 @@ public abstract class ExoticScroll extends Scroll {
@Override @Override
public void setKnown() { public void setKnown() {
if (isKnown()) { if (!isKnown()) {
handler.know(exoToReg.get(this.getClass())); handler.know(exoToReg.get(this.getClass()));
updateQuickslot(); updateQuickslot();
} }