From 99fd66fb6dbd09e1cd5608d8cd794cea09ddf4a5 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 6 Sep 2018 22:17:29 +0100
Subject: [PATCH 01/16] Dropping items!

* Shield Drop...
	* Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.)
	* Pops your Thunder Shield.
	* Happens upon ANY hit, except for deathpits.
* HUD Drop...
	* Also does the above, except for the Thunder Shield thing.
	* If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item!
	* You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type.
	* Happens upon Size Down and battle elimination.
	* Can also be forced on with `cv_kartdebughuddrop on`!
* Some other random stuff.
	* Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity.
	* Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter).
	* Allow shrunken players to pick up item boxes again.
	* Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.)
	* Break NiGHTS a little through my machinations.
---
 src/d_netcmd.c |   1 +
 src/d_netcmd.h |   2 +-
 src/dehacked.c |   3 +
 src/info.c     |  29 ++++++
 src/info.h     |   3 +
 src/k_kart.c   | 268 ++++++++++++++++++++++++++++++++++++++++---------
 src/k_kart.h   |   6 +-
 src/p_inter.c  |  38 +++++--
 src/p_map.c    |   2 +-
 src/p_mobj.c   | 202 +++++++++++++++++++++++++++----------
 src/sounds.c   |   1 +
 src/sounds.h   |   1 +
 12 files changed, 446 insertions(+), 110 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 8e046d928..c9343b07a 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -370,6 +370,7 @@ static CV_PossibleValue_t kartdebugamount_cons_t[] = {{1, "MIN"}, {255, "MAX"},
 consvar_t cv_kartdebugamount = {"kartdebugamount", "1", CV_NETVAR|CV_CHEAT, kartdebugamount_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_kartdebugshrink = {"kartdebugshrink", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_kartdebugdistribution = {"kartdebugdistribution", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartdebughuddrop = {"kartdebughuddrop", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_kartdebugcheckpoint = {"kartdebugcheckpoint", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 3f118944e..97dac8a96 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -133,7 +133,7 @@ extern consvar_t cv_karteliminatelast;
 
 extern consvar_t cv_votetime;
 
-extern consvar_t cv_kartdebugitem, cv_kartdebugamount, cv_kartdebugshrink, cv_kartdebugdistribution;
+extern consvar_t cv_kartdebugitem, cv_kartdebugamount, cv_kartdebugshrink, cv_kartdebugdistribution, cv_kartdebughuddrop;
 extern consvar_t cv_kartdebugcheckpoint;
 
 extern consvar_t cv_itemfinder;
diff --git a/src/dehacked.c b/src/dehacked.c
index 3473eb87c..78d6c4df3 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -6233,6 +6233,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_RANDOMITEMPOP4",
 	//}
 
+	"S_ITEMICON",
+
 	// Drift Sparks
 	"S_DRIFTSPARK1",
 	"S_DRIFTSPARK2",
@@ -7208,6 +7210,7 @@ static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for s
 	"MT_BLUEDIAG",
 	"MT_RANDOMITEM",
 	"MT_RANDOMITEMPOP",
+	"MT_FLOATINGITEM",
 
 	"MT_SNEAKERTRAIL",
 	"MT_SPARKLETRAIL",
diff --git a/src/info.c b/src/info.c
index 60cac109d..75a7655f0 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2566,6 +2566,8 @@ state_t states[NUMSTATES] =
 	{SPR_RPOP, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_RANDOMITEMPOP4}, // S_RANDOMITEMPOP3
 	{SPR_RPOP, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_NULL},           // S_RANDOMITEMPOP4
 
+	{SPR_NULL, 0|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_ITEMICON
+
 	{SPR_DRIF, 0|FF_FULLBRIGHT,  2, {NULL}, 0, 0, S_DRIFTSPARK2}, // S_DRIFTSPARK1
 	{SPR_DRIF, 1|FF_FULLBRIGHT,  2, {NULL}, 0, 0, S_DRIFTSPARK3}, // S_DRIFTSPARK2
 	{SPR_DRIF, 2|FF_FULLBRIGHT,  2, {NULL}, 0, 0, S_DRIFTSPARK1}, // S_DRIFTSPARK3
@@ -14390,6 +14392,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
+	{           // MT_FLOATINGITEM
+		-1,             // doomednum
+		S_ITEMICON,     // spawnstate
+		1,              // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_mcitm1,     // deathsound
+		0,              // speed
+		24*FRACUNIT,    // radius
+		24*FRACUNIT,    // height
+		0,              // display offset
+		100,            // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_SLIDEME|MF_SPECIAL, // flags
+		S_NULL          // raisestate
+	},
+
 	{           // MT_SNEAKERTRAIL
 		-1,             // doomednum
 		S_KARTFIRE1,    // spawnstate
diff --git a/src/info.h b/src/info.h
index 736fdfdee..ad876dc72 100644
--- a/src/info.h
+++ b/src/info.h
@@ -3078,6 +3078,8 @@ typedef enum state
 	S_RANDOMITEMPOP4,
 	//}
 
+	S_ITEMICON,
+
 	// Drift Sparks
 	S_DRIFTSPARK1,
 	S_DRIFTSPARK2,
@@ -4070,6 +4072,7 @@ typedef enum mobj_type
 	MT_BLUEDIAG,
 	MT_RANDOMITEM,
 	MT_RANDOMITEMPOP,
+	MT_FLOATINGITEM,
 
 	MT_SNEAKERTRAIL,
 	MT_SPARKLETRAIL,
diff --git a/src/k_kart.c b/src/k_kart.c
index 409560165..0c75635be 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -414,6 +414,7 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_kartdebugamount);
 	CV_RegisterVar(&cv_kartdebugshrink);
 	CV_RegisterVar(&cv_kartdebugdistribution);
+	CV_RegisterVar(&cv_kartdebughuddrop);
 
 	CV_RegisterVar(&cv_kartdebugcheckpoint);
 }
@@ -1101,7 +1102,7 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 		fx->eflags |= MFE_VERTICALFLIP;
 	else
 		fx->eflags &= ~MFE_VERTICALFLIP;
-	fx->scale = mobj1->scale;
+	P_SetScale(fx, mobj1->scale);
 
 	// Because this is done during collision now, rmomx and rmomy need to be recalculated
 	// so that friction doesn't immediately decide to stop the player if they're at a standstill
@@ -1715,6 +1716,10 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, boolean trapitem
 		P_SetPlayerMobjState(player->mo, S_KART_SPIN);
 
 	player->kartstuff[k_instashield] = 15;
+	if (cv_kartdebughuddrop.value)
+		K_DropItems(player);
+	else
+		K_DropHnextList(player);
 	return;
 }
 
@@ -1784,6 +1789,10 @@ void K_SquishPlayer(player_t *player, mobj_t *source)
 	P_PlayRinglossSound(player->mo);
 
 	player->kartstuff[k_instashield] = 15;
+	if (cv_kartdebughuddrop.value)
+		K_DropItems(player);
+	else
+		K_DropHnextList(player);
 	return;
 }
 
@@ -1861,6 +1870,10 @@ void K_ExplodePlayer(player_t *player, mobj_t *source) // A bit of a hack, we ju
 	}
 
 	player->kartstuff[k_instashield] = 15;
+	if (cv_kartdebughuddrop.value)
+		K_DropItems(player);
+	else
+		K_DropHnextList(player);
 	return;
 }
 
@@ -1936,6 +1949,10 @@ void K_StealBumper(player_t *player, player_t *victim, boolean force)
 	victim->kartstuff[k_comebacktimer] = comebacktime;*/
 
 	victim->kartstuff[k_instashield] = 15;
+	if (cv_kartdebughuddrop.value)
+		K_DropItems(victim);
+	else
+		K_DropHnextList(victim);
 	return;
 }
 
@@ -2043,14 +2060,14 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 	{
 		dust = P_SpawnMobj(source->x, source->y, source->z, MT_SMOKE);
 		dust->angle = (ANGLE_180/16) * i;
-		dust->scale = source->scale;
+		P_SetScale(dust, source->scale);
 		dust->destscale = source->scale*10;
 		P_InstaThrust(dust, dust->angle, FixedMul(20*FRACUNIT, source->scale));
 
 		truc = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
 			source->y + P_RandomRange(-radius, radius)*FRACUNIT,
 			source->z + P_RandomRange(0, height)*FRACUNIT, MT_BOOMEXPLODE);
-		truc->scale = source->scale*2;
+		P_SetScale(truc, source->scale);
 		truc->destscale = source->scale*6;
 		speed = FixedMul(10*FRACUNIT, source->scale)>>FRACBITS;
 		truc->momx = P_RandomRange(-speed, speed)*FRACUNIT;
@@ -2065,7 +2082,7 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 		dust = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
 			source->y + P_RandomRange(-radius, radius)*FRACUNIT,
 			source->z + P_RandomRange(0, height)*FRACUNIT, MT_SMOKE);
-		dust->scale = source->scale;
+		P_SetScale(dust, source->scale);
 		dust->destscale = source->scale*10;
 		dust->tics = 30;
 		dust->momz = P_RandomRange(FixedMul(3*FRACUNIT, source->scale)>>FRACBITS, FixedMul(7*FRACUNIT, source->scale)>>FRACBITS)*FRACUNIT;
@@ -2073,7 +2090,7 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 		truc = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
 			source->y + P_RandomRange(-radius, radius)*FRACUNIT,
 			source->z + P_RandomRange(0, height)*FRACUNIT, MT_BOOMPARTICLE);
-		truc->scale = source->scale;
+		P_SetScale(truc, source->scale);
 		truc->destscale = source->scale*5;
 		speed = FixedMul(20*FRACUNIT, source->scale)>>FRACBITS;
 		truc->momx = P_RandomRange(-speed, speed)*FRACUNIT;
@@ -2350,7 +2367,7 @@ void K_DriftDustHandling(mobj_t *spawner)
 		dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*FRACUNIT/4);
 		dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*FRACUNIT/4);
 		dust->momz = P_MobjFlip(spawner) * P_RandomRange(1, 4)<<FRACBITS;
-		dust->scale = spawner->scale/2;
+		P_SetScale(dust, spawner->scale/2);
 		dust->destscale = spawner->scale * 3;
 
 		if (leveltime % 6 == 0)
@@ -2808,46 +2825,190 @@ killnext:
 }
 
 // Just for firing/dropping items.
-void K_CleanHnextList(mobj_t *work)
-{
-	mobj_t *nextwork;
-
-	if (!work)
-		return;
-
-	work = work->hnext;
-
-	while (work && !P_MobjWasRemoved(work))
-	{
-		nextwork = work->hnext;
-
-		P_RemoveMobj(work);
-
-		work = nextwork;
-	}
-}
-
-// Ditto.
-void K_UpdateHnextList(player_t *player)
+void K_UpdateHnextList(player_t *player, boolean clean)
 {
 	mobj_t *work = player->mo, *nextwork;
 
 	if (!work)
 		return;
 
-	work = work->hnext;
+	nextwork = work->hnext;
 
-	while (work && !P_MobjWasRemoved(work))
+	while ((work = nextwork) && !P_MobjWasRemoved(work))
 	{
 		nextwork = work->hnext;
 
-		if (work->movedir > 0 && work->movedir > (UINT16)player->kartstuff[k_itemamount])
-			P_RemoveMobj(work);
+		if (!clean && (!work->movedir || work->movedir <= (UINT16)player->kartstuff[k_itemamount]))
+			continue;
 
-		work = nextwork;
+		P_RemoveMobj(work);
 	}
 }
 
