From 9ea640e8a88f38d80b1e354a34202a34f48baf84 Mon Sep 17 00:00:00 2001 From: Igor Date: Sun, 22 Sep 2024 12:43:16 -0400 Subject: [PATCH 1/6] [rayshud] Updates to match new release --- src/TF2HUD.Editor/JSON/rayshud.json | 74 ++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 18 deletions(-) diff --git a/src/TF2HUD.Editor/JSON/rayshud.json b/src/TF2HUD.Editor/JSON/rayshud.json index 8fc4a1f2..7e1617b9 100644 --- a/src/TF2HUD.Editor/JSON/rayshud.json +++ b/src/TF2HUD.Editor/JSON/rayshud.json @@ -28,8 +28,6 @@ } ] }, - "CustomizationsFolder": "resource//ui//#customizations", - "EnabledFolder": "resource//ui//#customizations//_enabled", "Controls": { "UberCharge": [ { @@ -163,7 +161,7 @@ "ToolTip": "Toggle crosshair feature.", "Value": "false", "Files": { - "scripts/hudlayout_base.res": { + "resource/ui/hudplayerclass.res": { "CustomCrosshair": { "visible": { "true": "1", @@ -184,7 +182,7 @@ "ToolTip": "Toggle hitmarker animation.", "Value": "true", "Files": { - "scripts/hudanimations_custom.txt": { + "scripts/hudanimations_hitmarker.txt": { "uncomment": [ "StopEvent HitMarker", "RunEvent HitMarker" @@ -199,7 +197,7 @@ "ToolTip": "Style of crosshair.", "Value": "<", "Files": { - "scripts/hudlayout_base.res": { + "resource/ui/hudplayerclass.res": { "CustomCrosshair": { "labelText": "$value" } @@ -216,7 +214,7 @@ "Increment": "1", "ToolTip": "Size of the crosshair.", "Files": { - "scripts/hudlayout_base.res": { + "resource/ui/hudplayerclass.res": { "CustomCrosshair": { "font": "Size:$value | Outline:OFF" } @@ -678,7 +676,16 @@ "Value": "false", "Restart": true, "ToolTip": "Toggle to the classic main menu style.", - "FileName": "mainmenuoverride_classic.res" + "Files": { + "resource/ui/mainmenuoverride.res": { + "HudName": { + "xpos": { + "true": "9999", + "false": "" + } + } + } + } }, { "Name": "rh_toggle_min_scoreboard", @@ -711,7 +718,7 @@ "Value": "false", "Restart": true, "Files": { - "resource/ui/mainmenuoverride_base.res": { + "resource/ui/mainmenuoverride.res": { "TFCharacterImage": { "ypos": { "true": "-80", @@ -749,11 +756,11 @@ "ToolTip": "Toggle position of the game chat to be near the bottom.", "Value": "false", "Files": { - "resource/ui/basechat_base.res": { + "resource/ui/basechat.res": { "HudChat": { "ypos": { "true": "315", - "false": "25" + "false": "20" } } } @@ -782,7 +789,7 @@ "ToolTip": "Toggle the position of the Engineer's metal counter to be near the middle.", "Value": "false", "Files": { - "scripts/hudlayout_base.res": { + "scripts/hudlayout.res": { "CHudAccountPanel": { "xpos": { "true": "c-20", @@ -804,6 +811,23 @@ } } }, + { + "Name": "rh_toggle_speedometer", + "Label": "Speedometer", + "Type": "Checkbox", + "ToolTip": "Toggle speedometer below the crosshair.", + "Value": "false", + "Files": { + "resource/ui/hudplayerclass.res": { + "Speedometer": { + "visible": { + "true": "1", + "false": "0" + } + } + } + } + }, { "Name": "rh_toggle_transparent_viewmodels", "Label": "Transparent Viewmodels", @@ -812,15 +836,11 @@ "Special": "TransparentViewmodels", "Value": "false", "Files": { - "scripts/hudlayout_base.res": { + "scripts/hudlayout.res": { "TransparentViewmodel": { "visible": { "true": "1", "false": "0" - }, - "enabled": { - "true": "1", - "false": "0" } } } @@ -834,7 +854,25 @@ "Value": "false", "FileName": "hudplayerclass_left.res", "Files": { - "scripts/hudlayout_base.res": { + "scripts/hudlayout.res": { + "DisguiseStatus": { + "xpos": { + "true": "100", + "false": "15" + } + } + } + } + }, + { + "Name": "rh_toggle_streamer_mode", + "Label": "Streamer Mode", + "Type": "Checkbox", + "ToolTip": "Removes player and game details, useful when streaming.", + "Value": "false", + "FileName": "hudplayerclass_left.res", + "Files": { + "scripts/hudlayout.res": { "DisguiseStatus": { "xpos": { "true": "100", @@ -872,7 +910,7 @@ "Maximum": "9", "Increment": "1", "Files": { - "scripts/hudlayout_base.res": { + "scripts/hudlayout.res": { "HudDeathNotice": { "MaxDeathNotices": "$value" } From 76b01f79d492bc933229fc99e977c895d1e2852c Mon Sep 17 00:00:00 2001 From: Igor Date: Sun, 22 Sep 2024 13:53:57 -0400 Subject: [PATCH 2/6] [rayshud] Added streamer mode --- src/TF2HUD.Editor/JSON/rayshud.json | 506 ++++++++++++++++++++++++++-- 1 file changed, 485 insertions(+), 21 deletions(-) diff --git a/src/TF2HUD.Editor/JSON/rayshud.json b/src/TF2HUD.Editor/JSON/rayshud.json index 7e1617b9..3879480f 100644 --- a/src/TF2HUD.Editor/JSON/rayshud.json +++ b/src/TF2HUD.Editor/JSON/rayshud.json @@ -166,10 +166,6 @@ "visible": { "true": "1", "false": "0" - }, - "enabled": { - "true": "1", - "false": "0" } } } @@ -742,8 +738,12 @@ "false": "c108" }, "xpos_minmode": { - "true": "c-138", + "true": "c-145", "false": "c58" + }, + "ypos_minmode": { + "true": "253", + "false": "263" } } } @@ -767,20 +767,57 @@ } }, { - "Name": "rh_toggle_center_team", + "Name": "rh_toggle_center_class", "Label": "Centered Class Select", "Type": "Checkbox", "ToolTip": "Toggle style of the class select to be center-oriented.", "Value": "false", - "FileName": "classselection_center.res" - }, - { - "Name": "rh_toggle_center_class", - "Label": "Centered Team Select", - "Type": "Checkbox", - "ToolTip": "Toggle style of the team select to be center-oriented.", - "Value": "false", - "FileName": "teammenu_center.res" + "Files": { + "resource/ui/classselection.res": { + "SidePanelBG": { + "wide": { + "true": "0", + "false": "255" + } + }, + "SelectClassLabel": { + "visible": { + "true": "1", + "false": "0" + } + }, + "scout": { + "xpos": { + "true": "c81", + "false": "32" + }, + "ypos": { + "true": "164", + "false": "275" + } + }, + "TFPlayerModel": { + "xpos": { + "true": "c-360", + "false": "0" + }, + "wide": { + "true": "420", + "false": "255" + }, + "tall": { + "true": "480", + "false": "270" + }, + "model": { + "origin_x": { + "true": "250", + "false": "270" + } + } + } + } + } }, { "Name": "rh_toggle_metal_pos", @@ -856,9 +893,71 @@ "Files": { "scripts/hudlayout.res": { "DisguiseStatus": { + "xpos": { + "true": "25", + "false": "c210" + }, + "ypos": { + "true": "r75", + "false": "r60" + }, + "wide": { + "true": "75", + "false": "60" + }, + "tall": { + "true": "75", + "false": "60" + } + }, + "classmodelpanel": { + "xpos": { + "true": "0", + "false": "r210" + }, + "ypos": { + "true": "r200", + "false": "r148" + }, + "wide": { + "true": "150", + "false": "75" + }, + "tall": { + "true": "200", + "false": "150" + }, + "fov": { + "true": "23", + "false": "25" + }, + "model": { + "angles_x": { + "true": "0", + "false": "-13" + }, + "angles_y": { + "true": "165", + "false": "150" + }, + "origin_x": { + "true": "200", + "false": "138" + }, + "origin_y": { + "true": "0", + "false": "-4" + }, + "origin_z": { + "true": "-80", + "false": "-93" + } + } + }, + "CarryingWeapon": { "xpos": { "true": "100", - "false": "15" + "false": "r250" } } } @@ -870,13 +969,378 @@ "Type": "Checkbox", "ToolTip": "Removes player and game details, useful when streaming.", "Value": "false", - "FileName": "hudplayerclass_left.res", "Files": { + "resource/ui/basechat.res": { + "HudChat": { + "ypos": { + "true": "9999", + "false": "" + } + } + }, + "resource/ui/dashboardpartymember.res": { + "avatar": { + "ypos": { + "true": "9999", + "false": "" + } + } + }, + "resource/ui/disguisestatuspanel.res": { + "DisguiseNameLabel": { + "ypos": { + "true": "9999", + "false": "" + } + } + }, + "resource/ui/freezepanel_basic.res": { + "FreezePanelBase": { + "FreezeLabel": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "FreezeLabelKiller": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + }, + "resource/ui/hudarenawinpanel.res": { + "ArenaWinPanelWinnersPanel": { + "Player1Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player1Name": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player2Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player2Name": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player3Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player3Name": { + "ypos": { + "true": "9999", + "false": "" + } + } + }, + "ArenaWinPanelLosersPanel": { + "Player1Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player1Name": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player2Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player2Name": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player3Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player3Name": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + }, + "resource/ui/hudinspectpanel.res": { + "itempanel": { + "ItemLabel": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + }, + "resource/ui/hudkillstreaknotice.res": { + "SplashLabel": { + "ypos": { + "true": "9999", + "false": "" + } + } + }, + "resource/ui/matchmakingtooltip.res": { + "TooltipPanel": { + "TipLabel": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + }, + "resource/ui/mvmscoreboard.res": { + "MvMPlayerList": { + "ypos": { + "true": "9999", + "false": "" + } + } + }, + "resource/ui/pvprankpanel.res": { + "BGPanel": { + "NameLabel": { + "labelText": { + "true": "STREAMER MODE", + "false": "" + } + } + } + }, + "scripts/hudmatchstatus.res": { + "TeamStatus": { + "playerpanels_kv": { + "wide": { + "true": "0", + "false": "" + } + } + }, + "BlueTeamPanel": { + "wide": { + "true": "0", + "false": "" + }, + "if_large": { + "wide": { + "true": "0", + "false": "" + } + } + }, + "RedTeamPanel": { + "wide": { + "true": "0", + "false": "" + }, + "if_large": { + "wide": { + "true": "0", + "false": "" + } + } + } + }, + "resource/ui/scoreboard.res": { + "BluePlayerList": { + "wide": { + "true": "0", + "false": "" + } + }, + "RedPlayerList": { + "labelText": { + "wide": "0", + "false": "" + } + }, + "ServerLabel": { + "ypos": { + "true": "9999", + "false": "" + }, + "if_mvm": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + }, + "resource/ui/spectator.res": { + "itempanel": { + "ItemLabel": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + }, + "resource/ui/hudplayerclass.res": { + "CarryingWeapon": { + "OwnerLabel": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + }, + "resource/ui/targetid.res": { + "TargetNameLabel": { + "labeltext": { + "true": "", + "false": "" + } + } + }, + "resource/ui/votehud.res": { + "VoteActive": { + "Header": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + }, + "resource/ui/winpanel.res": { + "Player1Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player1Name": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player2Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player2Name": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player3Avatar": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "Player3Name": { + "ypos": { + "true": "9999", + "false": "" + } + } + }, + "resource/ui/hudmatchsummary.res": { + "MainStatsContainer": { + "TeamScoresPanel": { + "BlueTeamPanel": { + "wide": { + "true": "0", + "false": "" + }, + "BluePlayerListParent": { + "BluePlayerList": { + "wide": { + "true": "0", + "false": "" + } + } + } + }, + "RedTeamPanel": { + "wide": { + "true": "0", + "false": "" + }, + "RedPlayerListParent": { + "RedPlayerListParent": { + "wide": { + "true": "0", + "false": "" + } + } + } + } + } + } + }, + "resource/ui/hudtournament.res": { + "HudTournament": { + "playerpanels_kv": { + "playername": { + "if_competitive": { + "ypos": { + "true": "9999", + "false": "" + } + }, + "if_readymode": { + "ypos": { + "true": "9999", + "false": "" + } + } + } + } + } + }, "scripts/hudlayout.res": { - "DisguiseStatus": { - "xpos": { - "true": "100", - "false": "15" + "HudDeathNotice": { + "TextFont": { + "true": "", + "false": "" + } + }, + "HudVoiceStatus": { + "text_xpos": { + "true": "9999", + "false": "" + } + }, + "HudSpectatorExtras": { + "player_name_font": { + "true": "", + "false": "" } } } From 9d0695e82c076cf9432b4824bd3eddb2695b3475 Mon Sep 17 00:00:00 2001 From: Igor Date: Sun, 22 Sep 2024 21:31:40 -0400 Subject: [PATCH 3/6] Only force update schema on release builds --- src/TF2HUD.Editor/MainWindow.xaml.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/TF2HUD.Editor/MainWindow.xaml.cs b/src/TF2HUD.Editor/MainWindow.xaml.cs index 5ac1662e..63254228 100644 --- a/src/TF2HUD.Editor/MainWindow.xaml.cs +++ b/src/TF2HUD.Editor/MainWindow.xaml.cs @@ -46,8 +46,10 @@ public MainWindow() // Check for tf/custom directory SetupDirectory(); +#if !DEBUG // Check for updates UpdateAppSchema(true); +#endif } private void MainWindowViewModelPropertyChanged(object sender, PropertyChangedEventArgs e) From d372260cdd149ffe60d344673d9da7e8829c7e97 Mon Sep 17 00:00:00 2001 From: Igor Date: Sun, 22 Sep 2024 21:31:58 -0400 Subject: [PATCH 4/6] [rayshud] Updated customizations --- src/TF2HUD.Editor/JSON/rayshud.json | 353 +++++++++++++++++++--------- 1 file changed, 237 insertions(+), 116 deletions(-) diff --git a/src/TF2HUD.Editor/JSON/rayshud.json b/src/TF2HUD.Editor/JSON/rayshud.json index 3879480f..608697ca 100644 --- a/src/TF2HUD.Editor/JSON/rayshud.json +++ b/src/TF2HUD.Editor/JSON/rayshud.json @@ -224,7 +224,6 @@ "ToolTip": "Default crosshair color.", "Value": "242 242 242 255", "Restart": true, - "Width": 125, "Files": { "resource/scheme/clientscheme_colors.res": { "Scheme": { @@ -242,7 +241,6 @@ "ToolTip": "Color of crosshair when hitting another player.", "Value": "255 0 0 255", "Restart": true, - "Width": 125, "Files": { "resource/scheme/clientscheme_colors.res": { "Scheme": { @@ -689,7 +687,172 @@ "Type": "Checkbox", "Value": "false", "ToolTip": "Toggle to a minimal scoreboard style.", - "FileName": "scoreboard_minimal.res" + "Files": { + "resource/ui/scoreboard.res": { + "BlueScoreBG": { + "ypos": { + "true": "250", + "false": "144" + } + }, + "ClassImage": { + "ypos": { + "true": "-30", + "false": "-115" + }, + "pin_to_sibling": { + "true": "RedPlayerList", + "false": "LocalPlayerStatsPanel" + } + }, + "classmodelpanel": { + "ypos": { + "true": "50", + "false": "0" + }, + "pin_to_sibling": { + "true": "RedPlayerList", + "false": "LocalPlayerStatsPanel" + }, + "pin_corner_to_sibling": { + "true": "PIN_TOPLEFT", + "false": "PIN_BOTTOMLEFT" + }, + "pin_to_sibling_corner": { + "true": "PIN_TOPRIGHT", + "false": "PIN_BOTTOMRIGHT" + } + }, + "SideBG": { + "visible": { + "true": "1", + "false": "0" + } + }, + "LocalPlayerStatsPanel": { + "wide": { + "true": "150", + "false": "540" + }, + "tall": { + "true": "190", + "false": "70" + }, + "pin_to_sibling": { + "true": "SideBG", + "false": "MainBG" + }, + "pin_corner_to_sibling": { + "true": "PIN_TOPLEFT", + "false": "PIN_BOTTOMLEFT" + }, + "pin_to_sibling_corner": { + "true": "PIN_TOPLEFT", + "false": "PIN_BOTTOMLEFT" + }, + "KillsLabel": { + "xpos": { + "true": "70", + "false": "265" + }, + "ypos": { + "true": "-10", + "false": "0" + } + }, + "AssistsLabel": { + "xpos": { + "true": "40", + "false": "15" + }, + "ypos": { + "true": "50", + "false": "2" + } + }, + "DestructionLabel": { + "xpos": { + "true": "9999", + "false": "0" + } + }, + "CapturesLabel": { + "xpos": { + "true": "9999", + "false": "0" + } + }, + "DefensesLabel": { + "xpos": { + "true": "9999", + "false": "0" + } + }, + "DominationLabel": { + "xpos": { + "true": "9999", + "false": "0" + } + }, + "RevengeLabel": { + "pin_to_sibling": { + "true": "DefensesLabel", + "false": "DominationLabel" + } + }, + "HealingLabel": { + "pin_to_sibling": { + "true": "AssistsLabel", + "false": "RevengeLabel" + } + }, + "InvulnLabel": { + "xpos": { + "true": "9999", + "false": "0" + } + }, + "TeleportsLabel": { + "xpos": { + "true": "0", + "false": "342" + }, + "pin_to_sibling": { + "true": "HealingLabel", + "false": "DominationsLabel" + }, + "pin_to_sibling_corner": { + "true": "PIN_BOTTOMLEFT", + "false": "PIN_TOPLEFT" + } + }, + "BonusLabel": { + "xpos": { + "true": "9999", + "false": "0" + } + }, + "SupportLabel": { + "xpos": { + "true": "0", + "false": "5" + }, + "ypos": { + "true": "1", + "false": "0" + }, + "pin_to_sibling": { + "true": "BackstabsLabel", + "false": "Teleports2" + }, + "pin_to_sibling_corner": { + "true": "PIN_BOTTOMLEFT", + "false": "PIN_TOPRIGHT" + } + } + } + } + } }, { "Name": "rh_toggle_disguise_image", @@ -698,11 +861,13 @@ "ToolTip": "Toggle the spy silhouette seen when changing the disguise.", "Value": "false", "Files": { - "scripts/hudanimations_custom.txt": { - "uncomment": [ - "RunEvent HudSpyDisguiseChanged", - "Animate PlayerStatusSpyImage" - ] + "resource/ui/hudplayerclass.res": { + "PlayerStatusSpyOutlineImage": { + "image": { + "true": "../hud/class_spy_outline", + "false": "../vgui/replay/thumbnails/transparent" + } + } } } }, @@ -829,7 +994,7 @@ "scripts/hudlayout.res": { "CHudAccountPanel": { "xpos": { - "true": "c-20", + "true": "c-27", "false": "c200" }, "ypos": { @@ -837,7 +1002,7 @@ "false": "c130" }, "xpos_minmode": { - "true": "c-30", + "true": "c-27", "false": "c130" }, "ypos_minmode": { @@ -895,21 +1060,11 @@ "DisguiseStatus": { "xpos": { "true": "25", - "false": "c210" - }, - "ypos": { - "true": "r75", - "false": "r60" - }, - "wide": { - "true": "75", - "false": "60" - }, - "tall": { - "true": "75", - "false": "60" + "false": "r150" } - }, + } + }, + "resource/ui/hudplayerclass.res": { "classmodelpanel": { "xpos": { "true": "0", @@ -959,6 +1114,12 @@ "true": "100", "false": "r250" } + }, + "PlayerStatusSpyOutlineImage": { + "image": { + "true": "../vgui/replay/thumbnails/transparent", + "false": "../hud/class_spy_outline" + } } } } @@ -969,12 +1130,13 @@ "Type": "Checkbox", "ToolTip": "Removes player and game details, useful when streaming.", "Value": "false", + "Width": 250, "Files": { "resource/ui/basechat.res": { "HudChat": { - "ypos": { - "true": "9999", - "false": "" + "wide": { + "true": "0", + "false": "250" } } }, @@ -982,7 +1144,7 @@ "avatar": { "ypos": { "true": "9999", - "false": "" + "false": "1" } } }, @@ -990,7 +1152,7 @@ "DisguiseNameLabel": { "ypos": { "true": "9999", - "false": "" + "false": "0" } } }, @@ -999,13 +1161,13 @@ "FreezeLabel": { "ypos": { "true": "9999", - "false": "" + "false": "0" } }, "FreezeLabelKiller": { "ypos": { "true": "9999", - "false": "" + "false": "15" } } } @@ -1015,37 +1177,37 @@ "Player1Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "4" } }, "Player1Name": { "ypos": { "true": "9999", - "false": "" + "false": "4" } }, "Player2Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "19" } }, "Player2Name": { "ypos": { "true": "9999", - "false": "" + "false": "19" } }, "Player3Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "34" } }, "Player3Name": { "ypos": { "true": "9999", - "false": "" + "false": "34" } } }, @@ -1053,37 +1215,37 @@ "Player1Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "4" } }, "Player1Name": { "ypos": { "true": "9999", - "false": "" + "false": "4" } }, "Player2Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "19" } }, "Player2Name": { "ypos": { "true": "9999", - "false": "" + "false": "19" } }, "Player3Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "34" } }, "Player3Name": { "ypos": { "true": "9999", - "false": "" + "false": "34" } } } @@ -1093,7 +1255,7 @@ "ItemLabel": { "ypos": { "true": "9999", - "false": "" + "false": "3" } } } @@ -1102,7 +1264,7 @@ "SplashLabel": { "ypos": { "true": "9999", - "false": "" + "false": "70" } } }, @@ -1111,7 +1273,7 @@ "TipLabel": { "ypos": { "true": "9999", - "false": "" + "false": "10" } } } @@ -1120,7 +1282,7 @@ "MvMPlayerList": { "ypos": { "true": "9999", - "false": "" + "false": "248" } } }, @@ -1129,42 +1291,30 @@ "NameLabel": { "labelText": { "true": "STREAMER MODE", - "false": "" + "false": "%name%" } } } }, - "scripts/hudmatchstatus.res": { + "resource/ui/hudmatchstatus.res": { "TeamStatus": { "playerpanels_kv": { "wide": { "true": "0", - "false": "" + "false": "25" } } }, "BlueTeamPanel": { "wide": { "true": "0", - "false": "" - }, - "if_large": { - "wide": { - "true": "0", - "false": "" - } + "false": "150" } }, "RedTeamPanel": { "wide": { "true": "0", - "false": "" - }, - "if_large": { - "wide": { - "true": "0", - "false": "" - } + "false": "150" } } }, @@ -1172,35 +1322,19 @@ "BluePlayerList": { "wide": { "true": "0", - "false": "" + "false": "270" } }, "RedPlayerList": { "labelText": { "wide": "0", - "false": "" + "false": "270" } }, "ServerLabel": { "ypos": { "true": "9999", - "false": "" - }, - "if_mvm": { - "ypos": { - "true": "9999", - "false": "" - } - } - } - }, - "resource/ui/spectator.res": { - "itempanel": { - "ItemLabel": { - "ypos": { - "true": "9999", - "false": "" - } + "false": "0" } } }, @@ -1209,7 +1343,7 @@ "OwnerLabel": { "ypos": { "true": "9999", - "false": "" + "false": "14" } } } @@ -1218,7 +1352,7 @@ "TargetNameLabel": { "labeltext": { "true": "", - "false": "" + "false": "%targetname%" } } }, @@ -1227,7 +1361,7 @@ "Header": { "ypos": { "true": "9999", - "false": "" + "false": "5" } } } @@ -1236,37 +1370,37 @@ "Player1Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "120" } }, "Player1Name": { "ypos": { "true": "9999", - "false": "" + "false": "117" } }, "Player2Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "136" } }, "Player2Name": { "ypos": { "true": "9999", - "false": "" + "false": "133" } }, "Player3Avatar": { "ypos": { "true": "9999", - "false": "" + "false": "152" } }, "Player3Name": { "ypos": { "true": "9999", - "false": "" + "false": "149" } } }, @@ -1276,13 +1410,13 @@ "BlueTeamPanel": { "wide": { "true": "0", - "false": "" + "false": "f0" }, "BluePlayerListParent": { "BluePlayerList": { "wide": { "true": "0", - "false": "" + "false": "p.465" } } } @@ -1290,13 +1424,13 @@ "RedTeamPanel": { "wide": { "true": "0", - "false": "" + "false": "f0" }, "RedPlayerListParent": { - "RedPlayerListParent": { + "RedPlayerList": { "wide": { "true": "0", - "false": "" + "false": "p.465" } } } @@ -1308,17 +1442,9 @@ "HudTournament": { "playerpanels_kv": { "playername": { - "if_competitive": { - "ypos": { - "true": "9999", - "false": "" - } - }, - "if_readymode": { - "ypos": { - "true": "9999", - "false": "" - } + "wide": { + "true": "9999", + "false": "48" } } } @@ -1328,19 +1454,13 @@ "HudDeathNotice": { "TextFont": { "true": "", - "false": "" + "false": "HudFontSmallest" } }, "HudVoiceStatus": { "text_xpos": { "true": "9999", - "false": "" - } - }, - "HudSpectatorExtras": { - "player_name_font": { - "true": "", - "false": "" + "false": "25" } } } @@ -1388,6 +1508,7 @@ "ToolTip": "Change the style of background image shown on the main menu.", "Value": "1", "Restart": true, + "Width": 210, "Options": [ { "Label": "Modern", From 2bc288d42fcb2231cb99e9e2410265e9b18c20b6 Mon Sep 17 00:00:00 2001 From: Igor Date: Tue, 24 Sep 2024 22:12:58 -0400 Subject: [PATCH 5/6] [rayshud] Added classic main menu and health styles --- src/TF2HUD.Editor/JSON/rayshud.json | 449 +++++++++++++++++++++++++++- 1 file changed, 447 insertions(+), 2 deletions(-) diff --git a/src/TF2HUD.Editor/JSON/rayshud.json b/src/TF2HUD.Editor/JSON/rayshud.json index 608697ca..334f196e 100644 --- a/src/TF2HUD.Editor/JSON/rayshud.json +++ b/src/TF2HUD.Editor/JSON/rayshud.json @@ -672,10 +672,222 @@ "ToolTip": "Toggle to the classic main menu style.", "Files": { "resource/ui/mainmenuoverride.res": { + "TFLogoImage": { + "visible": { + "true": "1", + "false": "0" + } + }, "HudName": { + "visible": { + "true": "0", + "false": "1" + } + }, + "RankModelPanel": { + "ypos": { + "true": "cs-0.47", + "false": "cs-0.5-15" + } + }, + "CycleRankTypeButton": { "xpos": { - "true": "9999", - "false": "" + "true": "250", + "false": "270" + }, + "ypos": { + "true": "cs-0.4-05", + "false": "cs-0.5-33" + } + }, + "RankPanel": { + "xpos": { + "true": "50", + "false": "30" + }, + "ypos": { + "true": "250", + "false": "205" + } + }, + "NoGCMessage": { + "xpos": { + "true": "75", + "false": "30" + }, + "ypos": { + "true": "240", + "false": "200" + }, + "wide": { + "true": "200", + "false": "260" + } + }, + "NoGCImage": { + "xpos": { + "true": "210", + "false": "220" + }, + "ypos": { + "true": "260", + "false": "220" + } + }, + "FriendsContainer": { + "xpos": { + "true": "80", + "false": "40" + }, + "ypos": { + "true": "310", + "false": "270" + }, + "wide": { + "true": "210", + "false": "260" + }, + "SteamFriendsList": { + "wide": { + "true": "f20", + "false": "242" + }, + "friendpanel_kv": { + "wide": { + "true": "85", + "false": "110" + } + } + } + }, + "CharacterSetupButton": { + "xpos": { + "true": "90", + "false": "30" + }, + "ypos": { + "true": "85", + "false": "82" + }, + "wide": { + "true": "150", + "false": "260" + }, + "textinsetx": { + "true": "0", + "false": "25" + }, + "border_armed": { + "true": "NoBorder", + "false": "MainMenuTabs" + } + }, + "GeneralStoreButton": { + "wide": { + "true": "150", + "false": "260" + }, + "textinsetx": { + "true": "0", + "false": "25" + }, + "border_armed": { + "true": "NoBorder", + "false": "MainMenuTabs" + } + }, + "SteamWorkshopButton": { + "wide": { + "true": "150", + "false": "260" + }, + "textinsetx": { + "true": "0", + "false": "25" + }, + "border_armed": { + "true": "NoBorder", + "false": "MainMenuTabs" + } + }, + "SettingButton": { + "wide": { + "true": "150", + "false": "260" + }, + "textinsetx": { + "true": "0", + "false": "25" + }, + "border_armed": { + "true": "NoBorder", + "false": "MainMenuTabs" + } + }, + "AdvSettingsButton": { + "wide": { + "true": "150", + "false": "260" + }, + "textinsetx": { + "true": "0", + "false": "25" + }, + "border_armed": { + "true": "NoBorder", + "false": "MainMenuTabs" + } + }, + "MinmodeToggle": { + "wide": { + "true": "150", + "false": "260" + }, + "textinsetx": { + "true": "0", + "false": "25" + }, + "border_armed": { + "true": "NoBorder", + "false": "MainMenuTabs" + } + }, + "AchievementsButton": { + "xpos": { + "true": "90", + "false": "110" + }, + "ypos": { + "true": "210", + "false": "62" + } + }, + "BGPanel1": { + "xpos": { + "true": "75", + "false": "30" + }, + "ypos": { + "true": "0", + "false": "57" + }, + "wide": { + "true": "200", + "false": "260" + }, + "tall": { + "true": "f0", + "false": "370" + }, + "bgcolor_override": { + "true": "DarkGrey", + "false": "25 25 25 168" + } + }, + "BGPanel2": { + "visible": { + "true": "1", + "false": "0" } } } @@ -1533,6 +1745,239 @@ } ] }, + { + "Name": "rh_val_health_style", + "Label": "Health Style", + "Type": "ComboBox", + "ToolTip": "Change the style of the player health.", + "Value": "0", + "Restart": false, + "Width": 210, + "Options": [ + { + "Label": "Default", + "Value": "0", + "Files": { + "resource/ui/hudplayerhealth.res": { + "PlayerStatusHealthImage": { + "xpos": "54", + "xpos_minmode": "93", + "ypos_minmode": "41", + "wide": "36", + "tall": "36", + "wide_minmode": "20", + "tall_minmode": "20", + "visible": "0" + }, + "PlayerStatusHealthImageBG": { + "xpos": "52", + "xpos_minmode": "92", + "ypos_minmode": "40", + "wide": "0", + "tall": "40", + "wide_minmode": "0", + "tall_minmode": "22", + "visible": "0" + }, + "PlayerStatusHealthBonusImage": { + "xpos": "116", + "ypos": "18", + "xpos_minmode": "140", + "ypos_minmode": "40", + "wide": "68", + "tall": "68", + "wide_minmode": "22", + "tall_minmode": "22" + }, + "PlayerHealthValue": { + "xpos": "0", + "ypos": "0", + "xpos_minmode": "0", + "ypos_minmode": "0", + "font": "Cerbetica56", + "font_minmode": "Cerbetica32" + }, + "PlayerHealthShadow": { + "xpos_minmode": "-2", + "ypos_minmode": "-2", + "font": "Cerbetica56", + "font_minmode": "Cerbetica32" + }, + "HPBorderPanel1": { + "xpos": "64", + "ypos": "32", + "xpos_minmode": "98", + "ypos_minmode": "39", + "wide": "16", + "tall": "42", + "wide_minmode": "11", + "tall_minmode": "25", + "visible": "0" + }, + "HPBorderPanel2": { + "xpos": "51", + "ypos": "45", + "xpos_minmode": "91", + "ypos_minmode": "46", + "wide": "43", + "tall": "16", + "wide_minmode": "25", + "tall_minmode": "11", + "visible": "0" + } + } + } + }, + { + "Label": "Team Cross", + "Value": "1", + "Files": { + "resource/ui/hudplayerhealth.res": { + "PlayerStatusHealthImage": { + "xpos": "54", + "xpos_minmode": "93", + "ypos_minmode": "41", + "wide": "36", + "tall": "36", + "wide_minmode": "20", + "tall_minmode": "20", + "visible": "1" + }, + "PlayerStatusHealthImageBG": { + "xpos": "52", + "xpos_minmode": "92", + "ypos_minmode": "40", + "wide": "40", + "tall": "40", + "wide_minmode": "22", + "tall_minmode": "22", + "visible": "0" + }, + "PlayerStatusHealthBonusImage": { + "xpos": "52", + "ypos": "33", + "xpos_minmode": "91", + "ypos_minmode": "39", + "wide": "40", + "tall": "40", + "wide_minmode": "25", + "tall_minmode": "25" + }, + "PlayerHealthValue": { + "xpos": "0", + "ypos": "0", + "xpos_minmode": "0", + "ypos_minmode": "0", + "font": "Cerbetica56", + "font_minmode": "Cerbetica32" + }, + "PlayerHealthShadow": { + "xpos_minmode": "-2", + "ypos_minmode": "-2", + "font": "Cerbetica56", + "font_minmode": "Cerbetica32" + }, + "HPBorderPanel1": { + "xpos": "64", + "ypos": "32", + "xpos_minmode": "98", + "ypos_minmode": "39", + "wide": "16", + "tall": "42", + "wide_minmode": "11", + "tall_minmode": "25", + "visible": "1" + }, + "HPBorderPanel2": { + "xpos": "51", + "ypos": "45", + "xpos_minmode": "91", + "ypos_minmode": "46", + "wide": "43", + "tall": "16", + "wide_minmode": "25", + "tall_minmode": "11", + "visible": "1" + } + } + } + }, + { + "Label": "Broesel Cross", + "Value": "2", + "Files": { + "resource/ui/hudplayerhealth.res": { + "PlayerStatusHealthImage": { + "xpos": "104", + "xpos_minmode": "104", + "ypos_minmode": "35", + "wide": "56", + "tall": "56", + "wide_minmode": "45", + "tall_minmode": "45", + "visible": "1" + }, + "PlayerStatusHealthImageBG": { + "xpos": "102", + "xpos_minmode": "102", + "ypos_minmode": "33", + "wide": "60", + "tall": "60", + "wide_minmode": "49", + "tall_minmode": "49", + "visible": "1" + }, + "PlayerStatusHealthBonusImage": { + "xpos": "99", + "ypos": "30", + "xpos_minmode": "98", + "ypos_minmode": "29", + "wide": "66", + "tall": "66", + "wide_minmode": "56", + "tall_minmode": "56" + }, + "PlayerHealthValue": { + "xpos": "-18", + "ypos": "12", + "xpos_minmode": "-23", + "ypos_minmode": "7", + "font": "Cerbetica24", + "font_minmode": "Cerbetica18" + }, + "PlayerHealthShadow": { + "xpos_minmode": "-1", + "ypos_minmode": "-1", + "font": "Cerbetica24", + "font_minmode": "Cerbetica18" + }, + "HPBorderPanel1": { + "xpos": "119", + "ypos": "31", + "xpos_minmode": "115", + "ypos_minmode": "31", + "wide": "26", + "tall": "64", + "wide_minmode": "23", + "tall_minmode": "54", + "visible": "1" + }, + "HPBorderPanel2": { + "xpos": "100", + "ypos": "50", + "xpos_minmode": "100", + "ypos_minmode": "46", + "wide": "64", + "tall": "26", + "wide_minmode": "53", + "tall_minmode": "23", + "visible": "1" + } + } + } + } + ] + }, { "Name": "rh_custom_background", "Label": "Set Custom Background", From a7f5863f4a7c91acfbe310f85d6959c2970ee5cf Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 30 Sep 2024 15:29:26 -0400 Subject: [PATCH 6/6] [flawhud] Removed unused customization #249 --- src/TF2HUD.Editor/JSON/flawhud.json | 88 ----------------------------- 1 file changed, 88 deletions(-) diff --git a/src/TF2HUD.Editor/JSON/flawhud.json b/src/TF2HUD.Editor/JSON/flawhud.json index 87d1c21d..eca70b3e 100644 --- a/src/TF2HUD.Editor/JSON/flawhud.json +++ b/src/TF2HUD.Editor/JSON/flawhud.json @@ -910,94 +910,6 @@ } } }, - { - "Name": "fh_chat_font", - "Label": "Default Chat Font", - "Type": "Checkbox", - "ToolTip": "Changes the in-game chat font back to Verdana", - "Value": "false", - "Restart": true, - "Files": { - "resource/scheme/clientscheme_fonts.res": { - "Scheme": { - "Fonts": { - "ChatFont": { - "1": { - "name": { - "true": "Verdana", - "false": "Verdana Bold" - }, - "tall": { - "true": "12", - "false": "19" - }, - "weight": { - "true": "700", - "false": "400" - } - }, - "2": { - "name": { - "true": "Verdana", - "false": "Verdana Bold" - }, - "tall": { - "true": "14", - "false": "19" - }, - "weight": { - "true": "700", - "false": "400" - } - }, - "3": { - "name": { - "true": "Verdana", - "false": "Verdana Bold" - }, - "tall": { - "true": "15", - "false": "19" - }, - "weight": { - "true": "700", - "false": "400" - } - }, - "4": { - "name": { - "true": "Verdana", - "false": "Verdana Bold" - }, - "tall": { - "true": "17", - "false": "19" - }, - "weight": { - "true": "700", - "false": "400" - } - }, - "5": { - "name": { - "true": "Verdana", - "false": "Verdana Bold" - }, - "tall": { - "true": "22", - "false": "19" - }, - "weight": { - "true": "700", - "false": "400" - } - } - } - } - } - } - } - }, { "Name": "fh_val_hud_style", "Label": "Cornered Health/Ammo",