Crosshair tweaks

[voretournament/voretournament.git] / data / qcsrc / menu / voret / dialog_multiplayer_playersetup_weapons.c

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 8a4071002c3c6ea1aa8fe431a18d13a398cbb891..d2de6d4f60a1e4bcb668cf5a316332b145b7207c 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -5,9 +5,9 @@ CLASS(VoretWeaponsDialog) EXTENDS(VoretDialog)
        METHOD(VoretWeaponsDialog, showNotify, void(entity))\r
        ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings")\r
        ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)\r
        METHOD(VoretWeaponsDialog, showNotify, void(entity))\r
        ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings")\r
        ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)\r

-       ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.95)\r
-       ATTRIB(VoretWeaponsDialog, rows, float, 17)\r
-       ATTRIB(VoretWeaponsDialog, columns, float, 8)\r
+       ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.7)\r
+       ATTRIB(VoretWeaponsDialog, rows, float, 20)\r
+       ATTRIB(VoretWeaponsDialog, columns, float, 4)\r

        ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)\r
 ENDCLASS(VoretWeaponsDialog)\r
 #endif\r
        ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)\r
 ENDCLASS(VoretWeaponsDialog)\r
 #endif\r


@@ -23,7 +23,7 @@ string toStringVoretWeaponsDialog(entity me)
 }\r
 void fillVoretWeaponsDialog(entity me)\r
 {\r
 }\r
 void fillVoretWeaponsDialog(entity me)\r
 {\r

-       entity e;\r
+       entity e, sl;\r

        float i;\r
 \r
        // Voretournament has one weapon by default, so disable the weapon priority list code\r
        float i;\r
 \r
        // Voretournament has one weapon by default, so disable the weapon priority list code\r


@@ -42,24 +42,12 @@ void fillVoretWeaponsDialog(entity me)
                        e.onClickEntity = me.weaponsList;\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                        e.onClickEntity = me.weaponsList;\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r

-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_weaponpriority_useforcycling", "Use priority list for weapon cycling"));*/\r
-       /*me.TR(me);\r
-               me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));*/\r
-       me.TR(me);\r
-               me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model"));\r
-       me.TR(me);\r
-               me.TDempty(me, 0.6);\r
-               me.TD(me, 1, 2, e = makeVoretRadioButton(1, "cl_gunalign", "4", "Left align"));\r
-                       setDependent(e, "r_drawviewmodel", 1, 1);\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_gunalign", "3", "Right align"));\r
-                       setDependent(e, "r_drawviewmodel", 1, 1);\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_weaponpriority_useforcycling", "Use priority list for weapon cycling"));\r

        me.TR(me);\r
                me.TDempty(me, 0.3);\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r

-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_flipped", "Flip view horizontally"));\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));*/\r

 \r
 \r

-       me.gotoRC(me, 0, 4); me.setFirstColumn(me, me.currentColumn);\r
+       me.TR(me);\r

        me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon crosshair settings:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
        me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon crosshair settings:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r


@@ -76,7 +64,7 @@ void fillVoretWeaponsDialog(entity me)
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Size:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Size:"));\r

-               me.TD(me, 1, 2.5, e = makeVoretSlider(0.40, 2, 0.05, "crosshair_size"));\r
+               me.TD(me, 1, 2.5, e = makeVoretSlider(0.10, 1, 0.05, "crosshair_size"));\r

        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Alpha:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Alpha:"));\r


@@ -85,20 +73,55 @@ void fillVoretWeaponsDialog(entity me)
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Red:"));\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_red"));\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Red:"));\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_red"));\r

+               setDependent(e, "crosshair_color_by_health", 0, 0);\r

        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Green:"));\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_green"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Green:"));\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_green"));\r

+               setDependent(e, "crosshair_color_by_health", 0, 0);\r

        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Blue:"));\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_blue"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Blue:"));\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_blue"));\r

+               setDependent(e, "crosshair_color_by_health", 0, 0);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.6);\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_color_by_health", "Colorize by health"));\r
+       me.TR(me);\r

        me.TR(me);\r
                me.TDempty(me, 0.3);\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r

-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Hit test:"));\r
+               me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Hit test:"));\r

                me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "0",    "None"));\r
                me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1",    "TrueAim"));\r
                me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1.25", "Enemies"));\r
                me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "0",    "None"));\r
                me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1",    "TrueAim"));\r
                me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1.25", "Enemies"));\r

+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               sl = makeVoretSlider(0.1, 1, 0.05, "crosshair_unarmed_dim_color");\r
+               me.TD(me, 1, 1.25, e = makeVoretSliderCheckBox(0, 1, sl, "Dim when unarmed:"));\r
+               me.TD(me, 1, 2.5, sl);\r
+               makeMulti(e, "crosshair_unarmed_dim_alpha");\r
+               makeMulti(sl, "crosshair_unarmed_dim_alpha");\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_pickup", "Crosshair pickup effect"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_ring_alpha", "Crosshair ammo ring"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_swallowindicator", "Crosshair swallow indicator"));\r
+       me.TR(me);\r
+       me.TR(me);\r
+       me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon model settings:"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.6);\r
+               me.TD(me, 1, 2, e = makeVoretRadioButton(1, "cl_gunalign", "4", "Left align"));\r
+                       setDependent(e, "r_drawviewmodel", 1, 1);\r
+               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_gunalign", "3", "Right align"));\r
+                       setDependent(e, "r_drawviewmodel", 1, 1);\r

 \r
        me.gotoRC(me, me.rows - 1, 0);\r
                me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));\r
 \r
        me.gotoRC(me, me.rows - 1, 0);\r
                me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));\r