From 5751e5a89b25e07d7d6becb0dc3e9cb58bfa83aa Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 29 May 2015 00:06:22 -0400 Subject: [PATCH] v0.3.0b: scroll of remove curse now works on bags --- .../items/scrolls/ScrollOfRemoveCurse.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java index 6a6eb4982..71f39bc77 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java @@ -17,6 +17,7 @@ */ package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; @@ -77,12 +78,19 @@ public class ScrollOfRemoveCurse extends Scroll { public static boolean uncurse( Hero hero, Item... items ) { boolean procced = false; - for (int i=0; i < items.length; i++) { - Item item = items[i]; + for (Item item : items) { if (item != null && item.cursed) { item.cursed = false; procced = true; } + if (item instanceof Bag){ + for (Item bagItem : ((Bag)item).items){ + if (bagItem != null && bagItem.cursed) { + bagItem.cursed = false; + procced = true; + } + } + } } if (procced) {