VIP and TDM Game modes

mp/game/neo/scripts/weapon_smac.txt

@@ -9,8 +9,8 @@ WeaponData
 	"anim_prefix"		"smac"
 	"bucket"		"0"
 	"bucket_position"	"0"
-	"Damage"		"0"
-	"Penetration"		"0.0"
+	"Damage"		"12"
+	"Penetration"		"12.0"
 	"CycleTime"		"0.085"		// time between shots
 
 	"TPMuzzleFlashScale"	"0.5"
@@ -20,9 +20,14 @@ WeaponData
 	"primary_ammo"		"AMMO_SMAC"
 	"secondary_ammo"	"None"
 
-	"weight"		"3"
-	"item_flags"		"0"
+	"autoswitchfrom"        "0"
 
+	"weight"		"3"
+	// ITEM_FLAG_SELECTONEMPTY = 1
+	// ITEM_FLAG_NOAUTOSWITCHEMPTY = (1 << 2)
+	// ITEM_FLAG_DOHITLOCATIONDMG = (1 << 5) 
+	// Combined as int = 37
+	"item_flags"		"37"
 
 	"AimType"		"1"
 

mp/src/game/client/neo/c_neo_player.cpp

@@ -285,11 +285,16 @@ class NeoClassMenu_Cb : public ICommandCallback
 	virtual void CommandCallback(const CCommand& command)
 	{
 		auto team = GetLocalPlayerTeam();
-
 		if(team < FIRST_GAME_TEAM)
 		{
 			return;
 		}
+
+		auto playerNeoClass = C_NEO_Player::GetLocalNEOPlayer()->m_iNeoClass;
+		if (playerNeoClass == NEO_CLASS_VIP)
+		{
+			return;
+		}
 
 		vgui::EditablePanel *panel = dynamic_cast<vgui::EditablePanel*>
 			(GetClientModeNormal()->GetViewport()->FindChildByName(PANEL_CLASS));
@@ -456,7 +461,7 @@ void C_NEO_Player::CheckThermOpticButtons()
 
 	if ((m_afButtonPressed & IN_THERMOPTIC) && IsAlive())
 	{
-		if (GetClass() != NEO_CLASS_RECON && GetClass() != NEO_CLASS_ASSAULT)
+		if (GetClass() == NEO_CLASS_SUPPORT)
 		{
 			return;
 		}
@@ -1360,6 +1365,8 @@ float C_NEO_Player::GetCrouchSpeed(void) const
 		return NEO_ASSAULT_CROUCH_SPEED * GetBackwardsMovementPenaltyScale();
 	case NEO_CLASS_SUPPORT:
 		return NEO_SUPPORT_CROUCH_SPEED * GetBackwardsMovementPenaltyScale();
+	case NEO_CLASS_VIP:
+		return NEO_VIP_CROUCH_SPEED * GetBackwardsMovementPenaltyScale();
 	default:
 		return NEO_BASE_CROUCH_SPEED * GetBackwardsMovementPenaltyScale();
 	}
@@ -1375,6 +1382,8 @@ float C_NEO_Player::GetNormSpeed(void) const
 		return NEO_ASSAULT_NORM_SPEED * GetBackwardsMovementPenaltyScale();
 	case NEO_CLASS_SUPPORT:
 		return NEO_SUPPORT_NORM_SPEED * GetBackwardsMovementPenaltyScale();
+	case NEO_CLASS_VIP:
+		return NEO_VIP_NORM_SPEED * GetBackwardsMovementPenaltyScale();
 	default:
 		return NEO_BASE_NORM_SPEED * GetBackwardsMovementPenaltyScale();
 	}
@@ -1390,6 +1399,8 @@ float C_NEO_Player::GetWalkSpeed(void) const
 		return NEO_ASSAULT_WALK_SPEED * GetBackwardsMovementPenaltyScale();
 	case NEO_CLASS_SUPPORT:
 		return NEO_SUPPORT_WALK_SPEED * GetBackwardsMovementPenaltyScale();
+	case NEO_CLASS_VIP:
+		return NEO_VIP_WALK_SPEED * GetBackwardsMovementPenaltyScale();
 	default:
 		return NEO_BASE_WALK_SPEED * GetBackwardsMovementPenaltyScale();
 	}
@@ -1405,6 +1416,8 @@ float C_NEO_Player::GetSprintSpeed(void) const
 		return NEO_ASSAULT_SPRINT_SPEED * GetBackwardsMovementPenaltyScale();
 	case NEO_CLASS_SUPPORT:
 		return NEO_SUPPORT_SPRINT_SPEED * GetBackwardsMovementPenaltyScale();
