From 36a8156e28c0b5223ad37da6b1a227d2ba552bc5 Mon Sep 17 00:00:00 2001 From: Edi316 <61267443+Edi316@users.noreply.github.com> Date: Sun, 8 Mar 2026 12:41:05 +0100 Subject: [PATCH] Highlight Top 3 Highscores (#835) * Add Highscore Bars * Add Highscore Bars * Add Highscore Bars * Add Highscore Bars * Add Highscore Bars * Add Highscore Bars * Add Highscore Bars * Add Highscore Bars * Add Highscore Bars * Screen Version 3 --- .../Changelog/Changelog_ScreenHighscore.txt | 6 +- Output/Themes/Vocaluxe 2024/01_Standard.xml | 18 +++++ Output/Themes/Vocaluxe 2024/02.xml | 18 +++++ Output/Themes/Vocaluxe 2024/03.xml | 18 +++++ Output/Themes/Vocaluxe 2024/04.xml | 18 +++++ Output/Themes/Vocaluxe 2024/05.xml | 18 +++++ Output/Themes/Vocaluxe 2024/06.xml | 18 +++++ .../Vocaluxe 2024/Screens/ScreenHighscore.xml | 67 ++++++++++++++----- Vocaluxe/Screens/CScreenHighscore.cs | 8 ++- 9 files changed, 170 insertions(+), 19 deletions(-) diff --git a/Output/Themes/Changelog/Changelog_ScreenHighscore.txt b/Output/Themes/Changelog/Changelog_ScreenHighscore.txt index 6849c941..3e9af9b1 100644 --- a/Output/Themes/Changelog/Changelog_ScreenHighscore.txt +++ b/Output/Themes/Changelog/Changelog_ScreenHighscore.txt @@ -1,7 +1,11 @@ ScreenHighscore +++++++++++ +Version 3: + +Add: Color bars (Gold, Silver, Bronze) for Top 3 Scores ++++++++++ Version 2: Add: ParticleEffectsNew[1..10] (one for each entry!) -++++++++++ \ No newline at end of file +++++++++++ diff --git a/Output/Themes/Vocaluxe 2024/01_Standard.xml b/Output/Themes/Vocaluxe 2024/01_Standard.xml index 8338b341..da7a232c 100644 --- a/Output/Themes/Vocaluxe 2024/01_Standard.xml +++ b/Output/Themes/Vocaluxe 2024/01_Standard.xml @@ -308,6 +308,24 @@ 1.000 0.900 + + 1.000 + 0.800 + 0.000 + 0.800 + + + 0.800 + 0.800 + 0.800 + 0.750 + + + 0.800 + 0.500 + 0.300 + 0.750 + BG_Default.png diff --git a/Output/Themes/Vocaluxe 2024/02.xml b/Output/Themes/Vocaluxe 2024/02.xml index cec51d64..ed92d714 100644 --- a/Output/Themes/Vocaluxe 2024/02.xml +++ b/Output/Themes/Vocaluxe 2024/02.xml @@ -308,6 +308,24 @@ 1.000 0.900 + + 1.000 + 0.800 + 0.000 + 0.800 + + + 0.800 + 0.800 + 0.800 + 0.750 + + + 0.800 + 0.500 + 0.300 + 0.750 + BG_Default.png diff --git a/Output/Themes/Vocaluxe 2024/03.xml b/Output/Themes/Vocaluxe 2024/03.xml index a91111fe..fe568246 100644 --- a/Output/Themes/Vocaluxe 2024/03.xml +++ b/Output/Themes/Vocaluxe 2024/03.xml @@ -308,6 +308,24 @@ 1.000 0.900 + + 1.000 + 0.800 + 0.000 + 0.800 + + + 0.800 + 0.800 + 0.800 + 0.750 + + + 0.800 + 0.500 + 0.300 + 0.750 + BG_Default.png diff --git a/Output/Themes/Vocaluxe 2024/04.xml b/Output/Themes/Vocaluxe 2024/04.xml index e1a00608..e5188c71 100644 --- a/Output/Themes/Vocaluxe 2024/04.xml +++ b/Output/Themes/Vocaluxe 2024/04.xml @@ -308,6 +308,24 @@ 1.000 0.900 + + 1.000 + 0.800 + 0.000 + 0.800 + + + 0.800 + 0.800 + 0.800 + 0.750 + + + 0.800 + 0.500 + 0.300 + 0.750 + BG_Default.png diff --git a/Output/Themes/Vocaluxe 2024/05.xml b/Output/Themes/Vocaluxe 2024/05.xml index e28a4749..09239155 100644 --- a/Output/Themes/Vocaluxe 2024/05.xml +++ b/Output/Themes/Vocaluxe 2024/05.xml @@ -308,6 +308,24 @@ 1.000 0.900 + + 1.000 + 0.800 + 0.000 + 0.800 + + + 0.800 + 0.800 + 0.800 + 0.750 + + + 0.800 + 0.500 + 0.300 + 0.750 + BG_Default.png diff --git a/Output/Themes/Vocaluxe 2024/06.xml b/Output/Themes/Vocaluxe 2024/06.xml index 0e75d9dc..6f39e659 100644 --- a/Output/Themes/Vocaluxe 2024/06.xml +++ b/Output/Themes/Vocaluxe 2024/06.xml @@ -308,6 +308,24 @@ 1.000 0.900 + + 1.000 + 0.800 + 0.000 + 0.800 + + + 0.800 + 0.800 + 0.800 + 0.750 + + + 0.800 + 0.500 + 0.300 + 0.750 + BG_Default.png diff --git a/Output/Themes/Vocaluxe 2024/Screens/ScreenHighscore.xml b/Output/Themes/Vocaluxe 2024/Screens/ScreenHighscore.xml index eafe8848..adf7fe4d 100644 --- a/Output/Themes/Vocaluxe 2024/Screens/ScreenHighscore.xml +++ b/Output/Themes/Vocaluxe 2024/Screens/ScreenHighscore.xml @@ -2,7 +2,7 @@ ScreenHighscore - 2 + 3 @@ -25,6 +25,39 @@ 0 + + + + + 120 + 155 + 1620 + 52.5 + 0 + + + + + + + 120 + 245 + 1620 + 52.5 + 0 + + + + + + + 120 + 335 + 1620 + 52.5 + 0 + + @@ -72,7 +105,7 @@ 180 154.5 - 0 + -2 52.5 0 @@ -85,8 +118,8 @@ 180 - 240 - 0 + 244.5 + -2 52.5 0 @@ -100,7 +133,7 @@ 180 334.5 - 0 + -2 52.5 0 @@ -212,7 +245,7 @@ 300 154.5 - 0 + -2 52.5 0 @@ -226,7 +259,7 @@ 300 244.5 - 0 + -2 52.5 0 @@ -240,7 +273,7 @@ 300 334.5 - 0 + -2 52.5 0 @@ -352,7 +385,7 @@ 1200 154.5 - 0 + -2 52.5 0 @@ -366,7 +399,7 @@ 1200 244.5 - 0 + -2 52.5 0 @@ -380,7 +413,7 @@ 1200 334.5 - 0 + -2 52.5 0 @@ -492,7 +525,7 @@ 1500 154.5 - 0 + -2 52.5 0 @@ -506,7 +539,7 @@ 1500 244.5 - 0 + -2 52.5 0 @@ -520,7 +553,7 @@ 1500 334.5 - 0 + -2 52.5 0 @@ -646,7 +679,7 @@ 150 1620 52.5 - 1 + -1 Star @@ -660,7 +693,7 @@ 240 1620 52.5 - 1 + -1 Star @@ -674,7 +707,7 @@ 330 1620 52.5 - 1 + -1 Star diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs index d238a016..1ba9c635 100644 --- a/Vocaluxe/Screens/CScreenHighscore.cs +++ b/Vocaluxe/Screens/CScreenHighscore.cs @@ -33,7 +33,7 @@ namespace Vocaluxe.Screens // Version number for theme files. Increment it, if you've changed something on the theme files! protected override int _ScreenVersion { - get { return 2; } + get { return 3; } } private const int _NumEntrys = 10; @@ -106,6 +106,7 @@ namespace Vocaluxe.Screens for (int i = 0; i < _NumEntrys; i++) _ParticleEffectNew[i] = "ParticleEffectNew" + (i + 1); + _ThemeStatics = new string[] { "StaticTop1Bar", "StaticTop2Bar", "StaticTop3Bar" }; _ThemeTexts = texts.ToArray(); _ThemeParticleEffects = _ParticleEffectNew; @@ -175,6 +176,11 @@ namespace Vocaluxe.Screens public override bool UpdateGame() { + int numScores = _Scores[_Round].Count; + _Statics["StaticTop1Bar"].Visible = (numScores >= 1); + _Statics["StaticTop2Bar"].Visible = (numScores >= 2); + _Statics["StaticTop3Bar"].Visible = (numScores >= 3); + for (int p = 0; p < _NumEntrys; p++) { if (_Pos + p < _Scores[_Round].Count)