konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging 1.9.1 source: item changes

Browse Source
This commit is contained in:
Evan Debenham
2015-11-11 02:01:25 -05:00
parent bc1e3ee17a
commit 366dce1610
86 changed files with 409 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java
+6 -4
View File
@@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.scrolls;
import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.effects.Enchanting;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
@@ -46,7 +47,7 @@ public class ScrollOfMagicalInfusion extends InventoryScroll {
@Override
protected void onItemSelected( Item item ) {
ScrollOfRemoveCurse.uncurse( Dungeon.hero, item );
ScrollOfRemoveCurse.uncurse(Dungeon.hero, item);
if (item instanceof Weapon)
((Weapon)item).upgrade(true);
else
@@ -54,9 +55,10 @@ public class ScrollOfMagicalInfusion extends InventoryScroll {
GLog.p( TXT_INFUSE, item.name() );
Badges.validateItemLevelAquired( item );
curUser.sprite.emitter().start( Speck.factory( Speck.UP ), 0.2f, 3 );
Badges.validateItemLevelAquired(item);
curUser.sprite.emitter().start(Speck.factory(Speck.UP), 0.2f, 3);
Enchanting.show(curUser, item);
}
@Override