Replace Nexuiz weapons with their Xonotic counterparts in maps when New Toys is disabled

diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc
index 9d58e513d6065db0571486c9053ad3c616a072dc..950612f9f36999c3a8a50bdb50184252f8194fe7 100644 (file)
--- 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 6388c65c990b69bafc707df374b223d8f2b88fc2..ac3a57a92f1ac90a19bf0cadf75be5956bb0a4a3 100644 (file)
--- 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 0b8637345860b5864d20c404a7db33fc7844f030..6de0cca91877e3face5d93f6d68990456a129578 100644 (file)
--- 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 d60bb194d2828f574e033800b9e0d20e7332d0c4..7b6b3e3e2a01683f15c2b6236bc332be417adbb3 100644 (file)
--- 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;
 }