From 0b4c4000caa169895f0765f785ea0438e3963a9c Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Thu, 15 Mar 2012 21:13:19 +0200 Subject: [PATCH] Good menu settings for the radar --- data/defaultVT.cfg | 4 +- .../dialog_multiplayer_playersetup_hud.c | 54 +++++++++++++++---- docs/TODO.txt | 4 +- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index f9d099a5..d501b1f3 100644 --- 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 seta cl_radar 2 "show radar. 1 in team maches, 2 always" -seta cl_radar_content_alpha 1 "alpha of the minimap" +seta cl_radar_content_alpha 0.9 "alpha of the minimap" seta cl_radar_background_alpha 0.5 "set to -1 to disable" seta cl_radar_foreground_alpha 0.9 "set to -1 to disable" seta cl_radar_scale 4096 "distance you can see on the radar" seta cl_radar_rotation 0 "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north" -seta cl_radar_size "128 128" "size of the radar in pixels" +seta cl_radar_size "160 128" "size of the radar in pixels" 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" seta cl_radar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out" alias cl_radar_rotate "toggle cl_radar_rotation 0 1 2 3 4" diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c index 7e4077c1..e1c7c2a4 100644 --- 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") ATTRIB(VoretHudDialog, color, vector, SKINCOLOR_DIALOG_HUD) ATTRIB(VoretHudDialog, intendedWidth, float, 1) - ATTRIB(VoretHudDialog, rows, float, 18) + ATTRIB(VoretHudDialog, rows, float, 19) ATTRIB(VoretHudDialog, columns, float, 8) ENDCLASS(VoretHudDialog) #endif @@ -91,27 +91,63 @@ void fillVoretHudDialog(entity me) me.TD(me, 1, 4, makeVoretTextLabel(0, "Radar settings:")); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Position:")); - me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_radar_position", "0 0", "Top left")); - me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_radar_position", "0.5 0", "Top middle")); - me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_radar_position", "1 0", "Top right")); + me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "0", "Disabled")); + me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "1", "Team games")); + me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "2", "Always")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Foreground:")); + setDependent(e, "cl_radar", 1, 2); + me.TD(me, 1, 3, e = makeVoretSlider(0.10, 1, 0.05, "cl_radar_foreground_alpha")); + makeMulti(e, "cl_radar_content_alpha"); + setDependent(e, "cl_radar", 1, 2); + me.TR(me); + me.TDempty(me, 0.2); + sl = makeVoretSlider(0.10, 1, 0.05, "cl_radar_background_alpha"); + me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:")); + me.TD(me, 1, 3, sl); + setDependent(e, "cl_radar", 1, 2); + setDependent(sl, "cl_radar", 1, 2); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Size:")); + setDependent(e, "cl_radar", 1, 2); me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_size")); e.addValue(e, "96x96", "96 96"); e.addValue(e, "128x96", "128 96"); e.addValue(e, "128x128", "128 128"); - e.addValue(e, "192x144", "192 144"); + e.addValue(e, "160x128", "160 128"); + e.addValue(e, "160x160", "160 160"); + e.addValue(e, "192x160", "192 160"); e.addValue(e, "192x192", "192 192"); e.addValue(e, "256x192", "256 192"); e.addValue(e, "256x256", "256 256"); e.configureVoretTextSliderValues(e); + setDependent(e, "cl_radar", 1, 2); me.TR(me); me.TDempty(me, 0.2); - sl = makeVoretSlider(0.20, 1, 0.01, "cl_radar_background_alpha"); - me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:")); - me.TD(me, 1, 3, sl); + me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Distance:")); + setDependent(e, "cl_radar", 1, 2); + me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_scale")); + e.addValue(e, "512", "512"); + e.addValue(e, "1024", "1024"); + e.addValue(e, "2048", "2048"); + e.addValue(e, "4096", "4096"); + e.addValue(e, "8192", "8192"); + e.configureVoretTextSliderValues(e); + setDependent(e, "cl_radar", 1, 2); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Rotation:")); + setDependent(e, "cl_radar", 1, 2); + me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_rotation")); + e.addValue(e, "Player", "0"); + e.addValue(e, "West", "1"); + e.addValue(e, "South", "2"); + e.addValue(e, "East", "3"); + e.addValue(e, "North", "4"); + e.configureVoretTextSliderValues(e); + setDependent(e, "cl_radar", 1, 2); me.TR(me); me.TR(me); me.TD(me, 1, 4, makeVoretTextLabel(0, "Waypoint settings:")); diff --git a/docs/TODO.txt b/docs/TODO.txt index cedef231..04f73ea8 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -152,4 +152,6 @@ - 0.7: Remove _mini -- 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 + +- 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 -- 2.39.2