From 6827da804d2f9be45b672f65ab86fa226713dd92 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 19 Sep 2023 14:20:50 -0400
Subject: [PATCH] v2.2.0: implemented a bunch of functionality for the crystal
 spire

---
 .../src/main/assets/sprites/crystal_spire.png | Bin 340 -> 1278 bytes
 .../actors/mobs/CrystalGuardian.java          |   5 +
 .../actors/mobs/CrystalSpire.java             |  97 +++++++++++++++++-
 .../actors/mobs/npcs/Blacksmith.java          |   4 +
 .../shatteredpixeldungeon/effects/Splash.java |  16 +++
 .../sprites/CrystalSpireSprite.java           |  42 +++++++-
 .../sprites/SpawnerSprite.java                |   2 +-
 7 files changed, 160 insertions(+), 6 deletions(-)

diff --git a/core/src/main/assets/sprites/crystal_spire.png b/core/src/main/assets/sprites/crystal_spire.png
index fc1927ea3a9e90f6bc065b0deaa609fc16e808cd..d2eb6069d010948a4cee8987b4bfc4993ba83faa 100644
GIT binary patch
literal 1278
zcmV<a1OfYrP)<h;3K|Lk000e1NJLTq00961004jl0{{R37MrR$0000XP)t-s00028
z^8aSD|C#?ZF6J)(|NmHS+yBE&|9=1gvpcgM0JqR?wg3PC0d!JMQvg8b*k%9#1dB;T
zK~#7F?3yudgGv-de`KN5Seo9l#0m(#3)35bK+?xM7~#?lQZ|sn3rOQt{<%X&m}j2<
zJY?y|Qf`&g%snszwx9CPPnPZvInumH5cw4XPs^1UnJiv59!T>i5H8nZWD>t@{qffb
zJef6DLS(Wq6&p|d6BrVjHP^nVEOLoW#nuBKT_C!zz>}?5`C_(Q=PULIpkm{Jze*sq
z6>Cp40uhke0aR=~@R0@7GQY3D(@(|93$suugFEgB*out@&J|Gqhd@3O07k$$0_B82
zXd6v9R3prA2ck7|1kh;0VPa7#kc|a0a|rX90>vBwb%oJffuu)z1YF~48nbK6E8vjI
zZL(|JOk?3tBA|c~#R}*W>?<#U1ej8Rux~^rF$0=|pHsB4kK^lpZ!zv0kx49o<~b-O
z0!q0?ib$XY0!cDQAVXt>2ah6>DZ2yvkF|$D0RgiE>6RV=*SMO%45uzfBSk9^?(7Zt
z04^>XHxpRk5S9?w_zS4;vN0eSgaUyio+FUq!B+-y4zUCK+(V$idmu4Tjs!y2h#1VS
zP^lb^90sot0LHEnF<4w-l9Uht-W14y(SWMTZ{q7m#0eC@bikx4fpiC)zzQ##UI6d=
z0V5Awj084#??3=oTwY*m@uq+R;vywDEsy|l%@lcoFdJ2PAtMkMLnB3U1grpJuBcx#
zGLXwK9t03`y?tY9prptOR2eR-Uo(;+6{reabl;d#<e!4jttrQm0B~rec=NMB0V6q1
zd=@0YbQ<|@L<*SCLi!ab0hSEj{%x4ck^3=NQWQ)`<S3tz@RL9}O6P=Rgv;k3M?Sw(
z0C$GZ^Wi8%dHw`2!sXK*KIQmW0_^+2=Gm-yl%X_#0`{8{e+0~$pT4Mpk13GePoR?@
zfdU`X>=8i4(HHB(X9IjFf!GM7>>+4v#iu74fe!d+0?A8xF9CgMqymc~PVlpR#~lG%
zarDBv)!N`rCXn1uK+hD2F*w=G6lg{Qzz!%ngSZ3fmN^1wG~rN>u*MzefFgmy9Kv#@
zKs^?y%^_^00tv=<GX?Y&b}|7sLoTcFCvxRB*)<-gvA)Kp0+OZJ3^U~FQXn{0UIH4}
zQLKP2!I?LhoFUt1=<Rf}*!GRcB-TK4@EeN5Qt#(8kPV$72Z=yHYu88-3AC30nIRX6
z-GS5B)<d91V}}QiB2sI+1Ltobm#Z0a5%25`_yRs(G#)3g#;I%2NYM(kJ9`7Zfn0*|
z3^@p5fq-r=8v}wt>mxvB$QH2!r_w{9#)Gd7G#p|F&OkO~hHNo-g8;B~jflbe3bk&~
z$YJmf0U#GLLw5M~m2v_#up3ZU%}sp&267=YWP;Blfg@fty#U_#19l$B3-BZ5X#owy
zMM{ttU`EQEKwFP01jq^89x1nj0AjAFU$ZmN$dDDdIZ~zqRgKH)*X%^d3jD`Nc_aXI
zYl@K#KT@9lEYQGCjC}Z!^7L0A4Q%AdhaV~PKL(q5DE}Wkeg+~($(#_#kN)H+&cE%!
ofdBvi0DvHW>p`vn0002sB<&?%vq!dJ6aWAK07*qoM6N<$g6U)=r~m)}

literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq004jh002M)0{{R3AoyZT0000LP)t-s00028
z^8aSD|C#?ZF6J)(!%hEx0PCxOzW@LL0d!JMQvg8b*k%9#0PRUcK~#7F%+Ub`#V`!U
z@zv}A-3cmJ*bWfn3LAic-2Vu#>Qf1Ln34j4AK$+l-noT$$MfC(yzf9cn?LuP{dv5a
zAE+n!^SZ^K&ugoJ(t+j{bb#H04rq3uc7R-h4v0(80ZR^)0koN506Y^6K$ik_05lg2
zK<0u0SZbgEXh;BnkpO^Z1}XqT0sw*p04y<3CeV-o03!haT?W(%5EcLsEC66>f#QIM
z1OONb0BBaAI)IP>fFJ<?TLY8;v^@ZP1VD2FH2`!4K%M~D65#tc{ziOWptMAyv~Hxd
mg+g&VaRh)-FbYP&C;$M@qW0*Y?~_yj0000<MNUMnLSTYnKYdI9

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalGuardian.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalGuardian.java
index 082e89a45..1b78362a9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalGuardian.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalGuardian.java
@@ -40,6 +40,11 @@ public class CrystalGuardian extends Mob{
 		state = SLEEPING;
 	}
 
+	@Override
+	public boolean reset() {
+		return true;
+	}
+
 	public CrystalGuardian(){
 		super();
 		switch (Random.Int(3)){
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalSpire.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalSpire.java
index 683c01a5f..594b29f52 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalSpire.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/CrystalSpire.java
@@ -21,17 +21,103 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.actors.mobs;
 
+import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Dread;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Vertigo;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Blacksmith;
+import com.shatteredpixel.shatteredpixeldungeon.items.quest.Pickaxe;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CrystalSpireSprite;
+import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
+import com.watabou.utils.Callback;
 import com.watabou.utils.Random;
 
 public class CrystalSpire extends Mob {
 
 	{
-		HP = HT = 1;
+		HP = HT = 200;
 		spriteClass = CrystalSpireSprite.class;
 
 		state = PASSIVE;
+
+		alignment = Alignment.NEUTRAL;
+
+		properties.add(Property.IMMOVABLE);
+		properties.add(Property.MINIBOSS);
+		properties.add(Property.INORGANIC);
+	}
+
+	@Override
+	protected boolean act() {
+		alerted = false;
+		return super.act();
+	}
+
+	//TODO just whaling on this thing is boring, it has to do something in retaliation other than aggroing guardians
+
+	@Override
+	public void beckon(int cell) {
+		//do nothing
+	}
+
+	@Override
+	public boolean reset() {
+		return true;
+	}
+
+	@Override
+	public void damage(int dmg, Object src) {
+		if (!(src instanceof Pickaxe) ){
+			dmg = 0;
+		}
+		super.damage(dmg, src);
+	}
+
+	@Override
+	public boolean interact(Char c) {
+		if (c == Dungeon.hero){
+			final Pickaxe p = Dungeon.hero.belongings.getItem(Pickaxe.class);
+
+			if (p == null){
+				//maybe a game log entry here?
+				return true;
+			}
+
+			Dungeon.hero.sprite.attack(pos, new Callback() {
+				@Override
+				public void call() {
+					//does its own special damage calculation that's only influenced by pickaxe level
+					int dmg = Random.NormalIntRange(3+p.buffedLvl(), 15+3*p.buffedLvl());
+
+					damage(dmg, p);
+					sprite.bloodBurstA(Dungeon.hero.sprite.center(), dmg);
+					sprite.flash();
+
+					if (isAlive()) {
+						Sample.INSTANCE.play(Assets.Sounds.SHATTER, 1f, Random.Float(1.15f, 1.25f));
+						((CrystalSpireSprite) sprite).updateIdle();
+					} else {
+						Sample.INSTANCE.play(Assets.Sounds.SHATTER);
+						Sample.INSTANCE.playDelayed(Assets.Sounds.ROCKS, 0.1f);
+						PixelScene.shake( 3, 0.7f );
+						Blacksmith.Quest.beatBoss();
+					}
+
+					Dungeon.hero.spendAndNext(Actor.TICK);
+				}
+			});
+			return false;
+
+		}
+		return true;
 	}
 
 	public CrystalSpire(){
@@ -68,4 +154,13 @@ public class CrystalSpire extends Mob {
 		spriteClass = bundle.getClass(SPRITE);
 	}
 
+	{
+		immunities.add( Paralysis.class );
+		immunities.add( Amok.class );
+		immunities.add( Sleep.class );
+		immunities.add( Terror.class );
+		immunities.add( Dread.class );
+		immunities.add( Vertigo.class );
+	}
+
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
index d864f5123..d992dfea1 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
@@ -405,6 +405,10 @@ public class Blacksmith extends NPC {
 			started = true;
 		}
 
+		public static boolean beatBoss(){
+			return bossBeaten = true;
+		}
+
 		public static boolean bossBeaten(){
 			return bossBeaten;
 		}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java
index 39d4c7a35..1753faad9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java
@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.effects;
 
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTilemap;
+import com.watabou.noosa.Visual;
 import com.watabou.noosa.particles.Emitter;
 import com.watabou.noosa.particles.PixelParticle;
 import com.watabou.utils.PointF;
@@ -66,6 +67,21 @@ public class Splash {
 		emitter.burst( FACTORY, n );
 	}
 
+	public static void around(Visual v, final int color, int n ) {
+		if (n <= 0) {
+			return;
+		}
+
+		Emitter emitter = GameScene.emitter();
+		if (emitter == null) return;
+		emitter.pos( v );
+
+		FACTORY.color = color;
+		FACTORY.dir = -3.1415926f / 2;
+		FACTORY.cone = 3.1415926f;
+		emitter.burst( FACTORY, n );
+	}
+
 	public static void at( PointF p, final float dir, final float cone, final int color, int n, float interval ) {
 
 		if (n <= 0) {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CrystalSpireSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CrystalSpireSprite.java
index e05ebd33f..d3e14e270 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CrystalSpireSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CrystalSpireSprite.java
@@ -23,12 +23,17 @@ 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;
 
 public abstract class CrystalSpireSprite extends MobSprite {
 
 	{
 		perspectiveRaise = 7 / 16f; //7 pixels
+
+		shadowWidth     = 1f;
+		shadowHeight    = 1f;
+		shadowOffset    = 1f;
 	}
 
 	public CrystalSpireSprite(){
@@ -46,15 +51,44 @@ public abstract class CrystalSpireSprite extends MobSprite {
 		zap = idle.clone();
 
 		die = new Animation(1, false);
-		die.frames( frames, 0+c );
+		die.frames( frames, 4+c );
 
 		play(idle);
 	}
 
+	public void updateIdle(){
+		float hpPercent = 1f;
+		if (ch != null){
+			hpPercent = ch.HP/(float)ch.HT;
+		}
+
+		TextureFilm frames = new TextureFilm( texture, 30, 45 );
+
+		if (hpPercent > 0.8f){
+			idle.frames( frames, 0+texOffset() );
+		} else if (hpPercent > 0.5f){
+			idle.frames( frames, 1+texOffset() );
+		} else if (hpPercent > 0.25f){
+			idle.frames( frames, 2+texOffset() );
+		} else {
+			idle.frames( frames, 3+texOffset() );
+		}
+		play(idle, true);
+		run = idle.clone();
+		attack = idle.clone();
+		zap = idle.clone();
+	}
+
 	@Override
 	public void link(Char ch) {
 		super.link(ch);
-		renderShadow = false;
+		updateIdle();
+	}
+
+	@Override
+	public void die() {
+		super.die();
+		Splash.around(this, blood(), 100);
 	}
 
 	protected abstract int texOffset();
@@ -73,7 +107,7 @@ public abstract class CrystalSpireSprite extends MobSprite {
 	public static class Green extends CrystalSpireSprite {
 		@Override
 		protected int texOffset() {
-			return 1;
+			return 5;
 		}
 		@Override
 		public int blood() {
@@ -84,7 +118,7 @@ public abstract class CrystalSpireSprite extends MobSprite {
 	public static class Red extends CrystalSpireSprite {
 		@Override
 		protected int texOffset() {
-			return 2;
+			return 10;
 		}
 		@Override
 		public int blood() {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpawnerSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpawnerSprite.java
index 068cb9ac6..0ee22b7a0 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpawnerSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpawnerSprite.java
@@ -73,7 +73,7 @@ public class SpawnerSprite extends MobSprite {
 
 	@Override
 	public void die() {
-		Splash.at( center(), blood(), 100 );
+		Splash.around( this, blood(), 100 );
 		killAndErase();
 	}