NIX: turn into a mutator

diff --git a/balance.cfg b/balance.cfg
index 73ecd16ab133cdbaebe4c95dead7ab5339d72188..37a36e8d9d0a2acd5618785b4f3e97b6f1a6d154 100644 (file)
--- a/balance.cfg
+++ b/balance.cfg
@@ -61,18 +61,18 @@ set g_lms_start_ammo_nails 150
 set g_lms_start_ammo_rockets 50
 set g_lms_start_ammo_cells 50
 set g_lms_start_ammo_fuel 0
-set g_balance_nixnex_roundtime 25
-set g_balance_nixnex_incrtime 1.6
-set g_balance_nixnex_ammo_shells 15
-set g_balance_nixnex_ammo_nails 45
-set g_balance_nixnex_ammo_rockets 15
-set g_balance_nixnex_ammo_cells 15
-set g_balance_nixnex_ammo_fuel 0
-set g_balance_nixnex_ammoincr_shells 2
-set g_balance_nixnex_ammoincr_nails 6
-set g_balance_nixnex_ammoincr_rockets 2
-set g_balance_nixnex_ammoincr_cells 2
-set g_balance_nixnex_ammoincr_fuel 2
+set g_balance_nix_roundtime 25
+set g_balance_nix_incrtime 1.6
+set g_balance_nix_ammo_shells 15
+set g_balance_nix_ammo_nails 45
+set g_balance_nix_ammo_rockets 15
+set g_balance_nix_ammo_cells 15
+set g_balance_nix_ammo_fuel 0
+set g_balance_nix_ammoincr_shells 2
+set g_balance_nix_ammoincr_nails 6
+set g_balance_nix_ammoincr_rockets 2
+set g_balance_nix_ammoincr_cells 2
+set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items

diff --git a/balance25.cfg b/balance25.cfg
index 9cee6d5765e270bf71b36579351666ec78e7851d..c13ec4487c8e590918caf22f4aa79ed943e43cdf 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -60,18 +60,18 @@ set g_lms_start_ammo_nails 150
 set g_lms_start_ammo_rockets 50
 set g_lms_start_ammo_cells 50
 set g_lms_start_ammo_fuel 0
-set g_balance_nixnex_roundtime 25
-set g_balance_nixnex_incrtime 1.6
-set g_balance_nixnex_ammo_shells 15
-set g_balance_nixnex_ammo_nails 45
-set g_balance_nixnex_ammo_rockets 15
-set g_balance_nixnex_ammo_cells 15
-set g_balance_nixnex_ammo_fuel 0
-set g_balance_nixnex_ammoincr_shells 2
-set g_balance_nixnex_ammoincr_nails 6
-set g_balance_nixnex_ammoincr_rockets 2
-set g_balance_nixnex_ammoincr_cells 2
-set g_balance_nixnex_ammoincr_fuel 2
+set g_balance_nix_roundtime 25
+set g_balance_nix_incrtime 1.6
+set g_balance_nix_ammo_shells 15
+set g_balance_nix_ammo_nails 45
+set g_balance_nix_ammo_rockets 15
+set g_balance_nix_ammo_cells 15
+set g_balance_nix_ammo_fuel 0
+set g_balance_nix_ammoincr_shells 2
+set g_balance_nix_ammoincr_nails 6
+set g_balance_nix_ammoincr_rockets 2
+set g_balance_nix_ammoincr_cells 2
+set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items

diff --git a/balanceNexrun.cfg b/balanceNexrun.cfg
index 52e34634cce3a3cb97056b2467aba994d5973395..a23e9b462c74527b720fa9e23558a9d478d5ba3d 100644 (file)
--- a/balanceNexrun.cfg
+++ b/balanceNexrun.cfg
@@ -60,18 +60,18 @@ set g_lms_start_ammo_nails 210
 set g_lms_start_ammo_rockets 150
 set g_lms_start_ammo_cells 150
 set g_lms_start_ammo_fuel 0
-set g_balance_nixnex_roundtime 25
-set g_balance_nixnex_incrtime 1.6
-set g_balance_nixnex_ammo_shells 15
-set g_balance_nixnex_ammo_nails 45
-set g_balance_nixnex_ammo_rockets 15
-set g_balance_nixnex_ammo_cells 15
-set g_balance_nixnex_ammo_fuel 0
-set g_balance_nixnex_ammoincr_shells 2
-set g_balance_nixnex_ammoincr_nails 6
-set g_balance_nixnex_ammoincr_rockets 2
-set g_balance_nixnex_ammoincr_cells 2
-set g_balance_nixnex_ammoincr_fuel 2
+set g_balance_nix_roundtime 25
+set g_balance_nix_incrtime 1.6
+set g_balance_nix_ammo_shells 15
+set g_balance_nix_ammo_nails 45
+set g_balance_nix_ammo_rockets 15
+set g_balance_nix_ammo_cells 15
+set g_balance_nix_ammo_fuel 0
+set g_balance_nix_ammoincr_shells 2
+set g_balance_nix_ammoincr_nails 6
+set g_balance_nix_ammoincr_rockets 2
+set g_balance_nix_ammoincr_cells 2
+set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 747a9db1f0e019dda6a3b9c3fd2d447bcf74fdcc..19f7896188a8c8acd764d487c05e748d8fbc5291 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -61,18 +61,18 @@ set g_lms_start_ammo_nails 150
 set g_lms_start_ammo_rockets 50
 set g_lms_start_ammo_cells 50
 set g_lms_start_ammo_fuel 0
