Better display for mod icons, display mod icons on song select, fix a bug where nameplate text didn't appear, add DLB cover image

TJAPlayer3/Stages/01.StartUp/TextureLoader.cs

@@ -771,6 +771,15 @@ namespace TJAPlayer3
                 HiSp[i] = TxC(GAME + MODICONS + @"HS\" + i.ToString() + @".png");
             }
 
+            Mod_Timing = new CTexture[5];
+            for (int i = 0; i < Mod_Timing.Length; i++)
+            {
+                Mod_Timing[i] = TxC(GAME + MODICONS + @"Timing\" + i.ToString() + @".png");
+            }
+
+            Mod_Auto = TxC(GAME + MODICONS + @"Auto.png");
+            Mod_None = TxC(GAME + MODICONS + @"None.png");
+
             #endregion
 
             #endregion
@@ -1663,7 +1672,10 @@ namespace TJAPlayer3
 
         #region [21_ModIcons]
 
-        public CTexture[] HiSp;
+        public CTexture[]   Mod_Timing,
+            HiSp;
+        public CTexture     Mod_None,
+            Mod_Auto;
 
         #endregion
 

TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs

@@ -435,6 +435,7 @@ namespace TJAPlayer3
 
                 #region[ 下部テキスト ]
 
+                /*
                 if (TJAPlayer3.Tx.SongSelect_Auto != null)
                 {
                     if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay)
@@ -446,6 +447,17 @@ namespace TJAPlayer3
                         TJAPlayer3.Tx.SongSelect_Auto.t2D描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.SongSelect_Auto_X[1], TJAPlayer3.Skin.SongSelect_Auto_Y[1]);
                     }
                 }
+                */
+
+                for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
+                {
+                    ModIcons.tDisplayModsMenu(40 + i * 980, 672, i);
+                }
+
+                
+
+
+
                 if (TJAPlayer3.ConfigIni.bTokkunMode)
                     TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, "GAME: TRAINING MODE");
                 if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー)

TJAPlayer3/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs

@@ -236,7 +236,7 @@ namespace TJAPlayer3
                 //        this.txオプションパネル_特殊.t2D描画( CDTXMania.app.Device, 0, 300, new Rectangle( 0, 44, 162, 44 ) );
                 //}
 
-                ModIcons.tDisplayMods(114, 236 + i * 190, TJAPlayer3.GetActualPlayer(i));
+                ModIcons.tDisplayMods(80, 236 + i * 190, i);
 
                 if (TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stage選曲.n確定された曲の難易度[i]] != null)
                 {

TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs

@@ -10,7 +10,37 @@ namespace TJAPlayer3
     {
         static public void tDisplayMods(int x, int y, int player)
         {
-            tDisplayHSIcon(x, y, player);
+            // +30 x/y
+            int actual = TJAPlayer3.GetActualPlayer(player);
+
+            tDisplayHSIcon(x, y, actual); // 1st icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 30, y, player); // 2nd icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 60, y, player); // 3rd icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 90, y, player); // 4th icon
+            PLACEHOLDER_tDisplayNoneIcon(x, y + 30, player); // 5th icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 30, y + 30, player); // 6th icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 60, y + 30, player); // 7th icon
+            tDisplayAutoIcon(x + 90, y + 30, player); // 8th icon
+        }
+
+        static public void tDisplayModsMenu(int x, int y, int player)
+        {
+            if (TJAPlayer3.Tx.Mod_None != null)
+                TJAPlayer3.Tx.Mod_None.Opacity = 0;
+
+            int actual = TJAPlayer3.GetActualPlayer(player);
+
+            tDisplayHSIcon(x, y, actual); // 1st icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 30, y, player); // 2nd icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 60, y, player); // 3rd icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 90, y, player); // 4th icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 120, y, player); // 5th icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 150, y, player); // 6th icon
+            PLACEHOLDER_tDisplayNoneIcon(x + 180, y, player); // 7th icon
+            tDisplayAutoIcon(x + 210, y, player); // 8th icon
+
+            if (TJAPlayer3.Tx.Mod_None != null)
+                TJAPlayer3.Tx.Mod_None.Opacity = 255;
         }
 
         static private void tDisplayHSIcon(int x, int y, int player)
@@ -20,7 +50,7 @@ namespace TJAPlayer3
 
             for (int j = 0; j < _vals.Length; j++)
             {
-                if (TJAPlayer3.ConfigIni.nScrollSpeed[player] >= _vals[j])
+                if (TJAPlayer3.ConfigIni.nScrollSpeed[player] >= _vals[j] && j < TJAPlayer3.Tx.HiSp.Length)
                     _i = j;
                 else
                     break;
@@ -28,7 +58,29 @@ namespace TJAPlayer3
 
             if (_i >= 0)
                 TJAPlayer3.Tx.HiSp[_i]?.t2D描画(TJAPlayer3.app.Device, x, y);
-        } 
+            else
+                TJAPlayer3.Tx.Mod_None?.t2D描画(TJAPlayer3.app.Device, x, y);
+        }
+
+        static private void tDisplayAutoIcon(int x, int y, int player)
+        {
+            bool _displayed = false;
+
+            if (player == 0 && TJAPlayer3.ConfigIni.b太鼓パートAutoPlay)
+                _displayed = true;
+            else if (player == 1 && TJAPlayer3.ConfigIni.b太鼓パートAutoPlay2P)
+                _displayed = true;
+
+            if (_displayed == true)
+                TJAPlayer3.Tx.Mod_Auto?.t2D描画(TJAPlayer3.app.Device, x, y);
+            else
+                TJAPlayer3.Tx.Mod_None?.t2D描画(TJAPlayer3.app.Device, x, y);
+        }
+
+        static private void PLACEHOLDER_tDisplayNoneIcon(int x, int y, int player)
+        {
+            TJAPlayer3.Tx.Mod_None?.t2D描画(TJAPlayer3.app.Device, x, y);
+        }
 
     }
 }

