From d5d99c5593e94a8da5149dc83fedaef54661b982 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 11 Jul 2011 23:46:24 +0300 Subject: [PATCH] Make "reverse scoring" a mutator, and tweak other things --- .../voret/dialog_multiplayer_create_mutators.c | 16 +++++++++++----- data/qcsrc/server/teamplay.qc | 6 ++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c index da9d852d..2fd8856d 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, 19) + ATTRIB(VoretMutatorsDialog, rows, float, 20) 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_vore_reversescoring")) + s = strcat(s, ", Reverse scoring"); if(!cvar("g_vore_digestion")) - s = strcat(s, ", Gentle Vore"); + s = strcat(s, ", Gentle vore"); if(cvar("g_balance_vore_digestion_damage") >= 1000) - s = strcat(s, ", InstaDigestion"); + s = strcat(s, ", Instant digestion"); if(cvar("g_balance_vore_weight_gravity") < 0) s = strcat(s, ", Lighten"); if(s == "") @@ -99,11 +101,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, 1, "g_vore_digestion", "Gentle vore")); + me.TD(me, 1, 2, e = makeVoretCheckBox(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 + me.TD(me, 1, 2, e = makeVoretCheckBox(0, "g_vore_reversescoring", "Reverse scoring")); + 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", "Instant digestion")); // must contain default cvar value for off position setDependent(e, "g_vore_digestion", 1, 1); me.TR(me); me.TDempty(me, 0.2); diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index b0913fd7..5c38654f 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_vore_reversescoring")) + modifications = strcat(modifications, ", Reverse scoring"); if(!cvar("g_vore_digestion")) - modifications = strcat(modifications, ", Gentle Vore"); + modifications = strcat(modifications, ", Gentle vore"); if(cvar("g_balance_vore_digestion_damage") >= 1000) - modifications = strcat(modifications, ", InstaDigestion"); + modifications = strcat(modifications, ", Instant digestion"); if(cvar("g_balance_vore_weight_gravity") < 0) modifications = strcat(modifications, ", Lighten"); modifications = substring(modifications, 2, strlen(modifications) - 2); -- 2.39.2