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

v0.7.0: bugfixes to corpse dust and alchemy interface

Browse Source
This commit is contained in:
Evan Debenham 2018-08-12 21:43:32 -04:00
parent 608a889f7f
commit 9df6f29019
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java
View File

@ -101,12 +101,16 @@ public class CorpseDust extends Item {
if (powerNeeded <= spawnPower){ if (powerNeeded <= spawnPower){
spawnPower -= powerNeeded; spawnPower -= powerNeeded;
int pos = 0; int pos = 0;
int tries = 20;
do{ do{
pos = Random.Int(Dungeon.level.length()); pos = Random.Int(Dungeon.level.length());
} while (!Dungeon.level.heroFOV[pos] || !Dungeon.level.passable[pos] || Actor.findChar( pos ) != null); tries --;
} while (tries > 0 && (!Dungeon.level.heroFOV[pos] || !Dungeon.level.passable[pos] || Actor.findChar( pos ) != null));
if (tries > 0) {
Wraith.spawnAt(pos); Wraith.spawnAt(pos);
Sample.INSTANCE.play(Assets.SND_CURSED); Sample.INSTANCE.play(Assets.SND_CURSED);
} }
}
spend(TICK); spend(TICK);
return true; return true;

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java
View File

@ -47,7 +47,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
@ -57,6 +56,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.watabou.gltextures.TextureCache; import com.watabou.gltextures.TextureCache;
import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapText;
import com.watabou.noosa.ColorBlock; import com.watabou.noosa.ColorBlock;
import com.watabou.noosa.Game;
import com.watabou.noosa.Image; import com.watabou.noosa.Image;
import com.watabou.noosa.RenderedText; import com.watabou.noosa.RenderedText;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
@ -251,7 +251,7 @@ public class WndBag extends WndTabbed {
@Override @Override
protected void onClick( Tab tab ) { protected void onClick( Tab tab ) {
hide(); hide();
GameScene.show( new WndBag( ((BagTab)tab).bag, listener, mode, title ) ); Game.scene().addToFront(new WndBag(((BagTab) tab).bag, listener, mode, title));
} }
@Override @Override
@ -439,7 +439,7 @@ public class WndBag extends WndTabbed {
} else { } else {
GameScene.show(new WndItem( WndBag.this, item ) ); Game.scene().addToFront(new WndItem( WndBag.this, item ) );
} }
} }