Merge branch 'master' into fruitiex/fruitbalance

diff --git a/bots.txt b/bots.txt
index 0530c99f92170ce83b8ea22b7cb59c85f11d088f..fc8082f49d114179419fcafa857bc0757d762c74 100644 (file)
--- a/bots.txt
+++ b/bots.txt
@@ -1,21 +1,21 @@
 //bot configuration: name      model   skin    shirt   pants   team    keyboard use    moving  dodging ping    weapon use      aggressivity    range   aiming  calmhand        mouse   fightthink      aithink
 //default team values (team-override): 1 = red, 2 = blue, 3 = yellow, 4 = pink                                                                                                                                 
 //use -1 for shirt-color or pants-color to get random colors                                                                                                                                   
-Hellfire       umbra   0       4       0       0       0       0       -0.5    -1      1       1       -0.5    -1      -1      2       0.5     -1
-Toxic  umbra   0       14      7       0       -1      -1.5    -0.5    0       1       0       0       0       2       -0.5    -0.5    1
-Discovery      umbra   0       2       6       0       0       -1      -0.5    -0.5    1       -0.5    0.5     1.5     -0.5    -1      1       0.5
+Hellfire       ignis   0       4       0       0       0       0       -0.5    -1      1       1       -0.5    -1      -1      2       0.5     -1
+Toxic  gakarmored      0       14      7       0       -1      -1.5    -0.5    0       1       0       0       0       2       -0.5    -0.5    1
+Discovery      erebus  0       2       6       0       0       -1      -0.5    -0.5    1       -0.5    0.5     1.5     -0.5    -1      1       0.5
 Pegasus        umbra   0       13      11      0       1       1       1       1       -1      0       0.5     0       -2      0       -1      0
 Eureka umbra   0       12      7       0       0       0       -1.5    -0.5    -0.5    0       0       0       0       -0.5    1.5     1.5
-Airhead        umbra   0       11      1       0       -1      -1.5    -1      -0.5    1       1       -1      1       -0.5    1       0.5     0
-Gator  umbra   0       3       10      0       0       1       0       0.5     -0.5    0.5     -0.5    -1      0       0       -0.5    0
-Delirium       umbra   0       8       12      0       0       -1      -1      -1      0       2       0       1       0       2       -1      -1
-Death  umbra   0       4       11      0       -0.5    0       0       1       -0.5    0       1       0       0       0       0       0
-Scorcher       umbra   0       13      13      0       0       -1      0       -0.5    0.5     1       0       1       -2      1       0       0
-Necrotic       umbra   0       12      14      0       0       0       0       1       0       -1      -0.5    -1      1       0       0       0
-Dominator      umbra   0       3       9       0       0       0       0       2       -1      0       0       0       -1      0       0       0
-Thunderstorm   umbra   0       13      6       0       0       0       0       -0.5    -1      1       0.5     0.5     -0.5    0       0.5     0
-Mystery        umbra   0       9       14      0       1       1       1       1       -1      -1      0       1       1       -2      -1      -1
-Lion   umbra   0       0       4       0       1       1.5     2       -1      -1      -1      1       0       1       -0.5    -1      -1
-Sensible       umbra   0       9       9       0       0       0       0.5     -1      0       -1      0       -1      2.5     -1.5    1       0.5
-Shadow umbra   0       4       8       0       -0.5    2       1       0       0       -1      0       -1      0       1       -1      -0.5
+Airhead        ignis   0       11      1       0       -1      -1.5    -1      -0.5    1       1       -1      1       -0.5    1       0.5     0
+Gator  gak     0       3       10      0       0       1       0       0.5     -0.5    0.5     -0.5    -1      0       0       -0.5    0
+Delirium       gakmasked       0       8       12      0       0       -1      -1      -1      0       2       0       1       0       2       -1      -1
+Death  gakmasked       0       4       11      0       -0.5    0       0       1       -0.5    0       1       0       0       0       0       0
+Scorcher       ignishalfmasked 0       13      13      0       0       -1      0       -0.5    0.5     1       0       1       -2      1       0       0
+Necrotic       nyx     0       12      14      0       0       0       0       1       0       -1      -0.5    -1      1       0       0       0
+Dominator      nyx     0       3       9       0       0       0       0       2       -1      0       0       0       -1      0       0       0
+Thunderstorm   erebus  0       13      6       0       0       0       0       -0.5    -1      1       0.5     0.5     -0.5    0       0.5     0
+Mystery        pyria   0       9       14      0       1       1       1       1       -1      -1      0       1       1       -2      -1      -1
+Lion   ignismasked     0       0       4       0       1       1.5     2       -1      -1      -1      1       0       1       -0.5    -1      -1
+Sensible       seraphina       0       9       9       0       0       0       0.5     -1      0       -1      0       -1      2.5     -1.5    1       0.5
+Shadow seraphinamasked 0       4       8       0       -0.5    2       1       0       0       -1      0       -1      0       1       -1      -0.5
 Resurrection   umbra   0       1       1       0       0       -0.5    -0.5    0       2       -1      -1      -1      0       -1      1       1

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9a6509cf37bcc9b60b907a7bcacb218890ace1c4..cc131c9f4faf6d6ce5d0393bc486e4eea3839931 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1871,3 +1871,5 @@ set g_weaponreplace_seeker ""
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility in mapinfo files)"
 
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
+
+set g_maxspeed 0 "player speed limit, faster players are killed (0 for unlimited speed)"

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 45320f2db526f0303cb0f3e9d8aed3181e78c9e7..a79f9a473b0638911a9918f2ec78513eab9a0cca 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -2,7 +2,7 @@
 void CreatureFrame (void)
 {
        local entity oldself;
-       local float dm;
+       local float dm, maxspeed;
        oldself = self;
        self = findfloat(world, iscreature, TRUE);
        while (self)
@@ -78,13 +78,12 @@ void CreatureFrame (void)
                                {
                                        Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0');
                                }
-                               else if(vlen(self.velocity) > 100000 && cvar("developer"))
-                               {
-                                       dprint(strcat(self.netname, " became too fast, please investigate: ", vtos(self.spawnorigin), "\n"));
-                                       Damage (self, world, world, 50000, DEATH_SHOOTING_STAR, self.origin, '0 0 0');
-                               }
                        }
 
+                       maxspeed = cvar("g_maxspeed");
+                       if(maxspeed > 0 && vlen(self.velocity) > maxspeed)
+                               Damage (self, world, world, 100000, DEATH_SHOOTING_STAR, self.origin, '0 0 0');
+
                        // play stupid sounds
                        if (g_footsteps)
                        if (!gameover)