Make "reverse scoring" a mutator, and tweak other things

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c
index da9d852d6fa6ef1a873d06ea3f75f67ddcc57f39..2fd8856dde67f7e03a32d0a4d1935f5a44b2bf7b 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, title, string, "Mutators")\r
        ATTRIB(VoretMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)\r
        ATTRIB(VoretMutatorsDialog, intendedWidth, float, 0.3)\r

-       ATTRIB(VoretMutatorsDialog, rows, float, 19)\r
+       ATTRIB(VoretMutatorsDialog, rows, float, 20)\r

        ATTRIB(VoretMutatorsDialog, columns, float, 2)\r
        ATTRIB(VoretMutatorsDialog, refilterEntity, entity, NULL)\r
 ENDCLASS(VoretMutatorsDialog)\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
                s = strcat(s, ", Jet pack");\r
        if(!cvar("g_start_weapon_grabber"))\r
                s = strcat(s, ", No start weapon");\r

+       if(cvar("g_vore_reversescoring"))\r
+               s = strcat(s, ", Reverse scoring");\r

        if(!cvar("g_vore_digestion"))\r
        if(!cvar("g_vore_digestion"))\r

-               s = strcat(s, ", Gentle Vore");\r
+               s = strcat(s, ", Gentle vore");\r

        if(cvar("g_balance_vore_digestion_damage") >= 1000)\r
        if(cvar("g_balance_vore_digestion_damage") >= 1000)\r

-               s = strcat(s, ", InstaDigestion");\r
+               s = strcat(s, ", Instant digestion");\r

        if(cvar("g_balance_vore_weight_gravity") < 0)\r
                s = strcat(s, ", Lighten");\r
        if(s == "")\r
        if(cvar("g_balance_vore_weight_gravity") < 0)\r
                s = strcat(s, ", Lighten");\r
        if(s == "")\r


@@ -99,11 +101,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, makeVoretTextLabel(0, "Vore mutators:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r

-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0, 1, "g_vore_digestion", "Gentle vore"));\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(1, "g_vore_digestion", "Gentle vore"));\r

                makeMulti(e, "g_vore_kick");\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\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
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "g_vore_reversescoring", "Reverse scoring"));\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", "Instant digestion")); // 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
                setDependent(e, "g_vore_digestion", 1, 1);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r

diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index b0913fd73c1bef8db2db1de91e9029d4575192ac..5c38654fc7385d4c4e69c145ff36005a02b63743 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
                modifications = strcat(modifications, ", Jet pack");\r
        if(!cvar("g_start_weapon_grabber"))\r
                modifications = strcat(modifications, ", No start weapon");\r

+       if(cvar("g_vore_reversescoring"))\r
+               modifications = strcat(modifications, ", Reverse scoring");\r

        if(!cvar("g_vore_digestion"))\r
        if(!cvar("g_vore_digestion"))\r

-               modifications = strcat(modifications, ", Gentle Vore");\r
+               modifications = strcat(modifications, ", Gentle vore");\r

        if(cvar("g_balance_vore_digestion_damage") >= 1000)\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_weight_gravity") < 0)\r
                modifications = strcat(modifications, ", Lighten");\r
        modifications = substring(modifications, 2, strlen(modifications) - 2);\r
        if(cvar("g_balance_vore_weight_gravity") < 0)\r
                modifications = strcat(modifications, ", Lighten");\r
        modifications = substring(modifications, 2, strlen(modifications) - 2);\r