v0.3.0b: scroll of remove curse now works on bags

This commit is contained in:
Evan Debenham 2015-05-29 00:06:22 -04:00
parent 4f177d305e
commit 5751e5a89b

View File

@ -17,6 +17,7 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; package com.shatteredpixel.shatteredpixeldungeon.items.scrolls;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
@ -77,12 +78,19 @@ public class ScrollOfRemoveCurse extends Scroll {
public static boolean uncurse( Hero hero, Item... items ) { public static boolean uncurse( Hero hero, Item... items ) {
boolean procced = false; boolean procced = false;
for (int i=0; i < items.length; i++) { for (Item item : items) {
Item item = items[i];
if (item != null && item.cursed) { if (item != null && item.cursed) {
item.cursed = false; item.cursed = false;
procced = true; procced = true;
} }
if (item instanceof Bag){
for (Item bagItem : ((Bag)item).items){
if (bagItem != null && bagItem.cursed) {
bagItem.cursed = false;
procced = true;
}
}
}
} }
if (procced) { if (procced) {