add some Lua support, hit confirm animations and fix some stuff

src/dehacked.c

@@ -725,6 +725,7 @@ static void readfollower(MYFILE *f)
 	followers[numfollowers].vertlag = 6;
 	followers[numfollowers].bobspeed = TICRATE*2;
 	followers[numfollowers].bobamp = 4;
+	followers[numfollowers].hitconfirmtime = TICRATE;
 
 	do
 	{
@@ -835,6 +836,18 @@ static void readfollower(MYFILE *f)
 				DEH_WriteUndoline(word, va("%d", followers[numfollowers].winstate), UNDO_NONE);
 				followers[numfollowers].winstate = get_number(word2);
 			}
+			else if (fastcmp(word, "HITSTATE") || (fastcmp(word, "HITCONFIRMSTATE")))
+			{
+				if (word2)
+					strupr(word2);
+				DEH_WriteUndoline(word, va("%d", followers[numfollowers].hitconfirmstate), UNDO_NONE);
+				followers[numfollowers].hitconfirmstate = get_number(word2);
+			}
+			else if (fastcmp(word, "HITTIME") || (fastcmp(word, "HITCONFIRMTIME")))
+			{
+				DEH_WriteUndoline(word, va("%d", followers[numfollowers].hitconfirmtime), UNDO_NONE);
+				followers[numfollowers].hitconfirmtime = (INT32)atoi(word2);
+			}
 			else
 				deh_warning("Follower %d: unknown word '%s'", numfollowers, word);
 		}
@@ -893,6 +906,10 @@ static void readfollower(MYFILE *f)
 	if (followers[numfollowers].bobspeed < 0)
 		followers[numfollowers].bobspeed = 1;
 
+	// hit confirm time must be > 0
+	if (followers[numfollowers].hitconfirmtime < 1)
+		followers[numfollowers].hitconfirmtime = 1;
+
 	// also check if we forgot states. If we did, we will set any missing state to the follower's idlestate.
 	// Print a warning in case we don't have a fallback and set the state to S_INVISIBLE (rather than S_NULL) if unavailable.
 
@@ -909,6 +926,7 @@ if (!followers[numfollowers].field) \
 	NOSTATE(hurtstate, "hurtstate");
 	NOSTATE(losestate, "losestate");
 	NOSTATE(winstate, "winstate");
+	NOSTATE(winstate, "hitconfirmstate");
 #undef NOSTATE
 
 	CONS_Printf("Added follower '%s'\n", dname);

src/k_kart.c

@@ -1642,6 +1642,13 @@ void K_PlayOvertakeSound(mobj_t *source)
 
 void K_PlayHitEmSound(mobj_t *source)
 {
+	
+	if (source->player->follower)
+	{
+		follower_t fl = followers[source->player->followerskin];
+		source->player->follower->movecount = fl.hitconfirmtime;	// movecount is used to play the hitconfirm animation for followers.
+	}
+	
 	if (cv_kartvoices.value)
 		S_StartSound(source, sfx_khitem);
 	else

src/lua_playerlib.c

@@ -319,6 +319,10 @@ static int player_get(lua_State *L)
 		lua_pushinteger(L, plr->awayviewtics);
 	else if (fastcmp(field,"awayviewaiming"))
 		lua_pushangle(L, plr->awayviewaiming);
+	else if (fastcmp(field,"follower"))
+		LUA_PushUserdata(L, plr->follower, META_MOBJ);
+	else if (fastcmp(field,"followerskin"))
+		lua_pushinteger(L, plr->followerskin);
 	else if (fastcmp(field,"spectator"))
 		lua_pushboolean(L, plr->spectator);
 	else if (fastcmp(field,"bot"))
@@ -609,6 +613,10 @@ static int player_set(lua_State *L)
 	}
 	else if (fastcmp(field,"awayviewaiming"))
 		plr->awayviewaiming = luaL_checkangle(L, 3);
+	else if (fastcmp(field,"follower"))	// it's probably best we don't allow the follower mobj to change.
+		return NOSET;
+	else if (fastcmp(field,"followerskin"))
+		plr->followerskin = luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"spectator"))
 		plr->spectator = lua_toboolean(L, 3);
 	else if (fastcmp(field,"bot"))

src/p_user.c

@@ -8929,6 +8929,15 @@ void P_DoTimeOver(player_t *player)
 */
 static void P_SetFollowerState(mobj_t *f, INT32 state)
 {
+	// extravalue2 stores the last "first state" we used.
+	// because states default to idlestates, if we use an animation that uses an "ongoing" state line, don't reset it!
+	// this prevents it from looking very dumb
+	if (state == f->extravalue2)
+		return;
+
+	// we will save the state into extravalue2.
+	f->extravalue2 = state;
+
 	P_SetMobjStateNF(f, state);
 	if (f->state->tics > 0)
 		f->tics++;
@@ -9000,6 +9009,7 @@ static void P_HandleFollower(player_t *player)
 			2 = hurt
 			3 = win
 			4 = lose
+			5 = hitconfirm (< this one uses ->movecount as timer to know when to end, and goes back to normal states afterwards, unless hurt)
 		*/
 	}
 	else	// follower exists, woo!
@@ -9019,13 +9029,19 @@ static void P_HandleFollower(player_t *player)
 		P_SetScale(player->follower, FixedMul(fl.scale, player->mo->scale));
 		K_MatchGenericExtraFlags(player->follower, player->mo);
 
+		// Make the follower invisible if we no contest'd rather than removing it. No one will notice the diff seriously.
+
+		if (player->pflags & PF_TIMEOVER)	// there is more to it than that to check for a full no contest but this isn't used for anything else.
+			player->follower->flags2 &= MF2_DONTDRAW;
+
+
 
 		// handle follower animations. Yes, it looks like very bad kiddie script so what, do you have any better idea genius? Go get a life instead of criticizing my unpaid work!!!!!!
-
 		// hurt or dead
-		if (player->kartstuff[k_spinouttimer] || player->mo->health <= 0)
+		if (player->kartstuff[k_spinouttimer] || player->mo->state == &states[S_KART_SPIN] || player->mo->health <= 0)
 		{
-			player->follower->angle = -leveltime*48*ANG1;	// spin out
+			player->follower->movecount = 0;	// cancel hit confirm.
+			player->follower->angle = player->frameangle;	// spin out
 			if (player->follower->extravalue1 != 2)
 			{
 				player->follower->extravalue1 = 2;
@@ -9034,6 +9050,15 @@ static void P_HandleFollower(player_t *player)
 			if (player->mo->health <= 0)	// if dead, follow the player's z momentum exactly so they both look like they die at the same speed.
 				player->follower->momz = player->mo->momz;
 		}
+		else if (player->follower->movecount)
+		{
+			if (player->follower->extravalue1 != 5)
+			{
+				player->follower->extravalue1 = 5;
+				P_SetFollowerState(player->follower, fl.hitconfirmstate);
+			}
+			player->follower->movecount--;
+		}
 		else if (player->speed > 10*player->mo->scale)	// animation for moving fast enough
 		{
 			// if we're moving fast enough, let's make the angle the direction we're moving towards. This is to avoid drifting looking awkward.

src/r_things.h

@@ -147,6 +147,8 @@ typedef struct follower_s
 	INT32 hurtstate;		// state when the player is being hurt
 	INT32 winstate;			// state when the player has won
 	INT32 losestate;		// state when the player has lost
+	INT32 hitconfirmstate;	// state for hit confirm
+	INT32 hitconfirmtime;	// time to keep the above playing for
 } follower_t;
 
 // -----------