From b5642be3c73bb2e309683ed3ae3897e19670e53e Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 1 Oct 2019 02:53:29 -0400
Subject: [PATCH] v0.7.5: improved necromancer sprite

---
 android/src/main/assets/necromancer.png       | Bin 3298 -> 448 bytes
 .../actors/mobs/Necromancer.java              |  67 ++++++++++++------
 .../sprites/NecromancerSprite.java            |  24 ++++---
 3 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/android/src/main/assets/necromancer.png b/android/src/main/assets/necromancer.png
index 86ab5026edf6d22665110fd41ce7199c7ec0f530..9fa626cd8e37d529db3df80d398396f5e1391400 100644
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq00CqG000mK0{{R3)A1N^0000UP)t-s0000r
zH8mh0AZTc4QBhF<004J)cmMzY7Z(>tM@M_)ugm}d00DGTPE!Ct=GbNc00B@*L_t(|
z0lkxfMg~C;$FCzkfbKg4IHP@o9w6&bKw@+Nq8Eto1(w(V0`<1-?A~A7xJ_}p13$O-
zAM-PIyHFRy)J2l8P{^q~*tX8Di6SjOXf-g;>Adc1P{(!TXr7;-q=}r)C!SuiT#Lf!
zfitC&qR#8SHbpWLgp#JtZT2<0AQ-t98(a`4qrjqy&XxO)^`GP5J%ME<oh$c^2HQ5Z
zwmr@t7W_?Vyz^E}J`KO!1e&0jQK@6wm6UHS2=z@`cB1^wyi9TrLJ^2uuCAYBO=aWs
zd8T|WiuWC_^_Xx%pH{E(9Is|;f6}<k^Q7F1;S|lq9Ymj2#|3Gl3@T-lF2*3H%Qunl
zXDk1qj&0Xe#>oFFqYtE+cyUl~qO8^bs4Q`27e8aLr=Y&`n!P8=c<@dpfpVUdJ+bic
qnv^e-Du}$qMOi*2=sgK{-18S@qSwm$B{}5)0000<MNUMnLSTZRyve2j

literal 3298
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

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java
index 5c2f527cc..5103e3d26 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java
@@ -37,6 +37,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.NecromancerSprite;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.SkeletonSprite;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.noosa.particles.Emitter;
 import com.watabou.utils.Bundle;
@@ -62,7 +63,7 @@ public class Necromancer extends Mob {
 		HUNTING = new Hunting();
 	}
 	
-	private boolean summoning = false;
+	public boolean summoning = false;
 	private Emitter summoningEmitter = null;
 	private int summoningPos = -1;
 	
@@ -78,7 +79,7 @@ public class Necromancer extends Mob {
 		if (summoning && summoningEmitter == null){
 			summoningEmitter = CellEmitter.get( summoningPos );
 			summoningEmitter.pour(Speck.factory(Speck.RATTLE), 0.2f);
-			((NecromancerSprite)sprite).charge( summoningPos );
+			sprite.zap( summoningPos );
 		}
 	}
 	
@@ -152,6 +153,28 @@ public class Necromancer extends Mob {
 		}
 	}
 	
+	public void onZapComplete(){
+		if (mySkeleton == null){
+			return;
+		}
+		
+		//heal skeleton first
+		if (mySkeleton.HP < mySkeleton.HT){
+			
+			sprite.parent.add(new Beam.HealthRay(sprite.center(), mySkeleton.sprite.center()));
+			
+			mySkeleton.HP = Math.min(mySkeleton.HP + 5, mySkeleton.HT);
+			mySkeleton.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 );
+			
+			//otherwise give it adrenaline
+		} else if (mySkeleton.buff(Adrenaline.class) == null) {
+			
+			sprite.parent.add(new Beam.HealthRay(sprite.center(), mySkeleton.sprite.center()));
+			
+			Buff.affect(mySkeleton, Adrenaline.class, 3f);
+		}
+	}
+	
 	private class Hunting extends Mob.Hunting{
 		
 		@Override
@@ -218,7 +241,7 @@ public class Necromancer extends Mob {
 			}
 			
 			//if enemy is seen, and enemy is within range, and we haven no skeleton, summon a skeleton!
-			if (enemySeen && Dungeon.level.distance(pos, enemy.pos) <= 4 && mySkeleton == null){
+			if (enemySeen && Dungeon.level.distance(pos, enemy.pos) <= 1 && mySkeleton == null){
 				
 				summoningPos = -1;
 				for (int c : PathFinder.NEIGHBOURS8){
@@ -236,7 +259,7 @@ public class Necromancer extends Mob {
 					summoningEmitter = CellEmitter.get(summoningPos);
 					summoningEmitter.pour(Speck.factory(Speck.RATTLE), 0.2f);
 					
-					((NecromancerSprite)sprite).charge(summoningPos);
+					sprite.zap( summoningPos );
 					
 					spend( firstSummon ? TICK : 2*TICK );
 				} else {
@@ -274,24 +297,11 @@ public class Necromancer extends Mob {
 					
 				} else {
 					
-					//heal skeleton first
-					if (mySkeleton.HP < mySkeleton.HT){
-						
+					//zap skeleton
+					if (mySkeleton.HP < mySkeleton.HT || mySkeleton.buff(Adrenaline.class) == null) {
 						sprite.zap(mySkeleton.pos);
-						sprite.parent.add(new Beam.HealthRay(sprite.center(), mySkeleton.sprite.center()));
-						
-						int healRoll = Random.NormalIntRange(5, 8);
-						mySkeleton.HP = Math.min(mySkeleton.HP + healRoll, mySkeleton.HT);
-						mySkeleton.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 );
-						
-					//otherwise give it adrenaline
-					} else if (mySkeleton.buff(Adrenaline.class) == null) {
-						
-						sprite.zap(mySkeleton.pos);
-						sprite.parent.add(new Beam.HealthRay(sprite.center(), mySkeleton.sprite.center()));
-						
-						Buff.affect(mySkeleton, Adrenaline.class, 3f);
 					}
+					
 				}
 				
 				spend(TICK);
@@ -305,12 +315,13 @@ public class Necromancer extends Mob {
 		}
 	}
 	
-	//TODO should give this its own sprite
 	public static class NecroSkeleton extends Skeleton {
 		
 		{
 			state = WANDERING;
 			
+			spriteClass = NecroSkeletonSprite.class;
+			
 			//no loot or exp
 			maxLvl = -5;
 			
@@ -322,5 +333,19 @@ public class Necromancer extends Mob {
 			spend(TICK);
 		}
 		
+		public static class NecroSkeletonSprite extends SkeletonSprite{
+			
+			public NecroSkeletonSprite(){
+				super();
+				brightness(0.75f);
+			}
+			
+			@Override
+			public void resetColor() {
+				super.resetColor();
+				brightness(0.75f);
+			}
+		}
+		
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java
index c2fb28220..3aaeb90ed 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java
@@ -22,9 +22,9 @@
 package com.shatteredpixel.shatteredpixeldungeon.sprites;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Necromancer;
 import com.watabou.noosa.TextureFilm;
 
-//TODO placeholder graphics atm
 public class NecromancerSprite extends MobSprite {
 	
 	private Animation charging;
@@ -38,25 +38,24 @@ public class NecromancerSprite extends MobSprite {
 		idle = new Animation( 1, true );
 		idle.frames( film, 0, 0, 0, 1, 0, 0, 0, 0, 1 );
 		
-		run = new Animation( 10, true );
-		run.frames( film, 0, 2, 3, 4, 0 );
+		run = new Animation( 8, true );
+		run.frames( film, 0, 0, 0, 2, 3, 4 );
 		
-		zap = new Animation( 5, false );
-		zap.frames( film, 5, 1 );
+		zap = new Animation( 10, false );
+		zap.frames( film, 5, 6, 7, 8 );
 		
 		charging = new Animation( 5, true );
-		charging.frames( film, 1, 5 );
+		charging.frames( film, 7, 8 );
 		
 		die = new Animation( 10, false );
-		die.frames( film, 6, 7, 8, 9 );
+		die.frames( film, 9, 10, 11, 12 );
 		
 		attack = zap.clone();
 		
 		idle();
 	}
 	
-	public void charge( int pos ){
-		turnTo(ch.pos, pos);
+	public void charge(){
 		play(charging);
 	}
 	
@@ -64,7 +63,12 @@ public class NecromancerSprite extends MobSprite {
 	public void onComplete(Animation anim) {
 		super.onComplete(anim);
 		if (anim == zap){
-			idle();
+			if (((Necromancer) ch).summoning){
+				charge();
+			} else {
+				((Necromancer)ch).onZapComplete();
+				idle();
+			}
 		}
 	}
 }