From 82034c5f067a21c4ec3b537861015cc94b85ad35 Mon Sep 17 00:00:00 2001 From: otta8634 Date: Mon, 10 Feb 2025 19:55:50 +0800 Subject: [PATCH] Make the monster nade bounce off the roof This prevents spawning monsters on the roof of the map, from where they would just start tweaking and be a bit useless. Instead, the nade now bounces off the roof back down, like translocate and spawn nade. --- qcsrc/common/mutators/mutator/nades/cl_nades.qc | 4 +++- qcsrc/common/mutators/mutator/nades/sv_nades.qc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/mutators/mutator/nades/cl_nades.qc b/qcsrc/common/mutators/mutator/nades/cl_nades.qc index 2587e9cce..945c1c2f1 100644 --- a/qcsrc/common/mutators/mutator/nades/cl_nades.qc +++ b/qcsrc/common/mutators/mutator/nades/cl_nades.qc @@ -56,7 +56,9 @@ MUTATOR_HOOKFUNCTION(cl_nades, EditProjectile) proj.avelocity = randomvec() * 720; proj.alphamod = nade_type.m_alpha; - if (nade_type == NADE_TYPE_TRANSLOCATE || nade_type == NADE_TYPE_SPAWN) + if (nade_type == NADE_TYPE_TRANSLOCATE + || nade_type == NADE_TYPE_SPAWN + || nade_type == NADE_TYPE_MONSTER) proj.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP; else proj.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY; diff --git a/qcsrc/common/mutators/mutator/nades/sv_nades.qc b/qcsrc/common/mutators/mutator/nades/sv_nades.qc index 683871573..34786c9b6 100644 --- a/qcsrc/common/mutators/mutator/nades/sv_nades.qc +++ b/qcsrc/common/mutators/mutator/nades/sv_nades.qc @@ -383,7 +383,9 @@ void toss_nade(entity e, bool set_owner, vector _velocity, float _time) _nade.toss_time = time; _nade.solid = SOLID_CORPSE; //((STAT(NADE_BONUS_TYPE, _nade) == NADE_TYPE_TRANSLOCATE) ? SOLID_CORPSE : SOLID_BBOX); - if(STAT(NADE_BONUS_TYPE, _nade) == NADE_TYPE_TRANSLOCATE.m_id || STAT(NADE_BONUS_TYPE, _nade) == NADE_TYPE_SPAWN.m_id) + if(STAT(NADE_BONUS_TYPE, _nade) == NADE_TYPE_TRANSLOCATE.m_id + || STAT(NADE_BONUS_TYPE, _nade) == NADE_TYPE_SPAWN.m_id + || STAT(NADE_BONUS_TYPE, _nade) == NADE_TYPE_MONSTER.m_id) _nade.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP; else _nade.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY; -- 2.39.5