-set g_balance_nixnex_roundtime 25
-set g_balance_nixnex_incrtime 1.6
-set g_balance_nixnex_ammo_shells 15
-set g_balance_nixnex_ammo_nails 45
-set g_balance_nixnex_ammo_rockets 15
-set g_balance_nixnex_ammo_cells 15
-set g_balance_nixnex_ammo_fuel 0
-set g_balance_nixnex_ammoincr_shells 2
-set g_balance_nixnex_ammoincr_nails 6
-set g_balance_nixnex_ammoincr_rockets 2
-set g_balance_nixnex_ammoincr_cells 2
-set g_balance_nixnex_ammoincr_fuel 2
+set g_balance_nix_roundtime 25
+set g_balance_nix_incrtime 1.6
+set g_balance_nix_ammo_shells 15
+set g_balance_nix_ammo_nails 45
+set g_balance_nix_ammo_rockets 15
+set g_balance_nix_ammo_cells 15
+set g_balance_nix_ammo_fuel 0
+set g_balance_nix_ammoincr_shells 2
+set g_balance_nix_ammoincr_nails 6
+set g_balance_nix_ammoincr_rockets 2
+set g_balance_nix_ammoincr_cells 2
+set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index fb2800a02f2d1d43613834eb6a9683ec19dae1db..d8c11a2683dde044f2519db7d1ffb21b91fd5e48 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1065,12 +1065,12 @@ bind F2 vno
 alias spec "cmd spectate"
 bind F3 spec
 
-// NixNex (No-Items x Xonotic) - at each time, everyone uses the same weapon,
+// NIX (No Items Xonotic) - at each time, everyone uses the same weapon,
 // and in regular intervals, this weapon is cycled
-set g_nixnex 0 "No Items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on"
-set g_nixnex_with_laser 0 "always carry the laser as an additional weapon in NixNex"
-set g_nixnex_with_healtharmor 0 "when 1, health and armor still show up in NixNex"
-set g_nixnex_with_powerups 0 "when 1, powerups still show up in NixNex"
+set g_nix 0 "No Items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on"
+set g_nix_with_laser 0 "always carry the laser as an additional weapon in NIX"
+set g_nix_with_healtharmor 0 "when 1, health and armor still show up in NIX"
+set g_nix_with_powerups 0 "when 1, powerups still show up in NIX"
 
 // score log
 set sv_logscores_console 0     "print scores to server console"

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index ae07214e73b196bfd46a3e1fe4d680507a4b49a3..003377e8c30d0d0ab15f5c590914ee9a2ea25d0b 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -894,7 +894,7 @@ float MapInfo_CurrentFeatures()
 {
        float req;
        req = 0;
-       if(!(cvar("g_lms") || cvar("g_minstagib") || cvar("g_nixnex") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
+       if(!(cvar("g_lms") || cvar("g_minstagib") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
                req |= MAPINFO_FEATURE_WEAPONS;
        return req;
 }

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f7be50277e62b0301c1f1fec5c93891537bcf25a..c97e53460e803cd4f78905103407fbc353fd256d 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2490,6 +2490,8 @@ void PlayerPreThink (void)
                return;
 #endif
 
+       MUTATOR_CALLHOOK(PlayerPreThink);
+
        if(self.classname == "player") {
 //             if(self.netname == "Wazat")
 //                     bprint(self.classname, "\n");

diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index a855cb717916cc74e007d570bb6c18793b148537..b328e6de86cd1edb99144f621b7882ec1e20181a 100644 (file)
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -186,7 +186,7 @@ MUTATOR_HOOKFUNCTION(nix_OnEntityPreSpawn)
 MUTATOR_HOOKFUNCTION(nix_PlayerPreThink)
 {
        if(!intermission_running)
-       if(self.deadflag != DEAD_NO)
+       if(self.deadflag == DEAD_NO)
        if(self.classname == "player")
                NIX_GiveCurrentWeapon();
        return 0;

diff --git a/serverbench.cfg b/serverbench.cfg
index c1e9f70b86fbc2de1845272ab2607f699a3bc44a..50352aaae846931ea54e9aa8c3f32e2b8ae4c884 100644 (file)
--- a/serverbench.cfg
+++ b/serverbench.cfg
@@ -15,9 +15,9 @@ skill 100
 fraglimit_override 0
 timelimit_override 3
 sv_eventlog 1
-g_nixnex 1
-g_nixnex_with_laser 1
-g_balance_nixnex_roundtime 3
+g_nix 1
+g_nix_with_laser 1
+g_balance_nix_roundtime 3
 map downer
 
 // time darkplaces/xonotic-dedicated +exec serverbench.cfg | grep ^: > serverbench.log