- Moved health on zombification from cvar to zombie classes

- Added MOTD/server link to scoreboard

Author: JayCroghan

cfg/cs2fixes/cs2fixes.cfg

@@ -27,6 +27,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_fix_ladder_gravity			0		// Whether to fix ladders resetting player gravity.
 
+cs2f_motd_url					"https://wwww.zombiemod.com"		// Server MOTD URL, shows up as a "Server Website" button in scoreboard
 cs2f_beacon_particle			"particles/cs2fixes/admin_beacon.vpcf" // .vpcf file to be precached and used for player beacon
 
 cs2f_delay_auth_fail_kick		0		// How long in seconds to delay kicking players when their Steam authentication fails, use with sv_steamauth_enforce 0
@@ -192,5 +193,4 @@ zm_ztele_max_human 				1		// Max number of times a human is allowed to use ZTele
 zm_infinite_ammo				0		// Whether or not ammo gets set to 999 in the mag after first reload.
 zm_infinite_ammo_total			9999	// The total amount of actual bullets to count as 'infinite'.
 zm_user_prefs_to_file			1		// Whether to save user prefs to a file if cs2f_user_prefs_api is not set [Folder on server needs to be read/writeable by the game and is game/csgo/addons/cs2fixes/data]
-zm_run_with_bots				0		// When true, the server will end rounds as normal when only bots exist in the server.
-zm_health_on_zombification		0		// When greater than 0, zombies get this much health back when they turn someone else into a zombie.
+zm_run_with_bots				0		// When true, the server will end rounds as normal when only bots exist in the server.

configs/zm/playerclass.jsonc.example

@@ -78,7 +78,8 @@
 			"knockback": 1.0,
 			"admin_flag": "",
 			"health_regen_count": 250,