+	case NEO_CLASS_VIP:
+		return NEO_VIP_SPRINT_SPEED * GetBackwardsMovementPenaltyScale();
 	default:
 		return NEO_BASE_SPRINT_SPEED * GetBackwardsMovementPenaltyScale();
 	}

mp/src/game/client/neo/game_controls/neo_classmenu.cpp

@@ -269,6 +269,14 @@ void CNeoClassMenu::UpdateSkinImages(int classNumber = -1)
 		classNumber = player->m_iNeoClass.Get();
 	}
 
+	if (classNumber > NEO_CLASS_SUPPORT || classNumber < NEO_CLASS_RECON)
+	{
+		m_pSkinPanel1->SetImage("cm/none");
+		m_pSkinPanel2->SetImage("cm/none");
+		m_pSkinPanel3->SetImage("cm/none");
+		return;
+	}
+
 	m_pSkinPanel1->SetImage(playerModels[teamNumber * 9 + (classNumber * 3) + 0]);
 	m_pSkinPanel2->SetImage(playerModels[teamNumber * 9 + (classNumber * 3) + 1]);
 	m_pSkinPanel3->SetImage(playerModels[teamNumber * 9 + (classNumber * 3) + 2]);

mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp

@@ -312,14 +312,16 @@ void CNeoLoadoutMenu::ChangeMenu(const char* menuName = NULL)
 void CNeoLoadoutMenu::OnKeyCodeReleased(vgui::KeyCode code)
 {
 	switch (code) {
-	case 94: // F3 - Close the menu
+	case KEY_F3: // F3 - Close the menu
 		ChangeMenu(NULL);
-	case 65: // Spacebar - Try to equip weapon in the second slot like in the base game
+		break;
+	case KEY_SPACE: // Spacebar - Try to equip weapon in the second slot like in the base game
 		OnCommand("loadout 1");
+		break;
+	default:
+		// Ignore other key presses
+		break;
 	}
-
-	// Ignore other Key presses
-	//BaseClass::OnKeyCodeReleased(code);
 }
 
 void CNeoLoadoutMenu::OnButtonPressed(KeyValues *data)

mp/src/game/client/neo/ui/neo_hud_round_state.cpp

@@ -241,6 +241,7 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 	memset(m_wszTime, 0, sizeof(m_wszTime));
 	memset(m_wszLeftTeamScore, 0, sizeof(m_wszLeftTeamScore));
 	memset(m_wszRightTeamScore, 0, sizeof(m_wszRightTeamScore));
+	memset(m_wszGameTypeDescription, 0, sizeof(m_wszGameTypeDescription));
 
 	// Exactly zero means there's no time limit, so we don't need to draw anything.
 	if (roundTimeLeft == 0)
@@ -276,8 +277,72 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 	}
 
 	char szPlayersAliveANSI[9] = {};
-	V_sprintf_safe(szPlayersAliveANSI, "%i vs %i", m_iLeftPlayersAlive, m_iRightPlayersAlive);
+	if (NEORules()->GetGameType() == NEO_GAME_TYPE_TDM)
+	{
+		if (localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF) {
+			V_sprintf_safe(szPlayersAliveANSI, "%i:%i", GetGlobalTeam(localPlayerTeam)->Get_Score(), GetGlobalTeam(NEORules()->GetOpposingTeam(localPlayerTeam))->Get_Score());
+		}
+		else {
+			V_sprintf_safe(szPlayersAliveANSI, "%i:%i", GetGlobalTeam(TEAM_JINRAI)->Get_Score(), GetGlobalTeam(TEAM_NSF)->Get_Score());
+		}
+	}
+	else
+	{
+		V_sprintf_safe(szPlayersAliveANSI, "%i vs %i", m_iLeftPlayersAlive, m_iRightPlayersAlive);
+	}
 	g_pVGuiLocalize->ConvertANSIToUnicode(szPlayersAliveANSI, m_wszPlayersAliveUnicode, sizeof(m_wszPlayersAliveUnicode));