+// For getting hit!
+void K_DropHnextList(player_t *player)
+{
+	mobj_t *work = player->mo, *nextwork, *dropwork;
+	INT32 flip;
+	mobjtype_t type;
+	boolean orbit, ponground;
+
+	if (!work)
+		return;
+
+	flip = P_MobjFlip(player->mo);
+	ponground = P_IsObjectOnGround(player->mo);
+
+	if (player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD && player->kartstuff[k_itemamount])
+	{
+		K_DoThunderShield(player);
+		player->kartstuff[k_itemamount] = 0;
+		player->kartstuff[k_itemtype] = KITEM_NONE;
+	}
+
+	nextwork = work->hnext;
+
+	while ((work = nextwork) && !P_MobjWasRemoved(work))
+	{
+		nextwork = work->hnext;
+
+		switch (work->type)
+		{
+			// Kart orbit items
+			case MT_ORBINAUT_SHIELD:
+				orbit = true;
+				type = MT_ORBINAUT;
+				break;
+			case MT_JAWZ_SHIELD:
+				orbit = true;
+				type = MT_JAWZ_DUD;
+				break;
+			// Kart trailing items
+			case MT_BANANA_SHIELD:
+				orbit = false;
+				type = MT_BANANA;
+				break;
+			case MT_SSMINE_SHIELD:
+				orbit = false;
+				type = MT_SSMINE;
+				break;
+			case MT_FAKESHIELD:
+				orbit = false;
+				type = MT_FAKEITEM;
+				break;
+			// intentionally do nothing
+			case MT_SINK_SHIELD:
+				return;
+			default:
+				continue;
+		}
+
+		dropwork = P_SpawnMobj(work->x, work->y, work->z, type);
+		P_SetTarget(&dropwork->target, player->mo);
+		dropwork->angle = work->angle;
+		dropwork->flags2 = work->flags2;
+		dropwork->flags |= MF_NOCLIPTHING;
+		dropwork->floorz = work->floorz;
+		dropwork->ceilingz = work->ceilingz;
+
+		if (ponground)
+		{
+			// floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn
+			// This should set it for FOFs
+			//P_TeleportMove(dropwork, dropwork->x, dropwork->y, dropwork->z); -- handled better by above floorz/ceilingz passing
+
+			if (flip == 1)
+			{
+				if (dropwork->floorz > dropwork->target->z - dropwork->height)
+				{
+					dropwork->z = dropwork->floorz;
+				}
+			}
+			else
+			{
+				if (dropwork->ceilingz < dropwork->target->z + dropwork->target->height + dropwork->height)
+				{
+					dropwork->z = dropwork->ceilingz - dropwork->height;
+				}
+			}
+		}
+
+		if (orbit) // splay out
+		{
+			dropwork->flags2 |= MF2_AMBUSH;
+			dropwork->z += flip;
+			dropwork->momx = player->mo->momx>>1;
+			dropwork->momy = player->mo->momy>>1;
+			dropwork->momz = 3*flip*mapheaderinfo[gamemap-1]->mobj_scale;
+			P_Thrust(dropwork, work->angle - ANGLE_90, 6*(mapheaderinfo[gamemap-1]->mobj_scale));
+			dropwork->movecount = 2;
+			dropwork->movedir = work->angle - ANGLE_90;
+			P_SetMobjState(dropwork, dropwork->info->deathstate);
+			dropwork->tics = -1;
+			if (type == MT_JAWZ_DUD)
+				dropwork->z += 20*flip*dropwork->scale;
+			else
+			{
+				dropwork->color = work->color;
+				dropwork->angle -= ANGLE_90;
+			}
+		}
+		else // plop on the ground
+		{
+			dropwork->flags &= ~MF_NOCLIPTHING;
+			dropwork->threshold = 10;
+		}
+
+		P_RemoveMobj(work);
+	}
+
+	{
+		// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
+		P_SetTarget(&player->mo->hnext, NULL);
+		player->kartstuff[k_bananadrag] = 0;
+		if (player->kartstuff[k_eggmanheld])
+			player->kartstuff[k_eggmanheld] = 0;
+		else if (player->kartstuff[k_itemheld])
+		{
+			player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
+			player->kartstuff[k_itemtype] = KITEM_NONE;
+		}
+	}
+}
+
+// For getting EXTRA hit!
+void K_DropItems(player_t *player)
+{
+	boolean thunderhack = (player->kartstuff[k_curshield] && player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD);
+
+	if (thunderhack)
+		player->kartstuff[k_itemtype] = KITEM_NONE;
+
+	K_DropHnextList(player);
+
+	if (player->mo && player->kartstuff[k_itemamount])
+	{
+		mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
+		P_SetScale(drop, drop->scale>>5);
+		drop->destscale = (3*drop->destscale)/2;;
+
+		drop->angle = player->mo->angle + ANGLE_90;
+		drop->momx = player->mo->momx>>1;
+		drop->momy = player->mo->momy>>1;
+		P_Thrust(drop,
+			FixedAngle(P_RandomFixed()*180) + player->mo->angle + ANGLE_90,
+			8*(mapheaderinfo[gamemap-1]->mobj_scale));
+		drop->momz = P_MobjFlip(player->mo)*3*(mapheaderinfo[gamemap-1]->mobj_scale);
+
+		drop->threshold = (thunderhack ? KITEM_THUNDERSHIELD : player->kartstuff[k_itemtype]);
+		drop->movecount = player->kartstuff[k_itemamount];
+
+		drop->flags |= MF_NOCLIPTHING;
+	}
+
+	K_StripItems(player);
+}
+
 // When an item in the hnext chain dies.
 void K_RepairOrbitChain(mobj_t *orbit)
 {
@@ -3859,20 +4020,18 @@ static void K_KartUpdatePosition(player_t *player)
 //
 void K_StripItems(player_t *player)
 {
-	player->kartstuff[k_itemtype] = 0;
+	player->kartstuff[k_itemtype] = KITEM_NONE;
 	player->kartstuff[k_itemamount] = 0;
 	player->kartstuff[k_itemheld] = 0;
 
-	player->kartstuff[k_itemroulette] = 0;
-	player->kartstuff[k_roulettetype] = 0;
-
 	player->kartstuff[k_rocketsneakertimer] = 0;
-	player->kartstuff[k_invincibilitytimer] = 0;
-	player->kartstuff[k_growshrinktimer] = 0;
 
+	if (!player->kartstuff[k_itemroulette] || player->kartstuff[k_roulettetype] != 2)
+	{
+		player->kartstuff[k_itemroulette] = 0;
+		player->kartstuff[k_roulettetype] = 0;
+	}
 	player->kartstuff[k_eggmanheld] = 0;
-	player->kartstuff[k_eggmanexplode] = 0;
-	player->kartstuff[k_eggmanblame] = 0;
 
 	player->kartstuff[k_hyudorotimer] = 0;
 	player->kartstuff[k_stealingtimer] = 0;
@@ -3884,7 +4043,19 @@ void K_StripItems(player_t *player)
 
 	player->kartstuff[k_sadtimer] = 0;
 
-	K_CleanHnextList(player->mo);
+	K_UpdateHnextList(player, true);
+}
+
+void K_StripOther(player_t *player)
+{
+	player->kartstuff[k_itemroulette] = 0;
+	player->kartstuff[k_roulettetype] = 0;
+
+	player->kartstuff[k_invincibilitytimer] = 0;
+	player->kartstuff[k_growshrinktimer] = 0;
+
+	player->kartstuff[k_eggmanexplode] = 0;
+	player->kartstuff[k_eggmanblame] = 0;
 }
 
 //
@@ -3950,7 +4121,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 			K_ThrowKartItem(player, false, MT_FAKEITEM, -1, 0);
 			K_PlayTauntSound(player->mo);
 			player->kartstuff[k_eggmanheld] = 0;
-			K_CleanHnextList(player->mo);
+			K_UpdateHnextList(player, true);
 		}
 		// Rocket Sneaker
 		else if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO
@@ -4037,7 +4208,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 						K_ThrowKartItem(player, false, MT_BANANA, -1, 0);
 						K_PlayTauntSound(player->mo);
 						player->kartstuff[k_itemamount]--;
-						K_UpdateHnextList(player);
+						K_UpdateHnextList(player, false);
 					}
 					break;
 				case KITEM_EGGMAN:
@@ -4097,7 +4268,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 						K_ThrowKartItem(player, true, MT_ORBINAUT, 1, 0);
 						K_PlayTauntSound(player->mo);
 						player->kartstuff[k_itemamount]--;
-						K_UpdateHnextList(player);
+						K_UpdateHnextList(player, false);
 					}
 					break;
 				case KITEM_JAWZ:
@@ -4140,7 +4311,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 							K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 0);
 						K_PlayTauntSound(player->mo);
 						player->kartstuff[k_itemamount]--;
-						K_UpdateHnextList(player);
+						K_UpdateHnextList(player, false);
 					}
 					break;
 				case KITEM_MINE:
@@ -4166,7 +4337,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 						K_PlayTauntSound(player->mo);
 						player->kartstuff[k_itemamount]--;
 						player->kartstuff[k_itemheld] = 0;
-						K_CleanHnextList(player->mo);
+						K_UpdateHnextList(player, true);
 					}
 					break;
 				case KITEM_BALLHOG:
@@ -4293,7 +4464,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 						K_PlayTauntSound(player->mo);
 						player->kartstuff[k_itemamount]--;
 						player->kartstuff[k_itemheld] = 0;
-						K_CleanHnextList(player->mo);
+						K_UpdateHnextList(player, true);
 					}
 					break;
 				case KITEM_SAD:
@@ -4372,7 +4543,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 
 		if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) // dead in match? you da bomb
 		{
-			K_StripItems(player);
+			K_DropItems(player); //K_StripItems(player);
+			K_StripOther(player);
 			player->mo->flags2 |= MF2_SHADOW;
 			player->powers[pw_flashing] = player->kartstuff[k_comebacktimer];
 		}
diff --git a/src/k_kart.h b/src/k_kart.h
index 9865d3734..bbef6c000 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -39,14 +39,16 @@ void K_DriftDustHandling(mobj_t *spawner);
 void K_DoSneaker(player_t *player, boolean doPFlag);
 void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, boolean mute);
 void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source);
-void K_CleanHnextList(mobj_t *work);
-void K_UpdateHnextList(player_t *player);
+void K_UpdateHnextList(player_t *player, boolean clean);
+void K_DropHnextList(player_t *player);
 void K_RepairOrbitChain(mobj_t *orbit);
 player_t *K_FindJawzTarget(mobj_t *actor, player_t *source);
 boolean K_CheckPlayersRespawnColliding(INT32 playernum, fixed_t x, fixed_t y);
 INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue);
 fixed_t K_GetKartDriftSparkValue(player_t *player);
+void K_DropItems(player_t *player);
 void K_StripItems(player_t *player);
+void K_StripOther(player_t *player);
 void K_MomentumToFacing(player_t *player);
 fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower);
 fixed_t K_GetKartAccel(player_t *player);
diff --git a/src/p_inter.c b/src/p_inter.c
index 7e35731aa..c8d42b23f 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -181,13 +181,13 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon)
 		{
 			// Item-specific timer going off
 			if (player->kartstuff[k_stealingtimer]				|| player->kartstuff[k_stolentimer]
-				|| player->kartstuff[k_growshrinktimer] != 0	|| player->kartstuff[k_rocketsneakertimer]
+				|| player->kartstuff[k_growshrinktimer] > 0	|| player->kartstuff[k_rocketsneakertimer]
 				|| player->kartstuff[k_eggmanexplode])
 				return false;
 
 			// Item slot already taken up
 			if (player->kartstuff[k_itemroulette]
-				|| player->kartstuff[k_itemamount]
+				|| (weapon != 3 && player->kartstuff[k_itemamount])
 				|| player->kartstuff[k_itemheld]) 
 				return false;
 		}
