update traitors challenge to not use frag count

Author: BenLubar

reactivedrop/content/traitors_challenge/resource/challenges/traitors.txt

@@ -6,6 +6,7 @@
 		"_rd_traitors_challenge_enabled" "1"
 		"rd_player_bots_allowed" "0"
 		"rd_add_index_to_name" "1"
+		"rd_restrict_aspect_width" "1.77777777"
 		"rd_draw_restricted_rectangles_coop" "1"
 
 		"rd_auto_fast_restart" "1"

reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors.nut

@@ -228,7 +228,7 @@ function SetTraitorIcon(interval = 10) {
 		if (hPlayer == null || !hPlayer.IsValid()) {
 			continue;
 		}
-		NetProps.SetPropInt(hPlayer, "m_iFrags", 99);
+		NetProps.SetPropInt(hPlayer, "m_iChallengeScratch", 1);
 	}
 }
 

src/game/client/swarm/c_asw_player.cpp

@@ -270,6 +270,7 @@ BEGIN_NETWORK_TABLE( C_ASW_Player, DT_ASW_Player )
 	RecvPropQAngles( RECVINFO( m_angMarineAutoAimFromClient ) ),
 	RecvPropFloat( RECVINFO( m_flInactiveKickWarning ) ),
 	RecvPropDataTable( RECVINFO_DT( m_EquippedItemData ), 0, &REFERENCE_RECV_TABLE( DT_RD_ItemInstances_Player ) ),
+	RecvPropInt( RECVINFO( m_iChallengeScratch ) ),
 END_RECV_TABLE()
 
 BEGIN_PREDICTION_DATA( C_ASW_Player )
@@ -357,6 +358,7 @@ C_ASW_Player::C_ASW_Player() :
 	m_flInactiveKickWarning = 0.0f;
 	m_nLastInactiveKickWarning = 0;
 	m_flNextServerInfoUpdate = 0.0f;
+	m_iChallengeScratch = 0;
 }
 
 

src/game/client/swarm/c_asw_player.h

@@ -359,6 +359,8 @@ class C_ASW_Player : public C_BasePlayer, public IASWPlayerAnimStateHelpers
 	STEAM_CALLBACK( C_ASW_Player, Steam_OnUserStatsStored, UserStatsStored_t );
 #endif
 
+	int m_iChallengeScratch;
+
 private:
 	C_ASW_Player( const C_ASW_Player & );
 };

src/game/client/swarm/vgui/asw_hud_emotes.cpp

@@ -160,8 +160,8 @@ void CASWHudEmotes::PaintEmotesFor( C_ASW_Marine *pMarine )
 
 	if ( _rd_traitors_challenge_enabled.GetBool() )
 	{
-		CASW_Marine *pViewMarine = C_ASW_Marine::GetViewMarine();
-		if ( pViewMarine && pViewMarine->GetMarineResource() && ( pViewMarine->GetMarineResource()->m_iChallengeScratch & 1 ) )
+		C_ASW_Player *pLocalPlayer = C_ASW_Player::GetLocalASWPlayer();
+		if ( pLocalPlayer && ( pLocalPlayer->m_iChallengeScratch & 1 ) )
 		{
 			if ( pMarine->m_iEmote & ( 1 << 8 ) )
 				PaintTraitorEmote( pMarine, m_nTraitorEmoteTexture, 0.35f );

src/game/server/swarm/asw_player.cpp

@@ -245,6 +245,7 @@ IMPLEMENT_SERVERCLASS_ST( CASW_Player, DT_ASW_Player )
 	SendPropQAngles( SENDINFO( m_angMarineAutoAimFromClient ), 10, SPROP_CHANGES_OFTEN ),
 	SendPropFloat( SENDINFO( m_flInactiveKickWarning ) ),
 	SendPropDataTable( SENDINFO_DT( m_EquippedItemData ), &REFERENCE_SEND_TABLE( DT_RD_ItemInstances_Player ) ),
+	SendPropInt( SENDINFO( m_iChallengeScratch ) ),
 END_SEND_TABLE()
 
 BEGIN_DATADESC( CASW_Player )
@@ -275,6 +276,7 @@ BEGIN_DATADESC( CASW_Player )
 	DEFINE_FIELD( m_angMarineAutoAimFromClient, FIELD_VECTOR ),
 	DEFINE_FIELD( m_flLastActiveTime, FIELD_TIME ),
 	DEFINE_FIELD( m_flInactiveKickWarning, FIELD_TIME ),
+	DEFINE_FIELD( m_iChallengeScratch, FIELD_INTEGER ),
 END_DATADESC()
 
 BEGIN_ENT_SCRIPTDESC( CASW_Player, CBasePlayer, "The player entity." )
@@ -436,6 +438,7 @@ CASW_Player::CASW_Player()
 	m_iRecentMapVotesCount = 0;
 	m_fMapVoteCooldownEndTime = 0.0f;
 	m_fLastMapVoteTime = -1000.0f;
+	m_iChallengeScratch = 0;
 }
 
 

src/game/server/swarm/asw_player.h

@@ -329,15 +329,15 @@ class CASW_Player : public CBaseMultiplayerPlayer, public IASWPlayerAnimStateHel
 	CUtlVector<ReactiveDropInventory::ItemInstance_t> m_CraftingMaterialInstances;
 #endif
 
-private:
-
 	// Copyed from EyeAngles() so we can send it to the client.
 	CNetworkQAngle( m_angEyeAngles );	
 	Vector m_vecCrosshairTracePos;			// the world location directly beneath the player's crosshair
 	CNetworkVarForDerived( bool, m_fIsWalking );
 
 	IPlayerAnimState *m_PlayerAnimState;
 	bool m_bFirstInhabit;
+
+	CNetworkVar( int, m_iChallengeScratch );
 };
 
 extern void TE_MarineAnimEvent( CASW_Marine *pMarine, PlayerAnimEvent_t event );

src/game/shared/swarm/asw_gamerules.cpp

@@ -9981,6 +9981,15 @@ void CAlienSwarm::EnableChallenge( const char *szChallengeName )
 	else if ( bChanged )
 	{
 		UTIL_ClientPrintAll( ASW_HUD_PRINTTALKANDCONSOLE, "#rd_challenge_enabled", pKV->GetString( "name", szChallengeName ) );
+		for ( int i = 1; i <= MAX_PLAYERS; i++ )
+		{
+			CASW_Player *pPlayer = ToASW_Player( UTIL_PlayerByIndex( i ) );
+			if ( pPlayer )
+			{
+				// Reset to 0 before the challenge activates.
+				pPlayer->m_iChallengeScratch = 0;
+			}
+		}
 	}
 	// if rd_max_marines changed we need to update marines limits using SetMaxMarines
 	SetMaxMarines();