Skip to content

Add new damage modifier for explosives #2077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Agiel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add new damage modifier for explosives #2077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/game/shared/neo/neo_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ ConVar sv_neo_warmup_round_time("sv_neo_warmup_round_time", "45", FCVAR_REPLICAT
ConVar sv_neo_preround_freeze_time("sv_neo_preround_freeze_time", "15", FCVAR_REPLICATED, "The pre-round freeze time, in seconds.", true, 0.0, false, 0);
ConVar sv_neo_latespawn_max_time("sv_neo_latespawn_max_time", "15", FCVAR_REPLICATED, "How many seconds late are players still allowed to spawn.", true, 0.0, false, 0);

ConVar sv_neo_wep_dmg_modifier("sv_neo_wep_dmg_modifier", "1.485", FCVAR_REPLICATED, "Temp global weapon damage modifier.", true, 0.0, true, 100.0);
ConVar sv_neo_wep_dmg_modifier("sv_neo_wep_dmg_modifier", "1.485", FCVAR_REPLICATED, "Weapon damage modifier.", true, 0.0, true, 100.0);
ConVar sv_neo_exp_dmg_modifier("sv_neo_exp_dmg_modifier", "1.485", FCVAR_REPLICATED, "Explosive damage modifier", true, 0.0, true, 100.0);

ConVar sv_neo_player_restore("sv_neo_player_restore", "1", FCVAR_REPLICATED, "If enabled, the server will save players XP and deaths per match session and restore them if they reconnect.", true, 0.0f, true, 1.0f);

ConVar sv_neo_spraydisable("sv_neo_spraydisable", "0", FCVAR_REPLICATED, "If enabled, disables the players ability to spray.", true, 0.0f, true, 1.0f);
Expand Down
3 changes: 2 additions & 1 deletion src/game/shared/neo/weapons/weapon_detpack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ bool CWeaponDetpack::CanDrop()
return m_bThisDetpackHasBeenThrown && owner && !GetOwner()->IsAlive();
}

extern ConVar sv_neo_exp_dmg_modifier;
void CWeaponDetpack::TossDetpack(CBasePlayer* pPlayer)
{
Assert(HasPrimaryAmmo());
Expand All @@ -297,7 +298,7 @@ void CWeaponDetpack::TossDetpack(CBasePlayer* pPlayer)

if (m_pDetpack)
{
m_pDetpack->SetDamage(NEO_DETPACK_DAMAGE);
m_pDetpack->SetDamage(NEO_DETPACK_DAMAGE * sv_neo_exp_dmg_modifier.GetFloat());
m_pDetpack->SetDamageRadius(NEO_DETPACK_DAMAGE_RADIUS);
}
else
Expand Down
3 changes: 2 additions & 1 deletion src/game/shared/neo/weapons/weapon_grenade.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ void CWeaponGrenade::ItemPostFrame(void)
BaseClass::ItemPostFrame();
}

extern ConVar sv_neo_exp_dmg_modifier;
void CWeaponGrenade::ThrowGrenade(CNEO_Player *pPlayer, bool isAlive, CBaseEntity *pAttacker)
{
if (!sv_neo_infinite_frag_grenades.GetBool())
Expand Down Expand Up @@ -255,7 +256,7 @@ void CWeaponGrenade::ThrowGrenade(CNEO_Player *pPlayer, bool isAlive, CBaseEntit

if (pGrenade)
{
pGrenade->SetDamage(sv_neo_grenade_blast_damage.GetFloat());
pGrenade->SetDamage(sv_neo_grenade_blast_damage.GetFloat() * sv_neo_exp_dmg_modifier.GetFloat());
pGrenade->SetDamageRadius(sv_neo_grenade_blast_radius.GetFloat());
pGrenade->SetDetonateTimerLength(sv_neo_grenade_fuse_timer.GetFloat());
}
Expand Down