diff --git a/main/32av.cfg b/main/32av.cfg index 99fde576..d69ed307 100644 --- a/main/32av.cfg +++ b/main/32av.cfg @@ -25,8 +25,13 @@ crosshair "1" cl_cross "0" -echo "Classic NS preset:" +echo " " +echo "----------------------------------------------------------------------" +echo "Classic NS graphics and audio preset applied:" +echo "----------------------------------------------------------------------" echo "- Original dark lighting" echo "- Original HUD and crosshairs" echo "- Original weapon and view bob" -echo "- Original mix volumes for ambient sound and music" \ No newline at end of file +echo "- Original mix volumes for ambient sound and music" +echo " " +echo "Note: 25th aniversary Half-Life and sv_allow_shaders 1 are required for the graphics to display properly at the moment." \ No newline at end of file diff --git a/main/33av.cfg b/main/33av.cfg index f4129a36..a26bf500 100644 --- a/main/33av.cfg +++ b/main/33av.cfg @@ -1,6 +1,6 @@ // Lighting - temporary until new gamma ramp shader. -brightness "2" -gamma "3" +brightness "1" +gamma "2.5" lightgamma "2.25" gl_use_shaders "1" @@ -25,8 +25,13 @@ crosshair "0" cl_cross "1" -echo "NS 3.3 preset:" -echo "- Increased lightgamma for less dark shadows" +echo " " +echo "----------------------------------------------------------------------" +echo "NS 3.3 graphics and audio preset applied" +echo "----------------------------------------------------------------------" +echo "- Brighter shadows" echo "- Minimal marine HUD and new crosshair system" echo "- Reduced weapon bobbing and no view bobbing" -echo "- Reduced ambient sound and music volumes" \ No newline at end of file +echo "- Reduced ambient sound and music volumes" +echo " " +echo "Note: 25th aniversary Half-Life and sv_allow_shaders 1 are required for the graphics to display properly at the moment." \ No newline at end of file diff --git a/main/compav.cfg b/main/compav.cfg index fec33710..03486a06 100644 --- a/main/compav.cfg +++ b/main/compav.cfg @@ -27,8 +27,10 @@ cl_cross "1" //Disable help tooltips //cl_autohelp "0" - -echo "Competitive NS preset:" +echo " " +echo "----------------------------------------------------------------------" +echo "Competitive NS preset applied:" +echo "----------------------------------------------------------------------" echo "- Bright lighting settings with overbright shader disabled" echo "- Nine Legends competitive HUD and new crosshair system" echo "- No weapon of view bobbing" diff --git a/main/source/cl_dll/input.cpp b/main/source/cl_dll/input.cpp index 4607290d..a3fa00dd 100644 --- a/main/source/cl_dll/input.cpp +++ b/main/source/cl_dll/input.cpp @@ -1561,8 +1561,7 @@ void EchoDev(void) void NsPreset(void) { int presetChoice = atoi(gEngfuncs.Cmd_Argv(1)); - int printMethod = gViewPort ? HUD_PRINTTALK : HUD_PRINTCONSOLE; - const char* inGameAdditional = (printMethod == HUD_PRINTTALK) ? " See console for details." : ""; + bool printToChat = gViewPort; char execText[1024]; //char localizedText[1024]; @@ -1572,27 +1571,48 @@ void NsPreset(void) { case 1: ClientCmd("exec 32av.cfg"); - //Localize later. - //sprintf(localizedText, CHudTextMessage::BufferedLocaliseTextString("#Preset1")); - snprintf(execText, 1024, "%c** %s%s\n", printMethod, "Classic NS audio/visual presets applied.", inGameAdditional); - gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, (int)strlen(execText) + 1, execText); + if (printToChat) + { + // Localize later. + //sprintf(localizedText, CHudTextMessage::BufferedLocaliseTextString("#Preset1")); + snprintf(execText, 1024, "%c** %s\n", HUD_PRINTTALK, "Classic NS audio/visual presets applied. See console for details."); + gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, (int)strlen(execText) + 1, execText); + } + else + { + ClientCmd("toggleconsole"); + } break; case 2: ClientCmd("exec 33av.cfg"); - //Localize later. - //sprintf(localizedText, CHudTextMessage::BufferedLocaliseTextString("#Preset2")); - sprintf(execText, "%c** %s%s\n", printMethod, "NS 3.3 audio/visual presets applied. See console for details.", inGameAdditional); - gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, (int)strlen(execText) + 1, execText); + if (printToChat) + { + // Localize later. + //sprintf(localizedText, CHudTextMessage::BufferedLocaliseTextString("#Preset2")); + snprintf(execText, 1024, "%c** %s\n", HUD_PRINTTALK, "NS 3.3 audio/visual presets applied. See console for details."); + gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, (int)strlen(execText) + 1, execText); + } + else + { + ClientCmd("toggleconsole"); + } break; case 3: ClientCmd("exec compav.cfg"); - //Localize later. - //sprintf(localizedText, CHudTextMessage::BufferedLocaliseTextString("#Preset3")); - sprintf(execText, "%c** %s%s\n", printMethod, "Competive audio/visual presets applied. See console for details.", inGameAdditional); - gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, (int)strlen(execText) + 1, execText); + if (printToChat) + { + // Localize later. + //sprintf(localizedText, CHudTextMessage::BufferedLocaliseTextString("#Preset3")); + snprintf(execText, 1024, "%c** %s\n", HUD_PRINTTALK, "Competive audio/visual presets applied. See console for details."); + gHUD.m_TextMessage.MsgFunc_TextMsg(NULL, (int)strlen(execText) + 1, execText); + } + else + { + ClientCmd("toggleconsole"); + } break; default: gEngfuncs.Con_Printf("NS configuration preset selector. Useage:\n1: apply NS 3.2 settings\n2: apply NS 3.3 settings\n3: apply competitive settings\n"); diff --git a/main/user.scr b/main/user.scr index 3dab6269..46798d9a 100644 --- a/main/user.scr +++ b/main/user.scr @@ -32,7 +32,7 @@ // Half-Life User Info Configuration Layout Script (stores last settings chosen, too) -// File generated: Sun Aug 12 07:21:40 AM +// File generated: Mon Jan 29 21:27:07 AM // // // Cvar - Setting @@ -48,11 +48,32 @@ DESCRIPTION INFO_OPTIONS { "0" } } + "cl_pistoltrigger" + { + "Pistol binary trigger (pistol script)" + { BOOL } + { "1" } + } + + "cl_musicenabled" + { + "Music enabled" + { BOOL } + { "1" } + } + + "cl_musicvolume" + { + "Music volume (0-2)" + { NUMBER 0.000000 2.000000 } + { "0.600000" } + } + "cl_ambientsound" { "Ambient sound volume (0 to 1)" { NUMBER 0.000000 1.000000 } - { "0.000000" } + { "0.600000" } } "hud_style" @@ -120,7 +141,7 @@ DESCRIPTION INFO_OPTIONS } { "2.000000" } } - + "hud_drawwaypoints" { "Show waypoints on HUD" @@ -145,21 +166,21 @@ DESCRIPTION INFO_OPTIONS } { "1.000000" } } - + "hud_mapnames" { "Length of minimap names 1=unlim" { NUMBER 0.000000 30.000000 } { "5.000000" } } - + "hud_mapnamesComm" { "Show names on minimap when commander" { BOOL } { "1" } } - + "cl_mutemenu" { "Scoreboard mute menu hotkey" @@ -207,21 +228,21 @@ DESCRIPTION INFO_OPTIONS { BOOL } { "0" } } - + "hud_fastswitch" { "Weapon fast-switch" { BOOL } { "1" } } - + "cl_cmhotkeys" { "Commander hotkeys" { STRING } { "qwerasdfzxcv" } } - + "hud_teamhealthalert" { "Show health/armor of team when <" @@ -292,7 +313,7 @@ DESCRIPTION INFO_OPTIONS { "0" } } - "cl_cross_line_top" + "cl_cross_line_top" { "Cross top line" { BOOL } @@ -306,14 +327,14 @@ DESCRIPTION INFO_OPTIONS { "1" } } - "cl_cross_line_left" + "cl_cross_line_left" { "Cross left line" { BOOL } { "1" } } - "cl_cross_line_right" + "cl_cross_line_right" { "Cross right line" { BOOL } @@ -370,7 +391,7 @@ DESCRIPTION INFO_OPTIONS } "cl_cross_circle_color" - { + { "Circle color (R G B)" { STRING } { "" } @@ -453,20 +474,6 @@ DESCRIPTION INFO_OPTIONS { "1" } } - "cl_musicenabled" - { - "Music enabled" - { BOOL } - { "1" } - } - - "cl_musicvolume" - { - "Music volume (0-2)" - { NUMBER 0.000000 2.000000 } - { "1.000000" } - } - "cl_musicdirectory" { "Custom music directory"