@@ -429,6 +429,27 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 	// We now identify by object type, not sprite! Tails 04-11-2001
 	switch (special->type)
 	{
+		case MT_FLOATINGITEM: // SRB2kart
+			if (!P_CanPickupItem(player, 3) || (player->kartstuff[k_itemamount] && player->kartstuff[k_itemtype] != special->threshold))
+				return;
+
+			if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
+				return;
+
+			player->kartstuff[k_itemtype] = special->threshold;
+			player->kartstuff[k_itemamount] += special->movecount;
+			if (player->kartstuff[k_itemamount] > 255)
+				player->kartstuff[k_itemamount] = 255;
+
+			S_StartSound(special, special->info->deathsound);
+
+			P_SetTarget(&special->tracer, toucher);
+			special->flags2 |= MF2_NIGHTSPULL;
+			special->destscale = mapheaderinfo[gamemap-1]->mobj_scale>>5;
+			special->scalespeed <<= 1;
+
+			special->flags &= ~MF_SPECIAL;
+			return;
 		case MT_RANDOMITEM:			// SRB2kart
 			if (!P_CanPickupItem(player, 1))
 				return;
@@ -469,9 +490,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 				mobj_t *poof = P_SpawnMobj(special->x, special->y, special->z, MT_EXPLODE);
 				S_StartSound(poof, special->info->deathsound);
 
-				K_StripItems(player);
-				if (player->kartstuff[k_itemroulette] <= 0)
-					player->kartstuff[k_itemroulette] = 1;
+				K_DropItems(player); //K_StripItems(player);
+				K_StripOther(player);
+				player->kartstuff[k_itemroulette] = 1;
 				player->kartstuff[k_roulettetype] = 2;
 				if (special->target && special->target->player
 					&& (G_RaceGametype() || special->target->player->kartstuff[k_bumper] > 0))
@@ -2626,6 +2647,11 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		}
 	}
 
+	if ((target->type == MT_JAWZ || target->type == MT_JAWZ_DUD || target->type == MT_JAWZ_SHIELD) && !(target->flags2 & MF2_AMBUSH))
+	{
+		target->z += P_MobjFlip(target)*20*target->scale;
+	}
+
 	if (target->type == MT_SPIKE && inflictor && target->info->deathstate != S_NULL)
 	{
 		const fixed_t x=target->x,y=target->y,z=target->z;
@@ -3335,6 +3361,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 					player->mo->destscale = 6*player->mo->destscale/8;
 
 				// Wipeout
+				K_DropItems(player);
 				K_SpinPlayer(player, source, 1, false);
 				damage = player->mo->health - 1;
 				P_RingDamage(player, inflictor, source, damage);
@@ -3346,7 +3373,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 					quake.time = 5;
 				}
 
-				K_StripItems(player);
 				player->kartstuff[k_growshrinktimer] -= (200+(40*(16-player->kartstuff[k_position])));
 			}
 			// Grow? Let's take that away.
diff --git a/src/p_map.c b/src/p_map.c
index 88045a3e1..c97ee9091 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -497,7 +497,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		return true;
 	}
 
-	if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_PAIN|MF_SHOOTABLE)))
+	if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_PAIN|MF_SHOOTABLE)) || (thing->flags & MF_NOCLIPTHING))
 		return true;
 
 	// Don't collide with your buddies while NiGHTS-flying.
diff --git a/src/p_mobj.c b/src/p_mobj.c
index fb6eed541..dc4ac0365 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6006,7 +6006,7 @@ void P_Attract(mobj_t *source, mobj_t *dest, boolean nightsgrab) // Home in on y
 		return;
 
 	// change angle
-	source->angle = R_PointToAngle2(source->x, source->y, tx, ty);
+	//source->angle = R_PointToAngle2(source->x, source->y, tx, ty);
 
 	// change slope
 	dist = P_AproxDistance(P_AproxDistance(tx - source->x, ty - source->y), tz - source->z);
@@ -6015,7 +6015,7 @@ void P_Attract(mobj_t *source, mobj_t *dest, boolean nightsgrab) // Home in on y
 		dist = 1;
 
 	if (nightsgrab)
-		speedmul = P_AproxDistance(dest->momx, dest->momy) + FixedMul(8*FRACUNIT, source->scale);
+		speedmul = P_AproxDistance(dest->momx, dest->momy) + source->scale;
 	else
 		speedmul = P_AproxDistance(dest->momx, dest->momy) + FixedMul(source->info->speed, source->scale);
 
@@ -6348,6 +6348,9 @@ void P_RunShadows(void)
 					break;
 			}
 		}
+
+		if (mobj->target->type == MT_FLOATINGITEM)
+			P_SetScale(mobj, mobj->scale/2);
 	}
 	P_SetTarget(&shadowcap, NULL);
 }
