From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Sat, 11 Jul 2020 04:39:37 +0000 (+1000)
Subject: Spawn Crylink and cell ammo in place of Q3TA nailgun and ammo_nails
X-Git-Tag: xonotic-v0.8.5~352^2~78
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2c8509f4a9658d60cc234146ae83a944d735b8ef;p=xonotic%2Fxonotic-data.pk3dir.git

Spawn Crylink and cell ammo in place of Q3TA nailgun and ammo_nails
---

diff --git a/qcsrc/server/compat/quake.qc b/qcsrc/server/compat/quake.qc
index c80da0af3..93d935e02 100644
--- a/qcsrc/server/compat/quake.qc
+++ b/qcsrc/server/compat/quake.qc
@@ -7,7 +7,7 @@
 //***********************
 //QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
 //***********************
-SPAWNFUNC_WEAPON(weapon_nailgun, WEP_ELECTRO)
+// see: quake3.qc for weapon_nailgun
 SPAWNFUNC_WEAPON(weapon_supernailgun, WEP_HAGAR)
 SPAWNFUNC_WEAPON(weapon_supershotgun, WEP_MACHINEGUN)
 
diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index e062b8db2..bf0a8beeb 100644
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -26,18 +26,19 @@ SPAWNFUNC_ITEM(ammo_bullets, ITEM_Bullets)
 // GL -> Mortar
 SPAWNFUNC_ITEM(ammo_grenades, ITEM_Rockets)
 
-// Mines -> Rockets
+// Team Arena Proximity Launcher -> Mine Layer
 SPAWNFUNC_WEAPON(weapon_prox_launcher, WEP_MINE_LAYER)
 SPAWNFUNC_ITEM(ammo_mines, ITEM_Rockets)
 
-// Q3TA chaingun -> HLAC
+// Team Arena Chaingun -> HLAC
 SPAWNFUNC_WEAPON(weapon_chaingun, WEP_HLAC)
 SPAWNFUNC_ITEM(ammo_belt, ITEM_Cells)
 
-// Q3TA nails -> cells
+// Team Arena Nailgun -> Crylink || Quake Nailgun -> Electro
+SPAWNFUNC_WEAPON_COND(weapon_nailgun, autocvar_sv_q3acompat_machineshotgunswap, WEP_CRYLINK, WEP_ELECTRO)
 SPAWNFUNC_ITEM(ammo_nails, ITEM_Cells)
 
-// LG -> Lightning
+// LG -> Electro
 SPAWNFUNC_WEAPON(weapon_lightning, WEP_ELECTRO)
 SPAWNFUNC_ITEM(ammo_lightning, ITEM_Cells)