From a202425dd776873bedac275a6c5ad694f56edd7d Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sat, 3 Aug 2024 20:11:08 +0300 Subject: [PATCH 1/3] Fix: `ammo`/`weapons` respawn behavior (#982) * `CBasePlayerAmmo`: check spawnflags on `Spawn()` * `CBasePlayerItem`: check spawnflags on `Materialize()` * `CBasePlayerItem`: Add `Respawn()` item when hasn't specific spawnflags * `CBasePlayerItem`: remove `SF_NORESPAWN` flag on `Respawn()` * Use forgotten `AMMO_RESPAWN_TIME` --- regamedll/dlls/ammo.cpp | 6 +++++- regamedll/dlls/multiplay_gamerules.cpp | 2 +- regamedll/dlls/weapons.cpp | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/regamedll/dlls/ammo.cpp b/regamedll/dlls/ammo.cpp index bfef8749e..1df3622cc 100644 --- a/regamedll/dlls/ammo.cpp +++ b/regamedll/dlls/ammo.cpp @@ -10,7 +10,11 @@ void CBasePlayerAmmo::Spawn() SetTouch(&CBasePlayerAmmo::DefaultTouch); - if (g_pGameRules->IsMultiplayer()) + if (g_pGameRules->IsMultiplayer() +#ifdef REGAMEDLL_FIXES + && g_pGameRules->AmmoShouldRespawn(this) == GR_AMMO_RESPAWN_NO +#endif + ) { SetThink(&CBaseEntity::SUB_Remove); pev->nextthink = gpGlobals->time + 2.0f; diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp index 7caa946b8..1ff0a14be 100644 --- a/regamedll/dlls/multiplay_gamerules.cpp +++ b/regamedll/dlls/multiplay_gamerules.cpp @@ -4321,7 +4321,7 @@ int CHalfLifeMultiplay::AmmoShouldRespawn(CBasePlayerAmmo *pAmmo) float CHalfLifeMultiplay::FlAmmoRespawnTime(CBasePlayerAmmo *pAmmo) { - return gpGlobals->time + 20.0f; + return gpGlobals->time + AMMO_RESPAWN_TIME; } Vector CHalfLifeMultiplay::VecAmmoRespawnSpot(CBasePlayerAmmo *pAmmo) diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp index 454b96f04..9f1765418 100644 --- a/regamedll/dlls/weapons.cpp +++ b/regamedll/dlls/weapons.cpp @@ -518,7 +518,11 @@ void CBasePlayerItem::Materialize() UTIL_SetOrigin(pev, pev->origin); SetTouch(&CBasePlayerItem::DefaultTouch); - if (g_pGameRules->IsMultiplayer()) + if (g_pGameRules->IsMultiplayer() +#ifdef REGAMEDLL_FIXES + && g_pGameRules->WeaponShouldRespawn(this) == GR_WEAPON_RESPAWN_NO +#endif + ) { if (!CanDrop()) { @@ -555,8 +559,12 @@ void CBasePlayerItem::CheckRespawn() { switch (g_pGameRules->WeaponShouldRespawn(this)) { - case GR_WEAPON_RESPAWN_YES: + case GR_WEAPON_RESPAWN_YES: { +#ifdef REGAMEDLL_FIXES + Respawn(); +#endif return; + } case GR_WEAPON_RESPAWN_NO: return; } @@ -575,6 +583,10 @@ CBaseEntity *CBasePlayerItem::Respawn() // invisible for now pNewWeapon->pev->effects |= EF_NODRAW; +#ifdef REGAMEDLL_ADD + pNewWeapon->pev->spawnflags &= ~SF_NORESPAWN; +#endif + // no touch pNewWeapon->SetTouch(nullptr); pNewWeapon->SetThink(&CBasePlayerItem::AttemptToMaterialize); From 9d9c2de1ff66bca773bfb37f7214676b1f3d959d Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sat, 3 Aug 2024 20:17:52 +0300 Subject: [PATCH 2/3] Feature: ConVars for `weapon`/`item`/`ammo` respawn time (#983) * `CBasePlayerAmmo`: check spawnflags on `Spawn()` * `CBasePlayerItem`: check spawnflags on `Materialize()` * `CBasePlayerItem`: Add `Respawn()` item when hasn't specific spawnflags * `CBasePlayerItem`: remove `SF_NORESPAWN` flag on `Respawn()` * Use forgotten `AMMO_RESPAWN_TIME` * new ConVars: `mp_item_respawn_time`, `mp_weapon_respawn_time`, `mp_ammo_respawn_time` --- README.md | 3 +++ dist/game.cfg | 18 ++++++++++++++++++ regamedll/dlls/game.cpp | 8 ++++++++ regamedll/dlls/game.h | 4 ++++ regamedll/dlls/multiplay_gamerules.cpp | 12 ++++++++++++ 5 files changed, 45 insertions(+) diff --git a/README.md b/README.md index e5b55c0cf..0ad6361ae 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,9 @@ This means that plugins that do binary code analysis (Orpheu for example) probab | mp_freezetime_jump | 1 | 0 | 1 | Allow players to jump during freezetime.
`0` disabled
`1` enabled | | mp_defuser_allocation | 0 | 0 | 2 | Give defuser on player spawn.
`0` disabled
`1` Random players.
`2` All players. | | mp_location_area_info | 0 | 0 | 3 | Enable location area info.
`0` disabled
`1` show location below HUD radar.
`2` show location in HUD chat. `NOT RECOMMENDED!` [:speech_balloon:](## "Not all client builds are compatible")
`3` both displayed. `NOT RECOMMENDED!` [:speech_balloon:](## "Not all client builds are compatible")

`NOTE`: Navigation `maps/.nav` file required and should contain place names
`NOTE`: If option `2` or `3` is enabled, be sure to enable `mp_chat_loc_fallback 1` | +| mp_item_respawn_time | 30 | 0.0 | - | The respawn time for items (such as health packs, armor, etc.). | +| mp_weapon_respawn_time | 20 | 0.0 | - | The respawn time for weapons. | +| mp_ammo_respawn_time | 20 | 0.0 | - | The respawn time for ammunition. | ## How to install zBot for CS 1.6? diff --git a/dist/game.cfg b/dist/game.cfg index e6510f345..96e313aa4 100644 --- a/dist/game.cfg +++ b/dist/game.cfg @@ -587,3 +587,21 @@ mp_defuser_allocation "0" // // Default value: "0" mp_location_area_info "0" + +// The respawn time for items (such as health packs, armor, etc.). +// 0 - disable delay +// +// Default value: "30" +mp_item_respawn_time "30" + +// The respawn time for weapons. +// 0 - disable delay +// +// Default value: "20" +mp_weapon_respawn_time "20" + +// The respawn time for ammunition. +// 0 - disable delay +// +// Default value: "20" +mp_ammo_respawn_time "20" diff --git a/regamedll/dlls/game.cpp b/regamedll/dlls/game.cpp index 8d781724d..c4e303c51 100644 --- a/regamedll/dlls/game.cpp +++ b/regamedll/dlls/game.cpp @@ -181,6 +181,10 @@ cvar_t defuser_allocation = { "mp_defuser_allocation", "0", 0, 0.0f, nullpt cvar_t location_area_info = { "mp_location_area_info", "0", 0, 0.0f, nullptr }; cvar_t chat_loc_fallback = { "mp_chat_loc_fallback", "1", 1, 0.0f, nullptr }; +cvar_t item_respawn_time = { "mp_item_respawn_time", "30", FCVAR_SERVER, 30.0f, nullptr }; +cvar_t weapon_respawn_time = { "mp_weapon_respawn_time", "20", FCVAR_SERVER, 20.0f, nullptr }; +cvar_t ammo_respawn_time = { "mp_ammo_respawn_time", "20", FCVAR_SERVER, 20.0f, nullptr }; + void GameDLL_Version_f() { if (Q_stricmp(CMD_ARGV(1), "version") != 0) @@ -446,6 +450,10 @@ void EXT_FUNC GameDLLInit() CVAR_REGISTER(&location_area_info); CVAR_REGISTER(&chat_loc_fallback); + CVAR_REGISTER(&item_respawn_time); + CVAR_REGISTER(&weapon_respawn_time); + CVAR_REGISTER(&ammo_respawn_time); + // print version CONSOLE_ECHO("ReGameDLL version: " APP_VERSION "\n"); diff --git a/regamedll/dlls/game.h b/regamedll/dlls/game.h index dcd712f5e..d0924d3a3 100644 --- a/regamedll/dlls/game.h +++ b/regamedll/dlls/game.h @@ -204,6 +204,10 @@ extern cvar_t defuser_allocation; extern cvar_t location_area_info; extern cvar_t chat_loc_fallback; +extern cvar_t item_respawn_time; +extern cvar_t weapon_respawn_time; +extern cvar_t ammo_respawn_time; + #endif extern cvar_t scoreboard_showmoney; diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp index 1ff0a14be..e1b8a7e4e 100644 --- a/regamedll/dlls/multiplay_gamerules.cpp +++ b/regamedll/dlls/multiplay_gamerules.cpp @@ -4221,7 +4221,11 @@ void EXT_FUNC CHalfLifeMultiplay::__API_HOOK(PlayerGotWeapon)(CBasePlayer *pPlay // What is the time in the future at which this weapon may spawn? float CHalfLifeMultiplay::FlWeaponRespawnTime(CBasePlayerItem *pWeapon) { +#ifdef REGAMEDLL_ADD + return gpGlobals->time + weapon_respawn_time.value; +#else return gpGlobals->time + WEAPON_RESPAWN_TIME; +#endif } // Returns 0 if the weapon can respawn now, @@ -4289,7 +4293,11 @@ int CHalfLifeMultiplay::ItemShouldRespawn(CItem *pItem) // At what time in the future may this Item respawn? float CHalfLifeMultiplay::FlItemRespawnTime(CItem *pItem) { +#ifdef REGAMEDLL_ADD; + return gpGlobals->time + item_respawn_time.value; +#else return gpGlobals->time + ITEM_RESPAWN_TIME; +#endif } // Where should this item respawn? @@ -4321,7 +4329,11 @@ int CHalfLifeMultiplay::AmmoShouldRespawn(CBasePlayerAmmo *pAmmo) float CHalfLifeMultiplay::FlAmmoRespawnTime(CBasePlayerAmmo *pAmmo) { +#ifdef REGAMEDLL_ADD + return gpGlobals->time + ammo_respawn_time.value; +#else return gpGlobals->time + AMMO_RESPAWN_TIME; +#endif } Vector CHalfLifeMultiplay::VecAmmoRespawnSpot(CBasePlayerAmmo *pAmmo) From 1bd2c55ce4a8cf2025bfe198d74b56dc1461bd79 Mon Sep 17 00:00:00 2001 From: Eason <62255465+jonathan-up@users.noreply.github.com> Date: Sun, 4 Aug 2024 16:44:21 +0800 Subject: [PATCH 3/3] Cvar sv_allchat 2 to set spectator text message visible dead only (#17) --- README.md | 2 +- dist/game.cfg | 1 + regamedll/dlls/client.cpp | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ad6361ae..6f600bf54 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ This means that plugins that do binary code analysis (Orpheu for example) probab | mp_team_flash | 1 | -1 | 1 | Sets the behaviour for Flashbangs on teammates.
`-1` Don't affect teammates neither flash owner
`0` Don't affect teammates
`1` Affects teammates | | mp_fadetoblack | 0 | 0 | 2 | Observer's screen will fade to black on kill event or permanent.
`0` No fade.
`1` Fade to black and won't be able to watch anybody.
`2` fade to black only on kill moment. | | mp_falldamage | 1 | 0 | 1 | Damage from falling.
`0` disabled
`1` enabled | -| sv_allchat | 1 | 0 | 1 | Players can receive all other players text chat, team restrictions apply
`0` disabled
`1` enabled | +| sv_allchat | 1 | 0 | 1 | Players can receive all other players text chat, team restrictions apply
`0` disabled
`1` enabled
`2` enabled, but only dead player can see spectator's message | | sv_autobunnyhopping | 0 | 0 | 1 | Players automatically re-jump while holding jump button.
`0` disabled
`1` enabled | | sv_enablebunnyhopping | 0 | 0 | 1 | Allow player speed to exceed maximum running speed.
`0` disabled
`1` enabled | | mp_plant_c4_anywhere | 0 | 0 | 1 | When set, players can plant anywhere, not only in bombsites.
`0` disabled
`1` enabled | diff --git a/dist/game.cfg b/dist/game.cfg index 96e313aa4..2541ac75c 100644 --- a/dist/game.cfg +++ b/dist/game.cfg @@ -485,6 +485,7 @@ mp_team_flash "1" // Players can receive all other players text chat, team restrictions apply. // 0 - disabled (default behaviour) // 1 - enabled +// 2 - enabled, but only dead player can see spectator'smessage // // Default value: "0" sv_allchat "0" diff --git a/regamedll/dlls/client.cpp b/regamedll/dlls/client.cpp index 7d3fb659e..961175644 100644 --- a/regamedll/dlls/client.cpp +++ b/regamedll/dlls/client.cpp @@ -1010,6 +1010,17 @@ void Host_Say(edict_t *pEntity, BOOL teamonly) continue; } + // when allchat is 2,only dead player can see spectator's message + if ( +#ifdef REGAMEDLL_ADD + allchat.value == 2.0f && +#endif + (pPlayer->m_iTeam == UNASSIGNED || pPlayer->m_iTeam == SPECTATOR) + ) { + if (pReceiver->pev->deadflag == DEAD_NO) + continue; + } + if ((pReceiver->m_iIgnoreGlobalChat == IGNOREMSG_ENEMY && pReceiver->m_iTeam == pPlayer->m_iTeam) || pReceiver->m_iIgnoreGlobalChat == IGNOREMSG_NONE) {