Gamerules Refactor

game/bin/rebuild.fgd

@@ -40,6 +40,7 @@
 		2 : "VIP"
 		3 : "DM"
 		6 : "JGR"
+		7 : "ATK
 		4 : "Empty"
 		5 : "Tutorial"
 	]	

src/game/client/CMakeLists.txt

@@ -21,6 +21,7 @@ target_include_directories(client
     ${CMAKE_SOURCE_DIR}/game/shared/hl2mp
     ${CMAKE_SOURCE_DIR}/game/shared/Multiplayer
     ${CMAKE_SOURCE_DIR}/game/shared/neo
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons
     ${CMAKE_SOURCE_DIR}/public
     ${CMAKE_SOURCE_DIR}/thirdparty/sixensesdk/include
@@ -1629,8 +1630,6 @@ target_sources_grouped(
     FILES
     ${CMAKE_SOURCE_DIR}/game/shared/neo/achievements_neo.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/achievements_neo.h
-    ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_gamerules.cpp
-    ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_gamerules.h
     ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_ghost_cap_point.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_ghost_cap_point.h
     ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_juggernaut.cpp
@@ -1663,6 +1662,30 @@ target_sources_grouped(
     ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_serial.h
 )
 
+target_sources_grouped(
+    TARGET client
+    NAME "Source Files\\Shared\\Gamerules"
+    FILES
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_atk.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_atk.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_ctg.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_ctg.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_dm.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_dm.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_emt.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_emt.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_jgr.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_jgr.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_tdm.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_tdm.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_tut.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_tut.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_vip.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_vip.h
+)
+
 target_sources_grouped(
     TARGET client
     NAME "Source Files\\Shared\\Weapons"

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

@@ -4,7 +4,7 @@
 #pragma once
 #endif
 
-#include "neo_gamerules.h"
+#include "gamerules/neo_gamerules.h"
 
 class C_NEO_Player;
 

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

@@ -3,7 +3,7 @@
 #include "hudelement.h"
 #include <vgui_controls/Panel.h>
 
-#include "neo_gamerules.h"
+#include "gamerules/neo_gamerules.h"
 #include "neo_hud_worldpos_marker.h"
 
 enum NeoIFFMarkerSegment

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

@@ -20,6 +20,7 @@
 #include "c_playerresource.h"
 #include "vgui_avatarimage.h"
 #include "neo_scoreboard.h"
+#include "neo_gamerules_dm.h"
 
 #include "hltvcamera.h"
 
@@ -258,6 +259,7 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 	const bool inDoOrDie = NEORules()->RoundIsDoOrDie();
 	const bool inMatchPoint = !inDoOrDie && NEORules()->RoundIsMatchPoint(); // we don't care about matchpoint if in do or die
 
+	// NEO TODO (Adam) move this to neogamerules?
 	m_pWszStatusUnicode = L"";
 	if (roundStatus == NeoRoundStatus::Idle)
 	{
@@ -298,7 +300,7 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 			m_pWszStatusUnicode = L"Capture the Ghost\n";
 			break;
 		case NEO_GAME_TYPE_VIP:
-			if (GetLocalPlayerTeam() == NEORules()->m_iEscortingTeam.Get())
+			if (GetLocalPlayerTeam() == NEORules()->GetEscortingTeam())
 			{
 				if (NEORules()->GhostExists())
 				{
@@ -309,7 +311,7 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 					m_pWszStatusUnicode = L"Escort the VIP\n";
 				}
 			}
-			else
+			else // NEO TODO (Adam) check if opposite team to escorting team, else different message for spectators
 			{
 				if (NEORules()->GhostExists())
 				{
@@ -324,6 +326,20 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 		case NEO_GAME_TYPE_JGR:
 			m_pWszStatusUnicode = L"Control the Juggernaut\n";
 			break;
+		case NEO_GAME_TYPE_ATK:
+			if (GetLocalPlayerTeam() == NEORules()->GetAttackingTeam())
+			{
+				m_pWszStatusUnicode = L"Capture the Ghost\n";
+			}
+			else if (GetLocalPlayerTeam() == NEORules()->GetDefendingTeam())
+			{
+				m_pWszStatusUnicode = L"Protect the Ghost\n";
+			}
+			else
+			{
+				m_pWszStatusUnicode = L"Capture/Protect the Ghost\n";
+			}
+			break;
 		default:
 			m_pWszStatusUnicode = L"Await further orders\n";
 			break;
@@ -378,9 +394,9 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 		roundTimeLeft = NEORules()->GetRemainingPreRoundFreezeTime(true);
 
 	int secsTotal = 0.0f;
-	if (roundStatus == NeoRoundStatus::Overtime && NEORules()->GetGameType() == NEO_GAME_TYPE_CTG)
+	if (roundStatus == NeoRoundStatus::Overtime && (NEORules()->GetGameType() == NEO_GAME_TYPE_CTG || NEORules()->GetGameType() == NEO_GAME_TYPE_ATK))
 	{
-		secsTotal = RoundFloatToInt(NEORules()->GetCTGOverTime());
+		secsTotal = RoundFloatToInt(NEORules()->GetRoundRemainingTime());
 	}
 	else
 	{
@@ -408,7 +424,7 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
 	else
 	{
 		[[maybe_unused]] int iDMHighestTotal;
-		NEORules()->GetDMHighestScorers(&iDMHighestTotal, &iDMHighestXP);
+		NEORulesDM()->GetDMHighestScorers(&iDMHighestTotal, &iDMHighestXP);
 	}
 
 	char szPlayersAliveANSI[ARRAYSIZE(m_wszPlayersAliveUnicode)] = {};

src/game/server/CMakeLists.txt

@@ -42,6 +42,7 @@ target_include_directories(server
     ${CMAKE_SOURCE_DIR}/game/shared/hl2mp
     ${CMAKE_SOURCE_DIR}/game/shared/Multiplayer
     ${CMAKE_SOURCE_DIR}/game/shared/neo
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons
     ${CMAKE_SOURCE_DIR}/utils/common
     ${CMAKE_SOURCE_DIR}/public
@@ -1346,8 +1347,6 @@ target_sources_grouped(
     FILES
     ${CMAKE_SOURCE_DIR}/game/shared/neo/achievements_neo.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/achievements_neo.h
-    ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_gamerules.cpp
-    ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_gamerules.h
     ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_ghost_cap_point.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_ghost_cap_point.h
     ${CMAKE_SOURCE_DIR}/game/shared/neo/neo_juggernaut.cpp
@@ -1410,8 +1409,6 @@ target_sources_grouped(
     neo/neo_te_tocflash.h
     neo/neo_tracefilter_collisiongroupdelta.h
     neo/neo_typeconverter.cpp
-    neo/neo_dm_spawn.cpp
-    neo/neo_dm_spawn.h
 )
 
 target_sources_grouped(
@@ -1517,6 +1514,30 @@ target_sources_grouped(
     neo/bot/map_entities/neo_bot_proxy.h
 )
 
+target_sources_grouped(
+    TARGET server
+    NAME "NEO\\Gamerules"
+    FILES
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_atk.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_atk.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_ctg.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_ctg.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_dm.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_dm.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_emt.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_emt.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_jgr.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_jgr.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_tdm.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_tdm.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_tut.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_tut.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_vip.cpp
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/gamerules/neo_gamerules_vip.h
+)
+
 target_sources_grouped(
     TARGET server
     NAME "NEO\\Weapons"

src/game/server/neo/neo_client.cpp

@@ -1,5 +1,6 @@
 #include "cbase.h"
 #include "neo_player.h"
+#include "neo_game_config.h"
 #include "neo_gamerules.h"
 #include "gamerules.h"
 #include "teamplay_gamerules.h"
@@ -393,5 +394,5 @@ void GameStartFrame( void )
 //=========================================================
 void InstallGameRules()
 {
-	CreateGameRulesObject( "CNEORules" );
+	CreateGameRulesObject( "CNEORulesEMT" );
 }