v2.5.0: fixed tormented spirits not consuming SoRC, also buffed them

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/TormentedSpirit.java

@@ -29,7 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
-import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
+import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.TormentedSpiritSprite;
 import com.watabou.noosa.audio.Sample;
@@ -57,22 +57,22 @@ public class TormentedSpirit extends Wraith {
 		Sample.INSTANCE.play( Assets.Sounds.GHOST );
 		yell(Messages.get(this, "thank_you"));
 
-		//50/50 between weapon or armor, always uncursed
+		//50/50 between weapon or armor, always uncursed & enchanted, 50% chance to be +1 if level 0
 		Item prize;
 		if (Random.Int(2) == 0){
 			prize = Generator.randomWeapon(true);
-			if (((MeleeWeapon)prize).hasCurseEnchant()){
-				((MeleeWeapon) prize).enchantment = null;
-			}
+			((Weapon)prize).enchant();
 		} else {
 			prize = Generator.randomArmor();
-			if (((Armor) prize).hasCurseGlyph()){
-				((Armor) prize).glyph = null;
-			}
+			((Armor) prize).inscribe();
 		}
 		prize.cursed = false;
 		prize.cursedKnown = true;
 
+		if (prize.level() == 0 && Random.Int(2) == 0){
+			prize.upgrade();
+		}
+
 		Dungeon.level.drop(prize, pos).sprite.drop();
 
 		destroy();

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java

@@ -68,6 +68,7 @@ public class ScrollOfRemoveCurse extends InventoryScroll {
 				Degrade.detach(curUser, Degrade.class);
 			}
 
+			detach(curUser.belongings.backpack);
 			GLog.p(Messages.get(this, "spirit"));
 			spirit.cleanse();
 		} else {