Don't regurgitate fully digested prey silently by default

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

diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index c829326c3244d55f91efb909be1c93b86e81d42b..05a793c91e989604bc97fb7ad1fc1016b10f83aa 100644 (file)
--- a/data/qcsrc/server/teamplay.qc
+++ b/data/qcsrc/server/teamplay.qc
@@ -486,10 +486,14 @@ 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_vore_reversescoring"))\r
+               modifications = strcat(modifications, ", Reverse scoring");\r
        if(cvar("g_balance_vore_digestion_damage") >= 1000)\r
-               modifications = strcat(modifications, ", InstaDigestion");\r
+               modifications = strcat(modifications, ", Instant digestion");\r
+       if(cvar("g_balance_vore_load_pred_weight") < 0)\r
+               modifications = strcat(modifications, ", Lighten");\r
        modifications = substring(modifications, 2, strlen(modifications) - 2);\r
 \r
        local string versionmessage;\r
@@ -886,7 +890,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