+
+	// Update Objective
+	switch (NEORules()->GetGameType()) {
+	case NEO_GAME_TYPE_TDM:
+		V_sprintf_safe(szGameTypeDescription, "Score the most Points\n");
+		break;
+	case NEO_GAME_TYPE_CTG:
+		V_sprintf_safe(szGameTypeDescription, "Capture the Ghost\n");
+		break;
+	case NEO_GAME_TYPE_VIP:
+		if (localPlayerTeam == NEORules()->m_iEscortingTeam.Get())
+		{
+			if (NEORules()->GhostExists())
+			{
+				V_sprintf_safe(szGameTypeDescription, "VIP down, prevent Ghost capture\n");
+			}
+			else
+			{
+				V_sprintf_safe(szGameTypeDescription, "Escort the VIP\n");
+			}
+		}
+		else
+		{
+			if (NEORules()->GhostExists())
+			{
+				V_sprintf_safe(szGameTypeDescription, "HVT down, secure the Ghost\n");
+			}
+			else
+			{
+				V_sprintf_safe(szGameTypeDescription, "Eliminate the HVT\n");
+			}
+		}
+		break;
+	default:
+		V_sprintf_safe(szGameTypeDescription, "Await further orders\n");
+		break;
+	}
+
+	C_NEO_Player* localPlayer = C_NEO_Player::GetLocalNEOPlayer();
+	if (localPlayer);
+	{
+		if (NEORules()->IsRoundPreRoundFreeze() || localPlayer->m_nButtons & IN_SCORE)
+		{
+			m_iGameTypeDescriptionState = MIN(m_iGameTypeDescriptionState + 1, Q_UnicodeLength(szGameTypeDescription));
+		}
+		else
+		{
+			m_iGameTypeDescriptionState = MAX(m_iGameTypeDescriptionState - 1, 0);
+		}
+
+		g_pVGuiLocalize->ConvertANSIToUnicode(szGameTypeDescription, m_wszGameTypeDescription, m_iGameTypeDescriptionState * sizeof(wchar_t));
+	}
 }
 
 void CNEOHud_RoundState::DrawNeoHudElement()
@@ -462,6 +527,16 @@ void CNEOHud_RoundState::DrawNeoHudElement()
 	surface()->DrawSetTextPos(m_iXpos - (fontWidth / 2), neo_cl_squad_hud_original.GetBool() ? Y_POS : m_iSmallFontHeight);
 	surface()->DrawPrintText(m_wszTime, 6);
 
+	// Draw Game Type Description
+	if (m_iGameTypeDescriptionState)
+	{
+		surface()->DrawSetTextFont(m_hOCRFont);
+		surface()->GetTextSize(m_hOCRFont, m_wszGameTypeDescription, fontWidth, fontHeight);
+		surface()->DrawSetTextColor(COLOR_WHITE);
+		surface()->DrawSetTextPos(m_iXpos - (fontWidth / 2), m_iBoxYEnd);
+		surface()->DrawPrintText(m_wszGameTypeDescription, Q_UnicodeLength(m_wszGameTypeDescription));
+	}
+
 	CheckActiveStar();
 }
 

mp/src/game/client/neo/ui/neo_hud_round_state.h

@@ -17,6 +17,8 @@ class ImagePanel;
 class ImageList;
 }
 
+constexpr int MAX_GAME_TYPE_OBJECTIVE_LENGTH = 33;
+
 class CNEOHud_RoundState : public CNEOHud_ChildElement, public CHudElement, public vgui::Panel
 {
 	DECLARE_CLASS_SIMPLE(CNEOHud_RoundState, Panel);
@@ -64,6 +66,11 @@ class CNEOHud_RoundState : public CNEOHud_ChildElement, public CHudElement, publ
 	wchar_t m_wszRightTeamScore[3] = {};
 	wchar_t m_wszPlayersAliveUnicode[9] = {};
 	wchar_t m_wszStatusUnicode[24] = {};
+	wchar_t m_wszGameTypeDescription[MAX_GAME_TYPE_OBJECTIVE_LENGTH] = {};
+	char szGameTypeDescription[MAX_GAME_TYPE_OBJECTIVE_LENGTH] = {};
+
+	// Game Description
+	short m_iGameTypeDescriptionState = 0;
 
 	// Totals info
 	int m_iLeftPlayersAlive = 0;

mp/src/game/client/viewpostprocess.cpp

@@ -2963,6 +2963,9 @@ void DoEnginePostProcessing( int x, int y, int w, int h, bool bFlashlightIsOn, b
 				DoThermalVision(x, y, w, h);
 				break;
 			}
+			case NEO_CLASS_VIP:
+				// Cry a little
+				break;
 			default:
 				Assert(false);
 			}

mp/src/game/server/hl2/hl2_player.cpp

@@ -429,6 +429,8 @@ static inline float GetAuxChargeRate(CBaseCombatCharacter *player)
 		return 5.0f;	// 100 units in 20 seconds
 	case NEO_CLASS_ASSAULT:
 		return 2.5f;	// 100 units in 40 seconds
+	case NEO_CLASS_VIP:
+		return 2.5f;	// 100 units in 40 seconds
 	default:
 		break;
 	}

mp/src/game/server/hl2mp/hl2mp_player.cpp

@@ -1288,7 +1288,9 @@ void CHL2MP_Player::Event_Killed( const CTakeDamageInfo &info )
 			iScoreToAdd = -1;
 		}
 
+#ifndef NEO
 		GetGlobalTeam( pAttacker->GetTeamNumber() )->AddScore( iScoreToAdd );
+#endif
 	}
 
 	FlashlightTurnOff();