Rename g_weapons_noncore_allow to g_weapons_noncore and indicate what the different...

diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc
index 5e869228c99cd28fbef18a7d275ca3000ca09264..a960d3c644985518978c74f3012fae792470308f 100644 (file)
--- a/qcsrc/common/weapons/weapon/hlac.qc
+++ b/qcsrc/common/weapons/weapon/hlac.qc
@@ -4,7 +4,7 @@
 
 METHOD(HLAC, m_spawnfunc_hookreplace, Weapon(HLAC this, entity e))
 {
-    if (autocvar_g_weapon_noncore_allow && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+    if (autocvar_g_weapons_noncore == 2 && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED))
     {
         return WEP_CRYLINK;
     }

diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc
index a57252b2b18c10260108246eb9b1d89067db8b57..f192b663116062895957f30601c0e273a46a55bb 100644 (file)
--- a/qcsrc/common/weapons/weapon/minelayer.qc
+++ b/qcsrc/common/weapons/weapon/minelayer.qc
@@ -4,7 +4,7 @@
 
 METHOD(MineLayer, m_spawnfunc_hookreplace, Weapon(MineLayer this, entity e))
 {
-    if (autocvar_g_weapon_noncore_allow && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+    if (autocvar_g_weapons_noncore == 2 && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED))
     {
         return WEP_MORTAR;
     }

diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc
index 7a06c6ce67079c84e1e2221a9da375839a66fde3..972419a2fa97dc085372e797b7dc6e0453809da6 100644 (file)
--- a/qcsrc/common/weapons/weapon/rifle.qc
+++ b/qcsrc/common/weapons/weapon/rifle.qc
@@ -4,7 +4,7 @@
 
 METHOD(Rifle, m_spawnfunc_hookreplace, Weapon(Rifle this, entity e))
 {
-    if (autocvar_g_weapon_noncore_allow && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+    if (autocvar_g_weapons_noncore == 2 && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED))
     {
         return WEP_VORTEX;
     }

diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc
index 1150baf98b96af3bf24fb7b6513faa193969b68f..767d07c8687305124f094729cf17237916e4e51b 100644 (file)
--- a/qcsrc/common/weapons/weapon/seeker.qc
+++ b/qcsrc/common/weapons/weapon/seeker.qc
@@ -4,7 +4,7 @@
 
 METHOD(Seeker, m_spawnfunc_hookreplace, Weapon(Seeker this, entity e))
 {
-    if (autocvar_g_weapon_noncore_allow && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+    if (autocvar_g_weapons_noncore == 2 && !Item_IsLoot(e) && (this.spawnflags & WEP_FLAG_MUTATORBLOCKED))
     {
         return WEP_HAGAR;
     }

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 332c426e65a0c4a05274dd0ca2a5db76efcd1a49..074b66ce16ab0cfa85bda05ba61e8846e41c329c 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -328,7 +328,7 @@ string autocvar_sv_motd;
 int autocvar_sv_name_maxlength = 64;
 bool autocvar_sv_precacheplayermodels;
 bool autocvar_sv_q3acompat_machineshotgunswap;
-bool autocvar_g_weapon_noncore_allow = true;
+int autocvar_g_weapon_noncore = 2;
 bool autocvar_sv_servermodelsonly;
 int autocvar_sv_spectate;
 float autocvar_sv_spectator_speed_multiplier;

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index fbde65530420dcf443005c3323ea5eb393203e61..9dd18fc42b5da3d7ef8cbd28b3d4a07c4752fcc7 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -413,7 +413,7 @@ void cvar_changes_init()
                BADCVAR("capturelimit_override");
                BADCVAR("fraglimit_override");
                BADCVAR("gametype");
-               BADCVAR("g_weapon_noncore_allow");
+               BADCVAR("g_weapon_noncore_swap_legacy_with_counterparts");
                BADCVAR("g_antilag");
                BADCVAR("g_balance_teams");
                BADCVAR("g_balance_teams_prevent_imbalance");

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index d2b41b6bbd6734e3df7fd2b8d304e63aeb79145f..45b12dfefd3a9998a04c0c9e0c2755bf2c13103c 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -496,7 +496,7 @@ sv_gameplayfix_nogravityonground 1
 
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping machinegun and shotgun (for Q3A map compatibility in mapinfo files)"
 set sv_q3defragcompat 0 "toggle for some compatibility hacks (for Q3DF map compatibility)"
-set g_weapon_noncore_allow 1 "allow non-core weapons to spawn in the map (NOTE: this will currently enable Xonotic counterparts of some deprecated Nexuiz weapons, enable g_new_toys instead to allow these weapons to spawn normally)"
+set g_weapon_noncore 2 "how to handle non-core weapons placed in the map: 0 spawns no weapon, 1 is currently not implemented, 2 replaces noncore weapons with core weapons"
 
 set g_movement_highspeed 1 "multiplier scale for movement speed (applies to sv_maxspeed and sv_maxairspeed, also applies to air acceleration when g_movement_highspeed_q3_compat is set to 0)"
 set g_movement_highspeed_q3_compat 0 "apply speed modifiers to air movement in a more Q3-compatible way (only apply speed buffs and g_movement_highspeed to max air speed, not to acceleration)"