@@ -6727,7 +6730,7 @@ void P_MobjThinker(mobj_t *mobj)
 				/*if (mobj->health > 0 && mobj->target && mobj->target->player
 					&& mobj->target->player->health > 0 && !mobj->target->player->spectator)
 				{
-					// Was this so hard? -- Handled this with K_UpdateHnextList and K_ClearHnextList instead of thinking it away...
+					// Was this so hard? -- Handled this with K_UpdateHnextList instead of thinking it away...
 					if ((mobj->type == MT_ORBINAUT_SHIELD && mobj->target->player->kartstuff[k_itemtype] != KITEM_ORBINAUT)
 						|| (mobj->type == MT_JAWZ_SHIELD && mobj->target->player->kartstuff[k_itemtype] != KITEM_JAWZ)
 						|| (mobj->movedir > 0 && ((UINT16)mobj->target->player->kartstuff[k_itemamount] < mobj->movedir))
@@ -6911,14 +6914,16 @@ void P_MobjThinker(mobj_t *mobj)
 					mobj->x = mobj->target->x;
 					mobj->y = mobj->target->y;
 
+					mobj->angle = R_PointToAngle(mobj->x, mobj->y) + ANGLE_90; // literally only happened because i wanted to ^L^R the SPR_ITEM's
+
 					if (!(mobj->target->eflags & MFE_VERTICALFLIP))
 					{
-						mobj->z = mobj->target->z + P_GetPlayerHeight(mobj->target->player)+16*FRACUNIT;
+						mobj->z = mobj->target->z + P_GetPlayerHeight(mobj->target->player)+(16+11)*mapheaderinfo[gamemap-1]->mobj_scale;
 						mobj->eflags &= ~MFE_VERTICALFLIP;
 					}
 					else
 					{
-						mobj->z = mobj->target->z - P_GetPlayerHeight(mobj->target->player)+16*FRACUNIT;
+						mobj->z = mobj->target->z - P_GetPlayerHeight(mobj->target->player)+(16+11)*mapheaderinfo[gamemap-1]->mobj_scale;
 						mobj->eflags |= MFE_VERTICALFLIP;
 					}
 					P_SetThingPosition(mobj);
@@ -6934,7 +6939,8 @@ void P_MobjThinker(mobj_t *mobj)
 						mobj->tracer = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
 						P_SetTarget(&mobj->tracer->target, mobj);
 						P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM);
-						P_SetScale(mobj->tracer, mobj->scale);
+						P_SetMobjState(mobj->tracer, S_ITEMICON); // null sprite and frame to be overwritten later
+						P_SetScale(mobj->tracer, (mobj->tracer->destscale = mobj->scale));
 					}
 
 					if (!(mobj->flags2 & MF2_DONTDRAW))
@@ -7027,7 +7033,7 @@ void P_MobjThinker(mobj_t *mobj)
 						else
 						{
 							P_SetMobjState(mobj, S_PLAYERARROW);
-							P_SetMobjState(mobj->tracer, S_INVISIBLE);
+							P_SetMobjState(mobj->tracer, S_ITEMICON); // null sprite and frame to be overwritten later
 						}
 
 						mobj->tracer->destscale = scale;
@@ -7097,12 +7103,12 @@ void P_MobjThinker(mobj_t *mobj)
 
 					if (!(mobj->target->eflags & MFE_VERTICALFLIP))
 					{
-						mobj->z = mobj->target->z + (P_GetPlayerHeight(mobj->target->player)+16*FRACUNIT+(64*mobj->scale));
+						mobj->z = mobj->target->z + (P_GetPlayerHeight(mobj->target->player)+16*mapheaderinfo[gamemap-1]->mobj_scale+(64*mobj->scale));
 						mobj->eflags &= ~MFE_VERTICALFLIP;
 					}
 					else
 					{
-						mobj->z = mobj->target->z - (P_GetPlayerHeight(mobj->target->player)+16*FRACUNIT+(64*mobj->scale));
+						mobj->z = mobj->target->z - (P_GetPlayerHeight(mobj->target->player)+16*mapheaderinfo[gamemap-1]->mobj_scale+(64*mobj->scale));
 						mobj->eflags |= MFE_VERTICALFLIP;
 					}
 					P_SetThingPosition(mobj);
@@ -8007,46 +8013,120 @@ void P_MobjThinker(mobj_t *mobj)
 				mobj->threshold = 0;
 			}
 			break;
-		case MT_ORBINAUT:
+		case MT_FLOATINGITEM:
 		{
-			sector_t *sec2;
-			fixed_t finalspeed = mobj->info->speed;
-
-			P_SpawnGhostMobj(mobj);
-
-			if (gamespeed == 0)
-				finalspeed = FixedMul(finalspeed, FRACUNIT-FRACUNIT/4);
-			else if (gamespeed == 2)
-				finalspeed = FixedMul(finalspeed, FRACUNIT+FRACUNIT/4);
-
-			mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy);
-			if (mobj->health <= 5)
+			if (mobj->flags & MF_NOCLIPTHING)
 			{
-				INT32 i;
-				for (i = 5; i >= mobj->health; i--)
+				if (P_IsObjectOnGround(mobj))
 				{
-					finalspeed = FixedMul(finalspeed, FRACUNIT-FRACUNIT/4);
+					mobj->momx = 1;
+					mobj->momy = 0;
+					mobj->flags &= ~MF_NOCLIPTHING;
+					mobj->flags |= MF_NOGRAVITY;
 				}
-				finalspeed = FixedMul(finalspeed, mapheaderinfo[gamemap-1]->mobj_scale);
-				P_InstaThrust(mobj, mobj->angle, finalspeed);
 			}
 			else
 			{
-				finalspeed = FixedMul(finalspeed, mapheaderinfo[gamemap-1]->mobj_scale);
-				P_InstaThrust(mobj, mobj->angle, finalspeed);
+				mobj->angle += 2*ANG2;
+				if (mobj->flags2 & MF2_NIGHTSPULL)
+				{
+					if (!mobj->tracer || !mobj->tracer->health
+					|| mobj->scale <= mapheaderinfo[gamemap-1]->mobj_scale>>5)
+					{
+						P_RemoveMobj(mobj);
+						return;
+					}
+					P_Attract(mobj, mobj->tracer, true);
+				}
+				else
+				{
+					fixed_t adj = FixedMul(FRACUNIT - FINECOSINE((mobj->movedir>>ANGLETOFINESHIFT) & FINEMASK), (mapheaderinfo[gamemap-1]->mobj_scale<<3));
+					mobj->movedir += 2*ANG2;
+					if (mobj->eflags & MFE_VERTICALFLIP)
+						mobj->z = mobj->ceilingz - mobj->height - adj;
+					else
+						mobj->z = mobj->floorz + adj;
+				}
 			}
 
-			sec2 = P_ThingOnSpecial3DFloor(mobj);
-			if ((sec2 && GETSECSPECIAL(sec2->special, 3) == 1)
-				|| (P_IsObjectOnRealGround(mobj, mobj->subsector->sector)
-				&& GETSECSPECIAL(mobj->subsector->sector->special, 3) == 1))
-				K_DoPogoSpring(mobj, 0, false);
+			switch (mobj->threshold)
+			{
+				case KITEM_ORBINAUT:
+					mobj->sprite = SPR_ITMO;
+					mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE|(min(mobj->movecount-1, 3));
+					break;
+				case KITEM_INVINCIBILITY:
+					mobj->sprite = SPR_ITMI;
+					mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE|((leveltime % (7*3)) / 3);
+					break;
+				case KITEM_SAD:
+					mobj->sprite = SPR_ITEM;
+					mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE;
+					break;
+				default:
+					mobj->sprite = SPR_ITEM;
+					mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE|(mobj->threshold);
+					break;
+				}
+			break;
+		}
+		case MT_ORBINAUT:
+		{
+			boolean grounded = P_IsObjectOnGround(mobj);
+			if (mobj->flags2 & MF2_AMBUSH)
+			{
+				if (grounded && (mobj->flags & MF_NOCLIPTHING))
+				{
+					mobj->momx = 1;
+					mobj->momy = 0;
+					mobj->frame = 3;
+					S_StartSound(mobj, mobj->info->activesound);
+					mobj->flags &= ~MF_NOCLIPTHING;
+				}
+				else if (mobj->movecount)
+					mobj->movecount--;
+				else if (mobj->frame < 3)
+				{
+					mobj->movecount = 2;
+					mobj->frame++;
+				}
+			}
+			else
+			{
+				fixed_t finalspeed = mobj->info->speed;
 
-			if (mobj->threshold > 0)
-				mobj->threshold--;
+				P_SpawnGhostMobj(mobj);
 
-			if (leveltime % 6 == 0)
-				S_StartSound(mobj, mobj->info->activesound);
+				if (gamespeed == 0)
+					finalspeed = FixedMul(finalspeed, FRACUNIT-FRACUNIT/4);
+				else if (gamespeed == 2)
+					finalspeed = FixedMul(finalspeed, FRACUNIT+FRACUNIT/4);
+
+				mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy);
+				if (mobj->health <= 5)
+				{
+					INT32 i;
+					for (i = 5; i >= mobj->health; i--)
+						finalspeed = FixedMul(finalspeed, FRACUNIT-FRACUNIT/4);
+				}
+				finalspeed = FixedMul(finalspeed, mapheaderinfo[gamemap-1]->mobj_scale);
+				P_InstaThrust(mobj, mobj->angle, finalspeed);
+
+				if (grounded)
+				{
+					sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj);
+					if ((sec2 && GETSECSPECIAL(sec2->special, 3) == 1)
+						|| (P_IsObjectOnRealGround(mobj, mobj->subsector->sector)
+						&& GETSECSPECIAL(mobj->subsector->sector->special, 3) == 1))
+						K_DoPogoSpring(mobj, 0, false);
+				}
+
+				if (mobj->threshold > 0)
+					mobj->threshold--;
+
+				if (leveltime % 6 == 0)
+					S_StartSound(mobj, mobj->info->activesound);
+			}
 			break;
 		}
 		case MT_JAWZ:
@@ -8119,23 +8199,38 @@ void P_MobjThinker(mobj_t *mobj)
 		}
 		case MT_JAWZ_DUD:
 		{
-			sector_t *sec2;
+			boolean grounded = P_IsObjectOnGround(mobj);
+			if (mobj->flags2 & MF2_AMBUSH)
+			{
+				if (grounded && (mobj->flags & MF_NOCLIPTHING))
+				{
+					mobj->momx = 1;
+					mobj->momy = 0;
+					S_StartSound(mobj, mobj->info->deathsound);
+					mobj->flags &= ~MF_NOCLIPTHING;
+				}
+			}
+			else
+			{
+				P_SpawnGhostMobj(mobj);
+				mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy);
+				P_InstaThrust(mobj, mobj->angle, mobj->info->speed);
 
-			P_SpawnGhostMobj(mobj);
-			mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy);
-			P_InstaThrust(mobj, mobj->angle, mobj->info->speed);
+				if (grounded)
+				{
+					sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj);
+					if ((sec2 && GETSECSPECIAL(sec2->special, 3) == 1)
+						|| (P_IsObjectOnRealGround(mobj, mobj->subsector->sector)
+						&& GETSECSPECIAL(mobj->subsector->sector->special, 3) == 1))
+						K_DoPogoSpring(mobj, 0, false);
+				}
 
-			sec2 = P_ThingOnSpecial3DFloor(mobj);
-			if ((sec2 && GETSECSPECIAL(sec2->special, 3) == 1)
-				|| (P_IsObjectOnRealGround(mobj, mobj->subsector->sector)
-				&& GETSECSPECIAL(mobj->subsector->sector->special, 3) == 1))
-				K_DoPogoSpring(mobj, 0, false);
+				if (mobj->threshold > 0)
+					mobj->threshold--;
 
-			if (mobj->threshold > 0)
-				mobj->threshold--;
-
-			if (leveltime % TICRATE == 0)
-				S_StartSound(mobj, mobj->info->activesound);
+				if (leveltime % TICRATE == 0)
+					S_StartSound(mobj, mobj->info->activesound);
+			}
 
 			break;
 		}
@@ -9155,6 +9250,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 		case MT_BIGMACE:		case MT_SMALLMACE:
 		case MT_FALLINGROCK:
 		//case MT_RANDOMITEM:
+		case MT_FLOATINGITEM:
 		case MT_BATTLEBUMPER:
 		case MT_BANANA:			case MT_BANANA_SHIELD:
 		//case MT_FAKEITEM: 		case MT_FAKESHIELD:
@@ -9254,6 +9350,8 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster)
 	if (mapheaderinfo[gamemap-1] && mapheaderinfo[gamemap-1]->mobj_scale != FRACUNIT) //&& !(mobj->type == MT_BLACKEGGMAN)
 		mobj->destscale = mapheaderinfo[gamemap-1]->mobj_scale;
 
+	P_SetScale(mobj, mobj->destscale);
+
 	// set subsector and/or block links
 	P_SetThingPosition(mobj);
 	I_Assert(mobj->subsector != NULL);
diff --git a/src/sounds.c b/src/sounds.c
index 6e9562609..b68c8afa9 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -811,6 +811,7 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"noooo1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"noooo2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"hogbom", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"mcitm1", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"dbgsal", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
 
   // SRB2kart - Skin sounds
diff --git a/src/sounds.h b/src/sounds.h
index 2f0732736..86319c335 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -883,6 +883,7 @@ typedef enum
 	sfx_noooo1,
 	sfx_noooo2,
 	sfx_hogbom,
+	sfx_mcitm1,
 	sfx_dbgsal,
 
 	sfx_kwin,

From d8f445f456169e83c2c50c03ecf101f318942557 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 7 Sep 2018 14:26:00 +0100
Subject: [PATCH 02/16] * Slightly more papersprite stability! * Slightly more
 sane Minecraft item scaling!

---
 src/k_kart.c   | 2 +-
 src/p_inter.c  | 2 +-
 src/p_mobj.c   | 2 +-
 src/r_things.c | 9 +++------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 477f710ef..55c1802a1 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3008,7 +3008,7 @@ void K_DropItems(player_t *player)
 	if (player->mo && player->kartstuff[k_itemamount])
 	{
 		mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
-		P_SetScale(drop, drop->scale>>5);
+		P_SetScale(drop, drop->scale>>4);
 		drop->destscale = (3*drop->destscale)/2;;
 
 		drop->angle = player->mo->angle + ANGLE_90;
diff --git a/src/p_inter.c b/src/p_inter.c
index c8d42b23f..aab44b5fe 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -445,7 +445,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 			P_SetTarget(&special->tracer, toucher);
 			special->flags2 |= MF2_NIGHTSPULL;
-			special->destscale = mapheaderinfo[gamemap-1]->mobj_scale>>5;
+			special->destscale = mapheaderinfo[gamemap-1]->mobj_scale>>4;
 			special->scalespeed <<= 1;
 
 			special->flags &= ~MF_SPECIAL;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7093e7814..baf0f1f2e 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8031,7 +8031,7 @@ void P_MobjThinker(mobj_t *mobj)
 				if (mobj->flags2 & MF2_NIGHTSPULL)
 				{
 					if (!mobj->tracer || !mobj->tracer->health
-					|| mobj->scale <= mapheaderinfo[gamemap-1]->mobj_scale>>5)
+					|| mobj->scale <= mapheaderinfo[gamemap-1]->mobj_scale>>4)
 					{
 						P_RemoveMobj(mobj);
 						return;
diff --git a/src/r_things.c b/src/r_things.c
index 5adcecd44..dbe31cb1e 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1266,7 +1266,6 @@ static void R_ProjectSprite(mobj_t *thing)
 	if (papersprite)
 	{
 		fixed_t yscale2, cosmul, sinmul, tz2;
-		INT32 range;
 
 		if (ang >= ANGLE_180)
 		{
@@ -1296,12 +1295,10 @@ static void R_ProjectSprite(mobj_t *thing)
 		if (max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier
 			return;
 
-		if (x2 > x1)
-			range = (x2 - x1);
-		else
-			range = 1;
+		if (x2 <= x1)
+			return;
 
-		scalestep = (yscale2 - yscale)/range;
+		scalestep = (yscale2 - yscale)/(x2 - x1);
 
 		// The following two are alternate sorting methods which might be more applicable in some circumstances. TODO - maybe enable via MF2?
 		// sortscale = max(yscale, yscale2);

From 00931cbb357d61d226fe2118fc79071120812fee Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 8 Sep 2018 12:12:28 +0100
Subject: [PATCH 03/16] Watertight fix I was avoiding because it's definitely
 slower to check ranges at runtime, but papersprites are used intermittently
 enough that I don't think it's a super big deal.

---
 src/r_things.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/r_things.c b/src/r_things.c
index dbe31cb1e..6166c762d 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -917,6 +917,16 @@ static void R_DrawVisSprite(vissprite_t *vis)
 
 	for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
 	{
+		if (vis->scalestep) // currently papersprites only
+		{
+#ifndef RANGECHECK
+			if ((frac>>FRACBITS) >= SHORT(patch->width)) // slower but kills intermittent crashes...
+				break;
+#endif
+			sprtopscreen = (centeryfrac - FixedMul(dc_texturemid, spryscale));
+			dc_iscale = (0xffffffffu / (unsigned)spryscale);
+			spryscale += vis->scalestep;
+		}
 #ifdef RANGECHECK
 		texturecolumn = frac>>FRACBITS;
 
@@ -926,16 +936,10 @@ static void R_DrawVisSprite(vissprite_t *vis)
 #else
 		column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[frac>>FRACBITS]));
 #endif
-		if (vis->scalestep)
-		{
-			sprtopscreen = (centeryfrac - FixedMul(dc_texturemid, spryscale));
-			dc_iscale = (0xffffffffu / (unsigned)spryscale);
-		}
 		if (vis->vflip)
 			R_DrawFlippedMaskedColumn(column, patch->height);
 		else
 			R_DrawMaskedColumn(column);
-		spryscale += vis->scalestep;
 	}
 
 	colfunc = basecolfunc;
@@ -1257,7 +1261,7 @@ static void R_ProjectSprite(mobj_t *thing)
 
 	offset2 = FixedMul(spritecachedinfo[lump].width, this_scale);
 	tx += FixedMul(offset2, ang_scale);
-	x2 = ((centerxfrac + FixedMul (tx,xscale)) >> FRACBITS) - (papersprite ? 2 : 1);
+	x2 = ((centerxfrac + FixedMul (tx,xscale)) >> FRACBITS) - 1;
 
 	// off the left side
 	if (x2 < 0)

From cf56852909f0919e8c4c61ecefba637daa0f90ad Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 8 Sep 2018 23:45:51 +0100
Subject: [PATCH 04/16] Make bomb attacks HUD drop. (Karma may be changed
 later, but Oni said let's try all together first...)

---
 src/k_kart.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index a53eb7f45..61c9446d3 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1886,10 +1886,10 @@ void K_ExplodePlayer(player_t *player, mobj_t *source) // A bit of a hack, we ju
 	}
 
 	player->kartstuff[k_instashield] = 15;
-	if (cv_kartdebughuddrop.value)
+	//if (cv_kartdebughuddrop.value)
 		K_DropItems(player);
-	else
-		K_DropHnextList(player);
+	/*else
+		K_DropHnextList(player);*/
 	return;
 }
 

