diff --git a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs index 20361a58..e33bc407 100644 --- a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs +++ b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs @@ -783,6 +783,10 @@ namespace TJAPlayer3 Mod_SongSpeed[i] = TxC(GAME + MODICONS + @"SongSpeed\" + i.ToString() + @".png"); } + Mod_Doron = TxC(GAME + MODICONS + @"Doron.png"); + Mod_Mirror = TxC(GAME + MODICONS + @"Mirror.png"); + Mod_Super = TxC(GAME + MODICONS + @"Super.png"); + Mod_Random = TxC(GAME + MODICONS + @"Random.png"); Mod_Auto = TxC(GAME + MODICONS + @"Auto.png"); Mod_None = TxC(GAME + MODICONS + @"None.png"); @@ -1682,6 +1686,10 @@ namespace TJAPlayer3 Mod_SongSpeed, HiSp; public CTexture Mod_None, + Mod_Doron, + Mod_Mirror, + Mod_Random, + Mod_Super, Mod_Auto; #endregion diff --git a/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs b/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs index 13e4e3a3..0ef8a713 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs @@ -14,10 +14,10 @@ namespace TJAPlayer3 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 + tDisplayDoronIcon(x + 30, y, player); // 2nd icon + tDisplayMirrorIcon(x + 60, y, player); // 3rd icon + tDisplayRandomIcon(x + 90, y, player); // 4th icon + tDisplaySuperIcon(x, y + 30, player); // 5th icon tDisplayTimingIcon(x + 30, y + 30, actual); // 6th icon tDisplaySongSpeedIcon(x + 60, y + 30, player); // 7th icon tDisplayAutoIcon(x + 90, y + 30, player); // 8th icon @@ -31,10 +31,10 @@ namespace TJAPlayer3 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 + tDisplayDoronIcon(x + 30, y, player); // 2nd icon + tDisplayMirrorIcon(x + 60, y, player); // 3rd icon + tDisplayRandomIcon(x + 90, y, player); // 4th icon + tDisplaySuperIcon(x + 120, y, player); // 5th icon tDisplayTimingIcon(x + 150, y, actual); // 6th icon tDisplaySongSpeedIcon(x + 180, y, player); // 7th icon tDisplayAutoIcon(x + 210, y, player); // 8th icon @@ -76,6 +76,38 @@ namespace TJAPlayer3 else TJAPlayer3.Tx.Mod_None?.t2D描画(TJAPlayer3.app.Device, x, y); } + + static private void tDisplayDoronIcon(int x, int y, int player) + { + if (TJAPlayer3.ConfigIni.eSTEALTH == Eステルスモード.DORON) + TJAPlayer3.Tx.Mod_Doron.t2D描画(TJAPlayer3.app.Device, x, y); + else + TJAPlayer3.Tx.Mod_None?.t2D描画(TJAPlayer3.app.Device, x, y); + } + + static private void tDisplayMirrorIcon(int x, int y, int player) + { + if (TJAPlayer3.ConfigIni.eRandom.Taiko == Eランダムモード.MIRROR) + TJAPlayer3.Tx.Mod_Mirror.t2D描画(TJAPlayer3.app.Device, x, y); + else + TJAPlayer3.Tx.Mod_None?.t2D描画(TJAPlayer3.app.Device, x, y); + } + + static private void tDisplayRandomIcon(int x, int y, int player) + { + if (TJAPlayer3.ConfigIni.eRandom.Taiko == Eランダムモード.RANDOM) + TJAPlayer3.Tx.Mod_Random.t2D描画(TJAPlayer3.app.Device, x, y); + else + TJAPlayer3.Tx.Mod_None?.t2D描画(TJAPlayer3.app.Device, x, y); + } + + static private void tDisplaySuperIcon(int x, int y, int player) + { + if (TJAPlayer3.ConfigIni.eRandom.Taiko == Eランダムモード.SUPERRANDOM) + TJAPlayer3.Tx.Mod_Super.t2D描画(TJAPlayer3.app.Device, x, y); + else + TJAPlayer3.Tx.Mod_None?.t2D描画(TJAPlayer3.app.Device, x, y); + } static private void tDisplaySongSpeedIcon(int x, int y, int player) { diff --git a/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Doron.png b/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Doron.png new file mode 100644 index 00000000..b10b6e17 Binary files /dev/null and b/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Doron.png differ diff --git a/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Mirror.png b/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Mirror.png new file mode 100644 index 00000000..2dec5614 Binary files /dev/null and b/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Mirror.png differ diff --git a/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Random.png b/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Random.png new file mode 100644 index 00000000..1b6f47ca Binary files /dev/null and b/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Random.png differ diff --git a/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Super.png b/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Super.png new file mode 100644 index 00000000..0f8a4ab4 Binary files /dev/null and b/Test/System/SimpleStyle/Graphics/5_Game/21_ModIcons/Super.png differ