From 72564d239f4feee1e259bff421673b019fa7a220 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 3 Jun 2020 18:42:24 +1000 Subject: [PATCH] Replace Nexuiz weapons with their Xonotic counterparts in maps when New Toys is disabled --- qcsrc/common/weapons/weapon/hlac.qc | 2 +- qcsrc/common/weapons/weapon/minelayer.qc | 2 +- qcsrc/common/weapons/weapon/rifle.qc | 2 +- qcsrc/common/weapons/weapon/seeker.qc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc index 9d58e513d..950612f9f 100644 --- a/qcsrc/common/weapons/weapon/hlac.qc +++ b/qcsrc/common/weapons/weapon/hlac.qc @@ -6,7 +6,7 @@ METHOD(HLAC, m_spawnfunc_hookreplace, Weapon(HLAC this, entity e)) { if (autocvar_sv_nexuizcompat_weaponswap && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) { - return ITEM_ArmorBig; + return WEP_CRYLINK; } return this; } diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc index 6388c65c9..ac3a57a92 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@ -6,7 +6,7 @@ METHOD(MineLayer, m_spawnfunc_hookreplace, Weapon(MineLayer this, entity e)) { if (autocvar_sv_nexuizcompat_weaponswap && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) { - return ITEM_HealthBig; + return WEP_MORTAR; } return this; } diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index 0b8637345..6de0cca91 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -6,7 +6,7 @@ METHOD(Rifle, m_spawnfunc_hookreplace, Weapon(Rifle this, entity e)) { if (autocvar_sv_nexuizcompat_weaponswap && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) { - return ITEM_ArmorBig; + return WEP_VORTEX; } return this; } diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc index d60bb194d..7b6b3e3e2 100644 --- a/qcsrc/common/weapons/weapon/seeker.qc +++ b/qcsrc/common/weapons/weapon/seeker.qc @@ -6,7 +6,7 @@ METHOD(Seeker, m_spawnfunc_hookreplace, Weapon(Seeker this, entity e)) { if (autocvar_sv_nexuizcompat_weaponswap && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED)) { - return ITEM_HealthBig; + return WEP_HAGAR; } return this; } -- 2.39.2