g_weaponarena_random_with_laser

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index fc80a1b51668bdc514d8ba3bb228668aca71e7b1..ec539074d86e6b6ac7c0f0fe1dba5dcb82be9d3f 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -526,6 +526,7 @@ set g_minstagib_speed_moverate 1.25 "speed-multiplier that applies while you car
 set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
 set g_weaponarena "0"  "put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\""
 set g_weaponarena_random "0"   "if set to a number, only that weapon count is given on every spawn (randomly)"
 set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
 set g_weaponarena "0"  "put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\""
 set g_weaponarena_random "0"   "if set to a number, only that weapon count is given on every spawn (randomly)"

+set g_weaponarena_random_with_laser "1"        "additionally, always provide the laser in random weapon arena games"

 set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
 set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
 set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns"
 set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
 set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
 set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns"

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 5ce52680727511ac333b21d9d1e3eb3fb249e8e2..8151aa5f128caf2e16ff6acff4a8f34109da729d 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -916,7 +916,13 @@ void PutClientInServer (void)
                }
 
                if(g_weaponarena_random)
                }
 
                if(g_weaponarena_random)

+               {
+                       if(g_weaponarena_random_with_laser)
+                               self.weapons &~= WEPBIT_LASER;

                        self.weapons = randombits(self.weapons, g_weaponarena_random, FALSE);
                        self.weapons = randombits(self.weapons, g_weaponarena_random, FALSE);

+                       if(g_weaponarena_random_with_laser)
+                               self.weapons |= WEPBIT_LASER;
+               }

 
                self.items = start_items;
                self.jump_interval = time;
 
                self.items = start_items;
                self.jump_interval = time;

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 1d373c97327d2271ede7e7b6e184fb881758e5d2..5b8ec7127fd861a81b3dde4d32fa8e25ac5390c4 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -855,6 +855,7 @@ float g_pickup_ammo_anyway;
 float g_pickup_weapons_anyway;
 float g_weaponarena;
 float g_weaponarena_random;
 float g_pickup_weapons_anyway;
 float g_weaponarena;
 float g_weaponarena_random;

+float g_weaponarena_random_with_laser;

 string g_weaponarena_list;
 float g_weaponspeedfactor;
 float g_weaponratefactor;
 string g_weaponarena_list;
 float g_weaponspeedfactor;
 float g_weaponratefactor;


@@ -995,6 +996,7 @@ void readplayerstartcvars()
                g_weaponarena_random = cvar("g_weaponarena_random");
        else
                g_weaponarena_random = 0;
                g_weaponarena_random = cvar("g_weaponarena_random");
        else
                g_weaponarena_random = 0;

+       g_weaponarena_random_with_laser = cvar("g_weaponarena_random_with_laser");

 
        if (g_weaponarena)
        {
 
        if (g_weaponarena)
        {