From adebd8c4e0c04c4138cafc49de7b859feb0bfb5e Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 9 Sep 2018 13:47:19 +0100
Subject: [PATCH 05/16] `// if this doesn't work i'm removing papersprites`

(check both the left and right side overflow of the sprite column being drawn)
---
 src/r_things.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/r_things.c b/src/r_things.c
index 6166c762d..7f6e39745 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -920,7 +920,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
 		if (vis->scalestep) // currently papersprites only
 		{
 #ifndef RANGECHECK
-			if ((frac>>FRACBITS) >= SHORT(patch->width)) // slower but kills intermittent crashes...
+			if ((frac>>FRACBITS) < 0 || (frac>>FRACBITS) >= SHORT(patch->width)) // if this doesn't work i'm removing papersprites
 				break;
 #endif
 			sprtopscreen = (centeryfrac - FixedMul(dc_texturemid, spryscale));
@@ -1271,6 +1271,9 @@ static void R_ProjectSprite(mobj_t *thing)
 	{
 		fixed_t yscale2, cosmul, sinmul, tz2;
 
+		if (x2 <= x1)
+			return;
+
 		if (ang >= ANGLE_180)
 		{
 			offset *= -1;
@@ -1299,9 +1302,6 @@ static void R_ProjectSprite(mobj_t *thing)
 		if (max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier
 			return;
 
-		if (x2 <= x1)
-			return;
-
 		scalestep = (yscale2 - yscale)/(x2 - x1);
 
 		// The following two are alternate sorting methods which might be more applicable in some circumstances. TODO - maybe enable via MF2?

From fd679bd2aa15f00f1235f412ab046df97f82d6fb Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 12 Sep 2018 19:03:45 +0100
Subject: [PATCH 06/16] * Chao audience! 	* Replaces the CZ64-era
 hopping Mario guys. 	* ~50% randomised colours! 	* 1/9 are FANS! 
 	* On mapload, some Chao select a random player in the server (even
 spectators) as their idol. 		* The fans cheer for their idol when
 they cross the finish line in a winning position! 		* They also
 sob when their idol loses. 	* The remaining percentage are the canon Aqua.
 * Minor on-field spikeball/fake radius alterations requested by Oni.

---
 src/dehacked.c | 15 ++++-------
 src/info.c     | 27 +++++++++----------
 src/info.h     | 15 ++++-------
 src/p_mobj.c   | 71 ++++++++++++++++++++++++++++++++++++++++++++++++--
 src/sounds.c   |  1 +
 src/sounds.h   |  1 +
 6 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 6365453fe..a6f3074dd 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -6519,16 +6519,11 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 
 	// Audience Members
 	"S_RANDOMAUDIENCE",
-	"S_AUDIENCE_TOAD1",
-	"S_AUDIENCE_TOAD2",
-	"S_AUDIENCE_BOO1",
-	"S_AUDIENCE_BOO2",
-	"S_AUDIENCE_GMBA1",
-	"S_AUDIENCE_GMBA2",
-	"S_AUDIENCE_SHYG1",
-	"S_AUDIENCE_SHYG2",
-	"S_AUDIENCE_SNIF1",
-	"S_AUDIENCE_SNIF2",
+	"S_AUDIENCE_CHAO_CHEER1",
+	"S_AUDIENCE_CHAO_CHEER2",
+	"S_AUDIENCE_CHAO_WIN1",
+	"S_AUDIENCE_CHAO_WIN2",
+	"S_AUDIENCE_CHAO_LOSE",
 
 	"S_FANCHAR_KOTE",
 	"S_FANCHAR_RYAN",
diff --git a/src/info.c b/src/info.c
index e7c40cb94..554f410ab 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2831,18 +2831,15 @@ state_t states[NUMSTATES] =
 	{SPR_POKE, 3,  2, {A_MoveAbsolute}, 180, 2, S_POKEY5}, // S_POKEY8
 	{SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL},               // S_POKEYIDLE
 
-	{SPR_NULL, 0,  1, {A_RandomStateRange}, S_AUDIENCE_TOAD1, S_AUDIENCE_SNIF1, S_RANDOMAUDIENCE}, // S_RANDOMAUDIENCE
+	{SPR_NULL, 0,  1, {A_RandomStateRange}, S_AUDIENCE_CHAO_CHEER1, S_AUDIENCE_CHAO_CHEER2, S_RANDOMAUDIENCE}, // S_RANDOMAUDIENCE
 
-	{SPR_AUDI, 0,  5, {NULL},       0, 0, S_AUDIENCE_TOAD2}, // S_AUDIENCE_TOAD1
-	{SPR_AUDI, 1, 20, {A_BunnyHop}, 7, 0, S_AUDIENCE_TOAD1}, // S_AUDIENCE_TOAD2
-	{SPR_AUDI, 2,  5, {NULL},       0, 0, S_AUDIENCE_BOO2},  // S_AUDIENCE_BOO1
-	{SPR_AUDI, 3, 20, {A_BunnyHop}, 7, 0, S_AUDIENCE_BOO1},  // S_AUDIENCE_BOO2
-	{SPR_AUDI, 4,  5, {NULL},       0, 0, S_AUDIENCE_GMBA2}, // S_AUDIENCE_GMBA1
-	{SPR_AUDI, 5, 20, {A_BunnyHop}, 7, 0, S_AUDIENCE_GMBA1}, // S_AUDIENCE_GMBA2
-	{SPR_AUDI, 6,  5, {NULL},       0, 0, S_AUDIENCE_SHYG2}, // S_AUDIENCE_SHYG1
-	{SPR_AUDI, 7, 20, {A_BunnyHop}, 7, 0, S_AUDIENCE_SHYG1}, // S_AUDIENCE_SHYG2
-	{SPR_AUDI, 8,  5, {NULL},       0, 0, S_AUDIENCE_SNIF2}, // S_AUDIENCE_SNIF1
-	{SPR_AUDI, 9, 20, {A_BunnyHop}, 7, 0, S_AUDIENCE_SNIF1}, // S_AUDIENCE_SNIF2
+	{SPR_AUDI, 0,  5, {NULL},       0, 0, S_AUDIENCE_CHAO_CHEER2}, // S_AUDIENCE_CHAO_CHEER1
+	{SPR_AUDI, 1, 20, {A_BunnyHop}, 7, 0, S_AUDIENCE_CHAO_CHEER1}, // S_AUDIENCE_CHAO_CHEER2
+
+	{SPR_AUDI, 2,  5, {NULL},       0, 0, S_AUDIENCE_CHAO_WIN2}, // S_AUDIENCE_CHAO_WIN1
+	{SPR_AUDI, 3, 25, {A_BunnyHop}, 10, 0, S_AUDIENCE_CHAO_WIN1}, // S_AUDIENCE_CHAO_WIN2
+
+	{SPR_AUDI, 4|FF_ANIMATE,  -1, {NULL},       1, 17, S_NULL}, // S_AUDIENCE_CHAO_LOSE
 
 	{SPR_AUDI, 10, -1, {NULL}, 0, 0, S_NULL}, // S_FANCHAR_KOTE
 	{SPR_AUDI, 11, -1, {NULL}, 0, 0, S_NULL}, // S_FANCHAR_RYAN
@@ -14691,7 +14688,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL,         // xdeathstate
 		sfx_kc2e,       // deathsound
 		0,              // speed
-		16*FRACUNIT,    // radius
+		24*FRACUNIT,    // radius
 		32*FRACUNIT,    // height
 		0,              // display offset
 		100,            // mass
@@ -14772,7 +14769,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL,         // xdeathstate
 		sfx_s3k5d,      // deathsound
 		64*FRACUNIT,    // speed
-		16*FRACUNIT,    // radius
+		24*FRACUNIT,    // radius
 		32*FRACUNIT,    // height
 		0,              // display offset
 		100,            // mass
@@ -15501,8 +15498,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL,         // xdeathstate
 		sfx_None,       // deathsound
 		8,              // speed
-		16*FRACUNIT,    // radius
-		40*FRACUNIT,    // height
+		8*FRACUNIT,     // radius
+		20*FRACUNIT,    // height
 		0,              // display offset
 		100,            // mass
 		0,              // damage
diff --git a/src/info.h b/src/info.h
index 53b5809aa..c5f98983c 100644
--- a/src/info.h
+++ b/src/info.h
@@ -3366,16 +3366,11 @@ typedef enum state
 
 	// Audience Members
 	S_RANDOMAUDIENCE,
-	S_AUDIENCE_TOAD1,
-	S_AUDIENCE_TOAD2,
-	S_AUDIENCE_BOO1,
-	S_AUDIENCE_BOO2,
-	S_AUDIENCE_GMBA1,
-	S_AUDIENCE_GMBA2,
-	S_AUDIENCE_SHYG1,
-	S_AUDIENCE_SHYG2,
-	S_AUDIENCE_SNIF1,
-	S_AUDIENCE_SNIF2,
+	S_AUDIENCE_CHAO_CHEER1,
+	S_AUDIENCE_CHAO_CHEER2,
+	S_AUDIENCE_CHAO_WIN1,
+	S_AUDIENCE_CHAO_WIN2,
+	S_AUDIENCE_CHAO_LOSE,
 
 	S_FANCHAR_KOTE,
 	S_FANCHAR_RYAN,
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 59b5c6cff..6c946e097 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8927,6 +8927,39 @@ void P_SceneryThinker(mobj_t *mobj)
 	}
 
 	P_CycleMobjState(mobj);
+
+	if (mobj->type != MT_RANDOMAUDIENCE)
+		return;
+
+	{
+		if (!mobj->colorized) // a fan of someone?
+			return;
+
+		if (mobj->threshold >= 0) // not already happy or sad?
+		{
+			if (!playeringame[mobj->threshold] || players[mobj->threshold].spectator) // focused on a valid player?
+				return;
+
+			if (!(players[mobj->threshold].exiting) && !(players[mobj->threshold].pflags & PF_TIMEOVER)) // not finished yet?
+				return;
+
+			if (K_IsPlayerLosing(&players[mobj->threshold]))
+				mobj->threshold = -2;
+			else
+			{
+				mobj->threshold = -1;
+				S_StartSound(mobj, sfx_chaooo);
+			}
+		}
+
+		if (mobj->threshold == -1)
+			mobj->angle += ANGLE_22h;
+
+		if (((statenum_t)(mobj->state-states) != S_AUDIENCE_CHAO_CHEER2) || (mobj->tics != states[S_AUDIENCE_CHAO_CHEER2].tics)) // not at the start of your cheer jump?
+			return;
+
+		P_SetMobjState(mobj, ((mobj->threshold == -1) ? S_AUDIENCE_CHAO_WIN2 : S_AUDIENCE_CHAO_LOSE));
+	}
 }
 
 //
@@ -9174,9 +9207,43 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 			}
 			break;
 		case MT_BIGRING:
-			mobj->destscale = 3*FRACUNIT;
-			P_SetScale(mobj, 3*FRACUNIT);
+			P_SetScale(mobj, (mobj->destscale = 3*FRACUNIT));
 			break;
+		case MT_RANDOMAUDIENCE:
+		{
+			fixed_t randu = P_RandomFixed();
+			P_SetScale(mobj, (mobj->destscale <<= 1));
+			if (randu < (FRACUNIT/9)) // a fan of someone?
+			{
+				UINT8 i, pcount = 0;
+				UINT8 pnum[MAXPLAYERS];
+
+				for (i = 0; i < MAXPLAYERS; i++)
+				{
+					if (!playeringame[i])
+						continue;
+					pnum[pcount] = i;
+					pcount++;
+				}
+
+				if (pcount)
+				{
+					mobj->threshold = pnum[P_RandomKey(pcount)];
+					mobj->color = players[mobj->threshold].skincolor;
+					mobj->colorized = true;
+					break;
+				}
+			}
+
+			if (randu > (FRACUNIT/2))
+			{
+				mobj->color = P_RandomKey(MAXSKINCOLORS-1)+1;
+				break;
+			}
+
+			mobj->color = SKINCOLOR_AQUA;
+			break;
+		}
 		default:
 			break;
 	}
