merging 1.7.5 source: items/scrolls changes

src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java

@@ -17,6 +17,8 @@
  */
 package com.shatteredpixel.shatteredpixeldungeon.items.scrolls;
 
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mimic;
+import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.watabou.noosa.audio.Sample;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
@@ -44,6 +46,16 @@ public class ScrollOfRage extends Scroll {
             }
         }
 
+		for (Heap heap : Dungeon.level.heaps.values()) {
+			if (heap.type == Heap.Type.MIMIC) {
+				Mimic m = Mimic.spawnAt( heap.pos, heap.items );
+				if (m != null) {
+					m.beckon( curUser.pos );
+					heap.destroy();
+				}
+			}
+		}
+
 		GLog.w( "The scroll emits an enraging roar that echoes throughout the dungeon!" );
 		setKnown();
 		

src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java

@@ -45,8 +45,7 @@ public class ScrollOfTerror extends Scroll {
 		Mob affected = null;
 		for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) {
 			if (Level.fieldOfView[mob.pos]) {
-				Terror terror = Buff.affect( mob, Terror.class, Terror.DURATION );
+				Buff.affect( mob, Terror.class, Terror.DURATION ).object = curUser.id();
-				terror.source = curUser;
 
 				count++;
 				affected = mob;

src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java

@@ -43,11 +43,10 @@ public class ScrollOfUpgrade extends InventoryScroll {
 		ScrollOfRemoveCurse.uncurse( Dungeon.hero, item );
 		item.upgrade();
 
+		upgrade( curUser );
 		GLog.p( TXT_LOOKS_BETTER, item.name() );
 		
 		Badges.validateItemLevelAquired( item );
-		
-		upgrade( curUser );
 	}
 	
 	public static void upgrade( Hero hero ) {