Add Gentle Digestion mutator to menu. 0.4 has been delayed, so this is a pre-0.4...

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c
index 7d94adb68fd18cc63c3c0bba4f667e6f62450362..da9d852d6fa6ef1a873d06ea3f75f67ddcc57f39 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c
@@ -7,7 +7,7 @@ CLASS(VoretMutatorsDialog) EXTENDS(VoretDialog)
        ATTRIB(VoretMutatorsDialog, title, string, "Mutators")\r
        ATTRIB(VoretMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)\r
        ATTRIB(VoretMutatorsDialog, intendedWidth, float, 0.3)\r
-       ATTRIB(VoretMutatorsDialog, rows, float, 18)\r
+       ATTRIB(VoretMutatorsDialog, rows, float, 19)\r
        ATTRIB(VoretMutatorsDialog, columns, float, 2)\r
        ATTRIB(VoretMutatorsDialog, refilterEntity, entity, NULL)\r
 ENDCLASS(VoretMutatorsDialog)\r
@@ -39,10 +39,12 @@ string toStringVoretMutatorsDialog(entity me)
                s = strcat(s, ", Jet pack");\r
        if(!cvar("g_start_weapon_grabber"))\r
                s = strcat(s, ", No start weapon");\r
-       if(cvar("g_balance_vore_weight_gravity") < 0)\r
-               s = strcat(s, ", Lighten");\r
+       if(!cvar("g_vore_digestion"))\r
+               s = strcat(s, ", Gentle Vore");\r
        if(cvar("g_balance_vore_digestion_damage") >= 1000)\r
                s = strcat(s, ", InstaDigestion");\r
+       if(cvar("g_balance_vore_weight_gravity") < 0)\r
+               s = strcat(s, ", Lighten");\r
        if(s == "")\r
                return "None";\r
        else\r
@@ -97,10 +99,15 @@ void fillVoretMutatorsDialog(entity me)
                me.TD(me, 1, 2, makeVoretTextLabel(0, "Vore mutators:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(-0.25, 1, "g_balance_vore_weight_gravity", "Lighten")); // must contain default cvar value for off position!\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0, 1, "g_vore_digestion", "Gentle vore"));\r
+               makeMulti(e, "g_vore_kick");\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(1000, 5, "g_balance_vore_digestion_damage", "InstaDigestion")); // must contain default cvar value for off position\r
+               setDependent(e, "g_vore_digestion", 1, 1);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(1000, 5, "g_balance_vore_digestion_damage", "InstaDigestion")); // must contain default cvar value for off position!\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(-0.25, 1, "g_balance_vore_weight_gravity", "Lighten")); // must contain default cvar value for off position\r
 \r
        me.gotoRC(me, me.rows - 1, 0);\r
                me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));\r

diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index c2daf0819b3d4bdf91ea7ad1101633c2aef79341..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