From bfe4a59e089bd1e19ad6bc230e01ea2dfbaef522 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sun, 3 Aug 2014 16:57:20 -0400
Subject: [PATCH] V0.1.0: rebalanced Scroll of Psionic Blast

-Scroll is now more powerful and dangerous, more rare
-Only bosses can resist psionic blast now, Yog is immune
---
 .../shatteredpixeldungeon/actors/mobs/Elemental.java  |  1 -
 .../shatteredpixeldungeon/actors/mobs/Golem.java      |  1 -
 .../shatteredpixeldungeon/actors/mobs/Statue.java     |  1 -
 .../shatteredpixeldungeon/actors/mobs/Yog.java        |  3 ++-
 .../shatteredpixeldungeon/items/Generator.java        |  2 +-
 .../items/scrolls/ScrollOfPsionicBlast.java           | 11 ++++++-----
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
index 0e44edf39..ec29b94ad 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
@@ -100,7 +100,6 @@ public class Elemental extends Mob {
 		IMMUNITIES.add( Burning.class );
 		IMMUNITIES.add( Fire.class );
 		IMMUNITIES.add( WandOfFirebolt.class );
-		IMMUNITIES.add( ScrollOfPsionicBlast.class );
 	}
 	
 	@Override
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java
index 6ab70249c..4207e8f16 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java
@@ -83,7 +83,6 @@ public class Golem extends Mob {
 	
 	private static final HashSet<Class<?>> RESISTANCES = new HashSet<Class<?>>();
 	static {
-		RESISTANCES.add( ScrollOfPsionicBlast.class );
 	}
 	
 	@Override
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java
index f4e8678fe..124f976dd 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java
@@ -154,7 +154,6 @@ public class Statue extends Mob {
 		RESISTANCES.add( ToxicGas.class );
 		RESISTANCES.add( Poison.class );
 		RESISTANCES.add( Death.class );
-		RESISTANCES.add( ScrollOfPsionicBlast.class );
 		IMMUNITIES.add( Leech.class );
 	}
 	
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java
index 0b829ad9a..633c298dd 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java
@@ -370,7 +370,7 @@ public class Yog extends Mob {
 		static {
 			RESISTANCES.add( ToxicGas.class );
 			RESISTANCES.add( Death.class );
-			RESISTANCES.add( ScrollOfPsionicBlast.class );
+
 		}
 		
 		@Override
@@ -384,6 +384,7 @@ public class Yog extends Mob {
 			IMMUNITIES.add( Sleep.class );
 			IMMUNITIES.add( Terror.class );
 			IMMUNITIES.add( Burning.class );
+            IMMUNITIES.add( ScrollOfPsionicBlast.class );
 		}
 		
 		@Override
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
index 6c4ff55fd..c19675663 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
@@ -93,7 +93,7 @@ public class Generator {
 			ScrollOfWeaponUpgrade.class,
 			ScrollOfPsionicBlast.class,
 			ScrollOfMirrorImage.class };
-		Category.SCROLL.probs = new float[]{ 30, 10, 15, 0, 10, 15, 12, 8, 8, 0, 4, 6 };
+		Category.SCROLL.probs = new float[]{ 30, 10, 15, 0, 10, 15, 12, 8, 8, 0, 3, 6 };
 		
 		Category.POTION.classes = new Class<?>[]{ 
 			PotionOfHealing.class, 
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java
index a43e4d012..4b27ad62b 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java
@@ -45,10 +45,11 @@ public class ScrollOfPsionicBlast extends Scroll {
 		for (Mob mob : Dungeon.level.mobs.toArray( new Mob[0] )) {
 			if (Level.fieldOfView[mob.pos]) {
 				Buff.prolong( mob, Blindness.class, Random.Int( 3, 6 ) );
-				mob.damage( Random.IntRange( 1, mob.HT * 2 / 3 ), this );
+				mob.damage(mob.HT, this );
 			}
 		}
-		
+
+		curUser.damage(Random.IntRange(curUser.HT/3, (int)(curUser.HT*0.99)), this);
 		Buff.prolong( curUser, Blindness.class, Random.Int( 3, 6 ) );
 		Dungeon.observe();
 		
@@ -60,9 +61,9 @@ public class ScrollOfPsionicBlast extends Scroll {
 	@Override
 	public String desc() {
 		return
-			"This scroll contains destructive energy, that can be psionically channeled to inflict a " +
-			"massive damage to all creatures within a field of view. An accompanying flash of light will " +
-			"temporarily blind everybody in the area of effect including the reader of the scroll.";
+			"This scroll contains destructive energy, that can be psionically channeled to tear apart" +
+			"the minds of all visible creatures. The power unleashed by the scroll will also temporarily" +
+			"blind and massively harm the reader. if the reader is already injured they will likely die.";
 	}
 	
 	@Override