From e7484bbf5aa1ae39f2e77b4fc9f8e3ad4bf76933 Mon Sep 17 00:00:00 2001
From: Takkkom <76614532+Takkkom@users.noreply.github.com>
Date: Tue, 3 Oct 2023 22:43:49 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=80=E3=83=B3=E3=82=B5=E3=83=BC=E3=81=AE?=
 =?UTF-8?q?=E3=83=97=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E3=81=AB=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=20(#501)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../07.Game/Taiko/CAct演奏DrumsDancer.cs      | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsDancer.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsDancer.cs
index 90a6241e..33caaf64 100644
--- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsDancer.cs
+++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsDancer.cs
@@ -21,7 +21,50 @@ namespace TJAPlayer3
         public override void Activate()
         {
             //this.ct踊り子モーション = new CCounter();
+
+            string presetSection = "";
+            if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower)
+            {
+            }
+            else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan)
+            {
+                presetSection = "Dan";
+            }
+            else if (TJAPlayer3.ConfigIni.bAIBattleMode)
+            {
+            }
+            else
+            {
+                presetSection = "Regular";
+            }
+
+            object _ps = null;
+
+            switch (presetSection)
+            {
+                case "Regular":
+                    _ps = TJAPlayer3.Skin.Game_SkinScenes.Regular;
+                    break;
+                case "Dan":
+                    _ps = TJAPlayer3.Skin.Game_SkinScenes.Dan;
+                    break;
+                default:
+                    break;
+            };
             
+            var preset = (_ps != null 
+                    && TJAPlayer3.stage選曲.r確定された曲.strScenePreset != null 
+                    && ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(TJAPlayer3.stage選曲.r確定された曲.strScenePreset)) 
+                ? ((Dictionary<string,DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.stage選曲.r確定された曲.strScenePreset] 
+                : null;
+
+            if (_ps != null
+                    && TJAPlayer3.DTX.scenePreset != null
+                    && ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(TJAPlayer3.DTX.scenePreset)) // If currently selected song has valid SCENEPRESET metadata within TJA
+            {
+                preset = ((Dictionary<string, DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.DTX.scenePreset];
+            }
+
             Random random = new Random();
             Dancer = new CTexture[5][];
 
@@ -31,7 +74,11 @@ namespace TJAPlayer3
                 var dirs = System.IO.Directory.GetDirectories($@"{dancerOrigindir}");
                 if (dirs.Length > 0)
                 {
-                    var path = dirs[random.Next(0, dirs.Length)];
+                    var _presetPath = (preset != null) ? $@"{dancerOrigindir}" + preset.DancerSet : "";
+                    var path = (preset != null && System.IO.Directory.Exists(_presetPath)) 
+                        ?  _presetPath
+                        : dirs[random.Next(0, dirs.Length)];
+
                     LoadDancerConifg(path);
 
                     nDancerPtn = TJAPlayer3.t連番画像の枚数を数える($@"{path}{Path.DirectorySeparatorChar}1{Path.DirectorySeparatorChar}");