From eeabcf2876e5d5b435a8a8e31d2fd48e6eda86ca Mon Sep 17 00:00:00 2001
From: 0aubsq <0aubsq@gmail.com>
Date: Fri, 24 Dec 2021 11:19:34 +0100
Subject: [PATCH] Difficulty icons for hiscore plate, display hiscore plate
 only if the currently selected box is a song

---
 TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs b/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs
index 53e50c72..76e76a7c 100644
--- a/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs
+++ b/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs
@@ -912,14 +912,9 @@ namespace TJAPlayer3
                         tBoardNumberDraw(this.ptBoardNumber[10].X - 10 + i * 1140, this.ptBoardNumber[10].Y, TJAPlayer3.NamePlateConfig.data.Medals[p].ToString());
 
                     #region [HiScore plate]
-
-                    int posx = (i == 1) ? 1280 - this.ptBoardNumber[11].X : this.ptBoardNumber[11].X;
-
-                    TJAPlayer3.Tx.SongSelect_High_Score.t2D中心基準描画(TJAPlayer3.app.Device, posx, this.ptBoardNumber[11].Y);
-
+ 
                     var song = this.r現在選択中の曲;
-                    int displayedScore = 0;
-
+                    
                     if (song != null && song.eノード種別 == C曲リストノード.Eノード種別.SCORE)
                     {
                         var closest = this.act曲リスト.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song);
@@ -927,17 +922,30 @@ namespace TJAPlayer3
 
                         if (score != null)
                         {
-                            if (this.n現在選択中の曲の難易度 > (int)Difficulty.Edit)
-                                displayedScore = score.GPInfo[p].nHighScore[0];
-                            else if (currentPads[i] <= (int)Difficulty.Edit)
-                                displayedScore = score.GPInfo[p].nHighScore[currentPads[i]];
-                            else
-                                displayedScore = score.GPInfo[p].nHighScore[closest];
-                        }
-                        
-                    }
+                            int posx = (i == 1) ? 1280 - this.ptBoardNumber[11].X : this.ptBoardNumber[11].X;
+                            int displayedScore = 0;
+                            int table = 0;
+                            
+                            TJAPlayer3.Tx.SongSelect_High_Score.t2D中心基準描画(TJAPlayer3.app.Device, posx, this.ptBoardNumber[11].Y);
 
-                    tBoardNumberDraw(posx - 10, this.ptBoardNumber[11].Y + 6, displayedScore.ToString());
+                            if (this.n現在選択中の曲の難易度 > (int)Difficulty.Edit)
+                                table = 0;
+                            else if (currentPads[i] <= (int)Difficulty.Edit)
+                                table = currentPads[i];
+                            else
+                                table = closest;
+
+                            displayedScore = score.GPInfo[p].nHighScore[table];
+
+                            TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.app.Device, 
+                                posx - 78, 
+                                this.ptBoardNumber[11].Y + 2,
+                                new Rectangle(table * 53, 0, 53, 53));
+
+                            tBoardNumberDraw(posx - 10, this.ptBoardNumber[11].Y + 6, displayedScore.ToString());
+                        }
+
+                    }
 
                     #endregion
                 }
@@ -1105,7 +1113,7 @@ namespace TJAPlayer3
         }
 
         private Point[] ptBoardNumber =
-            { new Point(72, 283), new Point(135, 283), new Point(200, 283), new Point(72, 258), new Point(135, 258), new Point(200, 258), new Point(200, 233), new Point(72, 311), new Point(135, 311), new Point(200, 311), new Point(84, 360), new Point(120, 412) };
+            { new Point(72, 283), new Point(135, 283), new Point(200, 283), new Point(72, 258), new Point(135, 258), new Point(200, 258), new Point(200, 233), new Point(72, 311), new Point(135, 311), new Point(200, 311), new Point(84, 360), new Point(124, 416) };
 
         public void tBoardNumberDraw(int x, int y, string str)
         {