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

v0.3.5: adjusted logic for picking up items at full inventory

Browse Source
This commit is contained in:
Evan Debenham 2016-04-15 15:30:14 -04:00
parent e883272242
commit 1f40d6289c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,8 +592,9 @@ public class Hero extends Char {
Heap heap = Dungeon.level.heaps.get( pos ); Heap heap = Dungeon.level.heaps.get( pos );
if (heap != null) { if (heap != null) {
Item item = heap.pickUp(); Item item = heap.peek();
if (item.doPickUp( this )) { if (item.doPickUp( this )) {
heap.pickUp();
if (item instanceof Dewdrop if (item instanceof Dewdrop
|| item instanceof TimekeepersHourglass.sandBag || item instanceof TimekeepersHourglass.sandBag
@ -616,7 +617,7 @@ public class Hero extends Char {
} }
curAction = null; curAction = null;
} else { } else {
Dungeon.level.drop( item, pos ).sprite.drop(); heap.sprite.drop();
ready(); ready();
} }
} else { } else {

16
src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java
View File

@ -21,12 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.sprites; package com.shatteredpixel.shatteredpixeldungeon.sprites;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import com.watabou.gltextures.TextureCache;
import com.watabou.noosa.Game;
import com.watabou.noosa.MovieClip;
import com.watabou.noosa.TextureFilm;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap;
@ -38,6 +32,11 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.watabou.gltextures.TextureCache;
import com.watabou.noosa.Game;
import com.watabou.noosa.MovieClip;
import com.watabou.noosa.TextureFilm;
import com.watabou.noosa.audio.Sample;
import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.Emitter;
import com.watabou.utils.PointF; import com.watabou.utils.PointF;
import com.watabou.utils.Random; import com.watabou.utils.Random;
@ -139,6 +138,11 @@ public class ItemSprite extends MovieClip {
if (heap.isEmpty()) { if (heap.isEmpty()) {
return; return;
} else if (heap.size() == 1){
// normally this would happen for any heap, however this is not applied to heaps greater than 1 in size
// in order to preserve an amusing visual bug/feature that used to trigger for heaps with size > 1
// where as long as the player continually taps, the heap sails up into the air.
place(heap.pos);
} }
dropInterval = DROP_INTERVAL; dropInterval = DROP_INTERVAL;