Make keeping digested prey in the stomach probability based. Still always disabled...

[voretournament/voretournament.git] / data / qcsrc / server / teamplay.qc

diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index 297cdb1e994f3be2cb9cdda6e65328fdebdd49eb..b0913fd73c1bef8db2db1de91e9029d4575192ac 100644 (file)
--- a/data/qcsrc/server/teamplay.qc
+++ b/data/qcsrc/server/teamplay.qc
@@ -486,10 +486,12 @@ void PrintWelcomeMessage(entity pl)
                modifications = strcat(modifications, ", Jet pack");\r
        if(!cvar("g_start_weapon_grabber"))\r
                modifications = strcat(modifications, ", No start weapon");\r
-       if(cvar("g_balance_vore_weight_gravity") < 0)\r
-               modifications = strcat(modifications, ", Lighten");\r
+       if(!cvar("g_vore_digestion"))\r
+               modifications = strcat(modifications, ", Gentle Vore");\r
        if(cvar("g_balance_vore_digestion_damage") >= 1000)\r
                modifications = strcat(modifications, ", InstaDigestion");\r
+       if(cvar("g_balance_vore_weight_gravity") < 0)\r
+               modifications = strcat(modifications, ", Lighten");\r
        modifications = substring(modifications, 2, strlen(modifications) - 2);\r
 \r
        local string versionmessage;\r
@@ -835,15 +837,19 @@ float JoinBestTeam(entity pl, float only_return_best, float forcebestteam)
                {\r
                        case 1:\r
                                SetPlayerColors(pl, COLOR_TEAM1 - 1);\r
+                               LogTeamchange(pl.playerid, pl.team, 2);\r
                                return COLOR_TEAM1;\r
                        case 2:\r
                                SetPlayerColors(pl, COLOR_TEAM2 - 1);\r
+                               LogTeamchange(pl.playerid, pl.team, 2);\r
                                return COLOR_TEAM2;\r
                        case 3:\r
                                SetPlayerColors(pl, COLOR_TEAM3 - 1);\r
+                               LogTeamchange(pl.playerid, pl.team, 2);\r
                                return COLOR_TEAM3;\r
                        case 4:\r
                                SetPlayerColors(pl, COLOR_TEAM4 - 1);\r
+                               LogTeamchange(pl.playerid, pl.team, 2);\r
                                return COLOR_TEAM4;\r
                        default:\r
                                break;\r
@@ -882,7 +888,7 @@ float JoinBestTeam(entity pl, float only_return_best, float forcebestteam)
 \r
        smallest = FindSmallestTeam(pl, TRUE);\r
 \r
-       if(!only_return_best)\r
+       if(!only_return_best && !pl.bot_forced_team)\r
        {\r
                TeamchangeFrags(self);\r
                if(smallest == 1)\r