More map system updates + misc dev

AMBuildScript

@@ -92,7 +92,7 @@ class MMSPluginConfig(object):
     if builder.options.targets:
       target_archs = builder.options.targets.split(',')
     else:
-      target_archs = ['x86', 'x86_64']
+      target_archs = ['x86_64']
 
     for arch in target_archs:
         try:

CS2Fixes.vcxproj

@@ -279,6 +279,7 @@
     <ClInclude Include="src\utils\module.h" />
     <ClInclude Include="src\utils\plat.h" />
     <ClInclude Include="src\utils\virtual.h" />
+    <ClInclude Include="src\netmessages.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />

CS2Fixes.vcxproj.filters

@@ -364,5 +364,8 @@
     <ClInclude Include="src\cs2_sdk\entity\ctriggerteleport.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\netmessages.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

PackageScript

@@ -59,7 +59,7 @@ mapcfg_folder = builder.AddFolder(os.path.join('cfg', MMSPlugin.plugin_name, 'ma
 gamedata_folder = builder.AddFolder(os.path.join('addons', MMSPlugin.plugin_name, 'gamedata'))
 builder.AddCopy(os.path.join(builder.sourcePath, 'configs', 'admins.cfg.example'), configs_folder)
 builder.AddCopy(os.path.join(builder.sourcePath, 'configs', 'discordbots.cfg.example'), configs_folder)
-builder.AddCopy(os.path.join(builder.sourcePath, 'configs', 'maplist.cfg.example'), configs_folder)
+builder.AddCopy(os.path.join(builder.sourcePath, 'configs', 'maplist.jsonc.example'), configs_folder)
 builder.AddCopy(os.path.join(builder.sourcePath, 'cfg', MMSPlugin.plugin_name, 'cs2fixes.cfg'), cfg_folder)
 builder.AddCopy(os.path.join(builder.sourcePath, 'cfg', MMSPlugin.plugin_name, 'maps', 'de_somemap.cfg'), mapcfg_folder)
 builder.AddCopy(os.path.join(builder.sourcePath, 'configs', 'zr', 'playerclass.jsonc.example'), zr_folder)

cfg/cs2fixes/cs2fixes.cfg

@@ -78,8 +78,9 @@ cs2f_rtv_success_ratio 			0.6		// Ratio needed to pass RTV
 cs2f_rtv_endround 				0		// Whether to immediately end the round when RTV succeeds
 
 // Map vote settings
-cs2f_vote_maps_cooldown 		10		// Default number of maps to wait until a map can be voted / nominated again i.e. cooldown.
-cs2f_vote_max_nominations 		10		// Number of nominations to include per vote, out of a maximum of 10.
+cs2f_vote_maps_cooldown 		6.0		// Default number of hours until a map can be played again i.e. cooldown
+cs2f_vote_max_nominations 		10		// Number of nominations to include per vote, out of a maximum of 10
+cs2f_vote_max_maps 				10		// Number of total maps to include per vote, including nominations, out of a maximum of 10
 
 // User preferences settings
 cs2f_user_prefs_api				""		// User Preferences REST API endpoint

configs/maplist.jsonc.example

@@ -0,0 +1,52 @@
+{
+	"Groups":
+	{
+		// If any map in a group gets played, all maps in that group will receive the group cooldown
+		// The group cooldown applies immediately, but only starts ticking down *after* the trigger map ends
+		"MyFirstGroup":
+		{
+			"enabled": true,
+			"cooldown": 4 // Cooldown in hours
+		},
+		"MySecondGroup":
+		{
+			"enabled": true,
+			"cooldown": 0.5
+		},
+		"MyThirdGroup":
+		{
+			// Omitting the cooldown option will fall back to cs2f_vote_maps_cooldown cvar
+			"enabled": true
+		}
+	},
+	"Maps":
+	{
+		"de_dust2": // Map name should always match .vpk name to avoid unintended behaviour
+		{
+			"enabled": true
+		},
+		"ze_my_first_ze_map":
+		{
+			"enabled": true,
+			"workshop_id": 123, // Workshop ID must be specified for workshop maps
+			"min_players": 20, // Minimum players required to nominate or appear in vote
+			"cooldown": 2 // Custom cooldown in hours, can override default map cooldown
+		},
+		"ze_my_second_ze_map":
+		{
+			"enabled": true,
+			"workshop_id": 456,
+			"min_players": 5, // Maximum players where map can be nominated or appear in vote
+			"max_players": 10,
+			"cooldown": 3,
+			"groups": [ "MyFirstGroup" ] // Any other maps in this group will receive the group cooldown when this map is played
+		},
+		"ze_my_third_ze_map":
+		{
+			"enabled": true,
+			"workshop_id": 789,
+			"max_players": 20,
+			"groups": [ "MyFirstGroup", "MySecondGroup" ] // A map can be in multiple groups
+		}
+	}
+}

src/adminsystem.cpp

@@ -38,7 +38,7 @@
 
 extern IVEngineServer2* g_pEngineServer2;
 extern CGameEntitySystem* g_pEntitySystem;
-extern CGlobalVars* gpGlobals;
+extern CGlobalVars* GetGlobals();
 extern CCSGameRules* g_pGameRules;
 
 CAdminSystem* g_pAdminSystem = nullptr;
@@ -113,10 +113,10 @@ void PrintMultiAdminAction(ETargetType nType, const char* pszAdminName, const ch
 
 CON_COMMAND_F(c_reload_admins, "Reload admin config", FCVAR_SPONLY | FCVAR_LINKED_CONCOMMAND)
 {
-	if (!g_pAdminSystem->LoadAdmins())
+	if (!g_pAdminSystem->LoadAdmins() || !GetGlobals())
 		return;
 
-	for (int i = 0; i < gpGlobals->maxClients; i++)
+	for (int i = 0; i < GetGlobals()->maxClients; i++)
 	{
 		ZEPlayer* pPlayer = g_playerManager->GetPlayer(i);
 
@@ -131,10 +131,10 @@ CON_COMMAND_F(c_reload_admins, "Reload admin config", FCVAR_SPONLY | FCVAR_LINKE
 
 CON_COMMAND_F(c_reload_infractions, "Reload infractions file", FCVAR_SPONLY | FCVAR_LINKED_CONCOMMAND)
 {
-	if (!g_pAdminSystem->LoadInfractions())
+	if (!g_pAdminSystem->LoadInfractions() || !GetGlobals())
 		return;
 
-	for (int i = 0; i < gpGlobals->maxClients; i++)
+	for (int i = 0; i < GetGlobals()->maxClients; i++)
 	{
 		ZEPlayer* pPlayer = g_playerManager->GetPlayer(i);
 
@@ -577,76 +577,6 @@ CON_COMMAND_CHAT_FLAGS(entfirecontroller, "<name> <input> [parameter] - Fire out
 	ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Input successful on %i player controllers.", iFoundEnts);
 }
 
-CON_COMMAND_CHAT_FLAGS(map, "<mapname> - Change map", ADMFLAG_CHANGEMAP)
-{
-	if (args.ArgC() < 2)
-	{
-		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Usage: !map <mapname>");
-		return;
-	}
-
-	std::string sMapName = args[1];
-
-	for (int i = 0; sMapName[i]; i++)
-	{
-		// Injection prevention, because we may pass user input to ServerCommand
-		if (sMapName[i] == ';' || sMapName[i] == '|')
-			return;
-
-		sMapName[i] = tolower(sMapName[i]);
-	}
-
-	const char* pszMapName = sMapName.c_str();
-
-	if (!g_pEngineServer2->IsMapValid(pszMapName))
-	{
-		std::string sCommand;
-		std::vector<int> foundIndexes = g_pMapVoteSystem->GetMapIndexesFromSubstring(pszMapName);
-
-		// Check if input is numeric (workshop ID)
-		// Not safe to expose to all admins until crashing on failed workshop addon downloads is fixed
-		if ((!player || player->GetZEPlayer()->IsAdminFlagSet(ADMFLAG_RCON)) && V_StringToUint64(pszMapName, 0, NULL, NULL, PARSING_FLAG_SKIP_WARNING) != 0)
-		{
-			sCommand = "host_workshop_map " + sMapName;
-		}
-		else if (g_bVoteManagerEnable && foundIndexes.size() > 0)
-		{
-			if (foundIndexes.size() > 1)
-			{
-				ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Multiple maps matched \x06%s\x01, try being more specific:", pszMapName);
-
-				for (int i = 0; i < foundIndexes.size() && i < 5; i++)
-					ClientPrint(player, HUD_PRINTTALK, "- %s", g_pMapVoteSystem->GetMapName(foundIndexes[i]));
-
-				return;
-			}
-
-			sCommand = "host_workshop_map " + std::to_string(g_pMapVoteSystem->GetMapWorkshopId(foundIndexes[0]));
-		}
-		else
-		{
-			ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Failed to find a map matching %s.", pszMapName);
-			return;
-		}
-
-		ClientPrintAll(HUD_PRINTTALK, CHAT_PREFIX "Changing map to %s...", pszMapName);
-
-		new CTimer(5.0f, false, true, [sCommand]() {
-			g_pEngineServer2->ServerCommand(sCommand.c_str());
-			return -1.0f;
-		});
-
-		return;
-	}
-
-	ClientPrintAll(HUD_PRINTTALK, CHAT_PREFIX "Changing map to %s...", pszMapName);
-
-	new CTimer(5.0f, false, true, [sMapName]() {
-		g_pEngineServer2->ChangeLevel(sMapName.c_str(), nullptr);
-		return -1.0f;
-	});
-}
-
 CON_COMMAND_CHAT_FLAGS(hsay, "<message> - Say something as a hud hint", ADMFLAG_CHAT)
 {
 	if (args.ArgC() < 2)
@@ -685,8 +615,7 @@ CON_COMMAND_CHAT_FLAGS(extend, "<minutes> - Extend current map (negative value r
 
 	int iExtendTime = V_StringToInt32(args[1], 0);
 
-	// Call the votemanager extend function so the extend vote can be checked
-	ExtendMap(iExtendTime);
+	g_pVoteManager->ExtendMap(iExtendTime);
 
 	const char* pszCommandPlayerName = player ? player->GetPlayerName() : CONSOLE_NAME;
 
@@ -698,6 +627,9 @@ CON_COMMAND_CHAT_FLAGS(extend, "<minutes> - Extend current map (negative value r
 
 CON_COMMAND_CHAT_FLAGS(pm, "<name> <message> - Private message a player. This will also show to all online admins", ADMFLAG_GENERIC)
 {
+	if (!GetGlobals())
+		return;
+
 	if (args.ArgC() < 3)
 	{
 		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Usage: /pm <name> <message>");
@@ -737,7 +669,7 @@ CON_COMMAND_CHAT_FLAGS(pm, "<name> <message> - Private message a player. This wi
 		return;
 	}
 
-	for (int i = 0; i < gpGlobals->maxClients; i++)
+	for (int i = 0; i < GetGlobals()->maxClients; i++)
 	{
 		ZEPlayer* pPlayer = g_playerManager->GetPlayer(i);
 
@@ -755,9 +687,12 @@ CON_COMMAND_CHAT_FLAGS(pm, "<name> <message> - Private message a player. This wi
 
 CON_COMMAND_CHAT_FLAGS(who, "- List the flags of all online players", ADMFLAG_GENERIC)
 {
+	if (!GetGlobals())
+		return;
+
 	std::vector<std::tuple<std::string, std::string, uint64>> rgNameSlotID;
 
-	for (size_t i = 0; i < gpGlobals->maxClients; i++)
+	for (size_t i = 0; i < GetGlobals()->maxClients; i++)
 	{
 		CCSPlayerController* ccsPly = CCSPlayerController::FromSlot(i);
 
@@ -961,7 +896,8 @@ CON_COMMAND_CHAT_FLAGS(listdc, "- List recently disconnected players and their S
 
 CON_COMMAND_CHAT_FLAGS(endround, "- Immediately ends the round, client-side variant of endround", ADMFLAG_RCON)
 {
-	g_pGameRules->TerminateRound(0.0f, CSRoundEndReason::Draw);
+	if (g_pGameRules)
+		g_pGameRules->TerminateRound(0.0f, CSRoundEndReason::Draw);
 }
 
 CON_COMMAND_CHAT_FLAGS(money, "<name> <amount> - Set a player's amount of money", ADMFLAG_CHEATS)

src/buttonwatch.cpp

@@ -96,7 +96,7 @@ bool IsButtonWatchEnabled()
 std::map<int, bool> mapRecentEnts;
 void ButtonWatch(const CEntityIOOutput* pThis, CEntityInstance* pActivator, CEntityInstance* pCaller, const CVariant* value, float flDelay)
 {
-	if (!IsButtonWatchEnabled() || V_stricmp(pThis->m_pDesc->m_pName, "OnPressed") || !pActivator || !((CBaseEntity*)pActivator)->IsPawn() || !pCaller || mapRecentEnts.contains(pCaller->GetEntityIndex().Get()))
+	if (!IsButtonWatchEnabled() || !GetGlobals() || V_stricmp(pThis->m_pDesc->m_pName, "OnPressed") || !pActivator || !((CBaseEntity*)pActivator)->IsPawn() || !pCaller || mapRecentEnts.contains(pCaller->GetEntityIndex().Get()))
 		return;
 
 	CCSPlayerController* ccsPlayer = CCSPlayerController::FromPawn(static_cast<CCSPlayerPawn*>(pActivator));
@@ -112,7 +112,7 @@ void ButtonWatch(const CEntityIOOutput* pThis, CEntityInstance* pActivator, CEnt
 
 	std::string strButton = std::to_string(pCaller->GetEntityIndex().Get()) + " " + std::string(((CBaseEntity*)pCaller)->GetName());
 
-	for (int i = 0; i < gpGlobals->maxClients; i++)
+	for (int i = 0; i < GetGlobals()->maxClients; i++)
 	{
 		CCSPlayerController* ccsPlayer = CCSPlayerController::FromSlot(i);
 		if (!ccsPlayer)

src/cs2_sdk/entity/ccsweaponbase.h

@@ -21,7 +21,7 @@
 
 #include "cbaseentity.h"
 
-extern CGlobalVars* gpGlobals;
+extern CGlobalVars* GetGlobals();
 
 enum gear_slot_t : uint32_t
 {
@@ -97,8 +97,11 @@ class CBasePlayerWeapon : public CEconEntity
 
 	void Disarm()
 	{
-		m_nNextPrimaryAttackTick(MAX(m_nNextPrimaryAttackTick(), gpGlobals->tickcount + 24));
-		m_nNextSecondaryAttackTick(MAX(m_nNextSecondaryAttackTick(), gpGlobals->tickcount + 24));
+		if (!GetGlobals())
+			return;
+
+		m_nNextPrimaryAttackTick(MAX(m_nNextPrimaryAttackTick(), GetGlobals()->tickcount + 24));
+		m_nNextSecondaryAttackTick(MAX(m_nNextSecondaryAttackTick(), GetGlobals()->tickcount + 24));
 	}
 };
 

src/cs2_sdk/entity/cgamerules.h

@@ -65,6 +65,7 @@ class CCSGameRules : public CGameRules
 	SCHEMA_FIELD(GameTime_t, m_fRoundStartTime)
 	SCHEMA_FIELD(GameTime_t, m_flRestartRoundTime)
 	SCHEMA_FIELD_POINTER(int, m_nEndMatchMapGroupVoteOptions)
+	SCHEMA_FIELD_POINTER(int, m_nEndMatchMapGroupVoteTypes)
 	SCHEMA_FIELD(int, m_nEndMatchMapVoteWinner)
 	SCHEMA_FIELD(int, m_iRoundTime)
 	SCHEMA_FIELD(bool, m_bFreezePeriod)

src/cs2_sdk/schema.cpp

@@ -27,7 +27,7 @@
 
 #include "tier0/memdbgon.h"
 
-extern CGlobalVars* gpGlobals;
+extern CGlobalVars* GetGlobals();
 
 using SchemaKeyValueMap_t = CUtlMap<uint32_t, SchemaKey>;
 using SchemaTableMap_t = CUtlMap<uint32_t, SchemaKeyValueMap_t*>;