TJAPlayer3/Stages/CNamePlate.cs

@@ -66,32 +66,19 @@ namespace TJAPlayer3
                 dan = TJAPlayer3.NamePlateConfig.data.Dan[player];
             }
 
-            /*
-            using (var tex = pfName.DrawPrivateFont(name, Color.White, Color.Black, 25))
-                txName[player] = TJAPlayer3.tテクスチャの生成(tex);
-
-            using (var tex = pfTitle.DrawPrivateFont(title, Color.Black, Color.Empty))
-                txTitle[player] = TJAPlayer3.tテクスチャの生成(tex);
-
-            using (var tex = pfdan.DrawPrivateFont(dan, Color.White, Color.Black, 22))
-                txdan[player] = TJAPlayer3.tテクスチャの生成(tex);
-            */
-
             txTitle[player] = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(new TitleTextureKey(title, pfTitle, Color.Black, Color.Empty, 1000));
             txName[player] = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(new TitleTextureKey(name, pfName, Color.White, Color.Black, 1000));
             txdan[player] = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(new TitleTextureKey(dan, pfdan, Color.White, Color.Black, 1000));
-
         }
 
 
         public void tNamePlateDraw(int x, int y, int player, bool bTitle = false, int Opacity = 255)
         {
-
-            tNamePlateRefreshTitles(player);
-
             int basePlayer = player;
             player = TJAPlayer3.GetActualPlayer(player);
 
+            tNamePlateRefreshTitles(player);
+
             ctNamePlateEffect.t進行Loop();
             ctAnimatedNamePlateTitle.t進行Loop();
 

Test/Songs/08 OpenTaiko Original/DONT_LOOK_BACK/DON'T LOOK BACK.tja

@@ -5,6 +5,7 @@ WAVE:DON'T LOOK BACK.ogg
 OFFSET:-0.0095
 DEMOSTART:44.082
 SCOREMODE:2
+PREIMAGE:DLB.png
 MAKER:bol
 
 COURSE:Edit

Test/System/SimpleStyle/SkinConfig.ini

@@ -1,7 +1,7 @@
 ;スキンの情報設定
 ;Skin information
 Name=OpenSkin
-Version=0.5.3
+Version=0.5.3.2
 Creator=0AuBSQ
 
 Game_Score_Size=26,34
@@ -18,7 +18,7 @@ SongSelect_Auto_Y=642,642
 
 Game_Notes_Anime=1
 
-Game_CourseSymbol_X=30,30
+Game_CourseSymbol_X=-4,-4
 
 Game_CourseSymbol_Y=233,426