diff --git a/src/sounds.c b/src/sounds.c
index 7c69eed7b..938f35ea4 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -813,6 +813,7 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"hogbom", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"ddash",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"mcitm1", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"chaooo", false, 110, 24, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"dbgsal", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
 
   // SRB2kart - Skin sounds
diff --git a/src/sounds.h b/src/sounds.h
index 13669e3a8..9aaaf2817 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -885,6 +885,7 @@ typedef enum
 	sfx_hogbom,
 	sfx_ddash,
 	sfx_mcitm1,
+	sfx_chaooo,
 	sfx_dbgsal,
 
 	sfx_kwin,

From 18c0e607fa29cce9fce2ae1b43262522ce33e7ad Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 13 Sep 2018 14:34:41 +0100
Subject: [PATCH 07/16] Make the chao quieter (if it's still too loud, I can
 tone it down further, but not by much)

---
 src/sounds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sounds.c b/src/sounds.c
index 938f35ea4..c30a3e529 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -813,7 +813,7 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"hogbom", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"ddash",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"mcitm1", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"chaooo", false, 110, 24, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"chaooo", false, 110, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"dbgsal", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
 
   // SRB2kart - Skin sounds

From 00438f4c41419ac72b3a7e500e1672e26e3166ec Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 13 Sep 2018 14:36:48 +0100
Subject: [PATCH 08/16] Dark SPB background

---
 src/k_kart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 32b4a8941..270bdf8a1 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -5652,7 +5652,7 @@ static void K_drawKartItem(void)
 				case KITEM_JAWZ:				localpatch = kp_jawz[offset]; break;
 				case KITEM_MINE:				localpatch = kp_mine[offset]; break;
 				case KITEM_BALLHOG:				localpatch = kp_ballhog[offset]; break;
-				case KITEM_SPB:					localpatch = kp_selfpropelledbomb[offset]; break;
+				case KITEM_SPB:					localpatch = kp_selfpropelledbomb[offset]; localbg = kp_itembg[offset+1]; break;
 				case KITEM_GROW:				localpatch = kp_grow[offset]; break;
 				case KITEM_SHRINK:				localpatch = kp_shrink[offset]; break;
 				case KITEM_THUNDERSHIELD:		localpatch = kp_thundershield[offset]; break;

From 63f990e6f28dff2d2d7e731e7f680b35714ca794 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 13 Sep 2018 14:40:50 +0100
Subject: [PATCH 09/16] Bugfix sad chao jumping in their sad state

---
 src/p_mobj.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 6c946e097..c6bcc2ba5 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8958,6 +8958,8 @@ void P_SceneryThinker(mobj_t *mobj)
 		if (((statenum_t)(mobj->state-states) != S_AUDIENCE_CHAO_CHEER2) || (mobj->tics != states[S_AUDIENCE_CHAO_CHEER2].tics)) // not at the start of your cheer jump?
 			return;
 
+		mobj->momz = 0;
+
 		P_SetMobjState(mobj, ((mobj->threshold == -1) ? S_AUDIENCE_CHAO_WIN2 : S_AUDIENCE_CHAO_LOSE));
 	}
 }

From 45455ca35b802ab0c008cc70de2ec49b0c3948ab Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 13 Sep 2018 19:01:36 +0100
Subject: [PATCH 10/16] Thunder shield stuff! 	* Slightly bigger visual size!
 	* Light-shadow! 	* Makes player fullbright if you have it! 
 * Visuals finally removed instantly on shield drop! 	* Uses dark background
 for item icons! 	* Goes behind the player on some frames, faking
 layering!

---
 src/info.c   | 50 +++++++++++++++++++++++++-------------------------
 src/k_kart.c |  7 +++++--
 src/p_mobj.c | 43 ++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/src/info.c b/src/info.c
index 554f410ab..172439f71 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2784,30 +2784,30 @@ state_t states[NUMSTATES] =
 	{SPR_LIGH, 2,  2, {NULL}, 0, 0, S_LIGHTNING4}, // S_LIGHTNING3
 	{SPR_LIGH, 3,  2, {NULL}, 0, 0, S_NULL},       // S_LIGHTNING4
 
-	{SPR_THNS, FF_FULLBRIGHT,    2, {NULL}, 0, 0, S_THUNDERSHIELD2},		// S_THUNDERSHIELD1
-	{SPR_THNS, FF_FULLBRIGHT|1,  2, {NULL}, 0, 0, S_THUNDERSHIELD3},		// S_THUNDERSHIELD2
-	{SPR_THNS, FF_FULLBRIGHT|2,  2, {NULL}, 0, 0, S_THUNDERSHIELD4},		// S_THUNDERSHIELD3
-	{SPR_THNS, FF_FULLBRIGHT|3,  2, {NULL}, 0, 0, S_THUNDERSHIELD5},		// S_THUNDERSHIELD4
-	{SPR_THNS, FF_FULLBRIGHT|4,  2, {NULL}, 0, 0, S_THUNDERSHIELD6},		// S_THUNDERSHIELD5
-	{SPR_THNS, FF_FULLBRIGHT|5,  2, {NULL}, 0, 0, S_THUNDERSHIELD7},		// S_THUNDERSHIELD6
-	{SPR_THNS, FF_FULLBRIGHT|6,  2, {NULL}, 0, 0, S_THUNDERSHIELD8},		// S_THUNDERSHIELD7
-	{SPR_THNS, FF_FULLBRIGHT|7,  2, {NULL}, 0, 0, S_THUNDERSHIELD9},		// S_THUNDERSHIELD8
-	{SPR_THNS, FF_FULLBRIGHT|8,  2, {NULL}, 0, 0, S_THUNDERSHIELD10},		// S_THUNDERSHIELD9
-	{SPR_THNS, FF_FULLBRIGHT|9,  2, {NULL}, 0, 0, S_THUNDERSHIELD11},		// S_THUNDERSHIELD10
-	{SPR_THNS, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_THUNDERSHIELD12},		// S_THUNDERSHIELD11
-	{SPR_THNS, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_THUNDERSHIELD13},		// S_THUNDERSHIELD12
-	{SPR_THNS, FF_FULLBRIGHT|8,  2, {NULL}, 0, 0, S_THUNDERSHIELD14},		// S_THUNDERSHIELD13
-	{SPR_THNS, FF_FULLBRIGHT|7,  2, {NULL}, 0, 0, S_THUNDERSHIELD15},		// S_THUNDERSHIELD14
-	{SPR_THNS, FF_FULLBRIGHT|6,  2, {NULL}, 0, 0, S_THUNDERSHIELD16},		// S_THUNDERSHIELD15
-	{SPR_THNS, FF_FULLBRIGHT|5,  2, {NULL}, 0, 0, S_THUNDERSHIELD17},		// S_THUNDERSHIELD16
-	{SPR_THNS, FF_FULLBRIGHT|4,  2, {NULL}, 0, 0, S_THUNDERSHIELD18},		// S_THUNDERSHIELD17
-	{SPR_THNS, FF_FULLBRIGHT|3,  2, {NULL}, 0, 0, S_THUNDERSHIELD19},		// S_THUNDERSHIELD18
-	{SPR_THNS, FF_FULLBRIGHT|2,  2, {NULL}, 0, 0, S_THUNDERSHIELD20},		// S_THUNDERSHIELD19
-	{SPR_THNS, FF_FULLBRIGHT|1,  2, {NULL}, 0, 0, S_THUNDERSHIELD21},		// S_THUNDERSHIELD20
-	{SPR_THNS, FF_FULLBRIGHT|0,  2, {NULL}, 0, 0, S_THUNDERSHIELD22},		// S_THUNDERSHIELD21
-	{SPR_THNS, FF_FULLBRIGHT|9,  2, {NULL}, 0, 0, S_THUNDERSHIELD23},		// S_THUNDERSHIELD22
-	{SPR_THNS, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_THUNDERSHIELD24},		// S_THUNDERSHIELD23
-	{SPR_THNS, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_THUNDERSHIELD1},		// S_THUNDERSHIELD24
+	{SPR_THNS, FF_FULLBRIGHT|9,  2, {NULL}, 0, 0, S_THUNDERSHIELD2},		// S_THUNDERSHIELD1
+	{SPR_THNS, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_THUNDERSHIELD3},		// S_THUNDERSHIELD2
+	{SPR_THNS, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_THUNDERSHIELD4},		// S_THUNDERSHIELD3
+	{SPR_THNS, FF_FULLBRIGHT,    2, {NULL}, 0, 0, S_THUNDERSHIELD5},		// S_THUNDERSHIELD4
+	{SPR_THNS, FF_FULLBRIGHT|1,  2, {NULL}, 0, 0, S_THUNDERSHIELD6},		// S_THUNDERSHIELD5
+	{SPR_THNS, FF_FULLBRIGHT|2,  2, {NULL}, 0, 0, S_THUNDERSHIELD7},		// S_THUNDERSHIELD6
+	{SPR_THNS, FF_FULLBRIGHT|3,  2, {NULL}, 0, 0, S_THUNDERSHIELD8},		// S_THUNDERSHIELD7
+	{SPR_THNS, FF_FULLBRIGHT|4,  2, {NULL}, 0, 0, S_THUNDERSHIELD9},		// S_THUNDERSHIELD8
+	{SPR_THNS, FF_FULLBRIGHT|5,  2, {NULL}, 0, 0, S_THUNDERSHIELD10},		// S_THUNDERSHIELD9
+	{SPR_THNS, FF_FULLBRIGHT|6,  2, {NULL}, 0, 0, S_THUNDERSHIELD11},		// S_THUNDERSHIELD10
+	{SPR_THNS, FF_FULLBRIGHT|7,  2, {NULL}, 0, 0, S_THUNDERSHIELD12},		// S_THUNDERSHIELD11
+	{SPR_THNS, FF_FULLBRIGHT|8,  2, {NULL}, 0, 0, S_THUNDERSHIELD13},		// S_THUNDERSHIELD12
+	{SPR_THNS, FF_FULLBRIGHT|9,  2, {NULL}, 0, 0, S_THUNDERSHIELD14},		// S_THUNDERSHIELD13
+	{SPR_THNS, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_THUNDERSHIELD15},		// S_THUNDERSHIELD14
+	{SPR_THNS, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_THUNDERSHIELD16},		// S_THUNDERSHIELD15
+	{SPR_THNS, FF_FULLBRIGHT|8,  2, {NULL}, 0, 0, S_THUNDERSHIELD17},		// S_THUNDERSHIELD16
+	{SPR_THNS, FF_FULLBRIGHT|7,  2, {NULL}, 0, 0, S_THUNDERSHIELD18},		// S_THUNDERSHIELD17
+	{SPR_THNS, FF_FULLBRIGHT|6,  2, {NULL}, 0, 0, S_THUNDERSHIELD19},		// S_THUNDERSHIELD18
+	{SPR_THNS, FF_FULLBRIGHT|5,  2, {NULL}, 0, 0, S_THUNDERSHIELD20},		// S_THUNDERSHIELD19
+	{SPR_THNS, FF_FULLBRIGHT|4,  2, {NULL}, 0, 0, S_THUNDERSHIELD21},		// S_THUNDERSHIELD20
+	{SPR_THNS, FF_FULLBRIGHT|3,  2, {NULL}, 0, 0, S_THUNDERSHIELD22},		// S_THUNDERSHIELD21
+	{SPR_THNS, FF_FULLBRIGHT|2,  2, {NULL}, 0, 0, S_THUNDERSHIELD23},		// S_THUNDERSHIELD22
+	{SPR_THNS, FF_FULLBRIGHT|1,  2, {NULL}, 0, 0, S_THUNDERSHIELD24},		// S_THUNDERSHIELD23
+	{SPR_THNS, FF_FULLBRIGHT|0,  2, {NULL}, 0, 0, S_THUNDERSHIELD1},		// S_THUNDERSHIELD24
 
 	{SPR_SINK, 0,  1, {A_SmokeTrailer}, MT_SINKTRAIL, 0, S_SINK},	// S_SINK
 	{SPR_SINK, 0|FF_TRANS80|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_SINK_SHIELD}, // S_SINK_SHIELD