-			"health_regen_interval": 5.0
+			"health_regen_interval": 5.0,
+			"health_on_zombification": 100
 		},
 		// special class that the first batch of zombie will be assigned to
 		"MotherZombie": {

src/cs2fixes.cpp

@@ -626,6 +626,8 @@ void CS2Fixes::Hook_DispatchConCommand(ConCommandRef cmdHandle, const CCommandCo
 	RETURN_META(MRES_IGNORED);
 }
 
+CConVar<CUtlString> g_cvarMotdUrl("cs2f_motd_url", FCVAR_NONE, "Server MOTD URL, shows up as a \"Server Website\" button in scoreboard", "");
+
 void CS2Fixes::Hook_StartupServer(const GameSessionConfiguration_t& config, ISource2WorldSession* pSession, const char* pszMapName)
 {
 	g_pEntitySystem = GameEntitySystem();
@@ -645,8 +647,18 @@ void CS2Fixes::Hook_StartupServer(const GameSessionConfiguration_t& config, ISou
 
 	g_pPanoramaVoteHandler->Reset();
 	g_pVoteManager->VoteManager_Init();
-
 	g_pIdleSystem->Reset();
+
+	INetworkStringTable* pInfoPanelTable = g_pNetworkStringTableServer->FindTable("InfoPanel");
+
+	if (pInfoPanelTable && V_strcmp(g_cvarMotdUrl.Get(), ""))
+	{
+		SetStringUserDataRequest_t pUserData;
+		pUserData.m_pRawData = (void*)g_cvarMotdUrl.Get().Get();
+		pUserData.m_cbDataSize = g_cvarMotdUrl.Get().Length() + 1;
+
+		pInfoPanelTable->AddString(true, "motd", &pUserData);
+	}
 }
 
 class CGamePlayerEquip;

src/zombiemod.cpp

@@ -60,7 +60,7 @@ extern ZRWeaponConfig* g_pZRWeaponConfig;
 extern ZRHitgroupConfig* g_pZRHitgroupConfig;
 
 CConVar<bool> g_cvarZMEnable("zm_enable", (FCVAR_REPLICATED | FCVAR_SPONLY | FCVAR_NOTIFY), "ZombieMod enabled or not.", false, ConVarZMEnableChange);
-CConVar<CUtlString> g_cvarZMVersion("zm_version", (FCVAR_REPLICATED | FCVAR_SPONLY | FCVAR_NOTIFY), "ZombieMod version", "4.0.0v");
+CConVar<CUtlString> g_cvarZMVersion("zm_version", (FCVAR_REPLICATED | FCVAR_SPONLY | FCVAR_NOTIFY), "ZombieMod version", "4.0.0x");
 CConVar<CUtlString> g_cvarZMHumanWinOverlayParticle("zm_human_win_overlay_particle", FCVAR_NONE, "Screenspace particle to display when human win", "");
 CConVar<CUtlString> g_cvarZMZombieWinOverlayParticle("zm_zombie_win_overlay_particle", FCVAR_NONE, "Screenspace particle to display when zombie win", "");
 CConVar<int> g_cvarZMInfectSpawnType("zm_infect_spawn_type", FCVAR_NONE, "Type of Mother Zombies Spawn [0 = MZ spawn where they stand, 1 = MZ get teleported back to spawn on being picked]", (int)EZMSpawnType::ZM_RESPAWN, true, 0, true, 1);
@@ -97,7 +97,6 @@ CConVar<int> g_cvarZMInfiniteAmmoTotal("zm_infinite_ammo_total", FCVAR_NONE, "Th
 CConVar<bool> g_cvarZMUserPresToFile("zm_user_prefs_to_file", FCVAR_NONE, "Whether to save user prefs to a file if cs2f_user_prefs_api is not set [Folder on server needs to be read/writeable by the game and is game/csgo/addons/cs2fixes/data]", true);
 
 CConVar<bool> g_cvarZMRunWithBots("zm_run_with_bots", FCVAR_NONE, "When true, the server will end rounds as normal when only bots exist in the server.", false);
-CConVar<int> g_cvarZMHealthOnZombification("zm_health_on_zombification", FCVAR_NONE, "When greater than 0, zombies get this much health back when they turn someone else into a zombie.", 0, true, 0, true, 1000);
 
 void ZM_Precache(IEntityResourceManifest* pResourceManifest)
 {
@@ -490,17 +489,25 @@ void ZM_Infect(CCSPlayerController* pAttackerController, CCSPlayerController* pV
 	if (!pVictimPawn)
 		return;
 
-	int health = g_cvarZMHealthOnZombification.Get();
-	if (health > 0)
+	ZEPlayer* pAttacker = pAttackerController->GetZEPlayer();
+	if (pAttacker)
 	{
-		CCSPlayerPawn* pAttackerPawn = (CCSPlayerPawn*)pAttackerController->GetPawn();
-		if (!pAttackerPawn)
-			return;
+		int health = 0;
+		std::shared_ptr<ZRClass> activeClass = pAttacker->GetActiveZRClass();
+		if (activeClass && activeClass->iTeam == CS_TEAM_T)
+			health = static_pointer_cast<ZRZombieClass>(activeClass)->iHealthOnZombification;
 
-		if (pAttackerPawn->m_iHealth() < pAttackerPawn->m_iMaxHealth())
+		if (health > 0)
 		{
-			int iHealth = pAttackerPawn->m_iHealth() + health;
-			pAttackerPawn->m_iHealth = pAttackerPawn->m_iMaxHealth() < iHealth ? pAttackerPawn->m_iMaxHealth() : iHealth;
+			CCSPlayerPawn* pAttackerPawn = (CCSPlayerPawn*)pAttackerController->GetPawn();
+			if (!pAttackerPawn)
+				return;
+
+			if (pAttackerPawn->m_iHealth() < pAttackerPawn->m_iMaxHealth())
+			{
+				int iHealth = pAttackerPawn->m_iHealth() + health;
+				pAttackerPawn->m_iHealth = pAttackerPawn->m_iMaxHealth() < iHealth ? pAttackerPawn->m_iMaxHealth() : iHealth;
+			}
 		}
 	}
 

src/zombiereborn.cpp

@@ -271,6 +271,8 @@ void ZRZombieClass::Override(ordered_json jsonKeys, std::string szClassname)
 		flHealthRegenInterval = jsonKeys["health_regen_interval"].get<float>();
 	if (jsonKeys.contains("knockback"))
 		flKnockback = jsonKeys["knockback"].get<float>();
+	if (jsonKeys.contains("health_on_zombification"))
+		iHealthOnZombification = jsonKeys["health_on_zombification"].get<int>();
 }
 
 bool ZRClass::IsApplicableTo(CCSPlayerController* pController)

src/zombiereborn.h

@@ -202,11 +202,13 @@ struct ZRZombieClass : ZRClass
 	int iHealthRegenCount;
 	float flHealthRegenInterval;
 	float flKnockback;
+	int iHealthOnZombification;
 	ZRZombieClass(std::shared_ptr<ZRZombieClass> pClass) :
 		ZRClass(pClass, CS_TEAM_T),
 		iHealthRegenCount(pClass->iHealthRegenCount),
 		flHealthRegenInterval(pClass->flHealthRegenInterval),
-		flKnockback(pClass->flKnockback){};
+		flKnockback(pClass->flKnockback),
+		iHealthOnZombification(pClass->iHealthOnZombification) {};
 	ZRZombieClass(ordered_json jsonKeys, std::string szClassname);
 	void PrintInfo()
 	{
@@ -235,7 +237,8 @@ struct ZRZombieClass : ZRClass
 			"\tknockback: %f\n"
 			"\tadmin flag: %d\n"
 			"\thealth_regen_count: %d\n"
-			"\thealth_regen_interval: %f\n",
+			"\thealth_regen_interval: %f\n"
+			"\thealth_on_zombification: %d\n",
 			szClassName.c_str(),
 			bEnabled,
 			iHealth,
@@ -246,7 +249,8 @@ struct ZRZombieClass : ZRClass
 			flKnockback,
 			iAdminFlag,
 			iHealthRegenCount,
-			flHealthRegenInterval);
+			flHealthRegenInterval,
+			iHealthOnZombification);
 	};
 	void Override(ordered_json jsonKeys, std::string szClassname);
 };