koth gamemode

.gitignore

@@ -694,3 +694,7 @@ FodyWeavers.xsd
 
 # Selected Background
 /game/neo/scripts/[Cc]hapter[Bb]ackgrounds.txt
+
+# clion stuff
+/src/cmake-build-debug/
+/.idea/

game/bin/rebuild.fgd

@@ -42,7 +42,8 @@
 		6 : "JGR"
 		4 : "Empty"
 		5 : "Tutorial"
-	]	
+		7 : "KOTH"
+	]
 
 	ForcedTeam(choices) : "Forced Team" : -1 : "Skip team menu and spawn as this team" =
 	[
@@ -461,3 +462,21 @@
 [
 	radius(float) : "Radius" : 12 : ""
 ]
+
+@SolidClass base(Trigger) = neo_trigger_koth_zone: "Trigger for zone capture detection. Can be grouped with other triggers into a single zone."
+[
+	zone_name(target_destination) : "Zone name" : "" : "Name of the neo_info_koth_zone this trigger belongs to."
+]
+
+@PointClass base(Targetname) iconsprite("vgui/hud/cp/hammer_koth_info.vmt") = neo_info_koth_zone : "Creates a zone to capture. Give it a name, then point one or more neo_trigger_koth_zone's zone_name at that name."
+[
+]
+
+@PointClass iconsprite("vgui/hud/cp/hammer_koth_master.vmt") = neo_koth_master : "Manages all neo_info_koth_zone entities on the map: picks which one is active and rotates between them. Place exactly one per map."
+[
+]
+
+@SolidClass base(Targetname) = neo_func_koth_border : "Visual border brush for a KOTH zone. Solidity, +use, shadows and color are all forced by default - not editable here."
+[
+	zone_name(target_destination) : "Zone name" : "" : "Name of the neo_info_koth_zone this border belongs to."
+]

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

@@ -321,6 +321,9 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 		case NEO_GAME_TYPE_JGR:
 			m_pWszStatusUnicode = L"Control the Juggernaut\n";
 			break;
+		case NEO_GAME_TYPE_KOTH:
+			m_pWszStatusUnicode = L"Capture the objective!\n";
+			break;
 		default:
 			m_pWszStatusUnicode = L"Await further orders\n";
 			break;
@@ -365,6 +368,10 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 		{
 			m_iWszRoundUCSize = V_swprintf_safe(m_wszRoundUnicode, L"DEATHMATCH");
 		}
+		else if (NEORules()->GetGameType() == NEO_GAME_TYPE_KOTH)
+		{
+			m_iWszRoundUCSize = V_swprintf_safe(m_wszRoundUnicode, L"FIRST TO %i WINS", sv_neo_koth_max_score.GetInt());
+		}
 		else
 		{
 			m_iWszRoundUCSize = V_swprintf_safe(m_wszRoundUnicode, L"ROUND %i", NEORules()->roundNumber());
@@ -393,13 +400,21 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 	const int localPlayerTeam = GetLocalPlayerTeam();
 	if (NEORules()->IsTeamplay())
 	{
-		if (cl_neo_hud_team_swap_sides.GetBool() && (localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF)) {
-			V_snwprintf(m_wszLeftTeamScore, 3, L"%i", GetGlobalTeam(localPlayerTeam)->GetRoundsWon());
-			V_snwprintf(m_wszRightTeamScore, 3, L"%i", GetGlobalTeam(NEORules()->GetOpposingTeam(localPlayerTeam))->GetRoundsWon());
+		const bool bSwapToLocal = cl_neo_hud_team_swap_sides.GetBool() && (localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF);
+		const int leftScoreTeam = bSwapToLocal ? localPlayerTeam : TEAM_JINRAI;
+		const int rightScoreTeam = bSwapToLocal ? NEORules()->GetOpposingTeam(localPlayerTeam) : TEAM_NSF;
+
+		if (NEORules()->GetGameType() == NEO_GAME_TYPE_KOTH)
+		{
+			const int leftScore = (leftScoreTeam == TEAM_JINRAI) ? NEORules()->GetKothTimeJinrai() : NEORules()->GetKothTimeNSF();
+			const int rightScore = (rightScoreTeam == TEAM_JINRAI) ? NEORules()->GetKothTimeJinrai() : NEORules()->GetKothTimeNSF();
+			V_snwprintf(m_wszLeftTeamScore, ARRAYSIZE(m_wszLeftTeamScore), L"%i", leftScore);
+			V_snwprintf(m_wszRightTeamScore, ARRAYSIZE(m_wszRightTeamScore), L"%i", rightScore);
 		}
-		else {
-			V_snwprintf(m_wszLeftTeamScore, 3, L"%i", GetGlobalTeam(TEAM_JINRAI)->GetRoundsWon());
-			V_snwprintf(m_wszRightTeamScore, 3, L"%i", GetGlobalTeam(TEAM_NSF)->GetRoundsWon());
+		else
+		{
+			V_snwprintf(m_wszLeftTeamScore, ARRAYSIZE(m_wszLeftTeamScore), L"%i", GetGlobalTeam(leftScoreTeam)->GetRoundsWon());
+			V_snwprintf(m_wszRightTeamScore, ARRAYSIZE(m_wszRightTeamScore), L"%i", GetGlobalTeam(rightScoreTeam)->GetRoundsWon());
 		}
 	}
 	else
@@ -430,6 +445,13 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 			V_sprintf_safe(szPlayersAliveANSI, "%i:%i", GetGlobalTeam(TEAM_JINRAI)->Get_Score(), GetGlobalTeam(TEAM_NSF)->Get_Score());
 		}
 	}
+	// neo TODO: add KOTH gameType (wip) or detect KOTH maps (removed this feature)
+//	else if (NEORules()->GetGameType() == NEO_GAME_TYPE_KOTH)
+//	{
+//		V_sprintf_safe(szPlayersAliveANSI, "J:%d  N:%d",
+//					   NEORules()->GetKothTimeJinrai(),
+//					   NEORules()->GetKothTimeNSF());
+//	}
 	else
 	{
 		V_sprintf_safe(szPlayersAliveANSI, "%i vs %i", m_iLeftPlayersAlive, m_iRightPlayersAlive);
@@ -547,12 +569,13 @@ void CNEOHud_RoundState::DrawNeoHudElement()
 		surface()->DrawSetTextFont(m_hOCRLargeFont);
 		surface()->DrawSetTextPos(m_posLeftTeamScore.x - (fontWidth / 2), m_posLeftTeamScore.y);
 		surface()->DrawSetTextColor(leftTeamInfo.color);
-		surface()->DrawPrintText(m_wszLeftTeamScore, 2);
+		surface()->DrawPrintText(m_wszLeftTeamScore, V_wcslen(m_wszLeftTeamScore));
 
 		surface()->GetTextSize(m_hOCRLargeFont, m_wszRightTeamScore, fontWidth, fontHeight);
+		surface()->DrawSetTextFont(m_hOCRLargeFont);
 		surface()->DrawSetTextPos(m_posRightTeamScore.x - (fontWidth / 2), m_posRightTeamScore.y);
 		surface()->DrawSetTextColor(rightTeamInfo.color);
-		surface()->DrawPrintText(m_wszRightTeamScore, 2);
+		surface()->DrawPrintText(m_wszRightTeamScore, V_wcslen(m_wszRightTeamScore));
 	}
 
 	m_iLeftPlayersAlive = m_iLeftPlayersTotal = m_iRightPlayersAlive = m_iRightPlayersTotal = 0;

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

@@ -78,11 +78,11 @@ class CNEOHud_RoundState : public CNEOHud_ChildElement, public CHudElement, publ
 	int m_iSmallFontHeight = 0;
 
 	// Center Box info
-	wchar_t m_wszRoundUnicode[12] = {};
+	wchar_t m_wszRoundUnicode[32] = {};
 	int m_iWszRoundUCSize = 0;
 	wchar_t m_wszTime[6] = {};
-	wchar_t m_wszLeftTeamScore[3] = {};
-	wchar_t m_wszRightTeamScore[3] = {};
+	wchar_t m_wszLeftTeamScore[12] = {};
+	wchar_t m_wszRightTeamScore[12] = {};
 	wchar_t m_wszPlayersAliveUnicode[16] = {};
 	const wchar_t *m_pWszStatusUnicode = nullptr;
 	int m_iStatusUnicodeSize = 0;

src/game/server/CMakeLists.txt

@@ -1498,6 +1498,14 @@ target_sources_grouped(
     neo/neo_te_tocflash.h
     neo/neo_tracefilter_collisiongroupdelta.h
     neo/neo_dm_spawn.h
+    neo/neo_trigger_koth_zone.h
+    neo/neo_info_koth_zone.h
+    neo/neo_koth_master.h
+    neo/neo_koth_border.h
+    neo/neo_trigger_koth_zone.cpp
+    neo/neo_info_koth_zone.cpp
+    neo/neo_koth_master.cpp
+    neo/neo_koth_border.cpp
     neo/neo_gamerules_restore.h
     ${UNITY_SOURCE_NEO_SRC_SERVER}
 )