make umbra the new default model

diff --git a/bots.txt b/bots.txt
index 4c2c12d2eb92225aea05fe618ba04e4298e455e2..0530c99f92170ce83b8ea22b7cb59c85f11d088f 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       nexus   0       4       0       0       0       0       -0.5    -1      1       1       -0.5    -1      -1      2       0.5     -1
-Toxic  nexus   1       14      7       0       -1      -1.5    -0.5    0       1       0       0       0       2       -0.5    -0.5    1
-Discovery      nexus   0       2       6       0       0       -1      -0.5    -0.5    1       -0.5    0.5     1.5     -0.5    -1      1       0.5
-Pegasus        nexus   0       13      11      0       1       1       1       1       -1      0       0.5     0       -2      0       -1      0
-Eureka nexus   0       12      7       0       0       0       -1.5    -0.5    -0.5    0       0       0       0       -0.5    1.5     1.5
-Airhead        nexus   0       11      1       0       -1      -1.5    -1      -0.5    1       1       -1      1       -0.5    1       0.5     0
-Gator  nexus   0       3       10      0       0       1       0       0.5     -0.5    0.5     -0.5    -1      0       0       -0.5    0
-Delirium       nexus   1       8       12      0       0       -1      -1      -1      0       2       0       1       0       2       -1      -1
-Death  nexus   0       4       11      0       -0.5    0       0       1       -0.5    0       1       0       0       0       0       0
-Scorcher       nexus   0       13      13      0       0       -1      0       -0.5    0.5     1       0       1       -2      1       0       0
-Necrotic       nexus   0       12      14      0       0       0       0       1       0       -1      -0.5    -1      1       0       0       0
-Dominator      nexus   1       3       9       0       0       0       0       2       -1      0       0       0       -1      0       0       0
-Thunderstorm   nexus   2       13      6       0       0       0       0       -0.5    -1      1       0.5     0.5     -0.5    0       0.5     0
-Mystery        nexus   0       9       14      0       1       1       1       1       -1      -1      0       1       1       -2      -1      -1
-Lion   nexus   0       0       4       0       1       1.5     2       -1      -1      -1      1       0       1       -0.5    -1      -1
-Sensible       nexus   0       9       9       0       0       0       0.5     -1      0       -1      0       -1      2.5     -1.5    1       0.5
-Shadow nexus   0       4       8       0       -0.5    2       1       0       0       -1      0       -1      0       1       -1      -0.5
-Resurrection   nexus   0       1       1       0       0       -0.5    -0.5    0       2       -1      -1      -1      0       -1      1       1
+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
+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
+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 0008735b6e2e9e1e5e823c66433f7def8af24d83..d7ed1815a8eb970d6d1c3cd1842a983ef5d15e15 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -105,7 +105,7 @@ mod_q3bsp_lightmapmergepower 3
 // player defaults
 _cl_color 102
 _cl_name Player
-_cl_playermodel models/player/marine.zym
+_cl_playermodel models/player/umbra.iqm
 _cl_playerskin 0
 crosshair 1
 seta crosshair_per_weapon 0    "when 1, each gun will display a different crosshair"

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index 2401c746f2acf135455dffa6d439b50b5bfebbdd..b4285304570c574c1ba0a8160e3da29ef12f1930 100644 (file)
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -153,7 +153,7 @@ void bot_setnameandstuff()
        else bot_name = "Bot";
 
        if(argv(1) != "") bot_model = argv(1);
-       else bot_model = "marine";
+       else bot_model = "";
 
        if(argv(2) != "") bot_skin = argv(2);
        else bot_skin = "0";
@@ -202,7 +202,7 @@ void bot_setnameandstuff()
 
        // pick the model and skin
        if(substring(bot_model, -4, 1) != ".")
-               bot_model = strcat(bot_model, ".zym");
+               bot_model = strcat(bot_model, ".iqm");
        self.playermodel = self.playermodel_freeme = strzone(strcat("models/player/", bot_model));
        self.playerskin = self.playerskin_freeme = strzone(bot_skin);
 

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 90f4b234eb8fc07173ef73884a906088803477eb..45eab621ea6b83caf327e662ceff0648dc2d09fe 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -230,11 +230,8 @@ float CheatImpulse(float i)
                        IS_CHEAT(i, 0, 0);
                        FOR_EACH_PLAYER(e)
                        {
-                               if( e.playermodel == "models/player/jeandarc.zym"
-                                               ||  e.playermodel == "models/player/pyria.zym"
-                                               ||  e.playermodel == "models/player/skadi.zym"
-                                               || (e.playermodel == "models/player/specop.zym" && random() < 0.5) // you never know
-                                               ||  e.playermodel == "models/player/visitant.zym")
+                               get_model_parameters(e.playermodel, e.skinindex);
+                               if(get_model_parameters_sex == "Female")
                                {
                                        makevectors(e.angles);
                                        traceline(e.origin, e.origin + v_right * 256, MOVE_NORMAL, e);

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c5acd3ebf8151dbdc349b9f5a62ea0033960d05f..5068f52d6aec12d8040ec0a3e02992cb416ece83 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -398,8 +398,15 @@ Checks if the argument string can be a valid playermodel.
 Returns a valid one in doubt.
 =============
 */
-string FallbackPlayerModel = "models/player/marine.zym";
+string FallbackPlayerModel;
 string CheckPlayerModel(string plyermodel) {
+       if(FallbackPlayerModel != cvar_defstring("_cl_playermodel"))
+       {
+               // note: we cannot summon Don Strunzone here, some player may
+               // still have the model string set. In case anyone manages how
+               // to change a cvar default, we'll have a small leak here.
+               FallbackPlayerModel = strzone(cvar_defstring("_cl_playermodel"));
+       }
        if(strlen(plyermodel) < 4)
                return FallbackPlayerModel;
        if( substring(plyermodel,0,14) != "models/player/")

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index bcd1ea7d08c4bbc7d0549afff9e7692aa321c185..8633a9c97ea7adb66f2ad4708b232cf7bf215c45 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1583,6 +1583,7 @@ void precache()
         precache_all_playermodels("models/player/*.dpm");
         precache_all_playermodels("models/player/*.md3");
         precache_all_playermodels("models/player/*.psk");
+        precache_all_playermodels("models/player/*.iqm");
     }
 
     if (cvar("sv_defaultcharacter"))