From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 4 Oct 2010 22:58:22 +0000 (+0300)
Subject: Add Gentle Digestion mutator to menu. 0.4 has been delayed, so this is a pre-0.4... 
X-Git-Url: https://git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=43e27f0bdff2829b6aeb2692afe23442eb99d9fb

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

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