Merge branch 'dev' into voicechat-command

Author: Faramour

PackageScript

@@ -113,7 +113,7 @@ for task in MMSPlugin.binaries:
   mapcfg_folder = builder.AddFolder(os.path.join(packages[sdk_name].sdk_name, 'cfg', MMSPlugin.metadata['name'], 'maps'))
   gamedata_folder = builder.AddFolder(os.path.join(packages[sdk_name].sdk_name, 'addons', MMSPlugin.metadata['name'], 'gamedata'))
   builder.AddCopy(os.path.join('configs', 'admins.jsonc.example'), configs_folder)
-  builder.AddCopy(os.path.join('configs', 'discordbots.cfg.example'), configs_folder)
+  builder.AddCopy(os.path.join('configs', 'discordbots.jsonc.example'), configs_folder)
   builder.AddCopy(os.path.join('configs', 'maplist.jsonc.example'), configs_folder)
   builder.AddCopy(os.path.join('cfg', MMSPlugin.metadata['name'], 'cs2fixes.cfg'), cfg_folder)
   builder.AddCopy(os.path.join('cfg', MMSPlugin.metadata['name'], 'maps', 'de_somemap.cfg'), mapcfg_folder)

cfg/cs2fixes/cs2fixes.cfg

@@ -7,7 +7,7 @@ cs2f_stopsound_enable 			0		// Whether to enable stopsound
 cs2f_noblock_enable 			0		// Whether to use player noblock, which sets debris collision on every player
 cs2f_noblock_grenades			0		// Whether to use noblock on grenade projectiles
 cs2f_block_team_messages 		0		// Whether to block team join messages
-cs2f_movement_unlocker_enable	0		// Whether to enable movement unlocker
+cs2f_movement_unlocker_enable	0		// Whether to enable movement unlocker, clients will not predict
 cs2f_use_old_push 				0		// Whether to use the old CSGO trigger_push behavior (Necessary for surf and other modes that heavily use ported pushes)
 cs2f_hide_enable 				0		// Whether to enable hide (WARNING: randomly crashes clients since 2023-12-13 CS2 update)
 cs2f_votemanager_enable			0		// Whether to enable votemanager features such as map vote fix, nominations, RTV and extends
@@ -26,6 +26,7 @@ cs2f_fix_game_bans				0		// Whether to fix CS2 game bans spreading to all new jo
 cs2f_free_armor					0		// Whether kevlar (1+) and/or helmet (2) are given automatically
 cs2f_block_particle_msgs		0		// Whether to block CUserMsg_ParticleManager messages to fix lag/crashes, experimental
 cs2f_disable_setmodel			0		// Whether to disable SetModel usage from maps (custom input, cs_script function)
+cs2f_allow_duck_spam			0		// Whether to allow duck spamming by removing the duck slowdown, clients will only partially predict [0 = disabled, 1 = both teams, 2 = T only, 3 = CT only]
 
 cs2f_beacon_particle			"particles/cs2fixes/admin_beacon.vpcf" // .vpcf file to be precached and used for player beacon
 cs2f_motd_url					""		// Server MOTD URL, shows up as a "Server Website" button in scoreboard

configs/discordbots.cfg.example

@@ -0,0 +1,13 @@
+{
+	"YourFirstBot":
+	{
+		"webhook": "DISCORD_WEBHOOK_1",
+		"override_name": false
+	},
+	"YourSecondBot":
+	{
+		"webhook": "DISCORD_WEBHOOK_2",
+		"avatar": "AVATAR_IMAGE_2",
+		"override_name": true
+	}
+}

configs/discordbots.jsonc.example

@@ -56,13 +56,6 @@
 			"windows": "C8 42 EB ? 4C 8B 77 ? 4D 39 66",
 			"linux": "C8 42 41 C7 85 ? ? ? ? ? ? ? ? 41 C7 85 ? ? ? ? ? ? ? ? E9"
 		},
-		// Called right after "Removed %s(%s)\n"
-		"UTIL_Remove":
-		{
-			"library": "server",
-			"windows": "48 85 C9 74 ? 48 8B D1 48 8B 0D ? ? ? ?",
-			"linux": "48 89 FE 48 85 FF 74 ? 48 8D 05 ? ? ? ? 48"
-		},
 		// "SetPosition" is passed to this
 		"CEntitySystem_AddEntityIOEvent":
 		{

gamedata/cs2fixes.jsonc

@@ -55,7 +55,6 @@ bool addresses::Initialize(CGameConfig* g_GameConfig)
 	RESOLVE_SIG(g_GameConfig, "CCSPlayerController_SwitchTeam", addresses::CCSPlayerController_SwitchTeam);
 	RESOLVE_SIG(g_GameConfig, "CBasePlayerController_SetPawn", addresses::CBasePlayerController_SetPawn);
 	RESOLVE_SIG(g_GameConfig, "CBaseModelEntity_SetModel", addresses::CBaseModelEntity_SetModel);
-	RESOLVE_SIG(g_GameConfig, "UTIL_Remove", addresses::UTIL_Remove);
 	RESOLVE_SIG(g_GameConfig, "CEntitySystem_AddEntityIOEvent", addresses::CEntitySystem_AddEntityIOEvent);
 	RESOLVE_SIG(g_GameConfig, "CEntityInstance_AcceptInput", addresses::CEntityInstance_AcceptInput);
 	RESOLVE_SIG(g_GameConfig, "CGameEntitySystem_FindEntityByClassName", addresses::CGameEntitySystem_FindEntityByClassName);

sdk

@@ -1338,74 +1338,6 @@ CAdminSystem::CAdminSystem()
 	m_iDCPlyIndex = 0;
 }
 