@@ -15255,7 +15255,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL,         // xdeathstate
 		sfx_None,       // deathsound
 		8,              // speed
-		16*FRACUNIT,    // radius
+		20*FRACUNIT,    // radius
 		56*FRACUNIT,    // height
 		1,              // display offset
 		16,             // mass
diff --git a/src/k_kart.c b/src/k_kart.c
index 270bdf8a1..ed13612f3 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2985,6 +2985,7 @@ void K_DropHnextList(player_t *player)
 		K_DoThunderShield(player);
 		player->kartstuff[k_itemamount] = 0;
 		player->kartstuff[k_itemtype] = KITEM_NONE;
+		player->kartstuff[k_curshield] = 0;
 	}
 
 	nextwork = work->hnext;
@@ -3771,7 +3772,8 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 
 void K_KartPlayerAfterThink(player_t *player)
 {
-	if (player->kartstuff[k_invincibilitytimer]
+	if (player->kartstuff[k_curshield]
+		|| player->kartstuff[k_invincibilitytimer]
 		|| (player->kartstuff[k_growshrinktimer] != 0 && player->kartstuff[k_growshrinktimer] % 5 == 4)) // 4 instead of 0 because this is afterthink!
 	{
 		player->mo->frame |= FF_FULLBRIGHT;
@@ -4539,6 +4541,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 					if (player->kartstuff[k_curshield] <= 0)
 					{
 						mobj_t *shield = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THUNDERSHIELD);
+						P_SetScale(shield, (shield->destscale = (5*shield->destscale)>>2));
 						P_SetTarget(&shield->target, player->mo);
 						player->kartstuff[k_curshield] = 1;
 					}
@@ -5655,7 +5658,7 @@ static void K_drawKartItem(void)
 				case KITEM_SPB:					localpatch = kp_selfpropelledbomb[offset]; localbg = kp_itembg[offset+1]; break;
 				case KITEM_GROW:				localpatch = kp_grow[offset]; break;
 				case KITEM_SHRINK:				localpatch = kp_shrink[offset]; break;
-				case KITEM_THUNDERSHIELD:		localpatch = kp_thundershield[offset]; break;
+				case KITEM_THUNDERSHIELD:		localpatch = kp_thundershield[offset]; localbg = kp_itembg[offset+1]; break;
 				case KITEM_HYUDORO:				localpatch = kp_hyudoro[offset]; break;
 				case KITEM_POGOSPRING:			localpatch = kp_pogospring[offset]; break;
 				case KITEM_KITCHENSINK:			localpatch = kp_kitchensink[offset]; break;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index c6bcc2ba5..1381cefaf 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6276,8 +6276,7 @@ static void P_RemoveOverlay(mobj_t *thing)
 
 void P_RunShadows(void)
 {
-	mobj_t *mobj;
-	mobj_t *next;
+	mobj_t *mobj, *next, *dest;
 
 	for (mobj = shadowcap; mobj; mobj = next)
 	{
@@ -6322,7 +6321,12 @@ void P_RunShadows(void)
 		// First scale to the same radius
 		P_SetScale(mobj, FixedDiv(mobj->target->radius, mobj->info->radius));
 
-		P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
+		dest = mobj->target;
+
+		if (dest->type == MT_THUNDERSHIELD)
+			dest = dest->target;
+
+		P_TeleportMove(mobj, dest->x, dest->y, mobj->target->z);
 
 		if (((mobj->eflags & MFE_VERTICALFLIP) && (mobj->ceilingz > mobj->z+mobj->height))
 			|| (!(mobj->eflags & MFE_VERTICALFLIP) && (mobj->floorz < mobj->z)))
@@ -6340,7 +6344,7 @@ void P_RunShadows(void)
 				P_SetScale(mobj, FixedDiv(mobj->scale, max(FRACUNIT, ((mobj->target->z-mobj->z)/200)+FRACUNIT)));
 
 				// Check new position to see if you should still be on that ledge
-				P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->z);
+				P_TeleportMove(mobj, dest->x, dest->y, mobj->z);
 
 				mobj->z = (mobj->eflags & MFE_VERTICALFLIP ? mobj->ceilingz : mobj->floorz);
 
@@ -8301,13 +8305,41 @@ void P_MobjThinker(mobj_t *mobj)
 			P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
 			break;
 		case MT_THUNDERSHIELD:
+		{
+			fixed_t destx, desty;
 			if (!mobj->target || !mobj->target->health || (mobj->target->player && mobj->target->player->kartstuff[k_curshield] != 1))
 			{
 				P_RemoveMobj(mobj);
 				return;
 			}
-			P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
+			P_SetScale(mobj, (mobj->destscale = (5*mobj->target->destscale)>>2));
+
+			if (!splitscreen /*&& rendermode != render_soft*/)
+			{
+				angle_t viewingangle;
+				statenum_t curstate = ((mobj->tics == 1) ? (mobj->state->nextstate) : ((statenum_t)(mobj->state-states)));
+
+				if (players[displayplayer].awayviewtics)
+					viewingangle = R_PointToAngle2(mobj->target->x, mobj->target->y, players[displayplayer].awayviewmobj->x, players[displayplayer].awayviewmobj->y);
+				else if (!camera.chase && players[displayplayer].mo)
+					viewingangle = R_PointToAngle2(mobj->target->x, mobj->target->y, players[displayplayer].mo->x, players[displayplayer].mo->y);
+				else
+					viewingangle = R_PointToAngle2(mobj->target->x, mobj->target->y, camera.x, camera.y);
+
+				if (curstate > S_THUNDERSHIELD15)
+					viewingangle += ANGLE_180;
+				destx = mobj->target->x + P_ReturnThrustX(mobj->target, viewingangle, mobj->scale>>4);
+				desty = mobj->target->y + P_ReturnThrustY(mobj->target, viewingangle, mobj->scale>>4);
+			}
+			else
+			{
+				destx = mobj->target->x;
+				desty = mobj->target->y;
+			}
+
+			P_TeleportMove(mobj, destx, desty, mobj->target->z);
 			break;
+		}
 		case MT_KARMAHITBOX:
 			if (!mobj->target || !mobj->target->health || !mobj->target->player || mobj->target->player->spectator
 				|| (G_RaceGametype() || mobj->target->player->kartstuff[k_bumper]))
@@ -9264,6 +9296,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 		case MT_JAWZ: 			case MT_JAWZ_DUD: 		case MT_JAWZ_SHIELD:
 		case MT_SSMINE: 		case MT_SSMINE_SHIELD:
 		case MT_BALLHOG: 		case MT_SINK:
+		case MT_THUNDERSHIELD:
 			P_SpawnShadowMobj(mobj);
 		default:
 			break;

From e342315ca84c5ec5fbea8424b581fc26444700b6 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 13 Sep 2018 20:41:12 +0100
Subject: [PATCH 11/16] Fix a potential crash vector in the shadows code. (It
 DEFINITELY crashed when I was testing the thunder shield, for example.)

---
 src/p_mobj.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 1381cefaf..79d9c9948 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6283,8 +6283,11 @@ void P_RunShadows(void)
 		next = mobj->hnext;
 		P_SetTarget(&mobj->hnext, NULL);
 
-		if (!mobj->target)
+		if (!mobj->target || P_MobjWasRemoved(mobj->target))
+		{
+			mobj->flags2 |= MF2_DONTDRAW;
 			continue; // shouldn't you already be dead?
+		}
 
 		if ((mobj->target->flags2 & MF2_DONTDRAW)
 			|| (((mobj->target->eflags & MFE_VERTICALFLIP) && mobj->target->z+mobj->target->height > mobj->target->ceilingz)

From 239be94fa8b9b6642ea823c67ec6eee81b5be78b Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 13 Sep 2018 20:51:30 +0100
Subject: [PATCH 12/16] Make these sparks fullbright (thanks, Ancient Tomb!)

---
 src/info.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/info.c b/src/info.c
index 172439f71..9581f238e 100644
--- a/src/info.c
+++ b/src/info.c
@@ -1756,11 +1756,11 @@ state_t states[NUMSTATES] =
 	{SPR_IVSP, FF_ANIMATE, 32, {NULL}, 31, 1, S_NULL},   // S_IVSP
 
 	// Super Sonic Spark
-	{SPR_SSPK, 0, 2, {NULL}, 0, 0, S_SSPK2}, // S_SSPK1
-	{SPR_SSPK, 1, 2, {NULL}, 0, 0, S_SSPK3}, // S_SSPK2
-	{SPR_SSPK, 2, 2, {NULL}, 0, 0, S_SSPK4}, // S_SSPK3
-	{SPR_SSPK, 1, 2, {NULL}, 0, 0, S_SSPK5}, // S_SSPK4
-	{SPR_SSPK, 0, 2, {NULL}, 0, 0, S_NULL},  // S_SSPK5
+	{SPR_SSPK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK2}, // S_SSPK1
+	{SPR_SSPK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK3}, // S_SSPK2
+	{SPR_SSPK, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK4}, // S_SSPK3
+	{SPR_SSPK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK5}, // S_SSPK4
+	{SPR_SSPK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL},  // S_SSPK5
 
 	// Freed Birdie
 	{SPR_BIRD, 0, 4, {NULL}, 0, 0, S_BIRD2},    // S_BIRD1

From 670b7d74fc1932998fc755973b54fd950e588e90 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 14 Sep 2018 00:19:23 +0100
Subject: [PATCH 13/16] angel island drift strat plus ketchup

---
 src/d_player.h |  1 +
 src/dehacked.c |  4 ++++
 src/info.c     | 31 ++++++++++++++++++++++++-
 src/info.h     |  6 +++++
 src/k_kart.c   | 63 ++++++++++++++++++++++++++++++++++++++++++++------
 5 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index 822ea305a..373110dd3 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -305,6 +305,7 @@ typedef enum
 	k_accelboost,		// Boost value smoothing for acceleration
 	k_boostcam,			// Camera push forward on boost
 	k_destboostcam,		// Ditto
+	k_aizdriftstrat,	// Let go of your drift while boosting? Helper for the SICK STRATZ you have just unlocked
 
 	k_itemroulette,		// Used for the roulette when deciding what item to give you (was "pw_kartitem")
 	k_roulettetype,		// Used for the roulette, for deciding type (currently only used for Battle, to give you better items from Karma items)
diff --git a/src/dehacked.c b/src/dehacked.c
index 4658108a2..fc0529a91 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -6271,6 +6271,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_KARTFIRE7",
 	"S_KARTFIRE8",
 
+	// Angel Island Drift Strat Dust (what a mouthful!)
+	"S_KARTAIZDRIFTSTRAT",
+
 	// Invincibility Sparks
 	"S_KARTINVULN_SMALL1",
 	"S_KARTINVULN_SMALL2",
@@ -7220,6 +7223,7 @@ static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for s
 	"MT_BOOSTFLAME",
 	"MT_BOOSTSMOKE",
 	"MT_SNEAKERTRAIL",
+	"MT_AIZDRIFTSTRAT",
 	"MT_SPARKLETRAIL",
 	"MT_INVULNFLASH",
 	"MT_WIPEOUTTRAIL",
diff --git a/src/info.c b/src/info.c
index 9581f238e..b0783a69d 100644
--- a/src/info.c
+++ b/src/info.c
@@ -60,7 +60,7 @@ char sprnames[NUMSPRITES + 1][5] =
 	"BLIG","LIGH","THNS","SINK","SITR","KBLN","DEZL","POKE","AUDI","DECO",
 	"DOOD","SNES","GBAS","SPRS","BUZB","CHOM","SACO","CRAB","SHAD","BRNG",
 	"BUMP","FLEN","CLAS","PSHW","ISTA","ISTB","ARRO","ITEM","ITMO","ITMI",
-	"ITMN","WANT","PBOM","RETI","VIEW"
+	"ITMN","WANT","PBOM","RETI","AIDU","VIEW"
 };
 
 // Doesn't work with g++, needs actionf_p1 (don't modify this comment)
@@ -2601,6 +2601,8 @@ state_t states[NUMSTATES] =
 	{SPR_KFRE, FF_FULLBRIGHT|5,  2, {NULL}, 0, 0, S_KARTFIRE8}, // S_KARTFIRE7
 	{SPR_KFRE, FF_FULLBRIGHT|6,  2, {NULL}, 0, 0, S_NULL},      // S_KARTFIRE8
 
+	{SPR_AIDU, FF_ANIMATE|FF_PAPERSPRITE, 5*2, {NULL}, 5, 2, S_NULL}, // S_KARTAIZDRIFTSTRAT
+
 	{SPR_KINV, FF_FULLBRIGHT,    1, {NULL}, 0, 0, S_KARTINVULN_SMALL2},	// S_KARTINVULN_SMALL1
 	{SPR_KINV, FF_FULLBRIGHT|1,  1, {NULL}, 0, 0, S_KARTINVULN_SMALL3},	// S_KARTINVULN_SMALL2
 	{SPR_KINV, FF_FULLBRIGHT|2,  1, {NULL}, 0, 0, S_KARTINVULN_SMALL4},	// S_KARTINVULN_SMALL3
@@ -14509,6 +14511,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
+	{           // MT_AIZDRIFTSTRAT
+		-1,             // doomednum
+		S_KARTAIZDRIFTSTRAT,// spawnstate
+		1,              // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		8,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		8,              // speed
+		14*FRACUNIT,    // radius
+		14*FRACUNIT,    // height
+		0,              // display offset
+		100,            // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
+		S_NULL          // raisestate
+	},
+
 	{           // MT_SPARKLETRAIL
 		-1,						// doomednum
 		S_KARTINVULN_SMALL1,	// spawnstate
diff --git a/src/info.h b/src/info.h
index c5f98983c..134988102 100644
--- a/src/info.h
+++ b/src/info.h
@@ -641,6 +641,8 @@ typedef enum sprite
 	SPR_PBOM, // player bomb
 	SPR_RETI, // player reticule
 
+	SPR_AIDU,
+
 	SPR_VIEW, // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw!
 
 	SPR_FIRSTFREESLOT,
@@ -3118,6 +3120,9 @@ typedef enum state
 	S_KARTFIRE7,
 	S_KARTFIRE8,
 
+	// Angel Island Drift Strat Dust (what a mouthful!)
+	S_KARTAIZDRIFTSTRAT,
+
 	// Invincibility Sparks
 	S_KARTINVULN_SMALL1,
 	S_KARTINVULN_SMALL2,
@@ -4084,6 +4089,7 @@ typedef enum mobj_type
 	MT_BOOSTFLAME,
 	MT_BOOSTSMOKE,
 	MT_SNEAKERTRAIL,
+	MT_AIZDRIFTSTRAT,
 	MT_SPARKLETRAIL,
 	MT_INVULNFLASH,
 	MT_WIPEOUTTRAIL,
diff --git a/src/k_kart.c b/src/k_kart.c
index ed13612f3..6ab905dc3 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2271,7 +2271,7 @@ static void K_SpawnDriftSparks(player_t *player)
 			if (player->kartstuff[k_driftcharge] <= (K_GetKartDriftSparkValue(player)*2)+(32*3))
 				spark->color = SKINCOLOR_DUSK; // transition
 			else
-				spark->color = SKINCOLOR_RUBY;
+				spark->color = SKINCOLOR_KETCHUP;
 		}
 		else
 			spark->color = SKINCOLOR_SAPPHIRE;
@@ -2306,6 +2306,46 @@ static void K_SpawnDriftSparks(player_t *player)
 	}
 }
 
+static void K_SpawnAIZDust(player_t *player)
+{
+	fixed_t newx;
+	fixed_t newy;
+	mobj_t *spark;
+	angle_t travelangle;
+
+	I_Assert(player != NULL);
+	I_Assert(player->mo != NULL);
+	I_Assert(!P_MobjWasRemoved(player->mo));
+
+	if (leveltime % 2 == 1)
+		return;
+
+	if (!P_IsObjectOnGround(player->mo))
+		return;
+
+	travelangle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
+
+	{
+		newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45), FixedMul(24*FRACUNIT, player->mo->scale));
+		newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45), FixedMul(24*FRACUNIT, player->mo->scale));
+		spark = P_SpawnMobj(newx, newy, player->mo->z, MT_AIZDRIFTSTRAT);
+
+		spark->angle = travelangle+(player->kartstuff[k_aizdriftstrat]*ANGLE_90);
+		P_SetScale(spark, (spark->destscale = (3*player->mo->scale)>>2));
+
+		spark->momx = (6*player->mo->momx)/5;
+		spark->momy = (6*player->mo->momy)/5;
+		//spark->momz = player->mo->momz/2;
+
+		spark->flags2 = (spark->flags2 & ~MF2_DONTDRAW)|(player->mo->eflags & MF2_DONTDRAW);
+		spark->eflags = (spark->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP);
+		spark->eflags = (spark->eflags & ~MFE_DRAWONLYFORP1)|(player->mo->eflags & MFE_DRAWONLYFORP1);
+		spark->eflags = (spark->eflags & ~MFE_DRAWONLYFORP2)|(player->mo->eflags & MFE_DRAWONLYFORP2);
+		spark->eflags = (spark->eflags & ~MFE_DRAWONLYFORP3)|(player->mo->eflags & MFE_DRAWONLYFORP3);
+		spark->eflags = (spark->eflags & ~MFE_DRAWONLYFORP4)|(player->mo->eflags & MFE_DRAWONLYFORP4);
+	}
+}
+
 void K_SpawnBoostTrail(player_t *player)
 {
 	fixed_t newx;
@@ -3947,16 +3987,14 @@ static void K_KartDrift(player_t *player, boolean onground)
 	{
 		// Starting left drift
 		player->kartstuff[k_drift] = 1;
-		player->kartstuff[k_driftend] = 0;
-		player->kartstuff[k_driftcharge] = 0;
+		player->kartstuff[k_driftend] = player->kartstuff[k_driftcharge] = 0;
 	}
 	else if ((player->cmd.driftturn < 0) && player->speed > FixedMul(10<<16, player->mo->scale) && player->kartstuff[k_jmp] == 1
 		&& (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) // && player->kartstuff[k_drift] != -1)
 	{
 		// Starting right drift
 		player->kartstuff[k_drift] = -1;
-		player->kartstuff[k_driftend] = 0;
-		player->kartstuff[k_driftcharge] = 0;
+		player->kartstuff[k_driftend] = player->kartstuff[k_driftcharge] = 0;
 	}
 	else if (player->kartstuff[k_jmp] == 0) // || player->kartstuff[k_turndir] == 0)
 	{
@@ -4015,9 +4053,20 @@ static void K_KartDrift(player_t *player, boolean onground)
 	if (player->kartstuff[k_spinouttimer] > 0 // banana peel
 		|| player->speed < FixedMul(10<<16, player->mo->scale)) // you're too slow!
 	{
-		player->kartstuff[k_drift] = 0;
-		player->kartstuff[k_driftcharge] = 0;
+		player->kartstuff[k_drift] = player->kartstuff[k_driftcharge] = player->kartstuff[k_aizdriftstrat] = 0;
 	}
+
+	if ((!player->kartstuff[k_sneakertimer])
+	|| (!player->cmd.driftturn)
+	|| (player->cmd.driftturn > 0) != (player->kartstuff[k_aizdriftstrat] > 0))
+	{
+		if (!player->kartstuff[k_drift])
+			player->kartstuff[k_aizdriftstrat] = 0;
+		else
+			player->kartstuff[k_aizdriftstrat] = ((player->kartstuff[k_drift] > 0) ? 1 : -1);
+	}
+	else if (player->kartstuff[k_aizdriftstrat] && !player->kartstuff[k_drift])
+		K_SpawnAIZDust(player);
 }
 //
 // K_KartUpdatePosition

From 91c6776cc46df0b4c2f29a8134ba1caffadedfe9 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Fri, 14 Sep 2018 00:29:39 -0400
Subject: [PATCH 14/16] Add to DeHackEd!

---
 src/dehacked.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dehacked.c b/src/dehacked.c
index fc0529a91..4621357ae 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7703,6 +7703,7 @@ static const char *const KARTSTUFF_LIST[] = {
 	"ACCELBOOST",
 	"BOOSTCAM",
 	"DESTBOOSTCAM",
+	"AIZDRIFTSTRAT",
 
 	"ITEMROULETTE",
 	"ROULETTETYPE",

From 5d496f43c6032c9f15d3de908574ec75386fa47b Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Tue, 18 Sep 2018 17:40:39 +0100
Subject: [PATCH 15/16] :boi:

(fix driftsparks, and subsequently sliptides because i copypasted most of the code for them, disappearing underwater)
---
 src/k_kart.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 6ab905dc3..b294b9f5f 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2297,7 +2297,7 @@ static void K_SpawnDriftSparks(player_t *player)
 				P_SetMobjState(spark, S_DRIFTSPARK_A1);
 		}
 
-		spark->flags2 = (spark->flags2 & ~MF2_DONTDRAW)|(player->mo->eflags & MF2_DONTDRAW);
+		spark->flags2 = (spark->flags2 & ~MF2_DONTDRAW)|(player->mo->flags2 & MF2_DONTDRAW);
 		spark->eflags = (spark->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP);
 		spark->eflags = (spark->eflags & ~MFE_DRAWONLYFORP1)|(player->mo->eflags & MFE_DRAWONLYFORP1);
 		spark->eflags = (spark->eflags & ~MFE_DRAWONLYFORP2)|(player->mo->eflags & MFE_DRAWONLYFORP2);
@@ -2337,7 +2337,7 @@ static void K_SpawnAIZDust(player_t *player)
 		spark->momy = (6*player->mo->momy)/5;
 		//spark->momz = player->mo->momz/2;
 
-		spark->flags2 = (spark->flags2 & ~MF2_DONTDRAW)|(player->mo->eflags & MF2_DONTDRAW);
+		spark->flags2 = (spark->flags2 & ~MF2_DONTDRAW)|(player->mo->flags2 & MF2_DONTDRAW);
 		spark->eflags = (spark->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP);
 		spark->eflags = (spark->eflags & ~MFE_DRAWONLYFORP1)|(player->mo->eflags & MFE_DRAWONLYFORP1);
 		spark->eflags = (spark->eflags & ~MFE_DRAWONLYFORP2)|(player->mo->eflags & MFE_DRAWONLYFORP2);

From b21863afdbd1f056c485a96fa123debfb6e55d54 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 21 Sep 2018 22:06:27 +0100
Subject: [PATCH 16/16] Okay, seems like reducing it to 1x is enough - making
 it singular is overkill and means that often if the furthest one away from
 you is the one to yell, you'll barely hear it. At least this way you'll only
 hear overkill chao if you're super close to the stands and the mapper's
 placed way too many

---
 src/sounds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sounds.c b/src/sounds.c
index 469427aed..a85da8e04 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -814,7 +814,7 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"kpogos", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"ddash",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"mcitm1", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"chaooo", false, 110, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"chaooo", false, 110,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"dbgsal", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
 
   // SRB2kart - Skin sounds