Good menu settings for the radar

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index f9d099a5d64f02024b4acfa33ab68aa19c8cfc91..d501b1f39b659a6323afb9117a7c00e85b7d6665 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1382,12 +1382,12 @@ seta sv_status_privacy 1        "hide IP addresses from \"status\" replies shown to cli
 \r
 \r
 seta cl_radar 2        "show radar. 1 in team maches, 2 always"\r
-seta cl_radar_content_alpha 1  "alpha of the minimap"\r
+seta cl_radar_content_alpha 0.9        "alpha of the minimap"\r
 seta cl_radar_background_alpha 0.5     "set to -1 to disable"\r
 seta cl_radar_foreground_alpha 0.9     "set to -1 to disable"\r
 seta cl_radar_scale 4096 "distance you can see on the radar"\r
 seta cl_radar_rotation 0       "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"\r
-seta cl_radar_size "128 128" "size of the radar in pixels"\r
+seta cl_radar_size "160 128" "size of the radar in pixels"\r
 seta cl_radar_position "1 0" "1 0 would be upper right corner, 0.5 0.5 the center, append a 2 at the end to disable the corner hack, and a 1 to disable half the hack"\r
 seta cl_radar_zoommode 0       "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"\r
 alias cl_radar_rotate "toggle cl_radar_rotation 0 1 2 3 4"\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 7e4077c1e0812cd96f51eab38fc9501a5e086c47..e1c7c2a4128ebda1aeaea56486dd5860f68bbc5c 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
@@ -6,7 +6,7 @@ CLASS(VoretHudDialog) EXTENDS(VoretDialog)
        ATTRIB(VoretHudDialog, title, string, "Radar, HUD & Waypoints")\r
        ATTRIB(VoretHudDialog, color, vector, SKINCOLOR_DIALOG_HUD)\r
        ATTRIB(VoretHudDialog, intendedWidth, float, 1)\r
-       ATTRIB(VoretHudDialog, rows, float, 18)\r
+       ATTRIB(VoretHudDialog, rows, float, 19)\r
        ATTRIB(VoretHudDialog, columns, float, 8)\r
 ENDCLASS(VoretHudDialog)\r
 #endif\r
@@ -91,27 +91,63 @@ void fillVoretHudDialog(entity me)
                me.TD(me, 1, 4, makeVoretTextLabel(0, "Radar settings:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Position:"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_radar_position", "0 0", "Top left"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_radar_position", "0.5 0", "Top middle"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_radar_position", "1 0", "Top right"));\r
+               me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "0", "Disabled"));\r
+               me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "1", "Team games"));\r
+               me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "2", "Always"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Foreground:"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretSlider(0.10, 1, 0.05, "cl_radar_foreground_alpha"));\r
+                       makeMulti(e, "cl_radar_content_alpha");\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               sl = makeVoretSlider(0.10, 1, 0.05, "cl_radar_background_alpha");\r
+               me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:"));\r
+               me.TD(me, 1, 3, sl);\r
+               setDependent(e, "cl_radar", 1, 2);\r
+               setDependent(sl, "cl_radar", 1, 2);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Size:"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
                me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_size"));\r
                        e.addValue(e, "96x96", "96 96");\r
                        e.addValue(e, "128x96", "128 96");\r
                        e.addValue(e, "128x128", "128 128");\r
-                       e.addValue(e, "192x144", "192 144");\r
+                       e.addValue(e, "160x128", "160 128");\r
+                       e.addValue(e, "160x160", "160 160");\r
+                       e.addValue(e, "192x160", "192 160");\r
                        e.addValue(e, "192x192", "192 192");\r
                        e.addValue(e, "256x192", "256 192");\r
                        e.addValue(e, "256x256", "256 256");\r
                        e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "cl_radar", 1, 2);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               sl = makeVoretSlider(0.20, 1, 0.01, "cl_radar_background_alpha");\r
-               me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:"));\r
-               me.TD(me, 1, 3, sl);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Distance:"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_scale"));\r
+                       e.addValue(e, "512", "512");\r
+                       e.addValue(e, "1024", "1024");\r
+                       e.addValue(e, "2048", "2048");\r
+                       e.addValue(e, "4096", "4096");\r
+                       e.addValue(e, "8192", "8192");\r
+                       e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Rotation:"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_rotation"));\r
+                       e.addValue(e, "Player", "0");\r
+                       e.addValue(e, "West", "1");\r
+                       e.addValue(e, "South", "2");\r
+                       e.addValue(e, "East", "3");\r
+                       e.addValue(e, "North", "4");\r
+                       e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "cl_radar", 1, 2);\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 4, makeVoretTextLabel(0, "Waypoint settings:"));\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index cedef23160bef2abc50553b8c6fc3fff6b175633..04f73ea8ff66ac0f227cf171220561699887413b 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -152,4 +152,6 @@
 \r
 - 0.7: Remove _mini\r
 \r
-- 0.7: Adapt radar menu
\ No newline at end of file
+- 0.8: Turn the Grabber into an organic weapon, but keep metal parts like the fuel cases and weapon display\r
+\r
+- 0.7: Regurgitate a player after he's been digested to minimum amount, rather than making him disappear (use a cvar)
\ No newline at end of file