-// TODO: Remove this once servers have been given a few months to update cs2fixes
-bool CAdminSystem::ConvertAdminsKVToJSON()
-{
-	KeyValues* pKV = new KeyValues("admins");
-	KeyValues::AutoDelete autoDelete(pKV);
-
-	const char* pszPath = "addons/cs2fixes/configs/admins.cfg";
-
-	if (!pKV->LoadFromFile(g_pFullFileSystem, pszPath))
-	{
-		Warning("Failed to load %s\n", pszPath);
-		return false;
-	}
-
-	ordered_json jAdmins;
-
-	jAdmins["Admins"] = ordered_json(ordered_json::value_t::object);
-
-	for (KeyValues* pKey = pKV->GetFirstSubKey(); pKey; pKey = pKey->GetNextKey())
-	{
-		ordered_json jAdmin;
-
-		if (!pKey->FindKey("steamid"))
-		{
-			Warning("Admin entry %s is missing 'steam' key\n", pKey->GetName());
-			return false;
-		}
-
-		jAdmin["name"] = pKey->GetName();
-
-		if (pKey->FindKey("flags"))
-			jAdmin["flags"] = pKey->GetString("flags", nullptr);
-
-		if (pKey->FindKey("immunity"))
-			jAdmin["immunity"] = pKey->GetInt("immunity", 0);
-
-		jAdmins["Admins"][pKey->GetString("steamid", "")] = jAdmin;
-	}
-
-	const char* pszJsonPath = "addons/cs2fixes/configs/admins.jsonc";
-	const char* pszKVConfigRenamePath = "addons/cs2fixes/configs/admins_old.cfg";
-	char szPath[MAX_PATH];
-	V_snprintf(szPath, sizeof(szPath), "%s%s%s", Plat_GetGameDirectory(), "/csgo/", pszJsonPath);
-	std::ofstream jsonFile(szPath);
-
-	if (!jsonFile.is_open())
-	{
-		Panic("Failed to open %s\n", pszJsonPath);
-		return false;
-	}
-
-	jsonFile << std::setfill('\t') << std::setw(1) << jAdmins << std::endl;
-
-	char szKVRenamePath[MAX_PATH];
-	V_snprintf(szPath, sizeof(szPath), "%s%s%s", Plat_GetGameDirectory(), "/csgo/", pszPath);
-	V_snprintf(szKVRenamePath, sizeof(szPath), "%s%s%s", Plat_GetGameDirectory(), "/csgo/", pszKVConfigRenamePath);
-
-	std::rename(szPath, szKVRenamePath);
-
-	// remove old cfg example if it exists
-	const char* pszKVExamplePath = "addons/cs2fixes/configs/admins.cfg.example";
-	V_snprintf(szPath, sizeof(szPath), "%s%s%s", Plat_GetGameDirectory(), "/csgo/", pszKVExamplePath);
-	std::remove(szPath);
-
-	Message("Successfully converted KV1 admins.cfg to JSON format at %s\n", pszJsonPath);
-	return true;
-}
-
 bool CAdminSystem::LoadAdmins()
 {
 	m_mapAdmins.clear();
@@ -1418,13 +1350,8 @@ bool CAdminSystem::LoadAdmins()
 
 	if (!jsonFile.is_open())
 	{
-		if (!ConvertAdminsKVToJSON())
-		{
-			Panic("Failed to open %s and convert KV1 admins.cfg to JSON format, admins are not loaded!\n", pszJsonPath);
-			return false;
-		}
-
-		jsonFile.open(szPath);
+		Panic("Failed to open %s, admins are not loaded!\n", pszJsonPath);
+		return false;
 	}
 
 	ordered_json jAdminConfig = ordered_json::parse(jsonFile, nullptr, false, true);

src/addresses.cpp

@@ -189,9 +189,6 @@ class CAdminSystem
 	void AddDisconnectedPlayer(const char* pszName, uint64 xuid, const char* pszIP);
 	void ShowDisconnectedPlayers(CCSPlayerController* const pAdmin);
 
-	// TODO: Remove this once servers have been given a few months to update cs2fixes
-	bool ConvertAdminsKVToJSON();
-
 private:
 	std::map<std::string, CAdminBase> m_mapAdminGroups;
 	std::map<uint64, CAdmin> m_mapAdmins;

src/adminsystem.cpp

@@ -24,4 +24,7 @@
 class CBaseToggle : CBaseModelEntity
 {
 	DECLARE_SCHEMA_CLASS(CBaseToggle);
+
+	SCHEMA_FIELD(Vector, m_vecPosition1);
+	SCHEMA_FIELD(Vector, m_vecPosition2);
 };