From 2b314bf1a90ab394ffb43e4072b26b6a360896b0 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Thu, 19 Jan 2017 18:46:03 -0500
Subject: [PATCH] v0.5.0: corrected shadows in some specific cases

---
 .../shatteredpixeldungeon/sprites/CharSprite.java   |  4 ++--
 .../sprites/PiranhaSprite.java                      | 12 +++++++++++-
 .../sprites/RotHeartSprite.java                     |  4 ++++
 .../shatteredpixeldungeon/sprites/YogSprite.java    | 13 +++++++++++--
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
index 7e18f358c..036b4cfcb 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
@@ -74,7 +74,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 	protected boolean renderShadow  = false;
 	protected float shadowWidth     = 1.2f;
 	protected float shadowHeight    = 0.25f;
-	protected float shadowOffset    = 0.5f;
+	protected float shadowOffset    = 0.25f;
 
 	public enum State {
 		BURNING, LEVITATING, INVISIBLE, PARALYSED, FROZEN, ILLUMINATED, CHILLED, DARKENED, MARKED
@@ -137,7 +137,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 		
 		return new PointF(
 			PixelScene.align(Camera.main, ((cell % Dungeon.level.width()) + 0.5f) * csize - width * 0.5f),
-			PixelScene.align(Camera.main, ((cell / Dungeon.level.width()) + 1.0f) * csize - height - csize * 0.33f)
+			PixelScene.align(Camera.main, ((cell / Dungeon.level.width()) + 1.0f) * csize - height - csize * perspectiveRaise)
 		);
 	}
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java
index 0f4a90140..0b8d65de3 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java
@@ -21,6 +21,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.sprites;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.watabou.noosa.TextureFilm;
 
@@ -28,6 +29,9 @@ public class PiranhaSprite extends MobSprite {
 	
 	public PiranhaSprite() {
 		super();
+
+		renderShadow = false;
+		perspectiveRaise = 0.2f;
 		
 		texture( Assets.PIRANHA );
 		
@@ -47,7 +51,13 @@ public class PiranhaSprite extends MobSprite {
 		
 		play( idle );
 	}
-	
+
+	@Override
+	public void link(Char ch) {
+		super.link(ch);
+		renderShadow = false;
+	}
+
 	@Override
 	public void onComplete( Animation anim ) {
 		super.onComplete( anim );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java
index 1d754593d..6296a3dac 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java
@@ -34,6 +34,8 @@ public class RotHeartSprite extends MobSprite {
 	public RotHeartSprite(){
 		super();
 
+		perspectiveRaise = 0.2f;
+
 		texture( Assets.ROT_HEART );
 
 		TextureFilm frames = new TextureFilm( texture, 16, 16 );
@@ -57,6 +59,8 @@ public class RotHeartSprite extends MobSprite {
 	public void link( Char ch ) {
 		super.link( ch );
 
+		renderShadow = false;
+
 		if (cloud == null) {
 			cloud = emitter();
 			cloud.pour( Speck.factory(Speck.TOXIC), 0.7f );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java
index cfd773684..e5388255c 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java
@@ -21,6 +21,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.sprites;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Splash;
 import com.watabou.noosa.TextureFilm;
 
@@ -28,7 +29,9 @@ public class YogSprite extends MobSprite {
 	
 	public YogSprite() {
 		super();
-		
+
+		perspectiveRaise = 0.2f;
+
 		texture( Assets.YOG );
 		
 		TextureFilm frames = new TextureFilm( texture, 20, 19 );
@@ -47,7 +50,13 @@ public class YogSprite extends MobSprite {
 		
 		play( idle );
 	}
-	
+
+	@Override
+	public void link(Char ch) {
+		super.link(ch);
+		renderShadow = false;
+	}
+
 	@Override
 	public void die() {
 		super.die();