From bdfa49f9e7f81ccbf9602d2f054ee4c38ec17ad9 Mon Sep 17 00:00:00 2001 From: LegendaryGuard Date: Sat, 29 May 2021 13:20:23 +0200 Subject: [PATCH] Fix emerald nade when spawning weapons in CA, FT and LMS --- qcsrc/common/mutators/mutator/nades/nades.qc | 14 ++++++++++++-- qcsrc/server/_mod.inc | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 95b49ec1d..a0931c2b9 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -796,7 +796,12 @@ void nade_emerald_randomitem(entity e, vector org) else if (c < 0.5) nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shield : ITEM_Strength)); else - nade_emerald_randomweapons(e, org); + { + if(!g_ca || !g_freezetag)// || !g_lms) + nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall)); + else + nade_emerald_randomweapons(e, org); + } } else { @@ -805,7 +810,12 @@ void nade_emerald_randomitem(entity e, vector org) else if (d < 0.2) nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shells : ITEM_Rockets)); else - nade_emerald_randomweapons(e, org); + { + if(!g_ca || !g_freezetag)// || !g_lms) + nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall)); + else + nade_emerald_randomweapons(e, org); + } return; } } diff --git a/qcsrc/server/_mod.inc b/qcsrc/server/_mod.inc index 588aa92bd..13edd957c 100644 --- a/qcsrc/server/_mod.inc +++ b/qcsrc/server/_mod.inc @@ -20,6 +20,7 @@ //SMB mods #include +#include // #include -- 2.39.2