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

v0.3.1: added various quickslot updates in needed places.

Browse Source
This commit is contained in:
Evan Debenham 2015-07-15 00:22:41 -04:00 committed by Evan Debenham
parent 75e49e7a3c
commit 72ed50545d
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.shatteredpixel.shatteredpixeldungeon" package="com.shatteredpixel.shatteredpixeldungeon"
android:versionCode="46" android:versionCode="49"
android:versionName="0.3.0e" android:versionName="0.3.1-BETA3"
android:installLocation="auto"> android:installLocation="auto">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>

1
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java
View File

@ -96,6 +96,7 @@ public class Monk extends Mob {
if (weapon != null && !(weapon instanceof Knuckles) && !weapon.cursed) { if (weapon != null && !(weapon instanceof Knuckles) && !weapon.cursed) {
hero.belongings.weapon = null; hero.belongings.weapon = null;
Dungeon.quickslot.clearItem( weapon ); Dungeon.quickslot.clearItem( weapon );
weapon.updateQuickslot();
Dungeon.level.drop( weapon, hero.pos ).sprite.drop(); Dungeon.level.drop( weapon, hero.pos ).sprite.drop();
GLog.w( TXT_DISARM, name, weapon.name() ); GLog.w( TXT_DISARM, name, weapon.name() );
} }

4
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java
View File

@ -137,8 +137,8 @@ public class Thief extends Mob {
if (item != null) { if (item != null) {
GLog.w( TXT_STOLE, this.name, item.name() ); GLog.w( TXT_STOLE, this.name, item.name() );
Dungeon.quickslot.clearItem( item );
item.updateQuickslot();
if (item instanceof Honeypot){ if (item instanceof Honeypot){
this.item = ((Honeypot)item).shatter(this, this.pos); this.item = ((Honeypot)item).shatter(this, this.pos);

1
src/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java
View File

@ -102,6 +102,7 @@ public abstract class EquipableItem extends Item {
if (collect && !collect( hero.belongings.backpack )) { if (collect && !collect( hero.belongings.backpack )) {
onDetach(); onDetach();
Dungeon.quickslot.clearItem(this); Dungeon.quickslot.clearItem(this);
updateQuickslot();
Dungeon.level.drop( this, hero.pos ); Dungeon.level.drop( this, hero.pos );
} }