From 9436993a3e8b3ae624feb4d865cb3ec9a9386dfe Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Tue, 29 Oct 2019 15:32:03 +0800
Subject: [PATCH] Implement new states for Buggle, the new Aquabuzz

---
 src/dehacked.c |  6 +++---
 src/info.c     | 10 +++++-----
 src/info.h     |  6 +++---
 src/p_inter.c  |  2 +-
 src/p_mobj.c   |  7 ++++++-
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 34ee1f170..534cabb0b 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7253,8 +7253,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_BUMBLEBORE_STUCK2",
 	"S_BUMBLEBORE_DIE",
 
-	"S_BBUZZFLY1",
-	"S_BBUZZFLY2",
+	"S_BUGGLEIDLE",
+	"S_BUGGLEFLY",
 
 	"S_SMASHSPIKE_FLOAT",
 	"S_SMASHSPIKE_EASE1",
@@ -8093,7 +8093,7 @@ static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for s
 	"MT_HIVEELEMENTAL",
 	"MT_BUMBLEBORE",
 
-	"MT_BUBBLEBUZZ",
+	"MT_BUGGLE",
 
 	"MT_SMASHINGSPIKEBALL",
 	"MT_CACOLANTERN",
diff --git a/src/info.c b/src/info.c
index cfaad552d..daa2029a6 100644
--- a/src/info.c
+++ b/src/info.c
@@ -3863,8 +3863,8 @@ state_t states[NUMSTATES] =
 	{SPR_BUMB, 5, 120, {NULL}, 0, 0, S_BUMBLEBORE_DIE}, // S_BUMBLEBORE_STUCK2
 	{SPR_BUMB, 5, 0, {A_CryingToMomma}, 0, 0, S_XPLD1}, // S_BUMBLEBORE_DIE
 
-	{SPR_BBUZ, 0, 2, {NULL}, 0, 0, S_BBUZZFLY2}, // S_BBUZZFLY1
-	{SPR_BBUZ, 1, 2, {NULL}, 0, 0, S_BBUZZFLY1}, // S_BBUZZFLY2
+	{SPR_BBUZ,          0, -1, {NULL}, 0, 0, S_NULL}, // S_BUGGLEIDLE
+	{SPR_BBUZ, FF_ANIMATE, -1, {NULL}, 1, 2, S_NULL}, // S_BUGGLEFLY
 
 	{SPR_FMCE, 0, 20, {NULL}, 0, 0, S_SMASHSPIKE_EASE1}, // S_SMASHSPIKE_FLOAT
 	{SPR_FMCE, 0,  4, {A_ZThrust},  4, (1<<16)|1, S_SMASHSPIKE_EASE2}, // S_SMASHSPIKE_EASE1
@@ -20128,11 +20128,11 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
-	{           // MT_BUBBLEBUZZ
+	{           // MT_BUGGLE
 		124,            // doomednum
-		S_BBUZZFLY1,    // spawnstate
+		S_BUGGLEIDLE,   // spawnstate
 		1,              // spawnhealth
-		S_BBUZZFLY1,    // seestate
+		S_BUGGLEFLY,    // seestate
 		sfx_None,       // seesound
 		2,              // reactiontime
 		sfx_None,       // attacksound
diff --git a/src/info.h b/src/info.h
index e7f41f585..20b471811 100644
--- a/src/info.h
+++ b/src/info.h
@@ -3927,8 +3927,8 @@ typedef enum state
 	S_BUMBLEBORE_STUCK2,
 	S_BUMBLEBORE_DIE,
 
-	S_BBUZZFLY1,
-	S_BBUZZFLY2,
+	S_BUGGLEIDLE,
+	S_BUGGLEFLY,
 
 	S_SMASHSPIKE_FLOAT,
 	S_SMASHSPIKE_EASE1,
@@ -4789,7 +4789,7 @@ typedef enum mobj_type
 	MT_HIVEELEMENTAL,
 	MT_BUMBLEBORE,
 
-	MT_BUBBLEBUZZ,
+	MT_BUGGLE,
 
 	MT_SMASHINGSPIKEBALL,
 	MT_CACOLANTERN,
diff --git a/src/p_inter.c b/src/p_inter.c
index 9017f795d..64a7d2ff8 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2615,7 +2615,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
 			target->fuse = target->info->damage;
 			break;
 
-		case MT_BUBBLEBUZZ:
+		case MT_BUGGLE:
 			if (inflictor && inflictor->player // did a player kill you? Spawn relative to the player so they're bound to get it
 			&& P_AproxDistance(inflictor->x - target->x, inflictor->y - target->y) <= inflictor->radius + target->radius + FixedMul(8*FRACUNIT, inflictor->scale) // close enough?
 			&& inflictor->z <= target->z + target->height + FixedMul(8*FRACUNIT, inflictor->scale)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 5735dc27b..93a77bcda 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8406,7 +8406,7 @@ void P_MobjThinker(mobj_t *mobj)
 					}
 				}
 				break;
-			case MT_BUBBLEBUZZ:
+			case MT_BUGGLE:
 				mobj->eflags |= MFE_UNDERWATER; //P_MobjCheckWater(mobj); // solely for MFE_UNDERWATER for A_FlickySpawn
 				{
 					if (mobj->tracer && mobj->tracer->player && mobj->tracer->health > 0
@@ -8420,6 +8420,9 @@ void P_MobjThinker(mobj_t *mobj)
 
 						if (leveltime % mobj->info->painchance == 0)
 							S_StartSound(mobj, mobj->info->activesound);
+
+						if ((statenum_t)(mobj->state-states) != mobj->info->seestate)
+							P_SetMobjState(mobj, mobj->info->seestate);
 					}
 					else
 					{
@@ -8428,6 +8431,8 @@ void P_MobjThinker(mobj_t *mobj)
 						mobj->momx >>= 1;
 						mobj->momy >>= 1;
 						mobj->momz >>= 1;
+						if ((statenum_t)(mobj->state-states) != mobj->info->spawnstate)
+							P_SetMobjState(mobj, mobj->info->spawnstate);
 					}
 				}
 				break;