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

v0.2.3e: fixes, actual final commit

Browse Source
This commit is contained in:
Evan Debenham 2015-01-21 23:55:37 -05:00
parent 8fa6b41427
commit 520131fb2d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
View File

@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.SnipersMark;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector;
@ -204,7 +205,7 @@ public class Item implements Bundlable {
} else
if (quantity == 1) {
if (stackable == true){
if (stackable == true || this instanceof Boomerang){
Dungeon.quickslot.convertToPlaceholder(this);
}

7
src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
View File

@ -17,6 +17,8 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.ui;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang;
import com.watabou.noosa.Image;
import com.watabou.noosa.ui.Button;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@ -75,7 +77,8 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
GameScene.handleCell( lastTarget.pos );
} else {
Item item = select(slotNum);
useTargeting();
if (item.stackable || item instanceof Wand || item instanceof Boomerang)
useTargeting();
item.execute( Dungeon.hero );
}
}
@ -165,6 +168,8 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
if (Actor.all().contains( lastTarget )) {
lastTarget.sprite.parent.add( crossM );
crossM.point( DungeonTilemap.tileToWorld( lastTarget.pos ) );
crossB.x = PixelScene.align( x + (width - crossB.width) / 2 );
crossB.y = PixelScene.align( y + (height - crossB.height) / 2 );
crossB.visible = true;
} else {
lastTarget = null;