v1.3.0: big buff to woolly bombs (and standardized some sheep logic)

core/src/main/assets/messages/items/items.properties

@@ -499,7 +499,7 @@ items.bombs.shrapnelbomb.name=shrapnel bomb
 items.bombs.shrapnelbomb.desc=This bomb has been modified with scraps of DM-300's metal, which will fragment and fly everywhere when it explodes, damaging anything in a huge range around the bomb. You had better hide behind something when using it...
 
 items.bombs.woollybomb.name=woolly bomb
-items.bombs.woollybomb.desc=This customized bomb will create a field of magical sheep after exploding. These sheep will block movement and persist for some time.
+items.bombs.woollybomb.desc=This customized bomb will create a wide field of magical sheep after exploding. These sheep will block movement and persist for a very long time! The sheep will not last as long in the presence of powerful enemies though, and can be manually dispelled sooner by interacting with them.
 
 ###food
 items.food.berry.name=dungeon berry

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java

@@ -53,7 +53,7 @@ public class Sheep extends NPC {
 
 		} else {
 			initialized = true;
-			spend( lifespan + Random.Float(2) );
+			spend( lifespan + Random.Float(-2, 2) );
 		}
 		return true;
 	}
@@ -77,6 +77,10 @@ public class Sheep extends NPC {
 		if (c == Dungeon.hero) {
 			Dungeon.hero.spendAndNext(1f);
 			Sample.INSTANCE.play(Assets.Sounds.SHEEP, 1, Random.Float(0.91f, 1.1f));
+			//sheep summoned by woolly bomb can be dispelled by interacting
+			if (lifespan >= 20){
+				spend(-cooldown());
+			}
 		}
 		return true;
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java

@@ -60,7 +60,7 @@ public class WoollyBomb extends Bomb {
 					&& Actor.findChar(i) == null
 					&& !(Dungeon.level.pit[i])) {
 				Sheep sheep = new Sheep();
-				sheep.lifespan = Random.NormalIntRange( 12, 16 );
+				sheep.lifespan = Dungeon.bossLevel() ? 20 : 200;
 				sheep.pos = i;
 				GameScene.add(sheep);
 				Dungeon.level.occupyCell(sheep);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java

@@ -62,7 +62,7 @@ public class StoneOfFlock extends Runestone {
 					&& Actor.findChar(i) == null
 					&& !(Dungeon.level.pit[i])) {
 				Sheep sheep = new Sheep();
-				sheep.lifespan = Random.NormalIntRange( 6, 8 );
+				sheep.lifespan = 8;
 				sheep.pos = i;
 				GameScene.add(sheep);
 				Dungeon.level.occupyCell(sheep);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java

@@ -59,7 +59,7 @@ public class FlockTrap extends Trap {
 					&& Actor.findChar(i) == null
 					&& !(Dungeon.level.pit[i])) {
 				Sheep sheep = new Sheep();
-				sheep.lifespan = Random.NormalIntRange( 4, 8 );
+				sheep.lifespan = 6;
 				sheep.pos = i;
 				GameScene.add(sheep);
 				CellEmitter.get(i).burst(Speck.factory(Speck.WOOL), 4);