diff --git a/FDK/src/00.Common/CJudgeTextEncoding.cs b/FDK/src/00.Common/CJudgeTextEncoding.cs index 5d8e9ab4..f100c8bf 100644 --- a/FDK/src/00.Common/CJudgeTextEncoding.cs +++ b/FDK/src/00.Common/CJudgeTextEncoding.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Text; -namespace TJAPlayer3 { +namespace OpenTaiko { public class CJudgeTextEncoding { /// /// Hnc8様のReadJEncを使用して文字コードの判別をする。 diff --git a/OpenTaiko/src/Animations/Animator.cs b/OpenTaiko/src/Animations/Animator.cs index e41c462a..7afba537 100644 --- a/OpenTaiko/src/Animations/Animator.cs +++ b/OpenTaiko/src/Animations/Animator.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3.Animations { +namespace OpenTaiko.Animations { class Animator : IAnimatable { public Animator(int startValue, int endValue, int tickInterval, bool isLoop) { Type = CounterType.Normal; @@ -22,7 +22,7 @@ namespace TJAPlayer3.Animations { if (Counter == null) throw new NullReferenceException(); switch (Type) { case CounterType.Normal: - Counter.Start((int)StartValue, (int)EndValue, (int)TickInterval, TJAPlayer3.Timer); + Counter.Start((int)StartValue, (int)EndValue, (int)TickInterval, OpenTaiko.Timer); break; case CounterType.Double: Counter.Start((double)StartValue, (double)EndValue, (double)TickInterval, SoundManager.PlayTimer); diff --git a/OpenTaiko/src/Animations/EaseIn.cs b/OpenTaiko/src/Animations/EaseIn.cs index 1be248f3..d337948d 100644 --- a/OpenTaiko/src/Animations/EaseIn.cs +++ b/OpenTaiko/src/Animations/EaseIn.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.Animations { +namespace OpenTaiko.Animations { /// /// イーズインを行うクラス。 /// diff --git a/OpenTaiko/src/Animations/EaseInOut.cs b/OpenTaiko/src/Animations/EaseInOut.cs index 58479a1d..d14ed146 100644 --- a/OpenTaiko/src/Animations/EaseInOut.cs +++ b/OpenTaiko/src/Animations/EaseInOut.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.Animations { +namespace OpenTaiko.Animations { /// /// イーズイン・アウトを行うクラス。 /// diff --git a/OpenTaiko/src/Animations/EaseOut.cs b/OpenTaiko/src/Animations/EaseOut.cs index 150dd619..ca968aee 100644 --- a/OpenTaiko/src/Animations/EaseOut.cs +++ b/OpenTaiko/src/Animations/EaseOut.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.Animations { +namespace OpenTaiko.Animations { /// /// イーズアウトを行うクラス。 /// diff --git a/OpenTaiko/src/Animations/FadeIn.cs b/OpenTaiko/src/Animations/FadeIn.cs index 51896e5a..4ec94e64 100644 --- a/OpenTaiko/src/Animations/FadeIn.cs +++ b/OpenTaiko/src/Animations/FadeIn.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.Animations { +namespace OpenTaiko.Animations { /// /// フェードインを行うクラス。 /// diff --git a/OpenTaiko/src/Animations/FadeOut.cs b/OpenTaiko/src/Animations/FadeOut.cs index d6a649af..f793424e 100644 --- a/OpenTaiko/src/Animations/FadeOut.cs +++ b/OpenTaiko/src/Animations/FadeOut.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.Animations { +namespace OpenTaiko.Animations { /// /// フェードアウトを行うクラス。 /// diff --git a/OpenTaiko/src/Animations/IAnimatable.cs b/OpenTaiko/src/Animations/IAnimatable.cs index d5a6b05c..db9fba77 100644 --- a/OpenTaiko/src/Animations/IAnimatable.cs +++ b/OpenTaiko/src/Animations/IAnimatable.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.Animations { +namespace OpenTaiko.Animations { /// /// アニメーション インターフェイス。 /// diff --git a/OpenTaiko/src/Animations/Linear.cs b/OpenTaiko/src/Animations/Linear.cs index 723c12c5..e5332df2 100644 --- a/OpenTaiko/src/Animations/Linear.cs +++ b/OpenTaiko/src/Animations/Linear.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.Animations { +namespace OpenTaiko.Animations { /// /// リニア移動を行うクラス。 /// diff --git a/OpenTaiko/src/Character/CMenuCharacter.cs b/OpenTaiko/src/Character/CMenuCharacter.cs index f2c9b5e5..cb6a9e2a 100644 --- a/OpenTaiko/src/Character/CMenuCharacter.cs +++ b/OpenTaiko/src/Character/CMenuCharacter.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CMenuCharacter { private static CCounter[] ctCharacterNormal = new CCounter[5] { new CCounter(), new CCounter(), new CCounter(), new CCounter(), new CCounter() }; private static CCounter[] ctCharacterSelect = new CCounter[5] { new CCounter(), new CCounter(), new CCounter(), new CCounter(), new CCounter() }; @@ -22,37 +22,37 @@ namespace TJAPlayer3 { private static bool _usesSubstituteTexture(int player, ECharacterAnimation eca) { - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; - if (_charaId >= 0 && _charaId < TJAPlayer3.Skin.Characters_Ptn) { + if (_charaId >= 0 && _charaId < OpenTaiko.Skin.Characters_Ptn) { switch (eca) { case (ECharacterAnimation.NORMAL): { - if (TJAPlayer3.Tx.Characters_Menu_Loop[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Menu_Loop[_charaId].Length > 0) return false; break; } case (ECharacterAnimation.START): { - if (TJAPlayer3.Tx.Characters_Menu_Start[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Menu_Start[_charaId].Length > 0) return false; break; } case (ECharacterAnimation.SELECT): { - if (TJAPlayer3.Tx.Characters_Menu_Select[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Menu_Select[_charaId].Length > 0) return false; break; } case (ECharacterAnimation.WAIT): { - if (TJAPlayer3.Tx.Characters_Menu_Wait[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Menu_Wait[_charaId].Length > 0) return false; break; } case (ECharacterAnimation.ENTRY): { - if (TJAPlayer3.Tx.Characters_Title_Entry[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Title_Entry[_charaId].Length > 0) return false; break; } case (ECharacterAnimation.ENTRY_NORMAL): { - if (TJAPlayer3.Tx.Characters_Title_Normal[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Title_Normal[_charaId].Length > 0) return false; break; } @@ -63,52 +63,52 @@ namespace TJAPlayer3 { } public static CTexture[] _getReferenceArray(int player, ECharacterAnimation eca) { - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; - if (_charaId >= 0 && _charaId < TJAPlayer3.Skin.Characters_Ptn) { + if (_charaId >= 0 && _charaId < OpenTaiko.Skin.Characters_Ptn) { switch (eca) { case (ECharacterAnimation.NORMAL): { - if (TJAPlayer3.Tx.Characters_Menu_Loop[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Menu_Loop[_charaId]; - if (TJAPlayer3.Tx.Characters_Normal[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Normal[_charaId]; + if (OpenTaiko.Tx.Characters_Menu_Loop[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Menu_Loop[_charaId]; + if (OpenTaiko.Tx.Characters_Normal[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Normal[_charaId]; break; } case (ECharacterAnimation.START): { - if (TJAPlayer3.Tx.Characters_Menu_Start[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Menu_Start[_charaId]; - if (TJAPlayer3.Tx.Characters_10Combo[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_10Combo[_charaId]; + if (OpenTaiko.Tx.Characters_Menu_Start[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Menu_Start[_charaId]; + if (OpenTaiko.Tx.Characters_10Combo[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_10Combo[_charaId]; break; } case (ECharacterAnimation.SELECT): { - if (TJAPlayer3.Tx.Characters_Menu_Select[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Menu_Select[_charaId]; - if (TJAPlayer3.Tx.Characters_10Combo[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_10Combo[_charaId]; + if (OpenTaiko.Tx.Characters_Menu_Select[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Menu_Select[_charaId]; + if (OpenTaiko.Tx.Characters_10Combo[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_10Combo[_charaId]; break; } case (ECharacterAnimation.WAIT): { - if (TJAPlayer3.Tx.Characters_Menu_Wait[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Menu_Wait[_charaId]; - if (TJAPlayer3.Tx.Characters_Menu_Loop[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Menu_Loop[_charaId]; - if (TJAPlayer3.Tx.Characters_GoGoTime[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_GoGoTime[_charaId]; + if (OpenTaiko.Tx.Characters_Menu_Wait[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Menu_Wait[_charaId]; + if (OpenTaiko.Tx.Characters_Menu_Loop[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Menu_Loop[_charaId]; + if (OpenTaiko.Tx.Characters_GoGoTime[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_GoGoTime[_charaId]; break; } case (ECharacterAnimation.ENTRY): { - if (TJAPlayer3.Tx.Characters_Title_Entry[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Title_Entry[_charaId]; - if (TJAPlayer3.Tx.Characters_10Combo[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_10Combo[_charaId]; + if (OpenTaiko.Tx.Characters_Title_Entry[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Title_Entry[_charaId]; + if (OpenTaiko.Tx.Characters_10Combo[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_10Combo[_charaId]; break; } case (ECharacterAnimation.ENTRY_NORMAL): { - if (TJAPlayer3.Tx.Characters_Title_Normal[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Title_Normal[_charaId]; - if (TJAPlayer3.Tx.Characters_Normal[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Normal[_charaId]; + if (OpenTaiko.Tx.Characters_Title_Normal[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Title_Normal[_charaId]; + if (OpenTaiko.Tx.Characters_Normal[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Normal[_charaId]; break; } } @@ -143,26 +143,26 @@ namespace TJAPlayer3 { } public static int _getReferenceAnimationDuration(int player, ECharacterAnimation eca) { - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; switch (eca) { case (ECharacterAnimation.NORMAL): { - return TJAPlayer3.Skin.Characters_Menu_Loop_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Menu_Loop_AnimationDuration[_charaId]; } case (ECharacterAnimation.START): { - return TJAPlayer3.Skin.Characters_Menu_Start_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Menu_Start_AnimationDuration[_charaId]; } case (ECharacterAnimation.SELECT): { - return TJAPlayer3.Skin.Characters_Menu_Select_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Menu_Select_AnimationDuration[_charaId]; } case (ECharacterAnimation.WAIT): { - return TJAPlayer3.Skin.Characters_Menu_Wait_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Menu_Wait_AnimationDuration[_charaId]; } case (ECharacterAnimation.ENTRY): { - return TJAPlayer3.Skin.Characters_Title_Entry_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Title_Entry_AnimationDuration[_charaId]; } case (ECharacterAnimation.ENTRY_NORMAL): { - return TJAPlayer3.Skin.Characters_Title_Normal_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Title_Normal_AnimationDuration[_charaId]; } } return 1000; @@ -211,7 +211,7 @@ namespace TJAPlayer3 { int _animeref = _getReferenceAnimationDuration(player, eca); if (_ref != null && _ref.Length > 0 && _ctref != null) { - _ctref[player] = new CCounter(0, _ref.Length - 1, _animeref / (float)_ref.Length, TJAPlayer3.Timer); + _ctref[player] = new CCounter(0, _ref.Length - 1, _animeref / (float)_ref.Length, OpenTaiko.Timer); } } @@ -222,7 +222,7 @@ namespace TJAPlayer3 { } public static void tMenuDisplayCharacter(int player, int x, int y, ECharacterAnimation eca, int opacity = 255) { - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; CTexture[] _ref = _getReferenceArray(player, eca); CCounter[] _ctref = _getReferenceCounter(eca); bool _substitute = _usesSubstituteTexture(player, eca); @@ -243,8 +243,8 @@ namespace TJAPlayer3 { _tex.Opacity = opacity; - float resolutionRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][0]; - float resolutionRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][1]; + float resolutionRatioX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[_charaId][0]; + float resolutionRatioY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[_charaId][1]; //float _x = (x + (150.0f * (TJAPlayer3.Skin.Characters_Resolution[_charaId][0] / 1280.0f))) * resolutionRatioX; //float _y = (y + (((_substitute == true) ? 290 : _ref[_ctref[player].n現在の値].szテクスチャサイズ.Height)) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][1] / 720.0f)) * resolutionRatioY; diff --git a/OpenTaiko/src/Character/CResultCharacter.cs b/OpenTaiko/src/Character/CResultCharacter.cs index 9f09c528..e0b39260 100644 --- a/OpenTaiko/src/Character/CResultCharacter.cs +++ b/OpenTaiko/src/Character/CResultCharacter.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CResultCharacter { private static CCounter[] ctCharacterNormal = new CCounter[5] { new CCounter(), new CCounter(), new CCounter(), new CCounter(), new CCounter() }; private static CCounter[] ctCharacterClear = new CCounter[5] { new CCounter(), new CCounter(), new CCounter(), new CCounter(), new CCounter() }; @@ -33,27 +33,27 @@ namespace TJAPlayer3 { } private static bool _usesSubstituteTexture(int player, ECharacterResult eca) { - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; - if (_charaId >= 0 && _charaId < TJAPlayer3.Skin.Characters_Ptn) { + if (_charaId >= 0 && _charaId < OpenTaiko.Skin.Characters_Ptn) { switch (eca) { case (ECharacterResult.NORMAL): { - if (TJAPlayer3.Tx.Characters_Result_Normal[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Result_Normal[_charaId].Length > 0) return false; break; } case (ECharacterResult.CLEAR): { - if (TJAPlayer3.Tx.Characters_Result_Clear[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Result_Clear[_charaId].Length > 0) return false; break; } case (ECharacterResult.FAILED): { - if (TJAPlayer3.Tx.Characters_Result_Failed[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Result_Failed[_charaId].Length > 0) return false; break; } case (ECharacterResult.FAILED_IN): { - if (TJAPlayer3.Tx.Characters_Result_Failed_In[_charaId].Length > 0) + if (OpenTaiko.Tx.Characters_Result_Failed_In[_charaId].Length > 0) return false; break; } @@ -64,36 +64,36 @@ namespace TJAPlayer3 { } public static CTexture[] _getReferenceArray(int player, ECharacterResult eca) { - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; - if (_charaId >= 0 && _charaId < TJAPlayer3.Skin.Characters_Ptn) { + if (_charaId >= 0 && _charaId < OpenTaiko.Skin.Characters_Ptn) { switch (eca) { case (ECharacterResult.NORMAL): { - if (TJAPlayer3.Tx.Characters_Result_Normal[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Result_Normal[_charaId]; - if (TJAPlayer3.Tx.Characters_Normal[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Normal[_charaId]; + if (OpenTaiko.Tx.Characters_Result_Normal[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Result_Normal[_charaId]; + if (OpenTaiko.Tx.Characters_Normal[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Normal[_charaId]; break; } case (ECharacterResult.CLEAR): { - if (TJAPlayer3.Tx.Characters_Result_Clear[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Result_Clear[_charaId]; - if (TJAPlayer3.Tx.Characters_10Combo[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_10Combo[_charaId]; + if (OpenTaiko.Tx.Characters_Result_Clear[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Result_Clear[_charaId]; + if (OpenTaiko.Tx.Characters_10Combo[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_10Combo[_charaId]; break; } case (ECharacterResult.FAILED): { - if (TJAPlayer3.Tx.Characters_Result_Failed[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Result_Failed[_charaId]; - if (TJAPlayer3.Tx.Characters_Normal[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Normal[_charaId]; + if (OpenTaiko.Tx.Characters_Result_Failed[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Result_Failed[_charaId]; + if (OpenTaiko.Tx.Characters_Normal[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Normal[_charaId]; break; } case (ECharacterResult.FAILED_IN): { - if (TJAPlayer3.Tx.Characters_Result_Failed_In[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Result_Failed_In[_charaId]; - if (TJAPlayer3.Tx.Characters_Normal[_charaId].Length > 0) - return TJAPlayer3.Tx.Characters_Normal[_charaId]; + if (OpenTaiko.Tx.Characters_Result_Failed_In[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Result_Failed_In[_charaId]; + if (OpenTaiko.Tx.Characters_Normal[_charaId].Length > 0) + return OpenTaiko.Tx.Characters_Normal[_charaId]; break; } } @@ -122,20 +122,20 @@ namespace TJAPlayer3 { } public static int _getReferenceAnimationDuration(int player, ECharacterResult eca) { - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; switch (eca) { case (ECharacterResult.NORMAL): { - return TJAPlayer3.Skin.Characters_Result_Normal_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Result_Normal_AnimationDuration[_charaId]; } case (ECharacterResult.CLEAR): { - return TJAPlayer3.Skin.Characters_Result_Clear_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Result_Clear_AnimationDuration[_charaId]; } case (ECharacterResult.FAILED): { - return TJAPlayer3.Skin.Characters_Result_Failed_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Result_Failed_AnimationDuration[_charaId]; } case (ECharacterResult.FAILED_IN): { - return TJAPlayer3.Skin.Characters_Result_Failed_In_AnimationDuration[_charaId]; + return OpenTaiko.Skin.Characters_Result_Failed_In_AnimationDuration[_charaId]; } } return 1000; @@ -174,7 +174,7 @@ namespace TJAPlayer3 { int _animeref = _getReferenceAnimationDuration(player, eca); if (_ref != null && _ref.Length > 0 && _ctref != null) { - _ctref[player] = new CCounter(0, _ref.Length - 1, _animeref / (float)_ref.Length, TJAPlayer3.Timer); + _ctref[player] = new CCounter(0, _ref.Length - 1, _animeref / (float)_ref.Length, OpenTaiko.Timer); } } @@ -185,7 +185,7 @@ namespace TJAPlayer3 { } public static void tMenuDisplayCharacter(int player, int x, int y, ECharacterResult eca, int pos = 0, int opacity = 255) { - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; CTexture[] _ref = _getReferenceArray(player, eca); CCounter[] _ctref = _getReferenceCounter(eca); bool _substitute = _usesSubstituteTexture(player, eca); @@ -205,8 +205,8 @@ namespace TJAPlayer3 { _tex.Opacity = opacity; - float resolutionRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][0]; - float resolutionRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][1]; + float resolutionRatioX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[_charaId][0]; + float resolutionRatioY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[_charaId][1]; //202 //float _x = (x - (((_substitute == true) ? 20 : 40) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][0] / 1280.0f))) * resolutionRatioX; @@ -220,7 +220,7 @@ namespace TJAPlayer3 { _tex.vcScaleRatio.X *= resolutionRatioX; _tex.vcScaleRatio.Y *= resolutionRatioY; - if (pos % 2 == 0 || TJAPlayer3.ConfigIni.nPlayerCount > 2) { + if (pos % 2 == 0 || OpenTaiko.ConfigIni.nPlayerCount > 2) { _tex.t2D拡大率考慮下中心基準描画( _x, _y diff --git a/OpenTaiko/src/Character/PuchiChara.cs b/OpenTaiko/src/Character/PuchiChara.cs index bdda8bdf..a066c868 100644 --- a/OpenTaiko/src/Character/PuchiChara.cs +++ b/OpenTaiko/src/Character/PuchiChara.cs @@ -2,16 +2,16 @@ using Silk.NET.Maths; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { class PuchiChara : CActivity { public PuchiChara() { base.IsDeActivated = true; } public override void Activate() { - Counter = new CCounter(0, TJAPlayer3.Skin.Game_PuchiChara[2] - 1, TJAPlayer3.Skin.Game_PuchiChara_Timer * 0.5f, TJAPlayer3.Timer); - SineCounter = new CCounter(0, 360, TJAPlayer3.Skin.Game_PuchiChara_SineTimer, SoundManager.PlayTimer); - SineCounterIdle = new CCounter(1, 360, (float)TJAPlayer3.Skin.Game_PuchiChara_SineTimer * 2f, TJAPlayer3.Timer); + Counter = new CCounter(0, OpenTaiko.Skin.Game_PuchiChara[2] - 1, OpenTaiko.Skin.Game_PuchiChara_Timer * 0.5f, OpenTaiko.Timer); + SineCounter = new CCounter(0, 360, OpenTaiko.Skin.Game_PuchiChara_SineTimer, SoundManager.PlayTimer); + SineCounterIdle = new CCounter(1, 360, (float)OpenTaiko.Skin.Game_PuchiChara_SineTimer * 2f, OpenTaiko.Timer); this.inGame = false; base.Activate(); } @@ -23,8 +23,8 @@ namespace TJAPlayer3 { } public static int tGetPuchiCharaIndexByName(int p) { - var _pc = TJAPlayer3.SaveFileInstances[p].data.PuchiChara; - var _pcs = TJAPlayer3.Skin.Puchicharas_Name; + var _pc = OpenTaiko.SaveFileInstances[p].data.PuchiChara; + var _pcs = OpenTaiko.Skin.Puchicharas_Name; int puriChar = 0; if (_pcs.Contains(_pc)) puriChar = _pcs.ToList().IndexOf(_pc); @@ -33,8 +33,8 @@ namespace TJAPlayer3 { } public void ChangeBPM(double bpm) { - Counter = new CCounter(0, TJAPlayer3.Skin.Game_PuchiChara[2] - 1, (int)(TJAPlayer3.Skin.Game_PuchiChara_Timer * bpm / TJAPlayer3.Skin.Game_PuchiChara[2]), TJAPlayer3.Timer); - SineCounter = new CCounter(1, 360, TJAPlayer3.Skin.Game_PuchiChara_SineTimer * bpm / 180, SoundManager.PlayTimer); + Counter = new CCounter(0, OpenTaiko.Skin.Game_PuchiChara[2] - 1, (int)(OpenTaiko.Skin.Game_PuchiChara_Timer * bpm / OpenTaiko.Skin.Game_PuchiChara[2]), OpenTaiko.Timer); + SineCounter = new CCounter(1, 360, OpenTaiko.Skin.Game_PuchiChara_SineTimer * bpm / 180, SoundManager.PlayTimer); this.inGame = true; } @@ -50,13 +50,13 @@ namespace TJAPlayer3 { /// 不透明度 /// public int On進行描画(int x, int y, bool isGrowing, int alpha = 255, bool isBalloon = false, int player = 0, float scale = 1.0f) { - if (!TJAPlayer3.ConfigIni.ShowPuchiChara) return base.Draw(); - if (Counter == null || SineCounter == null || TJAPlayer3.Tx.Puchichara == null) return base.Draw(); + if (!OpenTaiko.ConfigIni.ShowPuchiChara) return base.Draw(); + if (Counter == null || SineCounter == null || OpenTaiko.Tx.Puchichara == null) return base.Draw(); Counter.TickLoop(); SineCounter.TickLoopDB(); SineCounterIdle.TickLoop(); - int p = TJAPlayer3.GetActualPlayer(player); + int p = OpenTaiko.GetActualPlayer(player); /* TJAPlayer3.act文字コンソール.tPrint(700, 500, C文字コンソール.Eフォント種別.白, Counter.n現在の値.ToString()); @@ -71,7 +71,7 @@ namespace TJAPlayer3 { // TJAPlayer3.act文字コンソール.tPrint(700, 560, C文字コンソール.Eフォント種別.白, sineY.ToString()); - sineY = Math.Sin(sineY * (Math.PI / 180)) * (TJAPlayer3.Skin.Game_PuchiChara_Sine * (isBalloon ? TJAPlayer3.Skin.Game_PuchiChara_Scale[1] : TJAPlayer3.Skin.Game_PuchiChara_Scale[0])); + sineY = Math.Sin(sineY * (Math.PI / 180)) * (OpenTaiko.Skin.Game_PuchiChara_Sine * (isBalloon ? OpenTaiko.Skin.Game_PuchiChara_Scale[1] : OpenTaiko.Skin.Game_PuchiChara_Scale[0])); // TJAPlayer3.act文字コンソール.tPrint(700, 580, C文字コンソール.Eフォント種別.白, sineY.ToString()); @@ -79,13 +79,13 @@ namespace TJAPlayer3 { int puriChar = PuchiChara.tGetPuchiCharaIndexByName(p); - var chara = TJAPlayer3.Tx.Puchichara[puriChar].tx; + var chara = OpenTaiko.Tx.Puchichara[puriChar].tx; //TJAPlayer3.Tx.PuchiChara[puriChar]; if (chara != null) { - float puchiScale = TJAPlayer3.Skin.Resolution[1] / 720.0f; + float puchiScale = OpenTaiko.Skin.Resolution[1] / 720.0f; - chara.vcScaleRatio = new Vector3D((isBalloon ? TJAPlayer3.Skin.Game_PuchiChara_Scale[1] * puchiScale : TJAPlayer3.Skin.Game_PuchiChara_Scale[0] * puchiScale)); + chara.vcScaleRatio = new Vector3D((isBalloon ? OpenTaiko.Skin.Game_PuchiChara_Scale[1] * puchiScale : OpenTaiko.Skin.Game_PuchiChara_Scale[0] * puchiScale)); chara.vcScaleRatio.X *= scale; chara.vcScaleRatio.Y *= scale; chara.Opacity = alpha; @@ -100,7 +100,7 @@ namespace TJAPlayer3 { int adjustedX = x - 32; int adjustedY = y - 32; - chara.t2D拡大率考慮中央基準描画(adjustedX, adjustedY + (int)sineY, new Rectangle((Counter.CurrentValue + 2) * TJAPlayer3.Skin.Game_PuchiChara[0], 0, TJAPlayer3.Skin.Game_PuchiChara[0], TJAPlayer3.Skin.Game_PuchiChara[1])); + chara.t2D拡大率考慮中央基準描画(adjustedX, adjustedY + (int)sineY, new Rectangle((Counter.CurrentValue + 2) * OpenTaiko.Skin.Game_PuchiChara[0], 0, OpenTaiko.Skin.Game_PuchiChara[0], OpenTaiko.Skin.Game_PuchiChara[1])); } return base.Draw(); diff --git a/OpenTaiko/src/Common/BestPlayRecords.cs b/OpenTaiko/src/Common/BestPlayRecords.cs index 88652caa..6475e0c2 100644 --- a/OpenTaiko/src/Common/BestPlayRecords.cs +++ b/OpenTaiko/src/Common/BestPlayRecords.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class BestPlayRecords { public enum EClearStatus { diff --git a/OpenTaiko/src/Common/CConfigIni.cs b/OpenTaiko/src/Common/CConfigIni.cs index 25cf118d..2c1980b7 100644 --- a/OpenTaiko/src/Common/CConfigIni.cs +++ b/OpenTaiko/src/Common/CConfigIni.cs @@ -5,7 +5,7 @@ using System.Text; using FDK; using FDK.ExtensionMethods; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CConfigIni : INotifyPropertyChanged { private const int MinimumKeyboardSoundLevelIncrement = 1; private const int MaximumKeyboardSoundLevelIncrement = 20; @@ -1054,7 +1054,7 @@ namespace TJAPlayer3 { } public bool KeyIsPressed(STKEYASSIGN[] pad) { - return TJAPlayer3.InputManager.Keyboard.KeyPressed(pad.ToList().ConvertAll(key => key.コード)); + return OpenTaiko.InputManager.Keyboard.KeyPressed(pad.ToList().ConvertAll(key => key.コード)); } [StructLayout(LayoutKind.Sequential)] @@ -1890,7 +1890,7 @@ namespace TJAPlayer3 { } } public void t書き出し(string iniファイル名) { - StreamWriter sw = new StreamWriter(iniファイル名, false, Encoding.GetEncoding(TJAPlayer3.sEncType)); + StreamWriter sw = new StreamWriter(iniファイル名, false, Encoding.GetEncoding(OpenTaiko.sEncType)); sw.WriteLine(";-------------------"); #region [ System ] @@ -1900,7 +1900,7 @@ namespace TJAPlayer3 { #region [ Version ] sw.WriteLine("; リリースバージョン"); sw.WriteLine("; Release Version."); - sw.WriteLine("Version={0}", TJAPlayer3.VERSION); + sw.WriteLine("Version={0}", OpenTaiko.VERSION); sw.WriteLine(); #endregion #region [ TJAPath ] @@ -1913,11 +1913,11 @@ namespace TJAPlayer3 { #endregion #region [ スキン関連 ] #region [ Skinパスの絶対パス→相対パス変換 ] - Uri uriRoot = new Uri(System.IO.Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "System" + System.IO.Path.DirectorySeparatorChar)); + Uri uriRoot = new Uri(System.IO.Path.Combine(OpenTaiko.strEXEのあるフォルダ, "System" + System.IO.Path.DirectorySeparatorChar)); if (strSystemSkinSubfolderFullName != null && strSystemSkinSubfolderFullName.Length == 0) { // Config.iniが空の状態でDTXManiaをViewerとして起動_終了すると、strSystemSkinSubfolderFullName が空の状態でここに来る。 // → 初期値として Default/ を設定する。 - strSystemSkinSubfolderFullName = System.IO.Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "System" + System.IO.Path.DirectorySeparatorChar + "Default" + System.IO.Path.DirectorySeparatorChar); + strSystemSkinSubfolderFullName = System.IO.Path.Combine(OpenTaiko.strEXEのあるフォルダ, "System" + System.IO.Path.DirectorySeparatorChar + "Default" + System.IO.Path.DirectorySeparatorChar); } Uri uriPath = new Uri(System.IO.Path.Combine(this.strSystemSkinSubfolderFullName, "." + System.IO.Path.DirectorySeparatorChar)); string relPath = uriRoot.MakeRelativeUri(uriPath).ToString(); // 相対パスを取得 @@ -2662,7 +2662,7 @@ namespace TJAPlayer3 { if (this.bConfigIniが存在している) { string str; this.tキーアサインを全部クリアする(); - using (StreamReader reader = new StreamReader(this.ConfigIniファイル名, Encoding.GetEncoding(TJAPlayer3.sEncType))) { + using (StreamReader reader = new StreamReader(this.ConfigIniファイル名, Encoding.GetEncoding(OpenTaiko.sEncType))) { str = reader.ReadToEnd(); } t文字列から読み込み(str); @@ -2751,7 +2751,7 @@ namespace TJAPlayer3 { else if (str3.Equals("SkinPath")) { string absSkinPath = str4; if (!System.IO.Path.IsPathRooted(str4)) { - absSkinPath = System.IO.Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "System"); + absSkinPath = System.IO.Path.Combine(OpenTaiko.strEXEのあるフォルダ, "System"); absSkinPath = System.IO.Path.Combine(absSkinPath, str4); Uri u = new Uri(absSkinPath); absSkinPath = u.AbsolutePath.ToString(); // str4内に相対パスがある場合に備える diff --git a/OpenTaiko/src/Common/CCrypto.cs b/OpenTaiko/src/Common/CCrypto.cs index 884f2b53..6fbcfb7c 100644 --- a/OpenTaiko/src/Common/CCrypto.cs +++ b/OpenTaiko/src/Common/CCrypto.cs @@ -1,7 +1,7 @@ using System.Security.Cryptography; using System.Text; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CCrypto { internal static readonly char[] chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890".ToCharArray(); diff --git a/OpenTaiko/src/Common/CDTXVersion.cs b/OpenTaiko/src/Common/CDTXVersion.cs index 7c4cc11a..70fbf439 100644 --- a/OpenTaiko/src/Common/CDTXVersion.cs +++ b/OpenTaiko/src/Common/CDTXVersion.cs @@ -1,6 +1,6 @@ using System.Text; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// DTXMania のバージョン。 /// 例1："078b" → 整数部=078, 小数部=2000000 ('英字'+'yymmdd') diff --git a/OpenTaiko/src/Common/CHitSounds.cs b/OpenTaiko/src/Common/CHitSounds.cs index 16f1bfc9..4f542158 100644 --- a/OpenTaiko/src/Common/CHitSounds.cs +++ b/OpenTaiko/src/Common/CHitSounds.cs @@ -1,9 +1,9 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class CHitSounds { public CHitSounds(string path) { tLoadFile(path); for (int i = 0; i < 5; i++) { - tReloadHitSounds(TJAPlayer3.ConfigIni.nHitSounds[i], i); + tReloadHitSounds(OpenTaiko.ConfigIni.nHitSounds[i], i); } } diff --git a/OpenTaiko/src/Common/CPad.cs b/OpenTaiko/src/Common/CPad.cs index a9a21009..4d87b9d2 100644 --- a/OpenTaiko/src/Common/CPad.cs +++ b/OpenTaiko/src/Common/CPad.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { public class CPad { // プロパティ diff --git a/OpenTaiko/src/Common/CSavableT.cs b/OpenTaiko/src/Common/CSavableT.cs index 07dfb0ba..34861bb4 100644 --- a/OpenTaiko/src/Common/CSavableT.cs +++ b/OpenTaiko/src/Common/CSavableT.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class CSavableT where T : new() { public virtual string _fn { get; diff --git a/OpenTaiko/src/Common/CSkin.cs b/OpenTaiko/src/Common/CSkin.cs index 8d0448ac..ea9ddff2 100644 --- a/OpenTaiko/src/Common/CSkin.cs +++ b/OpenTaiko/src/Common/CSkin.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Text; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { // グローバル定数 public enum Eシステムサウンド { @@ -182,7 +182,7 @@ namespace TJAPlayer3 { for (int i = 0; i < 2; i++) // 一旦Cloneを止めてASIO対応に専念 { try { - this.rSound[i] = TJAPlayer3.SoundManager?.tCreateSound(CSkin.Path(this.strFileName), _soundGroup); + this.rSound[i] = OpenTaiko.SoundManager?.tCreateSound(CSkin.Path(this.strFileName), _soundGroup); } catch { this.rSound[i] = null; throw; @@ -226,10 +226,10 @@ namespace TJAPlayer3 { } public void tRemoveMixer() { - if (TJAPlayer3.SoundManager.GetCurrentSoundDeviceType() != "DirectShow") { + if (OpenTaiko.SoundManager.GetCurrentSoundDeviceType() != "DirectShow") { for (int i = 0; i < 2; i++) { if (this.rSound[i] != null) { - TJAPlayer3.SoundManager.RemoveMixer(this.rSound[i]); + OpenTaiko.SoundManager.RemoveMixer(this.rSound[i]); } } } @@ -241,7 +241,7 @@ namespace TJAPlayer3 { if (!this.bDisposed) { for (int i = 0; i < 2; i++) { if (this.rSound[i] != null) { - TJAPlayer3.SoundManager.tDisposeSound(this.rSound[i]); + OpenTaiko.SoundManager.tDisposeSound(this.rSound[i]); this.rSound[i] = null; } } @@ -643,7 +643,7 @@ namespace TJAPlayer3 { PrepareReloadSkin(); } private string InitializeSkinPathRoot() { - strSystemSkinRoot = System.IO.Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "System" + System.IO.Path.DirectorySeparatorChar); + strSystemSkinRoot = System.IO.Path.Combine(OpenTaiko.strEXEのあるフォルダ, "System" + System.IO.Path.DirectorySeparatorChar); return strSystemSkinRoot; } @@ -759,7 +759,7 @@ namespace TJAPlayer3 { if (!this[i].bExclusive) // BGM系以外のみ読み込む。(BGM系は必要になったときに読み込む) { CSystemSound cシステムサウンド = this[i]; - if (!TJAPlayer3.bコンパクトモード || cシステムサウンド.bCompact対象) { + if (!OpenTaiko.bコンパクトモード || cシステムサウンド.bCompact対象) { try { cシステムサウンド.tLoading(); Trace.TraceInformation("システムサウンドを読み込みました。({0})", cシステムサウンド.strFileName); @@ -929,7 +929,7 @@ namespace TJAPlayer3 { public void LoadSkinConfigFromFile(string path, ref string work) { if (!File.Exists(Path(path))) return; - using (var streamReader = new StreamReader(Path(path), Encoding.GetEncoding(TJAPlayer3.sEncType))) { + using (var streamReader = new StreamReader(Path(path), Encoding.GetEncoding(OpenTaiko.sEncType))) { while (streamReader.Peek() > -1) // 一行ずつ読み込む。 { var nowLine = streamReader.ReadLine(); diff --git a/OpenTaiko/src/Common/CSongDict.cs b/OpenTaiko/src/Common/CSongDict.cs index 6b28ea8b..ceb25ff9 100644 --- a/OpenTaiko/src/Common/CSongDict.cs +++ b/OpenTaiko/src/Common/CSongDict.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CSongDict { private static Dictionary nodes = new Dictionary(); private static HashSet urls = new HashSet(); @@ -171,7 +171,7 @@ namespace TJAPlayer3 { public static List tFetchFavoriteFolder(CSongListNode parent) { List childList = new List(); - foreach (string id in TJAPlayer3.Favorites.data.favorites[TJAPlayer3.SaveFile]) { + foreach (string id in OpenTaiko.Favorites.data.favorites[OpenTaiko.SaveFile]) { var node = tReadaptChildNote(parent, tGetNodeFromID(id)); if (node != null) { childList.Add(node); @@ -192,7 +192,7 @@ namespace TJAPlayer3 { public static List tFetchRecentlyPlayedSongsFolder(CSongListNode parent) { List childList = new List(); - foreach (string id in TJAPlayer3.RecentlyPlayedSongs.data.recentlyplayedsongs[TJAPlayer3.SaveFile].Reverse()) { + foreach (string id in OpenTaiko.RecentlyPlayedSongs.data.recentlyplayedsongs[OpenTaiko.SaveFile].Reverse()) { var node = tReadaptChildNote(parent, tGetNodeFromID(id)); if (node != null) { childList.Add(node); @@ -248,7 +248,7 @@ namespace TJAPlayer3 { public static void tRefreshScoreTables() { for (int pl = 0; pl < 5; pl++) { CActSelect曲リスト.CScorePad[] SPArrRef = ScorePads[pl]; - var BestPlayStats = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(pl)].data.bestPlaysStats; + var BestPlayStats = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(pl)].data.bestPlaysStats; for (int s = 0; s <= (int)Difficulty.Edit + 1; s++) { CActSelect曲リスト.CScorePad SPRef = SPArrRef[s]; diff --git a/OpenTaiko/src/Common/CTextConsole.cs b/OpenTaiko/src/Common/CTextConsole.cs index 6d1727d2..f62af20f 100644 --- a/OpenTaiko/src/Common/CTextConsole.cs +++ b/OpenTaiko/src/Common/CTextConsole.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CTextConsole : CActivity { // 定数 @@ -53,8 +53,8 @@ namespace TJAPlayer3 { } public override void CreateManagedResource() { if (!base.IsDeActivated) { - this.txフォント8x16[0] = TJAPlayer3.Tx.TxC(@"Console_Font.png"); - this.txフォント8x16[1] = TJAPlayer3.Tx.TxC(@"Console_Font_Small.png"); + this.txフォント8x16[0] = OpenTaiko.Tx.TxC(@"Console_Font.png"); + this.txフォント8x16[1] = OpenTaiko.Tx.TxC(@"Console_Font_Small.png"); nFontWidth = this.txフォント8x16[0].szTextureSize.Width / 32; nFontHeight = this.txフォント8x16[0].szTextureSize.Height / 16; diff --git a/OpenTaiko/src/Common/CVersionList.cs b/OpenTaiko/src/Common/CVersionList.cs index 988d8d2c..451a9071 100644 --- a/OpenTaiko/src/Common/CVersionList.cs +++ b/OpenTaiko/src/Common/CVersionList.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class CVersionList { public static string[] VersionList = { "0.1.0", diff --git a/OpenTaiko/src/Common/ConfigIniToSongGainControllerBinder.cs b/OpenTaiko/src/Common/ConfigIniToSongGainControllerBinder.cs index cb36ecfa..c9d8edb3 100644 --- a/OpenTaiko/src/Common/ConfigIniToSongGainControllerBinder.cs +++ b/OpenTaiko/src/Common/ConfigIniToSongGainControllerBinder.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// The ConfigIniToSongGainControllerBinder allows for SONGVOL and/or other /// properties related to the Gain levels applied to song preview and diff --git a/OpenTaiko/src/Common/ConfigIniToSoundGroupLevelControllerBinder.cs b/OpenTaiko/src/Common/ConfigIniToSoundGroupLevelControllerBinder.cs index 0033861e..fbf0739e 100644 --- a/OpenTaiko/src/Common/ConfigIniToSoundGroupLevelControllerBinder.cs +++ b/OpenTaiko/src/Common/ConfigIniToSoundGroupLevelControllerBinder.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// The ConfigIniToSoundGroupLevelControllerBinder allows for updated sound /// group level values, and keyboard sound level adjustment increment diff --git a/OpenTaiko/src/Common/ConfigManager.cs b/OpenTaiko/src/Common/ConfigManager.cs index 40eaddaa..50310992 100644 --- a/OpenTaiko/src/Common/ConfigManager.cs +++ b/OpenTaiko/src/Common/ConfigManager.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 設定ファイル入出力クラス。 /// diff --git a/OpenTaiko/src/Common/C定数.cs b/OpenTaiko/src/Common/C定数.cs index 821db53c..dc8bc878 100644 --- a/OpenTaiko/src/Common/C定数.cs +++ b/OpenTaiko/src/Common/C定数.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 難易度。 diff --git a/OpenTaiko/src/Common/Easing.cs b/OpenTaiko/src/Common/Easing.cs index 96f9773e..45e2e778 100644 --- a/OpenTaiko/src/Common/Easing.cs +++ b/OpenTaiko/src/Common/Easing.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class Easing { public int EaseIn(CCounter counter, float startPoint, float endPoint, CalcType type) { StartPoint = startPoint; diff --git a/OpenTaiko/src/Common/Favorites.cs b/OpenTaiko/src/Common/Favorites.cs index 5076c9d3..ea4a1994 100644 --- a/OpenTaiko/src/Common/Favorites.cs +++ b/OpenTaiko/src/Common/Favorites.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class Favorites { public void tFavorites() { if (!File.Exists("Favorite.json")) @@ -11,15 +11,15 @@ public void tToggleFavorite(string chartID) { if (tIsFavorite(chartID)) - data.favorites[TJAPlayer3.SaveFile].Remove(chartID); + data.favorites[OpenTaiko.SaveFile].Remove(chartID); else - data.favorites[TJAPlayer3.SaveFile].Add(chartID); + data.favorites[OpenTaiko.SaveFile].Add(chartID); tSaveFile(); } public bool tIsFavorite(string chartID) { - return (data.favorites[TJAPlayer3.SaveFile].Contains(chartID)); + return (data.favorites[OpenTaiko.SaveFile].Contains(chartID)); } diff --git a/OpenTaiko/src/Common/KeyboardSoundGroupLevelControlHandler.cs b/OpenTaiko/src/Common/KeyboardSoundGroupLevelControlHandler.cs index 3603f15d..898a432a 100644 --- a/OpenTaiko/src/Common/KeyboardSoundGroupLevelControlHandler.cs +++ b/OpenTaiko/src/Common/KeyboardSoundGroupLevelControlHandler.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// KeyboardSoundGroupLevelControlHandler is called by the song selection /// and song play stages when handling keyboard input. By delegating to @@ -23,8 +23,8 @@ namespace TJAPlayer3 { SoundGroupLevelController soundGroupLevelController, CSkin skin, bool isSongPreview) { - bool isAdjustmentPositive = TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.SongVolIncrease); - bool isAdjustmentNegative = TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.SongVolDecrease); + bool isAdjustmentPositive = OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.SongVolIncrease); + bool isAdjustmentNegative = OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.SongVolDecrease); if (!(isAdjustmentPositive || isAdjustmentNegative)) return; diff --git a/OpenTaiko/src/Common/LogNotification.cs b/OpenTaiko/src/Common/LogNotification.cs index 828e9aa8..c9db7097 100644 --- a/OpenTaiko/src/Common/LogNotification.cs +++ b/OpenTaiko/src/Common/LogNotification.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class LogNotification { private static Queue Notifications = new Queue(); @@ -20,7 +20,7 @@ namespace TJAPlayer3 { public ENotificationType NotificationType = ENotificationType.EINFO; public string Message = ""; - public CCounter LifeTime = new CCounter(0, 1000, 1, TJAPlayer3.Timer); + public CCounter LifeTime = new CCounter(0, 1000, 1, OpenTaiko.Timer); } diff --git a/OpenTaiko/src/Common/Modal.cs b/OpenTaiko/src/Common/Modal.cs index 52aa6888..db974289 100644 --- a/OpenTaiko/src/Common/Modal.cs +++ b/OpenTaiko/src/Common/Modal.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class Modal { public Modal(EModalType mt, int ra, params object?[] re) { modalType = mt; @@ -7,7 +7,7 @@ } public void tRegisterModal(int player) { - TJAPlayer3.stage結果.lcModal.RegisterNewModal(player, rarity, modalType, reference); + OpenTaiko.stage結果.lcModal.RegisterNewModal(player, rarity, modalType, reference); } #region [Enum definitions] diff --git a/OpenTaiko/src/Common/ModalQueue.cs b/OpenTaiko/src/Common/ModalQueue.cs index 8203a78b..bdee45a9 100644 --- a/OpenTaiko/src/Common/ModalQueue.cs +++ b/OpenTaiko/src/Common/ModalQueue.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class ModalQueue { public ModalQueue(Modal.EModalFormat mf) { _modalQueues = new Queue[] { new Queue(), new Queue(), new Queue(), new Queue(), new Queue() }; @@ -10,7 +10,7 @@ mp.modalFormat = _modalFormat; mp.player = player; - if (mp != null && player >= 0 && player < TJAPlayer3.ConfigIni.nPlayerCount) + if (mp != null && player >= 0 && player < OpenTaiko.ConfigIni.nPlayerCount) _modalQueues[player].Enqueue(mp); } @@ -22,7 +22,7 @@ // 1P => 2P => 3P => 4P => 5P public Modal? tPopModalInOrder() { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (!tIsQueueEmpty(i)) { Modal? _m = _modalQueues[i].Dequeue(); _m?.tRegisterModal(i + 1); @@ -34,7 +34,7 @@ } public bool tIsQueueEmpty(int player) { - if (player < 0 || player >= TJAPlayer3.ConfigIni.nPlayerCount) + if (player < 0 || player >= OpenTaiko.ConfigIni.nPlayerCount) return true; return _modalQueues[player].Count < 1; diff --git a/OpenTaiko/src/Common/NamePlateConfig.cs b/OpenTaiko/src/Common/NamePlateConfig.cs index 70b2f3f7..7bc13983 100644 --- a/OpenTaiko/src/Common/NamePlateConfig.cs +++ b/OpenTaiko/src/Common/NamePlateConfig.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { class NamePlateConfig { public void tNamePlateConfig() { // Deprecated, only converts to new format @@ -19,7 +19,7 @@ namespace TJAPlayer3 { return; for (int i = 0; i < 5; i++) { - int p = TJAPlayer3.GetActualPlayer(i); + int p = OpenTaiko.GetActualPlayer(i); data.Medals[p] += amounts[i]; } @@ -51,20 +51,20 @@ namespace TJAPlayer3 { bool iG = isGold; int cs = clearStatus; - if (TJAPlayer3.NamePlateConfig.data.DanTitles[player] == null) - TJAPlayer3.NamePlateConfig.data.DanTitles[player] = new Dictionary(); + if (OpenTaiko.NamePlateConfig.data.DanTitles[player] == null) + OpenTaiko.NamePlateConfig.data.DanTitles[player] = new Dictionary(); - if (TJAPlayer3.NamePlateConfig.data.DanTitles[player].ContainsKey(title)) { - if (TJAPlayer3.NamePlateConfig.data.DanTitles[player][title].clearStatus > cs) - cs = TJAPlayer3.NamePlateConfig.data.DanTitles[player][title].clearStatus; - if (TJAPlayer3.NamePlateConfig.data.DanTitles[player][title].isGold) + if (OpenTaiko.NamePlateConfig.data.DanTitles[player].ContainsKey(title)) { + if (OpenTaiko.NamePlateConfig.data.DanTitles[player][title].clearStatus > cs) + cs = OpenTaiko.NamePlateConfig.data.DanTitles[player][title].clearStatus; + if (OpenTaiko.NamePlateConfig.data.DanTitles[player][title].isGold) iG = true; } // Automatically set the dan to nameplate if new // Add a function within the NamePlate.cs file to update the title texture - if (!TJAPlayer3.NamePlateConfig.data.DanTitles[player].ContainsKey(title) || cs != clearStatus || iG != isGold) { + if (!OpenTaiko.NamePlateConfig.data.DanTitles[player].ContainsKey(title) || cs != clearStatus || iG != isGold) { changed = true; /* TJAPlayer3.NamePlateConfig.data.Dan[player] = title; @@ -76,7 +76,7 @@ namespace TJAPlayer3 { SaveFile.CDanTitle danTitle = new SaveFile.CDanTitle(iG, cs); - TJAPlayer3.NamePlateConfig.data.DanTitles[player][title] = danTitle; + OpenTaiko.NamePlateConfig.data.DanTitles[player][title] = danTitle; tSaveFile(); diff --git a/OpenTaiko/src/Common/TJAPlayer3.cs b/OpenTaiko/src/Common/OpenTaiko.cs similarity index 93% rename from OpenTaiko/src/Common/TJAPlayer3.cs rename to OpenTaiko/src/Common/OpenTaiko.cs index 05e6372a..9d474004 100644 --- a/OpenTaiko/src/Common/TJAPlayer3.cs +++ b/OpenTaiko/src/Common/OpenTaiko.cs @@ -13,8 +13,8 @@ using Silk.NET.Maths; using SkiaSharp; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { - internal class TJAPlayer3 : Game { +namespace OpenTaiko { + internal class OpenTaiko : Game { // プロパティ #region [ properties ] public static readonly string VERSION = Assembly.GetExecutingAssembly().GetName().Version.ToString();//.Substring(0, Assembly.GetExecutingAssembly().GetName().Version.ToString().Length - 2); @@ -49,7 +49,7 @@ namespace TJAPlayer3 { private set; } - public static TJAPlayer3 app { + public static OpenTaiko app { get; private set; } @@ -161,15 +161,15 @@ namespace TJAPlayer3 { public static CDTX GetDTX(int player) { switch (player) { case 0: - return TJAPlayer3.DTX; + return OpenTaiko.DTX; case 1: - return TJAPlayer3.DTX_2P; + return OpenTaiko.DTX_2P; case 2: - return TJAPlayer3.DTX_3P; + return OpenTaiko.DTX_3P; case 3: - return TJAPlayer3.DTX_4P; + return OpenTaiko.DTX_4P; case 4: - return TJAPlayer3.DTX_5P; + return OpenTaiko.DTX_5P; } return null; } @@ -430,15 +430,15 @@ namespace TJAPlayer3 { } public static bool P1IsBlue() { - return (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1); + return (OpenTaiko.PlayerSide == 1 && OpenTaiko.ConfigIni.nPlayerCount == 1); } #endregion // コンストラクタ - public TJAPlayer3() : base("OpenTaiko.ico") { - TJAPlayer3.app = this; + public OpenTaiko() : base("OpenTaiko.ico") { + OpenTaiko.app = this; } public static string sEncType = "Shift_JIS"; @@ -603,7 +603,7 @@ namespace TJAPlayer3 { foreach (STPlugin st in this.PluginList) { Directory.SetCurrentDirectory(st.pluginDirectory); st.plugin.OnUnmanagedリソースの作成(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } } protected override void UnloadContent() { @@ -615,7 +615,7 @@ namespace TJAPlayer3 { foreach (STPlugin st in this.PluginList) { Directory.SetCurrentDirectory(st.pluginDirectory); st.plugin.OnUnmanagedリソースの解放(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } } protected override void OnExiting() { @@ -631,7 +631,7 @@ namespace TJAPlayer3 { base.OnExiting(); } protected override void Update() { - InputManager?.Polling(TJAPlayer3.ConfigIni.bBufferedInputs); + InputManager?.Polling(OpenTaiko.ConfigIni.bBufferedInputs); } protected override void Draw() { #if !DEBUG @@ -717,7 +717,7 @@ namespace TJAPlayer3 { #endregion if (r現在のステージ != null) { - TJAPlayer3.NamePlate.lcNamePlate.Update(); + OpenTaiko.NamePlate.lcNamePlate.Update(); this.n進行描画の戻り値 = (r現在のステージ != null) ? r現在のステージ.Draw() : 0; #region [ プラグインの進行描画 ] @@ -725,12 +725,12 @@ namespace TJAPlayer3 { foreach (STPlugin sp in this.PluginList) { Directory.SetCurrentDirectory(sp.pluginDirectory); - if (TJAPlayer3.act現在入力を占有中のプラグイン == null || TJAPlayer3.act現在入力を占有中のプラグイン == sp.plugin) - sp.plugin.On進行描画(TJAPlayer3.Pad, TJAPlayer3.InputManager.Keyboard); + if (OpenTaiko.act現在入力を占有中のプラグイン == null || OpenTaiko.act現在入力を占有中のプラグイン == sp.plugin) + sp.plugin.On進行描画(OpenTaiko.Pad, OpenTaiko.InputManager.Keyboard); else sp.plugin.On進行描画(null, null); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } //--------------------- #endregion @@ -739,7 +739,7 @@ namespace TJAPlayer3 { CScoreIni scoreIni = null; #region [ 曲検索スレッドの起動/終了 ] // ここに"Enumerating Songs..."表示を集約 - if (!TJAPlayer3.bコンパクトモード) { + if (!OpenTaiko.bコンパクトモード) { actEnumSongs.Draw(); // "Enumerating Songs..."アイコンの描画 } switch (r現在のステージ.eStageID) { @@ -758,7 +758,7 @@ namespace TJAPlayer3 { actEnumSongs.CreateManagedResource(); actEnumSongs.CreateUnmanagedResource(); } - TJAPlayer3.stageSongSelect.bIsEnumeratingSongs = true; + OpenTaiko.stageSongSelect.bIsEnumeratingSongs = true; EnumSongs.Init(); // 取得した曲数を、新インスタンスにも与える EnumSongs.StartEnumFromDisk(); // 曲検索スレッドの起動_開始 } @@ -805,10 +805,10 @@ namespace TJAPlayer3 { actEnumSongs.ReleaseManagedResource(); actEnumSongs.ReleaseUnmanagedResource(); } - TJAPlayer3.stageSongSelect.bIsEnumeratingSongs = false; + OpenTaiko.stageSongSelect.bIsEnumeratingSongs = false; bool bRemakeSongTitleBar = (r現在のステージ.eStageID == CStage.EStage.SongSelect) ? true : false; - TJAPlayer3.stageSongSelect.Refresh(EnumSongs.Songs管理, bRemakeSongTitleBar); + OpenTaiko.stageSongSelect.Refresh(EnumSongs.Songs管理, bRemakeSongTitleBar); EnumSongs.SongListEnumCompletelyDone(); } #endregion @@ -859,7 +859,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -890,7 +890,7 @@ namespace TJAPlayer3 { r直前のステージ = r現在のステージ; r現在のステージ = stageSongSelect; - TJAPlayer3.latestSongSelect = stageSongSelect; + OpenTaiko.latestSongSelect = stageSongSelect; //----------------------------- #endregion break; @@ -912,7 +912,7 @@ namespace TJAPlayer3 { } r直前のステージ = r現在のステージ; r現在のステージ = stage段位選択; - TJAPlayer3.latestSongSelect = stage段位選択; + OpenTaiko.latestSongSelect = stage段位選択; //----------------------------- #endregion break; @@ -1061,7 +1061,7 @@ namespace TJAPlayer3 { r直前のステージ = r現在のステージ; r現在のステージ = stageSongSelect; - TJAPlayer3.latestSongSelect = stageSongSelect; + OpenTaiko.latestSongSelect = stageSongSelect; ConfigIni.nPreviousPlayerCount = ConfigIni.nPlayerCount; ConfigIni.nPlayerCount = 2; ConfigIni.bAIBattleMode = true; @@ -1075,7 +1075,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } //this.tガベージコレクションを実行する(); // #31980 2013.9.3 yyagi タイトル画面でだけ、毎フレームGCを実行して重くなっていた問題の修正 @@ -1110,7 +1110,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1139,7 +1139,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1190,7 +1190,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1226,7 +1226,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1280,7 +1280,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1341,7 +1341,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1371,7 +1371,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1409,7 +1409,7 @@ namespace TJAPlayer3 { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1425,7 +1425,7 @@ namespace TJAPlayer3 { //----------------------------- DTXVmode.Refreshed = false; // 曲のリロード中に発生した再リロードは、無視する。 if (this.n進行描画の戻り値 != 0) { - TJAPlayer3.Pad.st検知したデバイス.Clear(); // 入力デバイスフラグクリア(2010.9.11) + OpenTaiko.Pad.st検知したデバイス.Clear(); // 入力デバイスフラグクリア(2010.9.11) r現在のステージ.DeActivate(); if (!ConfigIni.PreAssetsLoading) { r現在のステージ.ReleaseManagedResource(); @@ -1463,20 +1463,20 @@ namespace TJAPlayer3 { Trace.TraceInformation("----------------------"); Trace.TraceInformation("■ Return to song select menu"); - TJAPlayer3.latestSongSelect.Activate(); + OpenTaiko.latestSongSelect.Activate(); if (!ConfigIni.PreAssetsLoading) { - TJAPlayer3.latestSongSelect.CreateManagedResource(); - TJAPlayer3.latestSongSelect.CreateUnmanagedResource(); + OpenTaiko.latestSongSelect.CreateManagedResource(); + OpenTaiko.latestSongSelect.CreateUnmanagedResource(); } r直前のステージ = r現在のステージ; // Seek latest registered song select screen - r現在のステージ = TJAPlayer3.latestSongSelect; + r現在のステージ = OpenTaiko.latestSongSelect; foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } break; @@ -1502,7 +1502,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1519,7 +1519,7 @@ for (int i = 0; i < 3; i++) { DTXVmode.Refreshed = false; if (DTXVmode.Command == CDTXVmode.ECommand.Stop) { - TJAPlayer3.stage演奏ドラム画面.t停止(); + OpenTaiko.stage演奏ドラム画面.t停止(); if (previewSound != null) { this.previewSound.tStopSound(); this.previewSound.Dispose(); @@ -1558,16 +1558,16 @@ for (int i = 0; i < 3; i++) { //} } else if (DTXVmode.Command == CDTXVmode.ECommand.Play) { if (DTXVmode.NeedReload) { - TJAPlayer3.stage演奏ドラム画面.t再読込(); + OpenTaiko.stage演奏ドラム画面.t再読込(); - TJAPlayer3.ConfigIni.bTimeStretch = DTXVmode.TimeStretch; + OpenTaiko.ConfigIni.bTimeStretch = DTXVmode.TimeStretch; SoundManager.bIsTimeStretch = DTXVmode.TimeStretch; - if (TJAPlayer3.ConfigIni.bEnableVSync != DTXVmode.VSyncWait) { - TJAPlayer3.ConfigIni.bEnableVSync = DTXVmode.VSyncWait; - TJAPlayer3.app.b次のタイミングで垂直帰線同期切り替えを行う = true; + if (OpenTaiko.ConfigIni.bEnableVSync != DTXVmode.VSyncWait) { + OpenTaiko.ConfigIni.bEnableVSync = DTXVmode.VSyncWait; + OpenTaiko.app.b次のタイミングで垂直帰線同期切り替えを行う = true; } } else { - TJAPlayer3.stage演奏ドラム画面.t演奏位置の変更(TJAPlayer3.DTXVmode.nStartBar, 0); + OpenTaiko.stage演奏ドラム画面.t演奏位置の変更(OpenTaiko.DTXVmode.nStartBar, 0); } } } @@ -1613,7 +1613,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.On演奏キャンセル(scoreIni); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } //--------------------- #endregion @@ -1651,22 +1651,22 @@ for (int i = 0; i < 3; i++) { Trace.TraceInformation("----------------------"); Trace.TraceInformation("■ Return to song select menu"); - TJAPlayer3.latestSongSelect.Activate(); + OpenTaiko.latestSongSelect.Activate(); if (!ConfigIni.PreAssetsLoading) { - TJAPlayer3.latestSongSelect.CreateManagedResource(); - TJAPlayer3.latestSongSelect.CreateUnmanagedResource(); + OpenTaiko.latestSongSelect.CreateManagedResource(); + OpenTaiko.latestSongSelect.CreateUnmanagedResource(); } r直前のステージ = r現在のステージ; // Seek latest registered song select screen - r現在のステージ = TJAPlayer3.latestSongSelect; + r現在のステージ = OpenTaiko.latestSongSelect; #region [ プラグイン Onステージ変更() の呼び出し ] //--------------------- foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } //--------------------- #endregion @@ -1686,7 +1686,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.On演奏失敗(scoreIni); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } //--------------------- #endregion @@ -1716,7 +1716,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } //--------------------- #endregion @@ -1740,7 +1740,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.On演奏クリア(scoreIni); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } //--------------------- #endregion @@ -1766,7 +1766,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } //--------------------- #endregion @@ -1819,22 +1819,22 @@ for (int i = 0; i < 3; i++) { Trace.TraceInformation("----------------------"); Trace.TraceInformation("■ Return to song select menu"); - TJAPlayer3.latestSongSelect.Activate(); + OpenTaiko.latestSongSelect.Activate(); if (!ConfigIni.PreAssetsLoading) { - TJAPlayer3.latestSongSelect.CreateManagedResource(); - TJAPlayer3.latestSongSelect.CreateUnmanagedResource(); + OpenTaiko.latestSongSelect.CreateManagedResource(); + OpenTaiko.latestSongSelect.CreateUnmanagedResource(); } r直前のステージ = r現在のステージ; // Seek latest registered song select screen - r現在のステージ = TJAPlayer3.latestSongSelect; + r現在のステージ = OpenTaiko.latestSongSelect; stageSongSelect.NowSong++; foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1871,7 +1871,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1901,7 +1901,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1974,7 +1974,7 @@ for (int i = 0; i < 3; i++) { foreach (STPlugin pg in this.PluginList) { Directory.SetCurrentDirectory(pg.pluginDirectory); pg.plugin.Onステージ変更(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } this.tガベージコレクションを実行する(); @@ -1989,8 +1989,8 @@ for (int i = 0; i < 3; i++) { actScanningLoudness?.Draw(); if (!ConfigIni.bTokkunMode) { - float screen_ratiox = TJAPlayer3.Skin.Resolution[0] / 1280.0f; - float screen_ratioy = TJAPlayer3.Skin.Resolution[1] / 720.0f; + float screen_ratiox = OpenTaiko.Skin.Resolution[0] / 1280.0f; + float screen_ratioy = OpenTaiko.Skin.Resolution[1] / 720.0f; /* var mat = Matrix.LookAtLH(new Vector3(-fCamXOffset * screen_ratiox, fCamYOffset * screen_ratioy, (float)(-SampleFramework.GameWindowSize.Height / (fCamZoomFactor * 2) * Math.Sqrt(3.0))), new Vector3(-fCamXOffset * screen_ratiox, fCamYOffset * screen_ratioy, 0f), new Vector3(0f, 1f, 0f)); mat *= Matrix.RotationYawPitchRoll(0, 0, C変換.DegreeToRadian(fCamRotation)); @@ -2006,9 +2006,9 @@ for (int i = 0; i < 3; i++) { Camera *= Matrix4X4.CreateTranslation(fCamXOffset / 1280, fCamYOffset / 720, 1f); - if (TJAPlayer3.DTX != null) { + if (OpenTaiko.DTX != null) { //object rendering - foreach (KeyValuePair pair in TJAPlayer3.DTX.listObj) { + foreach (KeyValuePair pair in OpenTaiko.DTX.listObj) { pair.Value.tDraw(); } } @@ -2016,7 +2016,7 @@ for (int i = 0; i < 3; i++) { Camera = Matrix4X4.Identity; } - if (r現在のステージ != null && r現在のステージ.eStageID != CStage.EStage.StartUp && TJAPlayer3.Tx.Network_Connection != null) { + if (r現在のステージ != null && r現在のステージ.eStageID != CStage.EStage.StartUp && OpenTaiko.Tx.Network_Connection != null) { if (Math.Abs(SoundManager.PlayTimer.SystemTimeMs - this.前回のシステム時刻ms) > 10000) { this.前回のシステム時刻ms = SoundManager.PlayTimer.SystemTimeMs; Task.Factory.StartNew(() => { @@ -2025,24 +2025,24 @@ for (int i = 0; i < 3; i++) { this.bネットワークに接続中 = reply.Status == IPStatus.Success; }); } - TJAPlayer3.Tx.Network_Connection.t2D描画(GameWindowSize.Width - (TJAPlayer3.Tx.Network_Connection.szTextureSize.Width / 2), GameWindowSize.Height - TJAPlayer3.Tx.Network_Connection.szTextureSize.Height, new Rectangle((TJAPlayer3.Tx.Network_Connection.szTextureSize.Width / 2) * (this.bネットワークに接続中 ? 0 : 1), 0, TJAPlayer3.Tx.Network_Connection.szTextureSize.Width / 2, TJAPlayer3.Tx.Network_Connection.szTextureSize.Height)); + OpenTaiko.Tx.Network_Connection.t2D描画(GameWindowSize.Width - (OpenTaiko.Tx.Network_Connection.szTextureSize.Width / 2), GameWindowSize.Height - OpenTaiko.Tx.Network_Connection.szTextureSize.Height, new Rectangle((OpenTaiko.Tx.Network_Connection.szTextureSize.Width / 2) * (this.bネットワークに接続中 ? 0 : 1), 0, OpenTaiko.Tx.Network_Connection.szTextureSize.Width / 2, OpenTaiko.Tx.Network_Connection.szTextureSize.Height)); } // オーバレイを描画する(テクスチャの生成されていない起動ステージは例外 // Display log cards VisualLogManager.Display(); - if (r現在のステージ != null && r現在のステージ.eStageID != CStage.EStage.StartUp && TJAPlayer3.Tx.Overlay != null) { - TJAPlayer3.Tx.Overlay.t2D描画(0, 0); + if (r現在のステージ != null && r現在のステージ.eStageID != CStage.EStage.StartUp && OpenTaiko.Tx.Overlay != null) { + OpenTaiko.Tx.Overlay.t2D描画(0, 0); } } //foreach(var capture in ConfigIni.KeyAssign.System.Capture) //{ //if (TJAPlayer3.Input管理.Keyboard.KeyPressed(capture.コード) && capture.コード != 0) - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.Capture)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.Capture)) { #if DEBUG - if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl)) { if (r現在のステージ.eStageID != CStage.EStage.Game) { RefreshSkin(); r現在のステージ.DeActivate(); @@ -2059,7 +2059,7 @@ for (int i = 0; i < 3; i++) { } else { // Debug.WriteLine( "capture: " + string.Format( "{0:2x}", (int) e.KeyCode ) + " " + (int) e.KeyCode ); string strFullPath = - Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "Capture_img"); + Path.Combine(OpenTaiko.strEXEのあるフォルダ, "Capture_img"); strFullPath = Path.Combine(strFullPath, DateTime.Now.ToString("yyyyMMddHHmmss") + ".png"); SaveResultScreen(strFullPath); } @@ -2130,10 +2130,10 @@ for (int i = 0; i < 3; i++) { } } public static void tテクスチャの解放(ref CTexture tx) { - TJAPlayer3.tDisposeSafely(ref tx); + OpenTaiko.tDisposeSafely(ref tx); } public static void tテクスチャの解放(ref CTextureAf tx) { - TJAPlayer3.tDisposeSafely(ref tx); + OpenTaiko.tDisposeSafely(ref tx); } public static CTexture tテクスチャの生成(SKBitmap bitmap) { return tテクスチャの生成(bitmap, false); @@ -2323,7 +2323,7 @@ for (int i = 0; i < 3; i++) { Trace.AutoFlush = true; if (ConfigIni.bOutputLogs) { try { - Trace.Listeners.Add(new CTraceLogListener(new StreamWriter(System.IO.Path.Combine(strEXEのあるフォルダ, "OpenTaiko.log"), false, Encoding.GetEncoding(TJAPlayer3.sEncType)))); + Trace.Listeners.Add(new CTraceLogListener(new StreamWriter(System.IO.Path.Combine(strEXEのあるフォルダ, "OpenTaiko.log"), false, Encoding.GetEncoding(OpenTaiko.sEncType)))); } catch (System.UnauthorizedAccessException) // #24481 2011.2.20 yyagi { int c = (CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == "ja") ? 0 : 1; @@ -2372,10 +2372,10 @@ for (int i = 0; i < 3; i++) { try #endif { - Skin = new CSkin(TJAPlayer3.ConfigIni.strSystemSkinSubfolderFullName, false); - TJAPlayer3.ConfigIni.strSystemSkinSubfolderFullName = TJAPlayer3.Skin.GetCurrentSkinSubfolderFullName(true); // 旧指定のSkinフォルダが消滅していた場合に備える + Skin = new CSkin(OpenTaiko.ConfigIni.strSystemSkinSubfolderFullName, false); + OpenTaiko.ConfigIni.strSystemSkinSubfolderFullName = OpenTaiko.Skin.GetCurrentSkinSubfolderFullName(true); // 旧指定のSkinフォルダが消滅していた場合に備える - ChangeResolution(TJAPlayer3.Skin.Resolution[0], TJAPlayer3.Skin.Resolution[1]); + ChangeResolution(OpenTaiko.Skin.Resolution[0], OpenTaiko.Skin.Resolution[1]); Trace.TraceInformation("Skin successfully initialized."); } @@ -2514,7 +2514,7 @@ for (int i = 0; i < 3; i++) { Trace.Indent(); try { ESoundDeviceType soundDeviceType; - switch (TJAPlayer3.ConfigIni.nSoundDeviceType) { + switch (OpenTaiko.ConfigIni.nSoundDeviceType) { case 0: soundDeviceType = ESoundDeviceType.Bass; break; @@ -2533,12 +2533,12 @@ for (int i = 0; i < 3; i++) { } SoundManager = new SoundManager(Window_, soundDeviceType, - TJAPlayer3.ConfigIni.nBassBufferSizeMs, - TJAPlayer3.ConfigIni.nWASAPIBufferSizeMs, + OpenTaiko.ConfigIni.nBassBufferSizeMs, + OpenTaiko.ConfigIni.nWASAPIBufferSizeMs, // CDTXMania.ConfigIni.nASIOBufferSizeMs, 0, - TJAPlayer3.ConfigIni.nASIODevice, - TJAPlayer3.ConfigIni.bUseOSTimer + OpenTaiko.ConfigIni.nASIODevice, + OpenTaiko.ConfigIni.bUseOSTimer ); //Sound管理 = FDK.CSound管理.Instance; //Sound管理.t初期化( soundDeviceType, 0, 0, CDTXMania.ConfigIni.nASIODevice, base.Window.Handle ); @@ -2568,8 +2568,8 @@ for (int i = 0; i < 3; i++) { } ShowWindowTitleWithSoundType(); - FDK.SoundManager.bIsTimeStretch = TJAPlayer3.ConfigIni.bTimeStretch; - SoundManager.nMasterVolume = TJAPlayer3.ConfigIni.nMasterVolume; + FDK.SoundManager.bIsTimeStretch = OpenTaiko.ConfigIni.bTimeStretch; + SoundManager.nMasterVolume = OpenTaiko.ConfigIni.nMasterVolume; //FDK.CSound管理.bIsMP3DecodeByWindowsCodec = CDTXMania.ConfigIni.bNoMP3Streaming; Trace.TraceInformation("サウンドデバイスの初期化を完了しました。"); } catch (Exception e) { @@ -2669,7 +2669,7 @@ for (int i = 0; i < 3; i++) { st.plugin.On初期化(this.PluginHost); st.plugin.OnManagedリソースの作成(); st.plugin.OnUnmanagedリソースの作成(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } Trace.TraceInformation("All plugins have been initialized."); } catch { @@ -2690,10 +2690,10 @@ for (int i = 0; i < 3; i++) { DiscordClient?.SetPresence(new RichPresence() { Details = "", State = "Startup", - Timestamps = new Timestamps(TJAPlayer3.StartupTime), + Timestamps = new Timestamps(OpenTaiko.StartupTime), Assets = new Assets() { - LargeImageKey = TJAPlayer3.LargeImageKey, - LargeImageText = TJAPlayer3.LargeImageText, + LargeImageKey = OpenTaiko.LargeImageKey, + LargeImageText = OpenTaiko.LargeImageText, } }); #endregion @@ -2707,7 +2707,7 @@ for (int i = 0; i < 3; i++) { Trace.TraceInformation("----------------------"); Trace.TraceInformation("■ Startup"); - if (TJAPlayer3.bコンパクトモード) { + if (OpenTaiko.bコンパクトモード) { r現在のステージ = stage曲読み込み; } else { r現在のステージ = stage起動; @@ -2756,7 +2756,7 @@ for (int i = 0; i < 3; i++) { #endregion #region [ 現在のステージの終了処理 ] //--------------------- - if (TJAPlayer3.r現在のステージ != null && TJAPlayer3.r現在のステージ.IsActivated) // #25398 2011.06.07 MODIFY FROM + if (OpenTaiko.r現在のステージ != null && OpenTaiko.r現在のステージ.IsActivated) // #25398 2011.06.07 MODIFY FROM { Trace.TraceInformation("Exiting stage..."); Trace.Indent(); @@ -2784,7 +2784,7 @@ for (int i = 0; i < 3; i++) { st.plugin.OnUnmanagedリソースの解放(); st.plugin.OnManagedリソースの解放(); st.plugin.On終了(); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } PluginHost = null; Trace.TraceInformation("All plugins have been terminated."); @@ -2806,7 +2806,7 @@ for (int i = 0; i < 3; i++) { #pragma warning disable SYSLIB0011 if (EnumSongs.IsSongListEnumCompletelyDone) { BinaryFormatter songlistdb_ = new BinaryFormatter(); - using Stream songlistdb = File.OpenWrite($"{TJAPlayer3.strEXEのあるフォルダ}songlist.db"); + using Stream songlistdb = File.OpenWrite($"{OpenTaiko.strEXEのあるフォルダ}songlist.db"); songlistdb_.Serialize(songlistdb, Songs管理.listSongsDB); } #pragma warning restore SYSLIB0011 @@ -3041,27 +3041,27 @@ for (int i = 0; i < 3; i++) { } public void RefreshSkin() { - Trace.TraceInformation("Skin Change:" + TJAPlayer3.Skin.GetCurrentSkinSubfolderFullName(false)); + Trace.TraceInformation("Skin Change:" + OpenTaiko.Skin.GetCurrentSkinSubfolderFullName(false)); - TJAPlayer3.actTextConsole.DeActivate(); + OpenTaiko.actTextConsole.DeActivate(); actTextConsole.ReleaseManagedResource(); actTextConsole.ReleaseUnmanagedResource(); - TJAPlayer3.Skin.Dispose(); - TJAPlayer3.Skin = null; - TJAPlayer3.Skin = new CSkin(TJAPlayer3.ConfigIni.strSystemSkinSubfolderFullName, false); + OpenTaiko.Skin.Dispose(); + OpenTaiko.Skin = null; + OpenTaiko.Skin = new CSkin(OpenTaiko.ConfigIni.strSystemSkinSubfolderFullName, false); - TJAPlayer3.Tx.DisposeTexture(); + OpenTaiko.Tx.DisposeTexture(); - ChangeResolution(TJAPlayer3.Skin.Resolution[0], TJAPlayer3.Skin.Resolution[1]); + ChangeResolution(OpenTaiko.Skin.Resolution[0], OpenTaiko.Skin.Resolution[1]); - TJAPlayer3.Tx.LoadTexture(); + OpenTaiko.Tx.LoadTexture(); - TJAPlayer3.actTextConsole.Activate(); + OpenTaiko.actTextConsole.Activate(); actTextConsole.CreateManagedResource(); actTextConsole.CreateUnmanagedResource(); - TJAPlayer3.NamePlate.RefleshSkin(); - TJAPlayer3.stage結果.RefreshSkin(); + OpenTaiko.NamePlate.RefleshSkin(); + OpenTaiko.stage結果.RefreshSkin(); CActSelectPopupMenu.RefleshSkin(); CActSelect段位リスト.RefleshSkin(); } diff --git a/OpenTaiko/src/Common/Program.cs b/OpenTaiko/src/Common/Program.cs index 673952f4..447ebf0d 100644 --- a/OpenTaiko/src/Common/Program.cs +++ b/OpenTaiko/src/Common/Program.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Runtime.InteropServices; using System.Text; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class Program { #region [ 二重起動チェック、DLL存在チェック ] //----------------------------- @@ -104,7 +104,7 @@ namespace TJAPlayer3 { fileinfo.CopyTo(AppContext.BaseDirectory + fileinfo.Name, true); } - using (var mania = new TJAPlayer3()) + using (var mania = new OpenTaiko()) mania.Run(); Trace.WriteLine(""); diff --git a/OpenTaiko/src/Common/RecentlyPlayedSongs.cs b/OpenTaiko/src/Common/RecentlyPlayedSongs.cs index 1d9de304..168a97e5 100644 --- a/OpenTaiko/src/Common/RecentlyPlayedSongs.cs +++ b/OpenTaiko/src/Common/RecentlyPlayedSongs.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class RecentlyPlayedSongs { public void tRecentlyPlayedSongs() { if (!File.Exists("RecentlyPlayedSongs.json")) @@ -10,11 +10,11 @@ #region [Auxiliary methods] public void tAddChart(string chartID) { - if (!data.recentlyplayedsongs[TJAPlayer3.SaveFile].Contains(chartID)) - data.recentlyplayedsongs[TJAPlayer3.SaveFile].Enqueue(chartID); + if (!data.recentlyplayedsongs[OpenTaiko.SaveFile].Contains(chartID)) + data.recentlyplayedsongs[OpenTaiko.SaveFile].Enqueue(chartID); - while (data.recentlyplayedsongs[TJAPlayer3.SaveFile].Count > TJAPlayer3.ConfigIni.nRecentlyPlayedMax) - data.recentlyplayedsongs[TJAPlayer3.SaveFile].Dequeue(); + while (data.recentlyplayedsongs[OpenTaiko.SaveFile].Count > OpenTaiko.ConfigIni.nRecentlyPlayedMax) + data.recentlyplayedsongs[OpenTaiko.SaveFile].Dequeue(); tSaveFile(); } diff --git a/OpenTaiko/src/Common/SaveFile.cs b/OpenTaiko/src/Common/SaveFile.cs index 48b4d607..e2d18e01 100644 --- a/OpenTaiko/src/Common/SaveFile.cs +++ b/OpenTaiko/src/Common/SaveFile.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class SaveFile { public void tSaveFile(string filename) { diff --git a/OpenTaiko/src/Common/TitleTextureKey.cs b/OpenTaiko/src/Common/TitleTextureKey.cs index f8b23c88..4a5897ac 100644 --- a/OpenTaiko/src/Common/TitleTextureKey.cs +++ b/OpenTaiko/src/Common/TitleTextureKey.cs @@ -1,7 +1,7 @@ using FDK; using Color = System.Drawing.Color; -namespace TJAPlayer3 { +namespace OpenTaiko { public sealed class TitleTextureKey { @@ -41,8 +41,8 @@ namespace TJAPlayer3 { private static CTexture GenerateTitleTextureTate(TitleTextureKey titleTextureKey, bool keepCenter = false) { using (var bmp = titleTextureKey.cPrivateFastFont.DrawText_V( - titleTextureKey.str文字, titleTextureKey.forecolor, titleTextureKey.backcolor, titleTextureKey.secondEdge, 30, keepCenter)) { - CTexture tx文字テクスチャ = TJAPlayer3.tテクスチャの生成(bmp, false); + titleTextureKey.str, titleTextureKey.forecolor, titleTextureKey.backcolor, titleTextureKey.secondEdge, 30, keepCenter)) { + CTexture tx文字テクスチャ = OpenTaiko.tテクスチャの生成(bmp, false); if (tx文字テクスチャ.szTextureSize.Height > titleTextureKey.maxWidth) { //tx文字テクスチャ.vc拡大縮小倍率.X = (float)(((double)titleTextureKey.maxWidth) / tx文字テクスチャ.szテクスチャサイズ.Height); tx文字テクスチャ.vcScaleRatio.X = 1.0f; @@ -55,8 +55,8 @@ namespace TJAPlayer3 { private static CTexture GenerateTitleTexture(TitleTextureKey titleTextureKey, bool keepCenter = false) { using (var bmp = titleTextureKey.cPrivateFastFont.DrawText( - titleTextureKey.str文字, titleTextureKey.forecolor, titleTextureKey.backcolor, titleTextureKey.secondEdge, 30, keepCenter)) { - CTexture tx文字テクスチャ = TJAPlayer3.tテクスチャの生成(bmp, false); + titleTextureKey.str, titleTextureKey.forecolor, titleTextureKey.backcolor, titleTextureKey.secondEdge, 30, keepCenter)) { + CTexture tx文字テクスチャ = OpenTaiko.tテクスチャの生成(bmp, false); if (tx文字テクスチャ.szTextureSize.Width > titleTextureKey.maxWidth) { tx文字テクスチャ.vcScaleRatio.X = (float)(((double)titleTextureKey.maxWidth) / tx文字テクスチャ.szTextureSize.Width); tx文字テクスチャ.vcScaleRatio.Y = 1.0f;// (float) (((double) titleTextureKey.maxWidth) / tx文字テクスチャ.szテクスチャサイズ.Width); @@ -77,7 +77,7 @@ namespace TJAPlayer3 { } // Non-static - public readonly string str文字; + public readonly string str; public readonly CCachedFontRenderer cPrivateFastFont; public readonly Color forecolor; public readonly Color backcolor; @@ -85,7 +85,7 @@ namespace TJAPlayer3 { public readonly Color? secondEdge; public TitleTextureKey(string str文字, CCachedFontRenderer cPrivateFastFont, Color forecolor, Color backcolor, int maxHeight, Color? secondEdge = null) { - this.str文字 = str文字; + this.str = str文字; this.cPrivateFastFont = cPrivateFastFont; this.forecolor = forecolor; this.backcolor = backcolor; @@ -94,7 +94,7 @@ namespace TJAPlayer3 { } private bool Equals(TitleTextureKey other) { - return string.Equals(str文字, other.str文字) && + return string.Equals(str, other.str) && cPrivateFastFont.Equals(other.cPrivateFastFont) && forecolor.Equals(other.forecolor) && backcolor.Equals(other.backcolor) && @@ -110,7 +110,7 @@ namespace TJAPlayer3 { public override int GetHashCode() { unchecked { - var hashCode = str文字.GetHashCode(); + var hashCode = str.GetHashCode(); hashCode = (hashCode * 397) ^ cPrivateFastFont.GetHashCode(); hashCode = (hashCode * 397) ^ forecolor.GetHashCode(); hashCode = (hashCode * 397) ^ backcolor.GetHashCode(); diff --git a/OpenTaiko/src/Components/CGimmickValue.cs b/OpenTaiko/src/Components/CGimmickValue.cs index 244c0867..a504b8a7 100644 --- a/OpenTaiko/src/Components/CGimmickValue.cs +++ b/OpenTaiko/src/Components/CGimmickValue.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CGimmickValue { } } diff --git a/OpenTaiko/src/Components/CLocalizationData.cs b/OpenTaiko/src/Components/CLocalizationData.cs index ddf2cf4c..62108857 100644 --- a/OpenTaiko/src/Components/CLocalizationData.cs +++ b/OpenTaiko/src/Components/CLocalizationData.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { [Serializable] internal class CLocalizationData { [JsonProperty("strings")] diff --git a/OpenTaiko/src/Components/CSongReplay.cs b/OpenTaiko/src/Components/CSongReplay.cs index 0949dab8..8ae4da08 100644 --- a/OpenTaiko/src/Components/CSongReplay.cs +++ b/OpenTaiko/src/Components/CSongReplay.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class CSongReplay { /* Game version used for the replay * 521 = 0.5.2.1 @@ -79,16 +79,16 @@ public void tDanInputSongResults(int songNo) { if (songNo >= DanSongCount) return; if (songNo < 0) return; - IndividualGoodCount[songNo] = TJAPlayer3.stage演奏ドラム画面.n良[songNo]; - IndividualOkCount[songNo] = TJAPlayer3.stage演奏ドラム画面.n可[songNo]; - IndividualBadCount[songNo] = TJAPlayer3.stage演奏ドラム画面.n不可[songNo]; - IndividualRollCount[songNo] = TJAPlayer3.stage演奏ドラム画面.n連打[songNo]; - IndividualMaxCombo[songNo] = TJAPlayer3.stage演奏ドラム画面.nHighestCombo[songNo]; - IndividualBoomCount[songNo] = TJAPlayer3.stage演奏ドラム画面.nMine[songNo]; - IndividualADLibCount[songNo] = TJAPlayer3.stage演奏ドラム画面.nADLIB[songNo]; + IndividualGoodCount[songNo] = OpenTaiko.stage演奏ドラム画面.n良[songNo]; + IndividualOkCount[songNo] = OpenTaiko.stage演奏ドラム画面.n可[songNo]; + IndividualBadCount[songNo] = OpenTaiko.stage演奏ドラム画面.n不可[songNo]; + IndividualRollCount[songNo] = OpenTaiko.stage演奏ドラム画面.n連打[songNo]; + IndividualMaxCombo[songNo] = OpenTaiko.stage演奏ドラム画面.nHighestCombo[songNo]; + IndividualBoomCount[songNo] = OpenTaiko.stage演奏ドラム画面.nMine[songNo]; + IndividualADLibCount[songNo] = OpenTaiko.stage演奏ドラム画面.nADLIB[songNo]; danAccumulatedScore = 0; for (int acc = 0; acc < songNo; acc++) danAccumulatedScore += IndividualScore[acc]; - IndividualScore[songNo] = (int)TJAPlayer3.stage演奏ドラム画面.actScore.GetScore(0) - danAccumulatedScore; + IndividualScore[songNo] = (int)OpenTaiko.stage演奏ドラム画面.actScore.GetScore(0) - danAccumulatedScore; } #endregion @@ -233,10 +233,10 @@ public void tResultsRegisterReplayInformations(int Coins, int Clear, int SRank) { // Actual player (Used for saved informations) - int actualPlayer = TJAPlayer3.GetActualPlayer(storedPlayer); + int actualPlayer = OpenTaiko.GetActualPlayer(storedPlayer); // Game mode - switch (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]) { + switch (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]) { case (int)Difficulty.Dan: GameMode = 1; break; @@ -252,16 +252,16 @@ // Chart Checksum (temporary) ChartChecksum = ""; // Player Name - PlayerName = TJAPlayer3.SaveFileInstances[actualPlayer].data.Name; + PlayerName = OpenTaiko.SaveFileInstances[actualPlayer].data.Name; // Performance informations - GoodCount = TJAPlayer3.stage演奏ドラム画面.CChartScore[storedPlayer].nGreat; - OkCount = TJAPlayer3.stage演奏ドラム画面.CChartScore[storedPlayer].nGood; - BadCount = TJAPlayer3.stage演奏ドラム画面.CChartScore[storedPlayer].nMiss; - RollCount = TJAPlayer3.stage演奏ドラム画面.GetRoll(storedPlayer); - MaxCombo = TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[storedPlayer]; - BoomCount = TJAPlayer3.stage演奏ドラム画面.CChartScore[storedPlayer].nMine; - ADLibCount = TJAPlayer3.stage演奏ドラム画面.CChartScore[storedPlayer].nADLIB; - Score = TJAPlayer3.stage演奏ドラム画面.CChartScore[storedPlayer].nScore; + GoodCount = OpenTaiko.stage演奏ドラム画面.CChartScore[storedPlayer].nGreat; + OkCount = OpenTaiko.stage演奏ドラム画面.CChartScore[storedPlayer].nGood; + BadCount = OpenTaiko.stage演奏ドラム画面.CChartScore[storedPlayer].nMiss; + RollCount = OpenTaiko.stage演奏ドラム画面.GetRoll(storedPlayer); + MaxCombo = OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[storedPlayer]; + BoomCount = OpenTaiko.stage演奏ドラム画面.CChartScore[storedPlayer].nMine; + ADLibCount = OpenTaiko.stage演奏ドラム画面.CChartScore[storedPlayer].nADLIB; + Score = OpenTaiko.stage演奏ドラム画面.CChartScore[storedPlayer].nScore; CoinValue = (short)Coins; // Tower parameters if (GameMode == 2) { @@ -273,11 +273,11 @@ // Score rank ScoreRank = (byte)SRank; // Scroll speed value (as on ConfigIni, 9 is x1) - ScrollSpeedValue = TJAPlayer3.ConfigIni.nScrollSpeed[actualPlayer]; + ScrollSpeedValue = OpenTaiko.ConfigIni.nScrollSpeed[actualPlayer]; // Song speed value (as on ConfigIni, 20 is x1) - SongSpeedValue = TJAPlayer3.ConfigIni.nSongSpeed; + SongSpeedValue = OpenTaiko.ConfigIni.nSongSpeed; // Just strictess adjust mod value (as on ConfigIni, between -2 for lenient and 2 for rigorous) - JudgeStrictnessAdjust = TJAPlayer3.ConfigIni.nTimingZones[actualPlayer]; + JudgeStrictnessAdjust = OpenTaiko.ConfigIni.nTimingZones[actualPlayer]; /* Mod Flags * Bit Offsets (Values) : @@ -292,25 +292,25 @@ * - 8 (256) : Safe (Bad => Ok) */ ModFlags = (int)EModFlag.None; - if (TJAPlayer3.ConfigIni.eRandom[actualPlayer] == ERandomMode.MIRROR) ModFlags |= (int)EModFlag.Mirror; - if (TJAPlayer3.ConfigIni.eRandom[actualPlayer] == ERandomMode.RANDOM) ModFlags |= (int)EModFlag.Random; - if (TJAPlayer3.ConfigIni.eRandom[actualPlayer] == ERandomMode.SUPERRANDOM) ModFlags |= (int)EModFlag.SuperRandom; - if (TJAPlayer3.ConfigIni.eRandom[actualPlayer] == ERandomMode.MIRRORRANDOM) ModFlags |= ((int)EModFlag.Random | (int)EModFlag.Mirror); - if (TJAPlayer3.ConfigIni.eSTEALTH[actualPlayer] == EStealthMode.DORON) ModFlags |= (int)EModFlag.Invisible; - if (TJAPlayer3.ConfigIni.eSTEALTH[actualPlayer] == EStealthMode.STEALTH) ModFlags |= (int)EModFlag.PerfectMemory; - if (TJAPlayer3.ConfigIni.nFunMods[actualPlayer] == EFunMods.AVALANCHE) ModFlags |= (int)EModFlag.Avalanche; - if (TJAPlayer3.ConfigIni.nFunMods[actualPlayer] == EFunMods.MINESWEEPER) ModFlags |= (int)EModFlag.Minesweeper; - if (TJAPlayer3.ConfigIni.bJust[actualPlayer] == 1) ModFlags |= (int)EModFlag.Just; - if (TJAPlayer3.ConfigIni.bJust[actualPlayer] == 2) ModFlags |= (int)EModFlag.Safe; + if (OpenTaiko.ConfigIni.eRandom[actualPlayer] == ERandomMode.MIRROR) ModFlags |= (int)EModFlag.Mirror; + if (OpenTaiko.ConfigIni.eRandom[actualPlayer] == ERandomMode.RANDOM) ModFlags |= (int)EModFlag.Random; + if (OpenTaiko.ConfigIni.eRandom[actualPlayer] == ERandomMode.SUPERRANDOM) ModFlags |= (int)EModFlag.SuperRandom; + if (OpenTaiko.ConfigIni.eRandom[actualPlayer] == ERandomMode.MIRRORRANDOM) ModFlags |= ((int)EModFlag.Random | (int)EModFlag.Mirror); + if (OpenTaiko.ConfigIni.eSTEALTH[actualPlayer] == EStealthMode.DORON) ModFlags |= (int)EModFlag.Invisible; + if (OpenTaiko.ConfigIni.eSTEALTH[actualPlayer] == EStealthMode.STEALTH) ModFlags |= (int)EModFlag.PerfectMemory; + if (OpenTaiko.ConfigIni.nFunMods[actualPlayer] == EFunMods.AVALANCHE) ModFlags |= (int)EModFlag.Avalanche; + if (OpenTaiko.ConfigIni.nFunMods[actualPlayer] == EFunMods.MINESWEEPER) ModFlags |= (int)EModFlag.Minesweeper; + if (OpenTaiko.ConfigIni.bJust[actualPlayer] == 1) ModFlags |= (int)EModFlag.Just; + if (OpenTaiko.ConfigIni.bJust[actualPlayer] == 2) ModFlags |= (int)EModFlag.Safe; /* Gauge type * - 0 : Normal * - 1 : Hard * - 2 : Extreme */ - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[actualPlayer].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[actualPlayer].data.Character]; GaugeType = (byte)HGaugeMethods.tGetGaugeTypeEnum(chara.effect.tGetGaugeType()); // Gauge fill value - GaugeFill = (float)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[storedPlayer]; + GaugeFill = (float)OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値[storedPlayer]; // Generation timestamp (in ticks) Timestamp = DateTime.Now.Ticks; // Compressed inputs and size @@ -318,9 +318,9 @@ CompressedInputs = SevenZip.Compression.LZMA.SevenZipHelper.Compress(barr); CompressedInputsSize = CompressedInputs.Length; // Chart metadata - ChartUniqueID = TJAPlayer3.stageSongSelect.rChoosenSong.uniqueId.data.id; - ChartDifficulty = (byte)TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[storedPlayer]; - ChartLevel = (byte)Math.Min(255, TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[ChartDifficulty].譜面情報.nレベル[ChartDifficulty]); + ChartUniqueID = OpenTaiko.stageSongSelect.rChoosenSong.uniqueId.data.id; + ChartDifficulty = (byte)OpenTaiko.stageSongSelect.nChoosenSongDifficulty[storedPlayer]; + ChartLevel = (byte)Math.Min(255, OpenTaiko.stageSongSelect.rChoosenSong.arスコア[ChartDifficulty].譜面情報.nレベル[ChartDifficulty]); // Online score ID used for online leaderboards linking, given by the server (Defaulted to 0 for now) OnlineScoreID = 0; // Replay Checksum (Calculate at the end) diff --git a/OpenTaiko/src/Components/CVisualLogManager.cs b/OpenTaiko/src/Components/CVisualLogManager.cs index c739e4ef..dae605e4 100644 --- a/OpenTaiko/src/Components/CVisualLogManager.cs +++ b/OpenTaiko/src/Components/CVisualLogManager.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CVisualLogManager { public enum ELogCardType { LogInfo, @@ -12,7 +12,7 @@ namespace TJAPlayer3 { public LogCard(ELogCardType type, string message) { lct = type; msg = message; - timeSinceCreation = new CCounter(0, 10000, 1, TJAPlayer3.Timer); + timeSinceCreation = new CCounter(0, 10000, 1, OpenTaiko.Timer); } public void Display(int screenPosition) { @@ -23,7 +23,7 @@ namespace TJAPlayer3 { int x = 0; int y = 0 + (40 * screenPosition); - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.Cyan, msg); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.Cyan, msg); } public bool IsExpired() { diff --git a/OpenTaiko/src/Databases/DBCDN.cs b/OpenTaiko/src/Databases/DBCDN.cs index 07fac50b..c40e6a21 100644 --- a/OpenTaiko/src/Databases/DBCDN.cs +++ b/OpenTaiko/src/Databases/DBCDN.cs @@ -1,9 +1,9 @@ using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { class DBCDN : CSavableT> { public DBCDN() { - _fn = @$"{TJAPlayer3.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}CDN.json"; + _fn = @$"{OpenTaiko.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}CDN.json"; base.tDBInitSavable(); } diff --git a/OpenTaiko/src/Databases/DBCharacter.cs b/OpenTaiko/src/Databases/DBCharacter.cs index 9de8a503..914d41aa 100644 --- a/OpenTaiko/src/Databases/DBCharacter.cs +++ b/OpenTaiko/src/Databases/DBCharacter.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { class DBCharacter { public class CharacterEffect { public CharacterEffect() { @@ -12,14 +12,14 @@ namespace TJAPlayer3 { public float GetCoinMultiplier() { float mult = 1f; - if (Gauge == "Hard" && !TJAPlayer3.ConfigIni.bForceNormalGauge) mult *= 1.5f; - if (Gauge == "Extreme" && !TJAPlayer3.ConfigIni.bForceNormalGauge) mult *= 1.8f; + if (Gauge == "Hard" && !OpenTaiko.ConfigIni.bForceNormalGauge) mult *= 1.5f; + if (Gauge == "Extreme" && !OpenTaiko.ConfigIni.bForceNormalGauge) mult *= 1.8f; return mult; } public string tGetGaugeType() { - return TJAPlayer3.ConfigIni.bForceNormalGauge || TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] >= 5 ? "Normal" : Gauge; + return OpenTaiko.ConfigIni.bForceNormalGauge || OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] >= 5 ? "Normal" : Gauge; } diff --git a/OpenTaiko/src/Databases/DBEncyclopediaMenus.cs b/OpenTaiko/src/Databases/DBEncyclopediaMenus.cs index 0dfe77f9..1916fd25 100644 --- a/OpenTaiko/src/Databases/DBEncyclopediaMenus.cs +++ b/OpenTaiko/src/Databases/DBEncyclopediaMenus.cs @@ -1,9 +1,9 @@ using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { class DBEncyclopediaMenus : CSavableT { public DBEncyclopediaMenus() { - _fn = @$"{TJAPlayer3.strEXEのあるフォルダ}Encyclopedia{Path.DirectorySeparatorChar}Menus.json"; + _fn = @$"{OpenTaiko.strEXEのあるフォルダ}Encyclopedia{Path.DirectorySeparatorChar}Menus.json"; base.tDBInitSavable(); } diff --git a/OpenTaiko/src/Databases/DBNameplateUnlockables.cs b/OpenTaiko/src/Databases/DBNameplateUnlockables.cs index 6a0d9885..53459260 100644 --- a/OpenTaiko/src/Databases/DBNameplateUnlockables.cs +++ b/OpenTaiko/src/Databases/DBNameplateUnlockables.cs @@ -1,14 +1,14 @@ using Microsoft.Data.Sqlite; using Newtonsoft.Json; -using static TJAPlayer3.DBNameplateUnlockables; +using static OpenTaiko.DBNameplateUnlockables; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class DBNameplateUnlockables : CSavableT> { public DBNameplateUnlockables() { //_fn = @$"{TJAPlayer3.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}NameplateUnlockables.json"; //base.tDBInitSavable(); - _fn = @$"{TJAPlayer3.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}NameplateUnlockables.db3"; + _fn = @$"{OpenTaiko.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}NameplateUnlockables.db3"; using (var connection = new SqliteConnection(@$"Data Source={_fn}")) { @@ -60,9 +60,9 @@ namespace TJAPlayer3 { } public void tGetUnlockedItems(int _player, ModalQueue mq) { - int player = TJAPlayer3.GetActualPlayer(_player); + int player = OpenTaiko.GetActualPlayer(_player); //var _sf = TJAPlayer3.SaveFileInstances[player].data.NamePlateTitles; - var _sf = TJAPlayer3.SaveFileInstances[player].data.UnlockedNameplateIds; + var _sf = OpenTaiko.SaveFileInstances[player].data.UnlockedNameplateIds; bool _edited = false; foreach (KeyValuePair item in data) { @@ -80,17 +80,17 @@ namespace TJAPlayer3 { Modal.EModalType.Title, HRarity.tRarityToLangInt(item.Value.rarity), item, - TJAPlayer3.NamePlate.lcNamePlate + OpenTaiko.NamePlate.lcNamePlate ), _player); - DBSaves.RegisterUnlockedNameplate(TJAPlayer3.SaveFileInstances[player].data.SaveId, _npvKey); + DBSaves.RegisterUnlockedNameplate(OpenTaiko.SaveFileInstances[player].data.SaveId, _npvKey); } } } if (_edited) - TJAPlayer3.SaveFileInstances[player].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[player].tApplyHeyaChanges(); } } } diff --git a/OpenTaiko/src/Databases/DBPuchichara.cs b/OpenTaiko/src/Databases/DBPuchichara.cs index 4f0f7f9a..e9b6cbd1 100644 --- a/OpenTaiko/src/Databases/DBPuchichara.cs +++ b/OpenTaiko/src/Databases/DBPuchichara.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { class DBPuchichara { public class PuchicharaEffect { public PuchicharaEffect() { diff --git a/OpenTaiko/src/Databases/DBSaves.cs b/OpenTaiko/src/Databases/DBSaves.cs index 7fa241d0..ac3ef717 100644 --- a/OpenTaiko/src/Databases/DBSaves.cs +++ b/OpenTaiko/src/Databases/DBSaves.cs @@ -2,10 +2,10 @@ using Microsoft.Data.Sqlite; using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class DBSaves { private static string _savesDBFilename = $@"Saves.db3"; - private static string _savesDBPath = @$"{TJAPlayer3.strEXEのあるフォルダ}{_savesDBFilename}"; + private static string _savesDBPath = @$"{OpenTaiko.strEXEのあるフォルダ}{_savesDBFilename}"; private static SqliteConnection SavesDBConnection = new SqliteConnection(@$"Data Source={_savesDBPath}"); private static string _DBNotFoundError = @$"The database {_savesDBFilename} was not found or the connection failed"; @@ -21,7 +21,7 @@ namespace TJAPlayer3 { } public static Int64 GetPlayerSaveId(int player) { - return TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.SaveId; + return OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.SaveId; } #region [Unlocked Dan Titles] @@ -276,11 +276,11 @@ namespace TJAPlayer3 { SqliteConnection? connection = GetSavesDBConnection(); if (connection == null) return; - SaveFile.Data saveData = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data; + SaveFile.Data saveData = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data; BestPlayRecords.CBestPlayRecord currentPlay = new BestPlayRecords.CBestPlayRecord(); - var choosenSong = TJAPlayer3.stageSongSelect.rChoosenSong; - var choosenDifficulty = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player]; - var chartScore = TJAPlayer3.stage演奏ドラム画面.CChartScore[player]; + var choosenSong = OpenTaiko.stageSongSelect.rChoosenSong; + var choosenDifficulty = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[player]; + var chartScore = OpenTaiko.stage演奏ドラム画面.CChartScore[player]; List[] danResults = new List[7] { new List(), new List(), new List(), new List(), new List(), new List(), new List() }; // Do not register the play if Dan/Tower and any mod is ON @@ -301,10 +301,10 @@ namespace TJAPlayer3 { currentPlay.HighScore = chartScore.nScore; if (choosenDifficulty == (int)Difficulty.Tower) currentPlay.TowerBestFloor = CFloorManagement.LastRegisteredFloor; if (choosenDifficulty == (int)Difficulty.Dan) { - for (int i = 0; i < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; i++) { - for (int j = 0; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C.Length; j++) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j] != null) { - int amount = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetAmount(); + for (int i = 0; i < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; i++) { + for (int j = 0; j < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C.Length; j++) { + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j] != null) { + int amount = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetAmount(); danResults[j].Add(amount); } } @@ -314,7 +314,7 @@ namespace TJAPlayer3 { currentPlay.HighScoreGoodCount = chartScore.nGreat; currentPlay.HighScoreOkCount = chartScore.nGood; currentPlay.HighScoreBadCount = chartScore.nMiss; - currentPlay.HighScoreMaxCombo = TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[player]; + currentPlay.HighScoreMaxCombo = OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[player]; currentPlay.HighScoreRollCount = chartScore.nRoll; currentPlay.HighScoreADLibCount = chartScore.nADLIB; currentPlay.HighScoreBoomCount = chartScore.nMine; @@ -355,18 +355,18 @@ namespace TJAPlayer3 { JsonConvert.DeserializeObject>((string)reader["DanExam6"]) ?? new List { -1 }, JsonConvert.DeserializeObject>((string)reader["DanExam7"]) ?? new List { -1 } }; - for (int i = 0; i < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; i++) { - for (int j = 0; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C.Length; j++) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j] != null) { + for (int i = 0; i < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; i++) { + for (int j = 0; j < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C.Length; j++) { + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j] != null) { int amount = danResults[j][i]; if (i < oldDanResults[j].Count) { int current = oldDanResults[j][i]; if (current == -1) { danResults[j][i] = amount; - } else if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetExamRange() == Exam.Range.More) { + } else if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetExamRange() == Exam.Range.More) { danResults[j][i] = Math.Max(amount, current); - } else if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetExamRange() == Exam.Range.Less) { + } else if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Dan_C[j].GetExamRange() == Exam.Range.Less) { danResults[j][i] = Math.Min(amount, current); } } diff --git a/OpenTaiko/src/Databases/DBSkinPreset.cs b/OpenTaiko/src/Databases/DBSkinPreset.cs index 422b940c..72c4979e 100644 --- a/OpenTaiko/src/Databases/DBSkinPreset.cs +++ b/OpenTaiko/src/Databases/DBSkinPreset.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class DBSkinPreset { public class SkinScene { public SkinScene() { diff --git a/OpenTaiko/src/Databases/DBSongUnlockables.cs b/OpenTaiko/src/Databases/DBSongUnlockables.cs index cf5e965a..482ea45a 100644 --- a/OpenTaiko/src/Databases/DBSongUnlockables.cs +++ b/OpenTaiko/src/Databases/DBSongUnlockables.cs @@ -1,8 +1,8 @@ using Microsoft.Data.Sqlite; using Newtonsoft.Json; -using static TJAPlayer3.DBSongUnlockables; +using static OpenTaiko.DBSongUnlockables; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class DBSongUnlockables : CSavableT> { /* DISPLAYED : Song displayed in song select, only a lock appearing on the side, audio preview plays * GRAYED : Box grayed, song preview does not play @@ -18,7 +18,7 @@ namespace TJAPlayer3 { //_fn = @$"{TJAPlayer3.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}SongUnlockables.json"; //base.tDBInitSavable(); - _fn = @$"{TJAPlayer3.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}SongUnlockables.db3"; + _fn = @$"{OpenTaiko.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}SongUnlockables.db3"; using (var connection = new SqliteConnection(@$"Data Source={_fn}")) { @@ -62,8 +62,8 @@ namespace TJAPlayer3 { } public void tGetUnlockedItems(int _player, ModalQueue mq) { - int player = TJAPlayer3.GetActualPlayer(_player); - var _sf = TJAPlayer3.SaveFileInstances[player].data.UnlockedSongs; + int player = OpenTaiko.GetActualPlayer(_player); + var _sf = OpenTaiko.SaveFileInstances[player].data.UnlockedSongs; bool _edited = false; foreach (KeyValuePair item in data) { @@ -86,23 +86,23 @@ namespace TJAPlayer3 { Modal.EModalType.Song, HRarity.tRarityToModalInt(item.Value.rarity), _node, - TJAPlayer3.stageSongSelect.actPreimageパネル.tGenerateAndGetPreimage(_node?.arスコア[0] ?? null) + OpenTaiko.stageSongSelect.actPreimageパネル.tGenerateAndGetPreimage(_node?.arスコア[0] ?? null) ), _player); - DBSaves.RegisterStringUnlockedAsset(TJAPlayer3.SaveFileInstances[player].data.SaveId, "unlocked_songs", _npvKey); + DBSaves.RegisterStringUnlockedAsset(OpenTaiko.SaveFileInstances[player].data.SaveId, "unlocked_songs", _npvKey); } } } if (_edited) - TJAPlayer3.SaveFileInstances[player].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[player].tApplyHeyaChanges(); } public bool tIsSongLocked(CSongListNode? song) { if (song == null) return false; - return !TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data.UnlockedSongs.Contains(song.tGetUniqueId()) + return !OpenTaiko.SaveFileInstances[OpenTaiko.SaveFile].data.UnlockedSongs.Contains(song.tGetUniqueId()) && data.ContainsKey(song.tGetUniqueId()); } diff --git a/OpenTaiko/src/Databases/DBUnlockables.cs b/OpenTaiko/src/Databases/DBUnlockables.cs index 8fd34128..0c30faad 100644 --- a/OpenTaiko/src/Databases/DBUnlockables.cs +++ b/OpenTaiko/src/Databases/DBUnlockables.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using static TJAPlayer3.BestPlayRecords; +using static OpenTaiko.BestPlayRecords; -namespace TJAPlayer3 { +namespace OpenTaiko { class DBUnlockables { public static Dictionary RequiredArgs = new Dictionary() { ["ch"] = 1, @@ -127,27 +127,27 @@ namespace TJAPlayer3 { case "cs": case "cm": if (this.Values.Length == 1) - return tConditionMet(new int[] { (int)TJAPlayer3.SaveFileInstances[player].data.Medals }, screen); + return tConditionMet(new int[] { (int)OpenTaiko.SaveFileInstances[player].data.Medals }, screen); else return (false, CLangManager.LangInstance.GetString("UNLOCK_CONDITION_ERROR", this.Condition, this.RequiredArgCount.ToString())); case "ce": if (this.Values.Length == 1) - return tConditionMet(new int[] { (int)TJAPlayer3.SaveFileInstances[player].data.TotalEarnedMedals }, screen); + return tConditionMet(new int[] { (int)OpenTaiko.SaveFileInstances[player].data.TotalEarnedMedals }, screen); else return (false, CLangManager.LangInstance.GetString("UNLOCK_CONDITION_ERROR", this.Condition, this.RequiredArgCount.ToString())); case "ap": if (this.Values.Length == 1) - return tConditionMet(new int[] { (int)TJAPlayer3.SaveFileInstances[player].data.AIBattleModePlaycount }, screen); + return tConditionMet(new int[] { (int)OpenTaiko.SaveFileInstances[player].data.AIBattleModePlaycount }, screen); else return (false, CLangManager.LangInstance.GetString("UNLOCK_CONDITION_ERROR", this.Condition, this.RequiredArgCount.ToString())); case "aw": if (this.Values.Length == 1) - return tConditionMet(new int[] { (int)TJAPlayer3.SaveFileInstances[player].data.AIBattleModeWins }, screen); + return tConditionMet(new int[] { (int)OpenTaiko.SaveFileInstances[player].data.AIBattleModeWins }, screen); else return (false, CLangManager.LangInstance.GetString("UNLOCK_CONDITION_ERROR", this.Condition, this.RequiredArgCount.ToString())); case "tp": if (this.Values.Length == 1) - return tConditionMet(new int[] { (int)TJAPlayer3.SaveFileInstances[player].data.TotalPlaycount }, screen); + return tConditionMet(new int[] { (int)OpenTaiko.SaveFileInstances[player].data.TotalPlaycount }, screen); else return (false, CLangManager.LangInstance.GetString("UNLOCK_CONDITION_ERROR", this.Condition, this.RequiredArgCount.ToString())); case "dp": @@ -245,7 +245,7 @@ namespace TJAPlayer3 { return CLangManager.LangInstance.GetString("UNLOCK_CONDITION_ERROR", this.Condition, this.RequiredArgCount); // Only the player loaded as 1P can check unlockables in real time - var SaveData = TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data; + var SaveData = OpenTaiko.SaveFileInstances[OpenTaiko.SaveFile].data; var ChartStats = SaveData.bestPlaysStats; switch (this.Condition) { @@ -428,8 +428,8 @@ namespace TJAPlayer3 { if (this.Condition == "dp" && (_aimedDifficulty < (int)Difficulty.Easy || _aimedDifficulty > (int)Difficulty.Edit)) return 0; } - var bpDistinctCharts = TJAPlayer3.SaveFileInstances[player].data.bestPlaysDistinctCharts; - var chartStats = TJAPlayer3.SaveFileInstances[player].data.bestPlaysStats; + var bpDistinctCharts = OpenTaiko.SaveFileInstances[player].data.bestPlaysDistinctCharts; + var chartStats = OpenTaiko.SaveFileInstances[player].data.bestPlaysStats; switch (this.Condition) { case "dp": diff --git a/OpenTaiko/src/Databases/Databases.cs b/OpenTaiko/src/Databases/Databases.cs index 43b5afd8..56256457 100644 --- a/OpenTaiko/src/Databases/Databases.cs +++ b/OpenTaiko/src/Databases/Databases.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class Databases { public void tDatabases() { DBCDN = new DBCDN(); diff --git a/OpenTaiko/src/Helpers/HDatabaseHelpers.cs b/OpenTaiko/src/Helpers/HDatabaseHelpers.cs index 6b672f21..fe3513b8 100644 --- a/OpenTaiko/src/Helpers/HDatabaseHelpers.cs +++ b/OpenTaiko/src/Helpers/HDatabaseHelpers.cs @@ -1,6 +1,6 @@ using Microsoft.Data.Sqlite; -namespace TJAPlayer3 { +namespace OpenTaiko { public static class HDatabaseHelpers { public static List GetAvailableLanguage(SqliteConnection connection, string prefix) { List _translations = new List(); diff --git a/OpenTaiko/src/Helpers/HEasingMethods.cs b/OpenTaiko/src/Helpers/HEasingMethods.cs index ea9014db..790b10eb 100644 --- a/OpenTaiko/src/Helpers/HEasingMethods.cs +++ b/OpenTaiko/src/Helpers/HEasingMethods.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class HEasingMethods { public enum EEaseType { IN = 0, diff --git a/OpenTaiko/src/Helpers/HGaugeMethods.cs b/OpenTaiko/src/Helpers/HGaugeMethods.cs index 3b06e9ef..60306df6 100644 --- a/OpenTaiko/src/Helpers/HGaugeMethods.cs +++ b/OpenTaiko/src/Helpers/HGaugeMethods.cs @@ -2,7 +2,7 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class HGaugeMethods { public enum EGaugeType { NORMAL = 0, @@ -387,7 +387,7 @@ namespace TJAPlayer3 { tDrawGaugeBase(baseTexture, x, y, scale_x, scale_y); tDrawGaugeBaseClear(baseNormaTexture, x, y, diff, level, gaugeType, scale_x, scale_y); tDrawGaugeFill(fillTexture, yellowTexture, (rainbowTextureArr != null && RainbowTextureIndex < rainbowTextureArr.Length) ? rainbowTextureArr[RainbowTextureIndex] : null, x, y, rainbow_x, rainbow_y, diff, level, currentPercent, gaugeType, scale_x, scale_y, Opacity, perfectHits, totalNotes); - if (!TJAPlayer3.ConfigIni.SimpleMode) tDrawGaugeFlash(flashTexture, x, y, Opacity, diff, level, currentPercent, gaugeType, scale_x, scale_y); + if (!OpenTaiko.ConfigIni.SimpleMode) tDrawGaugeFlash(flashTexture, x, y, Opacity, diff, level, currentPercent, gaugeType, scale_x, scale_y); tDrawKillZone(killzoneTexture, x, y, diff, level, gaugeType, scale_x, scale_y, perfectHits, totalNotes); tDrawClearIcon(clearIcon, diff, level, currentPercent, text_x, text_y, gaugeType, perfectHits, totalNotes, clearRect, clearRectHighlight); tDrawSoulFire(soulFire, diff, level, currentPercent, gaugeType, scale_x, scale_y, fire_x, fire_y, SoulFireIndex); @@ -400,42 +400,42 @@ namespace TJAPlayer3 { #region [Unsafe methods] public static bool UNSAFE_FastNormaCheck(int player) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; - var _dif = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character]; + var _dif = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[player]; return tNormaCheck( (Difficulty)_dif, - TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif], + OpenTaiko.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif], tGetGaugeTypeEnum(chara.effect.tGetGaugeType()), - (float)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[player], + (float)OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値[player], UNSAFE_KillZonePercent(player) ); } public static bool UNSAFE_IsRainbow(int player) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character]; if (tGetGaugeTypeEnum(chara.effect.tGetGaugeType()) != EGaugeType.NORMAL) return false; - return (float)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[player] >= 100f; + return (float)OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値[player] >= 100f; } public static float UNSAFE_KillZonePercent(int player) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character]; CDTX[] dtxs = { - TJAPlayer3.DTX, - TJAPlayer3.DTX_2P, - TJAPlayer3.DTX_3P, - TJAPlayer3.DTX_4P, - TJAPlayer3.DTX_5P + OpenTaiko.DTX, + OpenTaiko.DTX_2P, + OpenTaiko.DTX_3P, + OpenTaiko.DTX_4P, + OpenTaiko.DTX_5P }; // Total hits and perfect hits - int perfectHits = TJAPlayer3.stage演奏ドラム画面.CChartScore[player].nGreat; + int perfectHits = OpenTaiko.stage演奏ドラム画面.CChartScore[player].nGreat; int totalHits = dtxs[player].nノーツ数[3]; // Difficulty - int _dif = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player]; + int _dif = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[player]; Difficulty difficulty = (Difficulty)_dif; - int level = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif]; + int level = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif]; return tHardGaugeGetKillscreenRatio( difficulty, @@ -446,168 +446,168 @@ namespace TJAPlayer3 { } public static void UNSAFE_DrawGaugeFast(int player, int opacity, int rainbowTextureIndex, int soulFlameIndex) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character]; CDTX[] dtxs = { - TJAPlayer3.DTX, - TJAPlayer3.DTX_2P, - TJAPlayer3.DTX_3P, - TJAPlayer3.DTX_4P, - TJAPlayer3.DTX_5P + OpenTaiko.DTX, + OpenTaiko.DTX_2P, + OpenTaiko.DTX_3P, + OpenTaiko.DTX_4P, + OpenTaiko.DTX_5P }; // Set box - GaugeBox = new int[] { TJAPlayer3.Skin.Game_Gauge_Rect[0], TJAPlayer3.Skin.Game_Gauge_Rect[1], TJAPlayer3.Skin.Game_Gauge_Rect[2], TJAPlayer3.Skin.Game_Gauge_Rect[3] }; + GaugeBox = new int[] { OpenTaiko.Skin.Game_Gauge_Rect[0], OpenTaiko.Skin.Game_Gauge_Rect[1], OpenTaiko.Skin.Game_Gauge_Rect[2], OpenTaiko.Skin.Game_Gauge_Rect[3] }; // Gauge pos int gauge_x = 0; int gauge_y = 0; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - gauge_x = TJAPlayer3.Skin.Game_Gauge_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * player); - gauge_y = TJAPlayer3.Skin.Game_Gauge_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * player); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - gauge_x = TJAPlayer3.Skin.Game_Gauge_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * player); - gauge_y = TJAPlayer3.Skin.Game_Gauge_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * player); - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { - gauge_x = TJAPlayer3.Skin.Game_Gauge_X_AI; - gauge_y = TJAPlayer3.Skin.Game_Gauge_Y_AI; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + gauge_x = OpenTaiko.Skin.Game_Gauge_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * player); + gauge_y = OpenTaiko.Skin.Game_Gauge_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * player); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + gauge_x = OpenTaiko.Skin.Game_Gauge_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * player); + gauge_y = OpenTaiko.Skin.Game_Gauge_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * player); + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { + gauge_x = OpenTaiko.Skin.Game_Gauge_X_AI; + gauge_y = OpenTaiko.Skin.Game_Gauge_Y_AI; } else { - gauge_x = TJAPlayer3.Skin.Game_Gauge_X[player]; - gauge_y = TJAPlayer3.Skin.Game_Gauge_Y[player]; + gauge_x = OpenTaiko.Skin.Game_Gauge_X[player]; + gauge_y = OpenTaiko.Skin.Game_Gauge_Y[player]; } // Text pos int text_x = 0; int text_y = 0; - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - text_x = TJAPlayer3.Skin.Game_Gauge_ClearText_X_AI; - text_y = TJAPlayer3.Skin.Game_Gauge_ClearText_Y_AI; + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) { + if (OpenTaiko.ConfigIni.bAIBattleMode) { + text_x = OpenTaiko.Skin.Game_Gauge_ClearText_X_AI; + text_y = OpenTaiko.Skin.Game_Gauge_ClearText_Y_AI; } else { - text_x = TJAPlayer3.Skin.Game_Gauge_ClearText_X[player]; - text_y = TJAPlayer3.Skin.Game_Gauge_ClearText_Y[player]; + text_x = OpenTaiko.Skin.Game_Gauge_ClearText_X[player]; + text_y = OpenTaiko.Skin.Game_Gauge_ClearText_Y[player]; } } // Soul pos int soul_x = 0; int soul_y = 0; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - soul_x = TJAPlayer3.Skin.Gauge_Soul_X_AI; - soul_y = TJAPlayer3.Skin.Gauge_Soul_Y_AI; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + soul_x = OpenTaiko.Skin.Gauge_Soul_X_AI; + soul_y = OpenTaiko.Skin.Gauge_Soul_Y_AI; } else { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - soul_x = TJAPlayer3.Skin.Gauge_Soul_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * player); - soul_y = TJAPlayer3.Skin.Gauge_Soul_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * player); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - soul_x = TJAPlayer3.Skin.Gauge_Soul_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * player); - soul_y = TJAPlayer3.Skin.Gauge_Soul_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * player); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + soul_x = OpenTaiko.Skin.Gauge_Soul_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * player); + soul_y = OpenTaiko.Skin.Gauge_Soul_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * player); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + soul_x = OpenTaiko.Skin.Gauge_Soul_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * player); + soul_y = OpenTaiko.Skin.Gauge_Soul_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * player); } else { - soul_x = TJAPlayer3.Skin.Gauge_Soul_X[player]; - soul_y = TJAPlayer3.Skin.Gauge_Soul_Y[player]; + soul_x = OpenTaiko.Skin.Gauge_Soul_X[player]; + soul_y = OpenTaiko.Skin.Gauge_Soul_Y[player]; } } // Fire pos int fire_x = 0; int fire_y = 0; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - fire_x = TJAPlayer3.Skin.Gauge_Soul_Fire_X_AI; - fire_y = TJAPlayer3.Skin.Gauge_Soul_Fire_Y_AI; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + fire_x = OpenTaiko.Skin.Gauge_Soul_Fire_X_AI; + fire_y = OpenTaiko.Skin.Gauge_Soul_Fire_Y_AI; } else { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - fire_x = TJAPlayer3.Skin.Gauge_Soul_Fire_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * player); - fire_y = TJAPlayer3.Skin.Gauge_Soul_Fire_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * player); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - fire_x = TJAPlayer3.Skin.Gauge_Soul_Fire_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * player); - fire_y = TJAPlayer3.Skin.Gauge_Soul_Fire_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * player); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + fire_x = OpenTaiko.Skin.Gauge_Soul_Fire_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * player); + fire_y = OpenTaiko.Skin.Gauge_Soul_Fire_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * player); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + fire_x = OpenTaiko.Skin.Gauge_Soul_Fire_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * player); + fire_y = OpenTaiko.Skin.Gauge_Soul_Fire_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * player); } else { - fire_x = TJAPlayer3.Skin.Gauge_Soul_Fire_X[player]; - fire_y = TJAPlayer3.Skin.Gauge_Soul_Fire_Y[player]; + fire_x = OpenTaiko.Skin.Gauge_Soul_Fire_X[player]; + fire_y = OpenTaiko.Skin.Gauge_Soul_Fire_Y[player]; } } // Total hits and perfect hits - int perfectHits = TJAPlayer3.stage演奏ドラム画面.CChartScore[player].nGreat; + int perfectHits = OpenTaiko.stage演奏ドラム画面.CChartScore[player].nGreat; int totalHits = dtxs[player].nノーツ数[3]; // Scale float scale = 1.0f; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { + if (OpenTaiko.ConfigIni.bAIBattleMode) { scale = 0.8f; } // Difficulty - int _dif = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player]; + int _dif = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[player]; Difficulty difficulty = (Difficulty)_dif; - int level = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif]; + int level = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif]; // Current percent - float currentPercent = (float)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[player]; + float currentPercent = (float)OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値[player]; // Gauge type EGaugeType gaugeType = tGetGaugeTypeEnum(chara.effect.tGetGaugeType()); // Textures - int _4pGaugeIDX = (TJAPlayer3.ConfigIni.nPlayerCount >= 3) ? 1 : 0; + int _4pGaugeIDX = (OpenTaiko.ConfigIni.nPlayerCount >= 3) ? 1 : 0; int _usedGauge = player + 3 * _4pGaugeIDX; - if (TJAPlayer3.P1IsBlue()) _usedGauge = 2; - _4pGaugeIDX = (TJAPlayer3.ConfigIni.nPlayerCount >= 3) ? 2 + if (OpenTaiko.P1IsBlue()) _usedGauge = 2; + _4pGaugeIDX = (OpenTaiko.ConfigIni.nPlayerCount >= 3) ? 2 : (player == 1) ? 1 : 0; - CTexture baseTexture = TJAPlayer3.Tx.Gauge_Base[_usedGauge]; - CTexture fillTexture = TJAPlayer3.Tx.Gauge[_usedGauge]; + CTexture baseTexture = OpenTaiko.Tx.Gauge_Base[_usedGauge]; + CTexture fillTexture = OpenTaiko.Tx.Gauge[_usedGauge]; - CTexture[] rainbowTextureArr = (new CTexture[][] { TJAPlayer3.Tx.Gauge_Rainbow, TJAPlayer3.Tx.Gauge_Rainbow_2PGauge, TJAPlayer3.Tx.Gauge_Rainbow_Flat })[_4pGaugeIDX]; - CTexture yellowTexture = TJAPlayer3.Tx.Gauge_Clear[_4pGaugeIDX]; - CTexture baseNormaTexture = TJAPlayer3.Tx.Gauge_Base_Norma[_4pGaugeIDX]; - CTexture killzoneTexture = TJAPlayer3.Tx.Gauge_Killzone[_4pGaugeIDX]; + CTexture[] rainbowTextureArr = (new CTexture[][] { OpenTaiko.Tx.Gauge_Rainbow, OpenTaiko.Tx.Gauge_Rainbow_2PGauge, OpenTaiko.Tx.Gauge_Rainbow_Flat })[_4pGaugeIDX]; + CTexture yellowTexture = OpenTaiko.Tx.Gauge_Clear[_4pGaugeIDX]; + CTexture baseNormaTexture = OpenTaiko.Tx.Gauge_Base_Norma[_4pGaugeIDX]; + CTexture killzoneTexture = OpenTaiko.Tx.Gauge_Killzone[_4pGaugeIDX]; CTexture flashTexture = yellowTexture; CTexture clearIcon = (_4pGaugeIDX == 2) ? null : (gaugeType != EGaugeType.NORMAL) - ? TJAPlayer3.Tx.Gauge_Killzone[0] - : TJAPlayer3.Tx.Gauge[0]; - CTexture soulLetter = TJAPlayer3.Tx.Gauge_Soul; - CTexture soulFlame = TJAPlayer3.Tx.Gauge_Soul_Fire; + ? OpenTaiko.Tx.Gauge_Killzone[0] + : OpenTaiko.Tx.Gauge[0]; + CTexture soulLetter = OpenTaiko.Tx.Gauge_Soul; + CTexture soulFlame = OpenTaiko.Tx.Gauge_Soul_Fire; // Rectangles Rectangle clearRectHighlight = new Rectangle( - TJAPlayer3.Skin.Game_Gauge_ClearText_Rect[0], - TJAPlayer3.Skin.Game_Gauge_ClearText_Rect[1], - TJAPlayer3.Skin.Game_Gauge_ClearText_Rect[2], - TJAPlayer3.Skin.Game_Gauge_ClearText_Rect[3] + OpenTaiko.Skin.Game_Gauge_ClearText_Rect[0], + OpenTaiko.Skin.Game_Gauge_ClearText_Rect[1], + OpenTaiko.Skin.Game_Gauge_ClearText_Rect[2], + OpenTaiko.Skin.Game_Gauge_ClearText_Rect[3] ); Rectangle clearRect = new Rectangle( - TJAPlayer3.Skin.Game_Gauge_ClearText_Clear_Rect[0], - TJAPlayer3.Skin.Game_Gauge_ClearText_Clear_Rect[1], - TJAPlayer3.Skin.Game_Gauge_ClearText_Clear_Rect[2], - TJAPlayer3.Skin.Game_Gauge_ClearText_Clear_Rect[3] + OpenTaiko.Skin.Game_Gauge_ClearText_Clear_Rect[0], + OpenTaiko.Skin.Game_Gauge_ClearText_Clear_Rect[1], + OpenTaiko.Skin.Game_Gauge_ClearText_Clear_Rect[2], + OpenTaiko.Skin.Game_Gauge_ClearText_Clear_Rect[3] ); tDrawCompleteGauge(baseTexture, baseNormaTexture, flashTexture, fillTexture, yellowTexture, rainbowTextureArr, killzoneTexture, clearIcon, soulLetter, soulFlame, gauge_x, gauge_y, gauge_x, gauge_y, opacity, rainbowTextureIndex, soulFlameIndex, difficulty, level, currentPercent, gaugeType, scale, scale, text_x, text_y, perfectHits, totalHits, soul_x, soul_y, fire_x, fire_y, clearRect, clearRectHighlight); } public static void UNSAFE_DrawResultGaugeFast(int player, int shiftPos, int pos, int segmentsDisplayed, int rainbowTextureIndex, int soulFlameIndex, int uioffset_x) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character]; CDTX[] dtxs = { - TJAPlayer3.DTX, - TJAPlayer3.DTX_2P, - TJAPlayer3.DTX_3P, - TJAPlayer3.DTX_4P, - TJAPlayer3.DTX_5P + OpenTaiko.DTX, + OpenTaiko.DTX_2P, + OpenTaiko.DTX_3P, + OpenTaiko.DTX_4P, + OpenTaiko.DTX_5P }; // Set box - GaugeBox = new int[] { TJAPlayer3.Skin.Result_Gauge_Rect[0], TJAPlayer3.Skin.Result_Gauge_Rect[1], TJAPlayer3.Skin.Result_Gauge_Rect[2], TJAPlayer3.Skin.Result_Gauge_Rect[3] }; + GaugeBox = new int[] { OpenTaiko.Skin.Result_Gauge_Rect[0], OpenTaiko.Skin.Result_Gauge_Rect[1], OpenTaiko.Skin.Result_Gauge_Rect[2], OpenTaiko.Skin.Result_Gauge_Rect[3] }; // Total hits and perfect hits - int perfectHits = TJAPlayer3.stage演奏ドラム画面.CChartScore[player].nGreat; + int perfectHits = OpenTaiko.stage演奏ドラム画面.CChartScore[player].nGreat; int totalHits = dtxs[player].nノーツ数[3]; // Gauge type @@ -618,39 +618,39 @@ namespace TJAPlayer3 { // Scale x float scale_x = 1.0f; - if (TJAPlayer3.ConfigIni.nPlayerCount >= 3) { + if (OpenTaiko.ConfigIni.nPlayerCount >= 3) { scale_x = 0.5f; } // Difficulty - int _dif = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[player]; + int _dif = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[player]; Difficulty difficulty = (Difficulty)_dif; - int level = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif]; + int level = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[_dif].譜面情報.nレベル[_dif]; int gauge_x; int gauge_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - gauge_x = TJAPlayer3.Skin.Result_Gauge_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - gauge_y = TJAPlayer3.Skin.Result_Gauge_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - gauge_x = TJAPlayer3.Skin.Result_Gauge_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - gauge_y = TJAPlayer3.Skin.Result_Gauge_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + gauge_x = OpenTaiko.Skin.Result_Gauge_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + gauge_y = OpenTaiko.Skin.Result_Gauge_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + gauge_x = OpenTaiko.Skin.Result_Gauge_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + gauge_y = OpenTaiko.Skin.Result_Gauge_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { - gauge_x = TJAPlayer3.Skin.Result_Gauge_X[pos] + uioffset_x; - gauge_y = TJAPlayer3.Skin.Result_Gauge_Y[pos]; + gauge_x = OpenTaiko.Skin.Result_Gauge_X[pos] + uioffset_x; + gauge_y = OpenTaiko.Skin.Result_Gauge_Y[pos]; } int gauge_rainbow_x; int gauge_rainbow_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - gauge_rainbow_x = TJAPlayer3.Skin.Result_Gauge_Rainbow_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - gauge_rainbow_y = TJAPlayer3.Skin.Result_Gauge_Rainbow_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - gauge_rainbow_x = TJAPlayer3.Skin.Result_Gauge_Rainbow_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - gauge_rainbow_y = TJAPlayer3.Skin.Result_Gauge_Rainbow_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + gauge_rainbow_x = OpenTaiko.Skin.Result_Gauge_Rainbow_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + gauge_rainbow_y = OpenTaiko.Skin.Result_Gauge_Rainbow_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + gauge_rainbow_x = OpenTaiko.Skin.Result_Gauge_Rainbow_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + gauge_rainbow_y = OpenTaiko.Skin.Result_Gauge_Rainbow_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { - gauge_rainbow_x = TJAPlayer3.Skin.Result_Gauge_Rainbow_X[pos] + uioffset_x; - gauge_rainbow_y = TJAPlayer3.Skin.Result_Gauge_Rainbow_Y[pos]; + gauge_rainbow_x = OpenTaiko.Skin.Result_Gauge_Rainbow_X[pos] + uioffset_x; + gauge_rainbow_y = OpenTaiko.Skin.Result_Gauge_Rainbow_Y[pos]; } // Flame and soul @@ -658,68 +658,68 @@ namespace TJAPlayer3 { int soulText_y; int soulFire_x; int soulFire_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - soulText_x = TJAPlayer3.Skin.Result_Soul_Text_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - soulText_y = TJAPlayer3.Skin.Result_Soul_Text_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - soulFire_x = TJAPlayer3.Skin.Result_Soul_Fire_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - soulFire_y = TJAPlayer3.Skin.Result_Soul_Fire_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - soulText_x = TJAPlayer3.Skin.Result_Soul_Text_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[0]; - soulText_y = TJAPlayer3.Skin.Result_Soul_Text_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[1]; - soulFire_x = TJAPlayer3.Skin.Result_Soul_Fire_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[0]; - soulFire_y = TJAPlayer3.Skin.Result_Soul_Fire_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[1]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + soulText_x = OpenTaiko.Skin.Result_Soul_Text_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + soulText_y = OpenTaiko.Skin.Result_Soul_Text_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + soulFire_x = OpenTaiko.Skin.Result_Soul_Fire_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + soulFire_y = OpenTaiko.Skin.Result_Soul_Fire_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + soulText_x = OpenTaiko.Skin.Result_Soul_Text_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[0]; + soulText_y = OpenTaiko.Skin.Result_Soul_Text_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[1]; + soulFire_x = OpenTaiko.Skin.Result_Soul_Fire_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[0]; + soulFire_y = OpenTaiko.Skin.Result_Soul_Fire_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[1]; } else { - soulText_x = TJAPlayer3.Skin.Result_Soul_Text_X[pos] + uioffset_x; - soulText_y = TJAPlayer3.Skin.Result_Soul_Text_Y[pos]; - soulFire_x = TJAPlayer3.Skin.Result_Soul_Fire_X[pos] + uioffset_x; - soulFire_y = TJAPlayer3.Skin.Result_Soul_Fire_Y[pos]; + soulText_x = OpenTaiko.Skin.Result_Soul_Text_X[pos] + uioffset_x; + soulText_y = OpenTaiko.Skin.Result_Soul_Text_Y[pos]; + soulFire_x = OpenTaiko.Skin.Result_Soul_Fire_X[pos] + uioffset_x; + soulFire_y = OpenTaiko.Skin.Result_Soul_Fire_Y[pos]; } // Clear text int clearText_x; int clearText_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - clearText_x = TJAPlayer3.Skin.Result_Gauge_ClearText_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - clearText_y = TJAPlayer3.Skin.Result_Gauge_ClearText_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - clearText_x = TJAPlayer3.Skin.Result_Gauge_ClearText_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - clearText_y = TJAPlayer3.Skin.Result_Gauge_ClearText_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + clearText_x = OpenTaiko.Skin.Result_Gauge_ClearText_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + clearText_y = OpenTaiko.Skin.Result_Gauge_ClearText_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + clearText_x = OpenTaiko.Skin.Result_Gauge_ClearText_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + clearText_y = OpenTaiko.Skin.Result_Gauge_ClearText_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { - clearText_x = TJAPlayer3.Skin.Result_Gauge_ClearText_X[pos] + uioffset_x; - clearText_y = TJAPlayer3.Skin.Result_Gauge_ClearText_Y[pos]; + clearText_x = OpenTaiko.Skin.Result_Gauge_ClearText_X[pos] + uioffset_x; + clearText_y = OpenTaiko.Skin.Result_Gauge_ClearText_Y[pos]; } // Textures int _usedGauge = shiftPos; - CTexture baseTexture = TJAPlayer3.Tx.Result_Gauge_Base[_usedGauge]; - CTexture fillTexture = TJAPlayer3.Tx.Result_Gauge[_usedGauge]; + CTexture baseTexture = OpenTaiko.Tx.Result_Gauge_Base[_usedGauge]; + CTexture fillTexture = OpenTaiko.Tx.Result_Gauge[_usedGauge]; - CTexture[] rainbowTextureArr = TJAPlayer3.Tx.Result_Rainbow; - CTexture yellowTexture = TJAPlayer3.Tx.Result_Gauge_Clear; - CTexture baseNormaTexture = TJAPlayer3.Tx.Result_Gauge_Clear_Base; - CTexture killzoneTexture = TJAPlayer3.Tx.Result_Gauge_Killzone; + CTexture[] rainbowTextureArr = OpenTaiko.Tx.Result_Rainbow; + CTexture yellowTexture = OpenTaiko.Tx.Result_Gauge_Clear; + CTexture baseNormaTexture = OpenTaiko.Tx.Result_Gauge_Clear_Base; + CTexture killzoneTexture = OpenTaiko.Tx.Result_Gauge_Killzone; CTexture flashTexture = null; CTexture clearIcon = (gaugeType != EGaugeType.NORMAL) - ? TJAPlayer3.Tx.Result_Gauge_Killzone - : TJAPlayer3.Tx.Result_Gauge[0]; + ? OpenTaiko.Tx.Result_Gauge_Killzone + : OpenTaiko.Tx.Result_Gauge[0]; - CTexture soulLetter = TJAPlayer3.Tx.Result_Soul_Text; - CTexture soulFlame = TJAPlayer3.Tx.Result_Soul_Fire; + CTexture soulLetter = OpenTaiko.Tx.Result_Soul_Text; + CTexture soulFlame = OpenTaiko.Tx.Result_Soul_Fire; // Rectangles Rectangle clearRectHighlight = new Rectangle( - TJAPlayer3.Skin.Result_Gauge_ClearText_Clear_Rect[0], - TJAPlayer3.Skin.Result_Gauge_ClearText_Clear_Rect[1], - TJAPlayer3.Skin.Result_Gauge_ClearText_Clear_Rect[2], - TJAPlayer3.Skin.Result_Gauge_ClearText_Clear_Rect[3] + OpenTaiko.Skin.Result_Gauge_ClearText_Clear_Rect[0], + OpenTaiko.Skin.Result_Gauge_ClearText_Clear_Rect[1], + OpenTaiko.Skin.Result_Gauge_ClearText_Clear_Rect[2], + OpenTaiko.Skin.Result_Gauge_ClearText_Clear_Rect[3] ); Rectangle clearRect = new Rectangle( - TJAPlayer3.Skin.Result_Gauge_ClearText_Rect[0], - TJAPlayer3.Skin.Result_Gauge_ClearText_Rect[1], - TJAPlayer3.Skin.Result_Gauge_ClearText_Rect[2], - TJAPlayer3.Skin.Result_Gauge_ClearText_Rect[3] + OpenTaiko.Skin.Result_Gauge_ClearText_Rect[0], + OpenTaiko.Skin.Result_Gauge_ClearText_Rect[1], + OpenTaiko.Skin.Result_Gauge_ClearText_Rect[2], + OpenTaiko.Skin.Result_Gauge_ClearText_Rect[3] ); // Positionnings @@ -739,7 +739,7 @@ namespace TJAPlayer3 { #endregion - private static int[] GaugeBox = { TJAPlayer3.Skin.Game_Gauge_Rect[0], TJAPlayer3.Skin.Game_Gauge_Rect[1], TJAPlayer3.Skin.Game_Gauge_Rect[2], TJAPlayer3.Skin.Game_Gauge_Rect[3] }; + private static int[] GaugeBox = { OpenTaiko.Skin.Game_Gauge_Rect[0], OpenTaiko.Skin.Game_Gauge_Rect[1], OpenTaiko.Skin.Game_Gauge_Rect[2], OpenTaiko.Skin.Game_Gauge_Rect[3] }; } } diff --git a/OpenTaiko/src/Helpers/HGenreBar.cs b/OpenTaiko/src/Helpers/HGenreBar.cs index b521d58c..37248603 100644 --- a/OpenTaiko/src/Helpers/HGenreBar.cs +++ b/OpenTaiko/src/Helpers/HGenreBar.cs @@ -1,7 +1,7 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class HGenreBar { public static CTexture tGetGenreBar(string value, Dictionary textures) { if (textures.TryGetValue($"{value}", out CTexture tex)) { diff --git a/OpenTaiko/src/Helpers/HLocalizedPath.cs b/OpenTaiko/src/Helpers/HLocalizedPath.cs index 105811b1..cb4ed7bd 100644 --- a/OpenTaiko/src/Helpers/HLocalizedPath.cs +++ b/OpenTaiko/src/Helpers/HLocalizedPath.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { public static class HLocalizedPath { public static string GetFullPathWithoutExtension(string path) { return System.IO.Path.Combine(System.IO.Path.GetDirectoryName(path), System.IO.Path.GetFileNameWithoutExtension(path)); diff --git a/OpenTaiko/src/Helpers/HPrivateFastFont.cs b/OpenTaiko/src/Helpers/HPrivateFastFont.cs index 985c4b35..22abfbd4 100644 --- a/OpenTaiko/src/Helpers/HPrivateFastFont.cs +++ b/OpenTaiko/src/Helpers/HPrivateFastFont.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class HPrivateFastFont { static string DefaultFont = CFontRenderer.DefaultFontName; @@ -15,16 +15,16 @@ namespace TJAPlayer3 { } public static CCachedFontRenderer tInstantiateMainFont(int scale, CFontRenderer.FontStyle style = CFontRenderer.FontStyle.Regular) { - if (FontExists(TJAPlayer3.Skin.FontName)) - return (new CCachedFontRenderer(TJAPlayer3.Skin.FontName, scale, style)); + if (FontExists(OpenTaiko.Skin.FontName)) + return (new CCachedFontRenderer(OpenTaiko.Skin.FontName, scale, style)); if (FontExists(CLangManager.LangInstance.FontName)) return (new CCachedFontRenderer(CLangManager.LangInstance.FontName, scale, style)); return (new CCachedFontRenderer(DefaultFont, scale, style)); } public static CCachedFontRenderer tInstantiateBoxFont(int scale, CFontRenderer.FontStyle style = CFontRenderer.FontStyle.Regular) { - if (FontExists(TJAPlayer3.Skin.BoxFontName)) - return (new CCachedFontRenderer(TJAPlayer3.Skin.FontName, scale, style)); + if (FontExists(OpenTaiko.Skin.BoxFontName)) + return (new CCachedFontRenderer(OpenTaiko.Skin.FontName, scale, style)); if (FontExists(CLangManager.LangInstance.BoxFontName)) return (new CCachedFontRenderer(CLangManager.LangInstance.FontName, scale, style)); return (new CCachedFontRenderer(DefaultFont, scale, style)); diff --git a/OpenTaiko/src/Helpers/HRarity.cs b/OpenTaiko/src/Helpers/HRarity.cs index d193b24d..abf929b7 100644 --- a/OpenTaiko/src/Helpers/HRarity.cs +++ b/OpenTaiko/src/Helpers/HRarity.cs @@ -1,6 +1,6 @@ using Color = System.Drawing.Color; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class HRarity { private static Dictionary RarityToColor = new Dictionary { ["Poor"] = Color.Gray, diff --git a/OpenTaiko/src/Helpers/HScenePreset.cs b/OpenTaiko/src/Helpers/HScenePreset.cs index 627f64eb..9df12677 100644 --- a/OpenTaiko/src/Helpers/HScenePreset.cs +++ b/OpenTaiko/src/Helpers/HScenePreset.cs @@ -1,12 +1,12 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class HScenePreset { public static DBSkinPreset.SkinScene GetBGPreset() { string presetSection = ""; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { presetSection = "Tower"; - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { presetSection = "Dan"; - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { presetSection = "AI"; } else { presetSection = "Regular"; @@ -16,16 +16,16 @@ namespace TJAPlayer3 { switch (presetSection) { case "Regular": - _ps = TJAPlayer3.Skin.Game_SkinScenes.Regular; + _ps = OpenTaiko.Skin.Game_SkinScenes.Regular; break; case "Dan": - _ps = TJAPlayer3.Skin.Game_SkinScenes.Dan; + _ps = OpenTaiko.Skin.Game_SkinScenes.Dan; break; case "Tower": - _ps = TJAPlayer3.Skin.Game_SkinScenes.Tower; + _ps = OpenTaiko.Skin.Game_SkinScenes.Tower; break; case "AI": - _ps = TJAPlayer3.Skin.Game_SkinScenes.AI; + _ps = OpenTaiko.Skin.Game_SkinScenes.AI; break; default: break; @@ -34,20 +34,20 @@ namespace TJAPlayer3 { bool sectionIsValid = _ps != null ? ((Dictionary)_ps).Count > 0 : false; var preset = (sectionIsValid - && TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset != null - && ((Dictionary)_ps).ContainsKey(TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset)) - ? ((Dictionary)_ps)[TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset] + && OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset != null + && ((Dictionary)_ps).ContainsKey(OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset)) + ? ((Dictionary)_ps)[OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset] : null; if (sectionIsValid - && TJAPlayer3.DTX.scenePreset != null - && ((Dictionary)_ps).ContainsKey(TJAPlayer3.DTX.scenePreset)) // If currently selected song has valid SCENEPRESET metadata within TJA + && OpenTaiko.DTX.scenePreset != null + && ((Dictionary)_ps).ContainsKey(OpenTaiko.DTX.scenePreset)) // If currently selected song has valid SCENEPRESET metadata within TJA { - preset = ((Dictionary)_ps)[TJAPlayer3.DTX.scenePreset]; + preset = ((Dictionary)_ps)[OpenTaiko.DTX.scenePreset]; } else if (sectionIsValid - && TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset != null - && ((Dictionary)_ps).ContainsKey(TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset)) { - preset = ((Dictionary)_ps)[TJAPlayer3.stageSongSelect.rChoosenSong.strScenePreset]; + && OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset != null + && ((Dictionary)_ps).ContainsKey(OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset)) { + preset = ((Dictionary)_ps)[OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset]; } else if (sectionIsValid && ((Dictionary)_ps).ContainsKey("")) { preset = ((Dictionary)_ps)[""]; diff --git a/OpenTaiko/src/Helpers/HSongTraverse.cs b/OpenTaiko/src/Helpers/HSongTraverse.cs index 8674be5c..9781cf45 100644 --- a/OpenTaiko/src/Helpers/HSongTraverse.cs +++ b/OpenTaiko/src/Helpers/HSongTraverse.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class HSongTraverse { public static List SpecialFolders = new List { "Favorite", "最近遊んだ曲", "SearchD" }; diff --git a/OpenTaiko/src/Helpers/LocalizedStringConverter.cs b/OpenTaiko/src/Helpers/LocalizedStringConverter.cs index cb5609c3..f21fc928 100644 --- a/OpenTaiko/src/Helpers/LocalizedStringConverter.cs +++ b/OpenTaiko/src/Helpers/LocalizedStringConverter.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class LocalizedStringConverter : JsonConverter { public override bool CanConvert(Type objectType) { // CanConvert is not called when the [JsonConverter] attribute is used diff --git a/OpenTaiko/src/Helpers/ObjectExtensions.cs b/OpenTaiko/src/Helpers/ObjectExtensions.cs index 9bf72554..6beebe92 100644 --- a/OpenTaiko/src/Helpers/ObjectExtensions.cs +++ b/OpenTaiko/src/Helpers/ObjectExtensions.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Reflection; using System.Text.RegularExpressions; -using TJAPlayer3; +using OpenTaiko; // https://github.com/Burtsev-Alexey/net-object-deep-copy/blob/master/ObjectExtensions.cs diff --git a/OpenTaiko/src/I18N/CLang.cs b/OpenTaiko/src/I18N/CLang.cs index 5b6958dd..35a6546e 100644 --- a/OpenTaiko/src/I18N/CLang.cs +++ b/OpenTaiko/src/I18N/CLang.cs @@ -3,7 +3,7 @@ using System.Text.Json; using System.Text.Json.Nodes; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CLang { public string Id { get; private set; } = "foo"; public string Language { get; private set; } = "Unknown Language"; @@ -18,7 +18,7 @@ namespace TJAPlayer3 { get { return File.Exists(Path.Combine(Folder, _boxFontName)) ? Path.Combine(Folder, _boxFontName) : _boxFontName; } private set { _boxFontName = value; } } - public string Folder { get { return @$"{TJAPlayer3.strEXEのあるフォルダ}Lang{Path.DirectorySeparatorChar}{Id}{Path.DirectorySeparatorChar}"; } } + public string Folder { get { return @$"{OpenTaiko.strEXEのあるフォルダ}Lang{Path.DirectorySeparatorChar}{Id}{Path.DirectorySeparatorChar}"; } } private string _fontName = CFontRenderer.DefaultFontName; private string _boxFontName = CFontRenderer.DefaultFontName; diff --git a/OpenTaiko/src/I18N/ILang.cs b/OpenTaiko/src/I18N/ILang.cs index 85a6f524..34997eac 100644 --- a/OpenTaiko/src/I18N/ILang.cs +++ b/OpenTaiko/src/I18N/ILang.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal interface ILang { string GetString(int idx); } @@ -71,8 +71,8 @@ public static string[] Langcodes { get { if (_langCodes == null) - _langCodes = Directory.GetDirectories(Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "Lang"), "*", SearchOption.TopDirectoryOnly) - .Select(result => Path.GetRelativePath(Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "Lang"), result)) + _langCodes = Directory.GetDirectories(Path.Combine(OpenTaiko.strEXEのあるフォルダ, "Lang"), "*", SearchOption.TopDirectoryOnly) + .Select(result => Path.GetRelativePath(Path.Combine(OpenTaiko.strEXEのあるフォルダ, "Lang"), result)) .ToArray(); return _langCodes; diff --git a/OpenTaiko/src/Items/CItemBase.cs b/OpenTaiko/src/Items/CItemBase.cs index a5402fa1..80fab67b 100644 --- a/OpenTaiko/src/Items/CItemBase.cs +++ b/OpenTaiko/src/Items/CItemBase.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// すべてのアイテムの基本クラス。 /// diff --git a/OpenTaiko/src/Items/CItemInteger.cs b/OpenTaiko/src/Items/CItemInteger.cs index 11f1b430..29bff87c 100644 --- a/OpenTaiko/src/Items/CItemInteger.cs +++ b/OpenTaiko/src/Items/CItemInteger.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 「整数」を表すアイテム。 /// diff --git a/OpenTaiko/src/Items/CItemList.cs b/OpenTaiko/src/Items/CItemList.cs index f76c2f1a..1581f4ef 100644 --- a/OpenTaiko/src/Items/CItemList.cs +++ b/OpenTaiko/src/Items/CItemList.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 「リスト」（複数の固定値からの１つを選択可能）を表すアイテム。 /// diff --git a/OpenTaiko/src/Items/CItemThreeState.cs b/OpenTaiko/src/Items/CItemThreeState.cs index 1dcfefbf..dea69924 100644 --- a/OpenTaiko/src/Items/CItemThreeState.cs +++ b/OpenTaiko/src/Items/CItemThreeState.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 「スリーステート」（ON, OFF, 不定 の3状態）を表すアイテム。 /// diff --git a/OpenTaiko/src/Items/CItemToggle.cs b/OpenTaiko/src/Items/CItemToggle.cs index 7f5c3751..ac6a6877 100644 --- a/OpenTaiko/src/Items/CItemToggle.cs +++ b/OpenTaiko/src/Items/CItemToggle.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 「トグル」（ON, OFF の2状態）を表すアイテム。 /// diff --git a/OpenTaiko/src/Lua/CLuaScript.cs b/OpenTaiko/src/Lua/CLuaScript.cs index 38571557..8d6eacb6 100644 --- a/OpenTaiko/src/Lua/CLuaScript.cs +++ b/OpenTaiko/src/Lua/CLuaScript.cs @@ -5,7 +5,7 @@ using System.Text.Json.Nodes; using FDK; using NLua; -namespace TJAPlayer3 { +namespace OpenTaiko { class CLuaScript : IDisposable { private static List listScripts = new List(); public static void tReloadLanguage(string lang) { @@ -113,7 +113,7 @@ namespace TJAPlayer3 { soundGroup = ESoundGroup.Unknown; break; } - CSound sound = TJAPlayer3.SoundManager?.tCreateSound($"{strSounsdDir}/{name}", soundGroup); + CSound sound = OpenTaiko.SoundManager?.tCreateSound($"{strSounsdDir}/{name}", soundGroup); listDisposables.Add(sound); return sound; diff --git a/OpenTaiko/src/Lua/Infos/CLuaFps.cs b/OpenTaiko/src/Lua/Infos/CLuaFps.cs index 1c1e4ef7..0ee51062 100644 --- a/OpenTaiko/src/Lua/Infos/CLuaFps.cs +++ b/OpenTaiko/src/Lua/Infos/CLuaFps.cs @@ -1,6 +1,6 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CLuaFps { - public double deltaTime => TJAPlayer3.FPS.DeltaTime; - public int fps => TJAPlayer3.FPS.NowFPS; + public double deltaTime => OpenTaiko.FPS.DeltaTime; + public int fps => OpenTaiko.FPS.NowFPS; } } \ No newline at end of file diff --git a/OpenTaiko/src/Lua/Infos/CLuaInfo.cs b/OpenTaiko/src/Lua/Infos/CLuaInfo.cs index 74348e93..aa00baca 100644 --- a/OpenTaiko/src/Lua/Infos/CLuaInfo.cs +++ b/OpenTaiko/src/Lua/Infos/CLuaInfo.cs @@ -1,10 +1,10 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CLuaInfo { - public int playerCount => TJAPlayer3.ConfigIni.nPlayerCount; - public string lang => TJAPlayer3.ConfigIni.sLang; - public bool simplemode => TJAPlayer3.ConfigIni.SimpleMode; - public bool p1IsBlue => TJAPlayer3.P1IsBlue(); - public bool online => TJAPlayer3.app.bネットワークに接続中; + public int playerCount => OpenTaiko.ConfigIni.nPlayerCount; + public string lang => OpenTaiko.ConfigIni.sLang; + public bool simplemode => OpenTaiko.ConfigIni.SimpleMode; + public bool p1IsBlue => OpenTaiko.P1IsBlue(); + public bool online => OpenTaiko.app.bネットワークに接続中; public string dir { get; init; } diff --git a/OpenTaiko/src/Lua/Scripts/CLuaModalScript.cs b/OpenTaiko/src/Lua/Scripts/CLuaModalScript.cs index b3d0e26e..91298445 100644 --- a/OpenTaiko/src/Lua/Scripts/CLuaModalScript.cs +++ b/OpenTaiko/src/Lua/Scripts/CLuaModalScript.cs @@ -1,6 +1,6 @@ using NLua; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CLuaModalScript : CLuaScript { private LuaFunction lfRegisterModal; private LuaFunction lfAnimationFinished; diff --git a/OpenTaiko/src/Lua/Scripts/CLuaNamePlateScript.cs b/OpenTaiko/src/Lua/Scripts/CLuaNamePlateScript.cs index 62944541..f8903d26 100644 --- a/OpenTaiko/src/Lua/Scripts/CLuaNamePlateScript.cs +++ b/OpenTaiko/src/Lua/Scripts/CLuaNamePlateScript.cs @@ -1,7 +1,7 @@ using FDK; using NLua; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CLuaNamePlateScript : CLuaScript { private LuaFunction lfGetCharaOffset; private LuaFunction lfSetInfos; diff --git a/OpenTaiko/src/Plugins/CPluginHost.cs b/OpenTaiko/src/Plugins/CPluginHost.cs index 5ae375f5..f323cc4d 100644 --- a/OpenTaiko/src/Plugins/CPluginHost.cs +++ b/OpenTaiko/src/Plugins/CPluginHost.cs @@ -1,12 +1,12 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CPluginHost : IPluginHost { // コンストラクタ public CPluginHost() { - this._DTXManiaVersion = new CDTXVersion(TJAPlayer3.VERSION); + this._DTXManiaVersion = new CDTXVersion(OpenTaiko.VERSION); } @@ -16,37 +16,37 @@ namespace TJAPlayer3 { get { return this._DTXManiaVersion; } } public CTimer Timer { - get { return TJAPlayer3.Timer; } + get { return OpenTaiko.Timer; } } public SoundManager Sound管理 { - get { return TJAPlayer3.SoundManager; } + get { return OpenTaiko.SoundManager; } } public Size ClientSize { - get { return new Size(TJAPlayer3.app.Window_.Size.X, TJAPlayer3.app.Window_.Size.Y); } + get { return new Size(OpenTaiko.app.Window_.Size.X, OpenTaiko.app.Window_.Size.Y); } } public CStage.EStage e現在のステージ { - get { return (TJAPlayer3.r現在のステージ != null) ? TJAPlayer3.r現在のステージ.eStageID : CStage.EStage.None; } + get { return (OpenTaiko.r現在のステージ != null) ? OpenTaiko.r現在のステージ.eStageID : CStage.EStage.None; } } public CStage.EPhase e現在のフェーズ { - get { return (TJAPlayer3.r現在のステージ != null) ? TJAPlayer3.r現在のステージ.ePhaseID : CStage.EPhase.Common_NORMAL; } + get { return (OpenTaiko.r現在のステージ != null) ? OpenTaiko.r現在のステージ.ePhaseID : CStage.EPhase.Common_NORMAL; } } public bool t入力を占有する(IPluginActivity act) { - if (TJAPlayer3.act現在入力を占有中のプラグイン != null) + if (OpenTaiko.act現在入力を占有中のプラグイン != null) return false; - TJAPlayer3.act現在入力を占有中のプラグイン = act; + OpenTaiko.act現在入力を占有中のプラグイン = act; return true; } public bool t入力の占有を解除する(IPluginActivity act) { - if (TJAPlayer3.act現在入力を占有中のプラグイン == null || TJAPlayer3.act現在入力を占有中のプラグイン != act) + if (OpenTaiko.act現在入力を占有中のプラグイン == null || OpenTaiko.act現在入力を占有中のプラグイン != act) return false; - TJAPlayer3.act現在入力を占有中のプラグイン = null; + OpenTaiko.act現在入力を占有中のプラグイン = null; return true; } public void tシステムサウンドを再生する(Eシステムサウンド sound) { - if (TJAPlayer3.Skin != null) - TJAPlayer3.Skin[sound].tPlay(); + if (OpenTaiko.Skin != null) + OpenTaiko.Skin[sound].tPlay(); } diff --git a/OpenTaiko/src/Plugins/IPluginActivity.cs b/OpenTaiko/src/Plugins/IPluginActivity.cs index 11ca3676..8a80d287 100644 --- a/OpenTaiko/src/Plugins/IPluginActivity.cs +++ b/OpenTaiko/src/Plugins/IPluginActivity.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// Activity プラグインへのインターフェース。 /// DTXMania は、IPluginActivity に対して、以下のライフサイクルを実行します。 @@ -14,7 +14,7 @@ /// DTXMania の起動処理の最後（セットアップ画面が表示される直前）に、DTXMania から一度だけ呼び出されます。 /// プラグインが、ホスト（DTXMania）の情報にアクセスするためのオブジェクト。 /// - void On初期化(global::TJAPlayer3.IPluginHost PluginHost); + void On初期化(global::OpenTaiko.IPluginHost PluginHost); /// /// プラグインの終了処理を行います。 @@ -50,7 +50,7 @@ /// パッド入力。他のプラグインが入力占有中である場合は null が渡されます。 /// キーボード入力。他のプラグインが入力占有中である場合は null が渡されます。 /// - void On進行描画(global::TJAPlayer3.CPad pad, FDK.IInputDevice keyboard); + void On進行描画(global::OpenTaiko.CPad pad, FDK.IInputDevice keyboard); /// /// ステージが変わる度に呼び出されます。 @@ -67,8 +67,8 @@ /// 選択されている曲のブロック内の曲番号(0～4)。 void On選択曲変更(string str選択曲ファイル名, int n曲番号inブロック); - void On演奏クリア(global::TJAPlayer3.CScoreIni scoreIni); - void On演奏失敗(global::TJAPlayer3.CScoreIni scoreIni); - void On演奏キャンセル(global::TJAPlayer3.CScoreIni scoreIni); + void On演奏クリア(global::OpenTaiko.CScoreIni scoreIni); + void On演奏失敗(global::OpenTaiko.CScoreIni scoreIni); + void On演奏キャンセル(global::OpenTaiko.CScoreIni scoreIni); } } diff --git a/OpenTaiko/src/Plugins/IPluginHost.cs b/OpenTaiko/src/Plugins/IPluginHost.cs index 4494bea3..8ec24087 100644 --- a/OpenTaiko/src/Plugins/IPluginHost.cs +++ b/OpenTaiko/src/Plugins/IPluginHost.cs @@ -1,5 +1,5 @@  -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// プラグインホスト情報提供インターフェース。 /// プラグインでは、On初期化() で渡されるこのインターフェースオブジェクトを通じて、 @@ -9,7 +9,7 @@ namespace TJAPlayer3 { /// /// DTXMania のバージョンを表します。 /// - global::TJAPlayer3.CDTXVersion DTXManiaVersion { get; } + global::OpenTaiko.CDTXVersion DTXManiaVersion { get; } /// /// DirectSound の管理クラス。 @@ -25,12 +25,12 @@ namespace TJAPlayer3 { /// /// 現在のステージのIDを表します。 /// - global::TJAPlayer3.CStage.EStage e現在のステージ { get; } + global::OpenTaiko.CStage.EStage e現在のステージ { get; } /// /// 現在のステージにおけるフェーズのIDを表します。 /// - global::TJAPlayer3.CStage.EPhase e現在のフェーズ { get; } + global::OpenTaiko.CStage.EPhase e現在のフェーズ { get; } /// /// 自分以外は入力データを扱ってはならないことを宣言します。 diff --git a/OpenTaiko/src/Songs/CBoxDef.cs b/OpenTaiko/src/Songs/CBoxDef.cs index 664befba..552e8e26 100644 --- a/OpenTaiko/src/Songs/CBoxDef.cs +++ b/OpenTaiko/src/Songs/CBoxDef.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Text; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CBoxDef { // プロパティ @@ -50,7 +50,7 @@ namespace TJAPlayer3 { // メソッド public void t読み込み(string boxdefファイル名) { - StreamReader reader = new StreamReader(boxdefファイル名, Encoding.GetEncoding(TJAPlayer3.sEncType)); + StreamReader reader = new StreamReader(boxdefファイル名, Encoding.GetEncoding(OpenTaiko.sEncType)); string str = null; while ((str = reader.ReadLine()) != null) { if (str.Length != 0) { diff --git a/OpenTaiko/src/Songs/CCourse.cs b/OpenTaiko/src/Songs/CCourse.cs index acfb2f59..9f6f3b7a 100644 --- a/OpenTaiko/src/Songs/CCourse.cs +++ b/OpenTaiko/src/Songs/CCourse.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { public class CCourse { //2016.11.07 kairera0467 //とりあえずメモ代わりに diff --git a/OpenTaiko/src/Songs/CDTX.cs b/OpenTaiko/src/Songs/CDTX.cs index c8390a8d..9fd1a412 100644 --- a/OpenTaiko/src/Songs/CDTX.cs +++ b/OpenTaiko/src/Songs/CDTX.cs @@ -9,7 +9,7 @@ using FDK.ExtensionMethods; using SkiaSharp; using Color = System.Drawing.Color; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CDTX : CActivity { // 定数 @@ -414,7 +414,7 @@ namespace TJAPlayer3 { if (this.nチャンネル番号 == 0x01) // WAV { CDTX.CWAV wc; - TJAPlayer3.DTX.listWAV.TryGetValue(this.n整数値_内部番号, out wc); + OpenTaiko.DTX.listWAV.TryGetValue(this.n整数値_内部番号, out wc); if (wc == null) { nDuration = 0; } else { @@ -423,7 +423,7 @@ namespace TJAPlayer3 { } else if (this.nチャンネル番号 == 0x54) // AVI { CVideoDecoder wc; - TJAPlayer3.DTX.listVD.TryGetValue(this.n整数値_内部番号, out wc); + OpenTaiko.DTX.listVD.TryGetValue(this.n整数値_内部番号, out wc); if (wc == null) { nDuration = 0; } else { @@ -431,7 +431,7 @@ namespace TJAPlayer3 { } } - double _db再生速度 = (TJAPlayer3.DTXVmode.Enabled) ? TJAPlayer3.DTX.dbDTXVPlaySpeed : TJAPlayer3.DTX.db再生速度; + double _db再生速度 = (OpenTaiko.DTXVmode.Enabled) ? OpenTaiko.DTX.dbDTXVPlaySpeed : OpenTaiko.DTX.db再生速度; return (int)(nDuration / _db再生速度); } @@ -507,14 +507,14 @@ namespace TJAPlayer3 { public List listこのWAVを使用するチャンネル番号の集合 = new List(16); public int nチップサイズ = 100; public int n位置; - public long[] n一時停止時刻 = new long[TJAPlayer3.ConfigIni.nPoliphonicSounds]; // 4 + public long[] n一時停止時刻 = new long[OpenTaiko.ConfigIni.nPoliphonicSounds]; // 4 public int SongVol = CSound.DefaultSongVol; public LoudnessMetadata? SongLoudnessMetadata = null; public int n現在再生中のサウンド番号; - public long[] n再生開始時刻 = new long[TJAPlayer3.ConfigIni.nPoliphonicSounds]; // 4 + public long[] n再生開始時刻 = new long[OpenTaiko.ConfigIni.nPoliphonicSounds]; // 4 public int n内部番号; public int n表記上の番号; - public CSound[] rSound = new CSound[TJAPlayer3.ConfigIni.nPoliphonicSounds]; // 4 + public CSound[] rSound = new CSound[OpenTaiko.ConfigIni.nPoliphonicSounds]; // 4 public string strコメント文 = ""; public string strファイル名 = ""; public bool bBGMとして使わない { @@ -556,13 +556,13 @@ namespace TJAPlayer3 { return; if (bManagedリソースの解放も行う) { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPoliphonicSounds; i++) // 4 + for (int i = 0; i < OpenTaiko.ConfigIni.nPoliphonicSounds; i++) // 4 { if (this.rSound[i] != null) - TJAPlayer3.SoundManager.tDisposeSound(this.rSound[i]); + OpenTaiko.SoundManager.tDisposeSound(this.rSound[i]); this.rSound[i] = null; - if ((i == 0) && TJAPlayer3.ConfigIni.bLog作成解放ログ出力) + if ((i == 0) && OpenTaiko.ConfigIni.bLog作成解放ログ出力) Trace.TraceInformation("サウンドを解放しました。({0})({1})", this.strコメント文, this.strファイル名); } } @@ -1200,7 +1200,7 @@ namespace TJAPlayer3 { this.BACKGROUND_GR = ""; this.PATH_WAV = ""; this.BPM = 120.0; - this.nOFFSET = TJAPlayer3.ConfigIni.nGlobalOffsetMs; // When OFFSET isn't called (typically in Dans), it should default to the game's Global Offset to avoid desync. + this.nOFFSET = OpenTaiko.ConfigIni.nGlobalOffsetMs; // When OFFSET isn't called (typically in Dans), it should default to the game's Global Offset to avoid desync. this.bOFFSETの値がマイナスである = nOFFSET < 0; STDGBVALUE stdgbvalue = new STDGBVALUE(); stdgbvalue.Drums = 0; @@ -1259,7 +1259,7 @@ namespace TJAPlayer3 { this.stGDAParam = stgdaparamArray; #endregion this.nBGMAdjust = 0; - this.nPolyphonicSounds = TJAPlayer3.ConfigIni.nPoliphonicSounds; + this.nPolyphonicSounds = OpenTaiko.ConfigIni.nPoliphonicSounds; this.dbDTXVPlaySpeed = 1.0f; //this.nScoreModeTmp = 1; @@ -1340,7 +1340,7 @@ namespace TJAPlayer3 { if (this.listVD != null) { foreach (CVideoDecoder cvd in this.listVD.Values) { cvd.InitRead(); - cvd.dbPlaySpeed = TJAPlayer3.ConfigIni.SongPlaybackSpeed; + cvd.dbPlaySpeed = OpenTaiko.ConfigIni.SongPlaybackSpeed; } } } @@ -1365,7 +1365,7 @@ namespace TJAPlayer3 { //); // wc.rSound[ i ].t再生位置を変更する( wc.rSound[ i ].t時刻から位置を返す( nAbsTimeFromStartPlaying ) ); // WASAPI/ASIO用↓ - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) { + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) { if (wc.rSound[i].IsPaused) wc.rSound[i].Resume(nAbsTimeFromStartPlaying); else wc.rSound[i].tSetPositonToBegin(nAbsTimeFromStartPlaying); } else { @@ -1400,7 +1400,7 @@ namespace TJAPlayer3 { #region [ 同時発音数を、チャンネルによって変える ] int nPoly = nPolyphonicSounds; - if (TJAPlayer3.SoundManager.GetCurrentSoundDeviceType() != "DirectSound") // DShowでの再生の場合はミキシング負荷が高くないため、 + if (OpenTaiko.SoundManager.GetCurrentSoundDeviceType() != "DirectSound") // DShowでの再生の場合はミキシング負荷が高くないため、 { // チップのライフタイム管理を行わない if (cwav.bIsBassSound) nPoly = (nPolyphonicSounds >= 2) ? 2 : 1; @@ -1415,13 +1415,13 @@ namespace TJAPlayer3 { for (int i = 0; i < nPoly; i++) { try { - cwav.rSound[i] = TJAPlayer3.SoundManager.tCreateSound(str, ESoundGroup.SongPlayback); + cwav.rSound[i] = OpenTaiko.SoundManager.tCreateSound(str, ESoundGroup.SongPlayback); - if (!TJAPlayer3.ConfigIni.bDynamicBassMixerManagement) { + if (!OpenTaiko.ConfigIni.bDynamicBassMixerManagement) { cwav.rSound[i].AddBassSoundFromMixer(); } - if (TJAPlayer3.ConfigIni.bLog作成解放ログ出力) { + if (OpenTaiko.ConfigIni.bLog作成解放ログ出力) { Trace.TraceInformation("サウンドを作成しました。({3})({0})({1})({2}bytes)", cwav.strコメント文, str, cwav.rSound[0].SoundBufferSize, cwav.rSound[0].IsStreamPlay ? "Stream" : "OnMemory"); } @@ -1454,7 +1454,7 @@ namespace TJAPlayer3 { } public static void tManageKusudama(CDTX[] dtxarr) { - if (TJAPlayer3.ConfigIni.nPlayerCount == 1) return; + if (OpenTaiko.ConfigIni.nPlayerCount == 1) return; // Replace non-shared kusudamas by balloons #region [Sync check] @@ -1521,8 +1521,8 @@ namespace TJAPlayer3 { public void tApplyFunMods(int player = 0) { Random rnd = new System.Random(); - var eFun = TJAPlayer3.ConfigIni.nFunMods[TJAPlayer3.GetActualPlayer(player)]; - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; + var eFun = OpenTaiko.ConfigIni.nFunMods[OpenTaiko.GetActualPlayer(player)]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character]; var bombFactor = Math.Max(1, Math.Min(100, chara.effect.BombFactor)); var fuseRollFactor = Math.Max(0, Math.Min(100, chara.effect.FuseRollFactor)); @@ -1563,7 +1563,7 @@ namespace TJAPlayer3 { Random rnd = new System.Random(); - var eRandom = TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.GetActualPlayer(player)]; + var eRandom = OpenTaiko.ConfigIni.eRandom[OpenTaiko.GetActualPlayer(player)]; switch (eRandom) { case ERandomMode.MIRROR: @@ -1663,7 +1663,7 @@ namespace TJAPlayer3 { break; } - if (TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayerSide))].effect.AllPurple) { + if (OpenTaiko.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(OpenTaiko.GetActualPlayer(nPlayerSide))].effect.AllPurple) { foreach (var chip in this.listChip) { switch (chip.nチャンネル番号) { case 0x13: @@ -1702,7 +1702,7 @@ namespace TJAPlayer3 { #region [ チップの再生と停止 ] public void tチップの再生(CChip pChip, long n再生開始システム時刻ms) { - if (TJAPlayer3.ConfigIni.b演奏速度が一倍速であるとき以外音声を再生しない && TJAPlayer3.ConfigIni.nSongSpeed != 20) + if (OpenTaiko.ConfigIni.b演奏速度が一倍速であるとき以外音声を再生しない && OpenTaiko.ConfigIni.nSongSpeed != 20) return; if (pChip.n整数値_内部番号 >= 0) { @@ -1714,13 +1714,13 @@ namespace TJAPlayer3 { } CSound sound = wc.rSound[index]; if (sound != null) { - sound.PlaySpeed = TJAPlayer3.ConfigIni.SongPlaybackSpeed; + sound.PlaySpeed = OpenTaiko.ConfigIni.SongPlaybackSpeed; // 再生速度によって、WASAPI/ASIOで使う使用mixerが決まるため、付随情報の設定(音量/PAN)は、再生速度の設定後に行う // 2018-08-27 twopointzero - DON'T attempt to load (or queue scanning) loudness metadata here. // This code is called right after loading the .tja, and that code // will have just made such an attempt. - TJAPlayer3.SongGainController.Set(wc.SongVol, wc.SongLoudnessMetadata, sound); + OpenTaiko.SongGainController.Set(wc.SongVol, wc.SongLoudnessMetadata, sound); sound.SoundPosition = wc.n位置; sound.PlayStart(); @@ -1812,12 +1812,12 @@ namespace TJAPlayer3 { //TimeSpan span; string[] files = Directory.GetFiles(this.strフォルダ名, "*.tja"); - StreamReader reader = new StreamReader(strファイル名, Encoding.GetEncoding(TJAPlayer3.sEncType)); + StreamReader reader = new StreamReader(strファイル名, Encoding.GetEncoding(OpenTaiko.sEncType)); string str2 = reader.ReadToEnd(); reader.Close(); //StreamReader reader2 = new StreamReader( this.strフォルダ名 + "test.tja", Encoding.GetEncoding( "Shift_JIS" ) ); - StreamReader reader2 = new StreamReader(files[0], Encoding.GetEncoding(TJAPlayer3.sEncType)); + StreamReader reader2 = new StreamReader(files[0], Encoding.GetEncoding(OpenTaiko.sEncType)); string str3 = reader2.ReadToEnd(); reader2.Close(); @@ -1831,7 +1831,7 @@ namespace TJAPlayer3 { //DateTime timeBeginLoad = DateTime.Now; //TimeSpan span; - StreamReader reader = new StreamReader(strファイル名, Encoding.GetEncoding(TJAPlayer3.sEncType)); + StreamReader reader = new StreamReader(strファイル名, Encoding.GetEncoding(OpenTaiko.sEncType)); string str2 = reader.ReadToEnd(); reader.Close(); @@ -2442,7 +2442,7 @@ namespace TJAPlayer3 { } } if (this.db再生速度 > 0.0) { - double _db再生速度 = (TJAPlayer3.DTXVmode.Enabled) ? this.dbDTXVPlaySpeed : this.db再生速度; + double _db再生速度 = (OpenTaiko.DTXVmode.Enabled) ? this.dbDTXVPlaySpeed : this.db再生速度; foreach (CChip chip in this.listChip) { chip.n発声時刻ms = (int)(((double)chip.n発声時刻ms) / _db再生速度); chip.db発声時刻ms = (((double)chip.n発声時刻ms) / _db再生速度); @@ -2520,7 +2520,7 @@ namespace TJAPlayer3 { #endregion #region [ bLogDTX詳細ログ出力 ] - if (TJAPlayer3.ConfigIni.bLogDTX詳細ログ出力) { + if (OpenTaiko.ConfigIni.bLogDTX詳細ログ出力) { foreach (CWAV cwav in this.listWAV.Values) { Trace.TraceInformation(cwav.ToString()); } @@ -2870,7 +2870,7 @@ namespace TJAPlayer3 { //指定したコースの譜面の命令を消去する。 strSplitした譜面[n読み込むコース] = CDTXStyleExtractor.tセッション譜面がある( strSplitした譜面[n読み込むコース], - TJAPlayer3.ConfigIni.nPlayerCount > 1 ? (this.nPlayerSide + 1) : 0, + OpenTaiko.ConfigIni.nPlayerCount > 1 ? (this.nPlayerSide + 1) : 0, this.strファイル名の絶対パス); //命令をすべて消去した譜面 @@ -5047,11 +5047,11 @@ namespace TJAPlayer3 { if (this.bSession譜面を読み込む) { if (!this.listOriginalTextures.ContainsKey(chip.strTargetTxName)) { - TJAPlayer3.Tx.trackedTextures.TryGetValue(chip.strTargetTxName, out CTexture oldTx); + OpenTaiko.Tx.trackedTextures.TryGetValue(chip.strTargetTxName, out CTexture oldTx); this.listOriginalTextures.Add(chip.strTargetTxName, new CTexture(oldTx)); } if (!this.listTextures.ContainsKey(chip.strNewPath)) { - CTexture tx = TJAPlayer3.Tx.TxCSong(chip.strNewPath); + CTexture tx = OpenTaiko.Tx.TxCSong(chip.strNewPath); this.listTextures.Add(chip.strNewPath, tx); } } @@ -5399,10 +5399,10 @@ namespace TJAPlayer3 { this.bBARLINECUE[0] = 0; this.listChip.Add(chip); - } else if (command == "#LYRIC" && !usingLyricsFile && TJAPlayer3.ConfigIni.nPlayerCount < 4) // Do not parse LYRIC tags if a lyric file is already loaded + } else if (command == "#LYRIC" && !usingLyricsFile && OpenTaiko.ConfigIni.nPlayerCount < 4) // Do not parse LYRIC tags if a lyric file is already loaded { - if (TJAPlayer3.r現在のステージ.eStageID == CStage.EStage.SongLoading)//起動時に重たくなってしまう問題の修正用 - this.listLyric.Add(this.pf歌詞フォント.DrawText(argument, TJAPlayer3.Skin.Game_Lyric_ForeColor, TJAPlayer3.Skin.Game_Lyric_BackColor, null, 30)); + if (OpenTaiko.r現在のステージ.eStageID == CStage.EStage.SongLoading)//起動時に重たくなってしまう問題の修正用 + this.listLyric.Add(this.pf歌詞フォント.DrawText(argument, OpenTaiko.Skin.Game_Lyric_ForeColor, OpenTaiko.Skin.Game_Lyric_BackColor, null, 30)); var chip = new CChip(); @@ -6093,7 +6093,7 @@ namespace TJAPlayer3 { /// /// private void t難易度別ヘッダ(string InputText) { - if (TJAPlayer3.actEnumSongs != null && TJAPlayer3.actEnumSongs.IsDeActivated) { + if (OpenTaiko.actEnumSongs != null && OpenTaiko.actEnumSongs.IsDeActivated) { if (InputText.Equals("#NMSCROLL")) { eScrollMode = EScrollMode.Normal; } else if (InputText.Equals("#HBSCROLL")) { @@ -6183,9 +6183,9 @@ namespace TJAPlayer3 { } if (this.nScoreModeTmp == 99) //2017.01.28 DD SCOREMODEを入力していない場合のみConfigで設定したモードにする { - this.nScoreModeTmp = TJAPlayer3.ConfigIni.nScoreMode; + this.nScoreModeTmp = OpenTaiko.ConfigIni.nScoreMode; } - if (TJAPlayer3.ConfigIni.nScoreMode == 3 && !this.b配点が指定されている[2, this.n参照中の難易度]) { //2017.06.04 kairera0467 + if (OpenTaiko.ConfigIni.nScoreMode == 3 && !this.b配点が指定されている[2, this.n参照中の難易度]) { //2017.06.04 kairera0467 this.nScoreModeTmp = 3; } } @@ -6462,7 +6462,7 @@ namespace TJAPlayer3 { //tbOFFSET.Text = strCommandParam; // Substract global offset - this.nOFFSET += ((this.bOFFSETの値がマイナスである == true) ? -TJAPlayer3.ConfigIni.nGlobalOffsetMs : TJAPlayer3.ConfigIni.nGlobalOffsetMs); + this.nOFFSET += ((this.bOFFSETの値がマイナスである == true) ? -OpenTaiko.ConfigIni.nGlobalOffsetMs : OpenTaiko.ConfigIni.nGlobalOffsetMs); } else if (strCommandName.Equals("MOVIEOFFSET")) { this.nMOVIEOFFSET = (int)(Convert.ToDouble(strCommandParam) * 1000); this.bMOVIEOFFSETの値がマイナスである = this.nMOVIEOFFSET < 0 ? true : false; @@ -6668,7 +6668,7 @@ namespace TJAPlayer3 { if (!string.IsNullOrEmpty(strCommandParam)) { this.bHIDDENBRANCH = true; } - } else if (strCommandName.Equals("LYRICS") && !usingLyricsFile && TJAPlayer3.ConfigIni.nPlayerCount < 4) { + } else if (strCommandName.Equals("LYRICS") && !usingLyricsFile && OpenTaiko.ConfigIni.nPlayerCount < 4) { if (!string.IsNullOrEmpty(strCommandParam)) { string[] files = SplitComma(strCommandParam); string[] filePaths = new string[files.Length]; @@ -6677,7 +6677,7 @@ namespace TJAPlayer3 { if (File.Exists(filePaths[i])) { try { - if (TJAPlayer3.r現在のステージ.eStageID == CStage.EStage.SongLoading) { + if (OpenTaiko.r現在のステージ.eStageID == CStage.EStage.SongLoading) { if (filePaths[i].EndsWith(".vtt")) { using (VTTParser parser = new VTTParser()) { this.listLyric2.AddRange(parser.ParseVTTFile(filePaths[i], 0, 0)); @@ -6696,7 +6696,7 @@ namespace TJAPlayer3 { } } } - } else if (strCommandName.Equals("LYRICFILE") && !usingLyricsFile && TJAPlayer3.ConfigIni.nPlayerCount < 4) { + } else if (strCommandName.Equals("LYRICFILE") && !usingLyricsFile && OpenTaiko.ConfigIni.nPlayerCount < 4) { if (!string.IsNullOrEmpty(strCommandParam)) { string[] strFiles = SplitComma(strCommandParam); string[] strFilePath = new string[strFiles.Length]; @@ -6704,7 +6704,7 @@ namespace TJAPlayer3 { strFilePath[index] = this.strフォルダ名 + strFiles[index]; if (File.Exists(strFilePath[index])) { try { - if (TJAPlayer3.r現在のステージ.eStageID == CStage.EStage.SongLoading)//起動時に重たくなってしまう問題の修正用 + if (OpenTaiko.r現在のステージ.eStageID == CStage.EStage.SongLoading)//起動時に重たくなってしまう問題の修正用 this.LyricFileParser(strFilePath[index], index); this.bLyrics = true; this.usingLyricsFile = true; @@ -6718,7 +6718,7 @@ namespace TJAPlayer3 { } if (this.nScoreModeTmp == 99) { //2017.01.28 DD - this.nScoreModeTmp = TJAPlayer3.ConfigIni.nScoreMode; + this.nScoreModeTmp = OpenTaiko.ConfigIni.nScoreMode; } } /// @@ -6810,7 +6810,7 @@ namespace TJAPlayer3 { for (int listindex = 0; listindex < list.Count; listindex++) { STLYRIC stlrc; stlrc.Text = strSplit後[i]; - stlrc.TextTex = this.pf歌詞フォント.DrawText(strSplit後[i], TJAPlayer3.Skin.Game_Lyric_ForeColor, TJAPlayer3.Skin.Game_Lyric_BackColor, null, 30); + stlrc.TextTex = this.pf歌詞フォント.DrawText(strSplit後[i], OpenTaiko.Skin.Game_Lyric_ForeColor, OpenTaiko.Skin.Game_Lyric_BackColor, null, 30); stlrc.Time = list[listindex]; stlrc.index = ordnumber; this.listLyric2.Add(stlrc); @@ -7096,7 +7096,7 @@ namespace TJAPlayer3 { /// サウンドミキサーにサウンドを登録_削除する時刻を事前に算出する /// public void PlanToAddMixerChannel() { - if (TJAPlayer3.SoundManager.GetCurrentSoundDeviceType() == "DirectSound") // DShowでの再生の場合はミキシング負荷が高くないため、 + if (OpenTaiko.SoundManager.GetCurrentSoundDeviceType() == "DirectSound") // DShowでの再生の場合はミキシング負荷が高くないため、 { // チップのライフタイム管理を行わない return; } @@ -7178,7 +7178,7 @@ namespace TJAPlayer3 { int duration = 0; if (listWAV.TryGetValue(pChip.n整数値_内部番号, out CDTX.CWAV wc)) { - double _db再生速度 = (TJAPlayer3.DTXVmode.Enabled) ? this.dbDTXVPlaySpeed : this.db再生速度; + double _db再生速度 = (OpenTaiko.DTXVmode.Enabled) ? this.dbDTXVPlaySpeed : this.db再生速度; duration = (wc.rSound[0] == null) ? 0 : (int)(wc.rSound[0].TotalPlayTime / _db再生速度); // #23664 durationに再生速度が加味されておらず、低速再生でBGMが途切れる問題を修正 (発声時刻msは、DTX読み込み時に再生速度加味済) } //Debug.WriteLine("duration=" + duration ); @@ -7333,7 +7333,7 @@ namespace TJAPlayer3 { // CActivity 実装 private CCachedFontRenderer pf歌詞フォント; public override void Activate() { - if (TJAPlayer3.r現在のステージ.eStageID == CStage.EStage.SongLoading) { + if (OpenTaiko.r現在のステージ.eStageID == CStage.EStage.SongLoading) { //まさかこれが原因で曲の読み込みが停止するとは思わなかった... //どういうことかというとスキンを読み込むときに...いや厳密には //RefleshSkinを呼び出した後一回Disposeしてnullにして解放(その後にまたインスタンスを作成する)するんだけど @@ -7342,10 +7342,10 @@ namespace TJAPlayer3 { //実は曲の読み込みはマルチスレッドで実行されているのでnullにした瞬間に参照される可能性も十分にある //それならアプリが終了するんじゃないかと思ったのだけどtryを使ってい曲の読み込みを続行していた... //いやーマルチスレッドって難しいね! - if (!string.IsNullOrEmpty(TJAPlayer3.Skin.Game_Lyric_FontName)) { - this.pf歌詞フォント = new CCachedFontRenderer(TJAPlayer3.Skin.Game_Lyric_FontName, TJAPlayer3.Skin.Game_Lyric_FontSize); + if (!string.IsNullOrEmpty(OpenTaiko.Skin.Game_Lyric_FontName)) { + this.pf歌詞フォント = new CCachedFontRenderer(OpenTaiko.Skin.Game_Lyric_FontName, OpenTaiko.Skin.Game_Lyric_FontSize); } else { - this.pf歌詞フォント = new CCachedFontRenderer(CFontRenderer.DefaultFontName, TJAPlayer3.Skin.Game_Lyric_FontSize); + this.pf歌詞フォント = new CCachedFontRenderer(CFontRenderer.DefaultFontName, OpenTaiko.Skin.Game_Lyric_FontSize); } } this.listWAV = new Dictionary(); @@ -7464,7 +7464,7 @@ namespace TJAPlayer3 { foreach (KeyValuePair pair in this.listOriginalTextures) { string txPath = pair.Key; CTexture originalTx = pair.Value; - TJAPlayer3.Tx.trackedTextures.TryGetValue(txPath, out CTexture oldTx); + OpenTaiko.Tx.trackedTextures.TryGetValue(txPath, out CTexture oldTx); if (oldTx != originalTx) { oldTx.UpdateTexture(originalTx, originalTx.sz画像サイズ.Width, originalTx.sz画像サイズ.Height); @@ -7496,7 +7496,7 @@ namespace TJAPlayer3 { } this.listVD = null; } - TJAPlayer3.tDisposeSafely(ref this.pf歌詞フォント); + OpenTaiko.tDisposeSafely(ref this.pf歌詞フォント); base.ReleaseManagedResource(); } } @@ -7798,7 +7798,7 @@ namespace TJAPlayer3 { if (!int.TryParse(strパラメータ, out n数値)) n数値 = 1; - this.n現在の乱数 = TJAPlayer3.Random.Next(n数値) + 1; // 1～数値 までの乱数を生成。 + this.n現在の乱数 = OpenTaiko.Random.Next(n数値) + 1; // 1～数値 までの乱数を生成。 } //----------------- #endregion @@ -8327,8 +8327,8 @@ namespace TJAPlayer3 { /// 音源再生前の空白を追加するメソッド。 /// private void AddMusicPreTimeMs() { - this.dbNowTime += TJAPlayer3.ConfigIni.MusicPreTimeMs; - this.dbNowBMScollTime += TJAPlayer3.ConfigIni.MusicPreTimeMs * this.dbNowBPM / 15000; + this.dbNowTime += OpenTaiko.ConfigIni.MusicPreTimeMs; + this.dbNowBMScollTime += OpenTaiko.ConfigIni.MusicPreTimeMs * this.dbNowBPM / 15000; } //----------------- #endregion diff --git a/OpenTaiko/src/Songs/CDTXCompanionFileFinder.cs b/OpenTaiko/src/Songs/CDTXCompanionFileFinder.cs index 04c26baa..cf7f28c0 100644 --- a/OpenTaiko/src/Songs/CDTXCompanionFileFinder.cs +++ b/OpenTaiko/src/Songs/CDTXCompanionFileFinder.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Text; -namespace TJAPlayer3 { +namespace OpenTaiko { internal static class CDTXCompanionFileFinder { internal static string FindFileName( string directory, @@ -25,7 +25,7 @@ namespace TJAPlayer3 { // To begin finding the right file, we first need to get the raw // bytes that would comprise the file name if encoded into // Shift-JIS. - var encodedCompanionFileNameBytes = Encoding.GetEncoding(TJAPlayer3.sEncType).GetBytes(expectedCompanionFileName); + var encodedCompanionFileNameBytes = Encoding.GetEncoding(OpenTaiko.sEncType).GetBytes(expectedCompanionFileName); // Here we have a helper method that will be used to try finding // the file by interpreting the byte representation encoded diff --git a/OpenTaiko/src/Songs/CDTXStyleExtractor.cs b/OpenTaiko/src/Songs/CDTXStyleExtractor.cs index fe9dcada..282786d6 100644 --- a/OpenTaiko/src/Songs/CDTXStyleExtractor.cs +++ b/OpenTaiko/src/Songs/CDTXStyleExtractor.cs @@ -2,7 +2,7 @@ using System.Text; using System.Text.RegularExpressions; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// CDTXStyleExtractor determines if there is a session notation, and if there is then /// it returns a sheet of music clipped according to the specified player Side. diff --git a/OpenTaiko/src/Songs/CScoreIni.cs b/OpenTaiko/src/Songs/CScoreIni.cs index 9e243874..655e6bd0 100644 --- a/OpenTaiko/src/Songs/CScoreIni.cs +++ b/OpenTaiko/src/Songs/CScoreIni.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { [Serializable] public class CScoreIni { // プロパティ diff --git a/OpenTaiko/src/Songs/CScoreIni_Importer.cs b/OpenTaiko/src/Songs/CScoreIni_Importer.cs index acc9a608..65c304eb 100644 --- a/OpenTaiko/src/Songs/CScoreIni_Importer.cs +++ b/OpenTaiko/src/Songs/CScoreIni_Importer.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using Microsoft.Data.Sqlite; -namespace TJAPlayer3 { +namespace OpenTaiko { static class CScoreIni_Importer { public static string Status { get; private set; } = ""; private static readonly string langSUBTITLE = "SUBTITLE" + CLangManager.LangInstance.Id.ToUpper(); @@ -18,7 +18,7 @@ namespace TJAPlayer3 { Status = "Searching for scores..."; List _scoreFiles = new List(); - foreach (string path in TJAPlayer3.ConfigIni.strSongsPath.Split(';', StringSplitOptions.RemoveEmptyEntries)) { + foreach (string path in OpenTaiko.ConfigIni.strSongsPath.Split(';', StringSplitOptions.RemoveEmptyEntries)) { _scoreFiles.AddRange(Directory.GetFiles(path, "*.score.ini", SearchOption.AllDirectories)); } Trace.TraceInformation($"{_scoreFiles.Count} score.ini files have been found. Beginning import."); @@ -239,21 +239,21 @@ namespace TJAPlayer3 { private static string GetTJAFile(string path) { FileInfo info = new FileInfo(path); - if (info.FullName.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[0]}.score.ini")) return info.FullName.Replace($"{TJAPlayer3.ConfigIni.sSaveFile[0]}.score.ini", ""); - if (info.FullName.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[1]}.score.ini")) return info.FullName.Replace($"{TJAPlayer3.ConfigIni.sSaveFile[1]}.score.ini", ""); - if (info.FullName.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[2]}.score.ini")) return info.FullName.Replace($"{TJAPlayer3.ConfigIni.sSaveFile[2]}.score.ini", ""); - if (info.FullName.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[3]}.score.ini")) return info.FullName.Replace($"{TJAPlayer3.ConfigIni.sSaveFile[3]}.score.ini", ""); - if (info.FullName.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[4]}.score.ini")) return info.FullName.Replace($"{TJAPlayer3.ConfigIni.sSaveFile[4]}.score.ini", ""); + if (info.FullName.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[0]}.score.ini")) return info.FullName.Replace($"{OpenTaiko.ConfigIni.sSaveFile[0]}.score.ini", ""); + if (info.FullName.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[1]}.score.ini")) return info.FullName.Replace($"{OpenTaiko.ConfigIni.sSaveFile[1]}.score.ini", ""); + if (info.FullName.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[2]}.score.ini")) return info.FullName.Replace($"{OpenTaiko.ConfigIni.sSaveFile[2]}.score.ini", ""); + if (info.FullName.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[3]}.score.ini")) return info.FullName.Replace($"{OpenTaiko.ConfigIni.sSaveFile[3]}.score.ini", ""); + if (info.FullName.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[4]}.score.ini")) return info.FullName.Replace($"{OpenTaiko.ConfigIni.sSaveFile[4]}.score.ini", ""); return info.FullName.Replace(".score.ini", ""); } private static int GetPlayerId(string path) { FileInfo info = new FileInfo(path); - if (info.Name.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[0]}.score.ini")) return 0; - if (info.Name.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[1]}.score.ini")) return 1; - if (info.Name.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[2]}.score.ini")) return 2; - if (info.Name.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[3]}.score.ini")) return 3; - if (info.Name.EndsWith($"{TJAPlayer3.ConfigIni.sSaveFile[4]}.score.ini")) return 4; + if (info.Name.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[0]}.score.ini")) return 0; + if (info.Name.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[1]}.score.ini")) return 1; + if (info.Name.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[2]}.score.ini")) return 2; + if (info.Name.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[3]}.score.ini")) return 3; + if (info.Name.EndsWith($"{OpenTaiko.ConfigIni.sSaveFile[4]}.score.ini")) return 4; return 0; } } diff --git a/OpenTaiko/src/Songs/CSongListNode.cs b/OpenTaiko/src/Songs/CSongListNode.cs index 50f0ef77..b885f1b9 100644 --- a/OpenTaiko/src/Songs/CSongListNode.cs +++ b/OpenTaiko/src/Songs/CSongListNode.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace TJAPlayer3 { +namespace OpenTaiko { [Serializable] internal class CSongListNode { // プロパティ diff --git a/OpenTaiko/src/Songs/CSongUniqueID.cs b/OpenTaiko/src/Songs/CSongUniqueID.cs index 239f8993..10e706d6 100644 --- a/OpenTaiko/src/Songs/CSongUniqueID.cs +++ b/OpenTaiko/src/Songs/CSongUniqueID.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { [Serializable()] internal class CSongUniqueID { public CSongUniqueID(string path) { diff --git a/OpenTaiko/src/Songs/CSong管理.cs b/OpenTaiko/src/Songs/CSong管理.cs index 3f8debfd..f16223ec 100644 --- a/OpenTaiko/src/Songs/CSong管理.cs +++ b/OpenTaiko/src/Songs/CSong管理.cs @@ -1,9 +1,9 @@ using System.Diagnostics; using System.Security.Cryptography; using System.Text; -using TJAPlayer3.C曲リストノードComparers; +using OpenTaiko.C曲リストノードComparers; -namespace TJAPlayer3 { +namespace OpenTaiko { [Serializable] internal class CSongs管理 { // プロパティ @@ -86,9 +86,9 @@ namespace TJAPlayer3 { public void UpdateDownloadBox() { CSongListNode downloadBox = null; - for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++) { - if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == "Download") { - downloadBox = TJAPlayer3.Songs管理.list曲ルート[i]; + for (int i = 0; i < OpenTaiko.Songs管理.list曲ルート.Count; i++) { + if (OpenTaiko.Songs管理.list曲ルート[i].strジャンル == "Download") { + downloadBox = OpenTaiko.Songs管理.list曲ルート[i]; if (downloadBox.rParentNode != null) downloadBox = downloadBox.rParentNode; } @@ -96,7 +96,7 @@ namespace TJAPlayer3 { if (downloadBox != null && downloadBox.list子リスト != null) { - var flatten = TJAPlayer3.stageSongSelect.actSongList.flattenList(downloadBox.list子リスト); + var flatten = OpenTaiko.stageSongSelect.actSongList.flattenList(downloadBox.list子リスト); // Works because flattenList creates a new List for (int i = 0; i < downloadBox.list子リスト.Count; i++) { @@ -143,7 +143,7 @@ namespace TJAPlayer3 { DirectoryInfo info = new DirectoryInfo(str基点フォルダ); - if (TJAPlayer3.ConfigIni.bLog曲検索ログ出力) + if (OpenTaiko.ConfigIni.bLog曲検索ログ出力) Trace.TraceInformation("基点フォルダ: " + str基点フォルダ); #region [ a.フォルダ内に set.def が存在する場合 → 1フォルダ内のtjaファイル無制限] @@ -151,7 +151,7 @@ namespace TJAPlayer3 { string path = str基点フォルダ + "set.def"; if (File.Exists(path)) { new FileInfo(path); - if (TJAPlayer3.ConfigIni.bLog曲検索ログ出力) { + if (OpenTaiko.ConfigIni.bLog曲検索ログ出力) { Trace.TraceInformation("set.def検出 : {0}", path); Trace.Indent(); } @@ -260,7 +260,7 @@ namespace TJAPlayer3 { #endregion } } finally { - if (TJAPlayer3.ConfigIni.bLog曲検索ログ出力) { + if (OpenTaiko.ConfigIni.bLog曲検索ログ出力) { Trace.Unindent(); } } @@ -428,36 +428,36 @@ namespace TJAPlayer3 { switch (CStrジャンルtoNum.ForAC15(c曲リストノード.strジャンル)) { case 0: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_JPOP; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_JPOP; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_JPOP; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_JPOP; break; case 1: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Anime; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Anime; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Anime; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Anime; break; case 2: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_VOCALOID; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_VOCALOID; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_VOCALOID; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_VOCALOID; break; case 3: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Children; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Children; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Children; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Children; break; case 4: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Variety; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Variety; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Variety; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Variety; break; case 5: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Classic; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Classic; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Classic; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Classic; break; case 6: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_GameMusic; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_GameMusic; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_GameMusic; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_GameMusic; break; case 7: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Namco; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Namco; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Namco; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Namco; break; default: break; @@ -490,7 +490,7 @@ namespace TJAPlayer3 { b = true; } - if (TJAPlayer3.ConfigIni.bLog曲検索ログ出力) { + if (OpenTaiko.ConfigIni.bLog曲検索ログ出力) { // Trace.Indent(); // try // { @@ -579,36 +579,36 @@ namespace TJAPlayer3 { } switch (CStrジャンルtoNum.ForAC15(c曲リストノード.strジャンル)) { case 0: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_JPOP; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_JPOP; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_JPOP; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_JPOP; break; case 1: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Anime; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Anime; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Anime; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Anime; break; case 2: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_VOCALOID; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_VOCALOID; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_VOCALOID; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_VOCALOID; break; case 3: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Children; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Children; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Children; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Children; break; case 4: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Variety; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Variety; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Variety; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Variety; break; case 5: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Classic; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Classic; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Classic; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Classic; break; case 6: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_GameMusic; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_GameMusic; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_GameMusic; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_GameMusic; break; case 7: - c曲リストノード.ForeColor = TJAPlayer3.Skin.SongSelect_ForeColor_Namco; - c曲リストノード.BackColor = TJAPlayer3.Skin.SongSelect_BackColor_Namco; + c曲リストノード.ForeColor = OpenTaiko.Skin.SongSelect_ForeColor_Namco; + c曲リストノード.BackColor = OpenTaiko.Skin.SongSelect_BackColor_Namco; break; default: break; @@ -632,7 +632,7 @@ namespace TJAPlayer3 { c曲リストノード.list子リスト = new List(); listノードリスト.Add(c曲リストノード); - if (TJAPlayer3.ConfigIni.bLog曲検索ログ出力) { + if (OpenTaiko.ConfigIni.bLog曲検索ログ出力) { Trace.TraceInformation("box.def検出 : {0}", infoDir.FullName + @$"{Path.DirectorySeparatorChar}box.def"); Trace.Indent(); try { @@ -753,7 +753,7 @@ namespace TJAPlayer3 { //Debug.WriteLine( "★" + this.nファイルから反映できたスコア数 + " " + c曲リストノード.arスコア[ i ].譜面情報.タイトル ); #region [ 曲検索ログ出力 ] //----------------- - if (TJAPlayer3.ConfigIni.bLog曲検索ログ出力) { + if (OpenTaiko.ConfigIni.bLog曲検索ログ出力) { StringBuilder sb = new StringBuilder(0x400); sb.Append(string.Format("曲データファイルから譜面情報を転記しました。({0})", path)); sb.Append("(title=" + c曲リストノード.arスコア[i].譜面情報.タイトル); @@ -795,8 +795,8 @@ namespace TJAPlayer3 { //----------------- public void t曲リストへ後処理を適用する() { listStrBoxDefSkinSubfolderFullName = new List(); - if (TJAPlayer3.Skin.strBoxDefSkinSubfolders != null) { - foreach (string b in TJAPlayer3.Skin.strBoxDefSkinSubfolders) { + if (OpenTaiko.Skin.strBoxDefSkinSubfolders != null) { + foreach (string b in OpenTaiko.Skin.strBoxDefSkinSubfolders) { listStrBoxDefSkinSubfolderFullName.Add(b); } } @@ -845,7 +845,7 @@ namespace TJAPlayer3 { var c曲リストノード = list曲ルート[p]; if (c曲リストノード.eノード種別 == CSongListNode.ENodeType.BOX) { if (c曲リストノード.strジャンル == "段位道場") { - if (TJAPlayer3.ConfigIni.bDanTowerHide) { + if (OpenTaiko.ConfigIni.bDanTowerHide) { list曲ルート.Remove(c曲リストノード); p--; } @@ -863,7 +863,7 @@ namespace TJAPlayer3 { } */ } else if (c曲リストノード.strジャンル == "太鼓タワー") { - if (TJAPlayer3.ConfigIni.bDanTowerHide) { + if (OpenTaiko.ConfigIni.bDanTowerHide) { list曲ルート.Remove(c曲リストノード); p--; } @@ -874,7 +874,7 @@ namespace TJAPlayer3 { if (c曲リストノード.list子リスト[i].arスコア[6] != null) { list曲ルート_Dan.Add(c曲リストノード.list子リスト[i]); - if (TJAPlayer3.ConfigIni.bDanTowerHide) + if (OpenTaiko.ConfigIni.bDanTowerHide) c曲リストノード.list子リスト.Remove(c曲リストノード.list子リスト[i]); continue; @@ -882,7 +882,7 @@ namespace TJAPlayer3 { if (c曲リストノード.list子リスト[i].arスコア[5] != null) { list曲ルート_Tower.Add(c曲リストノード.list子リスト[i]); - if (TJAPlayer3.ConfigIni.bDanTowerHide) + if (OpenTaiko.ConfigIni.bDanTowerHide) c曲リストノード.list子リスト.Remove(c曲リストノード.list子リスト[i]); continue; @@ -904,7 +904,7 @@ namespace TJAPlayer3 { } #region [ skin名で比較して、systemスキンとboxdefスキンに重複があれば、boxdefスキン側を削除する ] - string[] systemSkinNames = CSkin.GetSkinName(TJAPlayer3.Skin.strSystemSkinSubfolders); + string[] systemSkinNames = CSkin.GetSkinName(OpenTaiko.Skin.strSystemSkinSubfolders); List l = new List(listStrBoxDefSkinSubfolderFullName); foreach (string boxdefSkinSubfolderFullName in l) { if (Array.BinarySearch(systemSkinNames, @@ -916,7 +916,7 @@ namespace TJAPlayer3 { #endregion string[] ba = listStrBoxDefSkinSubfolderFullName.ToArray(); Array.Sort(ba); - TJAPlayer3.Skin.strBoxDefSkinSubfolders = ba; + OpenTaiko.Skin.strBoxDefSkinSubfolders = ba; } @@ -934,11 +934,11 @@ namespace TJAPlayer3 { if (isGlobal) { #region [ Sort nodes ] //----------------------------- - if (TJAPlayer3.ConfigIni.nDefaultSongSort == 0) { + if (OpenTaiko.ConfigIni.nDefaultSongSort == 0) { t曲リストのソート1_絶対パス順(ノードリスト); - } else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 1) { + } else if (OpenTaiko.ConfigIni.nDefaultSongSort == 1) { t曲リストのソート9_ジャンル順(ノードリスト, EInstrumentPad.TAIKO, 1, 0); - } else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 2) { + } else if (OpenTaiko.ConfigIni.nDefaultSongSort == 2) { t曲リストのソート9_ジャンル順(ノードリスト, EInstrumentPad.TAIKO, 2, 0); } //----------------------------- @@ -955,11 +955,11 @@ namespace TJAPlayer3 { #region [ Sort child nodes ] //----------------------------- - if (TJAPlayer3.ConfigIni.nDefaultSongSort == 0) { + if (OpenTaiko.ConfigIni.nDefaultSongSort == 0) { t曲リストのソート1_絶対パス順(c曲リストノード.list子リスト); - } else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 1) { + } else if (OpenTaiko.ConfigIni.nDefaultSongSort == 1) { t曲リストのソート9_ジャンル順(c曲リストノード.list子リスト, EInstrumentPad.TAIKO, 1, 0); - } else if (TJAPlayer3.ConfigIni.nDefaultSongSort == 2) { + } else if (OpenTaiko.ConfigIni.nDefaultSongSort == 2) { t曲リストのソート9_ジャンル順(c曲リストノード.list子リスト, EInstrumentPad.TAIKO, 2, 0); } //----------------------------- @@ -986,7 +986,7 @@ namespace TJAPlayer3 { if ((c曲リストノード.arスコア[j] != null) && !string.IsNullOrEmpty(c曲リストノード.arスコア[j].譜面情報.タイトル)) { c曲リストノード.ldTitle = new CLocalizationData(); - if (TJAPlayer3.ConfigIni.bLog曲検索ログ出力) + if (OpenTaiko.ConfigIni.bLog曲検索ログ出力) Trace.TraceInformation("タイトルを設定しました。(nID#{0:D3}, title={1})", c曲リストノード.nID, c曲リストノード.ldTitle.GetString("")); break; diff --git a/OpenTaiko/src/Songs/CStrジャンルtoNum.cs b/OpenTaiko/src/Songs/CStrジャンルtoNum.cs index c93822a9..d0e056e2 100644 --- a/OpenTaiko/src/Songs/CStrジャンルtoNum.cs +++ b/OpenTaiko/src/Songs/CStrジャンルtoNum.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal static class CStrジャンルtoNum { internal static int ForAC8_14(string strジャンル) { switch (strジャンル) { diff --git a/OpenTaiko/src/Songs/Cスコア.cs b/OpenTaiko/src/Songs/Cスコア.cs index 4a41c894..442b6277 100644 --- a/OpenTaiko/src/Songs/Cスコア.cs +++ b/OpenTaiko/src/Songs/Cスコア.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { [Serializable] internal class Cスコア { // プロパティ diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/ComparerChain.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/ComparerChain.cs index c0c9d3b4..97e81238 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/ComparerChain.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/ComparerChain.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class ComparerChain : IComparer where T : class { private readonly IComparer[] _comparers; diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC15.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC15.cs index f2804f78..9469dca3 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC15.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC15.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class C曲リストノードComparerAC15 : IComparer { public int Compare(CSongListNode n1, CSongListNode n2) { return CStrジャンルtoNum.ForAC15(n1.strジャンル).CompareTo(CStrジャンルtoNum.ForAC15(n2.strジャンル)); diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC8_14.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC8_14.cs index 87b4125f..8a242bb1 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC8_14.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerAC8_14.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class C曲リストノードComparerAC8_14 : IComparer { public int Compare(CSongListNode n1, CSongListNode n2) { return CStrジャンルtoNum.ForAC8_14(n1.strジャンル).CompareTo(CStrジャンルtoNum.ForAC8_14(n2.strジャンル)); diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevel.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevel.cs index 6bf065a2..d7c25fe0 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevel.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevel.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class C曲リストノードComparerLevel : IComparer { private readonly int _order; @@ -18,7 +18,7 @@ } private int _diffOf(CSongListNode n1) { - return n1.nLevel[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(n1)]; + return n1.nLevel[OpenTaiko.stageSongSelect.actSongList.tFetchDifficulty(n1)]; } } } diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevelIcon.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevelIcon.cs index 57d303d3..62e30e22 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevelIcon.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerLevelIcon.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class C曲リストノードComparerLevelIcon : IComparer { private readonly int _order; @@ -18,7 +18,7 @@ } private int _diffOf(CSongListNode n1) { - return (int)n1.nLevelIcon[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(n1)]; + return (int)n1.nLevelIcon[OpenTaiko.stageSongSelect.actSongList.tFetchDifficulty(n1)]; } } } diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerSubtitle.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerSubtitle.cs index 1051400f..960bb422 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerSubtitle.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerSubtitle.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class C曲リストノードComparerSubtitle : IComparer { private readonly int _order; diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerタイトル.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerタイトル.cs index 5e185014..5d7885a0 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerタイトル.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerタイトル.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class C曲リストノードComparerタイトル : IComparer { private readonly int _order; diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerノード種別.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerノード種別.cs index fc6fba00..27b1d174 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerノード種別.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparerノード種別.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class C曲リストノードComparerノード種別 : IComparer { public int Compare(CSongListNode x, CSongListNode y) { return ToComparable(x.eノード種別).CompareTo(ToComparable(y.eノード種別)); diff --git a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparer絶対パス.cs b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparer絶対パス.cs index 821b1010..149cad6a 100644 --- a/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparer絶対パス.cs +++ b/OpenTaiko/src/Songs/C曲リストノードComparers/C曲リストノードComparer絶対パス.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3.C曲リストノードComparers { +namespace OpenTaiko.C曲リストノードComparers { internal sealed class C曲リストノードComparer絶対パス : IComparer { private readonly int _order; diff --git a/OpenTaiko/src/Songs/Dan-C.cs b/OpenTaiko/src/Songs/Dan-C.cs index 00caeca0..7489e4a9 100644 --- a/OpenTaiko/src/Songs/Dan-C.cs +++ b/OpenTaiko/src/Songs/Dan-C.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 段位認定を管理するクラス。 /// diff --git a/OpenTaiko/src/Songs/Extended/CSongObject.cs b/OpenTaiko/src/Songs/Extended/CSongObject.cs index 59a063b1..997cd862 100644 --- a/OpenTaiko/src/Songs/Extended/CSongObject.cs +++ b/OpenTaiko/src/Songs/Extended/CSongObject.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CSongObject { public CSongObject(string name, float x, float y, string path) { this.name = path; @@ -18,15 +18,15 @@ namespace TJAPlayer3 { FileAttributes attr = File.GetAttributes(path); if ((attr & FileAttributes.Directory) == FileAttributes.Directory) { - textures = TJAPlayer3.Tx.TxCSongFolder(path); + textures = OpenTaiko.Tx.TxCSongFolder(path); } else { textures = new CTexture[1]; - textures[0] = TJAPlayer3.Tx.TxCSong(path); + textures[0] = OpenTaiko.Tx.TxCSong(path); } } public void tStartAnimation(double animInterval, bool loop) { - counter.Start(0, textures.Length - 1, animInterval, TJAPlayer3.Timer); + counter.Start(0, textures.Length - 1, animInterval, OpenTaiko.Timer); counter.CurrentValue = this.frame; this.isLooping = loop; @@ -57,8 +57,8 @@ namespace TJAPlayer3 { tx.color4 = this.color; tx.Opacity = this.opacity; - float screen_ratiox = TJAPlayer3.Skin.Resolution[0] / 1280.0f; - float screen_ratioy = TJAPlayer3.Skin.Resolution[1] / 720.0f; + float screen_ratiox = OpenTaiko.Skin.Resolution[0] / 1280.0f; + float screen_ratioy = OpenTaiko.Skin.Resolution[1] / 720.0f; if (isVisible) tx.t2D描画SongObj((int)(this.x * screen_ratiox), (int)(this.y * screen_ratioy), this.xScale * screen_ratiox, this.yScale * screen_ratioy); } diff --git a/OpenTaiko/src/Songs/GaugeIncreaseMode.cs b/OpenTaiko/src/Songs/GaugeIncreaseMode.cs index 2748192b..d6315b24 100644 --- a/OpenTaiko/src/Songs/GaugeIncreaseMode.cs +++ b/OpenTaiko/src/Songs/GaugeIncreaseMode.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// ゲージ増加量の種類。 /// diff --git a/OpenTaiko/src/Songs/VTTParser.cs b/OpenTaiko/src/Songs/VTTParser.cs index 825ea7c9..faea538f 100644 --- a/OpenTaiko/src/Songs/VTTParser.cs +++ b/OpenTaiko/src/Songs/VTTParser.cs @@ -4,9 +4,9 @@ using System.Net; using System.Text.RegularExpressions; using FDK; using SkiaSharp; -using static TJAPlayer3.CDTX; +using static OpenTaiko.CDTX; -namespace TJAPlayer3 { +namespace OpenTaiko { public class VTTParser : IDisposable { /* @@ -101,8 +101,8 @@ namespace TJAPlayer3 { List lyricData = new List(); LyricData data = new LyricData() { - ForeColor = TJAPlayer3.Skin.Game_Lyric_ForeColor, - BackColor = TJAPlayer3.Skin.Game_Lyric_BackColor + ForeColor = OpenTaiko.Skin.Game_Lyric_ForeColor, + BackColor = OpenTaiko.Skin.Game_Lyric_BackColor }; bool readingHeader = true; @@ -138,8 +138,8 @@ namespace TJAPlayer3 { lyricData = new List(); data = new LyricData() { timestamp = startTime, - ForeColor = TJAPlayer3.Skin.Game_Lyric_ForeColor, - BackColor = TJAPlayer3.Skin.Game_Lyric_BackColor + ForeColor = OpenTaiko.Skin.Game_Lyric_ForeColor, + BackColor = OpenTaiko.Skin.Game_Lyric_BackColor }; ignoreLyrics = false; isUsingLang = false; @@ -183,8 +183,8 @@ namespace TJAPlayer3 { if (tagdata == ("c")) { lyricData.Add(data); data.Text = String.Empty; - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_ForeColor; - data.BackColor = TJAPlayer3.Skin.Game_Lyric_BackColor; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_ForeColor; + data.BackColor = OpenTaiko.Skin.Game_Lyric_BackColor; } else if (tagdata.StartsWith("lang")) { data.Language = String.Empty; } else if (tagdata == "ruby") { lyricData.Add(data); data.IsRuby = false; @@ -215,52 +215,52 @@ namespace TJAPlayer3 { foreach (string clr in colordata) { switch (clr) { case "white": - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_VTTForeColor[0]; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_VTTForeColor[0]; break; case "lime": - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_VTTForeColor[1]; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_VTTForeColor[1]; break; case "cyan": - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_VTTForeColor[2]; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_VTTForeColor[2]; break; case "red": - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_VTTForeColor[3]; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_VTTForeColor[3]; break; case "yellow": - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_VTTForeColor[4]; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_VTTForeColor[4]; break; case "magenta": - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_VTTForeColor[5]; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_VTTForeColor[5]; break; case "blue": - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_VTTForeColor[6]; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_VTTForeColor[6]; break; case "black": - data.ForeColor = TJAPlayer3.Skin.Game_Lyric_VTTForeColor[7]; + data.ForeColor = OpenTaiko.Skin.Game_Lyric_VTTForeColor[7]; break; case "bg_white": - data.BackColor = TJAPlayer3.Skin.Game_Lyric_VTTBackColor[0]; + data.BackColor = OpenTaiko.Skin.Game_Lyric_VTTBackColor[0]; break; case "bg_lime": - data.BackColor = TJAPlayer3.Skin.Game_Lyric_VTTBackColor[1]; + data.BackColor = OpenTaiko.Skin.Game_Lyric_VTTBackColor[1]; break; case "bg_cyan": - data.BackColor = TJAPlayer3.Skin.Game_Lyric_VTTBackColor[2]; + data.BackColor = OpenTaiko.Skin.Game_Lyric_VTTBackColor[2]; break; case "bg_red": - data.BackColor = TJAPlayer3.Skin.Game_Lyric_VTTBackColor[3]; + data.BackColor = OpenTaiko.Skin.Game_Lyric_VTTBackColor[3]; break; case "bg_yellow": - data.BackColor = TJAPlayer3.Skin.Game_Lyric_VTTBackColor[4]; + data.BackColor = OpenTaiko.Skin.Game_Lyric_VTTBackColor[4]; break; case "bg_magenta": - data.BackColor = TJAPlayer3.Skin.Game_Lyric_VTTBackColor[5]; + data.BackColor = OpenTaiko.Skin.Game_Lyric_VTTBackColor[5]; break; case "bg_blue": - data.BackColor = TJAPlayer3.Skin.Game_Lyric_VTTBackColor[6]; + data.BackColor = OpenTaiko.Skin.Game_Lyric_VTTBackColor[6]; break; case "bg_black": - data.BackColor = TJAPlayer3.Skin.Game_Lyric_VTTBackColor[7]; + data.BackColor = OpenTaiko.Skin.Game_Lyric_VTTBackColor[7]; break; default: break; @@ -394,20 +394,20 @@ namespace TJAPlayer3 { string text = String.Empty; foreach (LyricData data in datalist) { - using (CCachedFontRenderer fastdraw = HPrivateFastFont.tInstantiateFont(TJAPlayer3.Skin.Game_Lyric_FontName, TJAPlayer3.Skin.Game_Lyric_FontSize, data.Style)) { + using (CCachedFontRenderer fastdraw = HPrivateFastFont.tInstantiateFont(OpenTaiko.Skin.Game_Lyric_FontName, OpenTaiko.Skin.Game_Lyric_FontSize, data.Style)) { SKBitmap textdrawing = fastdraw.DrawText(data.Text, data.ForeColor, data.BackColor, null, 30); // Draw main text if (data.IsRuby) // ruby time { - using (CCachedFontRenderer rubydraw = HPrivateFastFont.tInstantiateFont(TJAPlayer3.Skin.Game_Lyric_FontName, TJAPlayer3.Skin.Game_Lyric_FontSize / 2, data.Style)) { + using (CCachedFontRenderer rubydraw = HPrivateFastFont.tInstantiateFont(OpenTaiko.Skin.Game_Lyric_FontName, OpenTaiko.Skin.Game_Lyric_FontSize / 2, data.Style)) { SKBitmap ruby = rubydraw.DrawText(data.RubyText, data.ForeColor, data.BackColor, null, 30); - Size size = new Size(textdrawing.Width > ruby.Width ? textdrawing.Width : ruby.Width, textdrawing.Height + (TJAPlayer3.Skin.Game_Lyric_VTTRubyOffset + (ruby.Height / 2))); + Size size = new Size(textdrawing.Width > ruby.Width ? textdrawing.Width : ruby.Width, textdrawing.Height + (OpenTaiko.Skin.Game_Lyric_VTTRubyOffset + (ruby.Height / 2))); SKBitmap fullruby = new SKBitmap(size.Width, size.Height); using (SKCanvas canvas = new SKCanvas(fullruby)) { canvas.DrawBitmap(textdrawing, (fullruby.Width / 2) - (textdrawing.Width / 2), (fullruby.Height / 2) - (textdrawing.Height / 2)); - canvas.DrawBitmap(ruby, (fullruby.Width - ruby.Width) / 2, (fullruby.Height / 2) - (ruby.Height / 2) - TJAPlayer3.Skin.Game_Lyric_VTTRubyOffset); + canvas.DrawBitmap(ruby, (fullruby.Width - ruby.Width) / 2, (fullruby.Height / 2) - (ruby.Height / 2) - OpenTaiko.Skin.Game_Lyric_VTTRubyOffset); } textures[data.line].Add(fullruby); rubywidthoffset[data.line].Add((fullruby.Width - textdrawing.Width) / 2 > 0 ? (fullruby.Width - textdrawing.Width) / 2 : 0); diff --git a/OpenTaiko/src/Stages/01.StartUp/CCharacter.cs b/OpenTaiko/src/Stages/01.StartUp/CCharacter.cs index abce4929..84dc367e 100644 --- a/OpenTaiko/src/Stages/01.StartUp/CCharacter.cs +++ b/OpenTaiko/src/Stages/01.StartUp/CCharacter.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class CCharacter { public DBCharacter.CharacterData metadata; public DBCharacter.CharacterEffect effect; @@ -16,8 +16,8 @@ } public void tGetUnlockedItems(int _player, ModalQueue mq) { - int player = TJAPlayer3.GetActualPlayer(_player); - var _sf = TJAPlayer3.SaveFileInstances[player].data.UnlockedCharacters; + int player = OpenTaiko.GetActualPlayer(_player); + var _sf = OpenTaiko.SaveFileInstances[player].data.UnlockedCharacters; bool _edited = false; var _npvKey = Path.GetFileName(_path); @@ -33,16 +33,16 @@ Modal.EModalType.Character, HRarity.tRarityToModalInt(metadata.Rarity), this, - TJAPlayer3.Tx.Characters_Heya_Render[_idx] + OpenTaiko.Tx.Characters_Heya_Render[_idx] ), _player); - DBSaves.RegisterStringUnlockedAsset(TJAPlayer3.SaveFileInstances[player].data.SaveId, "unlocked_characters", _npvKey); + DBSaves.RegisterStringUnlockedAsset(OpenTaiko.SaveFileInstances[player].data.SaveId, "unlocked_characters", _npvKey); } } if (_edited) - TJAPlayer3.SaveFileInstances[player].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[player].tApplyHeyaChanges(); } public CCharacter(string path, int i) { diff --git a/OpenTaiko/src/Stages/01.StartUp/CPuchichara.cs b/OpenTaiko/src/Stages/01.StartUp/CPuchichara.cs index 3eeb5e93..ebbe2a29 100644 --- a/OpenTaiko/src/Stages/01.StartUp/CPuchichara.cs +++ b/OpenTaiko/src/Stages/01.StartUp/CPuchichara.cs @@ -2,7 +2,7 @@ using Silk.NET.Maths; -namespace TJAPlayer3 { +namespace OpenTaiko { class CPuchichara { public CTexture tx; public CTexture render; @@ -22,8 +22,8 @@ namespace TJAPlayer3 { } public void tGetUnlockedItems(int _player, ModalQueue mq) { - int player = TJAPlayer3.GetActualPlayer(_player); - var _sf = TJAPlayer3.SaveFileInstances[player].data.UnlockedPuchicharas; + int player = OpenTaiko.GetActualPlayer(_player); + var _sf = OpenTaiko.SaveFileInstances[player].data.UnlockedPuchicharas; bool _edited = false; var _npvKey = Path.GetFileName(_path); @@ -42,25 +42,25 @@ namespace TJAPlayer3 { ), _player); - DBSaves.RegisterStringUnlockedAsset(TJAPlayer3.SaveFileInstances[player].data.SaveId, "unlocked_puchicharas", _npvKey); + DBSaves.RegisterStringUnlockedAsset(OpenTaiko.SaveFileInstances[player].data.SaveId, "unlocked_puchicharas", _npvKey); } } if (_edited) - TJAPlayer3.SaveFileInstances[player].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[player].tApplyHeyaChanges(); } public CPuchichara(string path) { _path = path; // Puchichara textures - tx = TJAPlayer3.Tx.TxCAbsolute($@"{path}{Path.DirectorySeparatorChar}Chara.png"); + tx = OpenTaiko.Tx.TxCAbsolute($@"{path}{Path.DirectorySeparatorChar}Chara.png"); if (tx != null) { - tx.vcScaleRatio = new Vector3D(TJAPlayer3.Skin.Game_PuchiChara_Scale[0]); + tx.vcScaleRatio = new Vector3D(OpenTaiko.Skin.Game_PuchiChara_Scale[0]); } // Heya render - render = TJAPlayer3.Tx.TxCAbsolute($@"{path}{Path.DirectorySeparatorChar}Render.png"); + render = OpenTaiko.Tx.TxCAbsolute($@"{path}{Path.DirectorySeparatorChar}Render.png"); // Puchichara welcome sfx welcome = new CSkin.CSystemSound($@"{path}{Path.DirectorySeparatorChar}Welcome.ogg", false, false, true, ESoundGroup.Voice); diff --git a/OpenTaiko/src/Stages/01.StartUp/CStage起動.cs b/OpenTaiko/src/Stages/01.StartUp/CStage起動.cs index 18e6ec34..8e3c160d 100644 --- a/OpenTaiko/src/Stages/01.StartUp/CStage起動.cs +++ b/OpenTaiko/src/Stages/01.StartUp/CStage起動.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CStage起動 : CStage { // コンストラクタ @@ -21,15 +21,15 @@ namespace TJAPlayer3 { Background = new ScriptBG(CSkin.Path($"{TextureLoader.BASE}{TextureLoader.STARTUP}Script.lua")); Background.Init(); - if (TJAPlayer3.ConfigIsNew) { - langSelectFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.StartUp_LangSelect_FontSize); - langSelectTitle = TJAPlayer3.tテクスチャの生成(langSelectFont.DrawText("Select Language:", System.Drawing.Color.White)); + if (OpenTaiko.ConfigIsNew) { + langSelectFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.StartUp_LangSelect_FontSize); + langSelectTitle = OpenTaiko.tテクスチャの生成(langSelectFont.DrawText("Select Language:", System.Drawing.Color.White)); langList = new CTexture[CLangManager.Languages.Length]; langListHighlighted = new CTexture[CLangManager.Languages.Length]; for (int i = 0; i < langList.Length; i++) { - langList[i] = TJAPlayer3.tテクスチャの生成(langSelectFont.DrawText(CLangManager.Languages[i], System.Drawing.Color.White)); - langListHighlighted[i] = TJAPlayer3.tテクスチャの生成(langSelectFont.DrawText(CLangManager.Languages[i], System.Drawing.Color.Red)); + langList[i] = OpenTaiko.tテクスチャの生成(langSelectFont.DrawText(CLangManager.Languages[i], System.Drawing.Color.White)); + langListHighlighted[i] = OpenTaiko.tテクスチャの生成(langSelectFont.DrawText(CLangManager.Languages[i], System.Drawing.Color.Red)); } langSelectOffset = new int[2] { SampleFramework.GameWindowSize.Width / 2, (SampleFramework.GameWindowSize.Height - langList.Select(tex => tex.szTextureSize.Height).Sum() - langSelectTitle.szTextureSize.Height) / 2 }; } @@ -46,14 +46,14 @@ namespace TJAPlayer3 { Trace.TraceInformation("起動ステージを非活性化します。"); Trace.Indent(); try { - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); - TJAPlayer3.tDisposeSafely(ref langSelectFont); - TJAPlayer3.tDisposeSafely(ref langSelectTitle); + OpenTaiko.tDisposeSafely(ref langSelectFont); + OpenTaiko.tDisposeSafely(ref langSelectTitle); if (langList != null) { for (int i = 0; i < langList.Length; i++) { - TJAPlayer3.tDisposeSafely(ref langList[i]); - TJAPlayer3.tDisposeSafely(ref langListHighlighted[i]); + OpenTaiko.tDisposeSafely(ref langList[i]); + OpenTaiko.tDisposeSafely(ref langListHighlighted[i]); } } @@ -82,7 +82,7 @@ namespace TJAPlayer3 { if (base.IsFirstDraw) { this.list進行文字列.Add("DTXManiaXG Ver.K powered by YAMAHA Silent Session Drums\n"); this.list進行文字列.Add("Product by.kairera0467\n"); - this.list進行文字列.Add("Release: " + TJAPlayer3.VERSION + " [" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() + "]"); + this.list進行文字列.Add("Release: " + OpenTaiko.VERSION + " [" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() + "]"); this.list進行文字列.Add(""); this.list進行文字列.Add("TJAPlayer3-Develop-ReWrite forked TJAPlayer3(@aioilight)"); @@ -134,14 +134,14 @@ namespace TJAPlayer3 { this.list進行文字列.Add("LOADING TEXTURES..."); try { - TJAPlayer3.Tx.LoadTexture(); + OpenTaiko.Tx.LoadTexture(); this.list進行文字列.Add("LOADING TEXTURES...OK"); this.str現在進行中 = "Setup done."; this.ePhaseID = EPhase.Startup_Complete; - TJAPlayer3.Skin.bgm起動画面.tStop(); + OpenTaiko.Skin.bgm起動画面.tStop(); } catch (Exception exception) { - TJAPlayer3.Skin.bgm起動画面.tStop(); + OpenTaiko.Skin.bgm起動画面.tStop(); Trace.TraceError(exception.ToString()); this.list進行文字列.Add("LOADING TEXTURES...NG"); @@ -153,9 +153,9 @@ namespace TJAPlayer3 { this.list進行文字列.Add("LOADING TEXTURES...OK"); this.str現在進行中 = "Setup done."; this.ePhaseID = EPhase.Startup_Complete; - TJAPlayer3.Skin.bgm起動画面.tStop(); + OpenTaiko.Skin.bgm起動画面.tStop(); } - if (TJAPlayer3.ConfigIni.ASyncTextureLoad) { + if (OpenTaiko.ConfigIni.ASyncTextureLoad) { Task.Run(loadTexture); } else { loadTexture(); @@ -173,18 +173,18 @@ namespace TJAPlayer3 { int x = 320; int y = 20; for (int i = 0; i < this.list進行文字列.Count; i++) { - TJAPlayer3.actTextConsole.tPrint((int)(x * TJAPlayer3.Skin.Resolution[0] / 1280.0), (int)(y * TJAPlayer3.Skin.Resolution[1] / 720.0), CTextConsole.EFontType.White, this.list進行文字列[i]); + OpenTaiko.actTextConsole.tPrint((int)(x * OpenTaiko.Skin.Resolution[0] / 1280.0), (int)(y * OpenTaiko.Skin.Resolution[1] / 720.0), CTextConsole.EFontType.White, this.list進行文字列[i]); y += 24; } //----------------- #endregion - } else if (TJAPlayer3.ConfigIsNew && !bLanguageSelected) // Prompt language selection if Config.ini is newly generated + } else if (OpenTaiko.ConfigIsNew && !bLanguageSelected) // Prompt language selection if Config.ini is newly generated { - if (TJAPlayer3.Tx.Tile_Black != null) { - TJAPlayer3.Tx.Tile_Black.Opacity = 255; - for (int i = 0; i <= SampleFramework.GameWindowSize.Width; i += TJAPlayer3.Tx.Tile_Black.szTextureSize.Width) { - for (int j = 0; j <= SampleFramework.GameWindowSize.Height; j += TJAPlayer3.Tx.Tile_Black.szTextureSize.Height) { - TJAPlayer3.Tx.Tile_Black.t2D描画(i, j); + if (OpenTaiko.Tx.Tile_Black != null) { + OpenTaiko.Tx.Tile_Black.Opacity = 255; + for (int i = 0; i <= SampleFramework.GameWindowSize.Width; i += OpenTaiko.Tx.Tile_Black.szTextureSize.Width) { + for (int j = 0; j <= SampleFramework.GameWindowSize.Height; j += OpenTaiko.Tx.Tile_Black.szTextureSize.Height) { + OpenTaiko.Tx.Tile_Black.t2D描画(i, j); } } } @@ -204,28 +204,28 @@ namespace TJAPlayer3 { y += langList[i].szTextureSize.Height; } - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.DownArrow) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.DownArrow) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { langSelectIndex = Math.Min(langSelectIndex + 1, CLangManager.Languages.Length - 1); - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.UpArrow) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.UpArrow) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { langSelectIndex = Math.Max(langSelectIndex - 1, 0); - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.ConfigIni.sLang = CLangManager.intToLang(langSelectIndex); - CLangManager.langAttach(TJAPlayer3.ConfigIni.sLang); + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) { + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.ConfigIni.sLang = CLangManager.intToLang(langSelectIndex); + CLangManager.langAttach(OpenTaiko.ConfigIni.sLang); bLanguageSelected = true; } } else { if (es != null && es.IsSongListEnumCompletelyDone) // 曲リスト作成が終わったら { - TJAPlayer3.Songs管理 = (es != null) ? es.Songs管理 : null; // 最後に、曲リストを拾い上げる + OpenTaiko.Songs管理 = (es != null) ? es.Songs管理 : null; // 最後に、曲リストを拾い上げる - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) { + OpenTaiko.Skin.soundDecideSFX.tPlay(); return 1; } } - TJAPlayer3.Tx.Readme.t2D描画(0, 0); + OpenTaiko.Tx.Readme.t2D描画(0, 0); } } diff --git a/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs b/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs index a357157c..40e2160e 100644 --- a/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs +++ b/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class TextureLoader { public static string BASE = @$"Graphics{Path.DirectorySeparatorChar}"; public static string GLOBAL = @$"Global{Path.DirectorySeparatorChar}"; @@ -73,31 +73,31 @@ namespace TJAPlayer3 { internal CTexture TxC(string FileName, bool localize = true) { var texpath = (localize) ? HLocalizedPath.GetAvailableLocalizedPath(CSkin.Path(BASE + FileName)) : CSkin.Path(BASE + FileName); - var tex = TJAPlayer3.tテクスチャの生成(texpath, false); + var tex = OpenTaiko.tテクスチャの生成(texpath, false); listTexture.Add(tex); return tex; } internal CTexture TxCGlobal(string FileName) { - var tex = TJAPlayer3.tテクスチャの生成(TJAPlayer3.strEXEのあるフォルダ + GLOBAL + FileName, false); + var tex = OpenTaiko.tテクスチャの生成(OpenTaiko.strEXEのあるフォルダ + GLOBAL + FileName, false); listTexture.Add(tex); return tex; } internal CTexture TxCAbsolute(string FileName) { - var tex = TJAPlayer3.tテクスチャの生成(FileName, false); + var tex = OpenTaiko.tテクスチャの生成(FileName, false); listTexture.Add(tex); return tex; } internal CTextureAf TxCAf(string FileName) { - var tex = TJAPlayer3.tテクスチャの生成Af(CSkin.Path(BASE + FileName)); + var tex = OpenTaiko.tテクスチャの生成Af(CSkin.Path(BASE + FileName)); listTexture.Add(tex); return tex; } internal CTexture TxCGen(string FileName) { - return TJAPlayer3.tテクスチャの生成(CSkin.Path(BASE + GAME + GENRE + FileName + ".png"), false); + return OpenTaiko.tテクスチャの生成(CSkin.Path(BASE + GAME + GENRE + FileName + ".png"), false); } internal CTexture TxCSong(string path) { @@ -113,13 +113,13 @@ namespace TJAPlayer3 { } public CTexture[] TxCSongFolder(string folder) { - var count = TJAPlayer3.t連番画像の枚数を数える(folder); + var count = OpenTaiko.t連番画像の枚数を数える(folder); var texture = count == 0 ? null : TxCSong(count, folder + "{0}.png"); return texture; } internal CTexture TxCUntrackedSong(string path) { - return TJAPlayer3.tテクスチャの生成(path, false); + return OpenTaiko.tテクスチャの生成(path, false); } public void LoadTexture() { @@ -428,9 +428,9 @@ namespace TJAPlayer3 { var _presetsDefs = CSkin.Path(BASE + GAME + BACKGROUND + @$"Presets.json"); if (File.Exists(_presetsDefs)) - TJAPlayer3.Skin.Game_SkinScenes = ConfigManager.GetConfig(_presetsDefs); + OpenTaiko.Skin.Game_SkinScenes = ConfigManager.GetConfig(_presetsDefs); else - TJAPlayer3.Skin.Game_SkinScenes = new DBSkinPreset.SkinPreset(); + OpenTaiko.Skin.Game_SkinScenes = new DBSkinPreset.SkinPreset(); #endregion @@ -559,36 +559,36 @@ namespace TJAPlayer3 { Gauge_Killzone[1] = TxC(GAME + GAUGE + @$"Killzone_2PGauge.png"); Gauge_Killzone[2] = TxC(GAME + GAUGE + @$"Killzone_4PGauge.png"); - TJAPlayer3.Skin.Game_Gauge_Rainbow_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + GAUGE + @$"Rainbow{Path.DirectorySeparatorChar}")); - if (TJAPlayer3.Skin.Game_Gauge_Rainbow_Ptn != 0) { - Gauge_Rainbow = new CTexture[TJAPlayer3.Skin.Game_Gauge_Rainbow_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Game_Gauge_Rainbow_Ptn; i++) { + OpenTaiko.Skin.Game_Gauge_Rainbow_Ptn = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + GAUGE + @$"Rainbow{Path.DirectorySeparatorChar}")); + if (OpenTaiko.Skin.Game_Gauge_Rainbow_Ptn != 0) { + Gauge_Rainbow = new CTexture[OpenTaiko.Skin.Game_Gauge_Rainbow_Ptn]; + for (int i = 0; i < OpenTaiko.Skin.Game_Gauge_Rainbow_Ptn; i++) { Gauge_Rainbow[i] = TxC(GAME + GAUGE + @$"Rainbow{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); } } - TJAPlayer3.Skin.Game_Gauge_Rainbow_Flat_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + GAUGE + @$"Rainbow_Flat{Path.DirectorySeparatorChar}")); - if (TJAPlayer3.Skin.Game_Gauge_Rainbow_Flat_Ptn != 0) { - Gauge_Rainbow_Flat = new CTexture[TJAPlayer3.Skin.Game_Gauge_Rainbow_Flat_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Game_Gauge_Rainbow_Flat_Ptn; i++) { + OpenTaiko.Skin.Game_Gauge_Rainbow_Flat_Ptn = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + GAUGE + @$"Rainbow_Flat{Path.DirectorySeparatorChar}")); + if (OpenTaiko.Skin.Game_Gauge_Rainbow_Flat_Ptn != 0) { + Gauge_Rainbow_Flat = new CTexture[OpenTaiko.Skin.Game_Gauge_Rainbow_Flat_Ptn]; + for (int i = 0; i < OpenTaiko.Skin.Game_Gauge_Rainbow_Flat_Ptn; i++) { Gauge_Rainbow_Flat[i] = TxC(GAME + GAUGE + @$"Rainbow_Flat{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); } } - TJAPlayer3.Skin.Game_Gauge_Rainbow_2PGauge_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + GAUGE + @$"Rainbow_2PGauge{Path.DirectorySeparatorChar}")); - if (TJAPlayer3.Skin.Game_Gauge_Rainbow_2PGauge_Ptn != 0) { - Gauge_Rainbow_2PGauge = new CTexture[TJAPlayer3.Skin.Game_Gauge_Rainbow_2PGauge_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Game_Gauge_Rainbow_2PGauge_Ptn; i++) { + OpenTaiko.Skin.Game_Gauge_Rainbow_2PGauge_Ptn = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + GAUGE + @$"Rainbow_2PGauge{Path.DirectorySeparatorChar}")); + if (OpenTaiko.Skin.Game_Gauge_Rainbow_2PGauge_Ptn != 0) { + Gauge_Rainbow_2PGauge = new CTexture[OpenTaiko.Skin.Game_Gauge_Rainbow_2PGauge_Ptn]; + for (int i = 0; i < OpenTaiko.Skin.Game_Gauge_Rainbow_2PGauge_Ptn; i++) { Gauge_Rainbow_2PGauge[i] = TxC(GAME + GAUGE + @$"Rainbow_2PGauge{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); } } // Dan - TJAPlayer3.Skin.Game_Gauge_Dan_Rainbow_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + DANC + @$"Rainbow{Path.DirectorySeparatorChar}")); - if (TJAPlayer3.Skin.Game_Gauge_Dan_Rainbow_Ptn != 0) { - Gauge_Dan_Rainbow = new CTexture[TJAPlayer3.Skin.Game_Gauge_Dan_Rainbow_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Game_Gauge_Dan_Rainbow_Ptn; i++) { + OpenTaiko.Skin.Game_Gauge_Dan_Rainbow_Ptn = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + DANC + @$"Rainbow{Path.DirectorySeparatorChar}")); + if (OpenTaiko.Skin.Game_Gauge_Dan_Rainbow_Ptn != 0) { + Gauge_Dan_Rainbow = new CTexture[OpenTaiko.Skin.Game_Gauge_Dan_Rainbow_Ptn]; + for (int i = 0; i < OpenTaiko.Skin.Game_Gauge_Dan_Rainbow_Ptn; i++) { Gauge_Dan_Rainbow[i] = TxC(GAME + DANC + @$"Rainbow{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); } } @@ -636,22 +636,22 @@ namespace TJAPlayer3 { #region Effects Effects_Hit_Explosion = TxCAf(GAME + EFFECTS + @$"Hit{Path.DirectorySeparatorChar}Explosion.png"); - if (Effects_Hit_Explosion != null) Effects_Hit_Explosion.b加算合成 = TJAPlayer3.Skin.Game_Effect_HitExplosion_AddBlend; + if (Effects_Hit_Explosion != null) Effects_Hit_Explosion.b加算合成 = OpenTaiko.Skin.Game_Effect_HitExplosion_AddBlend; Effects_Hit_Explosion_Big = TxC(GAME + EFFECTS + @$"Hit{Path.DirectorySeparatorChar}Explosion_Big.png"); - if (Effects_Hit_Explosion_Big != null) Effects_Hit_Explosion_Big.b加算合成 = TJAPlayer3.Skin.Game_Effect_HitExplosionBig_AddBlend; + if (Effects_Hit_Explosion_Big != null) Effects_Hit_Explosion_Big.b加算合成 = OpenTaiko.Skin.Game_Effect_HitExplosionBig_AddBlend; Effects_Hit_FireWorks = TxC(GAME + EFFECTS + @$"Hit{Path.DirectorySeparatorChar}FireWorks.png"); - if (Effects_Hit_FireWorks != null) Effects_Hit_FireWorks.b加算合成 = TJAPlayer3.Skin.Game_Effect_FireWorks_AddBlend; + if (Effects_Hit_FireWorks != null) Effects_Hit_FireWorks.b加算合成 = OpenTaiko.Skin.Game_Effect_FireWorks_AddBlend; Effects_Hit_Bomb = TxCAf(GAME + EFFECTS + @$"Hit{Path.DirectorySeparatorChar}Bomb.png"); Effects_Fire = TxC(GAME + EFFECTS + @$"Fire.png"); - if (Effects_Fire != null) Effects_Fire.b加算合成 = TJAPlayer3.Skin.Game_Effect_Fire_AddBlend; + if (Effects_Fire != null) Effects_Fire.b加算合成 = OpenTaiko.Skin.Game_Effect_Fire_AddBlend; Effects_Rainbow = TxC(GAME + EFFECTS + @$"Rainbow.png"); Effects_GoGoSplash = TxC(GAME + EFFECTS + @$"GoGoSplash.png"); - if (Effects_GoGoSplash != null) Effects_GoGoSplash.b加算合成 = TJAPlayer3.Skin.Game_Effect_GoGoSplash_AddBlend; + if (Effects_GoGoSplash != null) Effects_GoGoSplash.b加算合成 = OpenTaiko.Skin.Game_Effect_GoGoSplash_AddBlend; Effects_Hit_Great = new CTexture[15]; Effects_Hit_Great_Big = new CTexture[15]; Effects_Hit_Good = new CTexture[15]; @@ -662,9 +662,9 @@ namespace TJAPlayer3 { Effects_Hit_Good[i] = TxC(GAME + EFFECTS + @$"Hit{Path.DirectorySeparatorChar}" + @$"Good{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); Effects_Hit_Good_Big[i] = TxC(GAME + EFFECTS + @$"Hit{Path.DirectorySeparatorChar}" + @$"Good_Big{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); } - TJAPlayer3.Skin.Game_Effect_Roll_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + EFFECTS + @$"Roll{Path.DirectorySeparatorChar}")); - Effects_Roll = new CTexture[TJAPlayer3.Skin.Game_Effect_Roll_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Game_Effect_Roll_Ptn; i++) { + OpenTaiko.Skin.Game_Effect_Roll_Ptn = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + EFFECTS + @$"Roll{Path.DirectorySeparatorChar}")); + Effects_Roll = new CTexture[OpenTaiko.Skin.Game_Effect_Roll_Ptn]; + for (int i = 0; i < OpenTaiko.Skin.Game_Effect_Roll_Ptn; i++) { Effects_Roll[i] = TxC(GAME + EFFECTS + @$"Roll{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); } @@ -749,16 +749,16 @@ namespace TJAPlayer3 { #region PuchiChara - var puchicharaDirs = System.IO.Directory.GetDirectories(TJAPlayer3.strEXEのあるフォルダ + GLOBAL + PUCHICHARA); - TJAPlayer3.Skin.Puchichara_Ptn = puchicharaDirs.Length; + var puchicharaDirs = System.IO.Directory.GetDirectories(OpenTaiko.strEXEのあるフォルダ + GLOBAL + PUCHICHARA); + OpenTaiko.Skin.Puchichara_Ptn = puchicharaDirs.Length; - Puchichara = new CPuchichara[TJAPlayer3.Skin.Puchichara_Ptn]; - TJAPlayer3.Skin.Puchicharas_Name = new string[TJAPlayer3.Skin.Puchichara_Ptn]; + Puchichara = new CPuchichara[OpenTaiko.Skin.Puchichara_Ptn]; + OpenTaiko.Skin.Puchicharas_Name = new string[OpenTaiko.Skin.Puchichara_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Puchichara_Ptn; i++) { + for (int i = 0; i < OpenTaiko.Skin.Puchichara_Ptn; i++) { Puchichara[i] = new CPuchichara(puchicharaDirs[i]); - TJAPlayer3.Skin.Puchicharas_Name[i] = System.IO.Path.GetFileName(puchicharaDirs[i]); + OpenTaiko.Skin.Puchicharas_Name[i] = System.IO.Path.GetFileName(puchicharaDirs[i]); } ///TJAPlayer3.Skin.Puchichara_Ptn = 5 * Math.Max(1, (PuchiChara.szテクスチャサイズ.Height / 256)); @@ -789,71 +789,71 @@ namespace TJAPlayer3 { // Tower elements string[] towerDirectories = System.IO.Directory.GetDirectories(CSkin.Path(BASE + GAME + TOWER + TOWERFLOOR)); - TJAPlayer3.Skin.Game_Tower_Ptn = towerDirectories.Length; - TJAPlayer3.Skin.Game_Tower_Names = new string[TJAPlayer3.Skin.Game_Tower_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Game_Tower_Ptn; i++) - TJAPlayer3.Skin.Game_Tower_Names[i] = new DirectoryInfo(towerDirectories[i]).Name; - Tower_Top = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn]; - Tower_Base = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn][]; - Tower_Deco = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn][]; + OpenTaiko.Skin.Game_Tower_Ptn = towerDirectories.Length; + OpenTaiko.Skin.Game_Tower_Names = new string[OpenTaiko.Skin.Game_Tower_Ptn]; + for (int i = 0; i < OpenTaiko.Skin.Game_Tower_Ptn; i++) + OpenTaiko.Skin.Game_Tower_Names[i] = new DirectoryInfo(towerDirectories[i]).Name; + Tower_Top = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn]; + Tower_Base = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn][]; + Tower_Deco = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn][]; - TJAPlayer3.Skin.Game_Tower_Ptn_Base = new int[TJAPlayer3.Skin.Game_Tower_Ptn]; - TJAPlayer3.Skin.Game_Tower_Ptn_Deco = new int[TJAPlayer3.Skin.Game_Tower_Ptn]; + OpenTaiko.Skin.Game_Tower_Ptn_Base = new int[OpenTaiko.Skin.Game_Tower_Ptn]; + OpenTaiko.Skin.Game_Tower_Ptn_Deco = new int[OpenTaiko.Skin.Game_Tower_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Game_Tower_Ptn; i++) { - TJAPlayer3.Skin.Game_Tower_Ptn_Base[i] = TJAPlayer3.t連番画像の枚数を数える((towerDirectories[i] + @$"{Path.DirectorySeparatorChar}Base{Path.DirectorySeparatorChar}"), "Base"); - TJAPlayer3.Skin.Game_Tower_Ptn_Deco[i] = TJAPlayer3.t連番画像の枚数を数える((towerDirectories[i] + @$"{Path.DirectorySeparatorChar}Deco{Path.DirectorySeparatorChar}"), "Deco"); + for (int i = 0; i < OpenTaiko.Skin.Game_Tower_Ptn; i++) { + OpenTaiko.Skin.Game_Tower_Ptn_Base[i] = OpenTaiko.t連番画像の枚数を数える((towerDirectories[i] + @$"{Path.DirectorySeparatorChar}Base{Path.DirectorySeparatorChar}"), "Base"); + OpenTaiko.Skin.Game_Tower_Ptn_Deco[i] = OpenTaiko.t連番画像の枚数を数える((towerDirectories[i] + @$"{Path.DirectorySeparatorChar}Deco{Path.DirectorySeparatorChar}"), "Deco"); - Tower_Top[i] = TxC(GAME + TOWER + TOWERFLOOR + TJAPlayer3.Skin.Game_Tower_Names[i] + @$"{Path.DirectorySeparatorChar}Top.png"); + Tower_Top[i] = TxC(GAME + TOWER + TOWERFLOOR + OpenTaiko.Skin.Game_Tower_Names[i] + @$"{Path.DirectorySeparatorChar}Top.png"); - Tower_Base[i] = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Base[i]]; - Tower_Deco[i] = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Deco[i]]; + Tower_Base[i] = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Base[i]]; + Tower_Deco[i] = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Deco[i]]; - for (int j = 0; j < TJAPlayer3.Skin.Game_Tower_Ptn_Base[i]; j++) { - Tower_Base[i][j] = TxC(GAME + TOWER + TOWERFLOOR + TJAPlayer3.Skin.Game_Tower_Names[i] + @$"{Path.DirectorySeparatorChar}Base{Path.DirectorySeparatorChar}Base" + j.ToString() + ".png"); + for (int j = 0; j < OpenTaiko.Skin.Game_Tower_Ptn_Base[i]; j++) { + Tower_Base[i][j] = TxC(GAME + TOWER + TOWERFLOOR + OpenTaiko.Skin.Game_Tower_Names[i] + @$"{Path.DirectorySeparatorChar}Base{Path.DirectorySeparatorChar}Base" + j.ToString() + ".png"); } - for (int j = 0; j < TJAPlayer3.Skin.Game_Tower_Ptn_Deco[i]; j++) { - Tower_Deco[i][j] = TxC(GAME + TOWER + TOWERFLOOR + TJAPlayer3.Skin.Game_Tower_Names[i] + @$"{Path.DirectorySeparatorChar}Deco{Path.DirectorySeparatorChar}Deco" + j.ToString() + ".png"); + for (int j = 0; j < OpenTaiko.Skin.Game_Tower_Ptn_Deco[i]; j++) { + Tower_Deco[i][j] = TxC(GAME + TOWER + TOWERFLOOR + OpenTaiko.Skin.Game_Tower_Names[i] + @$"{Path.DirectorySeparatorChar}Deco{Path.DirectorySeparatorChar}Deco" + j.ToString() + ".png"); } } // Tower climbing Don - TJAPlayer3.Skin.Game_Tower_Ptn_Don = System.IO.Directory.GetDirectories(CSkin.Path(BASE + GAME + TOWER + TOWERDON)).Length; - Tower_Don_Climbing = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Don][]; - Tower_Don_Jump = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Don][]; - Tower_Don_Running = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Don][]; - Tower_Don_Standing = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Don][]; + OpenTaiko.Skin.Game_Tower_Ptn_Don = System.IO.Directory.GetDirectories(CSkin.Path(BASE + GAME + TOWER + TOWERDON)).Length; + Tower_Don_Climbing = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Don][]; + Tower_Don_Jump = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Don][]; + Tower_Don_Running = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Don][]; + Tower_Don_Standing = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Don][]; - TJAPlayer3.Skin.Game_Tower_Ptn_Don_Climbing = new int[TJAPlayer3.Skin.Game_Tower_Ptn_Don]; - TJAPlayer3.Skin.Game_Tower_Ptn_Don_Jump = new int[TJAPlayer3.Skin.Game_Tower_Ptn_Don]; - TJAPlayer3.Skin.Game_Tower_Ptn_Don_Running = new int[TJAPlayer3.Skin.Game_Tower_Ptn_Don]; - TJAPlayer3.Skin.Game_Tower_Ptn_Don_Standing = new int[TJAPlayer3.Skin.Game_Tower_Ptn_Don]; + OpenTaiko.Skin.Game_Tower_Ptn_Don_Climbing = new int[OpenTaiko.Skin.Game_Tower_Ptn_Don]; + OpenTaiko.Skin.Game_Tower_Ptn_Don_Jump = new int[OpenTaiko.Skin.Game_Tower_Ptn_Don]; + OpenTaiko.Skin.Game_Tower_Ptn_Don_Running = new int[OpenTaiko.Skin.Game_Tower_Ptn_Don]; + OpenTaiko.Skin.Game_Tower_Ptn_Don_Standing = new int[OpenTaiko.Skin.Game_Tower_Ptn_Don]; - for (int i = 0; i < TJAPlayer3.Skin.Game_Tower_Ptn_Don; i++) { - TJAPlayer3.Skin.Game_Tower_Ptn_Don_Climbing[i] = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Climbing{Path.DirectorySeparatorChar}"), "Climbing"); - TJAPlayer3.Skin.Game_Tower_Ptn_Don_Running[i] = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Running{Path.DirectorySeparatorChar}"), "Running"); - TJAPlayer3.Skin.Game_Tower_Ptn_Don_Standing[i] = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Standing{Path.DirectorySeparatorChar}"), "Standing"); - TJAPlayer3.Skin.Game_Tower_Ptn_Don_Jump[i] = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Jump{Path.DirectorySeparatorChar}"), "Jump"); + for (int i = 0; i < OpenTaiko.Skin.Game_Tower_Ptn_Don; i++) { + OpenTaiko.Skin.Game_Tower_Ptn_Don_Climbing[i] = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Climbing{Path.DirectorySeparatorChar}"), "Climbing"); + OpenTaiko.Skin.Game_Tower_Ptn_Don_Running[i] = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Running{Path.DirectorySeparatorChar}"), "Running"); + OpenTaiko.Skin.Game_Tower_Ptn_Don_Standing[i] = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Standing{Path.DirectorySeparatorChar}"), "Standing"); + OpenTaiko.Skin.Game_Tower_Ptn_Don_Jump[i] = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Jump{Path.DirectorySeparatorChar}"), "Jump"); - Tower_Don_Climbing[i] = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Don_Climbing[i]]; - Tower_Don_Running[i] = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Don_Running[i]]; - Tower_Don_Standing[i] = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Don_Standing[i]]; - Tower_Don_Jump[i] = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Don_Jump[i]]; + Tower_Don_Climbing[i] = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Don_Climbing[i]]; + Tower_Don_Running[i] = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Don_Running[i]]; + Tower_Don_Standing[i] = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Don_Standing[i]]; + Tower_Don_Jump[i] = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Don_Jump[i]]; - for (int j = 0; j < TJAPlayer3.Skin.Game_Tower_Ptn_Don_Climbing[i]; j++) { + for (int j = 0; j < OpenTaiko.Skin.Game_Tower_Ptn_Don_Climbing[i]; j++) { Tower_Don_Climbing[i][j] = TxC(GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Climbing{Path.DirectorySeparatorChar}Climbing" + j.ToString() + ".png"); } - for (int j = 0; j < TJAPlayer3.Skin.Game_Tower_Ptn_Don_Running[i]; j++) { + for (int j = 0; j < OpenTaiko.Skin.Game_Tower_Ptn_Don_Running[i]; j++) { Tower_Don_Running[i][j] = TxC(GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Running{Path.DirectorySeparatorChar}Running" + j.ToString() + ".png"); } - for (int j = 0; j < TJAPlayer3.Skin.Game_Tower_Ptn_Don_Standing[i]; j++) { + for (int j = 0; j < OpenTaiko.Skin.Game_Tower_Ptn_Don_Standing[i]; j++) { Tower_Don_Standing[i][j] = TxC(GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Standing{Path.DirectorySeparatorChar}Standing" + j.ToString() + ".png"); } - for (int j = 0; j < TJAPlayer3.Skin.Game_Tower_Ptn_Don_Jump[i]; j++) { + for (int j = 0; j < OpenTaiko.Skin.Game_Tower_Ptn_Don_Jump[i]; j++) { Tower_Don_Jump[i][j] = TxC(GAME + TOWER + TOWERDON + i.ToString() + @$"{Path.DirectorySeparatorChar}Jump{Path.DirectorySeparatorChar}Jump" + j.ToString() + ".png"); } } @@ -970,10 +970,10 @@ namespace TJAPlayer3 { //for (int i = 0; i < 3; i++) //Result_Work[i] = TxC(RESULT + @$"Work{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); - TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + RESULT + @$"Rainbow{Path.DirectorySeparatorChar}")); - if (TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn != 0) { - Result_Rainbow = new CTexture[TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn; i++) { + OpenTaiko.Skin.Result_Gauge_Rainbow_Ptn = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + RESULT + @$"Rainbow{Path.DirectorySeparatorChar}")); + if (OpenTaiko.Skin.Result_Gauge_Rainbow_Ptn != 0) { + Result_Rainbow = new CTexture[OpenTaiko.Skin.Result_Gauge_Rainbow_Ptn]; + for (int i = 0; i < OpenTaiko.Skin.Result_Gauge_Rainbow_Ptn; i++) { Result_Rainbow[i] = TxC(RESULT + @$"Rainbow{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); } } @@ -1016,15 +1016,15 @@ namespace TJAPlayer3 { #region [8_TowerResults] - TJAPlayer3.Skin.Game_Tower_Ptn_Result = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + TOWERRESULT + @$"Tower{Path.DirectorySeparatorChar}")); - TowerResult_Tower = new CTexture[TJAPlayer3.Skin.Game_Tower_Ptn_Result]; + OpenTaiko.Skin.Game_Tower_Ptn_Result = OpenTaiko.t連番画像の枚数を数える(CSkin.Path(BASE + TOWERRESULT + @$"Tower{Path.DirectorySeparatorChar}")); + TowerResult_Tower = new CTexture[OpenTaiko.Skin.Game_Tower_Ptn_Result]; TowerResult_Background = TxC(TOWERRESULT + @$"Background.png"); TowerResult_Panel = TxC(TOWERRESULT + @$"Panel.png"); TowerResult_ScoreRankEffect = TxC(TOWERRESULT + @$"ScoreRankEffect.png"); - for (int i = 0; i < TJAPlayer3.Skin.Game_Tower_Ptn_Result; i++) { + for (int i = 0; i < OpenTaiko.Skin.Game_Tower_Ptn_Result; i++) { TowerResult_Tower[i] = TxC(TOWERRESULT + @$"Tower{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); } @@ -1049,150 +1049,150 @@ namespace TJAPlayer3 { #region [Character count initialisations] - var charaDirs = System.IO.Directory.GetDirectories(TJAPlayer3.strEXEのあるフォルダ + GLOBAL + CHARACTERS); - TJAPlayer3.Skin.Characters_Ptn = charaDirs.Length; + var charaDirs = System.IO.Directory.GetDirectories(OpenTaiko.strEXEのあるフォルダ + GLOBAL + CHARACTERS); + OpenTaiko.Skin.Characters_Ptn = charaDirs.Length; - Characters_Heya_Preview = new CTexture[TJAPlayer3.Skin.Characters_Ptn]; - Characters_Heya_Render = new CTexture[TJAPlayer3.Skin.Characters_Ptn]; - Characters_Result_Clear_1P = new CTexture[TJAPlayer3.Skin.Characters_Ptn]; - Characters_Result_Failed_1P = new CTexture[TJAPlayer3.Skin.Characters_Ptn]; - Characters_Result_Clear_2P = new CTexture[TJAPlayer3.Skin.Characters_Ptn]; - Characters_Result_Failed_2P = new CTexture[TJAPlayer3.Skin.Characters_Ptn]; - Characters = new CCharacter[TJAPlayer3.Skin.Characters_Ptn]; + Characters_Heya_Preview = new CTexture[OpenTaiko.Skin.Characters_Ptn]; + Characters_Heya_Render = new CTexture[OpenTaiko.Skin.Characters_Ptn]; + Characters_Result_Clear_1P = new CTexture[OpenTaiko.Skin.Characters_Ptn]; + Characters_Result_Failed_1P = new CTexture[OpenTaiko.Skin.Characters_Ptn]; + Characters_Result_Clear_2P = new CTexture[OpenTaiko.Skin.Characters_Ptn]; + Characters_Result_Failed_2P = new CTexture[OpenTaiko.Skin.Characters_Ptn]; + Characters = new CCharacter[OpenTaiko.Skin.Characters_Ptn]; - Characters_Normal = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Normal_Missed = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Normal_MissedDown = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Normal_Cleared = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Normal_Maxed = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_MissIn = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_MissDownIn = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_GoGoTime = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_GoGoTime_Maxed = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_10Combo = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_10Combo_Clear = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_10Combo_Maxed = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_GoGoStart = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_GoGoStart_Clear = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_GoGoStart_Maxed = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Become_Cleared = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Become_Maxed = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_SoulOut = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_ClearOut = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Return = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Balloon_Breaking = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Balloon_Broke = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Balloon_Miss = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Kusudama_Idle = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Kusudama_Breaking = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Kusudama_Broke = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Kusudama_Miss = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Title_Entry = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Title_Normal = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Result_Clear = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Result_Failed = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Result_Failed_In = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Result_Normal = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Menu_Loop = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Menu_Start = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Menu_Select = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Menu_Wait = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Standing = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Climbing = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Running = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Clear = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Fail = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Standing_Tired = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Climbing_Tired = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Running_Tired = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; - Characters_Tower_Clear_Tired = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; + Characters_Normal = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Normal_Missed = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Normal_MissedDown = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Normal_Cleared = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Normal_Maxed = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_MissIn = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_MissDownIn = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_GoGoTime = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_GoGoTime_Maxed = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_10Combo = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_10Combo_Clear = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_10Combo_Maxed = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_GoGoStart = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_GoGoStart_Clear = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_GoGoStart_Maxed = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Become_Cleared = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Become_Maxed = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_SoulOut = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_ClearOut = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Return = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Balloon_Breaking = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Balloon_Broke = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Balloon_Miss = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Kusudama_Idle = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Kusudama_Breaking = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Kusudama_Broke = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Kusudama_Miss = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Title_Entry = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Title_Normal = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Result_Clear = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Result_Failed = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Result_Failed_In = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Result_Normal = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Menu_Loop = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Menu_Start = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Menu_Select = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Menu_Wait = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Standing = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Climbing = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Running = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Clear = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Fail = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Standing_Tired = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Climbing_Tired = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Running_Tired = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; + Characters_Tower_Clear_Tired = new CTexture[OpenTaiko.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_DirName = new string[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Normal_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Normal_Missed_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_MissIn_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_MissDownIn_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_GoGoTime_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_10Combo_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_10Combo_Clear_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_GoGoStart_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Become_Cleared_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Become_Maxed_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_SoulOut_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_ClearOut_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Return_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Title_Entry_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Title_Normal_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Result_Clear_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Result_Failed_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Result_Failed_In_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Result_Normal_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Menu_Loop_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Menu_Start_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Menu_Select_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Menu_Wait_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Standing_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Running_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Clear_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Fail_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Standing_Tired_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Climbing_Tired_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Running_Tired_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Clear_IsLooping = new bool[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Clear_Tired_IsLooping = new bool[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Tower_Fail_IsLooping = new bool[TJAPlayer3.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_DirName = new string[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Normal_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Normal_Missed_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Normal_MissedDown_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Normal_Cleared_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Normal_Maxed_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_MissIn_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_MissDownIn_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_GoGoTime_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_GoGoTime_Maxed_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_10Combo_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_10Combo_Clear_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_GoGoStart_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_GoGoStart_Maxed_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Become_Cleared_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Become_Maxed_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_SoulOut_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_ClearOut_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Return_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Balloon_Breaking_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Balloon_Broke_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Balloon_Miss_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Kusudama_Idle_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Kusudama_Breaking_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Kusudama_Broke_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Kusudama_Miss_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Title_Entry_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Title_Normal_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Result_Clear_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Result_Failed_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Result_Failed_In_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Result_Normal_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Menu_Loop_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Menu_Start_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Menu_Select_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Menu_Wait_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Standing_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Climbing_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Running_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Clear_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Fail_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Standing_Tired_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Climbing_Tired_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Running_Tired_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Clear_IsLooping = new bool[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Clear_Tired_IsLooping = new bool[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Tower_Fail_IsLooping = new bool[OpenTaiko.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Resolution = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Heya_Render_Offset = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_UseResult1P = new bool[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_X = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Y = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_4P = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_5P = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_X_AI = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Y_AI = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Balloon_X = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Balloon_Y = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Balloon_4P = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Balloon_5P = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Kusudama_X = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Kusudama_Y = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_Normal = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_10Combo = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_10Combo_Clear = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_10ComboMax = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_Miss = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_MissDown = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_ClearIn = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_Clear = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_ClearMax = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_MissIn = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_MissDownIn = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_GoGoStart = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_GoGoStart_Clear = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_GoGoStartMax = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_GoGo = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_GoGoMax = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_SoulIn = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_SoulOut = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_ClearOut = new int[TJAPlayer3.Skin.Characters_Ptn][]; - TJAPlayer3.Skin.Characters_Motion_Return = new int[TJAPlayer3.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Resolution = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Heya_Render_Offset = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_UseResult1P = new bool[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_X = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Y = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_4P = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_5P = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_X_AI = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Y_AI = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Balloon_X = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Balloon_Y = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Balloon_4P = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Balloon_5P = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Kusudama_X = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Kusudama_Y = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_Normal = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_10Combo = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_10Combo_Clear = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_10ComboMax = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_Miss = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_MissDown = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_ClearIn = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_Clear = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_ClearMax = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_MissIn = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_MissDownIn = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_GoGoStart = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_GoGoStart_Clear = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_GoGoStartMax = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_GoGo = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_GoGoMax = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_SoulIn = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_SoulOut = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_ClearOut = new int[OpenTaiko.Skin.Characters_Ptn][]; + OpenTaiko.Skin.Characters_Motion_Return = new int[OpenTaiko.Skin.Characters_Ptn][]; /* TJAPlayer3.Skin.Characters_Motion_Tower_Standing = new int[TJAPlayer3.Skin.Characters_Ptn][]; TJAPlayer3.Skin.Characters_Motion_Tower_Climbing = new int[TJAPlayer3.Skin.Characters_Ptn][]; @@ -1204,72 +1204,72 @@ namespace TJAPlayer3 { TJAPlayer3.Skin.Characters_Motion_Tower_Running_Tired = new int[TJAPlayer3.Skin.Characters_Ptn][]; TJAPlayer3.Skin.Characters_Motion_Tower_Clear_Tired = new int[TJAPlayer3.Skin.Characters_Ptn][]; */ - TJAPlayer3.Skin.Characters_Beat_Normal = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_Miss = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_MissDown = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_Clear = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_GoGo = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_10Combo = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_10Combo_Clear = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_10ComboMax = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_ClearIn = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_ClearMax = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_MissIn = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_MissDownIn = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_GoGoStart = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_GoGoStart_Clear = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_GoGoStartMax = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_GoGoMax = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_SoulIn = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_SoulOut = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_ClearOut = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_Return = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_Tower_Standing = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_Tower_Clear = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_Tower_Fail = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_Tower_Standing_Tired = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Beat_Tower_Clear_Tired = new float[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Balloon_Timer = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Balloon_Delay = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Balloon_FadeOut = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Title_Entry_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Title_Normal_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Menu_Loop_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Menu_Select_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Menu_Start_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Menu_Wait_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Result_Normal_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Result_Clear_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Result_Failed_In_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; - TJAPlayer3.Skin.Characters_Result_Failed_AnimationDuration = new int[TJAPlayer3.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Normal = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Miss = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_MissDown = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Clear = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_GoGo = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_10Combo = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_10Combo_Clear = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_10ComboMax = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_ClearIn = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_ClearMax = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_MissIn = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_MissDownIn = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_GoGoStart = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_GoGoStart_Clear = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_GoGoStartMax = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_GoGoMax = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_SoulIn = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_SoulOut = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_ClearOut = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Return = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Tower_Standing = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Tower_Clear = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Tower_Fail = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Tower_Standing_Tired = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Beat_Tower_Clear_Tired = new float[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Balloon_Timer = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Balloon_Delay = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Balloon_FadeOut = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Title_Entry_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Title_Normal_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Menu_Loop_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Menu_Select_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Menu_Start_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Menu_Wait_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Result_Normal_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Result_Clear_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Result_Failed_In_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; + OpenTaiko.Skin.Characters_Result_Failed_AnimationDuration = new int[OpenTaiko.Skin.Characters_Ptn]; for (int i = 0; i < charaDirs.Length; i++) { - TJAPlayer3.Skin.Characters_DirName[i] = System.IO.Path.GetFileName(charaDirs[i]); + OpenTaiko.Skin.Characters_DirName[i] = System.IO.Path.GetFileName(charaDirs[i]); } #endregion for (int i = 0; i < 5; i++) { - TJAPlayer3.SaveFileInstances[i].tReindexCharacter(TJAPlayer3.Skin.Characters_DirName); - this.ReloadCharacter(-1, TJAPlayer3.SaveFileInstances[i].data.Character, i, true); + OpenTaiko.SaveFileInstances[i].tReindexCharacter(OpenTaiko.Skin.Characters_DirName); + this.ReloadCharacter(-1, OpenTaiko.SaveFileInstances[i].data.Character, i, true); } - for (int i = 0; i < TJAPlayer3.Skin.Characters_Ptn; i++) { - Characters_Heya_Preview[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Normal{Path.DirectorySeparatorChar}0.png"); - Characters_Heya_Render[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Render.png"); - Characters_Result_Clear_1P[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Clear_1P.png"); - Characters_Result_Failed_1P[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed_1P.png"); - Characters_Result_Clear_2P[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Clear_2P.png"); - Characters_Result_Failed_2P[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed_2P.png"); + for (int i = 0; i < OpenTaiko.Skin.Characters_Ptn; i++) { + Characters_Heya_Preview[i] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Normal{Path.DirectorySeparatorChar}0.png"); + Characters_Heya_Render[i] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Render.png"); + Characters_Result_Clear_1P[i] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Clear_1P.png"); + Characters_Result_Failed_1P[i] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed_1P.png"); + Characters_Result_Clear_2P[i] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Clear_2P.png"); + Characters_Result_Failed_2P[i] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed_2P.png"); - TJAPlayer3.Skin.Characters_Resolution[i] = new int[] { 1280, 720 }; - TJAPlayer3.Skin.Characters_Heya_Render_Offset[i] = new int[] { 0, 0 }; - TJAPlayer3.Skin.Characters_UseResult1P[i] = false; + OpenTaiko.Skin.Characters_Resolution[i] = new int[] { 1280, 720 }; + OpenTaiko.Skin.Characters_Heya_Render_Offset[i] = new int[] { 0, 0 }; + OpenTaiko.Skin.Characters_UseResult1P[i] = false; var _str = ""; - TJAPlayer3.Skin.LoadSkinConfigFromFile(charaDirs[i] + @$"{Path.DirectorySeparatorChar}CharaConfig.txt", ref _str); + OpenTaiko.Skin.LoadSkinConfigFromFile(charaDirs[i] + @$"{Path.DirectorySeparatorChar}CharaConfig.txt", ref _str); string[] delimiter = { "\n", "\r" }; string[] strSingleLine = _str.Split(delimiter, StringSplitOptions.RemoveEmptyEntries); @@ -1278,14 +1278,14 @@ namespace TJAPlayer3 { if (line.StartsWith("Chara_Resolution=")) // required for Heya resolution compatibility { string[] values = line.Substring(17).Trim().Split(','); - TJAPlayer3.Skin.Characters_Resolution[i][0] = int.Parse(values[0]); - TJAPlayer3.Skin.Characters_Resolution[i][1] = int.Parse(values[1]); + OpenTaiko.Skin.Characters_Resolution[i][0] = int.Parse(values[0]); + OpenTaiko.Skin.Characters_Resolution[i][1] = int.Parse(values[1]); } else if (line.StartsWith("Heya_Chara_Render_Offset=")) { string[] values = line.Substring(25).Trim().Split(','); - TJAPlayer3.Skin.Characters_Heya_Render_Offset[i][0] = int.Parse(values[0]); - TJAPlayer3.Skin.Characters_Heya_Render_Offset[i][1] = int.Parse(values[1]); + OpenTaiko.Skin.Characters_Heya_Render_Offset[i][0] = int.Parse(values[0]); + OpenTaiko.Skin.Characters_Heya_Render_Offset[i][1] = int.Parse(values[1]); } else if (line.StartsWith("Result_UseResult1P=")) { - TJAPlayer3.Skin.Characters_UseResult1P[i] = FDK.CConversion.bONorOFF(line.Substring(19).Trim()[0]); + OpenTaiko.Skin.Characters_UseResult1P[i] = FDK.CConversion.bONorOFF(line.Substring(19).Trim()[0]); } } @@ -1323,8 +1323,8 @@ namespace TJAPlayer3 { #endregion - if (TJAPlayer3.ConfigIni.PreAssetsLoading) { - foreach (var act in TJAPlayer3.app.listトップレベルActivities) { + if (OpenTaiko.ConfigIni.PreAssetsLoading) { + foreach (var act in OpenTaiko.app.listトップレベルActivities) { act.CreateManagedResource(); act.CreateUnmanagedResource(); } @@ -1351,404 +1351,404 @@ namespace TJAPlayer3 { return; if (old >= 0 && - (TJAPlayer3.SaveFileInstances[0].data.Character != old || player == 0) && - (TJAPlayer3.SaveFileInstances[1].data.Character != old || player == 1) && - (TJAPlayer3.SaveFileInstances[2].data.Character != old || player == 2) && - (TJAPlayer3.SaveFileInstances[3].data.Character != old || player == 3) && - (TJAPlayer3.SaveFileInstances[4].data.Character != old || player == 4)) { + (OpenTaiko.SaveFileInstances[0].data.Character != old || player == 0) && + (OpenTaiko.SaveFileInstances[1].data.Character != old || player == 1) && + (OpenTaiko.SaveFileInstances[2].data.Character != old || player == 2) && + (OpenTaiko.SaveFileInstances[3].data.Character != old || player == 3) && + (OpenTaiko.SaveFileInstances[4].data.Character != old || player == 4)) { int i = old; #region [Dispose the previous character] - for (int j = 0; j < TJAPlayer3.Skin.Characters_Menu_Loop_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Menu_Loop_Ptn[i]; j++) Characters_Menu_Loop[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Menu_Start_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Menu_Start_Ptn[i]; j++) Characters_Menu_Start[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Menu_Select_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Menu_Select_Ptn[i]; j++) Characters_Menu_Select[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Menu_Wait_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Menu_Wait_Ptn[i]; j++) Characters_Menu_Wait[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Result_Normal_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Result_Normal_Ptn[i]; j++) Characters_Result_Normal[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Result_Failed_In_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Result_Failed_In_Ptn[i]; j++) Characters_Result_Failed_In[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Result_Failed_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Result_Failed_Ptn[i]; j++) Characters_Result_Failed[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Result_Clear_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Result_Clear_Ptn[i]; j++) Characters_Result_Clear[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Title_Normal_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Title_Normal_Ptn[i]; j++) Characters_Title_Normal[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Title_Entry_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Title_Entry_Ptn[i]; j++) Characters_Title_Entry[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_Ptn[i]; j++) Characters_Normal[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_Missed_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_Missed_Ptn[i]; j++) Characters_Normal_Missed[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_MissedDown_Ptn[i]; j++) Characters_Normal_MissedDown[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_Cleared_Ptn[i]; j++) Characters_Normal_Cleared[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_Maxed_Ptn[i]; j++) Characters_Normal_Maxed[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_MissIn_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_MissIn_Ptn[i]; j++) Characters_MissIn[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_MissDownIn_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_MissDownIn_Ptn[i]; j++) Characters_MissDownIn[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoTime_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoTime_Ptn[i]; j++) Characters_GoGoTime[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoTime_Maxed_Ptn[i]; j++) Characters_GoGoTime_Maxed[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoStart_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoStart_Ptn[i]; j++) Characters_GoGoStart[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn[i]; j++) Characters_GoGoStart_Clear[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoStart_Maxed_Ptn[i]; j++) Characters_GoGoStart_Maxed[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_10Combo_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_10Combo_Ptn[i]; j++) Characters_10Combo[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_10Combo_Clear_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_10Combo_Clear_Ptn[i]; j++) Characters_10Combo_Clear[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn[i]; j++) Characters_10Combo_Maxed[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Become_Cleared_Ptn[i]; j++) Characters_Become_Cleared[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Become_Maxed_Ptn[i]; j++) Characters_Become_Maxed[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_SoulOut_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_SoulOut_Ptn[i]; j++) Characters_SoulOut[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_ClearOut_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_ClearOut_Ptn[i]; j++) Characters_ClearOut[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Return_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Return_Ptn[i]; j++) Characters_Return[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Balloon_Breaking_Ptn[i]; j++) Characters_Balloon_Breaking[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Balloon_Broke_Ptn[i]; j++) Characters_Balloon_Broke[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Balloon_Miss_Ptn[i]; j++) Characters_Balloon_Miss[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Kusudama_Idle_Ptn[i]; j++) Characters_Kusudama_Idle[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Kusudama_Breaking_Ptn[i]; j++) Characters_Kusudama_Breaking[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Kusudama_Broke_Ptn[i]; j++) Characters_Kusudama_Broke[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Kusudama_Miss_Ptn[i]; j++) Characters_Kusudama_Miss[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Standing_Ptn[i]; j++) Characters_Tower_Standing[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Climbing_Ptn[i]; j++) Characters_Tower_Climbing[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Running_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Running_Ptn[i]; j++) Characters_Tower_Running[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Clear_Ptn[i]; j++) Characters_Tower_Clear[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Fail_Ptn[i]; j++) Characters_Tower_Fail[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Standing_Tired_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Standing_Tired_Ptn[i]; j++) Characters_Tower_Standing_Tired[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Climbing_Tired_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Climbing_Tired_Ptn[i]; j++) Characters_Tower_Climbing_Tired[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Running_Tired_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Running_Tired_Ptn[i]; j++) Characters_Tower_Running_Tired[i][j]?.Dispose(); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[i]; j++) + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn[i]; j++) Characters_Tower_Clear_Tired[i][j]?.Dispose(); #endregion } - string charaPath = TJAPlayer3.strEXEのあるフォルダ + GLOBAL + CHARACTERS + TJAPlayer3.Skin.Characters_DirName[newC]; + string charaPath = OpenTaiko.strEXEのあるフォルダ + GLOBAL + CHARACTERS + OpenTaiko.Skin.Characters_DirName[newC]; if ((newC >= 0 && - TJAPlayer3.SaveFileInstances[0].data.Character != newC && - TJAPlayer3.SaveFileInstances[1].data.Character != newC && - TJAPlayer3.SaveFileInstances[2].data.Character != newC && - TJAPlayer3.SaveFileInstances[3].data.Character != newC && - TJAPlayer3.SaveFileInstances[4].data.Character != newC) || primary) { + OpenTaiko.SaveFileInstances[0].data.Character != newC && + OpenTaiko.SaveFileInstances[1].data.Character != newC && + OpenTaiko.SaveFileInstances[2].data.Character != newC && + OpenTaiko.SaveFileInstances[3].data.Character != newC && + OpenTaiko.SaveFileInstances[4].data.Character != newC) || primary) { int i = newC; #region [Allocate the new character] #region [Character individual values count initialisation] - TJAPlayer3.Skin.Characters_Normal_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Normal{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Normal_Missed_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Miss{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}MissDown{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_MissIn_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}MissIn{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_MissDownIn_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}MissDownIn{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Clear{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Clear_Max{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_GoGoTime_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGo{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGo_Max{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_10Combo_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}10combo{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_10Combo_Clear_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}10combo_Clear{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}10combo_Max{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_GoGoStart_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGoStart{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGoStart_Clear{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGoStart_Max{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Clearin{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Soulin{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_SoulOut_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}SoulOut{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_ClearOut_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}ClearOut{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Return_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Return{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Balloon_Breaking{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Balloon_Broke{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Balloon_Miss{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Kusudama_Idle{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Kusudama_Breaking{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Kusudama_Broke{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Kusudama_Miss{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Title_Entry_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Title_Entry{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Title_Normal_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Title_Normal{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Menu_Loop_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Menu_Loop{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Menu_Select_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Menu_Select{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Menu_Start_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Menu_Start{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Menu_Wait_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Menu_Wait{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Result_Clear_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Result_Clear{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Result_Failed_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Result_Failed{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Result_Failed_In_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Result_Failed_In{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Result_Normal_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Result_Normal{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Standing{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Climbing{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Running_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Running{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Clear{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Fail{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Standing_Tired_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Standing_Tired{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Climbing_Tired_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Climbing_Tired{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Running_Tired_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Running_Tired{Path.DirectorySeparatorChar}"); - TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[i] = TJAPlayer3.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Clear_Tired{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Normal_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Normal{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Normal_Missed_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Miss{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Normal_MissedDown_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}MissDown{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_MissIn_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}MissIn{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_MissDownIn_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}MissDownIn{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Normal_Cleared_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Clear{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Normal_Maxed_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Clear_Max{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_GoGoTime_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGo{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_GoGoTime_Maxed_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGo_Max{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_10Combo_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}10combo{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_10Combo_Clear_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}10combo_Clear{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}10combo_Max{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_GoGoStart_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGoStart{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGoStart_Clear{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_GoGoStart_Maxed_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}GoGoStart_Max{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Become_Cleared_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Clearin{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Become_Maxed_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Soulin{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_SoulOut_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}SoulOut{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_ClearOut_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}ClearOut{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Return_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Return{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Balloon_Breaking_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Balloon_Breaking{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Balloon_Broke_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Balloon_Broke{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Balloon_Miss_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Balloon_Miss{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Kusudama_Idle_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Kusudama_Idle{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Kusudama_Breaking_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Kusudama_Breaking{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Kusudama_Broke_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Kusudama_Broke{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Kusudama_Miss_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Kusudama_Miss{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Title_Entry_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Title_Entry{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Title_Normal_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Title_Normal{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Menu_Loop_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Menu_Loop{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Menu_Select_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Menu_Select{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Menu_Start_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Menu_Start{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Menu_Wait_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Menu_Wait{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Result_Clear_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Result_Clear{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Result_Failed_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Result_Failed{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Result_Failed_In_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Result_Failed_In{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Result_Normal_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Result_Normal{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Standing_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Standing{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Climbing_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Climbing{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Running_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Running{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Clear_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Clear{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Fail_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Fail{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Standing_Tired_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Standing_Tired{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Climbing_Tired_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Climbing_Tired{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Running_Tired_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Running_Tired{Path.DirectorySeparatorChar}"); + OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn[i] = OpenTaiko.t連番画像の枚数を数える(charaPath + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Clear_Tired{Path.DirectorySeparatorChar}"); - Characters_Normal[i] = new CTexture[TJAPlayer3.Skin.Characters_Normal_Ptn[i]]; - Characters_Normal_Missed[i] = new CTexture[TJAPlayer3.Skin.Characters_Normal_Missed_Ptn[i]]; - Characters_Normal_MissedDown[i] = new CTexture[TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn[i]]; - Characters_Normal_Cleared[i] = new CTexture[TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn[i]]; - Characters_Normal_Maxed[i] = new CTexture[TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn[i]]; - Characters_MissIn[i] = new CTexture[TJAPlayer3.Skin.Characters_MissIn_Ptn[i]]; - Characters_MissDownIn[i] = new CTexture[TJAPlayer3.Skin.Characters_MissDownIn_Ptn[i]]; - Characters_GoGoTime[i] = new CTexture[TJAPlayer3.Skin.Characters_GoGoTime_Ptn[i]]; - Characters_GoGoTime_Maxed[i] = new CTexture[TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn[i]]; - Characters_10Combo[i] = new CTexture[TJAPlayer3.Skin.Characters_10Combo_Ptn[i]]; - Characters_10Combo_Clear[i] = new CTexture[TJAPlayer3.Skin.Characters_10Combo_Clear_Ptn[i]]; - Characters_10Combo_Maxed[i] = new CTexture[TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[i]]; - Characters_GoGoStart[i] = new CTexture[TJAPlayer3.Skin.Characters_GoGoStart_Ptn[i]]; - Characters_GoGoStart_Clear[i] = new CTexture[TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn[i]]; - Characters_GoGoStart_Maxed[i] = new CTexture[TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[i]]; - Characters_Become_Cleared[i] = new CTexture[TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[i]]; - Characters_Become_Maxed[i] = new CTexture[TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[i]]; - Characters_SoulOut[i] = new CTexture[TJAPlayer3.Skin.Characters_SoulOut_Ptn[i]]; - Characters_ClearOut[i] = new CTexture[TJAPlayer3.Skin.Characters_ClearOut_Ptn[i]]; - Characters_Return[i] = new CTexture[TJAPlayer3.Skin.Characters_Return_Ptn[i]]; - Characters_Balloon_Breaking[i] = new CTexture[TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[i]]; - Characters_Balloon_Broke[i] = new CTexture[TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[i]]; - Characters_Balloon_Miss[i] = new CTexture[TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[i]]; - Characters_Kusudama_Idle[i] = new CTexture[TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[i]]; - Characters_Kusudama_Breaking[i] = new CTexture[TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn[i]]; - Characters_Kusudama_Broke[i] = new CTexture[TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn[i]]; - Characters_Kusudama_Miss[i] = new CTexture[TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn[i]]; - Characters_Title_Entry[i] = new CTexture[TJAPlayer3.Skin.Characters_Title_Entry_Ptn[i]]; - Characters_Title_Normal[i] = new CTexture[TJAPlayer3.Skin.Characters_Title_Normal_Ptn[i]]; - Characters_Result_Clear[i] = new CTexture[TJAPlayer3.Skin.Characters_Result_Clear_Ptn[i]]; - Characters_Result_Failed[i] = new CTexture[TJAPlayer3.Skin.Characters_Result_Failed_Ptn[i]]; - Characters_Result_Failed_In[i] = new CTexture[TJAPlayer3.Skin.Characters_Result_Failed_In_Ptn[i]]; - Characters_Result_Normal[i] = new CTexture[TJAPlayer3.Skin.Characters_Result_Normal_Ptn[i]]; - Characters_Menu_Loop[i] = new CTexture[TJAPlayer3.Skin.Characters_Menu_Loop_Ptn[i]]; - Characters_Menu_Start[i] = new CTexture[TJAPlayer3.Skin.Characters_Menu_Start_Ptn[i]]; - Characters_Menu_Select[i] = new CTexture[TJAPlayer3.Skin.Characters_Menu_Select_Ptn[i]]; - Characters_Menu_Wait[i] = new CTexture[TJAPlayer3.Skin.Characters_Menu_Wait_Ptn[i]]; - Characters_Tower_Standing[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[i]]; - Characters_Tower_Climbing[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[i]]; - Characters_Tower_Running[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Running_Ptn[i]]; - Characters_Tower_Clear[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[i]]; - Characters_Tower_Fail[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[i]]; - Characters_Tower_Standing_Tired[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Standing_Tired_Ptn[i]]; - Characters_Tower_Climbing_Tired[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Climbing_Tired_Ptn[i]]; - Characters_Tower_Running_Tired[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Running_Tired_Ptn[i]]; - Characters_Tower_Clear_Tired[i] = new CTexture[TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[i]]; + Characters_Normal[i] = new CTexture[OpenTaiko.Skin.Characters_Normal_Ptn[i]]; + Characters_Normal_Missed[i] = new CTexture[OpenTaiko.Skin.Characters_Normal_Missed_Ptn[i]]; + Characters_Normal_MissedDown[i] = new CTexture[OpenTaiko.Skin.Characters_Normal_MissedDown_Ptn[i]]; + Characters_Normal_Cleared[i] = new CTexture[OpenTaiko.Skin.Characters_Normal_Cleared_Ptn[i]]; + Characters_Normal_Maxed[i] = new CTexture[OpenTaiko.Skin.Characters_Normal_Maxed_Ptn[i]]; + Characters_MissIn[i] = new CTexture[OpenTaiko.Skin.Characters_MissIn_Ptn[i]]; + Characters_MissDownIn[i] = new CTexture[OpenTaiko.Skin.Characters_MissDownIn_Ptn[i]]; + Characters_GoGoTime[i] = new CTexture[OpenTaiko.Skin.Characters_GoGoTime_Ptn[i]]; + Characters_GoGoTime_Maxed[i] = new CTexture[OpenTaiko.Skin.Characters_GoGoTime_Maxed_Ptn[i]]; + Characters_10Combo[i] = new CTexture[OpenTaiko.Skin.Characters_10Combo_Ptn[i]]; + Characters_10Combo_Clear[i] = new CTexture[OpenTaiko.Skin.Characters_10Combo_Clear_Ptn[i]]; + Characters_10Combo_Maxed[i] = new CTexture[OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn[i]]; + Characters_GoGoStart[i] = new CTexture[OpenTaiko.Skin.Characters_GoGoStart_Ptn[i]]; + Characters_GoGoStart_Clear[i] = new CTexture[OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn[i]]; + Characters_GoGoStart_Maxed[i] = new CTexture[OpenTaiko.Skin.Characters_GoGoStart_Maxed_Ptn[i]]; + Characters_Become_Cleared[i] = new CTexture[OpenTaiko.Skin.Characters_Become_Cleared_Ptn[i]]; + Characters_Become_Maxed[i] = new CTexture[OpenTaiko.Skin.Characters_Become_Maxed_Ptn[i]]; + Characters_SoulOut[i] = new CTexture[OpenTaiko.Skin.Characters_SoulOut_Ptn[i]]; + Characters_ClearOut[i] = new CTexture[OpenTaiko.Skin.Characters_ClearOut_Ptn[i]]; + Characters_Return[i] = new CTexture[OpenTaiko.Skin.Characters_Return_Ptn[i]]; + Characters_Balloon_Breaking[i] = new CTexture[OpenTaiko.Skin.Characters_Balloon_Breaking_Ptn[i]]; + Characters_Balloon_Broke[i] = new CTexture[OpenTaiko.Skin.Characters_Balloon_Broke_Ptn[i]]; + Characters_Balloon_Miss[i] = new CTexture[OpenTaiko.Skin.Characters_Balloon_Miss_Ptn[i]]; + Characters_Kusudama_Idle[i] = new CTexture[OpenTaiko.Skin.Characters_Kusudama_Idle_Ptn[i]]; + Characters_Kusudama_Breaking[i] = new CTexture[OpenTaiko.Skin.Characters_Kusudama_Breaking_Ptn[i]]; + Characters_Kusudama_Broke[i] = new CTexture[OpenTaiko.Skin.Characters_Kusudama_Broke_Ptn[i]]; + Characters_Kusudama_Miss[i] = new CTexture[OpenTaiko.Skin.Characters_Kusudama_Miss_Ptn[i]]; + Characters_Title_Entry[i] = new CTexture[OpenTaiko.Skin.Characters_Title_Entry_Ptn[i]]; + Characters_Title_Normal[i] = new CTexture[OpenTaiko.Skin.Characters_Title_Normal_Ptn[i]]; + Characters_Result_Clear[i] = new CTexture[OpenTaiko.Skin.Characters_Result_Clear_Ptn[i]]; + Characters_Result_Failed[i] = new CTexture[OpenTaiko.Skin.Characters_Result_Failed_Ptn[i]]; + Characters_Result_Failed_In[i] = new CTexture[OpenTaiko.Skin.Characters_Result_Failed_In_Ptn[i]]; + Characters_Result_Normal[i] = new CTexture[OpenTaiko.Skin.Characters_Result_Normal_Ptn[i]]; + Characters_Menu_Loop[i] = new CTexture[OpenTaiko.Skin.Characters_Menu_Loop_Ptn[i]]; + Characters_Menu_Start[i] = new CTexture[OpenTaiko.Skin.Characters_Menu_Start_Ptn[i]]; + Characters_Menu_Select[i] = new CTexture[OpenTaiko.Skin.Characters_Menu_Select_Ptn[i]]; + Characters_Menu_Wait[i] = new CTexture[OpenTaiko.Skin.Characters_Menu_Wait_Ptn[i]]; + Characters_Tower_Standing[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Standing_Ptn[i]]; + Characters_Tower_Climbing[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Climbing_Ptn[i]]; + Characters_Tower_Running[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Running_Ptn[i]]; + Characters_Tower_Clear[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Clear_Ptn[i]]; + Characters_Tower_Fail[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Fail_Ptn[i]]; + Characters_Tower_Standing_Tired[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Standing_Tired_Ptn[i]]; + Characters_Tower_Climbing_Tired[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Climbing_Tired_Ptn[i]]; + Characters_Tower_Running_Tired[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Running_Tired_Ptn[i]]; + Characters_Tower_Clear_Tired[i] = new CTexture[OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn[i]]; #endregion #region [Characters asset loading] - for (int j = 0; j < TJAPlayer3.Skin.Characters_Menu_Loop_Ptn[i]; j++) - Characters_Menu_Loop[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Menu_Loop{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Menu_Loop_Ptn[i]; j++) + Characters_Menu_Loop[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Menu_Loop{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Menu_Select_Ptn[i]; j++) - Characters_Menu_Select[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Menu_Select{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Menu_Select_Ptn[i]; j++) + Characters_Menu_Select[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Menu_Select{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Menu_Start_Ptn[i]; j++) - Characters_Menu_Start[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Menu_Start{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Menu_Start_Ptn[i]; j++) + Characters_Menu_Start[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Menu_Start{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Menu_Wait_Ptn[i]; j++) - Characters_Menu_Wait[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Menu_Wait{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Menu_Wait_Ptn[i]; j++) + Characters_Menu_Wait[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Menu_Wait{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Result_Normal_Ptn[i]; j++) - Characters_Result_Normal[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Normal{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Result_Normal_Ptn[i]; j++) + Characters_Result_Normal[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Normal{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Result_Failed_In_Ptn[i]; j++) - Characters_Result_Failed_In[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed_In{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Result_Failed_In_Ptn[i]; j++) + Characters_Result_Failed_In[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed_In{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Result_Failed_Ptn[i]; j++) - Characters_Result_Failed[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Result_Failed_Ptn[i]; j++) + Characters_Result_Failed[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Result_Clear_Ptn[i]; j++) - Characters_Result_Clear[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Result_Clear_Ptn[i]; j++) + Characters_Result_Clear[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Title_Normal_Ptn[i]; j++) - Characters_Title_Normal[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Title_Normal{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Title_Normal_Ptn[i]; j++) + Characters_Title_Normal[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Title_Normal{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Title_Entry_Ptn[i]; j++) - Characters_Title_Entry[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Title_Entry{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Title_Entry_Ptn[i]; j++) + Characters_Title_Entry[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Title_Entry{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_Ptn[i]; j++) - Characters_Normal[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Normal{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_Ptn[i]; j++) + Characters_Normal[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Normal{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_Missed_Ptn[i]; j++) - Characters_Normal_Missed[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Miss{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_Missed_Ptn[i]; j++) + Characters_Normal_Missed[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Miss{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn[i]; j++) - Characters_Normal_MissedDown[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}MissDown{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_MissedDown_Ptn[i]; j++) + Characters_Normal_MissedDown[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}MissDown{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn[i]; j++) - Characters_Normal_Cleared[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_Cleared_Ptn[i]; j++) + Characters_Normal_Cleared[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn[i]; j++) - Characters_Normal_Maxed[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Clear_Max{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Normal_Maxed_Ptn[i]; j++) + Characters_Normal_Maxed[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Clear_Max{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_MissIn_Ptn[i]; j++) - Characters_MissIn[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}MissIn{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_MissIn_Ptn[i]; j++) + Characters_MissIn[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}MissIn{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_MissDownIn_Ptn[i]; j++) - Characters_MissDownIn[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}MissDownIn{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_MissDownIn_Ptn[i]; j++) + Characters_MissDownIn[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}MissDownIn{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoTime_Ptn[i]; j++) - Characters_GoGoTime[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGo{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoTime_Ptn[i]; j++) + Characters_GoGoTime[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGo{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn[i]; j++) - Characters_GoGoTime_Maxed[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGo_Max{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoTime_Maxed_Ptn[i]; j++) + Characters_GoGoTime_Maxed[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGo_Max{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoStart_Ptn[i]; j++) - Characters_GoGoStart[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGoStart{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoStart_Ptn[i]; j++) + Characters_GoGoStart[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGoStart{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn[i]; j++) - Characters_GoGoStart_Clear[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGoStart_Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn[i]; j++) + Characters_GoGoStart_Clear[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGoStart_Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[i]; j++) - Characters_GoGoStart_Maxed[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGoStart_Max{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_GoGoStart_Maxed_Ptn[i]; j++) + Characters_GoGoStart_Maxed[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}GoGoStart_Max{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_10Combo_Ptn[i]; j++) - Characters_10Combo[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}10combo{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_10Combo_Ptn[i]; j++) + Characters_10Combo[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}10combo{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_10Combo_Clear_Ptn[i]; j++) - Characters_10Combo_Clear[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}10combo_Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_10Combo_Clear_Ptn[i]; j++) + Characters_10Combo_Clear[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}10combo_Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[i]; j++) - Characters_10Combo_Maxed[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}10combo_Max{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn[i]; j++) + Characters_10Combo_Maxed[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}10combo_Max{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[i]; j++) - Characters_Become_Cleared[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Clearin{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Become_Cleared_Ptn[i]; j++) + Characters_Become_Cleared[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Clearin{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[i]; j++) - Characters_Become_Maxed[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Soulin{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Become_Maxed_Ptn[i]; j++) + Characters_Become_Maxed[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Soulin{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_SoulOut_Ptn[i]; j++) - Characters_SoulOut[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Soulout{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_SoulOut_Ptn[i]; j++) + Characters_SoulOut[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Soulout{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_ClearOut_Ptn[i]; j++) - Characters_ClearOut[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Clearout{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_ClearOut_Ptn[i]; j++) + Characters_ClearOut[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Clearout{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Return_Ptn[i]; j++) - Characters_Return[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Return{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Return_Ptn[i]; j++) + Characters_Return[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Return{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[i]; j++) - Characters_Balloon_Breaking[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Balloon_Breaking{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Balloon_Breaking_Ptn[i]; j++) + Characters_Balloon_Breaking[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Balloon_Breaking{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[i]; j++) - Characters_Balloon_Broke[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Balloon_Broke{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Balloon_Broke_Ptn[i]; j++) + Characters_Balloon_Broke[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Balloon_Broke{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[i]; j++) - Characters_Balloon_Miss[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Balloon_Miss{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Balloon_Miss_Ptn[i]; j++) + Characters_Balloon_Miss[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Balloon_Miss{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[i]; j++) - Characters_Kusudama_Idle[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Kusudama_Idle{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Kusudama_Idle_Ptn[i]; j++) + Characters_Kusudama_Idle[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Kusudama_Idle{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn[i]; j++) - Characters_Kusudama_Breaking[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Kusudama_Breaking{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Kusudama_Breaking_Ptn[i]; j++) + Characters_Kusudama_Breaking[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Kusudama_Breaking{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn[i]; j++) - Characters_Kusudama_Broke[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Kusudama_Broke{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Kusudama_Broke_Ptn[i]; j++) + Characters_Kusudama_Broke[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Kusudama_Broke{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn[i]; j++) - Characters_Kusudama_Miss[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Kusudama_Miss{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Kusudama_Miss_Ptn[i]; j++) + Characters_Kusudama_Miss[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Kusudama_Miss{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[i]; j++) - Characters_Tower_Standing[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Standing{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Standing_Ptn[i]; j++) + Characters_Tower_Standing[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Standing{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[i]; j++) - Characters_Tower_Climbing[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Climbing{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Climbing_Ptn[i]; j++) + Characters_Tower_Climbing[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Climbing{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Running_Ptn[i]; j++) - Characters_Tower_Running[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Running{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Running_Ptn[i]; j++) + Characters_Tower_Running[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Running{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[i]; j++) - Characters_Tower_Clear[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Clear_Ptn[i]; j++) + Characters_Tower_Clear[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Clear{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[i]; j++) - Characters_Tower_Fail[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Fail{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Fail_Ptn[i]; j++) + Characters_Tower_Fail[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Fail{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Standing_Tired_Ptn[i]; j++) - Characters_Tower_Standing_Tired[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Standing_Tired{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Standing_Tired_Ptn[i]; j++) + Characters_Tower_Standing_Tired[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Standing_Tired{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Climbing_Tired_Ptn[i]; j++) - Characters_Tower_Climbing_Tired[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Climbing_Tired{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Climbing_Tired_Ptn[i]; j++) + Characters_Tower_Climbing_Tired[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Climbing_Tired{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Running_Tired_Ptn[i]; j++) - Characters_Tower_Running_Tired[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Running_Tired{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Running_Tired_Ptn[i]; j++) + Characters_Tower_Running_Tired[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Running_Tired{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); - for (int j = 0; j < TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[i]; j++) - Characters_Tower_Clear_Tired[i][j] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Clear_Tired{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); + for (int j = 0; j < OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn[i]; j++) + Characters_Tower_Clear_Tired[i][j] = TxCGlobal(CHARACTERS + OpenTaiko.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Tower_Char{Path.DirectorySeparatorChar}Clear_Tired{Path.DirectorySeparatorChar}" + j.ToString() + @$".png"); #endregion @@ -1756,38 +1756,38 @@ namespace TJAPlayer3 { #region [Default values] - TJAPlayer3.Skin.Characters_X[i] = new int[] { 0, 0 }; - TJAPlayer3.Skin.Characters_Y[i] = new int[] { 0, 537 }; - TJAPlayer3.Skin.Characters_4P[i] = new int[] { 165, 68 }; - TJAPlayer3.Skin.Characters_5P[i] = new int[] { 165, 40 }; - TJAPlayer3.Skin.Characters_X_AI[i] = new int[] { 472, 602 }; - TJAPlayer3.Skin.Characters_Y_AI[i] = new int[] { 152, 152 }; - TJAPlayer3.Skin.Characters_Balloon_X[i] = new int[] { 240, 240, 0, 0 }; - TJAPlayer3.Skin.Characters_Balloon_Y[i] = new int[] { 0, 297, 0, 0 }; - TJAPlayer3.Skin.Characters_Balloon_4P[i] = new int[] { 0, -176 }; - TJAPlayer3.Skin.Characters_Balloon_5P[i] = new int[] { 0, -168 }; - TJAPlayer3.Skin.Characters_Kusudama_X[i] = new int[] { 290, 690, 90, 890, 490 }; - TJAPlayer3.Skin.Characters_Kusudama_Y[i] = new int[] { 420, 420, 420, 420, 420 }; - TJAPlayer3.Skin.Characters_Motion_Normal[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_10Combo[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_10Combo_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_10Combo_Clear[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_10Combo_Clear_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_10ComboMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_Miss[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Missed_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_MissDown[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_ClearIn[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_Clear[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_ClearMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_MissIn[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_MissIn_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_MissDownIn[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_MissDownIn_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_GoGoStart[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoStart_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_GoGoStart_Clear[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_GoGo[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoTime_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_GoGoMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_SoulIn[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_SoulOut[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_SoulOut_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_ClearOut[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_ClearOut_Ptn[i]); - TJAPlayer3.Skin.Characters_Motion_Return[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Return_Ptn[i]); + OpenTaiko.Skin.Characters_X[i] = new int[] { 0, 0 }; + OpenTaiko.Skin.Characters_Y[i] = new int[] { 0, 537 }; + OpenTaiko.Skin.Characters_4P[i] = new int[] { 165, 68 }; + OpenTaiko.Skin.Characters_5P[i] = new int[] { 165, 40 }; + OpenTaiko.Skin.Characters_X_AI[i] = new int[] { 472, 602 }; + OpenTaiko.Skin.Characters_Y_AI[i] = new int[] { 152, 152 }; + OpenTaiko.Skin.Characters_Balloon_X[i] = new int[] { 240, 240, 0, 0 }; + OpenTaiko.Skin.Characters_Balloon_Y[i] = new int[] { 0, 297, 0, 0 }; + OpenTaiko.Skin.Characters_Balloon_4P[i] = new int[] { 0, -176 }; + OpenTaiko.Skin.Characters_Balloon_5P[i] = new int[] { 0, -168 }; + OpenTaiko.Skin.Characters_Kusudama_X[i] = new int[] { 290, 690, 90, 890, 490 }; + OpenTaiko.Skin.Characters_Kusudama_Y[i] = new int[] { 420, 420, 420, 420, 420 }; + OpenTaiko.Skin.Characters_Motion_Normal[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_Normal_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_10Combo[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_10Combo_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_10Combo_Clear[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_10Combo_Clear_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_10ComboMax[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_Miss[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_Normal_Missed_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_MissDown[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_Normal_MissedDown_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_ClearIn[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_Become_Cleared_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_Clear[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_Normal_Cleared_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_ClearMax[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_Normal_Maxed_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_MissIn[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_MissIn_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_MissDownIn[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_MissDownIn_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_GoGoStart[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_GoGoStart_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_GoGoStart_Clear[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_GoGoStartMax[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_GoGoStart_Maxed_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_GoGo[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_GoGoTime_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_GoGoMax[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_GoGoTime_Maxed_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_SoulIn[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_Become_Maxed_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_SoulOut[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_SoulOut_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_ClearOut[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_ClearOut_Ptn[i]); + OpenTaiko.Skin.Characters_Motion_Return[i] = CreateNumberedArrayFromInt(OpenTaiko.Skin.Characters_Return_Ptn[i]); /* TJAPlayer3.Skin.Characters_Motion_Tower_Standing[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[i]); TJAPlayer3.Skin.Characters_Motion_Tower_Climbing[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[i]); @@ -1799,49 +1799,49 @@ namespace TJAPlayer3 { TJAPlayer3.Skin.Characters_Motion_Tower_Running_Tired[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Tower_Running_Tired_Ptn[i]); TJAPlayer3.Skin.Characters_Motion_Tower_Clear_Tired[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[i]); */ - TJAPlayer3.Skin.Characters_Beat_Normal[i] = 1; - TJAPlayer3.Skin.Characters_Beat_Miss[i] = 1; - TJAPlayer3.Skin.Characters_Beat_MissDown[i] = 1; - TJAPlayer3.Skin.Characters_Beat_Clear[i] = 2; - TJAPlayer3.Skin.Characters_Beat_GoGo[i] = 2; - TJAPlayer3.Skin.Characters_Beat_MissIn[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_MissDownIn[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_10Combo[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_10Combo_Clear[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_10ComboMax[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_ClearIn[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_ClearMax[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_GoGoStart[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_GoGoStart_Clear[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_GoGoStartMax[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_GoGoMax[i] = 2; - TJAPlayer3.Skin.Characters_Beat_SoulIn[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_SoulOut[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_ClearOut[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_Return[i] = 1.5f; - TJAPlayer3.Skin.Characters_Beat_Tower_Standing[i] = 1; - TJAPlayer3.Skin.Characters_Beat_Tower_Clear[i] = 1; - TJAPlayer3.Skin.Characters_Beat_Tower_Fail[i] = 1; - TJAPlayer3.Skin.Characters_Beat_Tower_Standing_Tired[i] = 1; - TJAPlayer3.Skin.Characters_Beat_Tower_Clear_Tired[i] = 1; - TJAPlayer3.Skin.Characters_Balloon_Timer[i] = 28; - TJAPlayer3.Skin.Characters_Balloon_Delay[i] = 500; - TJAPlayer3.Skin.Characters_Balloon_FadeOut[i] = 84; - TJAPlayer3.Skin.Characters_Title_Entry_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Title_Normal_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Menu_Loop_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Menu_Select_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Menu_Start_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Menu_Wait_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Result_Normal_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Result_Clear_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Result_Failed_In_AnimationDuration[i] = 1000; - TJAPlayer3.Skin.Characters_Result_Failed_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Beat_Normal[i] = 1; + OpenTaiko.Skin.Characters_Beat_Miss[i] = 1; + OpenTaiko.Skin.Characters_Beat_MissDown[i] = 1; + OpenTaiko.Skin.Characters_Beat_Clear[i] = 2; + OpenTaiko.Skin.Characters_Beat_GoGo[i] = 2; + OpenTaiko.Skin.Characters_Beat_MissIn[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_MissDownIn[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_10Combo[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_10Combo_Clear[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_10ComboMax[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_ClearIn[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_ClearMax[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_GoGoStart[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_GoGoStart_Clear[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_GoGoStartMax[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_GoGoMax[i] = 2; + OpenTaiko.Skin.Characters_Beat_SoulIn[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_SoulOut[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_ClearOut[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_Return[i] = 1.5f; + OpenTaiko.Skin.Characters_Beat_Tower_Standing[i] = 1; + OpenTaiko.Skin.Characters_Beat_Tower_Clear[i] = 1; + OpenTaiko.Skin.Characters_Beat_Tower_Fail[i] = 1; + OpenTaiko.Skin.Characters_Beat_Tower_Standing_Tired[i] = 1; + OpenTaiko.Skin.Characters_Beat_Tower_Clear_Tired[i] = 1; + OpenTaiko.Skin.Characters_Balloon_Timer[i] = 28; + OpenTaiko.Skin.Characters_Balloon_Delay[i] = 500; + OpenTaiko.Skin.Characters_Balloon_FadeOut[i] = 84; + OpenTaiko.Skin.Characters_Title_Entry_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Title_Normal_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Menu_Loop_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Menu_Select_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Menu_Start_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Menu_Wait_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Result_Normal_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Result_Clear_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Result_Failed_In_AnimationDuration[i] = 1000; + OpenTaiko.Skin.Characters_Result_Failed_AnimationDuration[i] = 1000; #endregion var _str = ""; - TJAPlayer3.Skin.LoadSkinConfigFromFile(charaPath + @$"{Path.DirectorySeparatorChar}CharaConfig.txt", ref _str); + OpenTaiko.Skin.LoadSkinConfigFromFile(charaPath + @$"{Path.DirectorySeparatorChar}CharaConfig.txt", ref _str); string[] delimiter = { "\n" }; string[] strSingleLine = _str.Split(delimiter, StringSplitOptions.RemoveEmptyEntries); @@ -1862,184 +1862,184 @@ namespace TJAPlayer3 { case "Game_Chara_X": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_X[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_X[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Y": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_Y[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_Y[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_4P": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_4P[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_4P[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_5P": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_5P[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_5P[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_X_AI": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_X_AI[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_X_AI[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Y_AI": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_Y_AI[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_Y_AI[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Balloon_X": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_Balloon_X[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_Balloon_X[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Balloon_Y": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_Balloon_Y[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_Balloon_Y[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Balloon_4P": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_Balloon_4P[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_Balloon_4P[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Balloon_5P": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 2; k++) { - TJAPlayer3.Skin.Characters_Balloon_5P[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_Balloon_5P[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Kusudama_X": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 5; k++) { - TJAPlayer3.Skin.Characters_Kusudama_X[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_Kusudama_X[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Kusudama_Y": { string[] strSplit = strParam.Split(','); for (int k = 0; k < 5; k++) { - TJAPlayer3.Skin.Characters_Kusudama_Y[i][k] = int.Parse(strSplit[k]); + OpenTaiko.Skin.Characters_Kusudama_Y[i][k] = int.Parse(strSplit[k]); } break; } case "Game_Chara_Balloon_Timer": { if (int.Parse(strParam) > 0) - TJAPlayer3.Skin.Characters_Balloon_Timer[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Balloon_Timer[i] = int.Parse(strParam); break; } case "Game_Chara_Balloon_Delay": { if (int.Parse(strParam) > 0) - TJAPlayer3.Skin.Characters_Balloon_Delay[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Balloon_Delay[i] = int.Parse(strParam); break; } case "Game_Chara_Balloon_FadeOut": { if (int.Parse(strParam) > 0) - TJAPlayer3.Skin.Characters_Balloon_FadeOut[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Balloon_FadeOut[i] = int.Parse(strParam); break; } // パターン数の設定はTextureLoader.csで反映されます。 case "Game_Chara_Motion_Normal": { - TJAPlayer3.Skin.Characters_Motion_Normal[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_Normal[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_10Combo": { - TJAPlayer3.Skin.Characters_Motion_10Combo[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_10Combo[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_10Combo_Clear": { - TJAPlayer3.Skin.Characters_Motion_10Combo_Clear[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_10Combo_Clear[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_10Combo_Max": { - TJAPlayer3.Skin.Characters_Motion_10ComboMax[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_10ComboMax[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_Miss": { - TJAPlayer3.Skin.Characters_Motion_Miss[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_Miss[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_MissDown": { - TJAPlayer3.Skin.Characters_Motion_MissDown[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_MissDown[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_ClearIn": { - TJAPlayer3.Skin.Characters_Motion_ClearIn[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_ClearIn[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_Clear": { - TJAPlayer3.Skin.Characters_Motion_Clear[i] = CConversion.StringToIntArray(strParam); - TJAPlayer3.Skin.Characters_Motion_ClearMax[i] = TJAPlayer3.Skin.Characters_Motion_Clear[i]; + OpenTaiko.Skin.Characters_Motion_Clear[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_ClearMax[i] = OpenTaiko.Skin.Characters_Motion_Clear[i]; break; } case "Game_Chara_Motion_ClearMax": { - TJAPlayer3.Skin.Characters_Motion_ClearMax[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_ClearMax[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_MissIn": { - TJAPlayer3.Skin.Characters_Motion_MissIn[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_MissIn[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_MissDownIn": { - TJAPlayer3.Skin.Characters_Motion_MissDownIn[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_MissDownIn[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_GoGoStart": { - TJAPlayer3.Skin.Characters_Motion_GoGoStart[i] = CConversion.StringToIntArray(strParam); - TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[i] = TJAPlayer3.Skin.Characters_Motion_GoGoStart[i]; + OpenTaiko.Skin.Characters_Motion_GoGoStart[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_GoGoStartMax[i] = OpenTaiko.Skin.Characters_Motion_GoGoStart[i]; break; } case "Game_Chara_Motion_GoGoStart_Clear": { - TJAPlayer3.Skin.Characters_Motion_GoGoStart_Clear[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_GoGoStart_Clear[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_GoGoStart_Max": { - TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_GoGoStartMax[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_GoGo": { - TJAPlayer3.Skin.Characters_Motion_GoGo[i] = CConversion.StringToIntArray(strParam); - TJAPlayer3.Skin.Characters_Motion_GoGoMax[i] = TJAPlayer3.Skin.Characters_Motion_GoGo[i]; + OpenTaiko.Skin.Characters_Motion_GoGo[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_GoGoMax[i] = OpenTaiko.Skin.Characters_Motion_GoGo[i]; break; } case "Game_Chara_Motion_GoGo_Max": { - TJAPlayer3.Skin.Characters_Motion_GoGoMax[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_GoGoMax[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_SoulIn": { - TJAPlayer3.Skin.Characters_Motion_SoulIn[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_SoulIn[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_SoulOut": { - TJAPlayer3.Skin.Characters_Motion_SoulOut[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_SoulOut[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_ClearOut": { - TJAPlayer3.Skin.Characters_Motion_ClearOut[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_ClearOut[i] = CConversion.StringToIntArray(strParam); break; } case "Game_Chara_Motion_Return": { - TJAPlayer3.Skin.Characters_Motion_Return[i] = CConversion.StringToIntArray(strParam); + OpenTaiko.Skin.Characters_Motion_Return[i] = CConversion.StringToIntArray(strParam); break; } /*case "Game_Chara_Motion_Tower_Standing": @@ -2088,145 +2088,145 @@ namespace TJAPlayer3 { break; }*/ case "Game_Chara_Beat_Normal": { - TJAPlayer3.Skin.Characters_Beat_Normal[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Normal[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_10Combo": { - TJAPlayer3.Skin.Characters_Beat_10Combo[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_10Combo[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_10ComboMax": { - TJAPlayer3.Skin.Characters_Beat_10ComboMax[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_10ComboMax[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_Miss": { - TJAPlayer3.Skin.Characters_Beat_Miss[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Miss[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_MissDown": { - TJAPlayer3.Skin.Characters_Beat_MissDown[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_MissDown[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_ClearIn": { - TJAPlayer3.Skin.Characters_Beat_ClearIn[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_ClearIn[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_Clear": { - TJAPlayer3.Skin.Characters_Beat_Clear[i] = float.Parse(strParam); - TJAPlayer3.Skin.Characters_Beat_ClearMax[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Clear[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_ClearMax[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_ClearMax": { - TJAPlayer3.Skin.Characters_Beat_ClearMax[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_ClearMax[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_MissIn": { - TJAPlayer3.Skin.Characters_Beat_MissIn[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_MissIn[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_MissDownIn": { - TJAPlayer3.Skin.Characters_Beat_MissDownIn[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_MissDownIn[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_GoGoStart": { - TJAPlayer3.Skin.Characters_Beat_GoGoStart[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_GoGoStart[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_GoGoStartClear": { - TJAPlayer3.Skin.Characters_Beat_GoGoStart_Clear[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_GoGoStart_Clear[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_GoGoStartMax": { - TJAPlayer3.Skin.Characters_Beat_GoGoStartMax[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_GoGoStartMax[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_GoGo": { - TJAPlayer3.Skin.Characters_Beat_GoGo[i] = float.Parse(strParam); - TJAPlayer3.Skin.Characters_Beat_GoGoMax[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_GoGo[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_GoGoMax[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_GoGoMax": { - TJAPlayer3.Skin.Characters_Beat_GoGoMax[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_GoGoMax[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_SoulIn": { - TJAPlayer3.Skin.Characters_Beat_SoulIn[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_SoulIn[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_Return": { - TJAPlayer3.Skin.Characters_Beat_Return[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Return[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_Tower_Standing": { - TJAPlayer3.Skin.Characters_Beat_Tower_Standing[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Tower_Standing[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_Tower_Standing_Tired": { - TJAPlayer3.Skin.Characters_Beat_Tower_Standing_Tired[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Tower_Standing_Tired[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_Tower_Fail": { - TJAPlayer3.Skin.Characters_Beat_Tower_Fail[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Tower_Fail[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_Tower_Clear": { - TJAPlayer3.Skin.Characters_Beat_Tower_Clear[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Tower_Clear[i] = float.Parse(strParam); break; } case "Game_Chara_Beat_Tower_Clear_Tired": { - TJAPlayer3.Skin.Characters_Beat_Tower_Clear_Tired[i] = float.Parse(strParam); + OpenTaiko.Skin.Characters_Beat_Tower_Clear_Tired[i] = float.Parse(strParam); break; } case "Game_Chara_Tower_Clear_IsLooping": { - TJAPlayer3.Skin.Characters_Tower_Clear_IsLooping[i] = int.Parse(strParam) != 0; + OpenTaiko.Skin.Characters_Tower_Clear_IsLooping[i] = int.Parse(strParam) != 0; break; } case "Game_Chara_Tower_Clear_Tired_IsLooping": { - TJAPlayer3.Skin.Characters_Tower_Clear_Tired_IsLooping[i] = int.Parse(strParam) != 0; + OpenTaiko.Skin.Characters_Tower_Clear_Tired_IsLooping[i] = int.Parse(strParam) != 0; break; } case "Game_Chara_Tower_Fail_IsLooping": { - TJAPlayer3.Skin.Characters_Tower_Fail_IsLooping[i] = int.Parse(strParam) != 0; + OpenTaiko.Skin.Characters_Tower_Fail_IsLooping[i] = int.Parse(strParam) != 0; break; } case "Chara_Entry_AnimationDuration": { - TJAPlayer3.Skin.Characters_Title_Entry_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Title_Entry_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Normal_AnimationDuration": { - TJAPlayer3.Skin.Characters_Title_Normal_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Title_Normal_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Menu_Loop_AnimationDuration": { - TJAPlayer3.Skin.Characters_Menu_Loop_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Menu_Loop_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Menu_Select_AnimationDuration": { - TJAPlayer3.Skin.Characters_Menu_Select_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Menu_Select_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Menu_Start_AnimationDuration": { - TJAPlayer3.Skin.Characters_Menu_Start_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Menu_Start_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Menu_Wait_AnimationDuration": { - TJAPlayer3.Skin.Characters_Menu_Wait_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Menu_Wait_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Result_Normal_AnimationDuration": { - TJAPlayer3.Skin.Characters_Result_Normal_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Result_Normal_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Result_Clear_AnimationDuration": { - TJAPlayer3.Skin.Characters_Result_Clear_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Result_Clear_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Result_Failed_In_AnimationDuration": { - TJAPlayer3.Skin.Characters_Result_Failed_In_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Result_Failed_In_AnimationDuration[i] = int.Parse(strParam); break; } case "Chara_Result_Failed_AnimationDuration": { - TJAPlayer3.Skin.Characters_Result_Failed_AnimationDuration[i] = int.Parse(strParam); + OpenTaiko.Skin.Characters_Result_Failed_AnimationDuration[i] = int.Parse(strParam); break; } /* @@ -2259,7 +2259,7 @@ namespace TJAPlayer3 { #region [Voice samples] - var _skin = TJAPlayer3.Skin; + var _skin = OpenTaiko.Skin; #region [Dispose previously allocated sound effects] @@ -2319,7 +2319,7 @@ namespace TJAPlayer3 { public void DisposeTexture() { foreach (var tex in listTexture) { var texture = tex; - TJAPlayer3.tテクスチャの解放(ref texture); + OpenTaiko.tテクスチャの解放(ref texture); texture?.Dispose(); texture = null; } @@ -2327,7 +2327,7 @@ namespace TJAPlayer3 { //if (TJAPlayer3.ConfigIni.PreAssetsLoading) { - foreach (var act in TJAPlayer3.app.listトップレベルActivities) { + foreach (var act in OpenTaiko.app.listトップレベルActivities) { act.ReleaseManagedResource(); act.ReleaseUnmanagedResource(); } diff --git a/OpenTaiko/src/Stages/02.Title/CActEnumSongs.cs b/OpenTaiko/src/Stages/02.Title/CActEnumSongs.cs index 06086562..44c8f32b 100644 --- a/OpenTaiko/src/Stages/02.Title/CActEnumSongs.cs +++ b/OpenTaiko/src/Stages/02.Title/CActEnumSongs.cs @@ -5,7 +5,7 @@ using FDK; using Silk.NET.Maths; using SkiaSharp; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActEnumSongs : CActivity { public bool bコマンドでの曲データ取得; @@ -34,7 +34,7 @@ namespace TJAPlayer3 { try { this.ctNowEnumeratingSongs = new CCounter(); // 0, 1000, 17, CDTXMania.Timer ); - this.ctNowEnumeratingSongs.Start(0, 100, 17, TJAPlayer3.Timer); + this.ctNowEnumeratingSongs.Start(0, 100, 17, OpenTaiko.Timer); } finally { } } @@ -78,7 +78,7 @@ namespace TJAPlayer3 { this.txMessage = new CTexture(image); this.txMessage.vcScaleRatio = new Vector3D(0.5f, 0.5f, 1f); image.Dispose(); - TJAPlayer3.tDisposeSafely(ref ftMessage); + OpenTaiko.tDisposeSafely(ref ftMessage); } else { this.txMessage = null; } @@ -94,7 +94,7 @@ namespace TJAPlayer3 { public override void ReleaseManagedResource() { //CDTXMania.t安全にDisposeする( ref this.txDialogNowEnumeratingSongs ); //CDTXMania.t安全にDisposeする( ref this.txNowEnumeratingSongs ); - TJAPlayer3.tDisposeSafely(ref this.txMessage); + OpenTaiko.tDisposeSafely(ref this.txMessage); base.ReleaseManagedResource(); } @@ -103,12 +103,12 @@ namespace TJAPlayer3 { return 0; } this.ctNowEnumeratingSongs.TickLoop(); - if (TJAPlayer3.Tx.Enum_Song != null) { - TJAPlayer3.Tx.Enum_Song.Opacity = (int)(176.0 + 80.0 * Math.Sin((double)(2 * Math.PI * this.ctNowEnumeratingSongs.CurrentValue * 2 / 100.0))); - TJAPlayer3.Tx.Enum_Song.t2D描画(18, 7); + if (OpenTaiko.Tx.Enum_Song != null) { + OpenTaiko.Tx.Enum_Song.Opacity = (int)(176.0 + 80.0 * Math.Sin((double)(2 * Math.PI * this.ctNowEnumeratingSongs.CurrentValue * 2 / 100.0))); + OpenTaiko.Tx.Enum_Song.t2D描画(18, 7); } - if (bコマンドでの曲データ取得 && TJAPlayer3.Tx.Config_Enum_Song != null) { - TJAPlayer3.Tx.Config_Enum_Song.t2D描画(180, 177); + if (bコマンドでの曲データ取得 && OpenTaiko.Tx.Config_Enum_Song != null) { + OpenTaiko.Tx.Config_Enum_Song.t2D描画(180, 177); this.txMessage.t2D描画(190, 197); } diff --git a/OpenTaiko/src/Stages/02.Title/CActScanningLoudness.cs b/OpenTaiko/src/Stages/02.Title/CActScanningLoudness.cs index bb746a36..b33ff8f5 100644 --- a/OpenTaiko/src/Stages/02.Title/CActScanningLoudness.cs +++ b/OpenTaiko/src/Stages/02.Title/CActScanningLoudness.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActScanningLoudness : CActivity { public bool bIsActivelyScanning; @@ -13,7 +13,7 @@ namespace TJAPlayer3 { try { this.ctNowScanningLoudness = new CCounter(); - this.ctNowScanningLoudness.Start(0, 200, 29, TJAPlayer3.Timer); + this.ctNowScanningLoudness.Start(0, 200, 29, OpenTaiko.Timer); } finally { } } @@ -30,9 +30,9 @@ namespace TJAPlayer3 { return 0; } this.ctNowScanningLoudness.TickLoop(); - if (bIsActivelyScanning && TJAPlayer3.Tx.Scanning_Loudness != null) { - TJAPlayer3.Tx.Scanning_Loudness.Opacity = (int)(176.0 + 80.0 * Math.Sin((double)(2 * Math.PI * this.ctNowScanningLoudness.CurrentValue / 100.0))); - TJAPlayer3.Tx.Scanning_Loudness.t2D描画(18 + 89 + 18, 7); // 2018-09-03 twopointzero: display right of Enum_Song, using its width and margin + if (bIsActivelyScanning && OpenTaiko.Tx.Scanning_Loudness != null) { + OpenTaiko.Tx.Scanning_Loudness.Opacity = (int)(176.0 + 80.0 * Math.Sin((double)(2 * Math.PI * this.ctNowScanningLoudness.CurrentValue / 100.0))); + OpenTaiko.Tx.Scanning_Loudness.t2D描画(18 + 89 + 18, 7); // 2018-09-03 twopointzero: display right of Enum_Song, using its width and margin } return 0; diff --git a/OpenTaiko/src/Stages/02.Title/CEnumSongs.cs b/OpenTaiko/src/Stages/02.Title/CEnumSongs.cs index 956555d8..72a6c1a5 100644 --- a/OpenTaiko/src/Stages/02.Title/CEnumSongs.cs +++ b/OpenTaiko/src/Stages/02.Title/CEnumSongs.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Runtime.Serialization.Formatters.Binary; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CEnumSongs // #27060 2011.2.7 yyagi 曲リストを取得するクラス { // ファイルキャッシュ(songslist.db)からの取得と、ディスクからの取得を、この一つのクラスに集約。 @@ -56,8 +56,8 @@ namespace TJAPlayer3 { this.thDTXFileEnumerate.Priority = tp; } } - private readonly string strPathSongsDB = TJAPlayer3.strEXEのあるフォルダ + "songs.db"; - private readonly string strPathSongList = TJAPlayer3.strEXEのあるフォルダ + "songlist.db"; + private readonly string strPathSongsDB = OpenTaiko.strEXEのあるフォルダ + "songs.db"; + private readonly string strPathSongList = OpenTaiko.strEXEのあるフォルダ + "songlist.db"; public Thread thDTXFileEnumerate { get; @@ -207,18 +207,18 @@ namespace TJAPlayer3 { try { #region [ 0) システムサウンドの構築 ] //----------------------------- - TJAPlayer3.stage起動.ePhaseID = CStage.EPhase.Startup_0_CreateSystemSound; + OpenTaiko.stage起動.ePhaseID = CStage.EPhase.Startup_0_CreateSystemSound; Trace.TraceInformation("0) システムサウンドを構築します。"); Trace.Indent(); try { - TJAPlayer3.Skin.bgm起動画面.tPlay(); - for (int i = 0; i < TJAPlayer3.Skin.nシステムサウンド数; i++) { - if (!TJAPlayer3.Skin[i].bExclusive) // BGM系以外のみ読み込む。(BGM系は必要になったときに読み込む) + OpenTaiko.Skin.bgm起動画面.tPlay(); + for (int i = 0; i < OpenTaiko.Skin.nシステムサウンド数; i++) { + if (!OpenTaiko.Skin[i].bExclusive) // BGM系以外のみ読み込む。(BGM系は必要になったときに読み込む) { - CSkin.CSystemSound cシステムサウンド = TJAPlayer3.Skin[i]; - if (!TJAPlayer3.bコンパクトモード || cシステムサウンド.bCompact対象) { + CSkin.CSystemSound cシステムサウンド = OpenTaiko.Skin[i]; + if (!OpenTaiko.bコンパクトモード || cシステムサウンド.bCompact対象) { try { cシステムサウンド.tLoading(); Trace.TraceInformation("システムサウンドを読み込みました。({0})", cシステムサウンド.strFileName); @@ -235,8 +235,8 @@ namespace TJAPlayer3 { } } } - lock (TJAPlayer3.stage起動.list進行文字列) { - TJAPlayer3.stage起動.list進行文字列.Add("SYSTEM SOUND...OK"); + lock (OpenTaiko.stage起動.list進行文字列) { + OpenTaiko.stage起動.list進行文字列.Add("SYSTEM SOUND...OK"); } } finally { Trace.Unindent(); @@ -244,12 +244,12 @@ namespace TJAPlayer3 { //----------------------------- #endregion - if (TJAPlayer3.bコンパクトモード) { + if (OpenTaiko.bコンパクトモード) { Trace.TraceInformation("コンパクトモードなので残りの起動処理は省略します。"); return; } } finally { - TJAPlayer3.stage起動.ePhaseID = CStage.EPhase.Startup_6_LoadTextures; + OpenTaiko.stage起動.ePhaseID = CStage.EPhase.Startup_6_LoadTextures; TimeSpan span = (TimeSpan)(DateTime.Now - now); Trace.TraceInformation("起動所要時間: {0}", span.ToString()); lock (this) // #28700 2012.6.12 yyagi; state change must be in finally{} for exiting as of compact mode. @@ -274,8 +274,8 @@ namespace TJAPlayer3 { try { if (hard_reload) { - if (File.Exists($"{TJAPlayer3.strEXEのあるフォルダ}songlist.db")) - File.Delete($"{TJAPlayer3.strEXEのあるフォルダ}songlist.db"); + if (File.Exists($"{OpenTaiko.strEXEのあるフォルダ}songlist.db")) + File.Delete($"{OpenTaiko.strEXEのあるフォルダ}songlist.db"); } Deserialize(); @@ -287,15 +287,15 @@ namespace TJAPlayer3 { Trace.Indent(); try { - if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.strSongsPath)) { + if (!string.IsNullOrEmpty(OpenTaiko.ConfigIni.strSongsPath)) { CSongDict.tClearSongNodes(); - string[] strArray = TJAPlayer3.ConfigIni.strSongsPath.Split(new char[] { ';' }); + string[] strArray = OpenTaiko.ConfigIni.strSongsPath.Split(new char[] { ';' }); if (strArray.Length > 0) { // 全パスについて… foreach (string str in strArray) { string path = str; if (!Path.IsPathRooted(path)) { - path = TJAPlayer3.strEXEのあるフォルダ + str; // 相対パスの場合、絶対パスに直す(2010.9.16) + path = OpenTaiko.strEXEのあるフォルダ + str; // 相対パスの場合、絶対パスに直す(2010.9.16) } if (!string.IsNullOrEmpty(path)) { @@ -411,7 +411,7 @@ namespace TJAPlayer3 { /// private void SerializeSongList() { BinaryFormatter songlistdb_ = new BinaryFormatter(); - using Stream songlistdb = File.OpenWrite($"{TJAPlayer3.strEXEのあるフォルダ}songlist.db"); + using Stream songlistdb = File.OpenWrite($"{OpenTaiko.strEXEのあるフォルダ}songlist.db"); songlistdb_.Serialize(songlistdb, Songs管理.listSongsDB); } @@ -422,9 +422,9 @@ namespace TJAPlayer3 { /// public void Deserialize() { try { - if (File.Exists($"{TJAPlayer3.strEXEのあるフォルダ}songlist.db")) { + if (File.Exists($"{OpenTaiko.strEXEのあるフォルダ}songlist.db")) { BinaryFormatter songlistdb_ = new BinaryFormatter(); - using Stream songlistdb = File.OpenRead($"{TJAPlayer3.strEXEのあるフォルダ}songlist.db"); + using Stream songlistdb = File.OpenRead($"{OpenTaiko.strEXEのあるフォルダ}songlist.db"); this.Songs管理.listSongsDB = (Dictionary)songlistdb_.Deserialize(songlistdb); } } catch (Exception exception) { diff --git a/OpenTaiko/src/Stages/02.Title/CMainMenuTab.cs b/OpenTaiko/src/Stages/02.Title/CMainMenuTab.cs index 785c2c63..27bae5fa 100644 --- a/OpenTaiko/src/Stages/02.Title/CMainMenuTab.cs +++ b/OpenTaiko/src/Stages/02.Title/CMainMenuTab.cs @@ -1,8 +1,8 @@ using System.Drawing; using FDK; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; -namespace TJAPlayer3 { +namespace OpenTaiko { class CMainMenuTab { public static int __MenuCount = 14; // Number of existing menus public static CMainMenuTab[] __Menus; diff --git a/OpenTaiko/src/Stages/02.Title/CStageタイトル.cs b/OpenTaiko/src/Stages/02.Title/CStageタイトル.cs index 057a96e0..aad1dd8e 100644 --- a/OpenTaiko/src/Stages/02.Title/CStageタイトル.cs +++ b/OpenTaiko/src/Stages/02.Title/CStageタイトル.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Reflection; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CStageタイトル : CStage { // コンストラクタ @@ -67,9 +67,9 @@ namespace TJAPlayer3 { b音声再生 = false; if (bSaveFileLoaded == false) - TJAPlayer3.Skin.soundEntry.tPlay(); - if (TJAPlayer3.ConfigIni.bBGM音を発声する) - TJAPlayer3.Skin.bgmタイトルイン.tPlay(); + OpenTaiko.Skin.soundEntry.tPlay(); + if (OpenTaiko.ConfigIni.bBGM音を発声する) + OpenTaiko.Skin.bgmタイトルイン.tPlay(); base.Activate(); } finally { Trace.TraceInformation("タイトルステージの活性化を完了しました。"); @@ -80,7 +80,7 @@ namespace TJAPlayer3 { Trace.TraceInformation("タイトルステージを非活性化します。"); Trace.Indent(); try { - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); } finally { Trace.TraceInformation("タイトルステージの非活性化を完了しました。"); Trace.Unindent(); @@ -90,19 +90,19 @@ namespace TJAPlayer3 { public void tReloadMenus() { if (this.pfMenuTitle != null && this.pfBoxText != null) - CMainMenuTab.tInitMenus(this.pfMenuTitle, this.pfBoxText, TJAPlayer3.Tx.ModeSelect_Bar, TJAPlayer3.Tx.ModeSelect_Bar_Chara); + CMainMenuTab.tInitMenus(this.pfMenuTitle, this.pfBoxText, OpenTaiko.Tx.ModeSelect_Bar, OpenTaiko.Tx.ModeSelect_Bar_Chara); } public override void CreateManagedResource() { - this.pfMenuTitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Title_ModeSelect_Title_Scale[0]); - this.pfBoxText = HPrivateFastFont.tInstantiateBoxFont(TJAPlayer3.Skin.Title_ModeSelect_Title_Scale[1]); + this.pfMenuTitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Title_ModeSelect_Title_Scale[0]); + this.pfBoxText = HPrivateFastFont.tInstantiateBoxFont(OpenTaiko.Skin.Title_ModeSelect_Title_Scale[1]); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tDisposeSafely(ref pfMenuTitle); - TJAPlayer3.tDisposeSafely(ref pfBoxText); + OpenTaiko.tDisposeSafely(ref pfMenuTitle); + OpenTaiko.tDisposeSafely(ref pfBoxText); base.ReleaseManagedResource(); } @@ -111,7 +111,7 @@ namespace TJAPlayer3 { #region [ 初めての進行描画 ] //--------------------- if (base.IsFirstDraw) { - if (TJAPlayer3.r直前のステージ == TJAPlayer3.stage起動) { + if (OpenTaiko.r直前のステージ == OpenTaiko.stage起動) { this.actFIfromSetup.tフェードイン開始(); base.ePhaseID = CStage.EPhase.Title_FadeIn; } else { @@ -131,9 +131,9 @@ namespace TJAPlayer3 { this.ctキャライン.Tick(); this.ctBarMove.Tick(); - if (!TJAPlayer3.Skin.bgmタイトルイン.bIsPlaying) { - if (TJAPlayer3.ConfigIni.bBGM音を発声する && !b音声再生) { - TJAPlayer3.Skin.bgmタイトル.tPlay(); + if (!OpenTaiko.Skin.bgmタイトルイン.bIsPlaying) { + if (OpenTaiko.ConfigIni.bBGM音を発声する && !b音声再生) { + OpenTaiko.Skin.bgmタイトル.tPlay(); b音声再生 = true; } } @@ -143,24 +143,24 @@ namespace TJAPlayer3 { #region [ キー関係 ] if (base.ePhaseID == CStage.EPhase.Common_NORMAL // 通常状態、かつ - && TJAPlayer3.act現在入力を占有中のプラグイン == null) // プラグインの入力占有がない + && OpenTaiko.act現在入力を占有中のプラグイン == null) // プラグインの入力占有がない { - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { if (bモード選択) { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); bSaveFileLoaded = false; UnloadSaveFile(); if (bSaveFileLoaded == false) - TJAPlayer3.Skin.soundEntry.tPlay(); + OpenTaiko.Skin.soundEntry.tPlay(); } else { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); n現在の選択行モード選択 = (int)E戻り値.EXIT + 1; this.actFO.tフェードアウト開始(0, 500); base.ePhaseID = CStage.EPhase.Common_FADEOUT; } } #if DEBUG - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F8)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F8)) { CScoreIni_Importer.ImportScoreInisToSavesDb3(); } #endif @@ -183,39 +183,39 @@ namespace TJAPlayer3 { // 1st step (Save file loading) if (!bSaveIsLoading && !bSaveFailedToLoad) { - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed)) { // Hit 1P save - TJAPlayer3.SaveFile = 0; + OpenTaiko.SaveFile = 0; CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL); - this.ctSaveLoading.Start(0, 600, 1, TJAPlayer3.Timer); + this.ctSaveLoading.Start(0, 600, 1, OpenTaiko.Timer); this.ctSaveLoading.CurrentValue = (int)this.ctSaveLoading.EndValue; for (int i = 0; i < 2; i++) - TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i); - } else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P)) { + OpenTaiko.NamePlate.tNamePlateRefreshTitles(i); + } else if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P)) { // Hit 2P save - TJAPlayer3.SaveFile = 1; + OpenTaiko.SaveFile = 1; CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL); - this.ctSaveLoading.Start(0, 600, 1, TJAPlayer3.Timer); + this.ctSaveLoading.Start(0, 600, 1, OpenTaiko.Timer); this.ctSaveLoading.CurrentValue = (int)this.ctSaveLoading.EndValue; for (int i = 0; i < 2; i++) - TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i); - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.P)) // In case "P" is already binded to another pad + OpenTaiko.NamePlate.tNamePlateRefreshTitles(i); + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.P)) // In case "P" is already binded to another pad { // Hit 1P save - TJAPlayer3.SaveFile = 0; + OpenTaiko.SaveFile = 0; CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL); - this.ctSaveLoading.Start(0, 600, 1, TJAPlayer3.Timer); + this.ctSaveLoading.Start(0, 600, 1, OpenTaiko.Timer); this.ctSaveLoading.CurrentValue = (int)this.ctSaveLoading.EndValue; for (int i = 0; i < 2; i++) - TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i); + OpenTaiko.NamePlate.tNamePlateRefreshTitles(i); } } - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctSaveLoaded.IsEnded) { if (n現在の選択行プレイヤーエントリー + 1 <= 2) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); n現在の選択行プレイヤーエントリー += 1; } } @@ -223,8 +223,8 @@ namespace TJAPlayer3 { if (bモード選択) { //if (n現在の選択行モード選択 < this.nbModes - 1) if (n現在の選択行モード選択 < usedMenusCount - 1) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - ctBarMove.Start(0, 250, 1.2f, TJAPlayer3.Timer); + OpenTaiko.Skin.soundChangeSFX.tPlay(); + ctBarMove.Start(0, 250, 1.2f, OpenTaiko.Timer); n現在の選択行モード選択++; this.bDownPushed = true; @@ -235,18 +235,18 @@ namespace TJAPlayer3 { } } - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { if (bプレイヤーエントリー && !bプレイヤーエントリー決定 && this.ctSaveLoaded.IsEnded) { if (n現在の選択行プレイヤーエントリー - 1 >= 0) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); n現在の選択行プレイヤーエントリー -= 1; } } if (bモード選択) { if (n現在の選択行モード選択 > 0) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - ctBarMove.Start(0, 250, 1.2f, TJAPlayer3.Timer); + OpenTaiko.Skin.soundChangeSFX.tPlay(); + ctBarMove.Start(0, 250, 1.2f, OpenTaiko.Timer); n現在の選択行モード選択--; this.bDownPushed = false; @@ -258,24 +258,24 @@ namespace TJAPlayer3 { } - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) - || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) + || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) { if (bプレイヤーエントリー && this.ctSaveLoaded.IsEnded) { if (n現在の選択行プレイヤーエントリー == 0 || n現在の選択行プレイヤーエントリー == 2) { if (!bプレイヤーエントリー決定) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - ctエントリーバー決定点滅.Start(0, 1055, 1, TJAPlayer3.Timer); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + ctエントリーバー決定点滅.Start(0, 1055, 1, OpenTaiko.Timer); bプレイヤーエントリー決定 = true; - TJAPlayer3.PlayerSide = (n現在の選択行プレイヤーエントリー == 2) ? 1 : 0; - if (TJAPlayer3.PlayerSide == 1) - TJAPlayer3.ConfigIni.nPlayerCount = 1; + OpenTaiko.PlayerSide = (n現在の選択行プレイヤーエントリー == 2) ? 1 : 0; + if (OpenTaiko.PlayerSide == 1) + OpenTaiko.ConfigIni.nPlayerCount = 1; bSaveFileLoaded = true; } } else { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); bプレイヤーエントリー = false; bSaveIsLoading = false; - TJAPlayer3.Skin.SoundBanapas.bPlayed = false; + OpenTaiko.Skin.SoundBanapas.bPlayed = false; ctSaveLoaded = new CCounter(); ctSaveLoading = new CCounter(); } @@ -284,26 +284,26 @@ namespace TJAPlayer3 { bool operationSucceded = false; if (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]].rp == E戻り値.DANGAMESTART || CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]].rp == E戻り値.TAIKOTOWERSSTART) { - if (TJAPlayer3.Songs管理.list曲ルート_Dan.Count > 0 && TJAPlayer3.ConfigIni.nPlayerCount == 1) + if (OpenTaiko.Songs管理.list曲ルート_Dan.Count > 0 && OpenTaiko.ConfigIni.nPlayerCount == 1) operationSucceded = true; } else if (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]].implemented == true && (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]]._1pRestricted == false - || TJAPlayer3.ConfigIni.nPlayerCount == 1)) + || OpenTaiko.ConfigIni.nPlayerCount == 1)) operationSucceded = true; if (operationSucceded == true) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); this.actFO.tフェードアウト開始(0, 500); base.ePhaseID = CStage.EPhase.Common_FADEOUT; } else - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } } if (ctSaveLoading.CurrentValue >= 500) { if (!bSaveIsLoading) { - TJAPlayer3.Skin.soundEntry.tStop(); - ctSaveLoaded.Start(0, 3655, 1, TJAPlayer3.Timer); + OpenTaiko.Skin.soundEntry.tStop(); + ctSaveLoaded.Start(0, 3655, 1, OpenTaiko.Timer); bSaveIsLoading = true; bキャラカウンター初期化 = false; } @@ -316,11 +316,11 @@ namespace TJAPlayer3 { TJAPlayer3.Skin.soundsanka.t再生する(); */ - if (TJAPlayer3.Skin.voiceTitleSanka[TJAPlayer3.SaveFile] != null && !TJAPlayer3.Skin.voiceTitleSanka[TJAPlayer3.SaveFile].bPlayed) - TJAPlayer3.Skin.voiceTitleSanka[TJAPlayer3.SaveFile]?.tPlay(); + if (OpenTaiko.Skin.voiceTitleSanka[OpenTaiko.SaveFile] != null && !OpenTaiko.Skin.voiceTitleSanka[OpenTaiko.SaveFile].bPlayed) + OpenTaiko.Skin.voiceTitleSanka[OpenTaiko.SaveFile]?.tPlay(); - ctキャライン.Start(0, 180, 2, TJAPlayer3.Timer); - ctBarAnimeIn.Start(0, 1295, 1, TJAPlayer3.Timer); + ctキャライン.Start(0, 180, 2, OpenTaiko.Timer); + ctBarAnimeIn.Start(0, 1295, 1, OpenTaiko.Timer); bモード選択 = true; } } @@ -342,93 +342,93 @@ namespace TJAPlayer3 { #region [ Save Loading ] if (!bSaveIsLoading && !bSaveFailedToLoad) { - TJAPlayer3.Tx.Entry_Bar.t2D描画(0, 0); + OpenTaiko.Tx.Entry_Bar.t2D描画(0, 0); if (this.ctコインイン待機.CurrentValue <= 255) - TJAPlayer3.Tx.Entry_Bar_Text.Opacity = this.ctコインイン待機.CurrentValue; + OpenTaiko.Tx.Entry_Bar_Text.Opacity = this.ctコインイン待機.CurrentValue; else if (this.ctコインイン待機.CurrentValue <= 2000 - 355) - TJAPlayer3.Tx.Entry_Bar_Text.Opacity = 255; + OpenTaiko.Tx.Entry_Bar_Text.Opacity = 255; else - TJAPlayer3.Tx.Entry_Bar_Text.Opacity = 255 - (this.ctコインイン待機.CurrentValue - (2000 - 355)); + OpenTaiko.Tx.Entry_Bar_Text.Opacity = 255 - (this.ctコインイン待機.CurrentValue - (2000 - 355)); - TJAPlayer3.Tx.Entry_Bar_Text.t2D描画(TJAPlayer3.Skin.Title_Entry_Bar_Text_X[0], TJAPlayer3.Skin.Title_Entry_Bar_Text_Y[0], new RectangleF(0, 0, TJAPlayer3.Tx.Entry_Bar_Text.sz画像サイズ.Width, TJAPlayer3.Tx.Entry_Bar_Text.sz画像サイズ.Height / 2)); - TJAPlayer3.Tx.Entry_Bar_Text.t2D描画(TJAPlayer3.Skin.Title_Entry_Bar_Text_X[1], TJAPlayer3.Skin.Title_Entry_Bar_Text_Y[1], new RectangleF(0, TJAPlayer3.Tx.Entry_Bar_Text.sz画像サイズ.Height / 2, TJAPlayer3.Tx.Entry_Bar_Text.sz画像サイズ.Width, TJAPlayer3.Tx.Entry_Bar_Text.sz画像サイズ.Height / 2)); + OpenTaiko.Tx.Entry_Bar_Text.t2D描画(OpenTaiko.Skin.Title_Entry_Bar_Text_X[0], OpenTaiko.Skin.Title_Entry_Bar_Text_Y[0], new RectangleF(0, 0, OpenTaiko.Tx.Entry_Bar_Text.sz画像サイズ.Width, OpenTaiko.Tx.Entry_Bar_Text.sz画像サイズ.Height / 2)); + OpenTaiko.Tx.Entry_Bar_Text.t2D描画(OpenTaiko.Skin.Title_Entry_Bar_Text_X[1], OpenTaiko.Skin.Title_Entry_Bar_Text_Y[1], new RectangleF(0, OpenTaiko.Tx.Entry_Bar_Text.sz画像サイズ.Height / 2, OpenTaiko.Tx.Entry_Bar_Text.sz画像サイズ.Width, OpenTaiko.Tx.Entry_Bar_Text.sz画像サイズ.Height / 2)); } else { if (this.ctSaveLoaded.CurrentValue <= 1000 && this.ctSaveLoadingFailed.CurrentValue <= 1128) { if (bSaveIsLoading) { - TJAPlayer3.Tx.Tile_Black.Opacity = this.ctSaveLoaded.CurrentValue <= 2972 ? 128 : 128 - (this.ctSaveLoaded.CurrentValue - 2972); + OpenTaiko.Tx.Tile_Black.Opacity = this.ctSaveLoaded.CurrentValue <= 2972 ? 128 : 128 - (this.ctSaveLoaded.CurrentValue - 2972); - for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++) - for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++) - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + for (int i = 0; i < OpenTaiko.Skin.Resolution[0] / OpenTaiko.Tx.Tile_Black.szTextureSize.Width + 1; i++) + for (int j = 0; j < OpenTaiko.Skin.Resolution[1] / OpenTaiko.Tx.Tile_Black.szTextureSize.Height + 1; j++) + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); - TJAPlayer3.Tx.Banapas_Load[0].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue * 2; - TJAPlayer3.Tx.Banapas_Load[0].vcScaleRatio.Y = ctSaveLoaded.CurrentValue <= 100 ? ctSaveLoaded.CurrentValue * 0.01f : 1.0f; - TJAPlayer3.Tx.Banapas_Load[0].t2D描画(0, 0); + OpenTaiko.Tx.Banapas_Load[0].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue * 2; + OpenTaiko.Tx.Banapas_Load[0].vcScaleRatio.Y = ctSaveLoaded.CurrentValue <= 100 ? ctSaveLoaded.CurrentValue * 0.01f : 1.0f; + OpenTaiko.Tx.Banapas_Load[0].t2D描画(0, 0); - TJAPlayer3.Tx.Banapas_Load[1].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue <= 96 ? (int)((ctSaveLoaded.CurrentValue - 96) * 7.96875f) : 255; - TJAPlayer3.Tx.Banapas_Load[1].t2D描画(0, 0); + OpenTaiko.Tx.Banapas_Load[1].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue <= 96 ? (int)((ctSaveLoaded.CurrentValue - 96) * 7.96875f) : 255; + OpenTaiko.Tx.Banapas_Load[1].t2D描画(0, 0); - if (TJAPlayer3.Tx.Banapas_Load[2] != null) { - int step = TJAPlayer3.Tx.Banapas_Load[2].szTextureSize.Width / TJAPlayer3.Skin.Title_LoadingPinFrameCount; - int cycle = TJAPlayer3.Skin.Title_LoadingPinCycle; - int _stamp = (ctSaveLoaded.CurrentValue - 200) % (TJAPlayer3.Skin.Title_LoadingPinInstances * cycle); + if (OpenTaiko.Tx.Banapas_Load[2] != null) { + int step = OpenTaiko.Tx.Banapas_Load[2].szTextureSize.Width / OpenTaiko.Skin.Title_LoadingPinFrameCount; + int cycle = OpenTaiko.Skin.Title_LoadingPinCycle; + int _stamp = (ctSaveLoaded.CurrentValue - 200) % (OpenTaiko.Skin.Title_LoadingPinInstances * cycle); - for (int i = 0; i < TJAPlayer3.Skin.Title_LoadingPinInstances; i++) { - TJAPlayer3.Tx.Banapas_Load[2].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue <= 96 ? (int)((ctSaveLoaded.CurrentValue - 96) * 7.96875f) : 255; + for (int i = 0; i < OpenTaiko.Skin.Title_LoadingPinInstances; i++) { + OpenTaiko.Tx.Banapas_Load[2].Opacity = ctSaveLoaded.CurrentValue >= 872 ? 255 - (ctSaveLoaded.CurrentValue - 872) * 2 : ctSaveLoaded.CurrentValue <= 96 ? (int)((ctSaveLoaded.CurrentValue - 96) * 7.96875f) : 255; - TJAPlayer3.Tx.Banapas_Load[2].t2D拡大率考慮中央基準描画( - TJAPlayer3.Skin.Title_LoadingPinBase[0] + TJAPlayer3.Skin.Title_LoadingPinDiff[0] * i, - TJAPlayer3.Skin.Title_LoadingPinBase[1] + TJAPlayer3.Skin.Title_LoadingPinDiff[1] * i, + OpenTaiko.Tx.Banapas_Load[2].t2D拡大率考慮中央基準描画( + OpenTaiko.Skin.Title_LoadingPinBase[0] + OpenTaiko.Skin.Title_LoadingPinDiff[0] * i, + OpenTaiko.Skin.Title_LoadingPinBase[1] + OpenTaiko.Skin.Title_LoadingPinDiff[1] * i, new Rectangle(step * (_stamp >= i * cycle ? _stamp <= (i + 1) * cycle - ? (_stamp + i * cycle) / (cycle / TJAPlayer3.Skin.Title_LoadingPinFrameCount) + ? (_stamp + i * cycle) / (cycle / OpenTaiko.Skin.Title_LoadingPinFrameCount) : 0 : 0), 0, step, - TJAPlayer3.Tx.Banapas_Load[2].szTextureSize.Height)); + OpenTaiko.Tx.Banapas_Load[2].szTextureSize.Height)); } } } if (bSaveFailedToLoad) { - TJAPlayer3.Tx.Tile_Black.Opacity = this.ctSaveLoadingFailed.CurrentValue <= 1000 ? 128 : 128 - (this.ctSaveLoadingFailed.CurrentValue - 1000); + OpenTaiko.Tx.Tile_Black.Opacity = this.ctSaveLoadingFailed.CurrentValue <= 1000 ? 128 : 128 - (this.ctSaveLoadingFailed.CurrentValue - 1000); - for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++) - for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++) - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + for (int i = 0; i < OpenTaiko.Skin.Resolution[0] / OpenTaiko.Tx.Tile_Black.szTextureSize.Width + 1; i++) + for (int j = 0; j < OpenTaiko.Skin.Resolution[1] / OpenTaiko.Tx.Tile_Black.szTextureSize.Height + 1; j++) + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); - if (!TJAPlayer3.Skin.soundError.bPlayed) - TJAPlayer3.Skin.soundError.tPlay(); + if (!OpenTaiko.Skin.soundError.bPlayed) + OpenTaiko.Skin.soundError.tPlay(); int count = this.ctSaveLoadingFailed.CurrentValue; - TJAPlayer3.Tx.Banapas_Load_Failure[0].Opacity = count >= 872 ? 255 - (count - 872) * 2 : count * 2; - TJAPlayer3.Tx.Banapas_Load_Failure[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f; - TJAPlayer3.Tx.Banapas_Load_Failure[0].t2D描画(0, 0); + OpenTaiko.Tx.Banapas_Load_Failure[0].Opacity = count >= 872 ? 255 - (count - 872) * 2 : count * 2; + OpenTaiko.Tx.Banapas_Load_Failure[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f; + OpenTaiko.Tx.Banapas_Load_Failure[0].t2D描画(0, 0); if (ctSaveLoadingFailed.CurrentValue >= 1128) { bSaveFailedToLoad = false; - TJAPlayer3.Skin.soundError.bPlayed = false; + OpenTaiko.Skin.soundError.bPlayed = false; } } } else { if (bSaveIsLoading) { - TJAPlayer3.Tx.Tile_Black.Opacity = this.ctSaveLoaded.CurrentValue <= 2972 ? 128 : 128 - (this.ctSaveLoaded.CurrentValue - 2972); + OpenTaiko.Tx.Tile_Black.Opacity = this.ctSaveLoaded.CurrentValue <= 2972 ? 128 : 128 - (this.ctSaveLoaded.CurrentValue - 2972); - for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width + 1; i++) - for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height + 1; j++) - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + for (int i = 0; i < OpenTaiko.Skin.Resolution[0] / OpenTaiko.Tx.Tile_Black.szTextureSize.Width + 1; i++) + for (int j = 0; j < OpenTaiko.Skin.Resolution[1] / OpenTaiko.Tx.Tile_Black.szTextureSize.Height + 1; j++) + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); - if (!TJAPlayer3.Skin.SoundBanapas.bPlayed) - TJAPlayer3.Skin.SoundBanapas.tPlay(); + if (!OpenTaiko.Skin.SoundBanapas.bPlayed) + OpenTaiko.Skin.SoundBanapas.tPlay(); int count = this.ctSaveLoaded.CurrentValue - 1000; - TJAPlayer3.Tx.Banapas_Load_Clear[0].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2; - TJAPlayer3.Tx.Banapas_Load_Clear[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f; - TJAPlayer3.Tx.Banapas_Load_Clear[0].t2D描画(0, 0); + OpenTaiko.Tx.Banapas_Load_Clear[0].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2; + OpenTaiko.Tx.Banapas_Load_Clear[0].vcScaleRatio.Y = count <= 100 ? count * 0.01f : 1.0f; + OpenTaiko.Tx.Banapas_Load_Clear[0].t2D描画(0, 0); float anime = 0f; float scalex = 0f; @@ -453,10 +453,10 @@ namespace TJAPlayer3 { } } - TJAPlayer3.Tx.Banapas_Load_Clear[1].vcScaleRatio.X = 1.0f + scalex; - TJAPlayer3.Tx.Banapas_Load_Clear[1].vcScaleRatio.Y = 1.0f + scaley; - TJAPlayer3.Tx.Banapas_Load_Clear[1].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2; - TJAPlayer3.Tx.Banapas_Load_Clear[1].t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[0], TJAPlayer3.Skin.Title_Banapas_Load_Clear_Anime[1] - anime); + OpenTaiko.Tx.Banapas_Load_Clear[1].vcScaleRatio.X = 1.0f + scalex; + OpenTaiko.Tx.Banapas_Load_Clear[1].vcScaleRatio.Y = 1.0f + scaley; + OpenTaiko.Tx.Banapas_Load_Clear[1].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2; + OpenTaiko.Tx.Banapas_Load_Clear[1].t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Title_Banapas_Load_Clear_Anime[0], OpenTaiko.Skin.Title_Banapas_Load_Clear_Anime[1] - anime); if (ctSaveLoaded.CurrentValue >= 2000) { bプレイヤーエントリー = true; @@ -480,8 +480,8 @@ namespace TJAPlayer3 { int alpha = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctSaveLoaded.CurrentValue - 3400); - TJAPlayer3.Tx.Entry_Player[0].Opacity = alpha; - TJAPlayer3.Tx.Entry_Player[1].Opacity = alpha; + OpenTaiko.Tx.Entry_Player[0].Opacity = alpha; + OpenTaiko.Tx.Entry_Player[1].Opacity = alpha; /* var ___ttx = CMenuCharacter._getReferenceArray(0, CMenuCharacter.ECharacterAnimation.ENTRY) @@ -491,19 +491,19 @@ namespace TJAPlayer3 { //Chara_Entry[this.ctキャラエントリーループ.n現在の値].Opacity = alpha; - TJAPlayer3.Tx.Entry_Player[0].t2D描画(0, 0); + OpenTaiko.Tx.Entry_Player[0].t2D描画(0, 0); //Chara_Entry[this.ctキャラエントリーループ.n現在の値].t2D描画(485, 140); - int _actual = TJAPlayer3.GetActualPlayer(0); + int _actual = OpenTaiko.GetActualPlayer(0); - int _charaId = TJAPlayer3.SaveFileInstances[_actual].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[_actual].data.Character; - int chara_x = TJAPlayer3.Skin.Title_Entry_NamePlate[0] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2; - int chara_y = TJAPlayer3.Skin.Title_Entry_NamePlate[1]; + int chara_x = OpenTaiko.Skin.Title_Entry_NamePlate[0] + OpenTaiko.Tx.NamePlateBase.szTextureSize.Width / 2; + int chara_y = OpenTaiko.Skin.Title_Entry_NamePlate[1]; - int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[0]; - int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[0]; + int puchi_x = chara_x + OpenTaiko.Skin.Adjustments_MenuPuchichara_X[0]; + int puchi_y = chara_y + OpenTaiko.Skin.Adjustments_MenuPuchichara_Y[0]; CMenuCharacter.tMenuDisplayCharacter( 0, @@ -527,23 +527,23 @@ namespace TJAPlayer3 { //this.PuchiChara.On進行描画(485 + 100, 140 + 190, false, alpha); this.PuchiChara.On進行描画(puchi_x, puchi_y, false, alpha); - TJAPlayer3.Tx.Entry_Player[2].Opacity = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctSaveLoaded.CurrentValue - 3400) - (this.ctエントリーバー点滅.CurrentValue <= 255 ? this.ctエントリーバー点滅.CurrentValue : 255 - (this.ctエントリーバー点滅.CurrentValue - 255)); - TJAPlayer3.Tx.Entry_Player[2].t2D描画(TJAPlayer3.Skin.Title_Entry_Player_Select_X[n現在の選択行プレイヤーエントリー], TJAPlayer3.Skin.Title_Entry_Player_Select_Y[n現在の選択行プレイヤーエントリー], - new RectangleF(TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][0], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][1], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][2], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][3] + OpenTaiko.Tx.Entry_Player[2].Opacity = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctSaveLoaded.CurrentValue - 3400) - (this.ctエントリーバー点滅.CurrentValue <= 255 ? this.ctエントリーバー点滅.CurrentValue : 255 - (this.ctエントリーバー点滅.CurrentValue - 255)); + OpenTaiko.Tx.Entry_Player[2].t2D描画(OpenTaiko.Skin.Title_Entry_Player_Select_X[n現在の選択行プレイヤーエントリー], OpenTaiko.Skin.Title_Entry_Player_Select_Y[n現在の選択行プレイヤーエントリー], + new RectangleF(OpenTaiko.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][0], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][1], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][2], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[0][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][3] )); - TJAPlayer3.Tx.Entry_Player[2].Opacity = alpha; - TJAPlayer3.Tx.Entry_Player[2].t2D描画(TJAPlayer3.Skin.Title_Entry_Player_Select_X[n現在の選択行プレイヤーエントリー], TJAPlayer3.Skin.Title_Entry_Player_Select_Y[n現在の選択行プレイヤーエントリー], - new RectangleF(TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[1][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][0], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[1][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][1], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[1][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][2], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[1][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][3] + OpenTaiko.Tx.Entry_Player[2].Opacity = alpha; + OpenTaiko.Tx.Entry_Player[2].t2D描画(OpenTaiko.Skin.Title_Entry_Player_Select_X[n現在の選択行プレイヤーエントリー], OpenTaiko.Skin.Title_Entry_Player_Select_Y[n現在の選択行プレイヤーエントリー], + new RectangleF(OpenTaiko.Skin.Title_Entry_Player_Select_Rect[1][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][0], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[1][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][1], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[1][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][2], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[1][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][3] )); - TJAPlayer3.Tx.Entry_Player[1].t2D描画(0, 0); + OpenTaiko.Tx.Entry_Player[1].t2D描画(0, 0); #region [ 透明度 ] @@ -564,17 +564,17 @@ namespace TJAPlayer3 { #endregion - TJAPlayer3.Tx.Entry_Player[2].Opacity = Opacity; - TJAPlayer3.Tx.Entry_Player[2].t2D描画(TJAPlayer3.Skin.Title_Entry_Player_Select_X[n現在の選択行プレイヤーエントリー], TJAPlayer3.Skin.Title_Entry_Player_Select_Y[n現在の選択行プレイヤーエントリー], - new RectangleF(TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][0], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][1], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][2], - TJAPlayer3.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][3] + OpenTaiko.Tx.Entry_Player[2].Opacity = Opacity; + OpenTaiko.Tx.Entry_Player[2].t2D描画(OpenTaiko.Skin.Title_Entry_Player_Select_X[n現在の選択行プレイヤーエントリー], OpenTaiko.Skin.Title_Entry_Player_Select_Y[n現在の選択行プレイヤーエントリー], + new RectangleF(OpenTaiko.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][0], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][1], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][2], + OpenTaiko.Skin.Title_Entry_Player_Select_Rect[2][n現在の選択行プレイヤーエントリー == 1 ? 1 : 0][3] )); Opacity = ctエントリーバー決定点滅.CurrentValue >= 800 ? 255 - (ctエントリーバー決定点滅.CurrentValue - 800) : (this.ctSaveLoaded.CurrentValue - 3400); if (Opacity > 0) - TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.Title_Entry_NamePlate[0], TJAPlayer3.Skin.Title_Entry_NamePlate[1], 0, true, Opacity); + OpenTaiko.NamePlate.tNamePlateDraw(OpenTaiko.Skin.Title_Entry_NamePlate[0], OpenTaiko.Skin.Title_Entry_NamePlate[1], 0, true, Opacity); } #endregion @@ -586,7 +586,7 @@ namespace TJAPlayer3 { #region [ キャラ描画 ] - for (int player = 0; player < TJAPlayer3.ConfigIni.nPlayerCount; player++) { + for (int player = 0; player < OpenTaiko.ConfigIni.nPlayerCount; player++) { if (player >= 2) continue; float CharaX = 0f, CharaY = 0f; @@ -595,17 +595,17 @@ namespace TJAPlayer3 { CharaY = ((float)Math.Sin((90 + (ctキャライン.CurrentValue / 2)) * (Math.PI / 180)) * 150f); if (player == 1) CharaX *= -1; - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; //int chara_x = (int)(TJAPlayer3.Skin.Characters_Title_Normal_X[_charaId][player] + CharaX); //int chara_y = (int)(TJAPlayer3.Skin.Characters_Title_Normal_Y[_charaId][player] - CharaY); - int chara_x = (int)CharaX + TJAPlayer3.Skin.SongSelect_NamePlate_X[player] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2; - int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[player] - (int)CharaY; + int chara_x = (int)CharaX + OpenTaiko.Skin.SongSelect_NamePlate_X[player] + OpenTaiko.Tx.NamePlateBase.szTextureSize.Width / 2; + int chara_y = OpenTaiko.Skin.SongSelect_NamePlate_Y[player] - (int)CharaY; - int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[player]; - int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[player]; + int puchi_x = chara_x + OpenTaiko.Skin.Adjustments_MenuPuchichara_X[player]; + int puchi_y = chara_y + OpenTaiko.Skin.Adjustments_MenuPuchichara_Y[player]; //Entry_Chara_Normal[ctキャラループ.n現在の値].t2D描画(-200 + CharaX, 341 - CharaY); CMenuCharacter.tMenuDisplayCharacter(player, chara_x, chara_y, CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL); @@ -630,21 +630,21 @@ namespace TJAPlayer3 { #region [Disable visualy 1p specific buttons if 2p] - if ((_menu._1pRestricted == true && TJAPlayer3.ConfigIni.nPlayerCount > 1) + if ((_menu._1pRestricted == true && OpenTaiko.ConfigIni.nPlayerCount > 1) || _menu.implemented == false) { if (_bar != null) _bar.color4 = CConversion.ColorToColor4(Color.DarkGray); if (_chara != null) _chara.color4 = CConversion.ColorToColor4(Color.DarkGray); - TitleTextureKey.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true).color4 = CConversion.ColorToColor4(Color.DarkGray); - TitleTextureKey.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText).color4 = CConversion.ColorToColor4(Color.DarkGray); + TitleTextureKey.ResolveTitleTexture(_menu.ttkBoxText, OpenTaiko.Skin.Title_VerticalText, true).color4 = CConversion.ColorToColor4(Color.DarkGray); + TitleTextureKey.ResolveTitleTexture(_menu.ttkTitle, OpenTaiko.Skin.Title_VerticalText).color4 = CConversion.ColorToColor4(Color.DarkGray); } else { if (_bar != null) _bar.color4 = CConversion.ColorToColor4(Color.White); if (_chara != null) _chara.color4 = CConversion.ColorToColor4(Color.White); - TitleTextureKey.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true).color4 = CConversion.ColorToColor4(Color.White); - TitleTextureKey.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText).color4 = CConversion.ColorToColor4(Color.White); + TitleTextureKey.ResolveTitleTexture(_menu.ttkBoxText, OpenTaiko.Skin.Title_VerticalText, true).color4 = CConversion.ColorToColor4(Color.White); + TitleTextureKey.ResolveTitleTexture(_menu.ttkTitle, OpenTaiko.Skin.Title_VerticalText).color4 = CConversion.ColorToColor4(Color.White); } #endregion @@ -653,17 +653,17 @@ namespace TJAPlayer3 { if (usedMenusPos[i] == 1 && ctBarMove.CurrentValue >= 150) { float barAnimef = (ctBarMove.CurrentValue / 100.0f) - 1.5f; - float barAnime = TJAPlayer3.Skin.Title_ModeSelect_Bar_Move[0] + - (barAnimef * (TJAPlayer3.Skin.Title_ModeSelect_Bar_Move[1] - TJAPlayer3.Skin.Title_ModeSelect_Bar_Move[0])); + float barAnime = OpenTaiko.Skin.Title_ModeSelect_Bar_Move[0] + + (barAnimef * (OpenTaiko.Skin.Title_ModeSelect_Bar_Move[1] - OpenTaiko.Skin.Title_ModeSelect_Bar_Move[0])); - float barAnimeX = TJAPlayer3.Skin.Title_ModeSelect_Bar_Move_X[0] + - (barAnimef * (TJAPlayer3.Skin.Title_ModeSelect_Bar_Move_X[1] - TJAPlayer3.Skin.Title_ModeSelect_Bar_Move_X[0])); + float barAnimeX = OpenTaiko.Skin.Title_ModeSelect_Bar_Move_X[0] + + (barAnimef * (OpenTaiko.Skin.Title_ModeSelect_Bar_Move_X[1] - OpenTaiko.Skin.Title_ModeSelect_Bar_Move_X[0])); - float overlayAnime = TJAPlayer3.Skin.Title_ModeSelect_Overlay_Move[0] + - (barAnimef * (TJAPlayer3.Skin.Title_ModeSelect_Overlay_Move[1] - TJAPlayer3.Skin.Title_ModeSelect_Overlay_Move[0])); + float overlayAnime = OpenTaiko.Skin.Title_ModeSelect_Overlay_Move[0] + + (barAnimef * (OpenTaiko.Skin.Title_ModeSelect_Overlay_Move[1] - OpenTaiko.Skin.Title_ModeSelect_Overlay_Move[0])); - float overlayAnimeX = TJAPlayer3.Skin.Title_ModeSelect_Overlay_Move_X[0] + - (barAnimef * (TJAPlayer3.Skin.Title_ModeSelect_Overlay_Move_X[1] - TJAPlayer3.Skin.Title_ModeSelect_Overlay_Move_X[0])); + float overlayAnimeX = OpenTaiko.Skin.Title_ModeSelect_Overlay_Move_X[0] + + (barAnimef * (OpenTaiko.Skin.Title_ModeSelect_Overlay_Move_X[1] - OpenTaiko.Skin.Title_ModeSelect_Overlay_Move_X[0])); @@ -674,61 +674,61 @@ namespace TJAPlayer3 { _bar.Opacity = 255; _bar.vcScaleRatio.X = 1.0f; _bar.vcScaleRatio.Y = 1.0f; - _bar.t2D描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_X[0] - (TJAPlayer3.Skin.Title_VerticalBar ? barAnimeX : 0), - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Y[0] - (TJAPlayer3.Skin.Title_VerticalBar ? 0 : barAnime), - new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[0][0], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[0][1], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[0][2], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[0][3])); - _bar.t2D描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_X[1] + (TJAPlayer3.Skin.Title_VerticalBar ? barAnimeX : 0), - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Y[1] + (TJAPlayer3.Skin.Title_VerticalBar ? 0 : barAnime), - new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[1][0], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[1][1], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[1][2], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[1][3])); + _bar.t2D描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Center_X[0] - (OpenTaiko.Skin.Title_VerticalBar ? barAnimeX : 0), + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Y[0] - (OpenTaiko.Skin.Title_VerticalBar ? 0 : barAnime), + new Rectangle(OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[0][0], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[0][1], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[0][2], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[0][3])); + _bar.t2D描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Center_X[1] + (OpenTaiko.Skin.Title_VerticalBar ? barAnimeX : 0), + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Y[1] + (OpenTaiko.Skin.Title_VerticalBar ? 0 : barAnime), + new Rectangle(OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[1][0], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[1][1], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[1][2], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[1][3])); - if (TJAPlayer3.Skin.Title_VerticalBar) { - _bar.vcScaleRatio.X = (barAnimeX / TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][2]) * 2.0f; + if (OpenTaiko.Skin.Title_VerticalBar) { + _bar.vcScaleRatio.X = (barAnimeX / OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[2][2]) * 2.0f; } else { - _bar.vcScaleRatio.Y = (barAnime / TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][3]) * 2.0f; + _bar.vcScaleRatio.Y = (barAnime / OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[2][3]) * 2.0f; } - _bar.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_X[2], TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Y[2], - new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][0], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][1], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][2], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Rect[2][3])); + _bar.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Center_X[2], OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Y[2], + new Rectangle(OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[2][0], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[2][1], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[2][2], + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Rect[2][3])); } - if (TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount] != null) { - CTexture _overlap = TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount]; + if (OpenTaiko.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount] != null) { + CTexture _overlap = OpenTaiko.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount]; _overlap.vcScaleRatio.X = 1.0f; _overlap.vcScaleRatio.Y = 1.0f; - _overlap.t2D描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_X[0], TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Y[0], - new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][0], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][1], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][2], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][3])); - _overlap.t2D描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_X[1] + (TJAPlayer3.Skin.Title_VerticalBar ? overlayAnimeX : 0), - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Y[1] + (TJAPlayer3.Skin.Title_VerticalBar ? 0 : overlayAnime), - new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[1][0], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[1][1], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[1][2], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[1][3])); + _overlap.t2D描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_X[0], OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Y[0], + new Rectangle(OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][0], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][1], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][2], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[0][3])); + _overlap.t2D描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_X[1] + (OpenTaiko.Skin.Title_VerticalBar ? overlayAnimeX : 0), + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Y[1] + (OpenTaiko.Skin.Title_VerticalBar ? 0 : overlayAnime), + new Rectangle(OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[1][0], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[1][1], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[1][2], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[1][3])); - if (TJAPlayer3.Skin.Title_VerticalBar) { - _overlap.vcScaleRatio.X = (overlayAnimeX / TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][2]); + if (OpenTaiko.Skin.Title_VerticalBar) { + _overlap.vcScaleRatio.X = (overlayAnimeX / OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][2]); } else { - _overlap.vcScaleRatio.Y = (overlayAnime / TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][3]); + _overlap.vcScaleRatio.Y = (overlayAnime / OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][3]); } - _overlap.t2D拡大率考慮上中央基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_X[2], TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Y[2], - new Rectangle(TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][0], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][1], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][2], - TJAPlayer3.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][3])); + _overlap.t2D拡大率考慮上中央基準描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_X[2], OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Y[2], + new Rectangle(OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][0], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][1], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][2], + OpenTaiko.Skin.Title_ModeSelect_Bar_Overlay_Rect[2][3])); } @@ -740,24 +740,24 @@ namespace TJAPlayer3 { anime = BarAnimeCount * 3.333333333f; else anime = 1.50f - (BarAnimeCount - 0.45f) * 0.61764705f; - anime *= TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_Move; + anime *= OpenTaiko.Skin.Title_ModeSelect_Bar_Chara_Move; if (_chara != null) { _chara.Opacity = (int)(BarAnimeCount * 255f) + (int)(barAnimef * 2.5f); - _chara.t2D中心基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_X[0] - anime, TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_Y[0], + _chara.t2D中心基準描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Chara_X[0] - anime, OpenTaiko.Skin.Title_ModeSelect_Bar_Chara_Y[0], new Rectangle(0, 0, _chara.szTextureSize.Width / 2, _chara.szTextureSize.Height)); - _chara.t2D中心基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_X[1] + anime, TJAPlayer3.Skin.Title_ModeSelect_Bar_Chara_Y[1], + _chara.t2D中心基準描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Chara_X[1] + anime, OpenTaiko.Skin.Title_ModeSelect_Bar_Chara_Y[1], new Rectangle(_chara.szTextureSize.Width / 2, 0, _chara.szTextureSize.Width / 2, _chara.szTextureSize.Height)); } - TitleTextureKey.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText)?.t2D中心基準描画( - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title[0] + (TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title_Move_X * BarAnimeCount), - TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title[1] - (TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_Title_Move * BarAnimeCount)); + TitleTextureKey.ResolveTitleTexture(_menu.ttkTitle, OpenTaiko.Skin.Title_VerticalText)?.t2D中心基準描画( + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Title[0] + (OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Title_Move_X * BarAnimeCount), + OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Title[1] - (OpenTaiko.Skin.Title_ModeSelect_Bar_Center_Title_Move * BarAnimeCount)); - CTexture currentText = TitleTextureKey.ResolveTitleTexture(_menu.ttkBoxText, TJAPlayer3.Skin.Title_VerticalText, true); + CTexture currentText = TitleTextureKey.ResolveTitleTexture(_menu.ttkBoxText, OpenTaiko.Skin.Title_VerticalText, true); if (currentText != null) { currentText.Opacity = (int)(BarAnimeCount * 255f); - currentText?.t2D中心基準描画(TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_BoxText[0], TJAPlayer3.Skin.Title_ModeSelect_Bar_Center_BoxText[1]); + currentText?.t2D中心基準描画(OpenTaiko.Skin.Title_ModeSelect_Bar_Center_BoxText[0], OpenTaiko.Skin.Title_ModeSelect_Bar_Center_BoxText[1]); } } else { @@ -793,8 +793,8 @@ namespace TJAPlayer3 { _bar.t2D描画(pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY); } - if (TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount] != null) { - CTexture _overlap = TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount]; + if (OpenTaiko.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount] != null) { + CTexture _overlap = OpenTaiko.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount]; _overlap.vcScaleRatio.X = 1.0f; _overlap.vcScaleRatio.Y = 1.0f; @@ -803,15 +803,15 @@ namespace TJAPlayer3 { - TitleTextureKey.ResolveTitleTexture(_menu.ttkTitle, TJAPlayer3.Skin.Title_VerticalText)?.t2D中心基準描画(pos.X + BarAnimeX - BarMoveX + TJAPlayer3.Skin.Title_ModeSelect_Title_Offset[0], pos.Y + BarAnimeY - BarMoveY + TJAPlayer3.Skin.Title_ModeSelect_Title_Offset[1]); + TitleTextureKey.ResolveTitleTexture(_menu.ttkTitle, OpenTaiko.Skin.Title_VerticalText)?.t2D中心基準描画(pos.X + BarAnimeX - BarMoveX + OpenTaiko.Skin.Title_ModeSelect_Title_Offset[0], pos.Y + BarAnimeY - BarMoveY + OpenTaiko.Skin.Title_ModeSelect_Title_Offset[1]); } } } - for (int player = 0; player < TJAPlayer3.ConfigIni.nPlayerCount; player++) { + for (int player = 0; player < OpenTaiko.ConfigIni.nPlayerCount; player++) { if (player >= 2) continue; - TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[player], TJAPlayer3.Skin.SongSelect_NamePlate_Y[player], player, false, 255); + OpenTaiko.NamePlate.tNamePlateDraw(OpenTaiko.Skin.SongSelect_NamePlate_X[player], OpenTaiko.Skin.SongSelect_NamePlate_Y[player], player, false, 255); } } @@ -824,11 +824,11 @@ namespace TJAPlayer3 { //string strVersion = "KTT:J:A:I:2017072200"; string strCreator = "https://github.com/0AuBSQ/OpenTaiko"; AssemblyName asmApp = Assembly.GetExecutingAssembly().GetName(); - TJAPlayer3.actTextConsole.tPrint(4, 44, CTextConsole.EFontType.White, "DEBUG BUILD"); - TJAPlayer3.actTextConsole.tPrint(4, 4, CTextConsole.EFontType.White, asmApp.Name + " Ver." + TJAPlayer3.VERSION + " (" + strCreator + ")"); - TJAPlayer3.actTextConsole.tPrint(4, 24, CTextConsole.EFontType.White, "Skin:" + TJAPlayer3.Skin.Skin_Name + " Ver." + TJAPlayer3.Skin.Skin_Version + " (" + TJAPlayer3.Skin.Skin_Creator + ")"); + OpenTaiko.actTextConsole.tPrint(4, 44, CTextConsole.EFontType.White, "DEBUG BUILD"); + OpenTaiko.actTextConsole.tPrint(4, 4, CTextConsole.EFontType.White, asmApp.Name + " Ver." + OpenTaiko.VERSION + " (" + strCreator + ")"); + OpenTaiko.actTextConsole.tPrint(4, 24, CTextConsole.EFontType.White, "Skin:" + OpenTaiko.Skin.Skin_Name + " Ver." + OpenTaiko.Skin.Skin_Version + " (" + OpenTaiko.Skin.Skin_Creator + ")"); //CDTXMania.act文字コンソール.tPrint(4, 24, C文字コンソール.Eフォント種別.白, strSubTitle); - TJAPlayer3.actTextConsole.tPrint(4, (TJAPlayer3.Skin.Resolution[1] - 24), CTextConsole.EFontType.White, "TJAPlayer3 forked TJAPlayer2 forPC(kairera0467)"); + OpenTaiko.actTextConsole.tPrint(4, (OpenTaiko.Skin.Resolution[1] - 24), CTextConsole.EFontType.White, "TJAPlayer3 forked TJAPlayer2 forPC(kairera0467)"); #endif //TJAPlayer3.actTextConsole.tPrint(4, 64, CTextConsole.EFontType.White, CScoreIni_Importer.Status); @@ -844,8 +844,8 @@ namespace TJAPlayer3 { case CStage.EPhase.Common_FADEOUT: if (this.actFO.Draw() == 0) { - TJAPlayer3.Skin.bgmタイトル.tStop(); - TJAPlayer3.Skin.bgmタイトルイン.tStop(); + OpenTaiko.Skin.bgmタイトル.tStop(); + OpenTaiko.Skin.bgmタイトルイン.tStop(); break; } base.ePhaseID = CStage.EPhase.Common_EXIT; @@ -899,34 +899,34 @@ namespace TJAPlayer3 { bプレイヤーエントリー決定 = true; bキャラカウンター初期化 = true; - this.ctSaveLoading.Start(0, 600, 1, TJAPlayer3.Timer); + this.ctSaveLoading.Start(0, 600, 1, OpenTaiko.Timer); this.ctSaveLoading.CurrentValue = (int)this.ctSaveLoading.EndValue; - ctエントリーバー決定点滅.Start(0, 1055, 1, TJAPlayer3.Timer); + ctエントリーバー決定点滅.Start(0, 1055, 1, OpenTaiko.Timer); ctエントリーバー決定点滅.CurrentValue = (int)ctエントリーバー決定点滅.CurrentValue; - ctSaveLoaded.Start(0, 3655, 1, TJAPlayer3.Timer); + ctSaveLoaded.Start(0, 3655, 1, OpenTaiko.Timer); ctSaveLoaded.CurrentValue = (int)ctSaveLoaded.EndValue; - ctキャライン.Start(0, 180, 2, TJAPlayer3.Timer); - ctBarAnimeIn.Start(0, 1295, 1, TJAPlayer3.Timer); + ctキャライン.Start(0, 180, 2, OpenTaiko.Timer); + ctBarAnimeIn.Start(0, 1295, 1, OpenTaiko.Timer); ctコインイン待機.CurrentValue = (int)ctコインイン待機.EndValue; ctエントリーバー点滅.CurrentValue = (int)ctエントリーバー点滅.EndValue; - TJAPlayer3.Skin.SoundBanapas.bPlayed = true; + OpenTaiko.Skin.SoundBanapas.bPlayed = true; //TJAPlayer3.Skin.soundsanka.bPlayed = true; - if (TJAPlayer3.Skin.voiceTitleSanka[TJAPlayer3.SaveFile] != null) - TJAPlayer3.Skin.voiceTitleSanka[TJAPlayer3.SaveFile].bPlayed = true; + if (OpenTaiko.Skin.voiceTitleSanka[OpenTaiko.SaveFile] != null) + OpenTaiko.Skin.voiceTitleSanka[OpenTaiko.SaveFile].bPlayed = true; } } // Restore the title screen to the "Taiko hit start" screen private void UnloadSaveFile() { this.ctSaveLoading = new CCounter(); - this.ctコインイン待機 = new CCounter(0, 2000, 1, TJAPlayer3.Timer); + this.ctコインイン待機 = new CCounter(0, 2000, 1, OpenTaiko.Timer); this.ctSaveLoaded = new CCounter(); this.ctSaveLoadingFailed = new CCounter(); - this.ctエントリーバー点滅 = new CCounter(0, 510, 2, TJAPlayer3.Timer); + this.ctエントリーバー点滅 = new CCounter(0, 510, 2, OpenTaiko.Timer); this.ctエントリーバー決定点滅 = new CCounter(); //this.ctキャラエントリーループ = new CCounter(); @@ -948,7 +948,7 @@ namespace TJAPlayer3 { this.bキャラカウンター初期化 = false; this.n現在の選択行プレイヤーエントリー = 1; - TJAPlayer3.Skin.SoundBanapas.bPlayed = false; + OpenTaiko.Skin.SoundBanapas.bPlayed = false; } private static bool bSaveFileLoaded = false; @@ -1002,14 +1002,14 @@ namespace TJAPlayer3 { int posY; if (CurrentPos >= 0 && CurrentPos < 3) { - posX = TJAPlayer3.Skin.Title_ModeSelect_Bar_X[CurrentPos]; - posY = TJAPlayer3.Skin.Title_ModeSelect_Bar_Y[CurrentPos]; + posX = OpenTaiko.Skin.Title_ModeSelect_Bar_X[CurrentPos]; + posY = OpenTaiko.Skin.Title_ModeSelect_Bar_Y[CurrentPos]; } else if (CurrentPos < 0) { - posX = TJAPlayer3.Skin.Title_ModeSelect_Bar_X[0] + CurrentPos * TJAPlayer3.Skin.Title_ModeSelect_Bar_Offset[0]; - posY = TJAPlayer3.Skin.Title_ModeSelect_Bar_Y[0] + CurrentPos * TJAPlayer3.Skin.Title_ModeSelect_Bar_Offset[1]; + posX = OpenTaiko.Skin.Title_ModeSelect_Bar_X[0] + CurrentPos * OpenTaiko.Skin.Title_ModeSelect_Bar_Offset[0]; + posY = OpenTaiko.Skin.Title_ModeSelect_Bar_Y[0] + CurrentPos * OpenTaiko.Skin.Title_ModeSelect_Bar_Offset[1]; } else { - posX = TJAPlayer3.Skin.Title_ModeSelect_Bar_X[2] + (CurrentPos - 2) * TJAPlayer3.Skin.Title_ModeSelect_Bar_Offset[0]; - posY = TJAPlayer3.Skin.Title_ModeSelect_Bar_Y[2] + (CurrentPos - 2) * TJAPlayer3.Skin.Title_ModeSelect_Bar_Offset[1]; + posX = OpenTaiko.Skin.Title_ModeSelect_Bar_X[2] + (CurrentPos - 2) * OpenTaiko.Skin.Title_ModeSelect_Bar_Offset[0]; + posY = OpenTaiko.Skin.Title_ModeSelect_Bar_Y[2] + (CurrentPos - 2) * OpenTaiko.Skin.Title_ModeSelect_Bar_Offset[1]; } return new Point(posX, posY); diff --git a/OpenTaiko/src/Stages/04.Config/CActCalibrationMode.cs b/OpenTaiko/src/Stages/04.Config/CActCalibrationMode.cs index e83b707b..67b5ca20 100644 --- a/OpenTaiko/src/Stages/04.Config/CActCalibrationMode.cs +++ b/OpenTaiko/src/Stages/04.Config/CActCalibrationMode.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActCalibrationMode : CActivity { public CActCalibrationMode() { } @@ -22,7 +22,7 @@ namespace TJAPlayer3 { } public void Start() { - CalibrateTick = new CCounter(0, 500, 1, TJAPlayer3.Timer); + CalibrateTick = new CCounter(0, 500, 1, OpenTaiko.Timer); UpdateText(); } @@ -39,29 +39,29 @@ namespace TJAPlayer3 { CalibrateTick.Tick(); - bool decide = TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed) || - TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return); + bool decide = OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed) || + OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return); if (CalibrateTick.IsEnded) { - TJAPlayer3.Skin.calibrationTick.tPlay(); - CalibrateTick.Start(0, 500, 1, TJAPlayer3.Timer); + OpenTaiko.Skin.calibrationTick.tPlay(); + CalibrateTick.Start(0, 500, 1, OpenTaiko.Timer); } - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue) || - TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue) || + OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { buttonIndex = Math.Max(buttonIndex - 1, 0); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - } else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue) || - TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); + } else if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue) || + OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { buttonIndex = Math.Min(buttonIndex + 1, 2); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } else if (buttonIndex == 0 && decide) // Cancel { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); Stop(); } else if (buttonIndex == 1 && decide) // Hit! { @@ -70,15 +70,15 @@ namespace TJAPlayer3 { UpdateText(); } else if (buttonIndex == 2 && decide) // Save { - TJAPlayer3.ConfigIni.nGlobalOffsetMs = GetMedianOffset(); - TJAPlayer3.stageコンフィグ.actList.iGlobalOffsetMs.n現在の値 = GetMedianOffset(); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.ConfigIni.nGlobalOffsetMs = GetMedianOffset(); + OpenTaiko.stageコンフィグ.actList.iGlobalOffsetMs.n現在の値 = GetMedianOffset(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); Stop(); return 0; - } else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.Cancel) || - TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + } else if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.Cancel) || + OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) { + OpenTaiko.Skin.soundCancelSFX.tPlay(); Stop(); return 0; @@ -91,57 +91,57 @@ namespace TJAPlayer3 { if (IsDeActivated || CalibrateTick.IsStoped) return 1; - if (TJAPlayer3.Tx.Tile_Black != null) { - TJAPlayer3.Tx.Tile_Black.Opacity = 128; - for (int i = 0; i <= SampleFramework.GameWindowSize.Width; i += TJAPlayer3.Tx.Tile_Black.szTextureSize.Width) { - for (int j = 0; j <= SampleFramework.GameWindowSize.Height; j += TJAPlayer3.Tx.Tile_Black.szTextureSize.Height) { - TJAPlayer3.Tx.Tile_Black.t2D描画(i, j); + if (OpenTaiko.Tx.Tile_Black != null) { + OpenTaiko.Tx.Tile_Black.Opacity = 128; + for (int i = 0; i <= SampleFramework.GameWindowSize.Width; i += OpenTaiko.Tx.Tile_Black.szTextureSize.Width) { + for (int j = 0; j <= SampleFramework.GameWindowSize.Height; j += OpenTaiko.Tx.Tile_Black.szTextureSize.Height) { + OpenTaiko.Tx.Tile_Black.t2D描画(i, j); } } - TJAPlayer3.Tx.Tile_Black.Opacity = 255; + OpenTaiko.Tx.Tile_Black.Opacity = 255; } - TJAPlayer3.Tx.CalibrateBG?.t2D描画(TJAPlayer3.Skin.Config_Calibration_Highlights[buttonIndex].X, - TJAPlayer3.Skin.Config_Calibration_Highlights[buttonIndex].Y, - TJAPlayer3.Skin.Config_Calibration_Highlights[buttonIndex]); - TJAPlayer3.Tx.CalibrateFG?.t2D描画(0, 0); + OpenTaiko.Tx.CalibrateBG?.t2D描画(OpenTaiko.Skin.Config_Calibration_Highlights[buttonIndex].X, + OpenTaiko.Skin.Config_Calibration_Highlights[buttonIndex].Y, + OpenTaiko.Skin.Config_Calibration_Highlights[buttonIndex]); + OpenTaiko.Tx.CalibrateFG?.t2D描画(0, 0); - TJAPlayer3.Tx.Lane_Background_Main?.t2D描画(TJAPlayer3.Skin.Game_Lane_X[0], TJAPlayer3.Skin.Game_Lane_Y[0]); - TJAPlayer3.Tx.Lane_Background_Sub?.t2D描画(TJAPlayer3.Skin.Game_Lane_Sub_X[0], TJAPlayer3.Skin.Game_Lane_Sub_Y[0]); - TJAPlayer3.Tx.Taiko_Frame[2]?.t2D描画(TJAPlayer3.Skin.Game_Taiko_Frame_X[0], TJAPlayer3.Skin.Game_Taiko_Frame_Y[0]); + OpenTaiko.Tx.Lane_Background_Main?.t2D描画(OpenTaiko.Skin.Game_Lane_X[0], OpenTaiko.Skin.Game_Lane_Y[0]); + OpenTaiko.Tx.Lane_Background_Sub?.t2D描画(OpenTaiko.Skin.Game_Lane_Sub_X[0], OpenTaiko.Skin.Game_Lane_Sub_Y[0]); + OpenTaiko.Tx.Taiko_Frame[2]?.t2D描画(OpenTaiko.Skin.Game_Taiko_Frame_X[0], OpenTaiko.Skin.Game_Taiko_Frame_Y[0]); - TJAPlayer3.Tx.Notes[0]?.t2D描画(TJAPlayer3.Skin.nScrollFieldX[0], TJAPlayer3.Skin.nScrollFieldY[0], new RectangleF(0, 0, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Notes[0]?.t2D描画(OpenTaiko.Skin.nScrollFieldX[0], OpenTaiko.Skin.nScrollFieldY[0], new RectangleF(0, 0, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); - for (int x = TJAPlayer3.Skin.nScrollFieldX[0]; x < SampleFramework.GameWindowSize.Width + 500; x += 500) { - TJAPlayer3.Tx.Bar?.t2D描画( - (x - CalibrateTick.CurrentValue) + ((TJAPlayer3.Skin.Game_Notes_Size[0] - TJAPlayer3.Tx.Bar.szTextureSize.Width) / 2), - TJAPlayer3.Skin.nScrollFieldY[0], - new Rectangle(0, 0, TJAPlayer3.Tx.Bar.szTextureSize.Width, TJAPlayer3.Skin.Game_Notes_Size[1]) + for (int x = OpenTaiko.Skin.nScrollFieldX[0]; x < SampleFramework.GameWindowSize.Width + 500; x += 500) { + OpenTaiko.Tx.Bar?.t2D描画( + (x - CalibrateTick.CurrentValue) + ((OpenTaiko.Skin.Game_Notes_Size[0] - OpenTaiko.Tx.Bar.szTextureSize.Width) / 2), + OpenTaiko.Skin.nScrollFieldY[0], + new Rectangle(0, 0, OpenTaiko.Tx.Bar.szTextureSize.Width, OpenTaiko.Skin.Game_Notes_Size[1]) ); - TJAPlayer3.Tx.Notes[0]?.t2D描画( + OpenTaiko.Tx.Notes[0]?.t2D描画( (x - CalibrateTick.CurrentValue), - TJAPlayer3.Skin.nScrollFieldY[0], - new Rectangle(TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1], TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1]) + OpenTaiko.Skin.nScrollFieldY[0], + new Rectangle(OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1], OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1]) ); } - if (TJAPlayer3.P1IsBlue()) - TJAPlayer3.Tx.Taiko_Background[4]?.t2D描画(TJAPlayer3.Skin.Game_Taiko_Background_X[0], TJAPlayer3.Skin.Game_Taiko_Background_Y[0]); + if (OpenTaiko.P1IsBlue()) + OpenTaiko.Tx.Taiko_Background[4]?.t2D描画(OpenTaiko.Skin.Game_Taiko_Background_X[0], OpenTaiko.Skin.Game_Taiko_Background_Y[0]); else - TJAPlayer3.Tx.Taiko_Background[0]?.t2D描画(TJAPlayer3.Skin.Game_Taiko_Background_X[0], TJAPlayer3.Skin.Game_Taiko_Background_Y[0]); + OpenTaiko.Tx.Taiko_Background[0]?.t2D描画(OpenTaiko.Skin.Game_Taiko_Background_X[0], OpenTaiko.Skin.Game_Taiko_Background_Y[0]); #region Calibration Info - offsettext?.t2D描画(TJAPlayer3.Skin.Config_Calibration_OffsetText[0] - offsettext.szTextureSize.Width, TJAPlayer3.Skin.Config_Calibration_OffsetText[1]); + offsettext?.t2D描画(OpenTaiko.Skin.Config_Calibration_OffsetText[0] - offsettext.szTextureSize.Width, OpenTaiko.Skin.Config_Calibration_OffsetText[1]); - TJAPlayer3.actTextConsole.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1], CTextConsole.EFontType.Cyan, + OpenTaiko.actTextConsole.tPrint(OpenTaiko.Skin.Config_Calibration_InfoText[0], OpenTaiko.Skin.Config_Calibration_InfoText[1], CTextConsole.EFontType.Cyan, "MEDIAN OFFSET : " + GetMedianOffset() + "ms\n"); - TJAPlayer3.actTextConsole.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1] + TJAPlayer3.actTextConsole.nFontHeight, CTextConsole.EFontType.White, + OpenTaiko.actTextConsole.tPrint(OpenTaiko.Skin.Config_Calibration_InfoText[0], OpenTaiko.Skin.Config_Calibration_InfoText[1] + OpenTaiko.actTextConsole.nFontHeight, CTextConsole.EFontType.White, "MIN OFFSET : " + GetLowestOffset() + "ms\n" + "MAX OFFSET : " + GetHighestOffset() + "ms\n" + "LAST OFFSET : " + LastOffset + "ms\n" + "OFFSET COUNT : " + (Offsets != null ? Offsets.Count : 0)); - TJAPlayer3.actTextConsole.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1] + (TJAPlayer3.actTextConsole.nFontHeight * 5), CTextConsole.EFontType.White, + OpenTaiko.actTextConsole.tPrint(OpenTaiko.Skin.Config_Calibration_InfoText[0], OpenTaiko.Skin.Config_Calibration_InfoText[1] + (OpenTaiko.actTextConsole.nFontHeight * 5), CTextConsole.EFontType.White, "CURRENT OFFSET: " + CurrentOffset() + "ms"); #endregion diff --git a/OpenTaiko/src/Stages/04.Config/CActConfigKeyAssign.cs b/OpenTaiko/src/Stages/04.Config/CActConfigKeyAssign.cs index 93db6c85..6c64050e 100644 --- a/OpenTaiko/src/Stages/04.Config/CActConfigKeyAssign.cs +++ b/OpenTaiko/src/Stages/04.Config/CActConfigKeyAssign.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActConfigKeyAssign : CActivity { // プロパティ @@ -20,27 +20,27 @@ namespace TJAPlayer3 { this.pad = pad; this.strパッド名 = strパッド名; for (int i = 0; i < 0x10; i++) { - this.structReset用KeyAssign[i].入力デバイス = TJAPlayer3.ConfigIni.KeyAssign[(int)part][(int)pad][i].入力デバイス; - this.structReset用KeyAssign[i].ID = TJAPlayer3.ConfigIni.KeyAssign[(int)part][(int)pad][i].ID; - this.structReset用KeyAssign[i].コード = TJAPlayer3.ConfigIni.KeyAssign[(int)part][(int)pad][i].コード; + this.structReset用KeyAssign[i].入力デバイス = OpenTaiko.ConfigIni.KeyAssign[(int)part][(int)pad][i].入力デバイス; + this.structReset用KeyAssign[i].ID = OpenTaiko.ConfigIni.KeyAssign[(int)part][(int)pad][i].ID; + this.structReset用KeyAssign[i].コード = OpenTaiko.ConfigIni.KeyAssign[(int)part][(int)pad][i].コード; } } } public void tEnter押下() { if (!this.bキー入力待ち) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); switch (this.n現在の選択行) { case 0x10: for (int i = 0; i < 0x10; i++) { - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][i].入力デバイス = this.structReset用KeyAssign[i].入力デバイス; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][i].ID = this.structReset用KeyAssign[i].ID; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][i].コード = this.structReset用KeyAssign[i].コード; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][i].入力デバイス = this.structReset用KeyAssign[i].入力デバイス; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][i].ID = this.structReset用KeyAssign[i].ID; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][i].コード = this.structReset用KeyAssign[i].コード; } return; case 0x11: - TJAPlayer3.stageコンフィグ.tアサイン完了通知(); + OpenTaiko.stageコンフィグ.tアサイン完了通知(); return; } this.bキー入力待ち = true; @@ -48,13 +48,13 @@ namespace TJAPlayer3 { } public void t次に移動() { if (!this.bキー入力待ち) { - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); this.n現在の選択行 = (this.n現在の選択行 + 1) % 0x12; } } public void t前に移動() { if (!this.bキー入力待ち) { - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); this.n現在の選択行 = ((this.n現在の選択行 - 1) + 0x12) % 0x12; } } @@ -89,44 +89,44 @@ namespace TJAPlayer3 { public override int Draw() { if (!base.IsDeActivated) { if (this.bキー入力待ち) { - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) { + OpenTaiko.Skin.soundCancelSFX.tPlay(); this.bキー入力待ち = false; - TJAPlayer3.InputManager.Polling(false); + OpenTaiko.InputManager.Polling(false); } else if ((this.tキーチェックとアサイン_Keyboard() || this.tキーチェックとアサイン_MidiIn()) || (this.tキーチェックとアサイン_Joypad() || tキーチェックとアサイン_Gamepad() || this.tキーチェックとアサイン_Mouse())) { this.bキー入力待ち = false; - TJAPlayer3.InputManager.Polling(false); + OpenTaiko.InputManager.Polling(false); } - } else if ((TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Delete) && (this.n現在の選択行 >= 0)) && (this.n現在の選択行 <= 15)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Unknown; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = 0; + } else if ((OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Delete) && (this.n現在の選択行 >= 0)) && (this.n現在の選択行 <= 15)) { + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Unknown; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = 0; } - if (TJAPlayer3.Tx.Menu_Highlight != null) { - int num = TJAPlayer3.Skin.Config_KeyAssign_Move; - int num2 = TJAPlayer3.Skin.Config_KeyAssign_Menu_Highlight[0]; - int num3 = TJAPlayer3.Skin.Config_KeyAssign_Menu_Highlight[1] + (num * (this.n現在の選択行 + 1)); + if (OpenTaiko.Tx.Menu_Highlight != null) { + int num = OpenTaiko.Skin.Config_KeyAssign_Move; + int num2 = OpenTaiko.Skin.Config_KeyAssign_Menu_Highlight[0]; + int num3 = OpenTaiko.Skin.Config_KeyAssign_Menu_Highlight[1] + (num * (this.n現在の選択行 + 1)); //TJAPlayer3.Tx.Menu_Highlight.t2D描画( num2, num3, new Rectangle( 0, 0, 0x10, 0x20 ) ); float scale = 0.55f; for (int j = 0; j < 14; j++) { - TJAPlayer3.Tx.Menu_Highlight.vcScaleRatio.X = scale; - TJAPlayer3.Tx.Menu_Highlight.vcScaleRatio.Y = scale; + OpenTaiko.Tx.Menu_Highlight.vcScaleRatio.X = scale; + OpenTaiko.Tx.Menu_Highlight.vcScaleRatio.Y = scale; - TJAPlayer3.Tx.Menu_Highlight.t2D描画(num2, num3); - num2 += (int)(TJAPlayer3.Tx.Menu_Highlight.szTextureSize.Width * scale); + OpenTaiko.Tx.Menu_Highlight.t2D描画(num2, num3); + num2 += (int)(OpenTaiko.Tx.Menu_Highlight.szTextureSize.Width * scale); - TJAPlayer3.Tx.Menu_Highlight.vcScaleRatio.X = 1; - TJAPlayer3.Tx.Menu_Highlight.vcScaleRatio.Y = 1; + OpenTaiko.Tx.Menu_Highlight.vcScaleRatio.X = 1; + OpenTaiko.Tx.Menu_Highlight.vcScaleRatio.Y = 1; } //TJAPlayer3.Tx.Menu_Highlight.t2D描画( num2, num3, new Rectangle( 0x10, 0, 0x10, 0x20 ) ); } - int num5 = TJAPlayer3.Skin.Config_KeyAssign_Move; - int x = TJAPlayer3.Skin.Config_KeyAssign_Font[0]; - int y = TJAPlayer3.Skin.Config_KeyAssign_Font[1]; - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x, y, this.strパッド名, false, 0.75f); + int num5 = OpenTaiko.Skin.Config_KeyAssign_Move; + int x = OpenTaiko.Skin.Config_KeyAssign_Font[0]; + int y = OpenTaiko.Skin.Config_KeyAssign_Font[1]; + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x, y, this.strパッド名, false, 0.75f); y += num5; - CConfigIni.CKeyAssign.STKEYASSIGN[] stkeyassignArray = TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad]; + CConfigIni.CKeyAssign.STKEYASSIGN[] stkeyassignArray = OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad]; for (int i = 0; i < 0x10; i++) { switch (stkeyassignArray[i].入力デバイス) { case EInputDevice.Keyboard: @@ -150,17 +150,17 @@ namespace TJAPlayer3 { break; default: - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x + num5, y, string.Format("{0,2}.", i + 1), this.n現在の選択行 == i, 0.75f); + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x + num5, y, string.Format("{0,2}.", i + 1), this.n現在の選択行 == i, 0.75f); break; } y += num5; } - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x + num5, y, "Reset", this.n現在の選択行 == 0x10, 0.75f); + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x + num5, y, "Reset", this.n現在の選択行 == 0x10, 0.75f); y += num5; - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x + num5, y, "<< Returnto List", this.n現在の選択行 == 0x11, 0.75f); + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x + num5, y, "<< Returnto List", this.n現在の選択行 == 0x11, 0.75f); y += num5; - if (this.bキー入力待ち && (TJAPlayer3.Tx.Config_KeyAssign != null)) { - TJAPlayer3.Tx.Config_KeyAssign.t2D描画(TJAPlayer3.Skin.Config_KeyAssign[0], TJAPlayer3.Skin.Config_KeyAssign[1]); + if (this.bキー入力待ち && (OpenTaiko.Tx.Config_KeyAssign != null)) { + OpenTaiko.Tx.Config_KeyAssign.t2D描画(OpenTaiko.Skin.Config_KeyAssign[0], OpenTaiko.Skin.Config_KeyAssign[1]); } } return 0; @@ -248,7 +248,7 @@ namespace TJAPlayer3 { } break; } - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x, y, string.Format("{0,2}. Joypad #{1} ", line, nID) + str, b強調, 0.75f); + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x, y, string.Format("{0,2}. Joypad #{1} ", line, nID) + str, b強調, 0.75f); } private void tアサインコードの描画_Gamepad(int line, int x, int y, int nID, int nCode, bool b強調) { string str = ""; @@ -261,7 +261,7 @@ namespace TJAPlayer3 { } else { str = string.Format("Code{0}", nCode); } - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x, y, string.Format("{0,2}. Gamepad #{1} ", line, nID) + str, b強調, 0.75f); + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x, y, string.Format("{0,2}. Gamepad #{1} ", line, nID) + str, b強調, 0.75f); } private void tアサインコードの描画_Keyboard(int line, int x, int y, int nID, int nCode, bool b強調) { string str = null; @@ -274,26 +274,26 @@ namespace TJAPlayer3 { if (str == null) { str = string.Format("{0,2}. Key 0x{1:X2}", line, nCode); } - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x, y, str, b強調, 0.75f); + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x, y, str, b強調, 0.75f); } private void tアサインコードの描画_MidiIn(int line, int x, int y, int nID, int nCode, bool b強調) { - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x, y, string.Format("{0,2}. MidiIn #{1} code.{2}", line, nID, nCode), b強調, 0.75f); + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x, y, string.Format("{0,2}. MidiIn #{1} code.{2}", line, nID, nCode), b強調, 0.75f); } private void tアサインコードの描画_Mouse(int line, int x, int y, int nID, int nCode, bool b強調) { - TJAPlayer3.stageコンフィグ.actFont.t文字列描画(x, y, string.Format("{0,2}. Mouse Button{1}", line, nCode), b強調, 0.75f); + OpenTaiko.stageコンフィグ.actFont.t文字列描画(x, y, string.Format("{0,2}. Mouse Button{1}", line, nCode), b強調, 0.75f); } private bool tキーチェックとアサイン_Gamepad() { - foreach (IInputDevice device in TJAPlayer3.InputManager.InputDevices) { + foreach (IInputDevice device in OpenTaiko.InputManager.InputDevices) { if (device.CurrentType == InputDeviceType.Gamepad) { for (int i = 0; i < 15; i++) // +8 for Axis, +8 for HAT { if (device.KeyPressed(i)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Gamepad, device.ID, i, this.pad); - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Gamepad; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = device.ID; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Gamepad, device.ID, i, this.pad); + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Gamepad; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = device.ID; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; return true; } } @@ -302,16 +302,16 @@ namespace TJAPlayer3 { return false; } private bool tキーチェックとアサイン_Joypad() { - foreach (IInputDevice device in TJAPlayer3.InputManager.InputDevices) { + foreach (IInputDevice device in OpenTaiko.InputManager.InputDevices) { if (device.CurrentType == InputDeviceType.Joystick) { for (int i = 0; i < 15; i++) // +8 for Axis, +8 for HAT { if (device.KeyPressed(i)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Joypad, device.ID, i, this.pad); - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Joypad; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = device.ID; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Joypad, device.ID, i, this.pad); + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Joypad; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = device.ID; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; return true; } } @@ -331,35 +331,35 @@ namespace TJAPlayer3 { //{ if (i != (int)SlimDXKeys.Key.Escape && i != (int)SlimDXKeys.Key.Return && - TJAPlayer3.InputManager.Keyboard.KeyPressed(i)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.InputManager.Keyboard.KeyPressed(i)) { + OpenTaiko.Skin.soundDecideSFX.tPlay(); if (pad < EKeyConfigPad.Capture) - TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Keyboard, 0, i, this.pad); - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Keyboard; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; + OpenTaiko.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Keyboard, 0, i, this.pad); + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Keyboard; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; return true; - } else if (i == (int)SlimDXKeys.Key.Return && TJAPlayer3.InputManager.Keyboard.KeyPressed(i)) // Remove keybind + } else if (i == (int)SlimDXKeys.Key.Return && OpenTaiko.InputManager.Keyboard.KeyPressed(i)) // Remove keybind { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Unknown; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = 0; + OpenTaiko.Skin.soundCancelSFX.tPlay(); + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Unknown; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = 0; return true; } } return false; } private bool tキーチェックとアサイン_MidiIn() { - foreach (IInputDevice device in TJAPlayer3.InputManager.InputDevices) { + foreach (IInputDevice device in OpenTaiko.InputManager.InputDevices) { if (device.CurrentType == InputDeviceType.MidiIn) { for (int i = 0; i < 0x100; i++) { if (device.KeyPressed(i)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.MIDIInput, device.ID, i, this.pad); - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.MIDIInput; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = device.ID; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.MIDIInput, device.ID, i, this.pad); + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.MIDIInput; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = device.ID; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; return true; } } @@ -369,11 +369,11 @@ namespace TJAPlayer3 { } private bool tキーチェックとアサイン_Mouse() { for (int i = 0; i < 8; i++) { - if (TJAPlayer3.InputManager.Mouse.KeyPressed(i)) { - TJAPlayer3.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Mouse, 0, i, this.pad); - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Mouse; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0; - TJAPlayer3.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; + if (OpenTaiko.InputManager.Mouse.KeyPressed(i)) { + OpenTaiko.ConfigIni.t指定した入力が既にアサイン済みである場合はそれを全削除する(EInputDevice.Mouse, 0, i, this.pad); + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].入力デバイス = EInputDevice.Mouse; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].ID = 0; + OpenTaiko.ConfigIni.KeyAssign[(int)this.part][(int)this.pad][this.n現在の選択行].コード = i; } } return false; diff --git a/OpenTaiko/src/Stages/04.Config/CActConfigList.cs b/OpenTaiko/src/Stages/04.Config/CActConfigList.cs index 31008b3b..a0cf48db 100644 --- a/OpenTaiko/src/Stages/04.Config/CActConfigList.cs +++ b/OpenTaiko/src/Stages/04.Config/CActConfigList.cs @@ -2,7 +2,7 @@ using FDK; using SkiaSharp; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActConfigList : CActivity { // プロパティ @@ -62,7 +62,7 @@ namespace TJAPlayer3 { CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_RELOADSONGCACHE_DESC")); this.list項目リスト.Add(this.iSystemHardReloadDTX); - this.iSystemLanguage = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LANGUAGE"), CItemList.EPanelType.Normal, CLangManager.langToInt(TJAPlayer3.ConfigIni.sLang), + this.iSystemLanguage = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LANGUAGE"), CItemList.EPanelType.Normal, CLangManager.langToInt(OpenTaiko.ConfigIni.sLang), CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LANGUAGE_DESC"), CLangManager.Languages); this.list項目リスト.Add(this.iSystemLanguage); @@ -71,11 +71,11 @@ namespace TJAPlayer3 { // CLangManager.LangInstance.GetString(17)); //this.list項目リスト.Add(this.iLayoutType); - this.iTaikoPlayerCount = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_PLAYERCOUNT"), 1, 5, TJAPlayer3.ConfigIni.nPlayerCount, + this.iTaikoPlayerCount = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_PLAYERCOUNT"), 1, 5, OpenTaiko.ConfigIni.nPlayerCount, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_PLAYERCOUNT_DESC")); this.list項目リスト.Add(this.iTaikoPlayerCount); - this.iDanTowerHide = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_HIDEDANTOWER"), TJAPlayer3.ConfigIni.bDanTowerHide, + this.iDanTowerHide = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_HIDEDANTOWER"), OpenTaiko.ConfigIni.bDanTowerHide, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_HIDEDANTOWER_DESC")); this.list項目リスト.Add(this.iDanTowerHide); @@ -85,33 +85,33 @@ namespace TJAPlayer3 { this.list項目リスト.Add( this.iSystemRisky ); */ - this.iCommonPlaySpeed = new CItemInteger(CLangManager.LangInstance.GetString("MOD_SONGSPEED"), 5, 400, TJAPlayer3.ConfigIni.nSongSpeed, + this.iCommonPlaySpeed = new CItemInteger(CLangManager.LangInstance.GetString("MOD_SONGSPEED"), 5, 400, OpenTaiko.ConfigIni.nSongSpeed, CLangManager.LangInstance.GetString("SETTINGS_MOD_SONGSPEED_DESC")); this.list項目リスト.Add(this.iCommonPlaySpeed); - this.iSystemTimeStretch = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_TIMESTRETCH"), TJAPlayer3.ConfigIni.bTimeStretch, + this.iSystemTimeStretch = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_TIMESTRETCH"), OpenTaiko.ConfigIni.bTimeStretch, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_TIMESTRETCH_DESC")); this.list項目リスト.Add(this.iSystemTimeStretch); - this.iSystemGraphicsType = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_GRAPHICSAPI"), CItemList.EPanelType.Normal, TJAPlayer3.ConfigIni.nGraphicsDeviceType, + this.iSystemGraphicsType = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_GRAPHICSAPI"), CItemList.EPanelType.Normal, OpenTaiko.ConfigIni.nGraphicsDeviceType, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_GRAPHICSAPI_DESC"), //new string[] { "OpenGL", "DirectX9", "DirectX11", "Vulkan", "Metal" }); new string[] { "OpenGL", "DirectX11", "Vulkan", "Metal" }); this.list項目リスト.Add(this.iSystemGraphicsType); - this.iSystemFullscreen = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_FULLSCREEN"), TJAPlayer3.ConfigIni.bFullScreen, + this.iSystemFullscreen = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_FULLSCREEN"), OpenTaiko.ConfigIni.bFullScreen, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_FULLSCREEN_DESC")); this.list項目リスト.Add(this.iSystemFullscreen); - this.iSystemRandomFromSubBox = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_RANDOMSUBFOLDER"), TJAPlayer3.ConfigIni.bIncludeSubfoldersOnRandomSelect, + this.iSystemRandomFromSubBox = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_RANDOMSUBFOLDER"), OpenTaiko.ConfigIni.bIncludeSubfoldersOnRandomSelect, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_RANDOMSUBFOLDER_DESC")); this.list項目リスト.Add(this.iSystemRandomFromSubBox); - this.iSystemVSyncWait = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VSYNC"), TJAPlayer3.ConfigIni.bEnableVSync, + this.iSystemVSyncWait = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VSYNC"), OpenTaiko.ConfigIni.bEnableVSync, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VSYNC_DESC")); this.list項目リスト.Add(this.iSystemVSyncWait); - this.iSystemAVI = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGMOVIE"), TJAPlayer3.ConfigIni.bEnableAVI, + this.iSystemAVI = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGMOVIE"), OpenTaiko.ConfigIni.bEnableAVI, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGMOVIE_DESC")); this.list項目リスト.Add(this.iSystemAVI); @@ -123,7 +123,7 @@ namespace TJAPlayer3 { // this.list項目リスト.Add( this.iSystemAVIDisplayMode ); //} //else - this.iSystemAVIDisplayMode = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGMOVIEDISPLAY"), CItemList.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eClipDispType, + this.iSystemAVIDisplayMode = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGMOVIEDISPLAY"), CItemList.EPanelType.Normal, (int)OpenTaiko.ConfigIni.eClipDispType, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGMOVIEDISPLAY_DESC"), new string[] { CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGMOVIEDISPLAY_NONE"), @@ -133,55 +133,55 @@ namespace TJAPlayer3 { }); this.list項目リスト.Add(this.iSystemAVIDisplayMode); - this.iSystemBGA = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGA"), TJAPlayer3.ConfigIni.bEnableBGA, + this.iSystemBGA = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGA"), OpenTaiko.ConfigIni.bEnableBGA, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BGA_DESC")); this.list項目リスト.Add(this.iSystemBGA); - this.iSystemPreviewSoundWait = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPREVIEWBUFFER"), 0, 0x2710, TJAPlayer3.ConfigIni.n曲が選択されてからプレビュー音が鳴るまでのウェイトms, + this.iSystemPreviewSoundWait = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPREVIEWBUFFER"), 0, 0x2710, OpenTaiko.ConfigIni.n曲が選択されてからプレビュー音が鳴るまでのウェイトms, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPREVIEWBUFFER_DESC")); this.list項目リスト.Add(this.iSystemPreviewSoundWait); - this.iSystemPreviewImageWait = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_IMAGEPREVIEWBUFFER"), 0, 0x2710, TJAPlayer3.ConfigIni.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms, + this.iSystemPreviewImageWait = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_IMAGEPREVIEWBUFFER"), 0, 0x2710, OpenTaiko.ConfigIni.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_IMAGEPREVIEWBUFFER_DESC")); this.list項目リスト.Add(this.iSystemPreviewImageWait); - this.iSystemDebugInfo = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DEBUGMODE"), TJAPlayer3.ConfigIni.bDisplayDebugInfo, + this.iSystemDebugInfo = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DEBUGMODE"), OpenTaiko.ConfigIni.bDisplayDebugInfo, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DEBUGMODE_DESC")); this.list項目リスト.Add(this.iSystemDebugInfo); - this.iSystemBGAlpha = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LANEOPACITY"), 0, 0xff, TJAPlayer3.ConfigIni.n背景の透過度, + this.iSystemBGAlpha = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LANEOPACITY"), 0, 0xff, OpenTaiko.ConfigIni.n背景の透過度, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LANEOPACITY_DESC")); this.list項目リスト.Add(this.iSystemBGAlpha); - this.iSystemBGMSound = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPLAYBACK"), TJAPlayer3.ConfigIni.bBGM音を発声する, + this.iSystemBGMSound = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPLAYBACK"), OpenTaiko.ConfigIni.bBGM音を発声する, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPLAYBACK_DESC")); this.list項目リスト.Add(this.iSystemBGMSound); - this.iSystemApplySongVol = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_USESONGVOL"), TJAPlayer3.ConfigIni.ApplySongVol, + this.iSystemApplySongVol = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_USESONGVOL"), OpenTaiko.ConfigIni.ApplySongVol, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_USESONGVOL_DESC")); this.list項目リスト.Add(this.iSystemApplySongVol); - this.iSystemSoundEffectLevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SEVOL"), CSound.MinimumGroupLevel, CSound.MaximumGroupLevel, TJAPlayer3.ConfigIni.SoundEffectLevel, + this.iSystemSoundEffectLevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SEVOL"), CSound.MinimumGroupLevel, CSound.MaximumGroupLevel, OpenTaiko.ConfigIni.SoundEffectLevel, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SEVOL_DESC")); this.list項目リスト.Add(this.iSystemSoundEffectLevel); - this.iSystemVoiceLevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VOICEVOL"), CSound.MinimumGroupLevel, CSound.MaximumGroupLevel, TJAPlayer3.ConfigIni.VoiceLevel, + this.iSystemVoiceLevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VOICEVOL"), CSound.MinimumGroupLevel, CSound.MaximumGroupLevel, OpenTaiko.ConfigIni.VoiceLevel, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VOICEVOL_DESC")); this.list項目リスト.Add(this.iSystemVoiceLevel); - this.iSystemSongPreviewLevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPREVIEWVOL"), CSound.MinimumGroupLevel, CSound.MaximumGroupLevel, TJAPlayer3.ConfigIni.SongPreviewLevel, + this.iSystemSongPreviewLevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPREVIEWVOL"), CSound.MinimumGroupLevel, CSound.MaximumGroupLevel, OpenTaiko.ConfigIni.SongPreviewLevel, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPREVIEWVOL_DESC")); this.list項目リスト.Add(this.iSystemSongPreviewLevel); - this.iSystemSongPlaybackLevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGVOL"), CSound.MinimumGroupLevel, CSound.MaximumGroupLevel, TJAPlayer3.ConfigIni.SongPlaybackLevel, + this.iSystemSongPlaybackLevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGVOL"), CSound.MinimumGroupLevel, CSound.MaximumGroupLevel, OpenTaiko.ConfigIni.SongPlaybackLevel, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGVOL_DESC")); this.list項目リスト.Add(this.iSystemSongPlaybackLevel); - this.iSystemKeyboardSoundLevelIncrement = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VOLINCREMENT"), 1, 20, TJAPlayer3.ConfigIni.KeyboardSoundLevelIncrement, + this.iSystemKeyboardSoundLevelIncrement = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VOLINCREMENT"), 1, 20, OpenTaiko.ConfigIni.KeyboardSoundLevelIncrement, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_VOLINCREMENT_DESC")); this.list項目リスト.Add(this.iSystemKeyboardSoundLevelIncrement); - this.MusicPreTimeMs = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPLAYBACKBUFFER"), 0, 10000, TJAPlayer3.ConfigIni.MusicPreTimeMs, + this.MusicPreTimeMs = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPLAYBACKBUFFER"), 0, 10000, OpenTaiko.ConfigIni.MusicPreTimeMs, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SONGPLAYBACKBUFFER_DESC")); this.list項目リスト.Add(this.MusicPreTimeMs); @@ -190,85 +190,85 @@ namespace TJAPlayer3 { // "Turn ON to disable drawing\n * preview image / movie\n * result image / movie\n * nowloading image\n * wallpaper (in playing screen)\n * BGA / AVI (in playing screen)" ); //this.list項目リスト.Add( this.iSystemStoicMode ); - this.iSystemAutoResultCapture = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_AUTOSCREENSHOT"), TJAPlayer3.ConfigIni.bIsAutoResultCapture, + this.iSystemAutoResultCapture = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_AUTOSCREENSHOT"), OpenTaiko.ConfigIni.bIsAutoResultCapture, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_AUTOSCREENSHOT_DESC")); this.list項目リスト.Add(this.iSystemAutoResultCapture); SendDiscordPlayingInformation = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISCORDRPC"), - TJAPlayer3.ConfigIni.SendDiscordPlayingInformation, + OpenTaiko.ConfigIni.SendDiscordPlayingInformation, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISCORDRPC_DESC")); list項目リスト.Add(SendDiscordPlayingInformation); - this.iSystemBufferedInput = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BUFFEREDINPUT"), TJAPlayer3.ConfigIni.bBufferedInputs, + this.iSystemBufferedInput = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BUFFEREDINPUT"), OpenTaiko.ConfigIni.bBufferedInputs, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BUFFEREDINPUT_DESC")); this.list項目リスト.Add(this.iSystemBufferedInput); - this.iLogOutputLog = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LOG"), TJAPlayer3.ConfigIni.bOutputLogs, + this.iLogOutputLog = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LOG"), OpenTaiko.ConfigIni.bOutputLogs, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_LOG_DESC")); this.list項目リスト.Add(this.iLogOutputLog); // #24820 2013.1.3 yyagi - this.iSystemSoundType = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_AUDIOPLAYBACK"), CItemList.EPanelType.Normal, TJAPlayer3.ConfigIni.nSoundDeviceType, + this.iSystemSoundType = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_AUDIOPLAYBACK"), CItemList.EPanelType.Normal, OpenTaiko.ConfigIni.nSoundDeviceType, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_AUDIOPLAYBACK_DESC"), new string[] { "Bass", "ASIO", "WASAPI Exclusive", "WASAPI Shared" }); this.list項目リスト.Add(this.iSystemSoundType); // #24820 2013.1.15 yyagi - this.iSystemBassBufferSizeMs = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BASSBUFFER"), 0, 99999, TJAPlayer3.ConfigIni.nBassBufferSizeMs, + this.iSystemBassBufferSizeMs = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BASSBUFFER"), 0, 99999, OpenTaiko.ConfigIni.nBassBufferSizeMs, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_BASSBUFFER_DESC")); this.list項目リスト.Add(this.iSystemBassBufferSizeMs); // #24820 2013.1.15 yyagi - this.iSystemWASAPIBufferSizeMs = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_WASAPIBUFFER"), 0, 99999, TJAPlayer3.ConfigIni.nWASAPIBufferSizeMs, + this.iSystemWASAPIBufferSizeMs = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_WASAPIBUFFER"), 0, 99999, OpenTaiko.ConfigIni.nWASAPIBufferSizeMs, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_WASAPIBUFFER_DESC")); this.list項目リスト.Add(this.iSystemWASAPIBufferSizeMs); // #24820 2013.1.17 yyagi - this.iSystemASIODevice = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_ASIOPLAYBACK"), CItemList.EPanelType.Normal, TJAPlayer3.ConfigIni.nASIODevice, + this.iSystemASIODevice = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_ASIOPLAYBACK"), CItemList.EPanelType.Normal, OpenTaiko.ConfigIni.nASIODevice, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_ASIOPLAYBACK_DESC"), CEnumerateAllAsioDevices.GetAllASIODevices()); this.list項目リスト.Add(this.iSystemASIODevice); // #33689 2014.6.17 yyagi - this.iSystemSoundTimerType = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_OSTIMER"), TJAPlayer3.ConfigIni.bUseOSTimer, + this.iSystemSoundTimerType = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_OSTIMER"), OpenTaiko.ConfigIni.bUseOSTimer, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_OSTIMER_DESC")); this.list項目リスト.Add(this.iSystemSoundTimerType); - ShowChara = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYCHARA"), TJAPlayer3.ConfigIni.ShowChara, + ShowChara = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYCHARA"), OpenTaiko.ConfigIni.ShowChara, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYCHARA_DESC")); this.list項目リスト.Add(ShowChara); - ShowDancer = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYDANCER"), TJAPlayer3.ConfigIni.ShowDancer, + ShowDancer = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYDANCER"), OpenTaiko.ConfigIni.ShowDancer, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYDANCER_DESC")); this.list項目リスト.Add(ShowDancer); - ShowMob = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYMOB"), TJAPlayer3.ConfigIni.ShowMob, + ShowMob = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYMOB"), OpenTaiko.ConfigIni.ShowMob, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYMOB_DESC")); this.list項目リスト.Add(ShowMob); - ShowRunner = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYRUNNER"), TJAPlayer3.ConfigIni.ShowRunner, + ShowRunner = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYRUNNER"), OpenTaiko.ConfigIni.ShowRunner, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYRUNNER_DESC")); this.list項目リスト.Add(ShowRunner); - ShowFooter = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYFOOTER"), TJAPlayer3.ConfigIni.ShowFooter, + ShowFooter = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYFOOTER"), OpenTaiko.ConfigIni.ShowFooter, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYFOOTER_DESC")); this.list項目リスト.Add(ShowFooter); - FastRender = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_FASTRENDER"), TJAPlayer3.ConfigIni.FastRender, + FastRender = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_FASTRENDER"), OpenTaiko.ConfigIni.FastRender, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_FASTRENDER_DESC")); this.list項目リスト.Add(FastRender); - ShowPuchiChara = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYPUCHI"), TJAPlayer3.ConfigIni.ShowPuchiChara, + ShowPuchiChara = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYPUCHI"), OpenTaiko.ConfigIni.ShowPuchiChara, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_DISPLAYPUCHI_DESC")); this.list項目リスト.Add(ShowPuchiChara); - SimpleMode = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SIMPLEMODE"), TJAPlayer3.ConfigIni.SimpleMode, + SimpleMode = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SIMPLEMODE"), OpenTaiko.ConfigIni.SimpleMode, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_SIMPLEMODE_DESC")); this.list項目リスト.Add(SimpleMode); - ASyncTextureLoad = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_TEXTUREASYNC"), TJAPlayer3.ConfigIni.ASyncTextureLoad, + ASyncTextureLoad = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_TEXTUREASYNC"), OpenTaiko.ConfigIni.ASyncTextureLoad, CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_TEXTUREASYNC_DESC")); this.list項目リスト.Add(ASyncTextureLoad); @@ -314,27 +314,27 @@ namespace TJAPlayer3 { CLangManager.LangInstance.GetString("SETTINGS_GAME_CALIBRATION_DESC")); this.list項目リスト.Add(this.iDrumsGoToCalibration); - this.iRollsPerSec = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_AUTOROLL"), 0, 1000, TJAPlayer3.ConfigIni.nRollsPerSec, + this.iRollsPerSec = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_AUTOROLL"), 0, 1000, OpenTaiko.ConfigIni.nRollsPerSec, CLangManager.LangInstance.GetString("SETTINGS_GAME_AUTOROLL_DESC")); this.list項目リスト.Add(this.iRollsPerSec); - this.iAILevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_AILEVEL"), 1, 10, TJAPlayer3.ConfigIni.nDefaultAILevel, + this.iAILevel = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_AILEVEL"), 1, 10, OpenTaiko.ConfigIni.nDefaultAILevel, CLangManager.LangInstance.GetString("SETTINGS_GAME_AILEVEL_DESC")); this.list項目リスト.Add(this.iAILevel); - this.iSystemRisky = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_BADCOUNT"), 0, 10, TJAPlayer3.ConfigIni.nRisky, + this.iSystemRisky = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_BADCOUNT"), 0, 10, OpenTaiko.ConfigIni.nRisky, CLangManager.LangInstance.GetString("SETTINGS_GAME_BADCOUNT_DESC")); this.list項目リスト.Add(this.iSystemRisky); - this.iTaikoNoInfo = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_NOINFO"), TJAPlayer3.ConfigIni.bNoInfo, + this.iTaikoNoInfo = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_NOINFO"), OpenTaiko.ConfigIni.bNoInfo, CLangManager.LangInstance.GetString("SETTINGS_GAME_NOINFO_DESC")); this.list項目リスト.Add(this.iTaikoNoInfo); - this.iDrumsTight = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_NOTELOCK"), TJAPlayer3.ConfigIni.bTight, + this.iDrumsTight = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_NOTELOCK"), OpenTaiko.ConfigIni.bTight, CLangManager.LangInstance.GetString("SETTINGS_GAME_NOTELOCK_DESC")); this.list項目リスト.Add(this.iDrumsTight); - this.iSystemMinComboDrums = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_COMBODISPLAY"), 1, 0x1869f, TJAPlayer3.ConfigIni.n表示可能な最小コンボ数.Drums, + this.iSystemMinComboDrums = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_COMBODISPLAY"), 1, 0x1869f, OpenTaiko.ConfigIni.n表示可能な最小コンボ数.Drums, CLangManager.LangInstance.GetString("SETTINGS_GAME_COMBODISPLAY_DESC")); this.list項目リスト.Add(this.iSystemMinComboDrums); @@ -347,12 +347,12 @@ namespace TJAPlayer3 { this.list項目リスト.Add( this.iInputAdjustTimeMs ); */ - this.iGlobalOffsetMs = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_GLOBALOFFSET"), -9999, 9999, TJAPlayer3.ConfigIni.nGlobalOffsetMs, + this.iGlobalOffsetMs = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_GAME_GLOBALOFFSET"), -9999, 9999, OpenTaiko.ConfigIni.nGlobalOffsetMs, CLangManager.LangInstance.GetString("SETTINGS_GAME_GLOBALOFFSET_DESC")); this.list項目リスト.Add(this.iGlobalOffsetMs); - this.iTaikoDefaultCourse = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_DEFAULTDIFF"), CItemBase.EPanelType.Normal, TJAPlayer3.ConfigIni.nDefaultCourse, + this.iTaikoDefaultCourse = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_DEFAULTDIFF"), CItemBase.EPanelType.Normal, OpenTaiko.ConfigIni.nDefaultCourse, CLangManager.LangInstance.GetString("SETTINGS_GAME_DEFAULTDIFF_DESC"), new string[] { CLangManager.LangInstance.GetString("DIFF_EASY"), @@ -363,51 +363,51 @@ namespace TJAPlayer3 { CLangManager.LangInstance.GetString("DIFF_EXEXTRA") }); this.list項目リスト.Add(this.iTaikoDefaultCourse); - this.iTaikoScoreMode = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_SCOREMODE"), CItemBase.EPanelType.Normal, TJAPlayer3.ConfigIni.nScoreMode, + this.iTaikoScoreMode = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_SCOREMODE"), CItemBase.EPanelType.Normal, OpenTaiko.ConfigIni.nScoreMode, CLangManager.LangInstance.GetString("SETTINGS_GAME_SCOREMODE_DESC"), new string[] { "TYPE-A", "TYPE-B", "TYPE-C" }); this.list項目リスト.Add(this.iTaikoScoreMode); - this.ShinuchiMode = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_SHINUCHI"), TJAPlayer3.ConfigIni.ShinuchiMode, CItemBase.EPanelType.Normal, + this.ShinuchiMode = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_SHINUCHI"), OpenTaiko.ConfigIni.ShinuchiMode, CItemBase.EPanelType.Normal, CLangManager.LangInstance.GetString("SETTINGS_GAME_SHINUCHI_DESC")); this.list項目リスト.Add(this.ShinuchiMode); // This does nothing vvv - this.iTaikoBranchGuide = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_BRANCHGUIDE"), TJAPlayer3.ConfigIni.bBranchGuide, + this.iTaikoBranchGuide = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_BRANCHGUIDE"), OpenTaiko.ConfigIni.bBranchGuide, CLangManager.LangInstance.GetString("SETTINGS_GAME_BRANCHGUIDE_DESC")); this.list項目リスト.Add(this.iTaikoBranchGuide); - this.iTaikoBranchAnime = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_BRANCHANIME"), CItemBase.EPanelType.Normal, TJAPlayer3.ConfigIni.nBranchAnime, + this.iTaikoBranchAnime = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_BRANCHANIME"), CItemBase.EPanelType.Normal, OpenTaiko.ConfigIni.nBranchAnime, CLangManager.LangInstance.GetString("SETTINGS_GAME_BRANCHANIME_DESC"), new string[] { "TYPE-A", "TYPE-B" }); this.list項目リスト.Add(this.iTaikoBranchAnime); - this.iTaikoGameMode = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_SURVIVAL"), CItemBase.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eGameMode, + this.iTaikoGameMode = new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_SURVIVAL"), CItemBase.EPanelType.Normal, (int)OpenTaiko.ConfigIni.eGameMode, CLangManager.LangInstance.GetString("SETTINGS_GAME_SURVIVAL_DESC"), new string[] { "OFF", "TYPE-A", "TYPE-B" }); this.list項目リスト.Add(this.iTaikoGameMode); - this.iTaikoBigNotesJudge = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_BIGNOTEJUDGE"), TJAPlayer3.ConfigIni.bJudgeBigNotes, + this.iTaikoBigNotesJudge = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_BIGNOTEJUDGE"), OpenTaiko.ConfigIni.bJudgeBigNotes, CLangManager.LangInstance.GetString("SETTINGS_GAME_BIGNOTEJUDGE_DESC")); this.list項目リスト.Add(this.iTaikoBigNotesJudge); - this.iTaikoForceNormalGauge = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_NORMALGAUGE"), TJAPlayer3.ConfigIni.bForceNormalGauge, + this.iTaikoForceNormalGauge = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_NORMALGAUGE"), OpenTaiko.ConfigIni.bForceNormalGauge, CLangManager.LangInstance.GetString("SETTINGS_GAME_NORMALGAUGE_DESC")); this.list項目リスト.Add(this.iTaikoForceNormalGauge); - this.iTaikoJudgeCountDisp = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_SCOREDISPLAY"), TJAPlayer3.ConfigIni.bJudgeCountDisplay, + this.iTaikoJudgeCountDisp = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_SCOREDISPLAY"), OpenTaiko.ConfigIni.bJudgeCountDisplay, CLangManager.LangInstance.GetString("SETTINGS_GAME_SCOREDISPLAY_DESC")); this.list項目リスト.Add(this.iTaikoJudgeCountDisp); - this.iShowExExtraAnime = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_EXEXTRAANIME"), TJAPlayer3.ConfigIni.ShowExExtraAnime, + this.iShowExExtraAnime = new CItemToggle(CLangManager.LangInstance.GetString("SETTINGS_GAME_EXEXTRAANIME"), OpenTaiko.ConfigIni.ShowExExtraAnime, CLangManager.LangInstance.GetString("SETTINGS_GAME_EXEXTRAANIME_DESC")); this.list項目リスト.Add(this.iShowExExtraAnime); - this.TokkunSkipCount = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_TRAINING_SKIPCOUNT"), 1, 99, TJAPlayer3.ConfigIni.TokkunSkipMeasures, + this.TokkunSkipCount = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_TRAINING_SKIPCOUNT"), 1, 99, OpenTaiko.ConfigIni.TokkunSkipMeasures, CLangManager.LangInstance.GetString("SETTINGS_TRAINING_SKIPCOUNT_DESC")); this.list項目リスト.Add(TokkunSkipCount); - this.TokkunMashInterval = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_TRAINING_JUMPINTERVAL"), 1, 9999, TJAPlayer3.ConfigIni.TokkunMashInterval, + this.TokkunMashInterval = new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_TRAINING_JUMPINTERVAL"), 1, 9999, OpenTaiko.ConfigIni.TokkunMashInterval, CLangManager.LangInstance.GetString("SETTINGS_TRAINING_JUMPINTERVAL_DESC")); this.list項目リスト.Add(TokkunMashInterval); @@ -449,7 +449,7 @@ namespace TJAPlayer3 { // これ以外なら何もしない } public void tEnter押下() { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); if (this.b要素値にフォーカス中) { this.b要素値にフォーカス中 = false; } else if (this.list項目リスト[this.n現在の選択項目].e種別 == CItemBase.E種別.整数) { @@ -461,143 +461,143 @@ namespace TJAPlayer3 { #region [ 個々のキーアサイン ] //太鼓のキー設定。 else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLRed) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRRed) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLBlue) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRBlue) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue); } //太鼓のキー設定。2P else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLRed2P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed2P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed2P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRRed2P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed2P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed2P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLBlue2P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue2P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue2P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRBlue2P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue2P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue2P); } //太鼓のキー設定。3P else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLRed3P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed3P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed3P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRRed3P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed3P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed3P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLBlue3P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue3P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue3P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRBlue3P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue3P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue3P); } //太鼓のキー設定。4P else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLRed4P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed4P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed4P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRRed4P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed4P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed4P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLBlue4P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue4P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue4P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRBlue4P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue4P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue4P); } //太鼓のキー設定。5P else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLRed5P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed5P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LRed5P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRRed5P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed5P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RRed5P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoLBlue5P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue5P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LBlue5P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTaikoRBlue5P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue5P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RBlue5P); } // Konga claps else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignKongaClap) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignKongaClap2P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap2P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap2P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignKongaClap3P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap3P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap3P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignKongaClap4P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap4P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap4P); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignKongaClap5P) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap5P); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Clap5P); } // Menu controls else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignDecide) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Decide); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Decide); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignCancel) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Cancel); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.Cancel); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignLeftChange) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LeftChange); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.LeftChange); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignRightChange) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RightChange); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.RightChange); } // System controls else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemCapture) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.Capture); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.Capture); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemSongVolIncrease) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.SongVolumeIncrease); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.SongVolumeIncrease); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemSongVolDecrease) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.SongVolumeDecrease); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.SongVolumeDecrease); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemDisplayHit) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.DisplayHits); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.DisplayHits); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemDisplayDebug) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.DisplayDebug); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.DisplayDebug); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemQuickConfig) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.QuickConfig); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.QuickConfig); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemNewHeya) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.NewHeya); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.NewHeya); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemSortSongs) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.SortSongs); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.SortSongs); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemToggleAutoP1) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleAutoP1); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleAutoP1); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemToggleAutoP2) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleAutoP2); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleAutoP2); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemToggleTrainingMode) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleTrainingMode); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleTrainingMode); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignSystemCycleVideoDisplayMode) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.CycleVideoDisplayMode); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.SYSTEM, EKeyConfigPad.CycleVideoDisplayMode); } // Training controls else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingPause) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingPause); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingPause); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingToggleAuto) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingToggleAuto); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingToggleAuto); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingBookmark) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBookmark); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBookmark); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingIncreaseScrollSpeed) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingIncreaseScrollSpeed); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingIncreaseScrollSpeed); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingDecreaseScrollSpeed) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingDecreaseScrollSpeed); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingDecreaseScrollSpeed); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingIncreaseSongSpeed) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingIncreaseSongSpeed); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingIncreaseSongSpeed); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingDecreaseSongSpeed) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingDecreaseSongSpeed); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingDecreaseSongSpeed); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingBranchNormal) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchNormal); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchNormal); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingBranchExpert) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchExpert); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchExpert); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingBranchMaster) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchMaster); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingBranchMaster); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingMoveForwardMeasure) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingMoveForwardMeasure); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingMoveForwardMeasure); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingMoveBackMeasure) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingMoveBackMeasure); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingMoveBackMeasure); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingSkipForwardMeasure) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingSkipForwardMeasure); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingSkipForwardMeasure); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingSkipBackMeasure) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingSkipBackMeasure); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingSkipBackMeasure); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingJumpToFirstMeasure) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingJumpToFirstMeasure); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingJumpToFirstMeasure); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingJumpToLastMeasure) { - TJAPlayer3.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingJumpToLastMeasure); + OpenTaiko.stageコンフィグ.tパッド選択通知(EKeyConfigPart.DRUMS, EKeyConfigPad.TrainingJumpToLastMeasure); } #endregion else { @@ -613,21 +613,21 @@ namespace TJAPlayer3 { this.list項目リスト[this.n現在の選択項目].tEnter押下(); if (this.list項目リスト[this.n現在の選択項目] == this.iSystemLanguage) { - TJAPlayer3.ConfigIni.sLang = CLangManager.intToLang(this.iSystemLanguage.n現在選択されている項目番号); - CLangManager.langAttach(TJAPlayer3.ConfigIni.sLang); + OpenTaiko.ConfigIni.sLang = CLangManager.intToLang(this.iSystemLanguage.n現在選択されている項目番号); + CLangManager.langAttach(OpenTaiko.ConfigIni.sLang); prvFont?.Dispose(); - TJAPlayer3.stageコンフィグ.ftフォント?.Dispose(); - TJAPlayer3.stageタイトル.pfMenuTitle?.Dispose(); - TJAPlayer3.stageタイトル.pfBoxText?.Dispose(); + OpenTaiko.stageコンフィグ.ftフォント?.Dispose(); + OpenTaiko.stageタイトル.pfMenuTitle?.Dispose(); + OpenTaiko.stageタイトル.pfBoxText?.Dispose(); - prvFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Config_Font_Scale); - TJAPlayer3.stageコンフィグ.ftフォント = HPrivateFastFont.tInstantiateMainFont((int)TJAPlayer3.Skin.Config_Font_Scale_Description, CFontRenderer.FontStyle.Bold); - TJAPlayer3.stageタイトル.pfMenuTitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Title_ModeSelect_Title_Scale[0]); - TJAPlayer3.stageタイトル.pfBoxText = HPrivateFastFont.tInstantiateBoxFont(TJAPlayer3.Skin.Title_ModeSelect_Title_Scale[1]); + prvFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Config_Font_Scale); + OpenTaiko.stageコンフィグ.ftフォント = HPrivateFastFont.tInstantiateMainFont((int)OpenTaiko.Skin.Config_Font_Scale_Description, CFontRenderer.FontStyle.Bold); + OpenTaiko.stageタイトル.pfMenuTitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Title_ModeSelect_Title_Scale[0]); + OpenTaiko.stageタイトル.pfBoxText = HPrivateFastFont.tInstantiateBoxFont(OpenTaiko.Skin.Title_ModeSelect_Title_Scale[1]); t項目リストの設定_System(refresh: false); - TJAPlayer3.stageコンフィグ.ReloadMenus(); + OpenTaiko.stageコンフィグ.ReloadMenus(); } //} @@ -635,10 +635,10 @@ namespace TJAPlayer3 { // Enter押下後の後処理 if (this.list項目リスト[this.n現在の選択項目] == this.iSystemFullscreen) { - TJAPlayer3.app.b次のタイミングで全画面_ウィンドウ切り替えを行う = true; + OpenTaiko.app.b次のタイミングで全画面_ウィンドウ切り替えを行う = true; } else if (this.list項目リスト[this.n現在の選択項目] == this.iSystemVSyncWait) { - TJAPlayer3.ConfigIni.bEnableVSync = this.iSystemVSyncWait.bON; - TJAPlayer3.app.b次のタイミングで垂直帰線同期切り替えを行う = true; + OpenTaiko.ConfigIni.bEnableVSync = this.iSystemVSyncWait.bON; + OpenTaiko.app.b次のタイミングで垂直帰線同期切り替えを行う = true; } #region [ キーアサインへの遷移と脱出 ] else if (this.list項目リスト[this.n現在の選択項目] == this.iSystemGoToKeyAssign) // #24609 2011.4.12 yyagi @@ -656,7 +656,7 @@ namespace TJAPlayer3 { tConfigIniへ記録する(); t項目リストの設定_KeyAssignTraining(); } else if (this.list項目リスト[this.n現在の選択項目] == this.iDrumsGoToCalibration) { - TJAPlayer3.stageコンフィグ.actCalibrationMode.Start(); + OpenTaiko.stageコンフィグ.actCalibrationMode.Start(); } else if (this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignDrumsReturnToMenu || this.list項目リスト[this.n現在の選択項目] == this.iKeyAssignTrainingReturnToMenu) // #24525 2011.3.15 yyagi { @@ -672,34 +672,34 @@ namespace TJAPlayer3 { #region [ 曲データ一覧の再読み込み ] else if (this.list項目リスト[this.n現在の選択項目] == this.iSystemReloadDTX) // #32081 2013.10.21 yyagi { - if (TJAPlayer3.EnumSongs.IsEnumerating) { + if (OpenTaiko.EnumSongs.IsEnumerating) { // Debug.WriteLine( "バックグラウンドでEnumeratingSongs中だったので、一旦中断します。" ); - TJAPlayer3.EnumSongs.Abort(); - TJAPlayer3.actEnumSongs.DeActivate(); + OpenTaiko.EnumSongs.Abort(); + OpenTaiko.actEnumSongs.DeActivate(); } - TJAPlayer3.EnumSongs.StartEnumFromDisk(); - TJAPlayer3.EnumSongs.ChangeEnumeratePriority(ThreadPriority.Normal); - TJAPlayer3.actEnumSongs.bコマンドでの曲データ取得 = true; - TJAPlayer3.actEnumSongs.Activate(); + OpenTaiko.EnumSongs.StartEnumFromDisk(); + OpenTaiko.EnumSongs.ChangeEnumeratePriority(ThreadPriority.Normal); + OpenTaiko.actEnumSongs.bコマンドでの曲データ取得 = true; + OpenTaiko.actEnumSongs.Activate(); // TJAPlayer3.stage選曲.Refresh(TJAPlayer3.EnumSongs.Songs管理, true); - TJAPlayer3.stageSongSelect.actSongList.ResetSongIndex(); + OpenTaiko.stageSongSelect.actSongList.ResetSongIndex(); } else if (this.list項目リスト[this.n現在の選択項目] == this.iSystemHardReloadDTX) // #32081 2013.10.21 yyagi { - if (TJAPlayer3.EnumSongs.IsEnumerating) { + if (OpenTaiko.EnumSongs.IsEnumerating) { // Debug.WriteLine( "バックグラウンドでEnumeratingSongs中だったので、一旦中断します。" ); - TJAPlayer3.EnumSongs.Abort(); - TJAPlayer3.actEnumSongs.DeActivate(); + OpenTaiko.EnumSongs.Abort(); + OpenTaiko.actEnumSongs.DeActivate(); } - TJAPlayer3.EnumSongs.StartEnumFromDisk(true); - TJAPlayer3.EnumSongs.ChangeEnumeratePriority(ThreadPriority.Normal); - TJAPlayer3.actEnumSongs.bコマンドでの曲データ取得 = true; - TJAPlayer3.actEnumSongs.Activate(); + OpenTaiko.EnumSongs.StartEnumFromDisk(true); + OpenTaiko.EnumSongs.ChangeEnumeratePriority(ThreadPriority.Normal); + OpenTaiko.actEnumSongs.bコマンドでの曲データ取得 = true; + OpenTaiko.actEnumSongs.Activate(); // TJAPlayer3.stage選曲.Refresh(TJAPlayer3.EnumSongs.Songs管理, true); - TJAPlayer3.stageSongSelect.actSongList.ResetSongIndex(); + OpenTaiko.stageSongSelect.actSongList.ResetSongIndex(); } #endregion } @@ -713,13 +713,13 @@ namespace TJAPlayer3 { path = System.IO.Path.Combine(path, @$"Graphics{Path.DirectorySeparatorChar}1_Title{Path.DirectorySeparatorChar}Background.png"); SKBitmap bmSrc = SKBitmap.Decode(path); - int _w = TJAPlayer3.Skin.Resolution[0] / 4;// bmSrc.Width / 4; - int _h = TJAPlayer3.Skin.Resolution[1] / 4;// bmSrc.Height / 4; + int _w = OpenTaiko.Skin.Resolution[0] / 4;// bmSrc.Width / 4; + int _h = OpenTaiko.Skin.Resolution[1] / 4;// bmSrc.Height / 4; if (txSkinSample1 != null) { - TJAPlayer3.tDisposeSafely(ref txSkinSample1); + OpenTaiko.tDisposeSafely(ref txSkinSample1); } - txSkinSample1 = TJAPlayer3.tテクスチャの生成(bmSrc, false); + txSkinSample1 = OpenTaiko.tテクスチャの生成(bmSrc, false); txSkinSample1.vcScaleRatio = new Silk.NET.Maths.Vector3D(_w / (float)txSkinSample1.szTextureSize.Width, _h / (float)txSkinSample1.szTextureSize.Height, 0); @@ -970,7 +970,7 @@ namespace TJAPlayer3 { } #endregion public void t次に移動() { - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); if (this.b要素値にフォーカス中) { this.list項目リスト[this.n現在の選択項目].t項目値を前へ移動(); t要素値を上下に変更中の処理(); @@ -979,7 +979,7 @@ namespace TJAPlayer3 { } } public void t前に移動() { - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); if (this.b要素値にフォーカス中) { this.list項目リスト[this.n現在の選択項目].t項目値を次へ移動(); t要素値を上下に変更中の処理(); @@ -1005,16 +1005,16 @@ namespace TJAPlayer3 { this.eメニュー種別 = Eメニュー種別.Unknown; #region [ スキン選択肢と、現在選択中のスキン(index)の準備 #28195 2012.5.2 yyagi ] - int ns = (TJAPlayer3.Skin.strSystemSkinSubfolders == null) ? 0 : TJAPlayer3.Skin.strSystemSkinSubfolders.Length; - int nb = (TJAPlayer3.Skin.strBoxDefSkinSubfolders == null) ? 0 : TJAPlayer3.Skin.strBoxDefSkinSubfolders.Length; + int ns = (OpenTaiko.Skin.strSystemSkinSubfolders == null) ? 0 : OpenTaiko.Skin.strSystemSkinSubfolders.Length; + int nb = (OpenTaiko.Skin.strBoxDefSkinSubfolders == null) ? 0 : OpenTaiko.Skin.strBoxDefSkinSubfolders.Length; skinSubFolders = new string[ns + nb]; for (int i = 0; i < ns; i++) { - skinSubFolders[i] = TJAPlayer3.Skin.strSystemSkinSubfolders[i]; + skinSubFolders[i] = OpenTaiko.Skin.strSystemSkinSubfolders[i]; } for (int i = 0; i < nb; i++) { - skinSubFolders[ns + i] = TJAPlayer3.Skin.strBoxDefSkinSubfolders[i]; + skinSubFolders[ns + i] = OpenTaiko.Skin.strBoxDefSkinSubfolders[i]; } - skinSubFolder_org = TJAPlayer3.Skin.GetCurrentSkinSubfolderFullName(true); + skinSubFolder_org = OpenTaiko.Skin.GetCurrentSkinSubfolderFullName(true); Array.Sort(skinSubFolders); skinNames = CSkin.GetSkinName(skinSubFolders); nSkinIndex = Array.BinarySearch(skinSubFolders, skinSubFolder_org); @@ -1053,8 +1053,8 @@ namespace TJAPlayer3 { base.DeActivate(); #region [ Skin変更 ] - if (TJAPlayer3.Skin.GetCurrentSkinSubfolderFullName(true) != this.skinSubFolder_org) { - TJAPlayer3.app.RefreshSkin(); + if (OpenTaiko.Skin.GetCurrentSkinSubfolderFullName(true) != this.skinSubFolder_org) { + OpenTaiko.app.RefreshSkin(); } #endregion @@ -1085,15 +1085,15 @@ namespace TJAPlayer3 { soundDeviceType = ESoundDeviceType.Unknown; break; } - TJAPlayer3.SoundManager.tInitialize(soundDeviceType, + OpenTaiko.SoundManager.tInitialize(soundDeviceType, this.iSystemBassBufferSizeMs.n現在の値, this.iSystemWASAPIBufferSizeMs.n現在の値, 0, // this.iSystemASIOBufferSizeMs.n現在の値, this.iSystemASIODevice.n現在選択されている項目番号, this.iSystemSoundTimerType.bON); - TJAPlayer3.app.ShowWindowTitleWithSoundType(); - TJAPlayer3.Skin.ReloadSkin();// 音声の再読み込みをすることによって、音量の初期化を防ぐ + OpenTaiko.app.ShowWindowTitleWithSoundType(); + OpenTaiko.Skin.ReloadSkin();// 音声の再読み込みをすることによって、音量の初期化を防ぐ } #endregion #region [ サウンドのタイムストレッチモード変更 ] @@ -1101,7 +1101,7 @@ namespace TJAPlayer3 { #endregion } public override void CreateManagedResource() { - this.prvFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Config_Font_Scale); // t項目リストの設定 の前に必要 + this.prvFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Config_Font_Scale); // t項目リストの設定 の前に必要 //this.tx通常項目行パネル = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\4_itembox.png" ), false ); //this.txその他項目行パネル = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\4_itembox other.png" ), false ); @@ -1112,7 +1112,7 @@ namespace TJAPlayer3 { public override void ReleaseManagedResource() { prvFont.Dispose(); - TJAPlayer3.tテクスチャの解放(ref this.txSkinSample1); + OpenTaiko.tテクスチャの解放(ref this.txSkinSample1); //CDTXMania.tテクスチャの解放( ref this.tx通常項目行パネル ); //CDTXMania.tテクスチャの解放( ref this.txその他項目行パネル ); //CDTXMania.tテクスチャの解放( ref this.tx三角矢印 ); @@ -1152,8 +1152,8 @@ namespace TJAPlayer3 { #region [ 初めての進行描画 ] //----------------- if (base.IsFirstDraw) { - this.nスクロール用タイマ値 = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); - this.ct三角矢印アニメ.Start(0, 9, 50, TJAPlayer3.Timer); + this.nスクロール用タイマ値 = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); + this.ct三角矢印アニメ.Start(0, 9, 50, OpenTaiko.Timer); base.IsFirstDraw = false; } @@ -1164,7 +1164,7 @@ namespace TJAPlayer3 { #region [ 項目スクロールの進行 ] //----------------- - long n現在時刻 = TJAPlayer3.Timer.NowTime; + long n現在時刻 = OpenTaiko.Timer.NowTime; if (n現在時刻 < this.nスクロール用タイマ値) this.nスクロール用タイマ値 = n現在時刻; const int INTERVAL = 2; // [ms] @@ -1209,14 +1209,14 @@ namespace TJAPlayer3 { this.n現在のスクロールカウンタ -= 100; this.n目標のスクロールカウンタ -= 100; if (this.n目標のスクロールカウンタ == 0) { - TJAPlayer3.stageコンフィグ.t項目変更通知(); + OpenTaiko.stageコンフィグ.t項目変更通知(); } } else if (this.n現在のスクロールカウンタ <= -100) { this.n現在の選択項目 = this.t前の項目(this.n現在の選択項目); this.n現在のスクロールカウンタ += 100; this.n目標のスクロールカウンタ += 100; if (this.n目標のスクロールカウンタ == 0) { - TJAPlayer3.stageコンフィグ.t項目変更通知(); + OpenTaiko.stageコンフィグ.t項目変更通知(); } } //----------------- @@ -1242,17 +1242,17 @@ namespace TJAPlayer3 { #region [ 計11個の項目パネルを描画する。] //----------------- int nItem = this.n現在の選択項目; - for (int i = 0; i < (TJAPlayer3.Skin.Config_ItemBox_Count / 2) - 1; i++) + for (int i = 0; i < (OpenTaiko.Skin.Config_ItemBox_Count / 2) - 1; i++) nItem = this.t前の項目(nItem); - for (int i = 0; i < TJAPlayer3.Skin.Config_ItemBox_Count; i++) // n行番号 == 0 がフォーカスされている項目パネル。 + for (int i = 0; i < OpenTaiko.Skin.Config_ItemBox_Count; i++) // n行番号 == 0 がフォーカスされている項目パネル。 { - bool centerFlag = i == (TJAPlayer3.Skin.Config_ItemBox_Count / 2) - 1; + bool centerFlag = i == (OpenTaiko.Skin.Config_ItemBox_Count / 2) - 1; #region [ 今まさに画面外に飛びだそうとしている項目パネルは描画しない。] //----------------- if (((i == 0) && (this.n現在のスクロールカウンタ > 0)) || // 上に飛び出そうとしている - ((i == TJAPlayer3.Skin.Config_ItemBox_Count - 1) && (this.n現在のスクロールカウンタ < 0))) // 下に飛び出そうとしている + ((i == OpenTaiko.Skin.Config_ItemBox_Count - 1) && (this.n現在のスクロールカウンタ < 0))) // 下に飛び出そうとしている { nItem = this.t次の項目(nItem); continue; @@ -1260,17 +1260,17 @@ namespace TJAPlayer3 { //----------------- #endregion - int n移動先の行の基本位置 = (this.n現在のスクロールカウンタ <= 0) ? ((i + 1) % TJAPlayer3.Skin.Config_ItemBox_Count) : (((i - 1) + TJAPlayer3.Skin.Config_ItemBox_Count) % TJAPlayer3.Skin.Config_ItemBox_Count); - int x = TJAPlayer3.Skin.Config_ItemBox_X[i] + ((int)((TJAPlayer3.Skin.Config_ItemBox_X[n移動先の行の基本位置] - TJAPlayer3.Skin.Config_ItemBox_X[i]) * (((double)Math.Abs(this.n現在のスクロールカウンタ)) / 100.0))); - int y = TJAPlayer3.Skin.Config_ItemBox_Y[i] + ((int)((TJAPlayer3.Skin.Config_ItemBox_Y[n移動先の行の基本位置] - TJAPlayer3.Skin.Config_ItemBox_Y[i]) * (((double)Math.Abs(this.n現在のスクロールカウンタ)) / 100.0))); + int n移動先の行の基本位置 = (this.n現在のスクロールカウンタ <= 0) ? ((i + 1) % OpenTaiko.Skin.Config_ItemBox_Count) : (((i - 1) + OpenTaiko.Skin.Config_ItemBox_Count) % OpenTaiko.Skin.Config_ItemBox_Count); + int x = OpenTaiko.Skin.Config_ItemBox_X[i] + ((int)((OpenTaiko.Skin.Config_ItemBox_X[n移動先の行の基本位置] - OpenTaiko.Skin.Config_ItemBox_X[i]) * (((double)Math.Abs(this.n現在のスクロールカウンタ)) / 100.0))); + int y = OpenTaiko.Skin.Config_ItemBox_Y[i] + ((int)((OpenTaiko.Skin.Config_ItemBox_Y[n移動先の行の基本位置] - OpenTaiko.Skin.Config_ItemBox_Y[i]) * (((double)Math.Abs(this.n現在のスクロールカウンタ)) / 100.0))); #region [ 現在の行の項目パネル枠を描画。] //----------------- switch (this.list項目リスト[nItem].eパネル種別) { case CItemBase.EPanelType.Normal: case CItemBase.EPanelType.Other: - if (TJAPlayer3.Tx.Config_ItemBox != null) - TJAPlayer3.Tx.Config_ItemBox.t2D描画(x, y); + if (OpenTaiko.Tx.Config_ItemBox != null) + OpenTaiko.Tx.Config_ItemBox.t2D描画(x, y); break; } //----------------- @@ -1279,10 +1279,10 @@ namespace TJAPlayer3 { //----------------- if (listMenu[nItem].txMenuItemRight != null) // 自前のキャッシュに含まれているようなら、再レンダリングせずキャッシュを使用 { - listMenu[nItem].txMenuItemRight.t2D描画(x + TJAPlayer3.Skin.Config_ItemBox_Font_Offset[0], y + TJAPlayer3.Skin.Config_ItemBox_Font_Offset[1]); + listMenu[nItem].txMenuItemRight.t2D描画(x + OpenTaiko.Skin.Config_ItemBox_Font_Offset[0], y + OpenTaiko.Skin.Config_ItemBox_Font_Offset[1]); } else { using (var bmpItem = prvFont.DrawText(this.list項目リスト[nItem].str項目名, Color.White, Color.Black, null, 30)) { - listMenu[nItem].txMenuItemRight = TJAPlayer3.tテクスチャの生成(bmpItem); + listMenu[nItem].txMenuItemRight = OpenTaiko.tテクスチャの生成(bmpItem); // ctItem.t2D描画( CDTXMania.app.Device, ( x + 0x12 ) * Scale.X, ( y + 12 ) * Scale.Y - 20 ); // CDTXMania.tテクスチャの解放( ref ctItem ); } @@ -1360,7 +1360,7 @@ namespace TJAPlayer3 { if (this.list項目リスト[this.n現在の選択項目] == this.iSystemSkinSubfolder) { tGenerateSkinSample(); // 最初にSkinの選択肢にきたとき(Enterを押す前)に限り、サンプル生成が発生する。 if (txSkinSample1 != null) { - txSkinSample1.t2D描画(TJAPlayer3.Skin.Config_SkinSample1[0], TJAPlayer3.Skin.Config_SkinSample1[1]); + txSkinSample1.t2D描画(OpenTaiko.Skin.Config_SkinSample1[0], OpenTaiko.Skin.Config_SkinSample1[1]); } } #endregion @@ -1374,11 +1374,11 @@ namespace TJAPlayer3 { Color.Black, Color.White, null, - TJAPlayer3.Skin.Config_Selected_Menu_Text_Grad_Color_1, - TJAPlayer3.Skin.Config_Selected_Menu_Text_Grad_Color_2, + OpenTaiko.Skin.Config_Selected_Menu_Text_Grad_Color_1, + OpenTaiko.Skin.Config_Selected_Menu_Text_Grad_Color_2, 30)) { - using (var txStr = TJAPlayer3.tテクスチャの生成(bmpStr, false)) { - txStr.t2D描画(x + TJAPlayer3.Skin.Config_ItemBox_ItemValue_Font_Offset[0], y + TJAPlayer3.Skin.Config_ItemBox_ItemValue_Font_Offset[1]); + using (var txStr = OpenTaiko.tテクスチャの生成(bmpStr, false)) { + txStr.t2D描画(x + OpenTaiko.Skin.Config_ItemBox_ItemValue_Font_Offset[0], y + OpenTaiko.Skin.Config_ItemBox_ItemValue_Font_Offset[1]); } } } else { @@ -1390,12 +1390,12 @@ namespace TJAPlayer3 { stm.strParam = (o == null) ? "" : o.ToString(); using (var bmpStr = prvFont.DrawText(strParam, Color.White, Color.Black, null, 30)) { - stm.txParam = TJAPlayer3.tテクスチャの生成(bmpStr, false); + stm.txParam = OpenTaiko.tテクスチャの生成(bmpStr, false); } listMenu[nItem] = stm; } - listMenu[nItem].txParam.t2D描画(x + TJAPlayer3.Skin.Config_ItemBox_ItemValue_Font_Offset[0], y + TJAPlayer3.Skin.Config_ItemBox_ItemValue_Font_Offset[1]); + listMenu[nItem].txParam.t2D描画(x + OpenTaiko.Skin.Config_ItemBox_ItemValue_Font_Offset[0], y + OpenTaiko.Skin.Config_ItemBox_ItemValue_Font_Offset[1]); } //----------------- #endregion @@ -1416,22 +1416,22 @@ namespace TJAPlayer3 { // 位置決定。 if (this.b要素値にフォーカス中) { - x_upper = TJAPlayer3.Skin.Config_Arrow_Focus_X[0]; // 要素値の上下あたり。 - x_lower = TJAPlayer3.Skin.Config_Arrow_Focus_X[1]; // 要素値の上下あたり。 - y_upper = TJAPlayer3.Skin.Config_Arrow_Focus_Y[0] - this.ct三角矢印アニメ.CurrentValue; - y_lower = TJAPlayer3.Skin.Config_Arrow_Focus_Y[1] + this.ct三角矢印アニメ.CurrentValue; + x_upper = OpenTaiko.Skin.Config_Arrow_Focus_X[0]; // 要素値の上下あたり。 + x_lower = OpenTaiko.Skin.Config_Arrow_Focus_X[1]; // 要素値の上下あたり。 + y_upper = OpenTaiko.Skin.Config_Arrow_Focus_Y[0] - this.ct三角矢印アニメ.CurrentValue; + y_lower = OpenTaiko.Skin.Config_Arrow_Focus_Y[1] + this.ct三角矢印アニメ.CurrentValue; } else { - x_upper = TJAPlayer3.Skin.Config_Arrow_X[0]; // 要素値の上下あたり。 - x_lower = TJAPlayer3.Skin.Config_Arrow_X[1]; // 要素値の上下あたり。 - y_upper = TJAPlayer3.Skin.Config_Arrow_Y[0] - this.ct三角矢印アニメ.CurrentValue; - y_lower = TJAPlayer3.Skin.Config_Arrow_Y[1] + this.ct三角矢印アニメ.CurrentValue; + x_upper = OpenTaiko.Skin.Config_Arrow_X[0]; // 要素値の上下あたり。 + x_lower = OpenTaiko.Skin.Config_Arrow_X[1]; // 要素値の上下あたり。 + y_upper = OpenTaiko.Skin.Config_Arrow_Y[0] - this.ct三角矢印アニメ.CurrentValue; + y_lower = OpenTaiko.Skin.Config_Arrow_Y[1] + this.ct三角矢印アニメ.CurrentValue; } // 描画。 - if (TJAPlayer3.Tx.Config_Arrow != null) { - TJAPlayer3.Tx.Config_Arrow.t2D描画(x_upper, y_upper, new Rectangle(0, 0, TJAPlayer3.Tx.Config_Arrow.sz画像サイズ.Width, TJAPlayer3.Tx.Config_Arrow.sz画像サイズ.Height / 2)); - TJAPlayer3.Tx.Config_Arrow.t2D描画(x_lower, y_lower, new Rectangle(0, TJAPlayer3.Tx.Config_Arrow.sz画像サイズ.Height / 2, TJAPlayer3.Tx.Config_Arrow.sz画像サイズ.Width, TJAPlayer3.Tx.Config_Arrow.sz画像サイズ.Height / 2)); + if (OpenTaiko.Tx.Config_Arrow != null) { + OpenTaiko.Tx.Config_Arrow.t2D描画(x_upper, y_upper, new Rectangle(0, 0, OpenTaiko.Tx.Config_Arrow.sz画像サイズ.Width, OpenTaiko.Tx.Config_Arrow.sz画像サイズ.Height / 2)); + OpenTaiko.Tx.Config_Arrow.t2D描画(x_lower, y_lower, new Rectangle(0, OpenTaiko.Tx.Config_Arrow.sz画像サイズ.Height / 2, OpenTaiko.Tx.Config_Arrow.sz画像サイズ.Width, OpenTaiko.Tx.Config_Arrow.sz画像サイズ.Height / 2)); } } //----------------- @@ -1696,60 +1696,60 @@ namespace TJAPlayer3 { } } private void tConfigIniへ記録する_System() { - TJAPlayer3.ConfigIni.nSongSpeed = this.iCommonPlaySpeed.n現在の値; + OpenTaiko.ConfigIni.nSongSpeed = this.iCommonPlaySpeed.n現在の値; - TJAPlayer3.ConfigIni.nGraphicsDeviceType = this.iSystemGraphicsType.n現在選択されている項目番号; - TJAPlayer3.ConfigIni.bFullScreen = this.iSystemFullscreen.bON; - TJAPlayer3.ConfigIni.bIncludeSubfoldersOnRandomSelect = this.iSystemRandomFromSubBox.bON; + OpenTaiko.ConfigIni.nGraphicsDeviceType = this.iSystemGraphicsType.n現在選択されている項目番号; + OpenTaiko.ConfigIni.bFullScreen = this.iSystemFullscreen.bON; + OpenTaiko.ConfigIni.bIncludeSubfoldersOnRandomSelect = this.iSystemRandomFromSubBox.bON; //CDTXMania.ConfigIni.bWave再生位置自動調整機能有効 = this.iSystemAdjustWaves.bON; - TJAPlayer3.ConfigIni.bEnableVSync = this.iSystemVSyncWait.bON; - TJAPlayer3.ConfigIni.bBufferedInputs = this.iSystemBufferedInput.bON; - TJAPlayer3.ConfigIni.bEnableAVI = this.iSystemAVI.bON; - TJAPlayer3.ConfigIni.eClipDispType = (EClipDispType)this.iSystemAVIDisplayMode.n現在選択されている項目番号; - TJAPlayer3.ConfigIni.bEnableBGA = this.iSystemBGA.bON; - TJAPlayer3.ConfigIni.n曲が選択されてからプレビュー音が鳴るまでのウェイトms = this.iSystemPreviewSoundWait.n現在の値; - TJAPlayer3.ConfigIni.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms = this.iSystemPreviewImageWait.n現在の値; - TJAPlayer3.ConfigIni.bDisplayDebugInfo = this.iSystemDebugInfo.bON; - TJAPlayer3.ConfigIni.n背景の透過度 = this.iSystemBGAlpha.n現在の値; - TJAPlayer3.ConfigIni.bBGM音を発声する = this.iSystemBGMSound.bON; + OpenTaiko.ConfigIni.bEnableVSync = this.iSystemVSyncWait.bON; + OpenTaiko.ConfigIni.bBufferedInputs = this.iSystemBufferedInput.bON; + OpenTaiko.ConfigIni.bEnableAVI = this.iSystemAVI.bON; + OpenTaiko.ConfigIni.eClipDispType = (EClipDispType)this.iSystemAVIDisplayMode.n現在選択されている項目番号; + OpenTaiko.ConfigIni.bEnableBGA = this.iSystemBGA.bON; + OpenTaiko.ConfigIni.n曲が選択されてからプレビュー音が鳴るまでのウェイトms = this.iSystemPreviewSoundWait.n現在の値; + OpenTaiko.ConfigIni.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms = this.iSystemPreviewImageWait.n現在の値; + OpenTaiko.ConfigIni.bDisplayDebugInfo = this.iSystemDebugInfo.bON; + OpenTaiko.ConfigIni.n背景の透過度 = this.iSystemBGAlpha.n現在の値; + OpenTaiko.ConfigIni.bBGM音を発声する = this.iSystemBGMSound.bON; - TJAPlayer3.ConfigIni.bDanTowerHide = this.iDanTowerHide.bON; + OpenTaiko.ConfigIni.bDanTowerHide = this.iDanTowerHide.bON; // TJAPlayer3.ConfigIni.ApplyLoudnessMetadata = this.iSystemApplyLoudnessMetadata.bON; // TJAPlayer3.ConfigIni.TargetLoudness = this.iSystemTargetLoudness.n現在の値 / 10.0; - TJAPlayer3.ConfigIni.ApplySongVol = this.iSystemApplySongVol.bON; - TJAPlayer3.ConfigIni.SoundEffectLevel = this.iSystemSoundEffectLevel.n現在の値; - TJAPlayer3.ConfigIni.VoiceLevel = this.iSystemVoiceLevel.n現在の値; - TJAPlayer3.ConfigIni.SongPreviewLevel = this.iSystemSongPreviewLevel.n現在の値; - TJAPlayer3.ConfigIni.SongPlaybackLevel = this.iSystemSongPlaybackLevel.n現在の値; - TJAPlayer3.ConfigIni.KeyboardSoundLevelIncrement = this.iSystemKeyboardSoundLevelIncrement.n現在の値; - TJAPlayer3.ConfigIni.MusicPreTimeMs = this.MusicPreTimeMs.n現在の値; + OpenTaiko.ConfigIni.ApplySongVol = this.iSystemApplySongVol.bON; + OpenTaiko.ConfigIni.SoundEffectLevel = this.iSystemSoundEffectLevel.n現在の値; + OpenTaiko.ConfigIni.VoiceLevel = this.iSystemVoiceLevel.n現在の値; + OpenTaiko.ConfigIni.SongPreviewLevel = this.iSystemSongPreviewLevel.n現在の値; + OpenTaiko.ConfigIni.SongPlaybackLevel = this.iSystemSongPlaybackLevel.n現在の値; + OpenTaiko.ConfigIni.KeyboardSoundLevelIncrement = this.iSystemKeyboardSoundLevelIncrement.n現在の値; + OpenTaiko.ConfigIni.MusicPreTimeMs = this.MusicPreTimeMs.n現在の値; - TJAPlayer3.ConfigIni.bOutputLogs = this.iLogOutputLog.bON; + OpenTaiko.ConfigIni.bOutputLogs = this.iLogOutputLog.bON; //CDTXMania.ConfigIni.bストイックモード = this.iSystemStoicMode.bON; //CDTXMania.ConfigIni.nShowLagType = this.iSystemShowLag.n現在選択されている項目番号; // #25370 2011.6.3 yyagi - TJAPlayer3.ConfigIni.bIsAutoResultCapture = this.iSystemAutoResultCapture.bON; // #25399 2011.6.9 yyagi - TJAPlayer3.ConfigIni.SendDiscordPlayingInformation = this.SendDiscordPlayingInformation.bON; + OpenTaiko.ConfigIni.bIsAutoResultCapture = this.iSystemAutoResultCapture.bON; // #25399 2011.6.9 yyagi + OpenTaiko.ConfigIni.SendDiscordPlayingInformation = this.SendDiscordPlayingInformation.bON; - TJAPlayer3.ConfigIni.nRisky = this.iSystemRisky.n現在の値; // #23559 2011.7.27 yyagi + OpenTaiko.ConfigIni.nRisky = this.iSystemRisky.n現在の値; // #23559 2011.7.27 yyagi - TJAPlayer3.ConfigIni.strSystemSkinSubfolderFullName = skinSubFolders[nSkinIndex]; // #28195 2012.5.2 yyagi - TJAPlayer3.Skin.SetCurrentSkinSubfolderFullName(TJAPlayer3.ConfigIni.strSystemSkinSubfolderFullName, true); + OpenTaiko.ConfigIni.strSystemSkinSubfolderFullName = skinSubFolders[nSkinIndex]; // #28195 2012.5.2 yyagi + OpenTaiko.Skin.SetCurrentSkinSubfolderFullName(OpenTaiko.ConfigIni.strSystemSkinSubfolderFullName, true); - TJAPlayer3.ConfigIni.nSoundDeviceType = this.iSystemSoundType.n現在選択されている項目番号; // #24820 2013.1.3 yyagi - TJAPlayer3.ConfigIni.nBassBufferSizeMs = this.iSystemBassBufferSizeMs.n現在の値; // #24820 2013.1.15 yyagi - TJAPlayer3.ConfigIni.nWASAPIBufferSizeMs = this.iSystemWASAPIBufferSizeMs.n現在の値; // #24820 2013.1.15 yyagi + OpenTaiko.ConfigIni.nSoundDeviceType = this.iSystemSoundType.n現在選択されている項目番号; // #24820 2013.1.3 yyagi + OpenTaiko.ConfigIni.nBassBufferSizeMs = this.iSystemBassBufferSizeMs.n現在の値; // #24820 2013.1.15 yyagi + OpenTaiko.ConfigIni.nWASAPIBufferSizeMs = this.iSystemWASAPIBufferSizeMs.n現在の値; // #24820 2013.1.15 yyagi // CDTXMania.ConfigIni.nASIOBufferSizeMs = this.iSystemASIOBufferSizeMs.n現在の値; // #24820 2013.1.3 yyagi - TJAPlayer3.ConfigIni.nASIODevice = this.iSystemASIODevice.n現在選択されている項目番号; // #24820 2013.1.17 yyagi - TJAPlayer3.ConfigIni.bUseOSTimer = this.iSystemSoundTimerType.bON; // #33689 2014.6.17 yyagi + OpenTaiko.ConfigIni.nASIODevice = this.iSystemASIODevice.n現在選択されている項目番号; // #24820 2013.1.17 yyagi + OpenTaiko.ConfigIni.bUseOSTimer = this.iSystemSoundTimerType.bON; // #33689 2014.6.17 yyagi - TJAPlayer3.ConfigIni.bTimeStretch = this.iSystemTimeStretch.bON; // #23664 2013.2.24 yyagi + OpenTaiko.ConfigIni.bTimeStretch = this.iSystemTimeStretch.bON; // #23664 2013.2.24 yyagi - TJAPlayer3.ConfigIni.sLang = CLangManager.intToLang(this.iSystemLanguage.n現在選択されている項目番号); - CLangManager.langAttach(TJAPlayer3.ConfigIni.sLang); + OpenTaiko.ConfigIni.sLang = CLangManager.intToLang(this.iSystemLanguage.n現在選択されている項目番号); + CLangManager.langAttach(OpenTaiko.ConfigIni.sLang); //Trace.TraceInformation( "saved" ); @@ -1758,62 +1758,62 @@ namespace TJAPlayer3 { //Trace.TraceInformation( "Skin現在BoxDef : " + CSkin.strBoxDefSkinSubfolderFullName ); //CDTXMania.ConfigIni.nMasterVolume = this.iSystemMasterVolume.n現在の値; // #33700 2014.4.26 yyagi //CDTXMania.ConfigIni.e判定表示優先度 = (E判定表示優先度) this.iSystemJudgeDispPriority.n現在選択されている項目番号; - TJAPlayer3.ConfigIni.ShowChara = this.ShowChara.bON; - TJAPlayer3.ConfigIni.ShowDancer = this.ShowDancer.bON; - TJAPlayer3.ConfigIni.ShowRunner = this.ShowRunner.bON; - TJAPlayer3.ConfigIni.ShowMob = this.ShowMob.bON; - TJAPlayer3.ConfigIni.ShowFooter = this.ShowFooter.bON; - TJAPlayer3.ConfigIni.ShowPuchiChara = this.ShowPuchiChara.bON; + OpenTaiko.ConfigIni.ShowChara = this.ShowChara.bON; + OpenTaiko.ConfigIni.ShowDancer = this.ShowDancer.bON; + OpenTaiko.ConfigIni.ShowRunner = this.ShowRunner.bON; + OpenTaiko.ConfigIni.ShowMob = this.ShowMob.bON; + OpenTaiko.ConfigIni.ShowFooter = this.ShowFooter.bON; + OpenTaiko.ConfigIni.ShowPuchiChara = this.ShowPuchiChara.bON; - TJAPlayer3.ConfigIni.nPlayerCount = this.iTaikoPlayerCount.n現在の値; + OpenTaiko.ConfigIni.nPlayerCount = this.iTaikoPlayerCount.n現在の値; //TJAPlayer3.ConfigIni.nLayoutType = this.iLayoutType.n現在の値; - TJAPlayer3.ConfigIni.FastRender = this.FastRender.bON; - TJAPlayer3.ConfigIni.ASyncTextureLoad = this.ASyncTextureLoad.bON; - TJAPlayer3.ConfigIni.SimpleMode = this.SimpleMode.bON; + OpenTaiko.ConfigIni.FastRender = this.FastRender.bON; + OpenTaiko.ConfigIni.ASyncTextureLoad = this.ASyncTextureLoad.bON; + OpenTaiko.ConfigIni.SimpleMode = this.SimpleMode.bON; } private void tConfigIniへ記録する_Drums() { //TJAPlayer3.ConfigIni.b太鼓パートAutoPlay = this.iTaikoAutoPlay.bON; //TJAPlayer3.ConfigIni.b太鼓パートAutoPlay2P = this.iTaikoAutoPlay2P.bON; //TJAPlayer3.ConfigIni.bAuto先生の連打 = this.iTaikoAutoRoll.bON; - TJAPlayer3.ConfigIni.nRollsPerSec = this.iRollsPerSec.n現在の値; + OpenTaiko.ConfigIni.nRollsPerSec = this.iRollsPerSec.n現在の値; - TJAPlayer3.ConfigIni.nDefaultAILevel = this.iAILevel.n現在の値; + OpenTaiko.ConfigIni.nDefaultAILevel = this.iAILevel.n現在の値; for (int i = 0; i < 2; i++) - TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i); + OpenTaiko.NamePlate.tNamePlateRefreshTitles(i); //TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.SaveFile] = this.iDrumsScrollSpeed.n現在の値; - TJAPlayer3.ConfigIni.bTight = this.iDrumsTight.bON; + OpenTaiko.ConfigIni.bTight = this.iDrumsTight.bON; //TJAPlayer3.ConfigIni.nInputAdjustTimeMs = this.iInputAdjustTimeMs.n現在の値; - TJAPlayer3.ConfigIni.nGlobalOffsetMs = this.iGlobalOffsetMs.n現在の値; + OpenTaiko.ConfigIni.nGlobalOffsetMs = this.iGlobalOffsetMs.n現在の値; - TJAPlayer3.ConfigIni.n表示可能な最小コンボ数.Drums = this.iSystemMinComboDrums.n現在の値; - TJAPlayer3.ConfigIni.nRisky = this.iSystemRisky.n現在の値; // #23559 2911.7.27 yyagi + OpenTaiko.ConfigIni.n表示可能な最小コンボ数.Drums = this.iSystemMinComboDrums.n現在の値; + OpenTaiko.ConfigIni.nRisky = this.iSystemRisky.n現在の値; // #23559 2911.7.27 yyagi //CDTXMania.ConfigIni.e判定表示優先度.Drums = (E判定表示優先度) this.iDrumsJudgeDispPriority.n現在選択されている項目番号; - TJAPlayer3.ConfigIni.bBranchGuide = this.iTaikoBranchGuide.bON; - TJAPlayer3.ConfigIni.nDefaultCourse = this.iTaikoDefaultCourse.n現在選択されている項目番号; - TJAPlayer3.ConfigIni.nScoreMode = this.iTaikoScoreMode.n現在選択されている項目番号; - TJAPlayer3.ConfigIni.ShinuchiMode = this.ShinuchiMode.bON; - TJAPlayer3.ConfigIni.nBranchAnime = this.iTaikoBranchAnime.n現在選択されている項目番号; + OpenTaiko.ConfigIni.bBranchGuide = this.iTaikoBranchGuide.bON; + OpenTaiko.ConfigIni.nDefaultCourse = this.iTaikoDefaultCourse.n現在選択されている項目番号; + OpenTaiko.ConfigIni.nScoreMode = this.iTaikoScoreMode.n現在選択されている項目番号; + OpenTaiko.ConfigIni.ShinuchiMode = this.ShinuchiMode.bON; + OpenTaiko.ConfigIni.nBranchAnime = this.iTaikoBranchAnime.n現在選択されている項目番号; //CDTXMania.ConfigIni.bHispeedRandom = this.iTaikoHispeedRandom.bON; - TJAPlayer3.ConfigIni.bNoInfo = this.iTaikoNoInfo.bON; + OpenTaiko.ConfigIni.bNoInfo = this.iTaikoNoInfo.bON; //TJAPlayer3.ConfigIni.eRandom.Taiko = (Eランダムモード)this.iTaikoRandom.n現在選択されている項目番号; //TJAPlayer3.ConfigIni.eSTEALTH = (Eステルスモード)this.iTaikoStealth.n現在選択されている項目番号; - TJAPlayer3.ConfigIni.eGameMode = (EGame)this.iTaikoGameMode.n現在選択されている項目番号; + OpenTaiko.ConfigIni.eGameMode = (EGame)this.iTaikoGameMode.n現在選択されている項目番号; //TJAPlayer3.ConfigIni.bJust = this.iTaikoJust.bON; - TJAPlayer3.ConfigIni.bJudgeCountDisplay = this.iTaikoJudgeCountDisp.bON; - TJAPlayer3.ConfigIni.ShowExExtraAnime = this.iShowExExtraAnime.bON; - TJAPlayer3.ConfigIni.bJudgeBigNotes = this.iTaikoBigNotesJudge.bON; - TJAPlayer3.ConfigIni.bForceNormalGauge = this.iTaikoForceNormalGauge.bON; + OpenTaiko.ConfigIni.bJudgeCountDisplay = this.iTaikoJudgeCountDisp.bON; + OpenTaiko.ConfigIni.ShowExExtraAnime = this.iShowExExtraAnime.bON; + OpenTaiko.ConfigIni.bJudgeBigNotes = this.iTaikoBigNotesJudge.bON; + OpenTaiko.ConfigIni.bForceNormalGauge = this.iTaikoForceNormalGauge.bON; - TJAPlayer3.ConfigIni.TokkunSkipMeasures = this.TokkunSkipCount.n現在の値; - TJAPlayer3.ConfigIni.TokkunMashInterval = this.TokkunMashInterval.n現在の値; + OpenTaiko.ConfigIni.TokkunSkipMeasures = this.TokkunSkipCount.n現在の値; + OpenTaiko.ConfigIni.TokkunMashInterval = this.TokkunMashInterval.n現在の値; } //----------------- #endregion diff --git a/OpenTaiko/src/Stages/04.Config/CStageコンフィグ.cs b/OpenTaiko/src/Stages/04.Config/CStageコンフィグ.cs index 4bb17364..1b974f96 100644 --- a/OpenTaiko/src/Stages/04.Config/CStageコンフィグ.cs +++ b/OpenTaiko/src/Stages/04.Config/CStageコンフィグ.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; using FDK; using SkiaSharp; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CStageコンフィグ : CStage { // プロパティ @@ -52,12 +52,12 @@ namespace TJAPlayer3 { Trace.TraceInformation("コンフィグステージを活性化します。"); Trace.Indent(); try { - TJAPlayer3.Skin.bgmコンフィグ画面.tPlay(); + OpenTaiko.Skin.bgmコンフィグ画面.tPlay(); this.n現在のメニュー番号 = 0; // for (int i = 0; i < 4; i++) // { // - this.ctキー反復用[i] = new CCounter(0, 0, 0, TJAPlayer3.Timer); // + this.ctキー反復用[i] = new CCounter(0, 0, 0, OpenTaiko.Timer); // } // this.bメニューにフォーカス中 = true; // ここまでOPTIONと共通 this.eItemPanelモード = EItemPanelモード.パッド一覧; @@ -83,9 +83,9 @@ namespace TJAPlayer3 { Trace.TraceInformation("コンフィグステージを非活性化します。"); Trace.Indent(); try { - TJAPlayer3.Skin.bgmコンフィグ画面.tStop(); + OpenTaiko.Skin.bgmコンフィグ画面.tStop(); - TJAPlayer3.ConfigIni.t書き出し(TJAPlayer3.strEXEのあるフォルダ + "Config.ini"); // CONFIGだけ + OpenTaiko.ConfigIni.t書き出し(OpenTaiko.strEXEのあるフォルダ + "Config.ini"); // CONFIGだけ for (int i = 0; i < 4; i++) { this.ctキー反復用[i] = null; } @@ -98,7 +98,7 @@ namespace TJAPlayer3 { } txMenuItemLeft = null; - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); base.DeActivate(); } catch (UnauthorizedAccessException e) { @@ -123,21 +123,21 @@ namespace TJAPlayer3 { txMenuItemLeft = new CTexture[strMenuItem.Length, 2]; - using (var prvFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Config_Font_Scale)) { + using (var prvFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Config_Font_Scale)) { for (int i = 0; i < strMenuItem.Length; i++) { using (var bmpStr = prvFont.DrawText(strMenuItem[i], Color.White, Color.Black, null, 30)) { txMenuItemLeft[i, 0]?.Dispose(); - txMenuItemLeft[i, 0] = TJAPlayer3.tテクスチャの生成(bmpStr, false); + txMenuItemLeft[i, 0] = OpenTaiko.tテクスチャの生成(bmpStr, false); } using (var bmpStr = prvFont.DrawText(strMenuItem[i], Color.White, Color.Black, null, - TJAPlayer3.Skin.Config_Selected_Menu_Text_Grad_Color_1, - TJAPlayer3.Skin.Config_Selected_Menu_Text_Grad_Color_2, + OpenTaiko.Skin.Config_Selected_Menu_Text_Grad_Color_1, + OpenTaiko.Skin.Config_Selected_Menu_Text_Grad_Color_2, 30)) { txMenuItemLeft[i, 1]?.Dispose(); - txMenuItemLeft[i, 1] = TJAPlayer3.tテクスチャの生成(bmpStr, false); + txMenuItemLeft[i, 1] = OpenTaiko.tテクスチャの生成(bmpStr, false); } } } @@ -153,10 +153,10 @@ namespace TJAPlayer3 { //{ // this.ftフォント = new CCachedFontRenderer(CFontRenderer.DefaultFontName, (int)TJAPlayer3.Skin.Config_Font_Scale_Description, CFontRenderer.FontStyle.Bold); //} - this.ftフォント = HPrivateFastFont.tInstantiateMainFont((int)TJAPlayer3.Skin.Config_Font_Scale_Description, CFontRenderer.FontStyle.Bold); + this.ftフォント = HPrivateFastFont.tInstantiateMainFont((int)OpenTaiko.Skin.Config_Font_Scale_Description, CFontRenderer.FontStyle.Bold); - TJAPlayer3.Tx.Config_Cursor = TJAPlayer3.tテクスチャの生成(CSkin.Path($"{TextureLoader.BASE}{TextureLoader.CONFIG}Cursor.png")); + OpenTaiko.Tx.Config_Cursor = OpenTaiko.tテクスチャの生成(CSkin.Path($"{TextureLoader.BASE}{TextureLoader.CONFIG}Cursor.png")); //ctBackgroundAnime = new CCounter(0, TJAPlayer3.Tx.Config_Background.szテクスチャサイズ.Width, 20, TJAPlayer3.Timer); @@ -197,7 +197,7 @@ namespace TJAPlayer3 { //CDTXMania.tテクスチャの解放( ref this.tx下部パネル ); //CDTXMania.tテクスチャの解放( ref this.txMenuカーソル ); - TJAPlayer3.tテクスチャの解放(ref this.tx説明文パネル); + OpenTaiko.tテクスチャの解放(ref this.tx説明文パネル); base.ReleaseManagedResource(); } public override int Draw() { @@ -232,7 +232,7 @@ namespace TJAPlayer3 { #region [ Menu Cursor ] //--------------------- - if (TJAPlayer3.Tx.Config_Cursor != null) { + if (OpenTaiko.Tx.Config_Cursor != null) { #region Old /* Rectangle rectangle; @@ -257,28 +257,28 @@ namespace TJAPlayer3 { #endregion - int x = TJAPlayer3.Skin.Config_Item_X[this.n現在のメニュー番号]; - int y = TJAPlayer3.Skin.Config_Item_Y[this.n現在のメニュー番号]; + int x = OpenTaiko.Skin.Config_Item_X[this.n現在のメニュー番号]; + int y = OpenTaiko.Skin.Config_Item_Y[this.n現在のメニュー番号]; - int width = TJAPlayer3.Tx.Config_Cursor.sz画像サイズ.Width / 3; - int height = TJAPlayer3.Tx.Config_Cursor.sz画像サイズ.Height; + int width = OpenTaiko.Tx.Config_Cursor.sz画像サイズ.Width / 3; + int height = OpenTaiko.Tx.Config_Cursor.sz画像サイズ.Height; - int move = TJAPlayer3.Skin.Config_Item_Width; + int move = OpenTaiko.Skin.Config_Item_Width; //Left - TJAPlayer3.Tx.Config_Cursor.t2D中心基準描画(x - (width / 2) - move, y, + OpenTaiko.Tx.Config_Cursor.t2D中心基準描画(x - (width / 2) - move, y, new Rectangle(0, 0, width, height)); //Right - TJAPlayer3.Tx.Config_Cursor.t2D中心基準描画(x + (width / 2) + move, y, + OpenTaiko.Tx.Config_Cursor.t2D中心基準描画(x + (width / 2) + move, y, new Rectangle(width * 2, 0, width, height)); //Center - TJAPlayer3.Tx.Config_Cursor.vcScaleRatio.X = (move / (float)width) * 2.0f; - TJAPlayer3.Tx.Config_Cursor.t2D拡大率考慮中央基準描画(x, y, + OpenTaiko.Tx.Config_Cursor.vcScaleRatio.X = (move / (float)width) * 2.0f; + OpenTaiko.Tx.Config_Cursor.t2D拡大率考慮中央基準描画(x, y, new Rectangle(width, 0, width, height)); - TJAPlayer3.Tx.Config_Cursor.vcScaleRatio.X = 1.0f; + OpenTaiko.Tx.Config_Cursor.vcScaleRatio.X = 1.0f; } //--------------------- #endregion @@ -294,7 +294,7 @@ namespace TJAPlayer3 { //txMenuItemLeft = CDTXMania.tテクスチャの生成( bmpStr, false ); int flag = (this.n現在のメニュー番号 == i) ? 1 : 0; - txMenuItemLeft[i, flag].t2D中心基準描画(TJAPlayer3.Skin.Config_Item_X[i] + TJAPlayer3.Skin.Config_Item_Font_Offset[0], TJAPlayer3.Skin.Config_Item_Y[i] + TJAPlayer3.Skin.Config_Item_Font_Offset[1]); //55 + txMenuItemLeft[i, flag].t2D中心基準描画(OpenTaiko.Skin.Config_Item_X[i] + OpenTaiko.Skin.Config_Item_Font_Offset[0], OpenTaiko.Skin.Config_Item_Y[i] + OpenTaiko.Skin.Config_Item_Font_Offset[1]); //55 //txMenuItem.Dispose(); //menuY += stepY; } @@ -304,7 +304,7 @@ namespace TJAPlayer3 { #region [ Explanation Panel ] //--------------------- if (this.tx説明文パネル != null) - this.tx説明文パネル.t2D描画(TJAPlayer3.Skin.Config_ExplanationPanel[0], TJAPlayer3.Skin.Config_ExplanationPanel[1]); + this.tx説明文パネル.t2D描画(OpenTaiko.Skin.Config_ExplanationPanel[0], OpenTaiko.Skin.Config_ExplanationPanel[1]); //--------------------- #endregion @@ -367,26 +367,26 @@ namespace TJAPlayer3 { if ((base.ePhaseID != CStage.EPhase.Common_NORMAL) || this.actKeyAssign.bキー入力待ちの最中である - || TJAPlayer3.act現在入力を占有中のプラグイン != null) + || OpenTaiko.act現在入力を占有中のプラグイン != null) return 0; if (actCalibrationMode.IsStarted) { - if (TJAPlayer3.Skin.bgmコンフィグ画面.bIsPlaying) - TJAPlayer3.Skin.bgmコンフィグ画面.tStop(); + if (OpenTaiko.Skin.bgmコンフィグ画面.bIsPlaying) + OpenTaiko.Skin.bgmコンフィグ画面.tStop(); actCalibrationMode.Update(); actCalibrationMode.Draw(); } // 曲データの一覧取得中は、キー入力を無効化する - else if (!TJAPlayer3.EnumSongs.IsEnumerating || TJAPlayer3.actEnumSongs.bコマンドでの曲データ取得 != true) { - if (!TJAPlayer3.Skin.bgmコンフィグ画面.bIsPlaying) - TJAPlayer3.Skin.bgmコンフィグ画面.tPlay(); + else if (!OpenTaiko.EnumSongs.IsEnumerating || OpenTaiko.actEnumSongs.bコマンドでの曲データ取得 != true) { + if (!OpenTaiko.Skin.bgmコンフィグ画面.bIsPlaying) + OpenTaiko.Skin.bgmコンフィグ画面.tPlay(); - if ((TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.FT)) || TJAPlayer3.Pad.bPressedGB(EPad.FT)) { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + if ((OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.FT)) || OpenTaiko.Pad.bPressedGB(EPad.FT)) { + OpenTaiko.Skin.soundCancelSFX.tPlay(); if (!this.bメニューにフォーカス中) { if (this.eItemPanelモード == EItemPanelモード.キーコード一覧) { - TJAPlayer3.stageコンフィグ.tアサイン完了通知(); + OpenTaiko.stageコンフィグ.tアサイン完了通知(); return 0; } if (!this.actList.bIsKeyAssignSelected && !this.actList.bIsFocusingParameter) // #24525 2011.3.15 yyagi, #32059 2013.9.17 yyagi @@ -399,14 +399,14 @@ namespace TJAPlayer3 { this.actFIFO.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; } - } else if ((TJAPlayer3.Pad.bPressedDGB(EPad.CY) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RD)) || (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LC) || (TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)))) { + } else if ((OpenTaiko.Pad.bPressedDGB(EPad.CY) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RD)) || (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LC) || (OpenTaiko.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)))) { if (this.n現在のメニュー番号 == 2) { // Exit - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); this.actFIFO.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; } else if (this.bメニューにフォーカス中) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); this.bメニューにフォーカス中 = false; this.t説明文パネルに現在選択されている項目の説明を描画する(); } else { @@ -432,14 +432,14 @@ namespace TJAPlayer3 { } } } - this.ctキー反復用.Up.KeyIntervalFunc(TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.UpArrow), new CCounter.KeyProcess(this.tカーソルを上へ移動する)); - this.ctキー反復用.R.KeyIntervalFunc(TJAPlayer3.Pad.b押されているGB(EPad.HH), new CCounter.KeyProcess(this.tカーソルを上へ移動する)); - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.SD)) { + this.ctキー反復用.Up.KeyIntervalFunc(OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.UpArrow), new CCounter.KeyProcess(this.tカーソルを上へ移動する)); + this.ctキー反復用.R.KeyIntervalFunc(OpenTaiko.Pad.b押されているGB(EPad.HH), new CCounter.KeyProcess(this.tカーソルを上へ移動する)); + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.SD)) { this.tカーソルを上へ移動する(); } - this.ctキー反復用.Down.KeyIntervalFunc(TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.DownArrow), new CCounter.KeyProcess(this.tカーソルを下へ移動する)); - this.ctキー反復用.B.KeyIntervalFunc(TJAPlayer3.Pad.b押されているGB(EPad.BD), new CCounter.KeyProcess(this.tカーソルを下へ移動する)); - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LT)) { + this.ctキー反復用.Down.KeyIntervalFunc(OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.DownArrow), new CCounter.KeyProcess(this.tカーソルを下へ移動する)); + this.ctキー反復用.B.KeyIntervalFunc(OpenTaiko.Pad.b押されているGB(EPad.BD), new CCounter.KeyProcess(this.tカーソルを下へ移動する)); + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LT)) { this.tカーソルを下へ移動する(); } } @@ -535,7 +535,7 @@ namespace TJAPlayer3 { return; } } else { - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); this.n現在のメニュー番号 = (this.n現在のメニュー番号 + 1) % 3; switch (this.n現在のメニュー番号) { case 0: @@ -565,7 +565,7 @@ namespace TJAPlayer3 { return; } } else { - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); this.n現在のメニュー番号 = ((this.n現在のメニュー番号 - 1) + 3) % 3; switch (this.n現在のメニュー番号) { case 0: diff --git a/OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位リスト.cs b/OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位リスト.cs index 0f1c146c..40236060 100644 --- a/OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位リスト.cs +++ b/OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位リスト.cs @@ -2,10 +2,10 @@ using System.Drawing; using FDK; using Silk.NET.Maths; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { class CActSelect段位リスト : CStage { public CActSelect段位リスト() { for (int i = 0; i < 10; i++) { @@ -34,18 +34,18 @@ namespace TJAPlayer3 { ctDaniMoveAnime = new CCounter(); ctDanAnimeIn = new CCounter(); - ctDaniIn = new CCounter(0, 6000, 1, TJAPlayer3.Timer); + ctDaniIn = new CCounter(0, 6000, 1, OpenTaiko.Timer); - ctDanTick = new CCounter(0, 510, 3, TJAPlayer3.Timer); + ctDanTick = new CCounter(0, 510, 3, OpenTaiko.Timer); - ctExamConditionsAnim = new CCounter(0, 4000, 1, TJAPlayer3.Timer); + ctExamConditionsAnim = new CCounter(0, 4000, 1, OpenTaiko.Timer); this.ttkExams = new TitleTextureKey[(int)Exam.Type.Total]; for (int i = 0; i < this.ttkExams.Length; i++) { this.ttkExams[i] = new TitleTextureKey(CLangManager.LangInstance.GetExamName(i), this.pfExamFont, Color.White, Color.SaddleBrown, 1000); } - listSongs = TJAPlayer3.Songs管理.list曲ルート_Dan; + listSongs = OpenTaiko.Songs管理.list曲ルート_Dan; tUpdateSongs(); base.Activate(); @@ -57,19 +57,19 @@ namespace TJAPlayer3 { } public override void CreateManagedResource() { - this.pfDanFolder = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.DaniSelect_Font_DanFolder_Size[0]); - this.pfDanFolderDesc = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.DaniSelect_Font_DanFolder_Size[1]); - this.pfDanSong = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.DaniSelect_Font_DanSong_Size); - this.pfExamFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.DaniSelect_Font_Exam_Size); + this.pfDanFolder = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.DaniSelect_Font_DanFolder_Size[0]); + this.pfDanFolderDesc = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.DaniSelect_Font_DanFolder_Size[1]); + this.pfDanSong = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.DaniSelect_Font_DanSong_Size); + this.pfExamFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.DaniSelect_Font_Exam_Size); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tDisposeSafely(ref pfDanFolder); - TJAPlayer3.tDisposeSafely(ref pfDanFolderDesc); - TJAPlayer3.tDisposeSafely(ref pfDanSong); - TJAPlayer3.tDisposeSafely(ref pfExamFont); + OpenTaiko.tDisposeSafely(ref pfDanFolder); + OpenTaiko.tDisposeSafely(ref pfDanFolderDesc); + OpenTaiko.tDisposeSafely(ref pfDanSong); + OpenTaiko.tDisposeSafely(ref pfExamFont); base.ReleaseManagedResource(); } @@ -84,7 +84,7 @@ namespace TJAPlayer3 { if (ctDaniIn.CurrentValue == 6000) { if (!DaniInAnime) { - ctDanAnimeIn.Start(0, 90, 2f, TJAPlayer3.Timer); + ctDanAnimeIn.Start(0, 90, 2f, OpenTaiko.Timer); DaniInAnime = true; } } @@ -92,10 +92,10 @@ namespace TJAPlayer3 { #region [ バー表示 ] if (stバー情報.Length != 0 && ctDaniIn.CurrentValue == 6000) { - TJAPlayer3.Tx.DanC_ExamType.vcScaleRatio.X = 0.81f; - TJAPlayer3.Tx.DanC_ExamType.vcScaleRatio.Y = 0.81f; + OpenTaiko.Tx.DanC_ExamType.vcScaleRatio.X = 0.81f; + OpenTaiko.Tx.DanC_ExamType.vcScaleRatio.Y = 0.81f; - float Anime = ctDanAnimeIn.CurrentValue == 90 ? bLeftMove ? (float)Math.Sin(ctDaniMoveAnime.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0] : -((float)Math.Sin(ctDaniMoveAnime.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0]) : TJAPlayer3.Skin.Resolution[0] - (float)Math.Sin(ctDanAnimeIn.CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.Resolution[0]; + float Anime = ctDanAnimeIn.CurrentValue == 90 ? bLeftMove ? (float)Math.Sin(ctDaniMoveAnime.CurrentValue * (Math.PI / 180)) * OpenTaiko.Skin.Resolution[0] : -((float)Math.Sin(ctDaniMoveAnime.CurrentValue * (Math.PI / 180)) * OpenTaiko.Skin.Resolution[0]) : OpenTaiko.Skin.Resolution[0] - (float)Math.Sin(ctDanAnimeIn.CurrentValue * (Math.PI / 180)) * OpenTaiko.Skin.Resolution[0]; tDrawDanSelectedLevel(Anime); @@ -129,10 +129,10 @@ namespace TJAPlayer3 { // stバー情報[n現在の選択行] - int tickWidth = TJAPlayer3.Tx.Dani_Plate.szTextureSize.Width / 7; - int tickHeight = TJAPlayer3.Tx.Dani_Plate.szTextureSize.Height; - int tickExtraWidth = TJAPlayer3.Tx.Dani_Plate_Extra.szTextureSize.Width / 3; - int tickExtraHeight = TJAPlayer3.Tx.Dani_Plate_Extra.szTextureSize.Height; + int tickWidth = OpenTaiko.Tx.Dani_Plate.szTextureSize.Width / 7; + int tickHeight = OpenTaiko.Tx.Dani_Plate.szTextureSize.Height; + int tickExtraWidth = OpenTaiko.Tx.Dani_Plate_Extra.szTextureSize.Width / 3; + int tickExtraHeight = OpenTaiko.Tx.Dani_Plate_Extra.szTextureSize.Height; for (int idx = -13; idx < 14; idx++) { @@ -146,8 +146,8 @@ namespace TJAPlayer3 { if (currentSong >= stバー情報.Length) break; - int xPos = TJAPlayer3.Skin.DaniSelect_Plate[0] + (idx == 0 ? TJAPlayer3.Skin.DaniSelect_Plate_Center_Move[0] : 0) + idx * TJAPlayer3.Skin.DaniSelect_Plate_Move[0]; - int yPos = TJAPlayer3.Skin.DaniSelect_Plate[1] + (idx == 0 ? TJAPlayer3.Skin.DaniSelect_Plate_Center_Move[1] : 0) + idx * TJAPlayer3.Skin.DaniSelect_Plate_Move[1]; + int xPos = OpenTaiko.Skin.DaniSelect_Plate[0] + (idx == 0 ? OpenTaiko.Skin.DaniSelect_Plate_Center_Move[0] : 0) + idx * OpenTaiko.Skin.DaniSelect_Plate_Move[0]; + int yPos = OpenTaiko.Skin.DaniSelect_Plate[1] + (idx == 0 ? OpenTaiko.Skin.DaniSelect_Plate_Center_Move[1] : 0) + idx * OpenTaiko.Skin.DaniSelect_Plate_Move[1]; @@ -158,40 +158,40 @@ namespace TJAPlayer3 { switch (stバー情報[currentSong].eノード種別) { case CSongListNode.ENodeType.BACKBOX: { - TJAPlayer3.Tx.Dani_Plate_Extra?.tUpdateOpacity(255); - TJAPlayer3.Tx.Dani_Plate_Extra?.tUpdateColor4(CConversion.ColorToColor4(tickColor)); - TJAPlayer3.Tx.Dani_Plate_Extra?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(0, 0, tickExtraWidth, tickExtraHeight)); + OpenTaiko.Tx.Dani_Plate_Extra?.tUpdateOpacity(255); + OpenTaiko.Tx.Dani_Plate_Extra?.tUpdateColor4(CConversion.ColorToColor4(tickColor)); + OpenTaiko.Tx.Dani_Plate_Extra?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(0, 0, tickExtraWidth, tickExtraHeight)); break; } case CSongListNode.ENodeType.BOX: { - TJAPlayer3.Tx.Dani_Plate_Extra?.tUpdateOpacity(255); - TJAPlayer3.Tx.Dani_Plate_Extra?.tUpdateColor4(CConversion.ColorToColor4(tickColor)); - TJAPlayer3.Tx.Dani_Plate_Extra?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(tickExtraWidth, 0, tickExtraWidth, tickExtraHeight)); + OpenTaiko.Tx.Dani_Plate_Extra?.tUpdateOpacity(255); + OpenTaiko.Tx.Dani_Plate_Extra?.tUpdateColor4(CConversion.ColorToColor4(tickColor)); + OpenTaiko.Tx.Dani_Plate_Extra?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(tickExtraWidth, 0, tickExtraWidth, tickExtraHeight)); break; } case CSongListNode.ENodeType.RANDOM: { - TJAPlayer3.Tx.Dani_Plate_Extra?.tUpdateOpacity(255); - TJAPlayer3.Tx.Dani_Plate_Extra?.tUpdateColor4(CConversion.ColorToColor4(tickColor)); - TJAPlayer3.Tx.Dani_Plate_Extra?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(tickExtraWidth * 2, 0, tickExtraWidth, tickExtraHeight)); + OpenTaiko.Tx.Dani_Plate_Extra?.tUpdateOpacity(255); + OpenTaiko.Tx.Dani_Plate_Extra?.tUpdateColor4(CConversion.ColorToColor4(tickColor)); + OpenTaiko.Tx.Dani_Plate_Extra?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(tickExtraWidth * 2, 0, tickExtraWidth, tickExtraHeight)); break; } default: { - TJAPlayer3.Tx.Dani_Plate?.tUpdateOpacity(255); - TJAPlayer3.Tx.Dani_Plate?.tUpdateColor4(CConversion.ColorToColor4(tickColor)); - TJAPlayer3.Tx.Dani_Plate?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(tickWidth * tick, 0, tickWidth, tickHeight)); + OpenTaiko.Tx.Dani_Plate?.tUpdateOpacity(255); + OpenTaiko.Tx.Dani_Plate?.tUpdateColor4(CConversion.ColorToColor4(tickColor)); + OpenTaiko.Tx.Dani_Plate?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(tickWidth * tick, 0, tickWidth, tickHeight)); break; } } // Reset color for plate flash - TJAPlayer3.Tx.Dani_Plate?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Dani_Plate?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); #endregion #region [Dan grade title] if (stバー情報[currentSong].eノード種別 == CSongListNode.ENodeType.SCORE) TitleTextureKey.ResolveTitleTextureTate(stバー情報[currentSong].ttkタイトル[stバー情報[currentSong].ttkタイトル.Length - 1]) - .t2D拡大率考慮上中央基準描画(xPos + TJAPlayer3.Skin.DaniSelect_Plate_Title_Offset[0], yPos + TJAPlayer3.Skin.DaniSelect_Plate_Title_Offset[1]); + .t2D拡大率考慮上中央基準描画(xPos + OpenTaiko.Skin.DaniSelect_Plate_Title_Offset[0], yPos + OpenTaiko.Skin.DaniSelect_Plate_Title_Offset[1]); #endregion @@ -199,8 +199,8 @@ namespace TJAPlayer3 { #region [Plate flash] if (idx == 0) { - TJAPlayer3.Tx.Dani_Plate?.tUpdateOpacity(Math.Abs(255 - ctDanTick.CurrentValue)); - TJAPlayer3.Tx.Dani_Plate?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(tickWidth * 6, 0, tickWidth, tickHeight)); + OpenTaiko.Tx.Dani_Plate?.tUpdateOpacity(Math.Abs(255 - ctDanTick.CurrentValue)); + OpenTaiko.Tx.Dani_Plate?.t2D拡大率考慮上中央基準描画(xPos, yPos, new Rectangle(tickWidth * 6, 0, tickWidth, tickHeight)); } #endregion @@ -210,11 +210,11 @@ namespace TJAPlayer3 { int currentRank = Math.Min(stバー情報[currentSong].clearGrade, 8) - 3; if (currentRank >= 0) { - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 0.20f; - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 0.20f; - int rank_width = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Width / 7; - int rank_height = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Height; - TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮上中央基準描画(xPos - 2, yPos - 14, new Rectangle(rank_width * (currentRank + 1), 0, rank_width, rank_height)); + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.X = 0.20f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.Y = 0.20f; + int rank_width = OpenTaiko.Tx.DanResult_Rank.szTextureSize.Width / 7; + int rank_height = OpenTaiko.Tx.DanResult_Rank.szTextureSize.Height; + OpenTaiko.Tx.DanResult_Rank.t2D拡大率考慮上中央基準描画(xPos - 2, yPos - 14, new Rectangle(rank_width * (currentRank + 1), 0, rank_width, rank_height)); } #endregion @@ -278,8 +278,8 @@ namespace TJAPlayer3 { private Dictionary BarTexCache = new Dictionary(); public static void RefleshSkin() { - TJAPlayer3.tDisposeSafely(ref pfDanPlateTitle); - TJAPlayer3.tDisposeSafely(ref pfDanIconTitle); + OpenTaiko.tDisposeSafely(ref pfDanPlateTitle); + OpenTaiko.tDisposeSafely(ref pfDanIconTitle); } public static void tDisplayDanPlate(CTexture givenPlate, STバー情報? songNode, int x, int y) { @@ -292,9 +292,9 @@ namespace TJAPlayer3 { int danTick = 0; Color danTickColor = Color.White; - if (TJAPlayer3.stageSongSelect.r確定されたスコア != null) { - danTick = TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.nDanTick; - danTickColor = TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.cDanTickColor; + if (OpenTaiko.stageSongSelect.r確定されたスコア != null) { + danTick = OpenTaiko.stageSongSelect.r確定されたスコア.譜面情報.nDanTick; + danTickColor = OpenTaiko.stageSongSelect.r確定されたスコア.譜面情報.cDanTickColor; } if (songNode != null) { STバー情報 stNode = (STバー情報)songNode; @@ -304,46 +304,46 @@ namespace TJAPlayer3 { } - int unit = TJAPlayer3.Tx.Dani_DanPlates.szTextureSize.Width / 6; + int unit = OpenTaiko.Tx.Dani_DanPlates.szTextureSize.Width / 6; - if (TJAPlayer3.Tx.Dani_DanPlates != null) { - TJAPlayer3.Tx.Dani_DanPlates.Opacity = 255; - TJAPlayer3.Tx.Dani_DanPlates.color4 = CConversion.ColorToColor4(danTickColor); + if (OpenTaiko.Tx.Dani_DanPlates != null) { + OpenTaiko.Tx.Dani_DanPlates.Opacity = 255; + OpenTaiko.Tx.Dani_DanPlates.color4 = CConversion.ColorToColor4(danTickColor); } - TJAPlayer3.Tx.Dani_DanPlates_Back?.t2D中心基準描画(x, y, new Rectangle( + OpenTaiko.Tx.Dani_DanPlates_Back?.t2D中心基準描画(x, y, new Rectangle( unit * danTick, 0, unit, - TJAPlayer3.Tx.Dani_DanPlates_Back.szTextureSize.Height + OpenTaiko.Tx.Dani_DanPlates_Back.szTextureSize.Height )); - TJAPlayer3.Tx.Dani_DanPlates?.t2D中心基準描画(x, y, new Rectangle( + OpenTaiko.Tx.Dani_DanPlates?.t2D中心基準描画(x, y, new Rectangle( unit * danTick, 0, unit, - TJAPlayer3.Tx.Dani_DanPlates.szTextureSize.Height + OpenTaiko.Tx.Dani_DanPlates.szTextureSize.Height )); if (pfDanPlateTitle == null) - pfDanPlateTitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.DaniSelect_DanPlateTitle_Size); + pfDanPlateTitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.DaniSelect_DanPlateTitle_Size); string titleTmp = ""; - if (TJAPlayer3.stageSongSelect.r確定されたスコア != null) - titleTmp = TJAPlayer3.stageSongSelect.rChoosenSong.ldTitle.GetString(""); + if (OpenTaiko.stageSongSelect.r確定されたスコア != null) + titleTmp = OpenTaiko.stageSongSelect.rChoosenSong.ldTitle.GetString(""); if (songNode != null) { STバー情報 stNode = (STバー情報)songNode; - titleTmp = stNode.ttkタイトル[stNode.ttkタイトル.Length - 1].str文字; + titleTmp = stNode.ttkタイトル[stNode.ttkタイトル.Length - 1].str; } TitleTextureKey ttkTmp = new TitleTextureKey(titleTmp.Substring(0, 2), pfDanPlateTitle, Color.White, Color.Black, 1000); - TitleTextureKey.ResolveTitleTextureTate(ttkTmp).t2D中心基準描画(x + TJAPlayer3.Skin.DaniSelect_DanPlateTitle_Offset[0], y + TJAPlayer3.Skin.DaniSelect_DanPlateTitle_Offset[1]); + TitleTextureKey.ResolveTitleTextureTate(ttkTmp).t2D中心基準描画(x + OpenTaiko.Skin.DaniSelect_DanPlateTitle_Offset[0], y + OpenTaiko.Skin.DaniSelect_DanPlateTitle_Offset[1]); } } public static void tDisplayDanIcon(int count, float x, float y, int opacity, float scale, bool showFade = false) { if (pfDanIconTitle == null) - pfDanIconTitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.DaniSelect_DanIconTitle_Size); + pfDanIconTitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.DaniSelect_DanIconTitle_Size); string ex = "th"; switch (count) { @@ -361,27 +361,27 @@ namespace TJAPlayer3 { TitleTextureKey ttkTmp = new TitleTextureKey(count.ToString() + ex, pfDanIconTitle, Color.White, Color.Black, 1000); if (showFade) { - TJAPlayer3.Tx.Dani_DanIcon_Fade.vcScaleRatio = new Vector3D(scale, scale, 1.0f); - TJAPlayer3.Tx.Dani_DanIcon_Fade.Opacity = opacity; - TJAPlayer3.Tx.Dani_DanIcon_Fade.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.DaniSelect_DanIcon_Color[Math.Min(count - 1, TJAPlayer3.Skin.DaniSelect_DanIcon_Color.Length - 1)]); - TJAPlayer3.Tx.Dani_DanIcon_Fade.t2D拡大率考慮描画(CTexture.RefPnt.Left, x - ((TJAPlayer3.Tx.Dani_DanIcon.szTextureSize.Width / 2) * scale), y); - TJAPlayer3.Tx.Dani_DanIcon_Fade.Opacity = 255; + OpenTaiko.Tx.Dani_DanIcon_Fade.vcScaleRatio = new Vector3D(scale, scale, 1.0f); + OpenTaiko.Tx.Dani_DanIcon_Fade.Opacity = opacity; + OpenTaiko.Tx.Dani_DanIcon_Fade.color4 = CConversion.ColorToColor4(OpenTaiko.Skin.DaniSelect_DanIcon_Color[Math.Min(count - 1, OpenTaiko.Skin.DaniSelect_DanIcon_Color.Length - 1)]); + OpenTaiko.Tx.Dani_DanIcon_Fade.t2D拡大率考慮描画(CTexture.RefPnt.Left, x - ((OpenTaiko.Tx.Dani_DanIcon.szTextureSize.Width / 2) * scale), y); + OpenTaiko.Tx.Dani_DanIcon_Fade.Opacity = 255; } - TJAPlayer3.Tx.Dani_DanIcon.vcScaleRatio = new Vector3D(scale, scale, 1.0f); - TJAPlayer3.Tx.Dani_DanIcon.Opacity = opacity; - TJAPlayer3.Tx.Dani_DanIcon.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.DaniSelect_DanIcon_Color[Math.Min(count - 1, TJAPlayer3.Skin.DaniSelect_DanIcon_Color.Length - 1)]); - TJAPlayer3.Tx.Dani_DanIcon.t2D拡大率考慮中央基準描画(x, y); - TJAPlayer3.Tx.Dani_DanIcon.Opacity = 255; + OpenTaiko.Tx.Dani_DanIcon.vcScaleRatio = new Vector3D(scale, scale, 1.0f); + OpenTaiko.Tx.Dani_DanIcon.Opacity = opacity; + OpenTaiko.Tx.Dani_DanIcon.color4 = CConversion.ColorToColor4(OpenTaiko.Skin.DaniSelect_DanIcon_Color[Math.Min(count - 1, OpenTaiko.Skin.DaniSelect_DanIcon_Color.Length - 1)]); + OpenTaiko.Tx.Dani_DanIcon.t2D拡大率考慮中央基準描画(x, y); + OpenTaiko.Tx.Dani_DanIcon.Opacity = 255; TitleTextureKey.ResolveTitleTexture(ttkTmp).vcScaleRatio = new Vector3D(scale, scale, 1.0f); TitleTextureKey.ResolveTitleTexture(ttkTmp).Opacity = opacity; - TitleTextureKey.ResolveTitleTexture(ttkTmp).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.DaniSelect_DanIconTitle_Offset[0], y + TJAPlayer3.Skin.DaniSelect_DanIconTitle_Offset[1]); + TitleTextureKey.ResolveTitleTexture(ttkTmp).t2D拡大率考慮中央基準描画(x + OpenTaiko.Skin.DaniSelect_DanIconTitle_Offset[0], y + OpenTaiko.Skin.DaniSelect_DanIconTitle_Offset[1]); TitleTextureKey.ResolveTitleTexture(ttkTmp).Opacity = 255; } private void tDrawDanSelectedLevel(float Anime, int modifier = 0) { - int scroll = TJAPlayer3.Skin.Resolution[0] * modifier; + int scroll = OpenTaiko.Skin.Resolution[0] * modifier; int currentSong = Math.Clamp(n現在の選択行 + modifier, 0, stバー情報.Length - 1); bool over4 = false; @@ -396,28 +396,28 @@ namespace TJAPlayer3 { if (stバー情報[currentSong].txBarCenter != null) { stバー情報[currentSong].txBarCenter.t2D描画(scroll + Anime, 0); } else { - int unit = TJAPlayer3.Tx.Dani_DanSides.szTextureSize.Width / 6; - TJAPlayer3.Tx.Dani_DanSides.color4 = CConversion.ColorToColor4(danTickColor); + int unit = OpenTaiko.Tx.Dani_DanSides.szTextureSize.Width / 6; + OpenTaiko.Tx.Dani_DanSides.color4 = CConversion.ColorToColor4(danTickColor); - TJAPlayer3.Tx.Dani_Bar_Center.t2D描画(scroll + Anime, 0); + OpenTaiko.Tx.Dani_Bar_Center.t2D描画(scroll + Anime, 0); // Bar sides - TJAPlayer3.Tx.Dani_DanSides.t2D描画((int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_DanSides_X[0], TJAPlayer3.Skin.DaniSelect_DanSides_Y[0], new Rectangle( + OpenTaiko.Tx.Dani_DanSides.t2D描画((int)(scroll + Anime) + OpenTaiko.Skin.DaniSelect_DanSides_X[0], OpenTaiko.Skin.DaniSelect_DanSides_Y[0], new Rectangle( unit * danTick, 0, unit, - TJAPlayer3.Tx.Dani_DanSides.szTextureSize.Height + OpenTaiko.Tx.Dani_DanSides.szTextureSize.Height )); - TJAPlayer3.Tx.Dani_DanSides.t2D左右反転描画((int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_DanSides_X[1], TJAPlayer3.Skin.DaniSelect_DanSides_Y[1], new Rectangle( + OpenTaiko.Tx.Dani_DanSides.t2D左右反転描画((int)(scroll + Anime) + OpenTaiko.Skin.DaniSelect_DanSides_X[1], OpenTaiko.Skin.DaniSelect_DanSides_Y[1], new Rectangle( unit * danTick, 0, unit, - TJAPlayer3.Tx.Dani_DanSides.szTextureSize.Height + OpenTaiko.Tx.Dani_DanSides.szTextureSize.Height )); } - CActSelect段位リスト.tDisplayDanPlate(stバー情報[currentSong].txDanPlate, stバー情報[currentSong], (int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_DanPlate[0], TJAPlayer3.Skin.DaniSelect_DanPlate[1]); + CActSelect段位リスト.tDisplayDanPlate(stバー情報[currentSong].txDanPlate, stバー情報[currentSong], (int)(scroll + Anime) + OpenTaiko.Skin.DaniSelect_DanPlate[0], OpenTaiko.Skin.DaniSelect_DanPlate[1]); #endregion @@ -426,26 +426,26 @@ namespace TJAPlayer3 { int currentRank = Math.Min(stバー情報[currentSong].clearGrade, 8) - 3; if (currentRank >= 0) { - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 0.8f; - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 0.8f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.X = 0.8f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.Y = 0.8f; - int rank_width = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Width / 7; - int rank_height = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Height; + int rank_width = OpenTaiko.Tx.DanResult_Rank.szTextureSize.Width / 7; + int rank_height = OpenTaiko.Tx.DanResult_Rank.szTextureSize.Height; - TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Rank[0], TJAPlayer3.Skin.DaniSelect_Rank[1], new Rectangle(rank_width * (currentRank + 1), 0, rank_width, rank_height)); + OpenTaiko.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(scroll + Anime + OpenTaiko.Skin.DaniSelect_Rank[0], OpenTaiko.Skin.DaniSelect_Rank[1], new Rectangle(rank_width * (currentRank + 1), 0, rank_width, rank_height)); } #endregion #region [Soul gauge condition] - TJAPlayer3.Tx.Dani_Bloc[2]?.t2D描画(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Bloc2[0], TJAPlayer3.Skin.DaniSelect_Bloc2[1]); + OpenTaiko.Tx.Dani_Bloc[2]?.t2D描画(scroll + Anime + OpenTaiko.Skin.DaniSelect_Bloc2[0], OpenTaiko.Skin.DaniSelect_Bloc2[1]); if (stバー情報[currentSong].List_DanSongs[0].Dan_C[0] != null) - tSoulDraw(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Value_Gauge[0], TJAPlayer3.Skin.DaniSelect_Value_Gauge[1], stバー情報[currentSong].List_DanSongs[0].Dan_C[0].Value[0]); + tSoulDraw(scroll + Anime + OpenTaiko.Skin.DaniSelect_Value_Gauge[0], OpenTaiko.Skin.DaniSelect_Value_Gauge[1], stバー情報[currentSong].List_DanSongs[0].Dan_C[0].Value[0]); //TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkExams[0]).t2D下中央基準描画((int)(scroll + 396 + Anime), 452); - TitleTextureKey.ResolveTitleTexture(this.ttkExams[0]).t2D拡大率考慮中央基準描画((int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_Text_Gauge[0], TJAPlayer3.Skin.DaniSelect_Text_Gauge[1]); + TitleTextureKey.ResolveTitleTexture(this.ttkExams[0]).t2D拡大率考慮中央基準描画((int)(scroll + Anime) + OpenTaiko.Skin.DaniSelect_Text_Gauge[0], OpenTaiko.Skin.DaniSelect_Text_Gauge[1]); #endregion @@ -491,8 +491,8 @@ namespace TJAPlayer3 { */ } - int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5; - int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; + int difficulty_cymbol_width = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5; + int difficulty_cymbol_height = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; int sections_count = 1 + ((stバー情報[currentSong].n曲レベル.Length - 1) / 3); for (int i = 0; i < stバー情報[currentSong].ttkタイトル.Length - 1; i++) { @@ -502,28 +502,28 @@ namespace TJAPlayer3 { opacity = getOpacity(i, sections_count); } TitleTextureKey.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).Opacity = opacity; - TitleTextureKey.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).t2D描画(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Title_X[pos], TJAPlayer3.Skin.DaniSelect_Title_Y[pos]); + TitleTextureKey.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).t2D描画(scroll + Anime + OpenTaiko.Skin.DaniSelect_Title_X[pos], OpenTaiko.Skin.DaniSelect_Title_Y[pos]); TitleTextureKey.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[i]).Opacity = 255; - tDisplayDanIcon(i + 1, scroll + Anime + TJAPlayer3.Skin.DaniSelect_DanIcon_X[pos], TJAPlayer3.Skin.DaniSelect_DanIcon_Y[pos], opacity, 1.0f); + tDisplayDanIcon(i + 1, scroll + Anime + OpenTaiko.Skin.DaniSelect_DanIcon_X[pos], OpenTaiko.Skin.DaniSelect_DanIcon_Y[pos], opacity, 1.0f); } for (int i = 0; i < stバー情報[currentSong].n曲難易度.Length; i++) { int pos = i % 3; if (stバー情報[currentSong].n曲難易度.Length > 3) { - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = getOpacity(i, sections_count); + OpenTaiko.Tx.Dani_Difficulty_Cymbol.Opacity = getOpacity(i, sections_count); } - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Difficulty_Cymbol_X[pos], TJAPlayer3.Skin.DaniSelect_Difficulty_Cymbol_Y[pos], new Rectangle(stバー情報[currentSong].n曲難易度[i] * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height)); - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = 255; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(scroll + Anime + OpenTaiko.Skin.DaniSelect_Difficulty_Cymbol_X[pos], OpenTaiko.Skin.DaniSelect_Difficulty_Cymbol_Y[pos], new Rectangle(stバー情報[currentSong].n曲難易度[i] * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height)); + OpenTaiko.Tx.Dani_Difficulty_Cymbol.Opacity = 255; } for (int i = 0; i < stバー情報[currentSong].n曲レベル.Length; i++) { int pos = i % 3; if (stバー情報[currentSong].n曲レベル.Length > 3) { - TJAPlayer3.Tx.Dani_Level_Number.Opacity = getOpacity(i, sections_count); + OpenTaiko.Tx.Dani_Level_Number.Opacity = getOpacity(i, sections_count); } - this.tLevelNumberDraw(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Level_Number_X[pos], TJAPlayer3.Skin.DaniSelect_Level_Number_Y[pos], stバー情報[currentSong].n曲レベル[i]); - TJAPlayer3.Tx.Dani_Level_Number.Opacity = 255; + this.tLevelNumberDraw(scroll + Anime + OpenTaiko.Skin.DaniSelect_Level_Number_X[pos], OpenTaiko.Skin.DaniSelect_Level_Number_Y[pos], stバー情報[currentSong].n曲レベル[i]); + OpenTaiko.Tx.Dani_Level_Number.Opacity = 255; } @@ -578,37 +578,37 @@ namespace TJAPlayer3 { for (int i = 0; i < stバー情報[currentSong].List_DanSongs.Count; i++) //曲ごとのループ(魂ゲージを除く) 横(x) { if (stバー情報[currentSong].List_DanSongs[i].Dan_C[j] != null) { - TJAPlayer3.Tx.Dani_Exam_Number.Opacity = opacity; + OpenTaiko.Tx.Dani_Exam_Number.Opacity = opacity; if (stバー情報[currentSong].List_DanSongs[stバー情報[currentSong].List_DanSongs.Count - 1].Dan_C[j] != null) { //個別の条件がありますよー - int moveX = TJAPlayer3.Skin.DaniSelect_Exam_Interval[0]; - int moveY = TJAPlayer3.Skin.DaniSelect_Exam_Interval[1]; - int x = TJAPlayer3.Skin.DaniSelect_Exam_Bloc_X[index]; - int y = TJAPlayer3.Skin.DaniSelect_Exam_Bloc_Y[index]; + int moveX = OpenTaiko.Skin.DaniSelect_Exam_Interval[0]; + int moveY = OpenTaiko.Skin.DaniSelect_Exam_Interval[1]; + int x = OpenTaiko.Skin.DaniSelect_Exam_Bloc_X[index]; + int y = OpenTaiko.Skin.DaniSelect_Exam_Bloc_Y[index]; - int exam_x = TJAPlayer3.Skin.DaniSelect_Exam_X[index]; - int exam_y = TJAPlayer3.Skin.DaniSelect_Exam_Y[index]; + int exam_x = OpenTaiko.Skin.DaniSelect_Exam_X[index]; + int exam_y = OpenTaiko.Skin.DaniSelect_Exam_Y[index]; CTexture tex = null; switch (stバー情報[currentSong].List_DanSongs.Count) { case 1: - tex = TJAPlayer3.Tx.Dani_Bloc[0]; + tex = OpenTaiko.Tx.Dani_Bloc[0]; break; case 2: case 3: - tex = TJAPlayer3.Tx.Dani_Bloc[1]; + tex = OpenTaiko.Tx.Dani_Bloc[1]; break; case 4: case 5: case 6: default: - tex = TJAPlayer3.Tx.Dani_Bloc[3]; + tex = OpenTaiko.Tx.Dani_Bloc[3]; moveX /= 2; moveY /= 2; - exam_x = TJAPlayer3.Skin.DaniSelect_Exam_X_Ex[index]; - exam_y = TJAPlayer3.Skin.DaniSelect_Exam_Y_Ex[index]; + exam_x = OpenTaiko.Skin.DaniSelect_Exam_X_Ex[index]; + exam_y = OpenTaiko.Skin.DaniSelect_Exam_Y_Ex[index]; break; } @@ -628,18 +628,18 @@ namespace TJAPlayer3 { //全体の条件ですよー if (i == 0) { - if (TJAPlayer3.Tx.Dani_Bloc[0] != null) - TJAPlayer3.Tx.Dani_Bloc[0].Opacity = opacity; - TJAPlayer3.Tx.Dani_Bloc[0]?.t2D描画( - scroll + Anime + TJAPlayer3.Skin.DaniSelect_Exam_Bloc_X[index], - TJAPlayer3.Skin.DaniSelect_Exam_Bloc_Y[index]); + if (OpenTaiko.Tx.Dani_Bloc[0] != null) + OpenTaiko.Tx.Dani_Bloc[0].Opacity = opacity; + OpenTaiko.Tx.Dani_Bloc[0]?.t2D描画( + scroll + Anime + OpenTaiko.Skin.DaniSelect_Exam_Bloc_X[index], + OpenTaiko.Skin.DaniSelect_Exam_Bloc_Y[index]); } - tExamDraw(scroll + Anime + TJAPlayer3.Skin.DaniSelect_Exam_X[index], TJAPlayer3.Skin.DaniSelect_Exam_Y[index], stバー情報[currentSong].List_DanSongs[0].Dan_C[j].Value[0], stバー情報[currentSong].List_DanSongs[0].Dan_C[j].GetExamRange()); + tExamDraw(scroll + Anime + OpenTaiko.Skin.DaniSelect_Exam_X[index], OpenTaiko.Skin.DaniSelect_Exam_Y[index], stバー情報[currentSong].List_DanSongs[0].Dan_C[j].Value[0], stバー情報[currentSong].List_DanSongs[0].Dan_C[j].GetExamRange()); } - TJAPlayer3.Tx.Dani_Exam_Number.Opacity = 255; + OpenTaiko.Tx.Dani_Exam_Number.Opacity = 255; } } @@ -653,7 +653,7 @@ namespace TJAPlayer3 { tmpTex.Opacity = opacity; //tmpTex.t2D下中央基準描画((int)(scroll + 614 + Anime), 452 + index * 88); - tmpTex.t2D拡大率考慮中央基準描画((int)(scroll + Anime) + TJAPlayer3.Skin.DaniSelect_Exam_Title_X[index], TJAPlayer3.Skin.DaniSelect_Exam_Title_Y[index]); + tmpTex.t2D拡大率考慮中央基準描画((int)(scroll + Anime) + OpenTaiko.Skin.DaniSelect_Exam_Title_X[index], OpenTaiko.Skin.DaniSelect_Exam_Title_Y[index]); } #endregion @@ -663,21 +663,21 @@ namespace TJAPlayer3 { } break; case CSongListNode.ENodeType.BACKBOX: { - TJAPlayer3.Tx.Dani_Bar_Back?.t2D描画(scroll + Anime, 0); + OpenTaiko.Tx.Dani_Bar_Back?.t2D描画(scroll + Anime, 0); break; } case CSongListNode.ENodeType.BOX: { - TJAPlayer3.Tx.Dani_Bar_Folder_Back?.t2D描画(scroll + Anime, 0); - TJAPlayer3.Tx.Dani_Bar_Folder?.t2D描画(scroll + Anime, 0); + OpenTaiko.Tx.Dani_Bar_Folder_Back?.t2D描画(scroll + Anime, 0); + OpenTaiko.Tx.Dani_Bar_Folder?.t2D描画(scroll + Anime, 0); TitleTextureKey.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[0]) - .t2D拡大率考慮上中央基準描画((int)(scroll + Anime + TJAPlayer3.Skin.DaniSelect_FolderText_X[0]), TJAPlayer3.Skin.DaniSelect_FolderText_Y[0]); + .t2D拡大率考慮上中央基準描画((int)(scroll + Anime + OpenTaiko.Skin.DaniSelect_FolderText_X[0]), OpenTaiko.Skin.DaniSelect_FolderText_Y[0]); for (int desc = 1; desc < 4; desc++) TitleTextureKey.ResolveTitleTexture(stバー情報[currentSong].ttkタイトル[desc]) - .t2D拡大率考慮上中央基準描画((int)(scroll + Anime + TJAPlayer3.Skin.DaniSelect_FolderText_X[desc]), TJAPlayer3.Skin.DaniSelect_FolderText_Y[desc]); + .t2D拡大率考慮上中央基準描画((int)(scroll + Anime + OpenTaiko.Skin.DaniSelect_FolderText_X[desc]), OpenTaiko.Skin.DaniSelect_FolderText_Y[desc]); break; } case CSongListNode.ENodeType.RANDOM: { - TJAPlayer3.Tx.Dani_Bar_Random?.t2D描画(scroll + Anime, 0); + OpenTaiko.Tx.Dani_Bar_Random?.t2D描画(scroll + Anime, 0); break; } } @@ -726,14 +726,14 @@ namespace TJAPlayer3 { stバー情報[i].cDanTickColor = song.arスコア[6].譜面情報.cDanTickColor; //stバー情報[i].clearGrade = song.arスコア[6].譜面情報.nクリア[0]; - var TableEntry = TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data.tGetSongSelectTableEntry(song.tGetUniqueId()); + var TableEntry = OpenTaiko.SaveFileInstances[OpenTaiko.SaveFile].data.tGetSongSelectTableEntry(song.tGetUniqueId()); stバー情報[i].clearGrade = TableEntry.ClearStatuses[(int)Difficulty.Dan]; string barCenter = Path.GetDirectoryName(song.arスコア[6].ファイル情報.ファイルの絶対パス) + @$"${Path.DirectorySeparatorChar}Bar_Center.png"; if (BarTexCache.TryGetValue(barCenter, out CTexture texture1)) { stバー情報[i].txBarCenter = texture1; } else { - stバー情報[i].txBarCenter = TJAPlayer3.tテクスチャの生成(barCenter); + stバー情報[i].txBarCenter = OpenTaiko.tテクスチャの生成(barCenter); BarTexCache.Add(barCenter, stバー情報[i].txBarCenter); } @@ -741,21 +741,21 @@ namespace TJAPlayer3 { if (BarTexCache.TryGetValue(danPlate, out CTexture texture2)) { stバー情報[i].txDanPlate = texture2; } else { - stバー情報[i].txDanPlate = TJAPlayer3.tテクスチャの生成(danPlate); + stバー情報[i].txDanPlate = OpenTaiko.tテクスチャの生成(danPlate); BarTexCache.Add(danPlate, stバー情報[i].txDanPlate); } } break; case CSongListNode.ENodeType.BOX: { - TJAPlayer3.Tx.Dani_Bar_Folder?.tUpdateColor4(CConversion.ColorToColor4(song.BoxColor)); + OpenTaiko.Tx.Dani_Bar_Folder?.tUpdateColor4(CConversion.ColorToColor4(song.BoxColor)); stバー情報[i].ttkタイトル = new TitleTextureKey[4]; - stバー情報[i].ttkタイトル[0] = new TitleTextureKey(song.ldTitle.GetString(""), pfDanFolder, Color.White, Color.Black, TJAPlayer3.Skin.Resolution[0]); + stバー情報[i].ttkタイトル[0] = new TitleTextureKey(song.ldTitle.GetString(""), pfDanFolder, Color.White, Color.Black, OpenTaiko.Skin.Resolution[0]); for (int boxdesc = 0; boxdesc < 3; boxdesc++) if (song.strBoxText[boxdesc] != null) - stバー情報[i].ttkタイトル[boxdesc + 1] = new TitleTextureKey(song.strBoxText[boxdesc].GetString(""), pfDanFolderDesc, song.ForeColor, song.BackColor, TJAPlayer3.Skin.Resolution[0]); + stバー情報[i].ttkタイトル[boxdesc + 1] = new TitleTextureKey(song.strBoxText[boxdesc].GetString(""), pfDanFolderDesc, song.ForeColor, song.BackColor, OpenTaiko.Skin.Resolution[0]); else - stバー情報[i].ttkタイトル[boxdesc + 1] = new TitleTextureKey("", pfDanFolderDesc, Color.White, Color.Black, TJAPlayer3.Skin.Resolution[0]); + stバー情報[i].ttkタイトル[boxdesc + 1] = new TitleTextureKey("", pfDanFolderDesc, Color.White, Color.Black, OpenTaiko.Skin.Resolution[0]); stバー情報[i].cDanTickColor = song.BoxColor; } break; @@ -778,17 +778,17 @@ namespace TJAPlayer3 { public void t右に移動() { if (n現在の選択行 < stバー情報.Length - 1) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); this.bLeftMove = false; - this.ctDaniMoveAnime.Start(0, 90, 2f, TJAPlayer3.Timer); + this.ctDaniMoveAnime.Start(0, 90, 2f, OpenTaiko.Timer); } } public void t左に移動() { if (n現在の選択行 > 0) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); this.bLeftMove = true; - this.ctDaniMoveAnime.Start(0, 90, 2f, TJAPlayer3.Timer); + this.ctDaniMoveAnime.Start(0, 90, 2f, OpenTaiko.Timer); } } @@ -806,22 +806,22 @@ namespace TJAPlayer3 { } }*/ - float width = TJAPlayer3.Tx.Dani_Level_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.Dani_Level_Number.sz画像サイズ.Height; + float width = OpenTaiko.Tx.Dani_Level_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.Dani_Level_Number.sz画像サイズ.Height; int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j; - float _x = x - (((TJAPlayer3.Skin.DaniSelect_Level_Number_Interval[0] * offset) + (width / 2)) * scale); - float _y = y - (((TJAPlayer3.Skin.DaniSelect_Level_Number_Interval[1] * offset) - (width / 2)) * scale); + float _x = x - (((OpenTaiko.Skin.DaniSelect_Level_Number_Interval[0] * offset) + (width / 2)) * scale); + float _y = y - (((OpenTaiko.Skin.DaniSelect_Level_Number_Interval[1] * offset) - (width / 2)) * scale); - TJAPlayer3.Tx.Dani_Level_Number.vcScaleRatio.X = scale; - TJAPlayer3.Tx.Dani_Level_Number.vcScaleRatio.Y = scale; - TJAPlayer3.Tx.Dani_Level_Number.t2D描画(_x, _y, + OpenTaiko.Tx.Dani_Level_Number.vcScaleRatio.X = scale; + OpenTaiko.Tx.Dani_Level_Number.vcScaleRatio.Y = scale; + OpenTaiko.Tx.Dani_Level_Number.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); - TJAPlayer3.Tx.Dani_Level_Number.vcScaleRatio.X = 1; - TJAPlayer3.Tx.Dani_Level_Number.vcScaleRatio.Y = 1; + OpenTaiko.Tx.Dani_Level_Number.vcScaleRatio.X = 1; + OpenTaiko.Tx.Dani_Level_Number.vcScaleRatio.Y = 1; } } @@ -843,22 +843,22 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); - float width = TJAPlayer3.Tx.Dani_Soul_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.Dani_Soul_Number.sz画像サイズ.Height / 2.0f; + float width = OpenTaiko.Tx.Dani_Soul_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.Dani_Soul_Number.sz画像サイズ.Height / 2.0f; - float text_width = TJAPlayer3.Skin.DaniSelect_Soul_Number_Text_Width; + float text_width = OpenTaiko.Skin.DaniSelect_Soul_Number_Text_Width; - TJAPlayer3.Tx.Dani_Soul_Number.t2D描画(x + TJAPlayer3.Skin.DaniSelect_Soul_Number_Interval[0] + (width / 2), - y + TJAPlayer3.Skin.DaniSelect_Soul_Number_Interval[1] - (height / 2), + OpenTaiko.Tx.Dani_Soul_Number.t2D描画(x + OpenTaiko.Skin.DaniSelect_Soul_Number_Interval[0] + (width / 2), + y + OpenTaiko.Skin.DaniSelect_Soul_Number_Interval[1] - (height / 2), new RectangleF(0, height, text_width, height)); for (int j = 0; j < nums.Length; j++) { float offset = j; - float _x = x - (TJAPlayer3.Skin.DaniSelect_Soul_Number_Interval[0] * offset) + (width / 2); - float _y = y - (TJAPlayer3.Skin.DaniSelect_Soul_Number_Interval[1] * offset) - (height / 2); + float _x = x - (OpenTaiko.Skin.DaniSelect_Soul_Number_Interval[0] * offset) + (width / 2); + float _y = y - (OpenTaiko.Skin.DaniSelect_Soul_Number_Interval[1] * offset) - (height / 2); - TJAPlayer3.Tx.Dani_Soul_Number.t2D描画(_x, _y, + OpenTaiko.Tx.Dani_Soul_Number.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } @@ -883,26 +883,26 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); - float width = TJAPlayer3.Tx.Dani_Exam_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.Dani_Exam_Number.sz画像サイズ.Height / 2.0f; + float width = OpenTaiko.Tx.Dani_Exam_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.Dani_Exam_Number.sz画像サイズ.Height / 2.0f; - float text_width = TJAPlayer3.Skin.DaniSelect_Exam_Number_Text_Width; + float text_width = OpenTaiko.Skin.DaniSelect_Exam_Number_Text_Width; - TJAPlayer3.Tx.Dani_Exam_Number.vcScaleRatio.X = scale; - TJAPlayer3.Tx.Dani_Exam_Number.vcScaleRatio.Y = scale; + OpenTaiko.Tx.Dani_Exam_Number.vcScaleRatio.X = scale; + OpenTaiko.Tx.Dani_Exam_Number.vcScaleRatio.Y = scale; - TJAPlayer3.Tx.Dani_Exam_Number.t2D描画( - x + ((TJAPlayer3.Skin.DaniSelect_Exam_Number_Interval[0] + (width / 2)) * scale), - y + ((TJAPlayer3.Skin.DaniSelect_Exam_Number_Interval[1] + (height / 2)) * scale), + OpenTaiko.Tx.Dani_Exam_Number.t2D描画( + x + ((OpenTaiko.Skin.DaniSelect_Exam_Number_Interval[0] + (width / 2)) * scale), + y + ((OpenTaiko.Skin.DaniSelect_Exam_Number_Interval[1] + (height / 2)) * scale), new RectangleF(text_width * (int)Range, height, text_width, height)); for (int j = 0; j < nums.Length; j++) { float offset = j; - float _x = x - (((TJAPlayer3.Skin.DaniSelect_Exam_Number_Interval[0] * offset) + (width / 2)) * scale); - float _y = y - (((TJAPlayer3.Skin.DaniSelect_Exam_Number_Interval[1] * offset) - (height / 2)) * scale); + float _x = x - (((OpenTaiko.Skin.DaniSelect_Exam_Number_Interval[0] * offset) + (width / 2)) * scale); + float _y = y - (((OpenTaiko.Skin.DaniSelect_Exam_Number_Interval[1] * offset) - (height / 2)) * scale); - TJAPlayer3.Tx.Dani_Exam_Number.t2D描画(_x, _y, + OpenTaiko.Tx.Dani_Exam_Number.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } diff --git a/OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位挑戦選択画面.cs b/OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位挑戦選択画面.cs index 83469bd2..3e2d5775 100644 --- a/OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位挑戦選択画面.cs +++ b/OpenTaiko/src/Stages/05.DaniSelect/CActSelect段位挑戦選択画面.cs @@ -1,13 +1,13 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CActSelect段位挑戦選択画面 : CActivity { public override void Activate() { ctBarIn = new CCounter(); ctBarOut = new CCounter(); ctBarOut.CurrentValue = 255; - TJAPlayer3.stage段位選択.bDifficultyIn = false; + OpenTaiko.stage段位選択.bDifficultyIn = false; bOption = false; base.Activate(); @@ -26,60 +26,60 @@ namespace TJAPlayer3 { } public override int Draw() { - if (TJAPlayer3.stage段位選択.bDifficultyIn || ctBarOut.CurrentValue < ctBarOut.EndValue) { + if (OpenTaiko.stage段位選択.bDifficultyIn || ctBarOut.CurrentValue < ctBarOut.EndValue) { ctBarIn.Tick(); ctBarOut.Tick(); - TJAPlayer3.Tx.Challenge_Select[0].Opacity = TJAPlayer3.stage段位選択.bDifficultyIn ? ctBarIn.CurrentValue : 255 - ctBarOut.CurrentValue; - TJAPlayer3.Tx.Challenge_Select[1].Opacity = TJAPlayer3.stage段位選択.bDifficultyIn ? ctBarIn.CurrentValue : 255 - ctBarOut.CurrentValue; - TJAPlayer3.Tx.Challenge_Select[2].Opacity = TJAPlayer3.stage段位選択.bDifficultyIn ? ctBarIn.CurrentValue : 255 - ctBarOut.CurrentValue; + OpenTaiko.Tx.Challenge_Select[0].Opacity = OpenTaiko.stage段位選択.bDifficultyIn ? ctBarIn.CurrentValue : 255 - ctBarOut.CurrentValue; + OpenTaiko.Tx.Challenge_Select[1].Opacity = OpenTaiko.stage段位選択.bDifficultyIn ? ctBarIn.CurrentValue : 255 - ctBarOut.CurrentValue; + OpenTaiko.Tx.Challenge_Select[2].Opacity = OpenTaiko.stage段位選択.bDifficultyIn ? ctBarIn.CurrentValue : 255 - ctBarOut.CurrentValue; - TJAPlayer3.Tx.Challenge_Select[0].t2D描画(0, 0); + OpenTaiko.Tx.Challenge_Select[0].t2D描画(0, 0); int selectIndex = (2 - n現在の選択行); - int[] challenge_select_rect = TJAPlayer3.Skin.DaniSelect_Challenge_Select_Rect[selectIndex]; + int[] challenge_select_rect = OpenTaiko.Skin.DaniSelect_Challenge_Select_Rect[selectIndex]; - TJAPlayer3.Tx.Challenge_Select[2].t2D描画(TJAPlayer3.Skin.DaniSelect_Challenge_Select_X[selectIndex], TJAPlayer3.Skin.DaniSelect_Challenge_Select_Y[selectIndex], + OpenTaiko.Tx.Challenge_Select[2].t2D描画(OpenTaiko.Skin.DaniSelect_Challenge_Select_X[selectIndex], OpenTaiko.Skin.DaniSelect_Challenge_Select_Y[selectIndex], new Rectangle(challenge_select_rect[0], challenge_select_rect[1], challenge_select_rect[2], challenge_select_rect[3])); - TJAPlayer3.Tx.Challenge_Select[1].t2D描画(0, 0); + OpenTaiko.Tx.Challenge_Select[1].t2D描画(0, 0); - if (TJAPlayer3.stage段位選択.ct待機.IsStarted) + if (OpenTaiko.stage段位選択.ct待機.IsStarted) return base.Draw(); #region [Key bindings] - if (ctBarIn.IsEnded && !TJAPlayer3.stage段位選択.b選択した && bOption == false) { - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue)) { + if (ctBarIn.IsEnded && !OpenTaiko.stage段位選択.b選択した && bOption == false) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue)) { if (n現在の選択行 - 1 >= 0) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); n現在の選択行--; } } - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue)) { if (n現在の選択行 + 1 <= 2) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); n現在の選択行++; } } - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed)) { if (n現在の選択行 == 0) { - this.ctBarOut.Start(0, 255, 0.5f, TJAPlayer3.Timer); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); - TJAPlayer3.stage段位選択.bDifficultyIn = false; + this.ctBarOut.Start(0, 255, 0.5f, OpenTaiko.Timer); + OpenTaiko.Skin.soundCancelSFX.tPlay(); + OpenTaiko.stage段位選択.bDifficultyIn = false; } else if (n現在の選択行 == 1) { //TJAPlayer3.Skin.soundDanSongSelect.t再生する(); - TJAPlayer3.ConfigIni.bTokkunMode = false; - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.Skin.voiceMenuDanSelectConfirm[TJAPlayer3.SaveFile]?.tPlay(); - TJAPlayer3.stage段位選択.ct待機.Start(0, 3000, 1, TJAPlayer3.Timer); + OpenTaiko.ConfigIni.bTokkunMode = false; + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.voiceMenuDanSelectConfirm[OpenTaiko.SaveFile]?.tPlay(); + OpenTaiko.stage段位選択.ct待機.Start(0, 3000, 1, OpenTaiko.Timer); } else if (n現在の選択行 == 2) { bOption = true; } diff --git a/OpenTaiko/src/Stages/05.DaniSelect/CStage段位選択.cs b/OpenTaiko/src/Stages/05.DaniSelect/CStage段位選択.cs index 5e09a7a0..a362eef8 100644 --- a/OpenTaiko/src/Stages/05.DaniSelect/CStage段位選択.cs +++ b/OpenTaiko/src/Stages/05.DaniSelect/CStage段位選択.cs @@ -2,7 +2,7 @@ using System.Text; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CStage段位選択 : CStage { public CStage段位選択() { base.eStageID = EStage.DanDojoSelect; @@ -44,7 +44,7 @@ namespace TJAPlayer3 { } public override void DeActivate() { - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); base.DeActivate(); } @@ -81,8 +81,8 @@ namespace TJAPlayer3 { #region [Dan intro anim] if (!bInSongPlayed) { - this.段位リスト.ctDaniIn = new CCounter(0, 6000, 1, TJAPlayer3.Timer); - TJAPlayer3.Skin.soundDanSongSelectIn.tPlay(); + this.段位リスト.ctDaniIn = new CCounter(0, 6000, 1, OpenTaiko.Timer); + OpenTaiko.Skin.soundDanSongSelectIn.tPlay(); bInSongPlayed = true; } @@ -143,58 +143,58 @@ namespace TJAPlayer3 { } else if (stamp == 6000) { if (!ctChara_In.IsStarted) { //TJAPlayer3.Skin.soundDanSelectStart.t再生する(); - TJAPlayer3.Skin.voiceMenuDanSelectStart[TJAPlayer3.SaveFile]?.tPlay(); - TJAPlayer3.Skin.soundDanSelectBGM.tPlay(); - ctChara_In.Start(0, 180, 1.25f, TJAPlayer3.Timer); + OpenTaiko.Skin.voiceMenuDanSelectStart[OpenTaiko.SaveFile]?.tPlay(); + OpenTaiko.Skin.soundDanSelectBGM.tPlay(); + ctChara_In.Start(0, 180, 1.25f, OpenTaiko.Timer); } - TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[0], TJAPlayer3.Skin.SongSelect_NamePlate_Y[0], 0); - ModIcons.tDisplayModsMenu(TJAPlayer3.Skin.SongSelect_ModIcons_X[0], TJAPlayer3.Skin.SongSelect_ModIcons_Y[0], 0); ; + OpenTaiko.NamePlate.tNamePlateDraw(OpenTaiko.Skin.SongSelect_NamePlate_X[0], OpenTaiko.Skin.SongSelect_NamePlate_Y[0], 0); + ModIcons.tDisplayModsMenu(OpenTaiko.Skin.SongSelect_ModIcons_X[0], OpenTaiko.Skin.SongSelect_ModIcons_Y[0], 0); ; #region [ キー関連 ] if (!this.段位リスト.bスクロール中 && !b選択した && !bDifficultyIn) { int returnTitle() { - TJAPlayer3.Skin.soundDanSelectBGM.tStop(); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundDanSelectBGM.tStop(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る; this.actFOtoTitle.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; return 0; } - if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { this.段位リスト.t右に移動(); } - if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { this.段位リスト.t左に移動(); } - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { switch (段位リスト.currentBar.eノード種別) { case CSongListNode.ENodeType.SCORE: case CSongListNode.ENodeType.RANDOM: { //this.t段位を選択する(); //TJAPlayer3.Skin.soundDanSongSelectCheck.t再生する(); - TJAPlayer3.Skin.voiceMenuDanSelectPrompt[TJAPlayer3.SaveFile]?.tPlay(); + OpenTaiko.Skin.voiceMenuDanSelectPrompt[OpenTaiko.SaveFile]?.tPlay(); this.bDifficultyIn = true; - this.段位挑戦選択画面.ctBarIn.Start(0, 255, 1, TJAPlayer3.Timer); + this.段位挑戦選択画面.ctBarIn.Start(0, 255, 1, OpenTaiko.Timer); } break; case CSongListNode.ENodeType.BOX: { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); 段位リスト.tOpenFolder(段位リスト.currentBar); } break; case CSongListNode.ENodeType.BACKBOX: { - if (TJAPlayer3.Songs管理.list曲ルート.Contains(段位リスト.currentBar.rParentNode) && 段位リスト.currentBar.rParentNode.strジャンル == "段位道場") { + if (OpenTaiko.Songs管理.list曲ルート.Contains(段位リスト.currentBar.rParentNode) && 段位リスト.currentBar.rParentNode.strジャンル == "段位道場") { return returnTitle(); } else { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); 段位リスト.tCloseFolder(段位リスト.currentBar); } } @@ -202,8 +202,8 @@ namespace TJAPlayer3 { } } - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { this.段位リスト.n現在の選択行 = 0; return returnTitle(); } @@ -224,8 +224,8 @@ namespace TJAPlayer3 { //CMenuCharacter.tMenuDisplayCharacter(0, (int)(-200 + CharaX), (int)(336 - CharaY), CMenuCharacter.ECharacterAnimation.NORMAL); - int chara_x = TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2; - int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[0]; + int chara_x = OpenTaiko.Skin.SongSelect_NamePlate_X[0] + OpenTaiko.Tx.NamePlateBase.szTextureSize.Width / 2; + int chara_y = OpenTaiko.Skin.SongSelect_NamePlate_Y[0]; CMenuCharacter.tMenuDisplayCharacter( 0, @@ -235,8 +235,8 @@ namespace TJAPlayer3 { #region [PuchiChara] - int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[0]; - int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[0]; + int puchi_x = chara_x + OpenTaiko.Skin.Adjustments_MenuPuchichara_X[0]; + int puchi_y = chara_y + OpenTaiko.Skin.Adjustments_MenuPuchichara_Y[0]; //this.PuchiChara.On進行描画(0 + 100, 336 + 230, false); this.PuchiChara.On進行描画(puchi_x, puchi_y, false); @@ -256,10 +256,10 @@ namespace TJAPlayer3 { if (!tSelectSongRandomly()) { bDifficultyIn = false; b選択した = false; - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } } else { - TJAPlayer3.stage段位選択.t段位を選択する(); + OpenTaiko.stage段位選択.t段位を選択する(); } ct待機.CurrentValue = 0; ct待機.Stop(); @@ -291,11 +291,11 @@ namespace TJAPlayer3 { public void t段位を選択する() { this.b選択した = true; - TJAPlayer3.stageSongSelect.rChoosenSong = 段位リスト.listSongs[段位リスト.n現在の選択行]; - TJAPlayer3.stageSongSelect.r確定されたスコア = 段位リスト.listSongs[段位リスト.n現在の選択行].arスコア[(int)Difficulty.Dan]; - TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Dan; - TJAPlayer3.stageSongSelect.str確定された曲のジャンル = 段位リスト.listSongs[段位リスト.n現在の選択行].strジャンル; - if ((TJAPlayer3.stageSongSelect.rChoosenSong != null) && (TJAPlayer3.stageSongSelect.r確定されたスコア != null)) { + OpenTaiko.stageSongSelect.rChoosenSong = 段位リスト.listSongs[段位リスト.n現在の選択行]; + OpenTaiko.stageSongSelect.r確定されたスコア = 段位リスト.listSongs[段位リスト.n現在の選択行].arスコア[(int)Difficulty.Dan]; + OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Dan; + OpenTaiko.stageSongSelect.str確定された曲のジャンル = 段位リスト.listSongs[段位リスト.n現在の選択行].strジャンル; + if ((OpenTaiko.stageSongSelect.rChoosenSong != null) && (OpenTaiko.stageSongSelect.r確定されたスコア != null)) { this.eフェードアウト完了時の戻り値 = E戻り値.選曲した; this.actFOtoNowLoading.tフェードアウト開始(); // #27787 2012.3.10 yyagi 曲決定時の画面フェードアウトの省略 base.ePhaseID = CStage.EPhase.SongSelect_FadeOutToNowLoading; @@ -310,7 +310,7 @@ namespace TJAPlayer3 { CSongListNode song = 段位リスト.currentBar; List songs = new List(); - TJAPlayer3.stageSongSelect.t指定された曲の子リストの曲を列挙する_孫リスト含む(song.rParentNode, ref songs, ref mandatoryDiffs, true); + OpenTaiko.stageSongSelect.t指定された曲の子リストの曲を列挙する_孫リスト含む(song.rParentNode, ref songs, ref mandatoryDiffs, true); song.listランダム用ノードリスト = songs; int selectableSongCount = song.listランダム用ノードリスト.Count; @@ -319,20 +319,20 @@ namespace TJAPlayer3 { return false; } - int randomSongIndex = TJAPlayer3.Random.Next(selectableSongCount); + int randomSongIndex = OpenTaiko.Random.Next(selectableSongCount); - if (TJAPlayer3.ConfigIni.bLogDTX詳細ログ出力) { + if (OpenTaiko.ConfigIni.bLogDTX詳細ログ出力) { StringBuilder builder = new StringBuilder(0x400); builder.Append(string.Format("Total number of songs to randomly choose from {0}. Randomly selected index {0}.", selectableSongCount, randomSongIndex)); Trace.TraceInformation(builder.ToString()); } // Third assignment - TJAPlayer3.stageSongSelect.rChoosenSong = song.listランダム用ノードリスト[randomSongIndex]; - TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Dan; + OpenTaiko.stageSongSelect.rChoosenSong = song.listランダム用ノードリスト[randomSongIndex]; + OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Dan; - TJAPlayer3.stageSongSelect.r確定されたスコア = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(TJAPlayer3.stageSongSelect.rChoosenSong)]; - TJAPlayer3.stageSongSelect.str確定された曲のジャンル = TJAPlayer3.stageSongSelect.rChoosenSong.strジャンル; + OpenTaiko.stageSongSelect.r確定されたスコア = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[OpenTaiko.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(OpenTaiko.stageSongSelect.rChoosenSong)]; + OpenTaiko.stageSongSelect.str確定された曲のジャンル = OpenTaiko.stageSongSelect.rChoosenSong.strジャンル; //TJAPlayer3.Skin.sound曲決定音.t再生する(); diff --git a/OpenTaiko/src/Stages/05.SongSelect/AnimeBG.cs b/OpenTaiko/src/Stages/05.SongSelect/AnimeBG.cs index 1f161c90..4c6b3358 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/AnimeBG.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/AnimeBG.cs @@ -1,6 +1,6 @@ using NLua; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class AnimeBG : ScriptBG { private LuaFunction LuaPlayAnimation; public AnimeBG(string filePath) : base(filePath) { diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActPlayOption.cs b/OpenTaiko/src/Stages/05.SongSelect/CActPlayOption.cs index ad031574..6e446cf3 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActPlayOption.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActPlayOption.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActPlayOption : CActivity { public CActPlayOption() { base.IsDeActivated = true; @@ -76,7 +76,7 @@ namespace TJAPlayer3 { txNone = OptionTypeTx(CLangManager.LangInstance.GetString("MOD_BLANK"), Color.White, Color.Black); - hsInfo = TJAPlayer3.Skin.hsHitSoundsInformations; + hsInfo = OpenTaiko.Skin.hsHitSoundsInformations; txOtoiro = new CTexture[hsInfo.names.Length]; @@ -124,7 +124,7 @@ namespace TJAPlayer3 { base.DeActivate(); } public override void CreateManagedResource() { - OptionFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongSelect_Option_Font_Scale); + OptionFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongSelect_Option_Font_Scale); base.CreateManagedResource(); } @@ -147,10 +147,10 @@ namespace TJAPlayer3 { ctOpen.Tick(); ctClose.Tick(); - if (!ctOpen.IsTicked) ctOpen.Start(0, 50, 6, TJAPlayer3.Timer); + if (!ctOpen.IsTicked) ctOpen.Start(0, 50, 6, OpenTaiko.Timer); - var act難易度 = TJAPlayer3.stageSongSelect.actDifficultySelectionScreen; - var danAct = TJAPlayer3.stage段位選択.段位挑戦選択画面; + var act難易度 = OpenTaiko.stageSongSelect.actDifficultySelectionScreen; + var danAct = OpenTaiko.stage段位選択.段位挑戦選択画面; #region [ Open & Close ] @@ -186,24 +186,24 @@ namespace TJAPlayer3 { }; var pos = player % 2; - var _shift = pos == 1 ? (TJAPlayer3.Tx.Difficulty_Option.szTextureSize.Width / 2) : 0; - var _rect = new Rectangle(_shift, 0, TJAPlayer3.Tx.Difficulty_Option.szTextureSize.Width / 2, TJAPlayer3.Tx.Difficulty_Option.szTextureSize.Height); + var _shift = pos == 1 ? (OpenTaiko.Tx.Difficulty_Option.szTextureSize.Width / 2) : 0; + var _rect = new Rectangle(_shift, 0, OpenTaiko.Tx.Difficulty_Option.szTextureSize.Width / 2, OpenTaiko.Tx.Difficulty_Option.szTextureSize.Height); - TJAPlayer3.Tx.Difficulty_Option.t2D描画(_shift, y, _rect); - TJAPlayer3.Tx.Difficulty_Option_Select.t2D描画(_shift + TJAPlayer3.Skin.SongSelect_Option_Select_Offset[0] + NowCount * TJAPlayer3.Skin.SongSelect_Option_Interval[0], - TJAPlayer3.Skin.SongSelect_Option_Select_Offset[1] + y + NowCount * TJAPlayer3.Skin.SongSelect_Option_Interval[1], _rect); + OpenTaiko.Tx.Difficulty_Option.t2D描画(_shift, y, _rect); + OpenTaiko.Tx.Difficulty_Option_Select.t2D描画(_shift + OpenTaiko.Skin.SongSelect_Option_Select_Offset[0] + NowCount * OpenTaiko.Skin.SongSelect_Option_Interval[0], + OpenTaiko.Skin.SongSelect_Option_Select_Offset[1] + y + NowCount * OpenTaiko.Skin.SongSelect_Option_Interval[1], _rect); for (int i = 0; i < OptionType.Length; i++) { - OptionType[i].t2D描画(TJAPlayer3.Skin.SongSelect_Option_OptionType_X[pos] + i * TJAPlayer3.Skin.SongSelect_Option_Interval[0], - TJAPlayer3.Skin.SongSelect_Option_OptionType_Y[pos] + y + i * TJAPlayer3.Skin.SongSelect_Option_Interval[1]); + OptionType[i].t2D描画(OpenTaiko.Skin.SongSelect_Option_OptionType_X[pos] + i * OpenTaiko.Skin.SongSelect_Option_Interval[0], + OpenTaiko.Skin.SongSelect_Option_OptionType_Y[pos] + y + i * OpenTaiko.Skin.SongSelect_Option_Interval[1]); } - txModMults[0]?.t2D拡大率考慮描画(CTexture.RefPnt.Up, TJAPlayer3.Skin.SongSelect_Option_ModMults1_X[pos], TJAPlayer3.Skin.SongSelect_Option_ModMults1_Y[pos] + y); - txModMults[1]?.t2D拡大率考慮描画(CTexture.RefPnt.Up, TJAPlayer3.Skin.SongSelect_Option_ModMults2_X[pos], TJAPlayer3.Skin.SongSelect_Option_ModMults2_Y[pos] + y); + txModMults[0]?.t2D拡大率考慮描画(CTexture.RefPnt.Up, OpenTaiko.Skin.SongSelect_Option_ModMults1_X[pos], OpenTaiko.Skin.SongSelect_Option_ModMults1_Y[pos] + y); + txModMults[1]?.t2D拡大率考慮描画(CTexture.RefPnt.Up, OpenTaiko.Skin.SongSelect_Option_ModMults2_X[pos], OpenTaiko.Skin.SongSelect_Option_ModMults2_Y[pos] + y); for (int i = 0; i < _textures.Length; i++) { - _textures[i]?.t2D拡大率考慮描画(CTexture.RefPnt.Up, TJAPlayer3.Skin.SongSelect_Option_Value_X[pos] + i * TJAPlayer3.Skin.SongSelect_Option_Interval[0], - TJAPlayer3.Skin.SongSelect_Option_Value_Y[pos] + y + i * TJAPlayer3.Skin.SongSelect_Option_Interval[1]); + _textures[i]?.t2D拡大率考慮描画(CTexture.RefPnt.Up, OpenTaiko.Skin.SongSelect_Option_Value_X[pos] + i * OpenTaiko.Skin.SongSelect_Option_Interval[0], + OpenTaiko.Skin.SongSelect_Option_Value_Y[pos] + y + i * OpenTaiko.Skin.SongSelect_Option_Interval[1]); } if (ctClose.CurrentValue >= 50) { @@ -231,73 +231,73 @@ namespace TJAPlayer3 { switch (player) { case 0: - _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)); - _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)); - _centerDrum = (TJAPlayer3.Pad.bPressedDGB(EPad.Decide) || - (TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))); - _cancel = (TJAPlayer3.Pad.bPressedDGB(EPad.Cancel) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)); + _rightDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)); + _leftDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)); + _centerDrum = (OpenTaiko.Pad.bPressedDGB(EPad.Decide) || + (OpenTaiko.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))); + _cancel = (OpenTaiko.Pad.bPressedDGB(EPad.Cancel) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)); break; case 1: - _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue2P)); - _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue2P)); - _centerDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P)); + _rightDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue2P)); + _leftDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue2P)); + _centerDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P)); break; case 2: - _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue3P)); - _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue3P)); - _centerDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed3P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed3P)); + _rightDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue3P)); + _leftDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue3P)); + _centerDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed3P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed3P)); break; case 3: - _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue4P)); - _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue4P)); - _centerDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed4P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed4P)); + _rightDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue4P)); + _leftDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue4P)); + _centerDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed4P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed4P)); break; case 4: - _rightDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue5P)); - _leftDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue5P)); - _centerDrum = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed5P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed5P)); + _rightDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue5P)); + _leftDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue5P)); + _centerDrum = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed5P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed5P)); break; } - if (_leftDrum || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { + if (_leftDrum || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { OptionSelect(true); tFetchMults(player); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } - if (_rightDrum || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { + if (_rightDrum || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { OptionSelect(false); tFetchMults(player); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } if (_centerDrum && ctOpen.CurrentValue >= ctOpen.EndValue) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); if (NowCount < nOptionCount) { NowCount++; } else if (NowCount >= nOptionCount && !bEnd) { bEnd = true; - ctClose.Start(0, 50, 6, TJAPlayer3.Timer); + ctClose.Start(0, 50, 6, OpenTaiko.Timer); } } int cp1 = nOptionCount + 1; - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.UpArrow)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.UpArrow)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); NowCount = (NowCount + cp1 - 1) % cp1; } - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.DownArrow)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.DownArrow)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); NowCount = (NowCount + 1) % cp1; } - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) { + OpenTaiko.Skin.soundDecideSFX.tPlay(); bEnd = true; - ctClose.Start(0, 50, 6, TJAPlayer3.Timer); + ctClose.Start(0, 50, 6, OpenTaiko.Timer); } } @@ -361,7 +361,7 @@ namespace TJAPlayer3 { public CTexture OptionTypeTx(string str文字, Color forecolor, Color backcolor) { using (var bmp = OptionFont.DrawText(str文字, forecolor, backcolor, null, 30)) { - return TJAPlayer3.tテクスチャの生成(bmp); + return OpenTaiko.tテクスチャの生成(bmp); } } @@ -420,11 +420,11 @@ namespace TJAPlayer3 { } public void Init(int player) { - int actual = TJAPlayer3.GetActualPlayer(player); + int actual = OpenTaiko.GetActualPlayer(player); #region [ Speed ] - int speed = TJAPlayer3.ConfigIni.nScrollSpeed[actual]; + int speed = OpenTaiko.ConfigIni.nScrollSpeed[actual]; if (speed <= 8) nSpeedCount = 0; @@ -443,13 +443,13 @@ namespace TJAPlayer3 { #region [ Doron ] - nStealth = (int)TJAPlayer3.ConfigIni.eSTEALTH[actual]; + nStealth = (int)OpenTaiko.ConfigIni.eSTEALTH[actual]; #endregion #region [ Random ] - var rand_ = TJAPlayer3.ConfigIni.eRandom[actual]; + var rand_ = OpenTaiko.ConfigIni.eRandom[actual]; if (rand_ == ERandomMode.MIRRORRANDOM) { nRandom = 2; @@ -472,31 +472,31 @@ namespace TJAPlayer3 { #region [ Timing ] - nTiming = TJAPlayer3.ConfigIni.nTimingZones[actual]; + nTiming = OpenTaiko.ConfigIni.nTimingZones[actual]; #endregion #region [Just] - nJust = TJAPlayer3.ConfigIni.bJust[actual]; + nJust = OpenTaiko.ConfigIni.bJust[actual]; #endregion #region [GameType] - nGameType = (int)TJAPlayer3.ConfigIni.nGameType[actual]; + nGameType = (int)OpenTaiko.ConfigIni.nGameType[actual]; #endregion #region [Fun mods] - nFunMods = (int)TJAPlayer3.ConfigIni.nFunMods[actual]; + nFunMods = (int)OpenTaiko.ConfigIni.nFunMods[actual]; #endregion #region [ GameMode ] - if (TJAPlayer3.ConfigIni.bTokkunMode == true) + if (OpenTaiko.ConfigIni.bTokkunMode == true) nGameMode = 1; else nGameMode = 0; @@ -505,7 +505,7 @@ namespace TJAPlayer3 { #region [ AutoMode ] - bool _auto = TJAPlayer3.ConfigIni.bAutoPlay[player]; + bool _auto = OpenTaiko.ConfigIni.bAutoPlay[player]; if (_auto == true) nAutoMode = 1; @@ -516,13 +516,13 @@ namespace TJAPlayer3 { #region [ Hitsounds ] - nOtoiro = Math.Min(txOtoiro.Length - 1, TJAPlayer3.ConfigIni.nHitSounds[actual]); + nOtoiro = Math.Min(txOtoiro.Length - 1, OpenTaiko.ConfigIni.nHitSounds[actual]); #endregion #region [ Song speed ] - nSongSpeed = Math.Max(0, Math.Min(txSongSpeed.Length - 1, (TJAPlayer3.ConfigIni.nSongSpeed / 2) - 5)); + nSongSpeed = Math.Max(0, Math.Min(txSongSpeed.Length - 1, (OpenTaiko.ConfigIni.nSongSpeed / 2) - 5)); #endregion @@ -531,80 +531,80 @@ namespace TJAPlayer3 { } public void Decision(int player) { - int actual = TJAPlayer3.GetActualPlayer(player); + int actual = OpenTaiko.GetActualPlayer(player); #region [ Speed ] if (nSpeedCount == 0) { - TJAPlayer3.ConfigIni.nScrollSpeed[actual] = 4; + OpenTaiko.ConfigIni.nScrollSpeed[actual] = 4; } else if (nSpeedCount > 0 && nSpeedCount <= 11) { - TJAPlayer3.ConfigIni.nScrollSpeed[actual] = nSpeedCount + 8; + OpenTaiko.ConfigIni.nScrollSpeed[actual] = nSpeedCount + 8; } else if (nSpeedCount == 12) { - TJAPlayer3.ConfigIni.nScrollSpeed[actual] = 24; + OpenTaiko.ConfigIni.nScrollSpeed[actual] = 24; } else if (nSpeedCount == 13) { - TJAPlayer3.ConfigIni.nScrollSpeed[actual] = 29; + OpenTaiko.ConfigIni.nScrollSpeed[actual] = 29; } else if (nSpeedCount == 14) { - TJAPlayer3.ConfigIni.nScrollSpeed[actual] = 34; + OpenTaiko.ConfigIni.nScrollSpeed[actual] = 34; } else if (nSpeedCount == 15) { - TJAPlayer3.ConfigIni.nScrollSpeed[actual] = 39; + OpenTaiko.ConfigIni.nScrollSpeed[actual] = 39; } #endregion #region [ Doron ] - TJAPlayer3.ConfigIni.eSTEALTH[actual] = (EStealthMode)nStealth; + OpenTaiko.ConfigIni.eSTEALTH[actual] = (EStealthMode)nStealth; #endregion #region [ Random ] if (nRandom == 2 && nAbekobe == 1) { - TJAPlayer3.ConfigIni.eRandom[actual] = ERandomMode.MIRRORRANDOM; + OpenTaiko.ConfigIni.eRandom[actual] = ERandomMode.MIRRORRANDOM; } else if (nRandom == 2 && nAbekobe == 0) { - TJAPlayer3.ConfigIni.eRandom[actual] = ERandomMode.SUPERRANDOM; + OpenTaiko.ConfigIni.eRandom[actual] = ERandomMode.SUPERRANDOM; } else if (nRandom == 1 && nAbekobe == 1) { - TJAPlayer3.ConfigIni.eRandom[actual] = ERandomMode.RANDOM; + OpenTaiko.ConfigIni.eRandom[actual] = ERandomMode.RANDOM; } else if (nRandom == 1 && nAbekobe == 0) { - TJAPlayer3.ConfigIni.eRandom[actual] = ERandomMode.RANDOM; + OpenTaiko.ConfigIni.eRandom[actual] = ERandomMode.RANDOM; } else if (nRandom == 0 && nAbekobe == 1) { - TJAPlayer3.ConfigIni.eRandom[actual] = ERandomMode.MIRROR; + OpenTaiko.ConfigIni.eRandom[actual] = ERandomMode.MIRROR; } else if (nRandom == 0 && nAbekobe == 0) { - TJAPlayer3.ConfigIni.eRandom[actual] = ERandomMode.OFF; + OpenTaiko.ConfigIni.eRandom[actual] = ERandomMode.OFF; } #endregion #region [ Timing ] - TJAPlayer3.ConfigIni.nTimingZones[actual] = nTiming; + OpenTaiko.ConfigIni.nTimingZones[actual] = nTiming; #endregion #region [Just] - TJAPlayer3.ConfigIni.bJust[actual] = nJust; + OpenTaiko.ConfigIni.bJust[actual] = nJust; #endregion #region [GameType] - TJAPlayer3.ConfigIni.nGameType[actual] = (EGameType)nGameType; + OpenTaiko.ConfigIni.nGameType[actual] = (EGameType)nGameType; #endregion #region [Fun mods] - TJAPlayer3.ConfigIni.nFunMods[actual] = (EFunMods)nFunMods; + OpenTaiko.ConfigIni.nFunMods[actual] = (EFunMods)nFunMods; #endregion #region [ GameMode ] if (nGameMode == 0) { - TJAPlayer3.ConfigIni.bTokkunMode = false; + OpenTaiko.ConfigIni.bTokkunMode = false; } else { - TJAPlayer3.ConfigIni.bTokkunMode = true; + OpenTaiko.ConfigIni.bTokkunMode = true; } #endregion @@ -612,23 +612,23 @@ namespace TJAPlayer3 { #region [ AutoMode ] if (nAutoMode == 1) { - TJAPlayer3.ConfigIni.bAutoPlay[player] = true; + OpenTaiko.ConfigIni.bAutoPlay[player] = true; } else { - TJAPlayer3.ConfigIni.bAutoPlay[player] = false; + OpenTaiko.ConfigIni.bAutoPlay[player] = false; } #endregion #region [ Hitsounds ] - TJAPlayer3.ConfigIni.nHitSounds[actual] = nOtoiro; + OpenTaiko.ConfigIni.nHitSounds[actual] = nOtoiro; hsInfo.tReloadHitSounds(nOtoiro, actual); #endregion #region [ Song speed ] - TJAPlayer3.ConfigIni.nSongSpeed = (nSongSpeed + 5) * 2; + OpenTaiko.ConfigIni.nSongSpeed = (nSongSpeed + 5) * 2; #endregion } @@ -636,7 +636,7 @@ namespace TJAPlayer3 { #region [ Balancing functions ] public float tGetScrollSpeedFactor(EBalancingType ebt = EBalancingType.SCORE, bool isMenu = false, int actual = 0) { - var _compare = (isMenu) ? nSpeedCount != 1 : TJAPlayer3.ConfigIni.nScrollSpeed[actual] != 9; + var _compare = (isMenu) ? nSpeedCount != 1 : OpenTaiko.ConfigIni.nScrollSpeed[actual] != 9; if (ebt == EBalancingType.SCORE) return (_compare) ? 0.9f : 1f; @@ -644,7 +644,7 @@ namespace TJAPlayer3 { } public float tGetSongSpeedFactor(EBalancingType ebt = EBalancingType.SCORE, bool isMenu = false, int actual = 0) { - var _compare = ((isMenu) ? (nSongSpeed + 5) * 2 : TJAPlayer3.ConfigIni.nSongSpeed) / 20f; + var _compare = ((isMenu) ? (nSongSpeed + 5) * 2 : OpenTaiko.ConfigIni.nSongSpeed) / 20f; if (ebt == EBalancingType.SCORE || _compare <= 1f) return Math.Min(1f, (float)Math.Pow(_compare, 1.3)); @@ -652,7 +652,7 @@ namespace TJAPlayer3 { } public float tGetJustFactor(EBalancingType ebt = EBalancingType.SCORE, bool isMenu = false, int actual = 0) { - var _compare = (isMenu) ? nJust : TJAPlayer3.ConfigIni.bJust[actual]; + var _compare = (isMenu) ? nJust : OpenTaiko.ConfigIni.bJust[actual]; if (ebt == EBalancingType.SCORE) return (_compare == 2) ? 0.6f : 1f; @@ -661,7 +661,7 @@ namespace TJAPlayer3 { } public float tGetTimingFactor(EBalancingType ebt = EBalancingType.SCORE, bool isMenu = false, int actual = 0) { - var _compare = (isMenu) ? nTiming - 2 : TJAPlayer3.ConfigIni.nTimingZones[actual] - 2; + var _compare = (isMenu) ? nTiming - 2 : OpenTaiko.ConfigIni.nTimingZones[actual] - 2; if (ebt == EBalancingType.SCORE) return (_compare < 0) ? (1f + 0.2f * _compare) : 1f; @@ -670,7 +670,7 @@ namespace TJAPlayer3 { } public float tGetDoronFactor(EBalancingType ebt = EBalancingType.SCORE, bool isMenu = false, int actual = 0) { - var _compare = (isMenu) ? nStealth : (int)TJAPlayer3.ConfigIni.eSTEALTH[actual]; + var _compare = (isMenu) ? nStealth : (int)OpenTaiko.ConfigIni.eSTEALTH[actual]; if (ebt == EBalancingType.SCORE || _compare == 0) return 1f; @@ -681,7 +681,7 @@ namespace TJAPlayer3 { public float tGetModMultiplier(EBalancingType ebt = EBalancingType.SCORE, bool isMenu = false, int player = 0) { float factor = 1f; - int actual = TJAPlayer3.GetActualPlayer(player); + int actual = OpenTaiko.GetActualPlayer(player); //factor *= tGetScrollSpeedFactor(ebt, isMenu, actual); factor *= tGetSongSpeedFactor(ebt, isMenu, actual); diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectArtistComment.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectArtistComment.cs index 187df510..0ea19c95 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectArtistComment.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectArtistComment.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectArtistComment : CActivity { // メソッド @@ -128,8 +128,8 @@ namespace TJAPlayer3 { base.Activate(); } public override void DeActivate() { - TJAPlayer3.tテクスチャの解放(ref this.txArtist); - TJAPlayer3.tテクスチャの解放(ref this.txComment); + OpenTaiko.tテクスチャの解放(ref this.txArtist); + OpenTaiko.tテクスチャの解放(ref this.txComment); this.ctComment = null; base.DeActivate(); } @@ -143,8 +143,8 @@ namespace TJAPlayer3 { this.ft描画用フォント = null; } - TJAPlayer3.tテクスチャの解放(ref this.txArtist); - TJAPlayer3.tテクスチャの解放(ref this.txComment); + OpenTaiko.tテクスチャの解放(ref this.txArtist); + OpenTaiko.tテクスチャの解放(ref this.txComment); base.ReleaseManagedResource(); } public override int Draw() { diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectDanInfo.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectDanInfo.cs index 6c24ca9b..00c83cbb 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectDanInfo.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectDanInfo.cs @@ -2,7 +2,7 @@ using FDK; // Minimalist menu class to use for custom menus -namespace TJAPlayer3 { +namespace OpenTaiko { class CActSelectDanInfo : CStage { public CActSelectDanInfo() { base.IsDeActivated = true; @@ -14,8 +14,8 @@ namespace TJAPlayer3 { if (base.IsActivated) return; - ctStep = new CCounter(0, 1000, 2, TJAPlayer3.Timer); - ctStepFade = new CCounter(0, 255, 0.5, TJAPlayer3.Timer); + ctStep = new CCounter(0, 1000, 2, OpenTaiko.Timer); + ctStepFade = new CCounter(0, 255, 0.5, OpenTaiko.Timer); ttkExams = new TitleTextureKey[(int)Exam.Type.Total]; for (int i = 0; i < ttkExams.Length; i++) { @@ -33,16 +33,16 @@ namespace TJAPlayer3 { public override void CreateManagedResource() { // Ressource allocation - pfTitleFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongSelect_DanInfo_Title_Size); - pfExamFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Size); + pfTitleFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongSelect_DanInfo_Title_Size); + pfExamFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongSelect_DanInfo_Exam_Size); base.CreateManagedResource(); } public override void ReleaseManagedResource() { // Ressource freeing - TJAPlayer3.tDisposeSafely(ref pfTitleFont); - TJAPlayer3.tDisposeSafely(ref pfExamFont); + OpenTaiko.tDisposeSafely(ref pfTitleFont); + OpenTaiko.tDisposeSafely(ref pfExamFont); base.ReleaseManagedResource(); } @@ -51,16 +51,16 @@ namespace TJAPlayer3 { ctStep.Tick(); ctStepFade.Tick(); if (ctStep.CurrentValue == ctStep.EndValue) { - ctStep = new CCounter(0, 1000, 2, TJAPlayer3.Timer); + ctStep = new CCounter(0, 1000, 2, OpenTaiko.Timer); tNextStep(); } - if (TJAPlayer3.Skin.SongSelect_DanInfo_Show) { - for (int i = 0; i < TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++) { - var dan = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[i]; + if (OpenTaiko.Skin.SongSelect_DanInfo_Show) { + for (int i = 0; i < OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++) { + var dan = OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs[i]; int songIndex = i / 3; int opacity = 255; - if (TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count > 3) { + if (OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs.Count > 3) { if (nNowSongIndex == songIndex) { opacity = ctStepFade.CurrentValue; } else if (nPrevSongIndex == songIndex) { @@ -71,48 +71,48 @@ namespace TJAPlayer3 { } int pos = i % 3; - CActSelect段位リスト.tDisplayDanIcon(i + 1, TJAPlayer3.Skin.SongSelect_DanInfo_Icon_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Icon_Y[pos], opacity, TJAPlayer3.Skin.SongSelect_DanInfo_Icon_Scale, false); + CActSelect段位リスト.tDisplayDanIcon(i + 1, OpenTaiko.Skin.SongSelect_DanInfo_Icon_X[pos], OpenTaiko.Skin.SongSelect_DanInfo_Icon_Y[pos], opacity, OpenTaiko.Skin.SongSelect_DanInfo_Icon_Scale, false); - int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5; - int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; + int difficulty_cymbol_width = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5; + int difficulty_cymbol_height = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = opacity; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Scale; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Scale; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Y[pos], new Rectangle(dan.Difficulty * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height)); - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = 255; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = 1; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = 1; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.Opacity = opacity; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = OpenTaiko.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Scale; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = OpenTaiko.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Scale; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.SongSelect_DanInfo_Difficulty_Cymbol_X[pos], OpenTaiko.Skin.SongSelect_DanInfo_Difficulty_Cymbol_Y[pos], new Rectangle(dan.Difficulty * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height)); + OpenTaiko.Tx.Dani_Difficulty_Cymbol.Opacity = 255; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = 1; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = 1; - TJAPlayer3.Tx.Dani_Level_Number.Opacity = opacity; - TJAPlayer3.stage段位選択.段位リスト.tLevelNumberDraw(TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_Y[pos], dan.Level, TJAPlayer3.Skin.SongSelect_DanInfo_Level_Number_Scale); - TJAPlayer3.Tx.Dani_Level_Number.Opacity = 255; + OpenTaiko.Tx.Dani_Level_Number.Opacity = opacity; + OpenTaiko.stage段位選択.段位リスト.tLevelNumberDraw(OpenTaiko.Skin.SongSelect_DanInfo_Level_Number_X[pos], OpenTaiko.Skin.SongSelect_DanInfo_Level_Number_Y[pos], dan.Level, OpenTaiko.Skin.SongSelect_DanInfo_Level_Number_Scale); + OpenTaiko.Tx.Dani_Level_Number.Opacity = 255; TitleTextureKey.ResolveTitleTexture(ttkTitles[i]).Opacity = opacity; - TitleTextureKey.ResolveTitleTexture(ttkTitles[i]).t2D描画(TJAPlayer3.Skin.SongSelect_DanInfo_Title_X[pos], TJAPlayer3.Skin.SongSelect_DanInfo_Title_Y[pos]); + TitleTextureKey.ResolveTitleTexture(ttkTitles[i]).t2D描画(OpenTaiko.Skin.SongSelect_DanInfo_Title_X[pos], OpenTaiko.Skin.SongSelect_DanInfo_Title_Y[pos]); } for (int j = 0; j < CExamInfo.cMaxExam; j++) { int index = j; - Dan_C danc0 = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[0].Dan_C[j]; + Dan_C danc0 = OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs[0].Dan_C[j]; if (danc0 != null) { - TitleTextureKey.ResolveTitleTexture(this.ttkExams[(int)danc0.GetExamType()]).t2D中心基準描画(TJAPlayer3.Skin.SongSelect_DanInfo_Exam_X[index], TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Y[index]); + TitleTextureKey.ResolveTitleTexture(this.ttkExams[(int)danc0.GetExamType()]).t2D中心基準描画(OpenTaiko.Skin.SongSelect_DanInfo_Exam_X[index], OpenTaiko.Skin.SongSelect_DanInfo_Exam_Y[index]); } - if (TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count - 1].Dan_C[j] == null) { - Dan_C danc = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[0].Dan_C[j]; + if (OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs[OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs.Count - 1].Dan_C[j] == null) { + Dan_C danc = OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs[0].Dan_C[j]; if (danc != null) { - TJAPlayer3.stage段位選択.段位リスト.tExamDraw(TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_X[0], TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_Y[index], danc.Value[0], danc.GetExamRange(), TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_Scale); + OpenTaiko.stage段位選択.段位リスト.tExamDraw(OpenTaiko.Skin.SongSelect_DanInfo_Exam_Value_X[0], OpenTaiko.Skin.SongSelect_DanInfo_Exam_Value_Y[index], danc.Value[0], danc.GetExamRange(), OpenTaiko.Skin.SongSelect_DanInfo_Exam_Value_Scale); } } else { - for (int i = 0; i < TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++) { - Dan_C danc = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[i].Dan_C[j]; + for (int i = 0; i < OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++) { + Dan_C danc = OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs[i].Dan_C[j]; if (danc != null) { int opacity = 255; - if (TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count > 3) { + if (OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs.Count > 3) { if (nNowSongIndex == i / 3) { opacity = ctStepFade.CurrentValue; } else if (nPrevSongIndex == i / 3) { @@ -122,9 +122,9 @@ namespace TJAPlayer3 { } } - TJAPlayer3.Tx.Dani_Exam_Number.Opacity = opacity; - TJAPlayer3.stage段位選択.段位リスト.tExamDraw(TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_X[i % 3], TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_Y[index], danc.Value[0], danc.GetExamRange(), TJAPlayer3.Skin.SongSelect_DanInfo_Exam_Value_Scale); - TJAPlayer3.Tx.Dani_Exam_Number.Opacity = 255; + OpenTaiko.Tx.Dani_Exam_Number.Opacity = opacity; + OpenTaiko.stage段位選択.段位リスト.tExamDraw(OpenTaiko.Skin.SongSelect_DanInfo_Exam_Value_X[i % 3], OpenTaiko.Skin.SongSelect_DanInfo_Exam_Value_Y[index], danc.Value[0], danc.GetExamRange(), OpenTaiko.Skin.SongSelect_DanInfo_Exam_Value_Scale); + OpenTaiko.Tx.Dani_Exam_Number.Opacity = 255; } } } @@ -135,11 +135,11 @@ namespace TJAPlayer3 { } public void UpdateSong() { - if (TJAPlayer3.stageSongSelect.rNowSelectedSong == null || TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs == null) return; + if (OpenTaiko.stageSongSelect.rNowSelectedSong == null || OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs == null) return; - ttkTitles = new TitleTextureKey[TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count]; - for (int i = 0; i < TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++) { - var dan = TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs[i]; + ttkTitles = new TitleTextureKey[OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs.Count]; + for (int i = 0; i < OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs.Count; i++) { + var dan = OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs[i]; ttkTitles[i] = new TitleTextureKey(dan.bTitleShow ? "???" : dan.Title, pfTitleFont, Color.Black, Color.Transparent, 700); } } @@ -159,8 +159,8 @@ namespace TJAPlayer3 { private void tNextStep() { nPrevSongIndex = nNowSongIndex; - nNowSongIndex = (nNowSongIndex + 1) % (int)Math.Ceiling(TJAPlayer3.stageSongSelect.rNowSelectedSong.DanSongs.Count / 3.0); - ctStepFade = new CCounter(0, 255, 1, TJAPlayer3.Timer); + nNowSongIndex = (nNowSongIndex + 1) % (int)Math.Ceiling(OpenTaiko.stageSongSelect.rNowSelectedSong.DanSongs.Count / 3.0); + ctStepFade = new CCounter(0, 255, 1, OpenTaiko.Timer); } #endregion diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectExExtraTransAnime.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectExExtraTransAnime.cs index 78393551..f458073e 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectExExtraTransAnime.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectExExtraTransAnime.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectExExtraTransAnime : CActivity { enum AnimeState { NotRunning = 0, @@ -22,8 +22,8 @@ namespace TJAPlayer3 { CurrentState = AnimeState.NotRunning; - ExToExtraCounter = new CCounter(0, 1, TJAPlayer3.Skin.SongSelect_Difficulty_Bar_ExExtra_AnimeDuration[0], TJAPlayer3.Timer); - ExtraToExCounter = new CCounter(0, 1, TJAPlayer3.Skin.SongSelect_Difficulty_Bar_ExExtra_AnimeDuration[1], TJAPlayer3.Timer); + ExToExtraCounter = new CCounter(0, 1, OpenTaiko.Skin.SongSelect_Difficulty_Bar_ExExtra_AnimeDuration[0], OpenTaiko.Timer); + ExtraToExCounter = new CCounter(0, 1, OpenTaiko.Skin.SongSelect_Difficulty_Bar_ExExtra_AnimeDuration[1], OpenTaiko.Timer); ExToExtraScript = new AnimeBG(CSkin.Path($"{TextureLoader.BASE}{TextureLoader.SONGSELECT}Difficulty_Select{Path.DirectorySeparatorChar}ExToExtra{Path.DirectorySeparatorChar}0{Path.DirectorySeparatorChar}Script.lua")); ExtraToExScript = new AnimeBG(CSkin.Path($"{TextureLoader.BASE}{TextureLoader.SONGSELECT}Difficulty_Select{Path.DirectorySeparatorChar}ExtraToEx{Path.DirectorySeparatorChar}0{Path.DirectorySeparatorChar}Script.lua")); @@ -93,19 +93,19 @@ namespace TJAPlayer3 { } public void BeginAnime(bool toExtra) { - if (!TJAPlayer3.ConfigIni.ShowExExtraAnime) return; + if (!OpenTaiko.ConfigIni.ShowExExtraAnime) return; else if (toExtra && !ExToExtraScript.Exists()) return; else if (!toExtra && !ExtraToExScript.Exists()) return; CurrentState = toExtra ? AnimeState.ExToExtra : AnimeState.ExtraToEx; if (toExtra) { - ExToExtraCounter = new CCounter(0, 1, TJAPlayer3.Skin.SongSelect_Difficulty_Bar_ExExtra_AnimeDuration[0], TJAPlayer3.Timer); + ExToExtraCounter = new CCounter(0, 1, OpenTaiko.Skin.SongSelect_Difficulty_Bar_ExExtra_AnimeDuration[0], OpenTaiko.Timer); ExToExtraScript.PlayAnimation(); - TJAPlayer3.Skin.soundExToExtra[0]?.tPlay(); // Placeholder code + OpenTaiko.Skin.soundExToExtra[0]?.tPlay(); // Placeholder code } else { - ExtraToExCounter = new CCounter(0, 1, TJAPlayer3.Skin.SongSelect_Difficulty_Bar_ExExtra_AnimeDuration[1], TJAPlayer3.Timer); + ExtraToExCounter = new CCounter(0, 1, OpenTaiko.Skin.SongSelect_Difficulty_Bar_ExExtra_AnimeDuration[1], OpenTaiko.Timer); ExtraToExScript.PlayAnimation(); - TJAPlayer3.Skin.soundExtraToEx[0]?.tPlay(); // Placeholder code + OpenTaiko.Skin.soundExtraToEx[0]?.tPlay(); // Placeholder code } } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectInformation.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectInformation.cs index ad39d5ef..4cb9c4bc 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectInformation.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectInformation.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectInformation : CActivity { // コンストラクタ @@ -18,7 +18,7 @@ namespace TJAPlayer3 { this.n画像Index下 = 0; this.bFirst = true; - this.ct進行用 = new CCounter(0, 3000, 3, TJAPlayer3.Timer); + this.ct進行用 = new CCounter(0, 3000, 3, OpenTaiko.Timer); base.Activate(); } public override void DeActivate() { @@ -26,15 +26,15 @@ namespace TJAPlayer3 { base.DeActivate(); } public override void CreateManagedResource() { - this.txInfo_Back = TJAPlayer3.tテクスチャの生成(CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}5_information_BG.png")); - this.txInfo[0] = TJAPlayer3.tテクスチャの生成(CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}5_information.png")); - this.txInfo[1] = TJAPlayer3.tテクスチャの生成(CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}5_information2.png")); + this.txInfo_Back = OpenTaiko.tテクスチャの生成(CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}5_information_BG.png")); + this.txInfo[0] = OpenTaiko.tテクスチャの生成(CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}5_information.png")); + this.txInfo[1] = OpenTaiko.tテクスチャの生成(CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}5_information2.png")); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tテクスチャの解放(ref this.txInfo_Back); - TJAPlayer3.tテクスチャの解放(ref this.txInfo[0]); - TJAPlayer3.tテクスチャの解放(ref this.txInfo[1]); + OpenTaiko.tテクスチャの解放(ref this.txInfo_Back); + OpenTaiko.tテクスチャの解放(ref this.txInfo[0]); + OpenTaiko.tテクスチャの解放(ref this.txInfo[1]); base.ReleaseManagedResource(); } public override int Draw() { diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectPopupMenu.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectPopupMenu.cs index c035206d..a3969acb 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectPopupMenu.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectPopupMenu.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectPopupMenu : CActivity { private static List Child = new List(); @@ -56,14 +56,14 @@ namespace TJAPlayer3 { stqMenuTitle.cItem = new CItemBase(); stqMenuTitle.cItem.str項目名 = title; using (var bitmap = prvFont.DrawText(title, Color.White, Color.Black, null, 30)) { - stqMenuTitle.txName = TJAPlayer3.tテクスチャの生成(bitmap, false); + stqMenuTitle.txName = OpenTaiko.tテクスチャの生成(bitmap, false); } lciMenuItems = new stQuickMenuItem[menulist.Count]; for (int i = 0; i < menulist.Count; i++) { stQuickMenuItem stqm = new stQuickMenuItem(); stqm.cItem = menulist[i]; using (var bitmap = prvFont.DrawText(menulist[i].str項目名, Color.White, Color.Black, null, 30)) { - stqm.txName = TJAPlayer3.tテクスチャの生成(bitmap, false); + stqm.txName = OpenTaiko.tテクスチャの生成(bitmap, false); } lciMenuItems[i] = stqm; } @@ -74,7 +74,7 @@ namespace TJAPlayer3 { private void ConditionallyInitializePrvFont() { if (prvFont == null) { - prvFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.PopupMenu_Font_Size); + prvFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.PopupMenu_Font_Size); } } @@ -85,24 +85,24 @@ namespace TJAPlayer3 { } public void _RefleshSkin() { - TJAPlayer3.tDisposeSafely(ref prvFont); + OpenTaiko.tDisposeSafely(ref prvFont); ConditionallyInitializePrvFont(); using (var bitmap = prvFont.DrawText(stqMenuTitle.cItem.str項目名, Color.White, Color.Black, null, 30)) { - TJAPlayer3.tDisposeSafely(ref stqMenuTitle.txName); - stqMenuTitle.txName = TJAPlayer3.tテクスチャの生成(bitmap, false); + OpenTaiko.tDisposeSafely(ref stqMenuTitle.txName); + stqMenuTitle.txName = OpenTaiko.tテクスチャの生成(bitmap, false); } for (int i = 0; i < lciMenuItems.Length; i++) { using (var bitmap = prvFont.DrawText(lciMenuItems[i].cItem.str項目名, Color.White, Color.Black, null, 30)) { - TJAPlayer3.tDisposeSafely(ref lciMenuItems[i].txName); - lciMenuItems[i].txName = TJAPlayer3.tテクスチャの生成(bitmap, false); + OpenTaiko.tDisposeSafely(ref lciMenuItems[i].txName); + lciMenuItems[i].txName = OpenTaiko.tテクスチャの生成(bitmap, false); } } } public void tEnter押下() { if (this.bキー入力待ち) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); if (this.n現在の選択行 != lciMenuItems.Length - 1) { if (lciMenuItems[n現在の選択行].cItem.e種別 == CItemBase.E種別.リスト || @@ -143,7 +143,7 @@ namespace TJAPlayer3 { public void t次に移動() { if (this.bキー入力待ち) { - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); if (bIsSelectingIntItem) { lciMenuItems[n現在の選択行].cItem.t項目値を前へ移動(); // 項目移動と数値上下は方向が逆になるので注意 } else { @@ -155,7 +155,7 @@ namespace TJAPlayer3 { } public void t前に移動() { if (this.bキー入力待ち) { - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); if (bIsSelectingIntItem) { lciMenuItems[n現在の選択行].cItem.t項目値を次へ移動(); // 項目移動と数値上下は方向が逆になるので注意 } else { @@ -172,7 +172,7 @@ namespace TJAPlayer3 { // this.n現在の選択行 = 0; this.bキー入力待ち = true; for (int i = 0; i < 4; i++) { - this.ctキー反復用[i] = new CCounter(0, 0, 0, TJAPlayer3.Timer); + this.ctキー反復用[i] = new CCounter(0, 0, 0, OpenTaiko.Timer); } base.IsDeActivated = true; b選択した = false; @@ -207,7 +207,7 @@ namespace TJAPlayer3 { public override void ReleaseManagedResource() { //CDTXMania.tテクスチャの解放( ref this.txPopupMenuBackground ); //CDTXMania.tテクスチャの解放( ref this.txCursor ); - TJAPlayer3.tDisposeSafely(ref this.prvFont); + OpenTaiko.tDisposeSafely(ref this.prvFont); base.ReleaseManagedResource(); } @@ -219,19 +219,19 @@ namespace TJAPlayer3 { if (!base.IsDeActivated && this.bIsActivePopupMenu) { if (this.bキー入力待ち) { #region [ Shift-F1: CONFIG画面 ] - if ((TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightShift) || TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftShift)) && - TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F1)) { // [SHIFT] + [F1] CONFIG - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + if ((OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightShift) || OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftShift)) && + OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F1)) { // [SHIFT] + [F1] CONFIG + OpenTaiko.Skin.soundCancelSFX.tPlay(); tCancel(); this.bGotoDetailConfig = true; } #endregion #region [ キー入力: キャンセル ] - else if ((TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) - || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.FT) - || TJAPlayer3.Pad.bPressedGB(EPad.Cancel)) + else if ((OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) + || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.FT) + || OpenTaiko.Pad.bPressedGB(EPad.Cancel)) && this.bEsc有効) { // キャンセル - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); tCancel(); this.bIsActivePopupMenu = false; } @@ -241,19 +241,19 @@ namespace TJAPlayer3 { #region [ キー入力: 決定 ] // E楽器パート eInst = E楽器パート.UNKNOWN; ESortAction eAction = ESortAction.END; - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.GUITAR, EPad.Decide)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.GUITAR, EPad.Decide)) { eInst = EInstrumentPad.GUITAR; eAction = ESortAction.Decide; - } else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.BASS, EPad.Decide)) { + } else if (OpenTaiko.Pad.bPressed(EInstrumentPad.BASS, EPad.Decide)) { eInst = EInstrumentPad.BASS; eAction = ESortAction.Decide; } else if ( - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) // #24756 2011.4.1 yyagi: Add condition "Drum-Decide" to enable CY in Sort Menu. - || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RD) - || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LC) - || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed) - || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) - || (TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))) { + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide) // #24756 2011.4.1 yyagi: Add condition "Drum-Decide" to enable CY in Sort Menu. + || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RD) + || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LC) + || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed) + || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed) + || (OpenTaiko.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))) { eInst = EInstrumentPad.DRUMS; eAction = ESortAction.Decide; } @@ -263,45 +263,45 @@ namespace TJAPlayer3 { } #endregion #region [ キー入力: 前に移動 ] - this.ctキー反復用.Up.KeyIntervalFunc(TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.UpArrow), new CCounter.KeyProcess(this.t前に移動)); - this.ctキー反復用.R.KeyIntervalFunc(TJAPlayer3.Pad.b押されているGB(EPad.R), new CCounter.KeyProcess(this.t前に移動)); - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.SD) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue)) { + this.ctキー反復用.Up.KeyIntervalFunc(OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.UpArrow), new CCounter.KeyProcess(this.t前に移動)); + this.ctキー反復用.R.KeyIntervalFunc(OpenTaiko.Pad.b押されているGB(EPad.R), new CCounter.KeyProcess(this.t前に移動)); + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.SD) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue)) { this.t前に移動(); } #endregion #region [ キー入力: 次に移動 ] - this.ctキー反復用.Down.KeyIntervalFunc(TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.DownArrow), new CCounter.KeyProcess(this.t次に移動)); - this.ctキー反復用.B.KeyIntervalFunc(TJAPlayer3.Pad.b押されているGB(EPad.B), new CCounter.KeyProcess(this.t次に移動)); - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LT) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue)) { + this.ctキー反復用.Down.KeyIntervalFunc(OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.DownArrow), new CCounter.KeyProcess(this.t次に移動)); + this.ctキー反復用.B.KeyIntervalFunc(OpenTaiko.Pad.b押されているGB(EPad.B), new CCounter.KeyProcess(this.t次に移動)); + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LT) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue)) { this.t次に移動(); } #endregion } } #region [ ポップアップメニュー 背景描画 ] - if (TJAPlayer3.Tx.Menu_Title != null) { - TJAPlayer3.Tx.Menu_Title.t2D描画(TJAPlayer3.Skin.PopupMenu_Menu_Title[0], TJAPlayer3.Skin.PopupMenu_Menu_Title[1]); + if (OpenTaiko.Tx.Menu_Title != null) { + OpenTaiko.Tx.Menu_Title.t2D描画(OpenTaiko.Skin.PopupMenu_Menu_Title[0], OpenTaiko.Skin.PopupMenu_Menu_Title[1]); } #endregion #region [ ソートメニュータイトル描画 ] - stqMenuTitle.txName.t2D描画(TJAPlayer3.Skin.PopupMenu_Title[0], TJAPlayer3.Skin.PopupMenu_Title[1]); + stqMenuTitle.txName.t2D描画(OpenTaiko.Skin.PopupMenu_Title[0], OpenTaiko.Skin.PopupMenu_Title[1]); #endregion #region [ カーソル描画 ] - if (TJAPlayer3.Tx.Menu_Highlight != null) { - int curX = TJAPlayer3.Skin.PopupMenu_Menu_Highlight[0] + (TJAPlayer3.Skin.PopupMenu_Move[0] * (this.n現在の選択行 + 1)); - int curY = TJAPlayer3.Skin.PopupMenu_Menu_Highlight[1] + (TJAPlayer3.Skin.PopupMenu_Move[1] * (this.n現在の選択行 + 1)); + if (OpenTaiko.Tx.Menu_Highlight != null) { + int curX = OpenTaiko.Skin.PopupMenu_Menu_Highlight[0] + (OpenTaiko.Skin.PopupMenu_Move[0] * (this.n現在の選択行 + 1)); + int curY = OpenTaiko.Skin.PopupMenu_Menu_Highlight[1] + (OpenTaiko.Skin.PopupMenu_Move[1] * (this.n現在の選択行 + 1)); - int width = TJAPlayer3.Tx.Menu_Highlight.szTextureSize.Width / 2; - int height = TJAPlayer3.Tx.Menu_Highlight.szTextureSize.Height; + int width = OpenTaiko.Tx.Menu_Highlight.szTextureSize.Width / 2; + int height = OpenTaiko.Tx.Menu_Highlight.szTextureSize.Height; - TJAPlayer3.Tx.Menu_Highlight.t2D描画(curX, curY, new Rectangle(0, 0, width, height)); + OpenTaiko.Tx.Menu_Highlight.t2D描画(curX, curY, new Rectangle(0, 0, width, height)); curX += width; Rectangle rectangle = new Rectangle(width / 2, 0, width, height); for (int j = 0; j < 16; j++) { - TJAPlayer3.Tx.Menu_Highlight.t2D描画(curX, curY, rectangle); + OpenTaiko.Tx.Menu_Highlight.t2D描画(curX, curY, rectangle); curX += width; } - TJAPlayer3.Tx.Menu_Highlight.t2D描画(curX, curY, new Rectangle(width, 0, width, height)); + OpenTaiko.Tx.Menu_Highlight.t2D描画(curX, curY, new Rectangle(width, 0, width, height)); } #endregion #region [ ソート候補文字列描画 ] @@ -309,8 +309,8 @@ namespace TJAPlayer3 { bool bItemBold = (i == nItemSelecting && !bShowAllItems) ? true : false; //font.t文字列描画( 190, 80 + i * 32, lciMenuItems[ i ].cItem.str項目名, bItemBold, 1.0f ); if (lciMenuItems[i].txName != null) { - lciMenuItems[i].txName.t2D描画(TJAPlayer3.Skin.PopupMenu_MenuItem_Name[0] + i * TJAPlayer3.Skin.PopupMenu_Move[0], - TJAPlayer3.Skin.PopupMenu_MenuItem_Name[1] + i * TJAPlayer3.Skin.PopupMenu_Move[1]); + lciMenuItems[i].txName.t2D描画(OpenTaiko.Skin.PopupMenu_MenuItem_Name[0] + i * OpenTaiko.Skin.PopupMenu_Move[0], + OpenTaiko.Skin.PopupMenu_MenuItem_Name[1] + i * OpenTaiko.Skin.PopupMenu_Move[1]); } bool bValueBold = (bItemBold || (i == nItemSelecting && bIsSelectingIntItem)) ? true : false; @@ -348,9 +348,9 @@ namespace TJAPlayer3 { using (var bmpStr = bValueBold ? prvFont.DrawText(s, Color.White, Color.Black, null, Color.Yellow, Color.OrangeRed, 30) : prvFont.DrawText(s, Color.White, Color.Black, null, 30)) { - using (var ctStr = TJAPlayer3.tテクスチャの生成(bmpStr, false)) { - ctStr.t2D描画(TJAPlayer3.Skin.PopupMenu_MenuItem_Value[0] + i * TJAPlayer3.Skin.PopupMenu_Move[0], - TJAPlayer3.Skin.PopupMenu_MenuItem_Value[1] + i * TJAPlayer3.Skin.PopupMenu_Move[1]); + using (var ctStr = OpenTaiko.tテクスチャの生成(bmpStr, false)) { + ctStr.t2D描画(OpenTaiko.Skin.PopupMenu_MenuItem_Value[0] + i * OpenTaiko.Skin.PopupMenu_Move[0], + OpenTaiko.Skin.PopupMenu_MenuItem_Value[1] + i * OpenTaiko.Skin.PopupMenu_Move[1]); } } } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectPreimageパネル.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectPreimageパネル.cs index 017dd8b3..e18cb0bc 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectPreimageパネル.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectPreimageパネル.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectPreimageパネル : CActivity { // メソッド @@ -8,7 +8,7 @@ namespace TJAPlayer3 { base.IsDeActivated = true; } public void tSelectedSongChanged() { - this.ctDelayedDisplay = new CCounter(-TJAPlayer3.ConfigIni.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms, 100, 1, TJAPlayer3.Timer); + this.ctDelayedDisplay = new CCounter(-OpenTaiko.ConfigIni.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms, 100, 1, OpenTaiko.Timer); this.bNewPreimageLoaded = false; } @@ -19,37 +19,37 @@ namespace TJAPlayer3 { this.strCurrentFilename = ""; this.bNewPreimageLoaded = false; this.txPreimage = null; - this.tUpdatePreimage(TJAPlayer3.stageSongSelect.r現在選択中のスコア); + this.tUpdatePreimage(OpenTaiko.stageSongSelect.r現在選択中のスコア); base.Activate(); } public override void DeActivate() { - TJAPlayer3.tテクスチャの解放(ref this.txPreimage); + OpenTaiko.tテクスチャの解放(ref this.txPreimage); this.ctApparitionAnimation = null; this.ctDelayedDisplay = null; base.DeActivate(); } public override void CreateManagedResource() { - this.txDefaultPreimage = TJAPlayer3.tテクスチャの生成(CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}3_SongSelect{Path.DirectorySeparatorChar}PreImageDefault.png"), false); + this.txDefaultPreimage = OpenTaiko.tテクスチャの生成(CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}3_SongSelect{Path.DirectorySeparatorChar}PreImageDefault.png"), false); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tテクスチャの解放(ref this.txDefaultPreimage); + OpenTaiko.tテクスチャの解放(ref this.txDefaultPreimage); base.ReleaseManagedResource(); } public override int Draw() { if (!base.IsDeActivated) { if (base.IsFirstDraw) { - this.ctApparitionAnimation = new CCounter(0, 100, 5, TJAPlayer3.Timer); + this.ctApparitionAnimation = new CCounter(0, 100, 5, OpenTaiko.Timer); base.IsFirstDraw = false; } this.ctApparitionAnimation.Tick(); - if ((!TJAPlayer3.stageSongSelect.bCurrentlyScrolling && (this.ctDelayedDisplay != null)) && this.ctDelayedDisplay.IsTicked) { + if ((!OpenTaiko.stageSongSelect.bCurrentlyScrolling && (this.ctDelayedDisplay != null)) && this.ctDelayedDisplay.IsTicked) { this.ctDelayedDisplay.Tick(); if ((this.ctDelayedDisplay.CurrentValue >= 0) && this.bNewPreimageStillLoading) { - this.tUpdatePreimage(TJAPlayer3.stageSongSelect.r現在選択中のスコア); - TJAPlayer3.Timer.Update(); - this.ctDelayedDisplay.NowTime = TJAPlayer3.Timer.NowTime; + this.tUpdatePreimage(OpenTaiko.stageSongSelect.r現在選択中のスコア); + OpenTaiko.Timer.Update(); + this.ctDelayedDisplay.NowTime = OpenTaiko.Timer.NowTime; this.bNewPreimageLoaded = true; } else if (this.ctDelayedDisplay.IsEnded && this.ctDelayedDisplay.IsTicked) { this.ctDelayedDisplay.Stop(); @@ -70,8 +70,8 @@ namespace TJAPlayer3 { if (this.rCurrentlyDisplayedPreimage != null) { - int width = TJAPlayer3.Skin.SongSelect_Preimage_Size[0]; - int height = TJAPlayer3.Skin.SongSelect_Preimage_Size[1]; + int width = OpenTaiko.Skin.SongSelect_Preimage_Size[0]; + int height = OpenTaiko.Skin.SongSelect_Preimage_Size[1]; float xRatio = width / (float)this.rCurrentlyDisplayedPreimage.sz画像サイズ.Width; float yRatio = height / (float)this.rCurrentlyDisplayedPreimage.sz画像サイズ.Height; @@ -118,13 +118,13 @@ namespace TJAPlayer3 { string str = ((!Path.IsPathRooted(cScoreInst.譜面情報.Preimage)) ? cScoreInst.ファイル情報.フォルダの絶対パス : "") + cScoreInst.譜面情報.Preimage; if (!str.Equals(this.strCurrentFilename)) { - TJAPlayer3.tテクスチャの解放(ref this.txPreimage); + OpenTaiko.tテクスチャの解放(ref this.txPreimage); this.strCurrentFilename = str; if (!File.Exists(this.strCurrentFilename)) { LogNotification.PopWarning("Preimage not found ({0})".SafeFormat(this.strCurrentFilename)); return false; } - this.txPreimage = TJAPlayer3.tテクスチャの生成(this.strCurrentFilename, false); + this.txPreimage = OpenTaiko.tテクスチャの生成(this.strCurrentFilename, false); if (this.txPreimage != null) { this.rCurrentlyDisplayedPreimage = this.txPreimage; } else { @@ -135,15 +135,15 @@ namespace TJAPlayer3 { } private void tDisplayPreimage() { - if (!TJAPlayer3.stageSongSelect.bCurrentlyScrolling && (((this.ctDelayedDisplay != null) && (this.ctDelayedDisplay.CurrentValue > 0)) && !this.bNewPreimageStillLoading)) { + if (!OpenTaiko.stageSongSelect.bCurrentlyScrolling && (((this.ctDelayedDisplay != null) && (this.ctDelayedDisplay.CurrentValue > 0)) && !this.bNewPreimageStillLoading)) { float num3 = ((float)this.ctDelayedDisplay.CurrentValue) / 100f; float num4 = 0.9f + (0.1f * num3); if (this.rCurrentlyDisplayedPreimage != null) { - int width = TJAPlayer3.Skin.SongSelect_Preimage_Size[0]; - int height = TJAPlayer3.Skin.SongSelect_Preimage_Size[1]; + int width = OpenTaiko.Skin.SongSelect_Preimage_Size[0]; + int height = OpenTaiko.Skin.SongSelect_Preimage_Size[1]; float xRatio = width / (float)this.rCurrentlyDisplayedPreimage.sz画像サイズ.Width; float yRatio = height / (float)this.rCurrentlyDisplayedPreimage.sz画像サイズ.Height; @@ -152,7 +152,7 @@ namespace TJAPlayer3 { this.rCurrentlyDisplayedPreimage.vcScaleRatio.X = num4 * xRatio; this.rCurrentlyDisplayedPreimage.vcScaleRatio.Y = num4 * xRatio; - this.rCurrentlyDisplayedPreimage.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.SongSelect_Preimage[0], TJAPlayer3.Skin.SongSelect_Preimage[1]); + this.rCurrentlyDisplayedPreimage.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.SongSelect_Preimage[0], OpenTaiko.Skin.SongSelect_Preimage[1]); } } } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectPresound.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectPresound.cs index 7faaa4fe..74bed8a3 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectPresound.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectPresound.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectPresound : CActivity { // メソッド @@ -11,12 +11,12 @@ namespace TJAPlayer3 { public void tStopSound() { if (this.sound != null) { this.sound.Stop(); - TJAPlayer3.SoundManager.tDisposeSound(this.sound); + OpenTaiko.SoundManager.tDisposeSound(this.sound); this.sound = null; } } public void t選択曲が変更された() { - Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア; + Cスコア cスコア = OpenTaiko.stageSongSelect.r現在選択中のスコア; if ((cスコア != null) && ((!(cスコア.ファイル情報.フォルダの絶対パス + cスコア.譜面情報.strBGMファイル名).Equals(this.str現在のファイル名) || (this.sound == null)) || !this.sound.IsPlaying)) { this.tStopSound(); @@ -24,10 +24,10 @@ namespace TJAPlayer3 { this.long再生位置 = -1; if ((cスコア.譜面情報.strBGMファイル名 != null) && (cスコア.譜面情報.strBGMファイル名.Length > 0)) { //this.ct再生待ちウェイト = new CCounter( 0, CDTXMania.ConfigIni.n曲が選択されてからプレビュー音が鳴るまでのウェイトms, 1, CDTXMania.Timer ); - if (TJAPlayer3.SoundManager.GetCurrentSoundDeviceType() != "DirectSound") { - this.ct再生待ちウェイト = new CCounter(0, 1, 270, TJAPlayer3.Timer); + if (OpenTaiko.SoundManager.GetCurrentSoundDeviceType() != "DirectSound") { + this.ct再生待ちウェイト = new CCounter(0, 1, 270, OpenTaiko.Timer); } else { - this.ct再生待ちウェイト = new CCounter(0, 1, 500, TJAPlayer3.Timer); + this.ct再生待ちウェイト = new CCounter(0, 1, 500, OpenTaiko.Timer); } } } @@ -67,14 +67,14 @@ namespace TJAPlayer3 { if (!base.IsDeActivated) { if ((this.ctBGMフェードイン用 != null) && this.ctBGMフェードイン用.IsTicked) { this.ctBGMフェードイン用.Tick(); - TJAPlayer3.Skin.bgm選曲画面.nAutomationLevel_現在のサウンド = this.ctBGMフェードイン用.CurrentValue; + OpenTaiko.Skin.bgm選曲画面.nAutomationLevel_現在のサウンド = this.ctBGMフェードイン用.CurrentValue; if (this.ctBGMフェードイン用.IsEnded) { this.ctBGMフェードイン用.Stop(); } } if ((this.ctBGMフェードアウト用 != null) && this.ctBGMフェードアウト用.IsTicked) { this.ctBGMフェードアウト用.Tick(); - TJAPlayer3.Skin.bgm選曲画面.nAutomationLevel_現在のサウンド = CSound.MaximumAutomationLevel - this.ctBGMフェードアウト用.CurrentValue; + OpenTaiko.Skin.bgm選曲画面.nAutomationLevel_現在のサウンド = CSound.MaximumAutomationLevel - this.ctBGMフェードアウト用.CurrentValue; if (this.ctBGMフェードアウト用.IsEnded) { this.ctBGMフェードアウト用.Stop(); } @@ -82,7 +82,7 @@ namespace TJAPlayer3 { this.t進行処理_プレビューサウンド(); if (this.sound != null) { - Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア; + Cスコア cスコア = OpenTaiko.stageSongSelect.r現在選択中のスコア; if (long再生位置 == -1) { this.long再生開始時のシステム時刻 = SoundManager.PlayTimer.SystemTimeMs; this.long再生位置 = cスコア.譜面情報.nデモBGMオフセット; @@ -121,29 +121,29 @@ namespace TJAPlayer3 { if (this.ctBGMフェードイン用 != null) { this.ctBGMフェードイン用.Stop(); } - this.ctBGMフェードアウト用 = new CCounter(0, 100, 10, TJAPlayer3.Timer); - this.ctBGMフェードアウト用.CurrentValue = 100 - TJAPlayer3.Skin.bgm選曲画面.nAutomationLevel_現在のサウンド; + this.ctBGMフェードアウト用 = new CCounter(0, 100, 10, OpenTaiko.Timer); + this.ctBGMフェードアウト用.CurrentValue = 100 - OpenTaiko.Skin.bgm選曲画面.nAutomationLevel_現在のサウンド; } private void tBGMフェードイン開始() { if (this.ctBGMフェードアウト用 != null) { this.ctBGMフェードアウト用.Stop(); } - this.ctBGMフェードイン用 = new CCounter(0, 100, 20, TJAPlayer3.Timer); - this.ctBGMフェードイン用.CurrentValue = TJAPlayer3.Skin.bgm選曲画面.nAutomationLevel_現在のサウンド; + this.ctBGMフェードイン用 = new CCounter(0, 100, 20, OpenTaiko.Timer); + this.ctBGMフェードイン用.CurrentValue = OpenTaiko.Skin.bgm選曲画面.nAutomationLevel_現在のサウンド; } private void tプレビューサウンドの作成() { - Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア; - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(TJAPlayer3.stageSongSelect.rNowSelectedSong); + Cスコア cスコア = OpenTaiko.stageSongSelect.r現在選択中のスコア; + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(OpenTaiko.stageSongSelect.rNowSelectedSong); if ((cスコア != null) && !string.IsNullOrEmpty(cスコア.譜面情報.strBGMファイル名) - && TJAPlayer3.stageSongSelect.ePhaseID != CStage.EPhase.SongSelect_FadeOutToNowLoading + && OpenTaiko.stageSongSelect.ePhaseID != CStage.EPhase.SongSelect_FadeOutToNowLoading && HiddenIndex != DBSongUnlockables.EHiddenIndex.GRAYED ) { string strPreviewFilename = cスコア.ファイル情報.フォルダの絶対パス + cスコア.譜面情報.Presound; try { strPreviewFilename = cスコア.ファイル情報.フォルダの絶対パス + cスコア.譜面情報.strBGMファイル名; - if (TJAPlayer3.ConfigIni.bBGM音を発声する) - this.sound = TJAPlayer3.SoundManager.tCreateSound(strPreviewFilename, ESoundGroup.SongPreview); + if (OpenTaiko.ConfigIni.bBGM音を発声する) + this.sound = OpenTaiko.SoundManager.tCreateSound(strPreviewFilename, ESoundGroup.SongPreview); if (this.sound == null) return; //this.sound.db再生速度 = ((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0; @@ -153,7 +153,7 @@ namespace TJAPlayer3 { // If is not yet available then we wish to queue scanning. var loudnessMetadata = cスコア.譜面情報.SongLoudnessMetadata ?? LoudnessMetadataScanner.LoadForAudioPath(strPreviewFilename); - TJAPlayer3.SongGainController.Set(cスコア.譜面情報.SongVol, loudnessMetadata, this.sound); + OpenTaiko.SongGainController.Set(cスコア.譜面情報.SongVol, loudnessMetadata, this.sound); // Disable song if playing while playing the preview song CSongSelectSongManager.disable(); @@ -188,7 +188,7 @@ namespace TJAPlayer3 { this.ct再生待ちウェイト.Tick(); if (!this.ct再生待ちウェイト.IsUnEnded) { this.ct再生待ちウェイト.Stop(); - if (!TJAPlayer3.stageSongSelect.bCurrentlyScrolling) { + if (!OpenTaiko.stageSongSelect.bCurrentlyScrolling) { this.tプレビューサウンドの作成(); } } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectQuickConfig.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectQuickConfig.cs index 549bf6b7..b6f82ef4 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectQuickConfig.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectQuickConfig.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectQuickConfig : CActSelectPopupMenu { // コンストラクタ @@ -38,29 +38,29 @@ namespace TJAPlayer3 { #region [ 共通 Target/AutoMode/AutoLane ] #endregion #region [ 個別 ScrollSpeed ] - l.Add(new CItemInteger(CLangManager.LangInstance.GetString("MOD_SPEED"), 0, 1999, TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.SaveFile], + l.Add(new CItemInteger(CLangManager.LangInstance.GetString("MOD_SPEED"), 0, 1999, OpenTaiko.ConfigIni.nScrollSpeed[OpenTaiko.SaveFile], "")); #endregion #region [ 共通 Dark/Risky/PlaySpeed ] - l.Add(new CItemInteger(CLangManager.LangInstance.GetString("MOD_SONGSPEED"), 5, 400, TJAPlayer3.ConfigIni.nSongSpeed, + l.Add(new CItemInteger(CLangManager.LangInstance.GetString("MOD_SONGSPEED"), 5, 400, OpenTaiko.ConfigIni.nSongSpeed, "")); #endregion #region [ 個別 Sud/Hid ] - l.Add(new CItemList(CLangManager.LangInstance.GetString("MOD_RANDOM"), CItemBase.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.SaveFile], + l.Add(new CItemList(CLangManager.LangInstance.GetString("MOD_RANDOM"), CItemBase.EPanelType.Normal, (int)OpenTaiko.ConfigIni.eRandom[OpenTaiko.SaveFile], "", new string[] { CLangManager.LangInstance.GetString("MOD_SWITCH_OFF"), CLangManager.LangInstance.GetString("MOD_RANDOM"), CLangManager.LangInstance.GetString("MOD_FLIP"), "SUPER", "HYPER" })); - l.Add(new CItemList(CLangManager.LangInstance.GetString("MOD_HIDE"), CItemBase.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.SaveFile], + l.Add(new CItemList(CLangManager.LangInstance.GetString("MOD_HIDE"), CItemBase.EPanelType.Normal, (int)OpenTaiko.ConfigIni.eSTEALTH[OpenTaiko.SaveFile], "", new string[] { CLangManager.LangInstance.GetString("MOD_SWITCH_OFF"), CLangManager.LangInstance.GetString("MOD_HIDE"), CLangManager.LangInstance.GetString("MOD_STEALTH") })); - l.Add(new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_SURVIVAL"), CItemBase.EPanelType.Normal, (int)TJAPlayer3.ConfigIni.eGameMode, + l.Add(new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_SURVIVAL"), CItemBase.EPanelType.Normal, (int)OpenTaiko.ConfigIni.eGameMode, "", new string[] { CLangManager.LangInstance.GetString("MOD_SWITCH_OFF"), "TYPE-A", "TYPE-B" })); - l.Add(new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_SHINUCHI"), CItemBase.EPanelType.Normal, TJAPlayer3.ConfigIni.ShinuchiMode ? 1 : 0, "", "", new string[] { CLangManager.LangInstance.GetString("MOD_SWITCH_OFF"), CLangManager.LangInstance.GetString("MOD_SWITCH_ON") })); + l.Add(new CItemList(CLangManager.LangInstance.GetString("SETTINGS_GAME_SHINUCHI"), CItemBase.EPanelType.Normal, OpenTaiko.ConfigIni.ShinuchiMode ? 1 : 0, "", "", new string[] { CLangManager.LangInstance.GetString("MOD_SWITCH_OFF"), CLangManager.LangInstance.GetString("MOD_SWITCH_ON") })); #endregion #region [ 共通 SET切り替え/More/Return ] - l.Add(new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_PLAYERCOUNT"), 1, 5, TJAPlayer3.ConfigIni.nPlayerCount, "")); + l.Add(new CItemInteger(CLangManager.LangInstance.GetString("SETTINGS_SYSTEM_PLAYERCOUNT"), 1, 5, OpenTaiko.ConfigIni.nPlayerCount, "")); l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString("SONGSELECT_QUICKCONFIG_MORE"), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "" })); l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString("MENU_RETURN"), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "", "" })); #endregion @@ -85,17 +85,17 @@ namespace TJAPlayer3 { public override void tEnter押下Main(int nSortOrder) { switch (n現在の選択行) { case (int)EOrder.ScrollSpeed: - TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.SaveFile] = (int)GetObj現在値((int)EOrder.ScrollSpeed); + OpenTaiko.ConfigIni.nScrollSpeed[OpenTaiko.SaveFile] = (int)GetObj現在値((int)EOrder.ScrollSpeed); break; case (int)EOrder.PlaySpeed: - TJAPlayer3.ConfigIni.nSongSpeed = (int)GetObj現在値((int)EOrder.PlaySpeed); + OpenTaiko.ConfigIni.nSongSpeed = (int)GetObj現在値((int)EOrder.PlaySpeed); break; case (int)EOrder.Random: - TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.SaveFile] = (ERandomMode)GetIndex((int)EOrder.Random); + OpenTaiko.ConfigIni.eRandom[OpenTaiko.SaveFile] = (ERandomMode)GetIndex((int)EOrder.Random); break; case (int)EOrder.Stealth: - TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.SaveFile] = (EStealthMode)GetIndex((int)EOrder.Stealth); + OpenTaiko.ConfigIni.eSTEALTH[OpenTaiko.SaveFile] = (EStealthMode)GetIndex((int)EOrder.Stealth); break; case (int)EOrder.GameMode: EGame game = EGame.OFF; @@ -104,13 +104,13 @@ namespace TJAPlayer3 { case 1: game = EGame.完走叩ききりまショー; break; case 2: game = EGame.完走叩ききりまショー激辛; break; } - TJAPlayer3.ConfigIni.eGameMode = game; + OpenTaiko.ConfigIni.eGameMode = game; break; case (int)EOrder.ShinuchiMode: - TJAPlayer3.ConfigIni.ShinuchiMode = !TJAPlayer3.ConfigIni.ShinuchiMode; + OpenTaiko.ConfigIni.ShinuchiMode = !OpenTaiko.ConfigIni.ShinuchiMode; break; case (int)EOrder.PlayerCount: - TJAPlayer3.ConfigIni.nPlayerCount = (int)GetObj現在値((int)EOrder.PlayerCount); + OpenTaiko.ConfigIni.nPlayerCount = (int)GetObj現在値((int)EOrder.PlayerCount); break; case (int)EOrder.More: SetAutoParameters(); // 簡易CONFIGメニュー脱出に伴い、簡易CONFIG内のAUTOの設定をConfigIniクラスに反映する @@ -166,7 +166,7 @@ namespace TJAPlayer3 { this.ft表示用フォント = null; } //CDTXMania.tテクスチャの解放( ref this.txパネル本体 ); - TJAPlayer3.tテクスチャの解放(ref this.tx文字列パネル); + OpenTaiko.tテクスチャの解放(ref this.tx文字列パネル); base.ReleaseManagedResource(); } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectShowCurrentPosition.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectShowCurrentPosition.cs index eb8ad184..8a264601 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectShowCurrentPosition.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectShowCurrentPosition.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectShowCurrentPosition : CActivity { // メソッド @@ -23,16 +23,16 @@ namespace TJAPlayer3 { string pathScrollBar = CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}5_scrollbar.png"); string pathScrollPosition = CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}5_scrollbar.png"); if (File.Exists(pathScrollBar)) { - this.txScrollBar = TJAPlayer3.tテクスチャの生成(pathScrollBar, false); + this.txScrollBar = OpenTaiko.tテクスチャの生成(pathScrollBar, false); } if (File.Exists(pathScrollPosition)) { - this.txScrollPosition = TJAPlayer3.tテクスチャの生成(pathScrollPosition, false); + this.txScrollPosition = OpenTaiko.tテクスチャの生成(pathScrollPosition, false); } base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tDisposeSafely(ref this.txScrollBar); - TJAPlayer3.tDisposeSafely(ref this.txScrollPosition); + OpenTaiko.tDisposeSafely(ref this.txScrollBar); + OpenTaiko.tDisposeSafely(ref this.txScrollPosition); base.ReleaseManagedResource(); } @@ -42,7 +42,7 @@ namespace TJAPlayer3 { //this.txScrollBar.t2D描画( CDTXMania.app.Device, (int)(1280 - ((429.0f / 100.0f ) * CDTXMania.stage選曲.ct登場時アニメ用共通.n現在の値)), 164, new Rectangle( 0, 0, 352, 26 ) ); //移動後のxは851 #endregion #region [ スクロール地点の描画 (計算はCActSelect曲リストで行う。スクロール位置と選曲項目の同期のため。)#27648 ] - int py = TJAPlayer3.stageSongSelect.nスクロールバー相対y座標; + int py = OpenTaiko.stageSongSelect.nスクロールバー相対y座標; if (py <= 336 && py >= 0) { //this.txScrollBar.t2D描画( CDTXMania.app.Device, (int)( 1280 - 4 - (( 424.0f / 100.0f ) * CDTXMania.stage選曲.ct登場時アニメ用共通.n現在の値 ) ) + py, 164, new Rectangle( 352, 0, 26, 26 ) );//856 } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectSongInfo.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectSongInfo.cs index cca43c9e..4a7fb29a 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectSongInfo.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectSongInfo.cs @@ -2,7 +2,7 @@ using FDK; // Minimalist menu class to use for custom menus -namespace TJAPlayer3 { +namespace OpenTaiko { class CActSelectSongInfo : CStage { public CActSelectSongInfo() { base.IsDeActivated = true; @@ -38,26 +38,26 @@ namespace TJAPlayer3 { } public override int Draw() { - if (TJAPlayer3.stageSongSelect.rNowSelectedSong != null && TJAPlayer3.stageSongSelect.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE) { + if (OpenTaiko.stageSongSelect.rNowSelectedSong != null && OpenTaiko.stageSongSelect.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE) { int[] bpms = new int[3] { - (int)TJAPlayer3.stageSongSelect.rNowSelectedSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(TJAPlayer3.stageSongSelect.rNowSelectedSong)].譜面情報.BaseBpm, - (int)TJAPlayer3.stageSongSelect.rNowSelectedSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(TJAPlayer3.stageSongSelect.rNowSelectedSong)].譜面情報.MinBpm, - (int)TJAPlayer3.stageSongSelect.rNowSelectedSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.tFetchDifficulty(TJAPlayer3.stageSongSelect.rNowSelectedSong)].譜面情報.MaxBpm + (int)OpenTaiko.stageSongSelect.rNowSelectedSong.arスコア[OpenTaiko.stageSongSelect.actSongList.tFetchDifficulty(OpenTaiko.stageSongSelect.rNowSelectedSong)].譜面情報.BaseBpm, + (int)OpenTaiko.stageSongSelect.rNowSelectedSong.arスコア[OpenTaiko.stageSongSelect.actSongList.tFetchDifficulty(OpenTaiko.stageSongSelect.rNowSelectedSong)].譜面情報.MinBpm, + (int)OpenTaiko.stageSongSelect.rNowSelectedSong.arスコア[OpenTaiko.stageSongSelect.actSongList.tFetchDifficulty(OpenTaiko.stageSongSelect.rNowSelectedSong)].譜面情報.MaxBpm }; for (int i = 0; i < 3; i++) { - tBPMNumberDraw(TJAPlayer3.Skin.SongSelect_Bpm_X[i], TJAPlayer3.Skin.SongSelect_Bpm_Y[i], bpms[i]); + tBPMNumberDraw(OpenTaiko.Skin.SongSelect_Bpm_X[i], OpenTaiko.Skin.SongSelect_Bpm_Y[i], bpms[i]); } - if (TJAPlayer3.stageSongSelect.actSongList.ttkSelectedSongMaker != null && TJAPlayer3.Skin.SongSelect_Maker_Show) { - TitleTextureKey.ResolveTitleTexture(TJAPlayer3.stageSongSelect.actSongList.ttkSelectedSongMaker).t2D拡大率考慮描画(CTexture.RefPnt.Left, TJAPlayer3.Skin.SongSelect_Maker[0], TJAPlayer3.Skin.SongSelect_Maker[1]); + if (OpenTaiko.stageSongSelect.actSongList.ttkSelectedSongMaker != null && OpenTaiko.Skin.SongSelect_Maker_Show) { + TitleTextureKey.ResolveTitleTexture(OpenTaiko.stageSongSelect.actSongList.ttkSelectedSongMaker).t2D拡大率考慮描画(CTexture.RefPnt.Left, OpenTaiko.Skin.SongSelect_Maker[0], OpenTaiko.Skin.SongSelect_Maker[1]); } - if (TJAPlayer3.stageSongSelect.actSongList.ttkSelectedSongBPM != null && TJAPlayer3.Skin.SongSelect_BPM_Text_Show) { - TitleTextureKey.ResolveTitleTexture(TJAPlayer3.stageSongSelect.actSongList.ttkSelectedSongBPM).t2D拡大率考慮描画(CTexture.RefPnt.Left, TJAPlayer3.Skin.SongSelect_BPM_Text[0], TJAPlayer3.Skin.SongSelect_BPM_Text[1]); + if (OpenTaiko.stageSongSelect.actSongList.ttkSelectedSongBPM != null && OpenTaiko.Skin.SongSelect_BPM_Text_Show) { + TitleTextureKey.ResolveTitleTexture(OpenTaiko.stageSongSelect.actSongList.ttkSelectedSongBPM).t2D拡大率考慮描画(CTexture.RefPnt.Left, OpenTaiko.Skin.SongSelect_BPM_Text[0], OpenTaiko.Skin.SongSelect_BPM_Text[1]); } - if (TJAPlayer3.stageSongSelect.rNowSelectedSong.bExplicit) - TJAPlayer3.Tx.SongSelect_Explicit?.t2D描画(TJAPlayer3.Skin.SongSelect_Explicit[0], TJAPlayer3.Skin.SongSelect_Explicit[1]); - if (TJAPlayer3.stageSongSelect.rNowSelectedSong.bMovie) - TJAPlayer3.Tx.SongSelect_Movie?.t2D描画(TJAPlayer3.Skin.SongSelect_Movie[0], TJAPlayer3.Skin.SongSelect_Movie[1]); + if (OpenTaiko.stageSongSelect.rNowSelectedSong.bExplicit) + OpenTaiko.Tx.SongSelect_Explicit?.t2D描画(OpenTaiko.Skin.SongSelect_Explicit[0], OpenTaiko.Skin.SongSelect_Explicit[1]); + if (OpenTaiko.stageSongSelect.rNowSelectedSong.bMovie) + OpenTaiko.Tx.SongSelect_Movie?.t2D描画(OpenTaiko.Skin.SongSelect_Movie[0], OpenTaiko.Skin.SongSelect_Movie[1]); } @@ -70,15 +70,15 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { - if (TJAPlayer3.Skin.SongSelect_Bpm_Show && TJAPlayer3.Tx.SongSelect_Bpm_Number != null) { + if (OpenTaiko.Skin.SongSelect_Bpm_Show && OpenTaiko.Tx.SongSelect_Bpm_Number != null) { float offset = j; - float x = originx - (TJAPlayer3.Skin.SongSelect_Bpm_Interval[0] * offset); - float y = originy - (TJAPlayer3.Skin.SongSelect_Bpm_Interval[1] * offset); + float x = originx - (OpenTaiko.Skin.SongSelect_Bpm_Interval[0] * offset); + float y = originy - (OpenTaiko.Skin.SongSelect_Bpm_Interval[1] * offset); - float width = TJAPlayer3.Tx.SongSelect_Bpm_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.SongSelect_Bpm_Number.sz画像サイズ.Height; + float width = OpenTaiko.Tx.SongSelect_Bpm_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.SongSelect_Bpm_Number.sz画像サイズ.Height; - TJAPlayer3.Tx.SongSelect_Bpm_Number.t2D描画(x, y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.SongSelect_Bpm_Number.t2D描画(x, y, new RectangleF(width * nums[j], 0, width, height)); } } } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs index 4fb2c8ac..d8aaef1f 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs @@ -2,7 +2,7 @@ using FDK; // Minimalist menu class to use for custom menus -namespace TJAPlayer3 { +namespace OpenTaiko { class CActSelectTowerInfo : CStage { public CActSelectTowerInfo() { base.IsDeActivated = true; @@ -40,7 +40,7 @@ namespace TJAPlayer3 { } public override int Draw() { - tFloorNumberDraw(TJAPlayer3.Skin.SongSelect_FloorNum_X, TJAPlayer3.Skin.SongSelect_FloorNum_Y, TJAPlayer3.stageSongSelect.rNowSelectedSong.nTotalFloor); + tFloorNumberDraw(OpenTaiko.Skin.SongSelect_FloorNum_X, OpenTaiko.Skin.SongSelect_FloorNum_Y, OpenTaiko.stageSongSelect.rNowSelectedSong.nTotalFloor); return 0; } @@ -51,15 +51,15 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { - if (TJAPlayer3.Skin.SongSelect_FloorNum_Show && TJAPlayer3.Tx.SongSelect_Floor_Number != null) { + if (OpenTaiko.Skin.SongSelect_FloorNum_Show && OpenTaiko.Tx.SongSelect_Floor_Number != null) { float offset = j; - float x = originx - (TJAPlayer3.Skin.SongSelect_FloorNum_Interval[0] * offset); - float y = originy - (TJAPlayer3.Skin.SongSelect_FloorNum_Interval[1] * offset); + float x = originx - (OpenTaiko.Skin.SongSelect_FloorNum_Interval[0] * offset); + float y = originy - (OpenTaiko.Skin.SongSelect_FloorNum_Interval[1] * offset); - float width = TJAPlayer3.Tx.SongSelect_Floor_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.SongSelect_Floor_Number.sz画像サイズ.Height; + float width = OpenTaiko.Tx.SongSelect_Floor_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.SongSelect_Floor_Number.sz画像サイズ.Height; - TJAPlayer3.Tx.SongSelect_Floor_Number.t2D描画(x, y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.SongSelect_Floor_Number.t2D描画(x, y, new RectangleF(width * nums[j], 0, width, height)); } } } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectステータスパネル.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectステータスパネル.cs index c45ccd3e..2031f93b 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectステータスパネル.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectステータスパネル.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelectステータスパネル : CActivity { // メソッド diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs index 19ea2544..49fb7de8 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs @@ -6,7 +6,7 @@ using Color = System.Drawing.Color; using Rectangle = System.Drawing.Rectangle; using RectangleF = System.Drawing.RectangleF; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelect曲リスト : CActivity { // プロパティ @@ -65,7 +65,7 @@ namespace TJAPlayer3 { public void ResetSongIndex() { nSelectSongIndex = 0; - this.rCurrentlySelectedSong = TJAPlayer3.Songs管理.list曲ルート[nSelectSongIndex]; + this.rCurrentlySelectedSong = OpenTaiko.Songs管理.list曲ルート[nSelectSongIndex]; } public int nスクロールバー相対y座標 { @@ -84,7 +84,7 @@ namespace TJAPlayer3 { this.nSelectSongIndex = 0; this.rCurrentlySelectedSong = null; - this.n現在のアンカ難易度レベル = Math.Min((int)Difficulty.Edit, TJAPlayer3.ConfigIni.nDefaultCourse); + this.n現在のアンカ難易度レベル = Math.Min((int)Difficulty.Edit, OpenTaiko.ConfigIni.nDefaultCourse); base.IsDeActivated = true; this.bIsEnumeratingSongs = false; } @@ -148,7 +148,7 @@ namespace TJAPlayer3 { private List GetSongListWithinMe(CSongListNode song) { if (song.rParentNode == null) // root階層のノートだったら { - return TJAPlayer3.Songs管理.list曲ルート; // rootのリストを返す + return OpenTaiko.Songs管理.list曲ルート; // rootのリストを返す } else { if ((song.rParentNode.list子リスト != null) && (song.rParentNode.list子リスト.Count > 0)) { return song.rParentNode.list子リスト; @@ -178,17 +178,17 @@ namespace TJAPlayer3 { foreach (CSongListNode node in list) { if (node.eノード種別 != CSongListNode.ENodeType.BOX) continue; string newPath = parentName + node.ldTitle.GetString("") + "/"; - CSongDict.tReinsertBackButtons(node, node.list子リスト, newPath, TJAPlayer3.Songs管理.listStrBoxDefSkinSubfolderFullName); + CSongDict.tReinsertBackButtons(node, node.list子リスト, newPath, OpenTaiko.Songs管理.listStrBoxDefSkinSubfolderFullName); addBackBox(node.list子リスト, newPath); } } - addBackBox(TJAPlayer3.Songs管理.list曲ルート); + addBackBox(OpenTaiko.Songs管理.list曲ルート); this.t現在選択中の曲を元に曲バーを再構成する(); tChangeSong(0); this.t選択曲が変更された(false); tUpdateCurSong(); - TJAPlayer3.stageSongSelect.tNotifySelectedSongChange(); + OpenTaiko.stageSongSelect.tNotifySelectedSongChange(); } } @@ -209,12 +209,12 @@ namespace TJAPlayer3 { //Trace.TraceInformation( "Skin指定: " + CSkin.GetSkinName( this.r現在選択中の曲.strSkinPath ) ); //Trace.TraceInformation( "Skinpath: " + this.r現在選択中の曲.strSkinPath ); bool ret = false; - if (CSkin.GetSkinName(TJAPlayer3.Skin.GetCurrentSkinSubfolderFullName(false)) != CSkin.GetSkinName(this.rCurrentlySelectedSong.strSkinPath) + if (CSkin.GetSkinName(OpenTaiko.Skin.GetCurrentSkinSubfolderFullName(false)) != CSkin.GetSkinName(this.rCurrentlySelectedSong.strSkinPath) && CSkin.bUseBoxDefSkin) { ret = true; // BOXに入るときは、スキン変更発生時のみboxdefスキン設定の更新を行う - TJAPlayer3.Skin.SetCurrentSkinSubfolderFullName( - TJAPlayer3.Skin.GetSkinSubfolderFullNameFromSkinName(CSkin.GetSkinName(this.rCurrentlySelectedSong.strSkinPath)), false); + OpenTaiko.Skin.SetCurrentSkinSubfolderFullName( + OpenTaiko.Skin.GetSkinSubfolderFullNameFromSkinName(CSkin.GetSkinName(this.rCurrentlySelectedSong.strSkinPath)), false); } //Trace.TraceInformation( "Skin変更: " + CSkin.GetSkinName( CDTXMania.Skin.GetCurrentSkinSubfolderFullName(false) ) ); @@ -229,7 +229,7 @@ namespace TJAPlayer3 { if (rCurrentlySelectedSong != null && rCurrentlySelectedSong.list子リスト != null && rCurrentlySelectedSong.list子リスト.Count != 1) { - if (TJAPlayer3.ConfigIni.TJAP3FolderMode) { + if (OpenTaiko.ConfigIni.TJAP3FolderMode) { this.rCurrentlySelectedSong = this.rCurrentlySelectedSong.list子リスト[0]; nSelectSongIndex = 0; tChangeSong(this.rCurrentlySelectedSong.rParentNode.Openindex); @@ -249,7 +249,7 @@ namespace TJAPlayer3 { this.t現在選択中の曲を元に曲バーを再構成する(); this.t選択曲が変更された(false); - TJAPlayer3.stageSongSelect.tNotifySelectedSongChange(); // #27648 項目数変更を反映させる + OpenTaiko.stageSongSelect.tNotifySelectedSongChange(); // #27648 項目数変更を反映させる this.b選択曲が変更された = true; // TJAPlayer3.Skin.bgm選曲画面.t停止する(); CSongSelectSongManager.stopSong(); @@ -266,27 +266,27 @@ namespace TJAPlayer3 { public bool tCloseBOX() { bool ret = false; - if (CSkin.GetSkinName(TJAPlayer3.Skin.GetCurrentSkinSubfolderFullName(false)) != CSkin.GetSkinName(this.rCurrentlySelectedSong.strSkinPath) + if (CSkin.GetSkinName(OpenTaiko.Skin.GetCurrentSkinSubfolderFullName(false)) != CSkin.GetSkinName(this.rCurrentlySelectedSong.strSkinPath) && CSkin.bUseBoxDefSkin) { ret = true; } // スキン変更が発生しなくても、boxdef圏外に出る場合は、boxdefスキン設定の更新が必要 // (ユーザーがboxdefスキンをConfig指定している場合への対応のために必要) // tBoxに入る()とは処理が微妙に異なるので注意 - TJAPlayer3.Skin.SetCurrentSkinSubfolderFullName( - (this.rCurrentlySelectedSong.strSkinPath == "") ? "" : TJAPlayer3.Skin.GetSkinSubfolderFullNameFromSkinName(CSkin.GetSkinName(this.rCurrentlySelectedSong.strSkinPath)), false); + OpenTaiko.Skin.SetCurrentSkinSubfolderFullName( + (this.rCurrentlySelectedSong.strSkinPath == "") ? "" : OpenTaiko.Skin.GetSkinSubfolderFullNameFromSkinName(CSkin.GetSkinName(this.rCurrentlySelectedSong.strSkinPath)), false); tResetTitleTextureKey(); - if (TJAPlayer3.ConfigIni.TJAP3FolderMode) { + if (OpenTaiko.ConfigIni.TJAP3FolderMode) { if (this.rCurrentlySelectedSong.rParentNode != null) { this.rCurrentlySelectedSong = this.rCurrentlySelectedSong.rParentNode; this.rCurrentlySelectedSong.Openindex = nSelectSongIndex; - tChangeSong(TJAPlayer3.Songs管理.list曲ルート.IndexOf(this.rCurrentlySelectedSong) - nSelectSongIndex); + tChangeSong(OpenTaiko.Songs管理.list曲ルート.IndexOf(this.rCurrentlySelectedSong) - nSelectSongIndex); } } else { // Reindex the parent node - List currentSongList = flattenList(TJAPlayer3.Songs管理.list曲ルート, true); + List currentSongList = flattenList(OpenTaiko.Songs管理.list曲ルート, true); this.rCurrentlySelectedSong.rParentNode.Openindex = currentSongList.IndexOf(this.rCurrentlySelectedSong) - currentSongList.IndexOf(this.rCurrentlySelectedSong.rParentNode.list子リスト[0]); this.rCurrentlySelectedSong.rParentNode.bIsOpenFolder = false; tChangeSong(-this.rCurrentlySelectedSong.rParentNode.Openindex); @@ -329,24 +329,24 @@ namespace TJAPlayer3 { ctScoreFrameAnime.CurrentValue = 0; ctBarOpen.Stop(); ctBarOpen.CurrentValue = 0; - this.ctScrollCounter = new CCounter(0, 1000, TJAPlayer3.Skin.SongSelect_Scroll_Interval, TJAPlayer3.Timer); + this.ctScrollCounter = new CCounter(0, 1000, OpenTaiko.Skin.SongSelect_Scroll_Interval, OpenTaiko.Timer); #region [ パネルを１行上にシフトする。] //----------------- - int barCenterNum = (TJAPlayer3.Skin.SongSelect_Bar_Count - 1) / 2; + int barCenterNum = (OpenTaiko.Skin.SongSelect_Bar_Count - 1) / 2; // 選択曲と選択行を１つ下の行に移動。 tChangeSong(1); - this.n現在の選択行 = (this.n現在の選択行 + 1) % TJAPlayer3.Skin.SongSelect_Bar_Count; + this.n現在の選択行 = (this.n現在の選択行 + 1) % OpenTaiko.Skin.SongSelect_Bar_Count; // 選択曲から７つ下のパネル（＝新しく最下部に表示されるパネル。消えてしまう一番上のパネルを再利用する）に、新しい曲の情報を記載する。 var song = this.rGetSideSong(barCenterNum); - int index = (this.n現在の選択行 + barCenterNum) % TJAPlayer3.Skin.SongSelect_Bar_Count; // 新しく最下部に表示されるパネルのインデックス（0～12）。 + int index = (this.n現在の選択行 + barCenterNum) % OpenTaiko.Skin.SongSelect_Bar_Count; // 新しく最下部に表示されるパネルのインデックス（0～12）。 this.stバー情報[index].strタイトル文字列 = song.ldTitle.GetString(""); this.stバー情報[index].ForeColor = song.ForeColor; this.stバー情報[index].BackColor = song.BackColor; @@ -384,10 +384,10 @@ namespace TJAPlayer3 { this.stバー情報[index].nクリア[i] = new int[5]; this.stバー情報[index].nスコアランク[i] = new int[5]; - int ap = TJAPlayer3.GetActualPlayer(i); + int ap = OpenTaiko.GetActualPlayer(i); //var sr = song.arスコア[n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song)]; - var TableEntry = TJAPlayer3.SaveFileInstances[ap].data.tGetSongSelectTableEntry(song.tGetUniqueId()); + var TableEntry = OpenTaiko.SaveFileInstances[ap].data.tGetSongSelectTableEntry(song.tGetUniqueId()); this.stバー情報[index].nクリア[i] = TableEntry.ClearStatuses; this.stバー情報[index].nスコアランク[i] = TableEntry.ScoreRanks; @@ -401,9 +401,9 @@ namespace TJAPlayer3 { // stバー情報[] の内容を1行ずつずらす。 - for (int i = 0; i < TJAPlayer3.Skin.SongSelect_Bar_Count; i++) { + for (int i = 0; i < OpenTaiko.Skin.SongSelect_Bar_Count; i++) { CSongListNode song2 = this.rGetSideSong(i - barCenterNum); - int n = (((this.n現在の選択行 - barCenterNum) + i) + TJAPlayer3.Skin.SongSelect_Bar_Count) % TJAPlayer3.Skin.SongSelect_Bar_Count; + int n = (((this.n現在の選択行 - barCenterNum) + i) + OpenTaiko.Skin.SongSelect_Bar_Count) % OpenTaiko.Skin.SongSelect_Bar_Count; this.stバー情報[n].eバー種別 = this.e曲のバー種別を返す(song2); this.stバー情報[n].ttkタイトル = this.ttkGenerateSongNameTexture(this.stバー情報[n].strタイトル文字列, this.stバー情報[n].ForeColor, this.stバー情報[n].BackColor, stバー情報[n].eバー種別 == Eバー種別.Box ? this.pfBoxName : this.pfMusicName); } @@ -422,18 +422,18 @@ namespace TJAPlayer3 { { - TJAPlayer3.stageSongSelect.tNotifySelectedSongChange(); // スクロール完了＝選択曲変更！ - ctBarOpen.Start(0, 260, 2, TJAPlayer3.Timer); + OpenTaiko.stageSongSelect.tNotifySelectedSongChange(); // スクロール完了＝選択曲変更！ + ctBarOpen.Start(0, 260, 2, OpenTaiko.Timer); - TJAPlayer3.stageSongSelect.NowGenre = this.rCurrentlySelectedSong.strジャンル; + OpenTaiko.stageSongSelect.NowGenre = this.rCurrentlySelectedSong.strジャンル; - TJAPlayer3.stageSongSelect.NowBg = this.rCurrentlySelectedSong.BgType; + OpenTaiko.stageSongSelect.NowBg = this.rCurrentlySelectedSong.BgType; - TJAPlayer3.stageSongSelect.NowBgColor = this.rCurrentlySelectedSong.BgColor; + OpenTaiko.stageSongSelect.NowBgColor = this.rCurrentlySelectedSong.BgColor; - TJAPlayer3.stageSongSelect.NowUseGenre = !this.rCurrentlySelectedSong.isChangedBgType; + OpenTaiko.stageSongSelect.NowUseGenre = !this.rCurrentlySelectedSong.isChangedBgType; - ctScoreFrameAnime.Start(0, 6000, 1, TJAPlayer3.Timer); + ctScoreFrameAnime.Start(0, 6000, 1, OpenTaiko.Timer); } //----------------- @@ -451,25 +451,25 @@ namespace TJAPlayer3 { ctScoreFrameAnime.CurrentValue = 0; ctBarOpen.Stop(); ctBarOpen.CurrentValue = 0; - this.ctScrollCounter = new CCounter(0, 1000, TJAPlayer3.Skin.SongSelect_Scroll_Interval, TJAPlayer3.Timer); + this.ctScrollCounter = new CCounter(0, 1000, OpenTaiko.Skin.SongSelect_Scroll_Interval, OpenTaiko.Timer); #region [ パネルを１行下にシフトする。] //----------------- - int barCenterNum = (TJAPlayer3.Skin.SongSelect_Bar_Count - 1) / 2; + int barCenterNum = (OpenTaiko.Skin.SongSelect_Bar_Count - 1) / 2; // 選択曲と選択行を１つ上の行に移動。 tChangeSong(-1); - this.n現在の選択行 = ((this.n現在の選択行 - 1) + TJAPlayer3.Skin.SongSelect_Bar_Count) % TJAPlayer3.Skin.SongSelect_Bar_Count; + this.n現在の選択行 = ((this.n現在の選択行 - 1) + OpenTaiko.Skin.SongSelect_Bar_Count) % OpenTaiko.Skin.SongSelect_Bar_Count; // 選択曲から５つ上のパネル（＝新しく最上部に表示されるパネル。消えてしまう一番下のパネルを再利用する）に、新しい曲の情報を記載する。 var song = this.rGetSideSong(-barCenterNum); - int index = ((this.n現在の選択行 - barCenterNum) + TJAPlayer3.Skin.SongSelect_Bar_Count) % TJAPlayer3.Skin.SongSelect_Bar_Count; // 新しく最上部に表示されるパネルのインデックス（0～12）。 + int index = ((this.n現在の選択行 - barCenterNum) + OpenTaiko.Skin.SongSelect_Bar_Count) % OpenTaiko.Skin.SongSelect_Bar_Count; // 新しく最上部に表示されるパネルのインデックス（0～12）。 this.stバー情報[index].strタイトル文字列 = song.ldTitle.GetString(""); this.stバー情報[index].ForeColor = song.ForeColor; this.stバー情報[index].BackColor = song.BackColor; @@ -522,9 +522,9 @@ namespace TJAPlayer3 { this.stバー情報[index].nクリア[i] = new int[5]; this.stバー情報[index].nスコアランク[i] = new int[5]; - int ap = TJAPlayer3.GetActualPlayer(i); + int ap = OpenTaiko.GetActualPlayer(i); //var sr = song.arスコア[n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song)]; - var TableEntry = TJAPlayer3.SaveFileInstances[ap].data.tGetSongSelectTableEntry(song.tGetUniqueId()); + var TableEntry = OpenTaiko.SaveFileInstances[ap].data.tGetSongSelectTableEntry(song.tGetUniqueId()); this.stバー情報[index].nクリア[i] = TableEntry.ClearStatuses; this.stバー情報[index].nスコアランク[i] = TableEntry.ScoreRanks; @@ -537,8 +537,8 @@ namespace TJAPlayer3 { // stバー情報[] の内容を1行ずつずらす。 - for (int i = 0; i < TJAPlayer3.Skin.SongSelect_Bar_Count; i++) { - int n = (((this.n現在の選択行 - barCenterNum) + i) + TJAPlayer3.Skin.SongSelect_Bar_Count) % TJAPlayer3.Skin.SongSelect_Bar_Count; + for (int i = 0; i < OpenTaiko.Skin.SongSelect_Bar_Count; i++) { + int n = (((this.n現在の選択行 - barCenterNum) + i) + OpenTaiko.Skin.SongSelect_Bar_Count) % OpenTaiko.Skin.SongSelect_Bar_Count; var song2 = this.rGetSideSong(i - barCenterNum); this.stバー情報[n].eバー種別 = this.e曲のバー種別を返す(song2); this.stバー情報[n].ttkタイトル = this.ttkGenerateSongNameTexture(this.stバー情報[n].strタイトル文字列, this.stバー情報[n].ForeColor, this.stバー情報[n].BackColor, stバー情報[n].eバー種別 == Eバー種別.Box ? this.pfBoxName : this.pfMusicName); @@ -556,13 +556,13 @@ namespace TJAPlayer3 { this.ttk選択している曲の曲名 = null; this.ttk選択している曲のサブタイトル = null; - TJAPlayer3.stageSongSelect.tNotifySelectedSongChange(); // スクロール完了＝選択曲変更！ - ctBarOpen.Start(0, 260, 2, TJAPlayer3.Timer); - TJAPlayer3.stageSongSelect.NowGenre = this.rCurrentlySelectedSong.strジャンル; - TJAPlayer3.stageSongSelect.NowBg = this.rCurrentlySelectedSong.BgType; - TJAPlayer3.stageSongSelect.NowBgColor = this.rCurrentlySelectedSong.BgColor; - TJAPlayer3.stageSongSelect.NowUseGenre = !this.rCurrentlySelectedSong.isChangedBgType; - ctScoreFrameAnime.Start(0, 6000, 1, TJAPlayer3.Timer); + OpenTaiko.stageSongSelect.tNotifySelectedSongChange(); // スクロール完了＝選択曲変更！ + ctBarOpen.Start(0, 260, 2, OpenTaiko.Timer); + OpenTaiko.stageSongSelect.NowGenre = this.rCurrentlySelectedSong.strジャンル; + OpenTaiko.stageSongSelect.NowBg = this.rCurrentlySelectedSong.BgType; + OpenTaiko.stageSongSelect.NowBgColor = this.rCurrentlySelectedSong.BgColor; + OpenTaiko.stageSongSelect.NowUseGenre = !this.rCurrentlySelectedSong.isChangedBgType; + ctScoreFrameAnime.Start(0, 6000, 1, OpenTaiko.Timer); //----------------- #endregion @@ -573,7 +573,7 @@ namespace TJAPlayer3 { } public void tUpdateCurSong() { if ((this.rGetSideSong(0).eノード種別 == CSongListNode.ENodeType.SCORE) || this.rGetSideSong(0).eノード種別 == CSongListNode.ENodeType.BACKBOX) { - TJAPlayer3.stageSongSelect.bBGMIn再生した = false; + OpenTaiko.stageSongSelect.bBGMIn再生した = false; CSongSelectSongManager.disable(); } else { @@ -581,12 +581,12 @@ namespace TJAPlayer3 { CSongSelectSongManager.playSongIfPossible(); } - TJAPlayer3.stageSongSelect.ctBackgroundFade.Start(0, 600, 1, TJAPlayer3.Timer); - if (this.ctBarOpen.CurrentValue >= 200 || TJAPlayer3.stageSongSelect.ctBackgroundFade.CurrentValue >= 600 - 255) { - TJAPlayer3.stageSongSelect.OldGenre = this.rCurrentlySelectedSong.strジャンル; - TJAPlayer3.stageSongSelect.OldUseGenre = !this.rCurrentlySelectedSong.isChangedBgType; - TJAPlayer3.stageSongSelect.OldBg = this.rCurrentlySelectedSong.BgType; - TJAPlayer3.stageSongSelect.OldBgColor = this.rCurrentlySelectedSong.BgColor; + OpenTaiko.stageSongSelect.ctBackgroundFade.Start(0, 600, 1, OpenTaiko.Timer); + if (this.ctBarOpen.CurrentValue >= 200 || OpenTaiko.stageSongSelect.ctBackgroundFade.CurrentValue >= 600 - 255) { + OpenTaiko.stageSongSelect.OldGenre = this.rCurrentlySelectedSong.strジャンル; + OpenTaiko.stageSongSelect.OldUseGenre = !this.rCurrentlySelectedSong.isChangedBgType; + OpenTaiko.stageSongSelect.OldBg = this.rCurrentlySelectedSong.BgType; + OpenTaiko.stageSongSelect.OldBgColor = this.rCurrentlySelectedSong.BgColor; } if (this.rCurrentlySelectedSong != null) { @@ -615,10 +615,10 @@ namespace TJAPlayer3 { // 曲毎に表示しているスキル値を、新しい難易度レベルに合わせて取得し直す。（表示されている13曲全部。） - int _center = (TJAPlayer3.Skin.SongSelect_Bar_Count - 1) / 2; - for (int i = this.n現在の選択行 - _center; i < ((this.n現在の選択行 - _center) + TJAPlayer3.Skin.SongSelect_Bar_Count); i++) { + int _center = (OpenTaiko.Skin.SongSelect_Bar_Count - 1) / 2; + for (int i = this.n現在の選択行 - _center; i < ((this.n現在の選択行 - _center) + OpenTaiko.Skin.SongSelect_Bar_Count); i++) { var song = this.rGetSideSong(i); - int index = (i + TJAPlayer3.Skin.SongSelect_Bar_Count) % TJAPlayer3.Skin.SongSelect_Bar_Count; + int index = (i + OpenTaiko.Skin.SongSelect_Bar_Count) % OpenTaiko.Skin.SongSelect_Bar_Count; for (int m = 0; m < 3; m++) { this.stバー情報[index].nスキル値[m] = (int)song.arスコア[this.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song)].譜面情報.最大スキル[m]; } @@ -627,7 +627,7 @@ namespace TJAPlayer3 { // 選曲ステージに変更通知を発出し、関係Activityの対応を行ってもらう。 - TJAPlayer3.stageSongSelect.tNotifySelectedSongChange(); + OpenTaiko.stageSongSelect.tNotifySelectedSongChange(); } /// /// 不便だったから作った。 @@ -668,10 +668,10 @@ namespace TJAPlayer3 { // 曲毎に表示しているスキル値を、新しい難易度レベルに合わせて取得し直す。（表示されている13曲全部。） - int _center = (TJAPlayer3.Skin.SongSelect_Bar_Count - 1) / 2; - for (int i = this.n現在の選択行 - _center; i < ((this.n現在の選択行 - _center) + TJAPlayer3.Skin.SongSelect_Bar_Count); i++) { + int _center = (OpenTaiko.Skin.SongSelect_Bar_Count - 1) / 2; + for (int i = this.n現在の選択行 - _center; i < ((this.n現在の選択行 - _center) + OpenTaiko.Skin.SongSelect_Bar_Count); i++) { CSongListNode song = this.rGetSideSong(i); - int index = (i + TJAPlayer3.Skin.SongSelect_Bar_Count) % TJAPlayer3.Skin.SongSelect_Bar_Count; + int index = (i + OpenTaiko.Skin.SongSelect_Bar_Count) % OpenTaiko.Skin.SongSelect_Bar_Count; for (int m = 0; m < 3; m++) { this.stバー情報[index].nスキル値[m] = (int)song.arスコア[this.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song)].譜面情報.最大スキル[m]; } @@ -680,7 +680,7 @@ namespace TJAPlayer3 { // 選曲ステージに変更通知を発出し、関係Activityの対応を行ってもらう。 - TJAPlayer3.stageSongSelect.tNotifySelectedSongChange(); + OpenTaiko.stageSongSelect.tNotifySelectedSongChange(); } @@ -694,11 +694,11 @@ namespace TJAPlayer3 { if (cs != null && cs.list曲ルート.Count > 0) // 新しい曲リストを検索して、1曲以上あった { - TJAPlayer3.Songs管理 = cs; + OpenTaiko.Songs管理 = cs; if (this.rCurrentlySelectedSong != null) // r現在選択中の曲==null とは、「最初songlist.dbが無かった or 検索したが1曲もない」 { - this.rCurrentlySelectedSong = searchCurrentBreadcrumbsPosition(TJAPlayer3.Songs管理.list曲ルート, this.rCurrentlySelectedSong.strBreadcrumbs); + this.rCurrentlySelectedSong = searchCurrentBreadcrumbsPosition(OpenTaiko.Songs管理.list曲ルート, this.rCurrentlySelectedSong.strBreadcrumbs); if (bRemakeSongTitleBar) // 選曲画面以外に居るときには再構成しない (非活性化しているときに実行すると例外となる) { this.t現在選択中の曲を元に曲バーを再構成する(); @@ -740,14 +740,14 @@ namespace TJAPlayer3 { /// public void t選択曲が変更された(bool bForce) // #27648 { - CSongListNode song = TJAPlayer3.stageSongSelect.rNowSelectedSong; + CSongListNode song = OpenTaiko.stageSongSelect.rNowSelectedSong; if (song == null) return; if (song == song_last && bForce == false) return; song_last = song; - List list = TJAPlayer3.Songs管理.list曲ルート; + List list = OpenTaiko.Songs管理.list曲ルート; int index = list.IndexOf(song) + 1; if (index <= 0) { nCurrentPosition = nNumOfItems = 0; @@ -755,7 +755,7 @@ namespace TJAPlayer3 { nCurrentPosition = index; nNumOfItems = list.Count; } - TJAPlayer3.stageSongSelect.act演奏履歴パネル.tSongChange(); + OpenTaiko.stageSongSelect.act演奏履歴パネル.tSongChange(); } // CActivity 実装 @@ -783,28 +783,28 @@ namespace TJAPlayer3 { } - TJAPlayer3.IsPerformingCalibration = false; + OpenTaiko.IsPerformingCalibration = false; - TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect = false; + OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect = false; - this.pfBoxName = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongSelect_BoxName_Scale); - this.pfMusicName = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongSelect_MusicName_Scale); - this.pfSubtitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongSelect_Subtitle_Scale); - this.pfMaker = HPrivateFastFont.tInstantiateBoxFont(TJAPlayer3.Skin.SongSelect_Maker_Size); - this.pfBoxText = HPrivateFastFont.tInstantiateBoxFont(TJAPlayer3.Skin.SongSelect_BoxText_Scale); - this.pfBPM = HPrivateFastFont.tInstantiateBoxFont(TJAPlayer3.Skin.SongSelect_BPM_Text_Size); + this.pfBoxName = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongSelect_BoxName_Scale); + this.pfMusicName = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongSelect_MusicName_Scale); + this.pfSubtitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongSelect_Subtitle_Scale); + this.pfMaker = HPrivateFastFont.tInstantiateBoxFont(OpenTaiko.Skin.SongSelect_Maker_Size); + this.pfBoxText = HPrivateFastFont.tInstantiateBoxFont(OpenTaiko.Skin.SongSelect_BoxText_Scale); + this.pfBPM = HPrivateFastFont.tInstantiateBoxFont(OpenTaiko.Skin.SongSelect_BPM_Text_Size); this.b登場アニメ全部完了 = false; - this.ctScrollCounter = new CCounter(0, 1000, TJAPlayer3.Skin.SongSelect_Scroll_Interval, TJAPlayer3.Timer); + this.ctScrollCounter = new CCounter(0, 1000, OpenTaiko.Skin.SongSelect_Scroll_Interval, OpenTaiko.Timer); // フォント作成。 // 曲リスト文字は２倍（面積４倍）でテクスチャに描画してから縮小表示するので、フォントサイズは２倍とする。 // 現在選択中の曲がない（＝はじめての活性化）なら、現在選択中の曲をルートの先頭ノードに設定する。 - if ((this.rCurrentlySelectedSong == null) && (TJAPlayer3.Songs管理.list曲ルート.Count > 0)) - this.rCurrentlySelectedSong = TJAPlayer3.Songs管理.list曲ルート[0]; + if ((this.rCurrentlySelectedSong == null) && (OpenTaiko.Songs管理.list曲ルート.Count > 0)) + this.rCurrentlySelectedSong = OpenTaiko.Songs管理.list曲ルート[0]; this.tバーの初期化(); @@ -825,7 +825,7 @@ namespace TJAPlayer3 { string _append = ""; if (HSongTraverse.IsRegularFolder(rCurrentlySelectedSong)) { int countTotalSongs = HSongTraverse.GetSongsMatchingCondition(rCurrentlySelectedSong, (_) => true); - int countUnlockedSongs = HSongTraverse.GetSongsMatchingCondition(rCurrentlySelectedSong, (song) => !TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(song)); + int countUnlockedSongs = HSongTraverse.GetSongsMatchingCondition(rCurrentlySelectedSong, (song) => !OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(song)); _append = " ({0}/{1})".SafeFormat(countUnlockedSongs, countTotalSongs); } @@ -839,7 +839,7 @@ namespace TJAPlayer3 { if (strBoxText != boxText[0] + boxText[1] + boxText[2]) { for (int i = 0; i < 3; i++) { using (var texture = pfBoxText.DrawText(boxText[i], rCurrentlySelectedSong.ForeColor, rCurrentlySelectedSong.BackColor, null, 26)) { - this.txBoxText[i] = TJAPlayer3.tテクスチャの生成(texture); + this.txBoxText[i] = OpenTaiko.tテクスチャの生成(texture); this.strBoxText = boxText[0] + boxText[1] + boxText[2]; } } @@ -850,7 +850,7 @@ namespace TJAPlayer3 { strBoxText = "null"; } - for (int i = 0; i < TJAPlayer3.Skin.SongSelect_Bar_Count; i++) { + for (int i = 0; i < OpenTaiko.Skin.SongSelect_Bar_Count; i++) { this.stバー情報[i].ttkタイトル = this.ttkGenerateSongNameTexture(this.stバー情報[i].strタイトル文字列, this.stバー情報[i].ForeColor, this.stバー情報[i].BackColor, stバー情報[i].eバー種別 == Eバー種別.Box ? this.pfBoxName : this.pfMusicName); } @@ -862,11 +862,11 @@ namespace TJAPlayer3 { if (this.IsDeActivated) return; - TJAPlayer3.tDisposeSafely(ref pfBoxName); - TJAPlayer3.tDisposeSafely(ref pfMusicName); - TJAPlayer3.tDisposeSafely(ref pfSubtitle); - TJAPlayer3.tDisposeSafely(ref pfMaker); - TJAPlayer3.tDisposeSafely(ref pfBPM); + OpenTaiko.tDisposeSafely(ref pfBoxName); + OpenTaiko.tDisposeSafely(ref pfMusicName); + OpenTaiko.tDisposeSafely(ref pfSubtitle); + OpenTaiko.tDisposeSafely(ref pfMaker); + OpenTaiko.tDisposeSafely(ref pfBPM); tResetTitleKey(); //ClearTitleTextureCache(); @@ -943,15 +943,15 @@ namespace TJAPlayer3 { base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tDisposeSafely(ref this.ft曲リスト用フォント); + OpenTaiko.tDisposeSafely(ref this.ft曲リスト用フォント); - for (int i = 0; i < TJAPlayer3.Skin.SongSelect_Bar_Count; i++) { - TJAPlayer3.tテクスチャの解放(ref this.stバー情報[i].txタイトル名); + for (int i = 0; i < OpenTaiko.Skin.SongSelect_Bar_Count; i++) { + OpenTaiko.tテクスチャの解放(ref this.stバー情報[i].txタイトル名); this.stバー情報[i].ttkタイトル = null; } - TJAPlayer3.tテクスチャの解放(ref this.txEnumeratingSongs); - TJAPlayer3.tテクスチャの解放(ref this.txSongNotFound); + OpenTaiko.tテクスチャの解放(ref this.txEnumeratingSongs); + OpenTaiko.tテクスチャの解放(ref this.txSongNotFound); base.ReleaseManagedResource(); } @@ -962,10 +962,10 @@ namespace TJAPlayer3 { #region [ 初めての進行描画 ] //----------------- if (this.IsFirstDraw) { - TJAPlayer3.stageSongSelect.tNotifySelectedSongChange(); + OpenTaiko.stageSongSelect.tNotifySelectedSongChange(); - ctBarOpen.Start(0, 260, 2, TJAPlayer3.Timer); - this.ct三角矢印アニメ.Start(0, 1000, 1, TJAPlayer3.Timer); + ctBarOpen.Start(0, 260, 2, OpenTaiko.Timer); + this.ct三角矢印アニメ.Start(0, 1000, 1, OpenTaiko.Timer); base.IsFirstDraw = false; } //----------------- @@ -977,17 +977,17 @@ namespace TJAPlayer3 { ctDifficultyIn.Tick(); float BarAnimeCount = this.ctBarOpen.CurrentValue <= 200 ? 0 : (float)Math.Sin(((this.ctBarOpen.CurrentValue - 200) * 1.5f) * (Math.PI / 180)); - int centerMove = (int)(BarAnimeCount * TJAPlayer3.Skin.SongSelect_Bar_Center_Move); - int centerMoveX = (int)(BarAnimeCount * TJAPlayer3.Skin.SongSelect_Bar_Center_Move_X); + int centerMove = (int)(BarAnimeCount * OpenTaiko.Skin.SongSelect_Bar_Center_Move); + int centerMoveX = (int)(BarAnimeCount * OpenTaiko.Skin.SongSelect_Bar_Center_Move_X); if (BarAnimeCount == 1.0) ctScoreFrameAnime.TickLoop(); // まだ選択中の曲が決まってなければ、曲ツリールートの最初の曲にセットする。 - if ((this.rCurrentlySelectedSong == null) && (TJAPlayer3.Songs管理.list曲ルート.Count > 0)) { + if ((this.rCurrentlySelectedSong == null) && (OpenTaiko.Songs管理.list曲ルート.Count > 0)) { nSelectSongIndex = 0; - this.rCurrentlySelectedSong = TJAPlayer3.Songs管理.list曲ルート[nSelectSongIndex]; + this.rCurrentlySelectedSong = OpenTaiko.Songs管理.list曲ルート[nSelectSongIndex]; } // 描画。 @@ -1015,7 +1015,7 @@ namespace TJAPlayer3 { string _append = ""; if (HSongTraverse.IsRegularFolder(rCurrentlySelectedSong)) { int countTotalSongs = HSongTraverse.GetSongsMatchingCondition(rCurrentlySelectedSong, (_) => true); - int countUnlockedSongs = HSongTraverse.GetSongsMatchingCondition(rCurrentlySelectedSong, (song) => !TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(song)); + int countUnlockedSongs = HSongTraverse.GetSongsMatchingCondition(rCurrentlySelectedSong, (song) => !OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(song)); _append = " ({0}/{1})".SafeFormat(countUnlockedSongs, countTotalSongs); } @@ -1029,7 +1029,7 @@ namespace TJAPlayer3 { if (strBoxText != boxText[0] + boxText[1] + boxText[2]) { for (int i = 0; i < 3; i++) { using (var texture = pfBoxText.DrawText(boxText[i], rCurrentlySelectedSong.ForeColor, rCurrentlySelectedSong.BackColor, null, 26)) { - this.txBoxText[i] = TJAPlayer3.tテクスチャの生成(texture); + this.txBoxText[i] = OpenTaiko.tテクスチャの生成(texture); this.strBoxText = boxText[0] + boxText[1] + boxText[2]; } } @@ -1047,7 +1047,7 @@ namespace TJAPlayer3 { int i選曲バーX座標 = 673; //選曲バーの座標用 int i選択曲バーX座標 = 665; //選択曲バーの座標用 - int barCenterNum = (TJAPlayer3.Skin.SongSelect_Bar_Count - 1) / 2; + int barCenterNum = (OpenTaiko.Skin.SongSelect_Bar_Count - 1) / 2; if (this.ctScrollCounter.CurrentValue == this.ctScrollCounter.EndValue) { nNowChange = 0; @@ -1055,26 +1055,26 @@ namespace TJAPlayer3 { #region [ (2) 通常フェーズの描画。] //----------------- - for (int i = 0; i < TJAPlayer3.Skin.SongSelect_Bar_Count; i++) // パネルは全13枚。 + for (int i = 0; i < OpenTaiko.Skin.SongSelect_Bar_Count; i++) // パネルは全13枚。 { int index = i + nNowChange; - if (((index < 0 || index >= TJAPlayer3.Skin.SongSelect_Bar_Count) && this.ctScrollCounter.CurrentValue != this.ctScrollCounter.EndValue)) + if (((index < 0 || index >= OpenTaiko.Skin.SongSelect_Bar_Count) && this.ctScrollCounter.CurrentValue != this.ctScrollCounter.EndValue)) continue; - int nパネル番号 = (((this.n現在の選択行 - barCenterNum) + i) + TJAPlayer3.Skin.SongSelect_Bar_Count) % TJAPlayer3.Skin.SongSelect_Bar_Count; + int nパネル番号 = (((this.n現在の選択行 - barCenterNum) + i) + OpenTaiko.Skin.SongSelect_Bar_Count) % OpenTaiko.Skin.SongSelect_Bar_Count; int n見た目の行番号 = i; - int n次のパネル番号 = (index % TJAPlayer3.Skin.SongSelect_Bar_Count); + int n次のパネル番号 = (index % OpenTaiko.Skin.SongSelect_Bar_Count); int x = i選曲バーX座標; #region [Positions and layouts] - int xZahyou = TJAPlayer3.Skin.SongSelect_Bar_X[n見た目の行番号]; - int xNextZahyou = TJAPlayer3.Skin.SongSelect_Bar_X[n次のパネル番号]; - int xCentralZahyou = TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum]; + int xZahyou = OpenTaiko.Skin.SongSelect_Bar_X[n見た目の行番号]; + int xNextZahyou = OpenTaiko.Skin.SongSelect_Bar_X[n次のパネル番号]; + int xCentralZahyou = OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum]; - int yZahyou = TJAPlayer3.Skin.SongSelect_Bar_Y[n見た目の行番号]; - int yNextZahyou = TJAPlayer3.Skin.SongSelect_Bar_Y[n次のパネル番号]; - int yCentralZahyou = TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum]; + int yZahyou = OpenTaiko.Skin.SongSelect_Bar_Y[n見た目の行番号]; + int yNextZahyou = OpenTaiko.Skin.SongSelect_Bar_Y[n次のパネル番号]; + int yCentralZahyou = OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum]; int Diff4 = Math.Abs(n見た目の行番号 - barCenterNum); int NextDiff4 = Math.Abs(n次のパネル番号 - barCenterNum); @@ -1119,20 +1119,20 @@ namespace TJAPlayer3 { float Box = 0; float Box_X = 0; float Box_Y = 0; - int _center = (TJAPlayer3.Skin.SongSelect_Bar_Count - 1) / 2; + int _center = (OpenTaiko.Skin.SongSelect_Bar_Count - 1) / 2; float[] _boxAim = new float[2] { - TJAPlayer3.Skin.SongSelect_Bar_Anim_X[i], - TJAPlayer3.Skin.SongSelect_Bar_Anim_Y[i] + OpenTaiko.Skin.SongSelect_Bar_Anim_X[i], + OpenTaiko.Skin.SongSelect_Bar_Anim_Y[i] }; int _movfs = i - 1; int _maxfs = _center - 1; - int _gap = Math.Max(1, TJAPlayer3.Skin.SongSelect_Bar_Count - 3); + int _gap = Math.Max(1, OpenTaiko.Skin.SongSelect_Bar_Count - 3); #region [ BoxOpenAnime ] - if (i != _center && i != 0 && i < TJAPlayer3.Skin.SongSelect_Bar_Count - 1) { + if (i != _center && i != 0 && i < OpenTaiko.Skin.SongSelect_Bar_Count - 1) { if (ctBoxOpen.CurrentValue >= 1000 && ctBoxOpen.CurrentValue <= 1560) { float _curve = 1000 + (150 / _gap) * (_maxfs - _movfs);//Math.Abs(150 / (_center - i)); Box_X = _boxAim[0] - (float)Math.Sin(((ctBoxOpen.CurrentValue - _curve) / 4 + 90) * (Math.PI / 180)) * _boxAim[0]; @@ -1277,8 +1277,8 @@ namespace TJAPlayer3 { // int boxType = nStrジャンルtoNum(stバー情報[nパネル番号].strジャンル); string boxType = stバー情報[nパネル番号].BoxType; - var bar_genre = HGenreBar.tGetGenreBar(boxType, TJAPlayer3.Tx.SongSelect_Bar_Genre); - var bar_genre_overlap = HGenreBar.tGetGenreBar(boxType, TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlap); + var bar_genre = HGenreBar.tGetGenreBar(boxType, OpenTaiko.Tx.SongSelect_Bar_Genre); + var bar_genre_overlap = HGenreBar.tGetGenreBar(boxType, OpenTaiko.Tx.SongSelect_Bar_Genre_Overlap); bar_genre.color4 = CConversion.ColorToColor4(stバー情報[nパネル番号].BoxColor); @@ -1286,9 +1286,9 @@ namespace TJAPlayer3 { if (bar_genre_overlap != null) bar_genre_overlap.vcScaleRatio.X = 1.0f; - TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlay.vcScaleRatio.X = 1.0f; - TJAPlayer3.Tx.SongSelect_Bar_Genre_Back.vcScaleRatio.X = 1.0f; - TJAPlayer3.Tx.SongSelect_Bar_Genre_Random.vcScaleRatio.X = 1.0f; + OpenTaiko.Tx.SongSelect_Bar_Genre_Overlay.vcScaleRatio.X = 1.0f; + OpenTaiko.Tx.SongSelect_Bar_Genre_Back.vcScaleRatio.X = 1.0f; + OpenTaiko.Tx.SongSelect_Bar_Genre_Random.vcScaleRatio.X = 1.0f; @@ -1327,24 +1327,24 @@ namespace TJAPlayer3 { #endregion #region [ タイトル名テクスチャを描画。] - if (ctDifficultyIn.CurrentValue >= 1000 && TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) - TitleTextureKey.ResolveTitleTexture(this.stバー情報[nパネル番号].ttkタイトル, TJAPlayer3.Skin.SongSelect_VerticalText).Opacity = (int)255.0f - (ctDifficultyIn.CurrentValue - 1000); + if (ctDifficultyIn.CurrentValue >= 1000 && OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) + TitleTextureKey.ResolveTitleTexture(this.stバー情報[nパネル番号].ttkタイトル, OpenTaiko.Skin.SongSelect_VerticalText).Opacity = (int)255.0f - (ctDifficultyIn.CurrentValue - 1000); else - TitleTextureKey.ResolveTitleTexture(this.stバー情報[nパネル番号].ttkタイトル, TJAPlayer3.Skin.SongSelect_VerticalText).Opacity = 255; + TitleTextureKey.ResolveTitleTexture(this.stバー情報[nパネル番号].ttkタイトル, OpenTaiko.Skin.SongSelect_VerticalText).Opacity = 255; if (ctScrollCounter.CurrentValue != ctScrollCounter.EndValue) - TitleTextureKey.ResolveTitleTexture(this.stバー情報[nパネル番号].ttkタイトル, TJAPlayer3.Skin.SongSelect_VerticalText).t2D拡大率考慮中央基準描画( + TitleTextureKey.ResolveTitleTexture(this.stバー情報[nパネル番号].ttkタイトル, OpenTaiko.Skin.SongSelect_VerticalText).t2D拡大率考慮中央基準描画( xAnime - Box_X + GetTitleOffsetX(this.stバー情報[nパネル番号].eバー種別), y - Box_Y + GetTitleOffsetY(this.stバー情報[nパネル番号].eバー種別)); else if (n見た目の行番号 != barCenterNum) - TitleTextureKey.ResolveTitleTexture(this.stバー情報[nパネル番号].ttkタイトル, TJAPlayer3.Skin.SongSelect_VerticalText).t2D拡大率考慮中央基準描画( + TitleTextureKey.ResolveTitleTexture(this.stバー情報[nパネル番号].ttkタイトル, OpenTaiko.Skin.SongSelect_VerticalText).t2D拡大率考慮中央基準描画( xAnime - Box_X + GetTitleOffsetX(this.stバー情報[nパネル番号].eバー種別), y - Box_Y + GetTitleOffsetY(this.stバー情報[nパネル番号].eバー種別)); #endregion - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(stバー情報[nパネル番号].reference); - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(stバー情報[nパネル番号].reference); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(stバー情報[nパネル番号].reference); + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(stバー情報[nパネル番号].reference); if (HiddenIndex == DBSongUnlockables.EHiddenIndex.GRAYED) { - TJAPlayer3.Tx.SongSelect_Bar_Genre_Locked_Top?.t2D描画(xAnime - (int)Box_X, y - ((int)Box_Y)); + OpenTaiko.Tx.SongSelect_Bar_Genre_Locked_Top?.t2D描画(xAnime - (int)Box_X, y - ((int)Box_Y)); } @@ -1353,45 +1353,45 @@ namespace TJAPlayer3 { #endregion - if (TJAPlayer3.Skin.SongSelect_Bar_Select_Skip_Fade || + if (OpenTaiko.Skin.SongSelect_Bar_Select_Skip_Fade || this.ctScrollCounter.CurrentValue == this.ctScrollCounter.EndValue) { #region [ Bar_Select ] - int barSelect_width = TJAPlayer3.Tx.SongSelect_Bar_Select.sz画像サイズ.Width; - int barSelect_height = TJAPlayer3.Tx.SongSelect_Bar_Select.sz画像サイズ.Height / 2; + int barSelect_width = OpenTaiko.Tx.SongSelect_Bar_Select.sz画像サイズ.Width; + int barSelect_height = OpenTaiko.Tx.SongSelect_Bar_Select.sz画像サイズ.Height / 2; - if (ctBarFlash.IsEnded && !TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) { - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)(BarAnimeCount * 255.0f); - if (TJAPlayer3.Skin.SongSelect_Bar_Select_Skip_Fade) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = 255; + if (ctBarFlash.IsEnded && !OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) { + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)(BarAnimeCount * 255.0f); + if (OpenTaiko.Skin.SongSelect_Bar_Select_Skip_Fade) + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = 255; } else - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 700) * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 700) * 2.55f); - TJAPlayer3.Tx.SongSelect_Bar_Select.t2D描画(TJAPlayer3.Skin.SongSelect_Bar_Select[0], TJAPlayer3.Skin.SongSelect_Bar_Select[1], new Rectangle(0, 0, barSelect_width, barSelect_height)); + OpenTaiko.Tx.SongSelect_Bar_Select.t2D描画(OpenTaiko.Skin.SongSelect_Bar_Select[0], OpenTaiko.Skin.SongSelect_Bar_Select[1], new Rectangle(0, 0, barSelect_width, barSelect_height)); #region [ BarFlash ] if (ctBarFlash.CurrentValue <= 100) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)(ctBarFlash.CurrentValue * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)(ctBarFlash.CurrentValue * 2.55f); else if (ctBarFlash.CurrentValue <= 200) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 100) * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 100) * 2.55f); else if (ctBarFlash.CurrentValue <= 300) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)((ctBarFlash.CurrentValue - 200) * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)((ctBarFlash.CurrentValue - 200) * 2.55f); else if (ctBarFlash.CurrentValue <= 400) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 300) * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 300) * 2.55f); else if (ctBarFlash.CurrentValue <= 500) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)((ctBarFlash.CurrentValue - 400) * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)((ctBarFlash.CurrentValue - 400) * 2.55f); else if (ctBarFlash.CurrentValue <= 600) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 500) * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 500) * 2.55f); else if (ctBarFlash.CurrentValue <= 700) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)((ctBarFlash.CurrentValue - 600) * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)((ctBarFlash.CurrentValue - 600) * 2.55f); else if (ctBarFlash.CurrentValue <= 800) - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 700) * 2.55f); + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = (int)(255 - (ctBarFlash.CurrentValue - 700) * 2.55f); else - TJAPlayer3.Tx.SongSelect_Bar_Select.Opacity = 0; + OpenTaiko.Tx.SongSelect_Bar_Select.Opacity = 0; - TJAPlayer3.Tx.SongSelect_Bar_Select.t2D描画(TJAPlayer3.Skin.SongSelect_Bar_Select[0], TJAPlayer3.Skin.SongSelect_Bar_Select[1], new Rectangle(0, barSelect_height, barSelect_width, barSelect_height)); + OpenTaiko.Tx.SongSelect_Bar_Select.t2D描画(OpenTaiko.Skin.SongSelect_Bar_Select[0], OpenTaiko.Skin.SongSelect_Bar_Select[1], new Rectangle(0, barSelect_height, barSelect_width, barSelect_height)); #endregion @@ -1407,19 +1407,19 @@ namespace TJAPlayer3 { if (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE) { #region [ Score ] - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(rCurrentlySelectedSong); - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(rCurrentlySelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(rCurrentlySelectedSong); + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(rCurrentlySelectedSong); #region [ Bar ] if (HiddenIndex == DBSongUnlockables.EHiddenIndex.GRAYED) { - DrawBarCenter(TJAPlayer3.Tx.SongSelect_Bar_Genre_Locked, TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, false, false); + DrawBarCenter(OpenTaiko.Tx.SongSelect_Bar_Genre_Locked, OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum], OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, false, false); } else { - var bar_genre = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxType, TJAPlayer3.Tx.SongSelect_Bar_Genre); - var bar_genre_overlap = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxType, TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlap); + var bar_genre = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxType, OpenTaiko.Tx.SongSelect_Bar_Genre); + var bar_genre_overlap = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxType, OpenTaiko.Tx.SongSelect_Bar_Genre_Overlap); - DrawBarCenter(bar_genre, TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, true, false, false); - DrawBarCenter(bar_genre_overlap, TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, true, true); + DrawBarCenter(bar_genre, OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum], OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, true, false, false); + DrawBarCenter(bar_genre_overlap, OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum], OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, true, true); #region [ Crown and ScoreRank ] @@ -1428,19 +1428,19 @@ namespace TJAPlayer3 { if (this.rCurrentlySelectedSong.arスコア[(int)Difficulty.Dan] != null) { //int[] clear = this.r現在選択中の曲.arスコア[(int)Difficulty.Dan].譜面情報.nクリア; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (i >= 2) continue; - int ap = TJAPlayer3.GetActualPlayer(i); + int ap = OpenTaiko.GetActualPlayer(i); - var TableEntry = TJAPlayer3.SaveFileInstances[ap].data.tGetSongSelectTableEntry(rCurrentlySelectedSong.tGetUniqueId()); + var TableEntry = OpenTaiko.SaveFileInstances[ap].data.tGetSongSelectTableEntry(rCurrentlySelectedSong.tGetUniqueId()); int[] clear = TableEntry.ClearStatuses; int currentRank = Math.Min(clear[(int)Difficulty.Dan], 8) - 3; - int x = TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum] + TJAPlayer3.Skin.SongSelect_DanStatus_Offset_X[i]; - int y = TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum] + TJAPlayer3.Skin.SongSelect_DanStatus_Offset_Y[i]; + int x = OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum] + OpenTaiko.Skin.SongSelect_DanStatus_Offset_X[i]; + int y = OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum] + OpenTaiko.Skin.SongSelect_DanStatus_Offset_Y[i]; displayDanStatus((int)(x - centerMoveX / 1.1f), (int)(y - centerMove / 1.1f), currentRank, 0.2f); } @@ -1448,36 +1448,36 @@ namespace TJAPlayer3 { } else if (this.rCurrentlySelectedSong.arスコア[(int)Difficulty.Tower] != null) { //int[] clear = this.r現在選択中の曲.arスコア[(int)Difficulty.Tower].譜面情報.nクリア; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (i >= 2) continue; - int ap = TJAPlayer3.GetActualPlayer(i); - var TableEntry = TJAPlayer3.SaveFileInstances[ap].data.tGetSongSelectTableEntry(rCurrentlySelectedSong.tGetUniqueId()); + int ap = OpenTaiko.GetActualPlayer(i); + var TableEntry = OpenTaiko.SaveFileInstances[ap].data.tGetSongSelectTableEntry(rCurrentlySelectedSong.tGetUniqueId()); int[] clear = TableEntry.ClearStatuses; int currentRank = Math.Min(clear[(int)Difficulty.Tower], 8) - 2; - int x = TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum] + TJAPlayer3.Skin.SongSelect_TowerStatus_Offset_X[i]; - int y = TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum] + TJAPlayer3.Skin.SongSelect_TowerStatus_Offset_Y[i]; + int x = OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum] + OpenTaiko.Skin.SongSelect_TowerStatus_Offset_X[i]; + int y = OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum] + OpenTaiko.Skin.SongSelect_TowerStatus_Offset_Y[i]; displayTowerStatus((int)(x - centerMoveX / 1.1f), (int)(y - centerMove / 1.1f), currentRank, 0.3f); } } else if (this.rCurrentlySelectedSong.arスコア[3] != null || this.rCurrentlySelectedSong.arスコア[4] != null) { //var sr = this.rCurrentlySelectedSong.arスコア[n現在のアンカ難易度レベルに最も近い難易度レベルを返す(this.rCurrentlySelectedSong)]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (i >= 2) continue; - int ap = TJAPlayer3.GetActualPlayer(i); - var TableEntry = TJAPlayer3.SaveFileInstances[ap].data.tGetSongSelectTableEntry(TJAPlayer3.stageSongSelect.rNowSelectedSong.tGetUniqueId()); + int ap = OpenTaiko.GetActualPlayer(i); + var TableEntry = OpenTaiko.SaveFileInstances[ap].data.tGetSongSelectTableEntry(OpenTaiko.stageSongSelect.rNowSelectedSong.tGetUniqueId()); int[] クリア = TableEntry.ClearStatuses; int[] スコアランク = TableEntry.ScoreRanks; - int x = TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum] + TJAPlayer3.Skin.SongSelect_RegularCrowns_Offset_X[i]; - int y = TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum] + TJAPlayer3.Skin.SongSelect_RegularCrowns_Offset_Y[i]; + int x = OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum] + OpenTaiko.Skin.SongSelect_RegularCrowns_Offset_X[i]; + int y = OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum] + OpenTaiko.Skin.SongSelect_RegularCrowns_Offset_Y[i]; displayRegularCrowns((int)(x - centerMoveX / 1.1f), (int)(y - centerMove / 1.1f), クリア, スコアランク, 0.8f + BarAnimeCount / 620f); @@ -1491,20 +1491,20 @@ namespace TJAPlayer3 { if (IsSongLocked) { displayVisibleLockStatus( - (int)(TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum] + TJAPlayer3.Skin.SongSelect_FavoriteStatus_Offset[0] - centerMoveX / 1.1f), - (int)(TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum] + TJAPlayer3.Skin.SongSelect_FavoriteStatus_Offset[1] - centerMove / 1.1f), 1f); + (int)(OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum] + OpenTaiko.Skin.SongSelect_FavoriteStatus_Offset[0] - centerMoveX / 1.1f), + (int)(OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum] + OpenTaiko.Skin.SongSelect_FavoriteStatus_Offset[1] - centerMove / 1.1f), 1f); } else { displayFavoriteStatus( - (int)(TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum] + TJAPlayer3.Skin.SongSelect_FavoriteStatus_Offset[0] - centerMoveX / 1.1f), - (int)(TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum] + TJAPlayer3.Skin.SongSelect_FavoriteStatus_Offset[1] - centerMove / 1.1f), this.rCurrentlySelectedSong.uniqueId, 1f + BarAnimeCount / 620f); + (int)(OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum] + OpenTaiko.Skin.SongSelect_FavoriteStatus_Offset[0] - centerMoveX / 1.1f), + (int)(OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum] + OpenTaiko.Skin.SongSelect_FavoriteStatus_Offset[1] - centerMove / 1.1f), this.rCurrentlySelectedSong.uniqueId, 1f + BarAnimeCount / 620f); } #endregion #region [Level number big] tPrintLevelNumberBig( - (int)(TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum] + TJAPlayer3.Skin.SongSelect_Level_Offset[0] - centerMoveX / 1.1f), - (int)(TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum] + TJAPlayer3.Skin.SongSelect_Level_Offset[1] - centerMove / 1.1f), + (int)(OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum] + OpenTaiko.Skin.SongSelect_Level_Offset[0] - centerMoveX / 1.1f), + (int)(OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum] + OpenTaiko.Skin.SongSelect_Level_Offset[1] - centerMove / 1.1f), this.rCurrentlySelectedSong ); @@ -1522,13 +1522,13 @@ namespace TJAPlayer3 { #region [ Box ] //int boxType = nStrジャンルtoNum(r現在選択中の曲.strジャンル); - var bar_genre = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxType, TJAPlayer3.Tx.SongSelect_Bar_Genre); // Box - var bar_genre_overlap = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxType, TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlap); + var bar_genre = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxType, OpenTaiko.Tx.SongSelect_Bar_Genre); // Box + var bar_genre_overlap = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxType, OpenTaiko.Tx.SongSelect_Bar_Genre_Overlap); //DrawBarCenter(TJAPlayer3.Tx.SongSelect_Bar_Genre[boxType], TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, true, true, false); - DrawBarCenter(bar_genre, TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, true, false, false); - DrawBarCenter(bar_genre_overlap, TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, true, false); + DrawBarCenter(bar_genre, OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum], OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, true, false, false); + DrawBarCenter(bar_genre_overlap, OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum], OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, true, false); #endregion @@ -1536,14 +1536,14 @@ namespace TJAPlayer3 { if (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.BACKBOX) { #region [ BackBox ] - DrawBarCenter(TJAPlayer3.Tx.SongSelect_Bar_Genre_Back, TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, false, false); + DrawBarCenter(OpenTaiko.Tx.SongSelect_Bar_Genre_Back, OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum], OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, false, false); #endregion } if (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.RANDOM) { #region [Random box] - DrawBarCenter(TJAPlayer3.Tx.SongSelect_Bar_Genre_Random, TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, false, false); + DrawBarCenter(OpenTaiko.Tx.SongSelect_Bar_Genre_Random, OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum], OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, false, false); #endregion } @@ -1552,21 +1552,21 @@ namespace TJAPlayer3 { switch (rCurrentlySelectedSong.eノード種別) { case CSongListNode.ENodeType.SCORE: { - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(rCurrentlySelectedSong); - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(rCurrentlySelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(rCurrentlySelectedSong); + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(rCurrentlySelectedSong); #region [Difficulty bars] - if (TJAPlayer3.Tx.SongSelect_Frame_Score != null && HiddenIndex != DBSongUnlockables.EHiddenIndex.GRAYED) { + if (OpenTaiko.Tx.SongSelect_Frame_Score != null && HiddenIndex != DBSongUnlockables.EHiddenIndex.GRAYED) { // 難易度がTower、Danではない - if (TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度 != (int)Difficulty.Tower && TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度 != (int)Difficulty.Dan) { + if (OpenTaiko.stageSongSelect.n現在選択中の曲の難易度 != (int)Difficulty.Tower && OpenTaiko.stageSongSelect.n現在選択中の曲の難易度 != (int)Difficulty.Dan) { #region [Display difficulty boxes] - bool uraExists = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0; - bool omoteExists = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] >= 0; + bool uraExists = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0; + bool omoteExists = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] >= 0; for (int i = 0; i < (int)Difficulty.Edit + 1; i++) { - if (ctBarOpen.CurrentValue >= 100 || TJAPlayer3.Skin.SongSelect_Shorten_Frame_Fade) { + if (ctBarOpen.CurrentValue >= 100 || OpenTaiko.Skin.SongSelect_Shorten_Frame_Fade) { #region [Skip conditions] // Don't even bother process the Ura box if there isn't one @@ -1582,12 +1582,12 @@ namespace TJAPlayer3 { // avaliable : bool (Chart exists) #region [Gray box if stage isn't avaliable] - bool avaliable = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i] >= 0; + bool avaliable = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i] >= 0; if (avaliable) - TJAPlayer3.Tx.SongSelect_Frame_Score[0].color4 = new Color4(1f, 1f, 1f, 1f); + OpenTaiko.Tx.SongSelect_Frame_Score[0].color4 = new Color4(1f, 1f, 1f, 1f); else - TJAPlayer3.Tx.SongSelect_Frame_Score[0].color4 = new Color4(0.5f, 0.5f, 0.5f, 1f); + OpenTaiko.Tx.SongSelect_Frame_Score[0].color4 = new Color4(0.5f, 0.5f, 0.5f, 1f); #endregion @@ -1611,25 +1611,25 @@ namespace TJAPlayer3 { int difSelectOpacity = (_switchingUra) ? (BarAnimeCount < 1.0 ? 0 : opacity) : (int)(BarAnimeCount * 255.0f); - if (TJAPlayer3.Skin.SongSelect_Shorten_Frame_Fade && !_switchingUra) { + if (OpenTaiko.Skin.SongSelect_Shorten_Frame_Fade && !_switchingUra) { difSelectOpacity = 255; } - if (!TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect || ctDifficultyIn.CurrentValue < 1000) { - TJAPlayer3.Tx.SongSelect_Frame_Score[0].Opacity = difSelectOpacity; - TJAPlayer3.Tx.SongSelect_Level_Number.Opacity = difSelectOpacity; - TJAPlayer3.Tx.SongSelect_Level_Number_Icon?.tUpdateOpacity(difSelectOpacity); - TJAPlayer3.Tx.SongSelect_Level_Number_Colored?.tUpdateOpacity(difSelectOpacity); - if (TJAPlayer3.Tx.SongSelect_Level != null) TJAPlayer3.Tx.SongSelect_Level.Opacity = difSelectOpacity; + if (!OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect || ctDifficultyIn.CurrentValue < 1000) { + OpenTaiko.Tx.SongSelect_Frame_Score[0].Opacity = difSelectOpacity; + OpenTaiko.Tx.SongSelect_Level_Number.Opacity = difSelectOpacity; + OpenTaiko.Tx.SongSelect_Level_Number_Icon?.tUpdateOpacity(difSelectOpacity); + OpenTaiko.Tx.SongSelect_Level_Number_Colored?.tUpdateOpacity(difSelectOpacity); + if (OpenTaiko.Tx.SongSelect_Level != null) OpenTaiko.Tx.SongSelect_Level.Opacity = difSelectOpacity; } else if (ctDifficultyIn.CurrentValue >= 1000) { int difInOpacity = (int)((float)((int)255.0f - (ctDifficultyIn.CurrentValue - 1000)) * ((i == (int)Difficulty.Edit && omoteExists) ? (float)difSelectOpacity / 255f : 1f)); - TJAPlayer3.Tx.SongSelect_Frame_Score[0].Opacity = difInOpacity; - TJAPlayer3.Tx.SongSelect_Level_Number.Opacity = difInOpacity; - TJAPlayer3.Tx.SongSelect_Level_Number_Icon?.tUpdateOpacity(difInOpacity); - TJAPlayer3.Tx.SongSelect_Level_Number_Colored?.tUpdateOpacity(difInOpacity); - if (TJAPlayer3.Tx.SongSelect_Level != null) TJAPlayer3.Tx.SongSelect_Level.Opacity = difInOpacity; + OpenTaiko.Tx.SongSelect_Frame_Score[0].Opacity = difInOpacity; + OpenTaiko.Tx.SongSelect_Level_Number.Opacity = difInOpacity; + OpenTaiko.Tx.SongSelect_Level_Number_Icon?.tUpdateOpacity(difInOpacity); + OpenTaiko.Tx.SongSelect_Level_Number_Colored?.tUpdateOpacity(difInOpacity); + if (OpenTaiko.Tx.SongSelect_Level != null) OpenTaiko.Tx.SongSelect_Level.Opacity = difInOpacity; } #endregion @@ -1639,36 +1639,36 @@ namespace TJAPlayer3 { int displayingDiff = Math.Min(i, (int)Difficulty.Oni); int positionalOffset = displayingDiff * 122; - int width = TJAPlayer3.Tx.SongSelect_Frame_Score[0].sz画像サイズ.Width / 5; - int height = TJAPlayer3.Tx.SongSelect_Frame_Score[0].sz画像サイズ.Height; + int width = OpenTaiko.Tx.SongSelect_Frame_Score[0].sz画像サイズ.Width / 5; + int height = OpenTaiko.Tx.SongSelect_Frame_Score[0].sz画像サイズ.Height; - TJAPlayer3.Tx.SongSelect_Frame_Score[0].t2D描画(TJAPlayer3.Skin.SongSelect_Frame_Score_X[displayingDiff], TJAPlayer3.Skin.SongSelect_Frame_Score_Y[displayingDiff], new Rectangle(width * i, 0, width, height)); + OpenTaiko.Tx.SongSelect_Frame_Score[0].t2D描画(OpenTaiko.Skin.SongSelect_Frame_Score_X[displayingDiff], OpenTaiko.Skin.SongSelect_Frame_Score_Y[displayingDiff], new Rectangle(width * i, 0, width, height)); if (avaliable) { - t小文字表示(TJAPlayer3.Skin.SongSelect_Level_Number_X[displayingDiff], TJAPlayer3.Skin.SongSelect_Level_Number_Y[displayingDiff], - TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i], + t小文字表示(OpenTaiko.Skin.SongSelect_Level_Number_X[displayingDiff], OpenTaiko.Skin.SongSelect_Level_Number_Y[displayingDiff], + OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i], i, - TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nLevelIcon[i] + OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nLevelIcon[i] ); - if (TJAPlayer3.Tx.SongSelect_Level != null) { - int level_width = TJAPlayer3.Tx.SongSelect_Level.szTextureSize.Width / 7; - int level_height = TJAPlayer3.Tx.SongSelect_Level.szTextureSize.Height; + if (OpenTaiko.Tx.SongSelect_Level != null) { + int level_width = OpenTaiko.Tx.SongSelect_Level.szTextureSize.Width / 7; + int level_height = OpenTaiko.Tx.SongSelect_Level.szTextureSize.Height; - for (int i2 = 0; i2 < TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i]; i2++) { - TJAPlayer3.Tx.SongSelect_Level.t2D描画( - TJAPlayer3.Skin.SongSelect_Level_X[displayingDiff] + (TJAPlayer3.Skin.SongSelect_Level_Move[0] * i2), - TJAPlayer3.Skin.SongSelect_Level_Y[displayingDiff] + (TJAPlayer3.Skin.SongSelect_Level_Move[1] * i2), + for (int i2 = 0; i2 < OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i]; i2++) { + OpenTaiko.Tx.SongSelect_Level.t2D描画( + OpenTaiko.Skin.SongSelect_Level_X[displayingDiff] + (OpenTaiko.Skin.SongSelect_Level_Move[0] * i2), + OpenTaiko.Skin.SongSelect_Level_Y[displayingDiff] + (OpenTaiko.Skin.SongSelect_Level_Move[1] * i2), new RectangleF(level_width * i, 0, level_width, level_height)); } } - if (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.b譜面分岐[i]) { - TJAPlayer3.Tx.SongSelect_Branch?.tUpdateOpacity(TJAPlayer3.Tx.SongSelect_Frame_Score[0].Opacity); - TJAPlayer3.Tx.SongSelect_Branch?.t2D描画( + if (OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.b譜面分岐[i]) { + OpenTaiko.Tx.SongSelect_Branch?.tUpdateOpacity(OpenTaiko.Tx.SongSelect_Frame_Score[0].Opacity); + OpenTaiko.Tx.SongSelect_Branch?.t2D描画( - TJAPlayer3.Skin.SongSelect_Frame_Score_X[displayingDiff] + TJAPlayer3.Skin.SongSelect_Branch_Offset[0], - TJAPlayer3.Skin.SongSelect_Frame_Score_Y[displayingDiff] + TJAPlayer3.Skin.SongSelect_Branch_Offset[1] + OpenTaiko.Skin.SongSelect_Frame_Score_X[displayingDiff] + OpenTaiko.Skin.SongSelect_Branch_Offset[0], + OpenTaiko.Skin.SongSelect_Frame_Score_Y[displayingDiff] + OpenTaiko.Skin.SongSelect_Branch_Offset[1] ); } @@ -1686,7 +1686,7 @@ namespace TJAPlayer3 { #region [Check if Dan or Tower] int diff = 5; - if (TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度 == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.n現在選択中の曲の難易度 == (int)Difficulty.Dan) diff = 6; #endregion @@ -1694,12 +1694,12 @@ namespace TJAPlayer3 { // avaliable : bool (Chart exists) #region [Gray box if stage isn't avaliable] - bool avaliable = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[diff] >= 0; + bool avaliable = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[diff] >= 0; if (avaliable) - TJAPlayer3.Tx.SongSelect_Frame_Score[1].color4 = new Color4(1f, 1f, 1f, 1f); + OpenTaiko.Tx.SongSelect_Frame_Score[1].color4 = new Color4(1f, 1f, 1f, 1f); else - TJAPlayer3.Tx.SongSelect_Frame_Score[1].color4 = new Color4(0.5f, 0.5f, 0.5f, 1f); + OpenTaiko.Tx.SongSelect_Frame_Score[1].color4 = new Color4(0.5f, 0.5f, 0.5f, 1f); #endregion @@ -1707,23 +1707,23 @@ namespace TJAPlayer3 { int difSelectOpacity = (int)(BarAnimeCount * 255); - if (TJAPlayer3.Skin.SongSelect_Shorten_Frame_Fade) + if (OpenTaiko.Skin.SongSelect_Shorten_Frame_Fade) difSelectOpacity = 255; - if (!TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect || ctDifficultyIn.CurrentValue < 1000) { - TJAPlayer3.Tx.SongSelect_Frame_Score[1].Opacity = difSelectOpacity; - TJAPlayer3.Tx.SongSelect_Level_Number.Opacity = difSelectOpacity; - TJAPlayer3.Tx.SongSelect_Level_Number_Icon?.tUpdateOpacity(difSelectOpacity); - TJAPlayer3.Tx.SongSelect_Level_Number_Colored?.tUpdateOpacity(difSelectOpacity); - if (TJAPlayer3.Tx.SongSelect_Level != null) TJAPlayer3.Tx.SongSelect_Level.Opacity = difSelectOpacity; + if (!OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect || ctDifficultyIn.CurrentValue < 1000) { + OpenTaiko.Tx.SongSelect_Frame_Score[1].Opacity = difSelectOpacity; + OpenTaiko.Tx.SongSelect_Level_Number.Opacity = difSelectOpacity; + OpenTaiko.Tx.SongSelect_Level_Number_Icon?.tUpdateOpacity(difSelectOpacity); + OpenTaiko.Tx.SongSelect_Level_Number_Colored?.tUpdateOpacity(difSelectOpacity); + if (OpenTaiko.Tx.SongSelect_Level != null) OpenTaiko.Tx.SongSelect_Level.Opacity = difSelectOpacity; } else if (ctDifficultyIn.CurrentValue >= 1000) { int difInOpacity = (int)255.0f - (ctDifficultyIn.CurrentValue - 1000); - TJAPlayer3.Tx.SongSelect_Frame_Score[1].Opacity = difInOpacity; - TJAPlayer3.Tx.SongSelect_Level_Number.Opacity = difInOpacity; - TJAPlayer3.Tx.SongSelect_Level_Number_Icon?.tUpdateOpacity(difInOpacity); - TJAPlayer3.Tx.SongSelect_Level_Number_Colored?.tUpdateOpacity(difInOpacity); - if (TJAPlayer3.Tx.SongSelect_Level != null) TJAPlayer3.Tx.SongSelect_Level.Opacity = difInOpacity; + OpenTaiko.Tx.SongSelect_Frame_Score[1].Opacity = difInOpacity; + OpenTaiko.Tx.SongSelect_Level_Number.Opacity = difInOpacity; + OpenTaiko.Tx.SongSelect_Level_Number_Icon?.tUpdateOpacity(difInOpacity); + OpenTaiko.Tx.SongSelect_Level_Number_Colored?.tUpdateOpacity(difInOpacity); + if (OpenTaiko.Tx.SongSelect_Level != null) OpenTaiko.Tx.SongSelect_Level.Opacity = difInOpacity; } #endregion @@ -1731,42 +1731,42 @@ namespace TJAPlayer3 { #region [Displayables] int displayingDiff = diff == 5 ? 0 : 2; - int width = TJAPlayer3.Tx.SongSelect_Frame_Score[0].sz画像サイズ.Width / 5; - int height = TJAPlayer3.Tx.SongSelect_Frame_Score[0].sz画像サイズ.Height; + int width = OpenTaiko.Tx.SongSelect_Frame_Score[0].sz画像サイズ.Width / 5; + int height = OpenTaiko.Tx.SongSelect_Frame_Score[0].sz画像サイズ.Height; - TJAPlayer3.Tx.SongSelect_Frame_Score[1].t2D描画(TJAPlayer3.Skin.SongSelect_Frame_Score_X[displayingDiff], TJAPlayer3.Skin.SongSelect_Frame_Score_Y[displayingDiff], new Rectangle(width * displayingDiff, 0, width, height)); + OpenTaiko.Tx.SongSelect_Frame_Score[1].t2D描画(OpenTaiko.Skin.SongSelect_Frame_Score_X[displayingDiff], OpenTaiko.Skin.SongSelect_Frame_Score_Y[displayingDiff], new Rectangle(width * displayingDiff, 0, width, height)); - var _level_number = (diff == 5) ? TJAPlayer3.Skin.SongSelect_Level_Number_Tower : TJAPlayer3.Skin.SongSelect_Level_Number_Tower; + var _level_number = (diff == 5) ? OpenTaiko.Skin.SongSelect_Level_Number_Tower : OpenTaiko.Skin.SongSelect_Level_Number_Tower; if (avaliable) { - t小文字表示(TJAPlayer3.Skin.SongSelect_Level_Number_X[displayingDiff], TJAPlayer3.Skin.SongSelect_Level_Number_Y[displayingDiff], - TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[diff], + t小文字表示(OpenTaiko.Skin.SongSelect_Level_Number_X[displayingDiff], OpenTaiko.Skin.SongSelect_Level_Number_Y[displayingDiff], + OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[diff], diff, - TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nLevelIcon[diff] + OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nLevelIcon[diff] ); if (diff == 5) { - var _sidet = TJAPlayer3.Tx.SongSelect_Tower_Side; + var _sidet = OpenTaiko.Tx.SongSelect_Tower_Side; if (_sidet != null) { - var _side = (TJAPlayer3.stageSongSelect.rNowSelectedSong.nSide == CDTX.ESide.eNormal) ? 0 : 1; + var _side = (OpenTaiko.stageSongSelect.rNowSelectedSong.nSide == CDTX.ESide.eNormal) ? 0 : 1; var _sc = _sidet.sz画像サイズ.Width / 2; _sidet.t2D描画( - TJAPlayer3.Skin.SongSelect_Tower_Side[0], - TJAPlayer3.Skin.SongSelect_Tower_Side[1], + OpenTaiko.Skin.SongSelect_Tower_Side[0], + OpenTaiko.Skin.SongSelect_Tower_Side[1], new Rectangle(_side * _sc, 0, _sc, _sidet.sz画像サイズ.Height)); } } - if (TJAPlayer3.Tx.SongSelect_Level != null) { - int level_width = TJAPlayer3.Tx.SongSelect_Level.szTextureSize.Width / 7; - int level_height = TJAPlayer3.Tx.SongSelect_Level.szTextureSize.Height; + if (OpenTaiko.Tx.SongSelect_Level != null) { + int level_width = OpenTaiko.Tx.SongSelect_Level.szTextureSize.Width / 7; + int level_height = OpenTaiko.Tx.SongSelect_Level.szTextureSize.Height; - for (int i2 = 0; i2 < TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[diff]; i2++) { - TJAPlayer3.Tx.SongSelect_Level?.t2D描画( - TJAPlayer3.Skin.SongSelect_Level_X[displayingDiff] + (TJAPlayer3.Skin.SongSelect_Level_Move[0] * i2), - TJAPlayer3.Skin.SongSelect_Level_Y[displayingDiff] + (TJAPlayer3.Skin.SongSelect_Level_Move[1] * i2), + for (int i2 = 0; i2 < OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[diff]; i2++) { + OpenTaiko.Tx.SongSelect_Level?.t2D描画( + OpenTaiko.Skin.SongSelect_Level_X[displayingDiff] + (OpenTaiko.Skin.SongSelect_Level_Move[0] * i2), + OpenTaiko.Skin.SongSelect_Level_Y[displayingDiff] + (OpenTaiko.Skin.SongSelect_Level_Move[1] * i2), new RectangleF(level_width * diff, 0, level_width, level_height)); } @@ -1798,14 +1798,14 @@ namespace TJAPlayer3 { if (this.txBoxText[j].szTextureSize.Width >= 510) this.txBoxText[j].vcScaleRatio.X = 510f / this.txBoxText[j].szTextureSize.Width; - this.txBoxText[j].t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.SongSelect_BoxExplanation_X, TJAPlayer3.Skin.SongSelect_BoxExplanation_Y + j * TJAPlayer3.Skin.SongSelect_BoxExplanation_Interval); + this.txBoxText[j].t2D拡大率考慮中央基準描画(OpenTaiko.Skin.SongSelect_BoxExplanation_X, OpenTaiko.Skin.SongSelect_BoxExplanation_Y + j * OpenTaiko.Skin.SongSelect_BoxExplanation_Interval); } #endregion #region [Box chara] - var box_chara = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxChara, TJAPlayer3.Tx.SongSelect_Box_Chara); + var box_chara = HGenreBar.tGetGenreBar(rCurrentlySelectedSong.BoxChara, OpenTaiko.Tx.SongSelect_Box_Chara); // If BoxChara < 0, don't display any character { @@ -1813,17 +1813,17 @@ namespace TJAPlayer3 { box_chara.Opacity = (int)(ctBoxOpen.CurrentValue >= 1200 && ctBoxOpen.CurrentValue <= 1620 ? 255 - (ctBoxOpen.CurrentValue - 1200) * 2.55f : ctBoxOpen.CurrentValue >= 2000 ? (ctBoxOpen.CurrentValue - 2000) * 2.55f : ctBoxOpen.CurrentValue <= 1200 ? 255 : 0); else { - if (!TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) + if (!OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) box_chara.Opacity = (int)(BarAnimeCount * 255.0f); else if (ctDifficultyIn.CurrentValue >= 1000) box_chara.Opacity = (int)255.0f - (ctDifficultyIn.CurrentValue - 1000); } - box_chara?.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Box_Chara_X[0] - (BarAnimeCount * TJAPlayer3.Skin.SongSelect_Box_Chara_Move), TJAPlayer3.Skin.SongSelect_Box_Chara_Y[0], + box_chara?.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Box_Chara_X[0] - (BarAnimeCount * OpenTaiko.Skin.SongSelect_Box_Chara_Move), OpenTaiko.Skin.SongSelect_Box_Chara_Y[0], new Rectangle(0, 0, box_chara.szTextureSize.Width / 2, box_chara.szTextureSize.Height)); - box_chara?.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Box_Chara_X[1] + (BarAnimeCount * TJAPlayer3.Skin.SongSelect_Box_Chara_Move), TJAPlayer3.Skin.SongSelect_Box_Chara_Y[1], + box_chara?.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Box_Chara_X[1] + (BarAnimeCount * OpenTaiko.Skin.SongSelect_Box_Chara_Move), OpenTaiko.Skin.SongSelect_Box_Chara_Y[1], new Rectangle(box_chara.szTextureSize.Width / 2, 0, box_chara.szTextureSize.Width / 2, box_chara.szTextureSize.Height)); } @@ -1856,7 +1856,7 @@ namespace TJAPlayer3 { } if (bBoxClose) { this.tCloseBOX(); - TJAPlayer3.stageSongSelect.bBGM再生済み = false; + OpenTaiko.stageSongSelect.bBGM再生済み = false; /* if (TJAPlayer3.ConfigIni.bBGM音を発声する || !TJAPlayer3.Skin.bgm選曲画面イン.b再生中) TJAPlayer3.Skin.bgm選曲画面イン.t再生する(); @@ -1871,21 +1871,21 @@ namespace TJAPlayer3 { ctDifficultyIn.Stop(); } - for (int i = 0; i < TJAPlayer3.Skin.SongSelect_Bar_Count; i++) // パネルは全13枚。 + for (int i = 0; i < OpenTaiko.Skin.SongSelect_Bar_Count; i++) // パネルは全13枚。 { int index = i + nNowChange; - if (((index < 0 || index >= TJAPlayer3.Skin.SongSelect_Bar_Count) && this.ctScrollCounter.CurrentValue != this.ctScrollCounter.EndValue)) + if (((index < 0 || index >= OpenTaiko.Skin.SongSelect_Bar_Count) && this.ctScrollCounter.CurrentValue != this.ctScrollCounter.EndValue)) continue; - int nパネル番号 = (((this.n現在の選択行 - barCenterNum) + i) + TJAPlayer3.Skin.SongSelect_Bar_Count) % TJAPlayer3.Skin.SongSelect_Bar_Count; + int nパネル番号 = (((this.n現在の選択行 - barCenterNum) + i) + OpenTaiko.Skin.SongSelect_Bar_Count) % OpenTaiko.Skin.SongSelect_Bar_Count; int n見た目の行番号 = i; - int n次のパネル番号 = ((i + nNowChange) % TJAPlayer3.Skin.SongSelect_Bar_Count); + int n次のパネル番号 = ((i + nNowChange) % OpenTaiko.Skin.SongSelect_Bar_Count); //int x = this.ptバーの基本座標[ n見た目の行番号 ].X + ( (int) ( ( this.ptバーの基本座標[ n次のパネル番号 ].X - this.ptバーの基本座標[ n見た目の行番号 ].X ) * ( ( (double) Math.Abs( this.n現在のスクロールカウンタ ) ) / 100.0 ) ) ); int x = i選曲バーX座標; - int xAnime = TJAPlayer3.Skin.SongSelect_Bar_X[n見た目の行番号] + ((int)((TJAPlayer3.Skin.SongSelect_Bar_X[n次のパネル番号] - TJAPlayer3.Skin.SongSelect_Bar_X[n見た目の行番号]) * + int xAnime = OpenTaiko.Skin.SongSelect_Bar_X[n見た目の行番号] + ((int)((OpenTaiko.Skin.SongSelect_Bar_X[n次のパネル番号] - OpenTaiko.Skin.SongSelect_Bar_X[n見た目の行番号]) * fNowScrollAnime)); - int y = TJAPlayer3.Skin.SongSelect_Bar_Y[n見た目の行番号] + ((int)((TJAPlayer3.Skin.SongSelect_Bar_Y[n次のパネル番号] - TJAPlayer3.Skin.SongSelect_Bar_Y[n見た目の行番号]) * + int y = OpenTaiko.Skin.SongSelect_Bar_Y[n見た目の行番号] + ((int)((OpenTaiko.Skin.SongSelect_Bar_Y[n次のパネル番号] - OpenTaiko.Skin.SongSelect_Bar_Y[n見た目の行番号]) * fNowScrollAnime)); if ((i == barCenterNum) && ctScrollCounter.CurrentValue == ctScrollCounter.EndValue) { @@ -1909,19 +1909,19 @@ namespace TJAPlayer3 { if (this.ttk選択している曲のサブタイトル != null) - tx選択している曲のサブタイトル = TitleTextureKey.ResolveTitleTexture(ttk選択している曲のサブタイトル, TJAPlayer3.Skin.SongSelect_VerticalText); + tx選択している曲のサブタイトル = TitleTextureKey.ResolveTitleTexture(ttk選択している曲のサブタイトル, OpenTaiko.Skin.SongSelect_VerticalText); //サブタイトルがあったら700 if (ttk選択している曲の曲名 != null) { if (!ctBoxOpen.IsEnded) - TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, TJAPlayer3.Skin.SongSelect_VerticalText).Opacity = (int)(ctBoxOpen.CurrentValue >= 1200 && ctBoxOpen.CurrentValue <= 1620 ? 255 - (ctBoxOpen.CurrentValue - 1200) * 2.55f : + TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, OpenTaiko.Skin.SongSelect_VerticalText).Opacity = (int)(ctBoxOpen.CurrentValue >= 1200 && ctBoxOpen.CurrentValue <= 1620 ? 255 - (ctBoxOpen.CurrentValue - 1200) * 2.55f : ctBoxOpen.CurrentValue >= 2000 ? (ctBoxOpen.CurrentValue - 2000) * 2.55f : ctBoxOpen.CurrentValue <= 1200 ? 255 : 0); else { - if (!TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) - TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, TJAPlayer3.Skin.SongSelect_VerticalText).Opacity = 255; + if (!OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) + TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, OpenTaiko.Skin.SongSelect_VerticalText).Opacity = 255; else if (ctDifficultyIn.CurrentValue >= 1000) - TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, TJAPlayer3.Skin.SongSelect_VerticalText).Opacity = (int)255.0f - (ctDifficultyIn.CurrentValue - 1000); + TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, OpenTaiko.Skin.SongSelect_VerticalText).Opacity = (int)255.0f - (ctDifficultyIn.CurrentValue - 1000); } } @@ -1930,18 +1930,18 @@ namespace TJAPlayer3 { tx選択している曲のサブタイトル.Opacity = (int)(ctBoxOpen.CurrentValue >= 1200 && ctBoxOpen.CurrentValue <= 1620 ? 255 - (ctBoxOpen.CurrentValue - 1200) * 2.55f : ctBoxOpen.CurrentValue >= 2000 ? (ctBoxOpen.CurrentValue - 2000) * 2.55f : ctBoxOpen.CurrentValue <= 1200 ? 255 : 0); else { - if (!TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) + if (!OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) tx選択している曲のサブタイトル.Opacity = (int)(BarAnimeCount * 255.0f); else if (ctDifficultyIn.CurrentValue >= 1000) tx選択している曲のサブタイトル.Opacity = (int)255.0f - (ctDifficultyIn.CurrentValue - 1000); } tx選択している曲のサブタイトル.t2D拡大率考慮中央基準描画( - xAnime + TJAPlayer3.Skin.SongSelect_Bar_SubTitle_Offset[0] + (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.BOX ? centerMoveX : centerMoveX / 1.1f), - y + TJAPlayer3.Skin.SongSelect_Bar_SubTitle_Offset[1] - (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.BOX ? centerMove : centerMove / 1.1f)); + xAnime + OpenTaiko.Skin.SongSelect_Bar_SubTitle_Offset[0] + (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.BOX ? centerMoveX : centerMoveX / 1.1f), + y + OpenTaiko.Skin.SongSelect_Bar_SubTitle_Offset[1] - (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.BOX ? centerMove : centerMove / 1.1f)); if (this.ttk選択している曲の曲名 != null) { - TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, TJAPlayer3.Skin.SongSelect_VerticalText).t2D拡大率考慮中央基準描画( + TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, OpenTaiko.Skin.SongSelect_VerticalText).t2D拡大率考慮中央基準描画( xAnime + GetTitleOffsetX(rCurrentlySelectedSong.eノード種別) + (rCurrentlySelectedSong.eノード種別 != CSongListNode.ENodeType.BACKBOX ? (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.BOX ? centerMoveX : centerMoveX / 1.1f) : 0), @@ -1950,7 +1950,7 @@ namespace TJAPlayer3 { } } else { if (this.ttk選択している曲の曲名 != null) { - TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, TJAPlayer3.Skin.SongSelect_VerticalText).t2D拡大率考慮中央基準描画( + TitleTextureKey.ResolveTitleTexture(this.ttk選択している曲の曲名, OpenTaiko.Skin.SongSelect_VerticalText).t2D拡大率考慮中央基準描画( xAnime + GetTitleOffsetX(this.stバー情報[nパネル番号].eバー種別) + (rCurrentlySelectedSong.eノード種別 != CSongListNode.ENodeType.BACKBOX ? (rCurrentlySelectedSong.eノード種別 == CSongListNode.ENodeType.BOX ? centerMoveX : centerMoveX / 1.1f) : 0), @@ -1961,11 +1961,11 @@ namespace TJAPlayer3 { //----------------- #endregion - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(rCurrentlySelectedSong); - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(rCurrentlySelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(rCurrentlySelectedSong); + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(rCurrentlySelectedSong); if (HiddenIndex == DBSongUnlockables.EHiddenIndex.GRAYED) { - DrawBarCenter(TJAPlayer3.Tx.SongSelect_Bar_Genre_Locked_Top, TJAPlayer3.Skin.SongSelect_Bar_X[barCenterNum], TJAPlayer3.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, false, false); + DrawBarCenter(OpenTaiko.Tx.SongSelect_Bar_Genre_Locked_Top, OpenTaiko.Skin.SongSelect_Bar_X[barCenterNum], OpenTaiko.Skin.SongSelect_Bar_Y[barCenterNum], centerMoveX, centerMove, false, false, false); //TJAPlayer3.Tx.SongSelect_Bar_Genre_Locked_Top?.t2D描画(); } } @@ -1983,12 +1983,12 @@ namespace TJAPlayer3 { // 1 - Selected star rating // 2 - Current menu (0 : select difficulty, 1 : select star rating) if (emc == eMenuContext.SearchByDifficulty) { - TJAPlayer3.Tx.SongSelect_Search_Window?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Search_Window?.t2D描画(0, 0); int tileSize = 0; - if (TJAPlayer3.Tx.Dani_Difficulty_Cymbol != null) { - tileSize = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Search_Bar_X[0], TJAPlayer3.Skin.SongSelect_Search_Bar_Y[0], + if (OpenTaiko.Tx.Dani_Difficulty_Cymbol != null) { + tileSize = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Search_Bar_X[0], OpenTaiko.Skin.SongSelect_Search_Bar_Y[0], new Rectangle(tileSize * _contextVars[0], 0, (_contextVars[0] == (int)Difficulty.Oni ? 2 : 1) * tileSize, @@ -1997,14 +1997,14 @@ namespace TJAPlayer3 { if (_contextVars[2] == 0) { - TJAPlayer3.Tx.SongSelect_Search_Arrow_Glow?.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Search_Bar_X[0], TJAPlayer3.Skin.SongSelect_Search_Bar_Y[0]); + OpenTaiko.Tx.SongSelect_Search_Arrow_Glow?.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Search_Bar_X[0], OpenTaiko.Skin.SongSelect_Search_Bar_Y[0]); } else if (_contextVars[2] == 1) { - TJAPlayer3.Tx.SongSelect_Search_Arrow?.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Search_Bar_X[0], TJAPlayer3.Skin.SongSelect_Search_Bar_Y[0]); - TJAPlayer3.Tx.SongSelect_Search_Arrow_Glow?.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Search_Bar_X[1], TJAPlayer3.Skin.SongSelect_Search_Bar_Y[1]); + OpenTaiko.Tx.SongSelect_Search_Arrow?.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Search_Bar_X[0], OpenTaiko.Skin.SongSelect_Search_Bar_Y[0]); + OpenTaiko.Tx.SongSelect_Search_Arrow_Glow?.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Search_Bar_X[1], OpenTaiko.Skin.SongSelect_Search_Bar_Y[1]); - if (TJAPlayer3.Tx.SongSelect_Level_Icons != null) { - tileSize = TJAPlayer3.Tx.SongSelect_Level_Icons.szTextureSize.Height; - TJAPlayer3.Tx.SongSelect_Level_Icons.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Search_Bar_X[1], TJAPlayer3.Skin.SongSelect_Search_Bar_Y[1], + if (OpenTaiko.Tx.SongSelect_Level_Icons != null) { + tileSize = OpenTaiko.Tx.SongSelect_Level_Icons.szTextureSize.Height; + OpenTaiko.Tx.SongSelect_Level_Icons.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Search_Bar_X[1], OpenTaiko.Skin.SongSelect_Search_Bar_Y[1], new Rectangle(tileSize * _contextVars[1], 0, tileSize, @@ -2018,12 +2018,12 @@ namespace TJAPlayer3 { // 5 - Current menu (0~4 for each player) else if (emc == eMenuContext.Random) { // To change with a new texture - TJAPlayer3.Tx.SongSelect_Search_Window?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Search_Window?.t2D描画(0, 0); for (int i = 0; i <= _contextVars[5]; i++) { - if (TJAPlayer3.Tx.Dani_Difficulty_Cymbol != null) { - var tileSize = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Search_Bar_X[i], TJAPlayer3.Skin.SongSelect_Search_Bar_Y[i], + if (OpenTaiko.Tx.Dani_Difficulty_Cymbol != null) { + var tileSize = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Search_Bar_X[i], OpenTaiko.Skin.SongSelect_Search_Bar_Y[i], new Rectangle(tileSize * _contextVars[i], 0, (_contextVars[i] == (int)Difficulty.Oni ? 2 : 1) * tileSize, @@ -2032,9 +2032,9 @@ namespace TJAPlayer3 { } if (i < _contextVars[5]) - TJAPlayer3.Tx.SongSelect_Search_Arrow?.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Search_Bar_X[i], TJAPlayer3.Skin.SongSelect_Search_Bar_Y[i]); + OpenTaiko.Tx.SongSelect_Search_Arrow?.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Search_Bar_X[i], OpenTaiko.Skin.SongSelect_Search_Bar_Y[i]); else if (i == _contextVars[5]) - TJAPlayer3.Tx.SongSelect_Search_Arrow_Glow?.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Search_Bar_X[i], TJAPlayer3.Skin.SongSelect_Search_Bar_Y[i]); + OpenTaiko.Tx.SongSelect_Search_Arrow_Glow?.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Search_Bar_X[i], OpenTaiko.Skin.SongSelect_Search_Bar_Y[i]); } } } @@ -2046,10 +2046,10 @@ namespace TJAPlayer3 { #region [Decide] - if ((TJAPlayer3.Pad.bPressedDGB(EPad.Decide)) || - ((TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)))) { + if ((OpenTaiko.Pad.bPressedDGB(EPad.Decide)) || + ((OpenTaiko.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)))) { if (emc == eMenuContext.SearchByDifficulty) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); _contextVars[2]++; if (_contextVars[2] >= 2) { @@ -2074,16 +2074,16 @@ namespace TJAPlayer3 { } } else if (emc == eMenuContext.Random) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); _contextVars[5]++; - if (_contextVars[5] >= TJAPlayer3.ConfigIni.nPlayerCount) + if (_contextVars[5] >= OpenTaiko.ConfigIni.nPlayerCount) return true; - if (_contextVars[5] >= 1 && TJAPlayer3.ConfigIni.bAIBattleMode) { + if (_contextVars[5] >= 1 && OpenTaiko.ConfigIni.bAIBattleMode) { _contextVars[1] = _contextVars[0]; return true; } - _contextVars[_contextVars[5]] = Math.Min((int)Difficulty.Oni, TJAPlayer3.ConfigIni.nDefaultCourse); + _contextVars[_contextVars[5]] = Math.Min((int)Difficulty.Oni, OpenTaiko.ConfigIni.nDefaultCourse); } } @@ -2092,17 +2092,17 @@ namespace TJAPlayer3 { #region [Left] - else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) - || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { + else if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) + || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { if (emc == eMenuContext.SearchByDifficulty) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); _contextVars[_contextVars[2]]--; // Clamp values _contextVars[0] = Math.Max(0, Math.Min((int)Difficulty.Oni, _contextVars[0])); _contextVars[1] = Math.Max(1, Math.Min(13, _contextVars[1])); } else if (emc == eMenuContext.Random) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); _contextVars[_contextVars[5]]--; // Clamp values @@ -2114,17 +2114,17 @@ namespace TJAPlayer3 { #region [Right] - else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) - || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { + else if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) + || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { if (emc == eMenuContext.SearchByDifficulty) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); _contextVars[_contextVars[2]]++; // Clamp values _contextVars[0] = Math.Max(0, Math.Min((int)Difficulty.Oni, _contextVars[0])); _contextVars[1] = Math.Max(1, Math.Min(13, _contextVars[1])); } else if (emc == eMenuContext.Random) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); _contextVars[_contextVars[5]]++; // Clamp values @@ -2294,7 +2294,7 @@ namespace TJAPlayer3 { new Point(358, 485), new Point(386, 574), new Point(411, 665), new Point(436, 756) }; */ - private STバー情報[] stバー情報 = new STバー情報[TJAPlayer3.Skin.SongSelect_Bar_Count]; + private STバー情報[] stバー情報 = new STバー情報[OpenTaiko.Skin.SongSelect_Bar_Count]; private CTexture txSongNotFound, txEnumeratingSongs; private TitleTextureKey ttk選択している曲の曲名; @@ -2312,65 +2312,65 @@ namespace TJAPlayer3 { private int GetTitleOffsetX(Eバー種別 bar) { switch (bar) { case Eバー種別.Score: - return TJAPlayer3.Skin.SongSelect_Bar_Title_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_Title_Offset[0]; case Eバー種別.Box: - return TJAPlayer3.Skin.SongSelect_Bar_Box_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_Box_Offset[0]; case Eバー種別.BackBox: - return TJAPlayer3.Skin.SongSelect_Bar_BackBox_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_BackBox_Offset[0]; case Eバー種別.Random: - return TJAPlayer3.Skin.SongSelect_Bar_Random_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_Random_Offset[0]; default: - return TJAPlayer3.Skin.SongSelect_Bar_Title_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_Title_Offset[0]; } } private int GetTitleOffsetX(CSongListNode.ENodeType node) { switch (node) { case CSongListNode.ENodeType.SCORE: - return TJAPlayer3.Skin.SongSelect_Bar_Title_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_Title_Offset[0]; case CSongListNode.ENodeType.BOX: - return TJAPlayer3.Skin.SongSelect_Bar_Box_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_Box_Offset[0]; case CSongListNode.ENodeType.BACKBOX: - return TJAPlayer3.Skin.SongSelect_Bar_BackBox_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_BackBox_Offset[0]; case CSongListNode.ENodeType.RANDOM: - return TJAPlayer3.Skin.SongSelect_Bar_Random_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_Random_Offset[0]; default: - return TJAPlayer3.Skin.SongSelect_Bar_Title_Offset[0]; + return OpenTaiko.Skin.SongSelect_Bar_Title_Offset[0]; } } private int GetTitleOffsetY(Eバー種別 bar) { switch (bar) { case Eバー種別.Score: - return TJAPlayer3.Skin.SongSelect_Bar_Title_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_Title_Offset[1]; case Eバー種別.Box: - return TJAPlayer3.Skin.SongSelect_Bar_Box_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_Box_Offset[1]; case Eバー種別.BackBox: - return TJAPlayer3.Skin.SongSelect_Bar_BackBox_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_BackBox_Offset[1]; case Eバー種別.Random: - return TJAPlayer3.Skin.SongSelect_Bar_Random_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_Random_Offset[1]; default: - return TJAPlayer3.Skin.SongSelect_Bar_Title_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_Title_Offset[1]; } } private int GetTitleOffsetY(CSongListNode.ENodeType node) { switch (node) { case CSongListNode.ENodeType.SCORE: - return TJAPlayer3.Skin.SongSelect_Bar_Title_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_Title_Offset[1]; case CSongListNode.ENodeType.BOX: - return TJAPlayer3.Skin.SongSelect_Bar_Box_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_Box_Offset[1]; case CSongListNode.ENodeType.BACKBOX: - return TJAPlayer3.Skin.SongSelect_Bar_BackBox_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_BackBox_Offset[1]; case CSongListNode.ENodeType.RANDOM: - return TJAPlayer3.Skin.SongSelect_Bar_Random_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_Random_Offset[1]; default: - return TJAPlayer3.Skin.SongSelect_Bar_Title_Offset[1]; + return OpenTaiko.Skin.SongSelect_Bar_Title_Offset[1]; } } private void DrawBarCenter(CTexture texture, int x, int y, int moveX, int move, bool changeColor, bool drawOverlay, bool fullScaleOverlay) { - CTexture overlay = TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlay; + CTexture overlay = OpenTaiko.Tx.SongSelect_Bar_Genre_Overlay; float openAnime = 1; @@ -2379,7 +2379,7 @@ namespace TJAPlayer3 { } float overlay_xoffset = ((overlay.szTextureSize.Width / 3) * (1.0f - openAnime)); - float moveX_xoffset = (TJAPlayer3.Skin.SongSelect_Bar_Center_Move_X * (1.0f - openAnime)); + float moveX_xoffset = (OpenTaiko.Skin.SongSelect_Bar_Center_Move_X * (1.0f - openAnime)); int width = overlay.sz画像サイズ.Width / 3; int height = overlay.sz画像サイズ.Height / 3; @@ -2521,7 +2521,7 @@ namespace TJAPlayer3 { return Eバー種別.Other; } private void tChangeSong(int change) { - List list = (TJAPlayer3.ConfigIni.TJAP3FolderMode && rCurrentlySelectedSong.rParentNode != null) ? rCurrentlySelectedSong.rParentNode.list子リスト : flattenList(TJAPlayer3.Songs管理.list曲ルート, true); + List list = (OpenTaiko.ConfigIni.TJAP3FolderMode && rCurrentlySelectedSong.rParentNode != null) ? rCurrentlySelectedSong.rParentNode.list子リスト : flattenList(OpenTaiko.Songs管理.list曲ルート, true); int index = nSelectSongIndex + change; @@ -2534,9 +2534,9 @@ namespace TJAPlayer3 { nSelectSongIndex = index; rCurrentlySelectedSong = list[index]; - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(rCurrentlySelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(rCurrentlySelectedSong); if (IsSongLocked) { - var SongUnlockable = TJAPlayer3.Databases.DBSongUnlockables.tGetUnlockableByUniqueId(rCurrentlySelectedSong); + var SongUnlockable = OpenTaiko.Databases.DBSongUnlockables.tGetUnlockableByUniqueId(rCurrentlySelectedSong); if (SongUnlockable != null) { string _cond = "???"; if (HRarity.tRarityToModalInt(SongUnlockable.rarity) @@ -2549,7 +2549,7 @@ namespace TJAPlayer3 { public CSongListNode rGetSideSong(int change) { if (rCurrentlySelectedSong == null) return null; - List list = (TJAPlayer3.ConfigIni.TJAP3FolderMode && rCurrentlySelectedSong.rParentNode != null) ? rCurrentlySelectedSong.rParentNode.list子リスト : flattenList(TJAPlayer3.Songs管理.list曲ルート, true); + List list = (OpenTaiko.ConfigIni.TJAP3FolderMode && rCurrentlySelectedSong.rParentNode != null) ? rCurrentlySelectedSong.rParentNode.list子リスト : flattenList(OpenTaiko.Songs管理.list曲ルート, true); if (list.Count <= 0) return null; @@ -2568,10 +2568,10 @@ namespace TJAPlayer3 { } public void tバーの初期化() { - stバー情報 = new STバー情報[TJAPlayer3.Skin.SongSelect_Bar_Count]; + stバー情報 = new STバー情報[OpenTaiko.Skin.SongSelect_Bar_Count]; - int barCenterNum = (TJAPlayer3.Skin.SongSelect_Bar_Count - 1) / 2; - for (int i = 0; i < TJAPlayer3.Skin.SongSelect_Bar_Count; i++) { + int barCenterNum = (OpenTaiko.Skin.SongSelect_Bar_Count - 1) / 2; + for (int i = 0; i < OpenTaiko.Skin.SongSelect_Bar_Count; i++) { CSongListNode song = this.rGetSideSong(i - barCenterNum); if (song == null) continue; this.stバー情報[i].strタイトル文字列 = song.ldTitle.GetString(""); @@ -2614,10 +2614,10 @@ namespace TJAPlayer3 { this.stバー情報[i].nスコアランク[d] = new int[5]; if (this.stバー情報[i].eバー種別 == Eバー種別.Score) { - int ap = TJAPlayer3.GetActualPlayer(d); + int ap = OpenTaiko.GetActualPlayer(d); //var sr = song.arスコア[n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song)]; - var TableEntry = TJAPlayer3.SaveFileInstances[ap].data.tGetSongSelectTableEntry(song.tGetUniqueId()); + var TableEntry = OpenTaiko.SaveFileInstances[ap].data.tGetSongSelectTableEntry(song.tGetUniqueId()); this.stバー情報[i].nクリア[d] = TableEntry.ClearStatuses; this.stバー情報[i].nスコアランク[d] = TableEntry.ScoreRanks; @@ -2637,7 +2637,7 @@ namespace TJAPlayer3 { this.stバー情報[i].ttkタイトル = this.ttkGenerateSongNameTexture(this.stバー情報[i].strタイトル文字列, this.stバー情報[i].ForeColor, this.stバー情報[i].BackColor, stバー情報[i].eバー種別 == Eバー種別.Box ? this.pfBoxName : this.pfMusicName); } - int _center = (TJAPlayer3.Skin.SongSelect_Bar_Count - 1) / 2; + int _center = (OpenTaiko.Skin.SongSelect_Bar_Count - 1) / 2; this.n現在の選択行 = _center; } @@ -2657,149 +2657,149 @@ namespace TJAPlayer3 { if (x >= SampleFramework.GameWindowSize.Width || y >= SampleFramework.GameWindowSize.Height) return; - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(reference); - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(reference); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(reference); + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(reference); var rc = new Rectangle(0, 48, 128, 48); int opct = 255; - if (TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect && ctDifficultyIn.CurrentValue >= 1000) + if (OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect && ctDifficultyIn.CurrentValue >= 1000) opct = Math.Max((int)255.0f - (ctDifficultyIn.CurrentValue - 1000), 0); - TJAPlayer3.Tx.SongSelect_Crown.Opacity = opct; - TJAPlayer3.Tx.SongSelect_ScoreRank.Opacity = opct; + OpenTaiko.Tx.SongSelect_Crown.Opacity = opct; + OpenTaiko.Tx.SongSelect_ScoreRank.Opacity = opct; - foreach (var tex in TJAPlayer3.Tx.SongSelect_Bar_Genre) { + foreach (var tex in OpenTaiko.Tx.SongSelect_Bar_Genre) { tex.Value.Opacity = opct; } - foreach (var tex in TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlap) { + foreach (var tex in OpenTaiko.Tx.SongSelect_Bar_Genre_Overlap) { tex.Value.Opacity = opct; } - TJAPlayer3.Tx.SongSelect_Bar_Genre_Back?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Bar_Genre_Random?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlay?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Favorite?.tUpdateOpacity(opct); - TJAPlayer3.Tx.TowerResult_ScoreRankEffect?.tUpdateOpacity(opct); - TJAPlayer3.Tx.DanResult_Rank?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Level_Number_Big?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Level_Number_Big_Colored?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Level_Number_Big_Icon?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Lock?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Bar_Genre_Locked?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Bar_Genre_Locked_Top?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Bar_Genre_Back?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Bar_Genre_Random?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Bar_Genre_Overlay?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Favorite?.tUpdateOpacity(opct); + OpenTaiko.Tx.TowerResult_ScoreRankEffect?.tUpdateOpacity(opct); + OpenTaiko.Tx.DanResult_Rank?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Level_Number_Big?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Level_Number_Big_Colored?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Level_Number_Big_Icon?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Lock?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Bar_Genre_Locked?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Bar_Genre_Locked_Top?.tUpdateOpacity(opct); - for (int i = 0; i < TJAPlayer3.Tx.SongSelect_Song_Panel.Length; i++) { - TJAPlayer3.Tx.SongSelect_Song_Panel[i]?.tUpdateOpacity(opct); + for (int i = 0; i < OpenTaiko.Tx.SongSelect_Song_Panel.Length; i++) { + OpenTaiko.Tx.SongSelect_Song_Panel[i]?.tUpdateOpacity(opct); } - TJAPlayer3.Tx.SongSelect_Bpm_Number?.tUpdateOpacity(opct); - if (ttkSelectedSongMaker != null && TJAPlayer3.Skin.SongSelect_Maker_Show) { + OpenTaiko.Tx.SongSelect_Bpm_Number?.tUpdateOpacity(opct); + if (ttkSelectedSongMaker != null && OpenTaiko.Skin.SongSelect_Maker_Show) { TitleTextureKey.ResolveTitleTexture(ttkSelectedSongMaker)?.tUpdateOpacity(opct); } - if (ttkSelectedSongBPM != null && TJAPlayer3.Skin.SongSelect_BPM_Text_Show) { + if (ttkSelectedSongBPM != null && OpenTaiko.Skin.SongSelect_BPM_Text_Show) { TitleTextureKey.ResolveTitleTexture(ttkSelectedSongBPM)?.tUpdateOpacity(opct); } - TJAPlayer3.Tx.SongSelect_Explicit?.tUpdateOpacity(opct); - TJAPlayer3.Tx.SongSelect_Movie?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Explicit?.tUpdateOpacity(opct); + OpenTaiko.Tx.SongSelect_Movie?.tUpdateOpacity(opct); if (eバー種別 == Eバー種別.Random) { - TJAPlayer3.Tx.SongSelect_Bar_Genre_Random?.t2D描画(x, y); + OpenTaiko.Tx.SongSelect_Bar_Genre_Random?.t2D描画(x, y); } else if (eバー種別 != Eバー種別.BackBox) { if (HiddenIndex == DBSongUnlockables.EHiddenIndex.GRAYED) { - TJAPlayer3.Tx.SongSelect_Bar_Genre_Locked?.t2D描画(x, y); + OpenTaiko.Tx.SongSelect_Bar_Genre_Locked?.t2D描画(x, y); return; } else { - HGenreBar.tGetGenreBar(boxType, TJAPlayer3.Tx.SongSelect_Bar_Genre)?.t2D描画(x, y); - HGenreBar.tGetGenreBar(boxType, TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlap)?.t2D描画(x, y); - TJAPlayer3.Tx.SongSelect_Bar_Genre_Overlay?.t2D描画(x, y); + HGenreBar.tGetGenreBar(boxType, OpenTaiko.Tx.SongSelect_Bar_Genre)?.t2D描画(x, y); + HGenreBar.tGetGenreBar(boxType, OpenTaiko.Tx.SongSelect_Bar_Genre_Overlap)?.t2D描画(x, y); + OpenTaiko.Tx.SongSelect_Bar_Genre_Overlay?.t2D描画(x, y); } } else { - TJAPlayer3.Tx.SongSelect_Bar_Genre_Back?.t2D描画(x, y); + OpenTaiko.Tx.SongSelect_Bar_Genre_Back?.t2D描画(x, y); } if (eバー種別 == Eバー種別.Score) { if (_songType == 1) { // displayDanStatus(x + 30, y + 30, Math.Min(クリア[0][0], 6) - 1, 0.2f); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (i >= 2) continue; - displayDanStatus(x + TJAPlayer3.Skin.SongSelect_DanStatus_Offset_X[i], y + TJAPlayer3.Skin.SongSelect_DanStatus_Offset_Y[i], Math.Min(クリア[i][0], 6) - 1, 0.2f); + displayDanStatus(x + OpenTaiko.Skin.SongSelect_DanStatus_Offset_X[i], y + OpenTaiko.Skin.SongSelect_DanStatus_Offset_Y[i], Math.Min(クリア[i][0], 6) - 1, 0.2f); } } else if (_songType == 2) { // displayTowerStatus(x + 30, y + 30, Math.Min(クリア[0][0], 6) - 1, 0.2f); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (i >= 2) continue; - displayTowerStatus(x + TJAPlayer3.Skin.SongSelect_TowerStatus_Offset_X[i], y + TJAPlayer3.Skin.SongSelect_TowerStatus_Offset_Y[i], Math.Min(クリア[i][0], 7) - 1, 0.3f); + displayTowerStatus(x + OpenTaiko.Skin.SongSelect_TowerStatus_Offset_X[i], y + OpenTaiko.Skin.SongSelect_TowerStatus_Offset_Y[i], Math.Min(クリア[i][0], 7) - 1, 0.3f); } } else { // var sr = this.r現在選択中の曲.arスコア[n現在のアンカ難易度レベルに最も近い難易度レベルを返す(this.r現在選択中の曲)]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (i >= 2) continue; - displayRegularCrowns(x + TJAPlayer3.Skin.SongSelect_RegularCrowns_Offset_X[i], y + TJAPlayer3.Skin.SongSelect_RegularCrowns_Offset_Y[i], クリア[i], スコアランク[i], 0.8f); + displayRegularCrowns(x + OpenTaiko.Skin.SongSelect_RegularCrowns_Offset_X[i], y + OpenTaiko.Skin.SongSelect_RegularCrowns_Offset_Y[i], クリア[i], スコアランク[i], 0.8f); } } if (IsSongLocked) { - displayVisibleLockStatus(x + TJAPlayer3.Skin.SongSelect_FavoriteStatus_Offset[0], y + TJAPlayer3.Skin.SongSelect_FavoriteStatus_Offset[1], 1f); + displayVisibleLockStatus(x + OpenTaiko.Skin.SongSelect_FavoriteStatus_Offset[0], y + OpenTaiko.Skin.SongSelect_FavoriteStatus_Offset[1], 1f); } else { - displayFavoriteStatus(x + TJAPlayer3.Skin.SongSelect_FavoriteStatus_Offset[0], y + TJAPlayer3.Skin.SongSelect_FavoriteStatus_Offset[1], csu, 1f); + displayFavoriteStatus(x + OpenTaiko.Skin.SongSelect_FavoriteStatus_Offset[0], y + OpenTaiko.Skin.SongSelect_FavoriteStatus_Offset[1], csu, 1f); } tPrintLevelNumberBig( - x + TJAPlayer3.Skin.SongSelect_Level_Offset[0], - y + TJAPlayer3.Skin.SongSelect_Level_Offset[1], + x + OpenTaiko.Skin.SongSelect_Level_Offset[0], + y + OpenTaiko.Skin.SongSelect_Level_Offset[1], reference ); } } public void displayTowerStatus(int x, int y, int grade, float _resize) { - if (grade >= 0 && TJAPlayer3.Tx.TowerResult_ScoreRankEffect != null) { - int scoreRankEffect_width = TJAPlayer3.Tx.TowerResult_ScoreRankEffect.szTextureSize.Width / 7; - int scoreRankEffect_height = TJAPlayer3.Tx.TowerResult_ScoreRankEffect.szTextureSize.Height; + if (grade >= 0 && OpenTaiko.Tx.TowerResult_ScoreRankEffect != null) { + int scoreRankEffect_width = OpenTaiko.Tx.TowerResult_ScoreRankEffect.szTextureSize.Width / 7; + int scoreRankEffect_height = OpenTaiko.Tx.TowerResult_ScoreRankEffect.szTextureSize.Height; //TJAPlayer3.Tx.TowerResult_ScoreRankEffect.Opacity = 255; - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.X = _resize; - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.Y = _resize; - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.t2D拡大率考慮中央基準描画(x, y, new Rectangle(grade * scoreRankEffect_width, 0, scoreRankEffect_width, scoreRankEffect_height)); - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.X = _resize; + OpenTaiko.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.Y = _resize; + OpenTaiko.Tx.TowerResult_ScoreRankEffect.t2D拡大率考慮中央基準描画(x, y, new Rectangle(grade * scoreRankEffect_width, 0, scoreRankEffect_width, scoreRankEffect_height)); + OpenTaiko.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.X = 1f; + OpenTaiko.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.Y = 1f; } } public void displayDanStatus(int x, int y, int grade, float _resize) { - if (grade >= 0 && TJAPlayer3.Tx.DanResult_Rank != null) { - int danResult_rank_width = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Width / 7; - int danResult_rank_height = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Height; + if (grade >= 0 && OpenTaiko.Tx.DanResult_Rank != null) { + int danResult_rank_width = OpenTaiko.Tx.DanResult_Rank.szTextureSize.Width / 7; + int danResult_rank_height = OpenTaiko.Tx.DanResult_Rank.szTextureSize.Height; //TJAPlayer3.Tx.DanResult_Rank.Opacity = 255; - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = _resize; - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = _resize; - TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(x, y, new Rectangle(danResult_rank_width * (grade + 1), 0, danResult_rank_width, danResult_rank_height)); - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.X = _resize; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.Y = _resize; + OpenTaiko.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(x, y, new Rectangle(danResult_rank_width * (grade + 1), 0, danResult_rank_width, danResult_rank_height)); + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.X = 1f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.Y = 1f; } } public void displayRegularCrowns(int x, int y, int[] クリア, int[] スコアランク, float _resize) { // Don't display if one of the 2 textures is missing (to avoid crashes) - if (TJAPlayer3.Tx.SongSelect_Crown == null || TJAPlayer3.Tx.SongSelect_ScoreRank == null) + if (OpenTaiko.Tx.SongSelect_Crown == null || OpenTaiko.Tx.SongSelect_ScoreRank == null) return; // To change to include all crowns/score ranks later - TJAPlayer3.Tx.SongSelect_Crown.vcScaleRatio.X = _resize; - TJAPlayer3.Tx.SongSelect_Crown.vcScaleRatio.Y = _resize; - TJAPlayer3.Tx.SongSelect_ScoreRank.vcScaleRatio.X = _resize; - TJAPlayer3.Tx.SongSelect_ScoreRank.vcScaleRatio.Y = _resize; + OpenTaiko.Tx.SongSelect_Crown.vcScaleRatio.X = _resize; + OpenTaiko.Tx.SongSelect_Crown.vcScaleRatio.Y = _resize; + OpenTaiko.Tx.SongSelect_ScoreRank.vcScaleRatio.X = _resize; + OpenTaiko.Tx.SongSelect_ScoreRank.vcScaleRatio.Y = _resize; int bestCrown = -1; int bestScoreRank = -1; @@ -2812,44 +2812,44 @@ namespace TJAPlayer3 { } if (bestCrown >= 0) { - float width = TJAPlayer3.Tx.SongSelect_Crown.szTextureSize.Width / 4.0f; - int height = TJAPlayer3.Tx.SongSelect_Crown.szTextureSize.Height; - TJAPlayer3.Tx.SongSelect_Crown?.t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.SongSelect_RegularCrowns_ScoreRank_Offset_X[0], y + TJAPlayer3.Skin.SongSelect_RegularCrowns_ScoreRank_Offset_Y[0], + float width = OpenTaiko.Tx.SongSelect_Crown.szTextureSize.Width / 4.0f; + int height = OpenTaiko.Tx.SongSelect_Crown.szTextureSize.Height; + OpenTaiko.Tx.SongSelect_Crown?.t2D拡大率考慮中央基準描画(x + OpenTaiko.Skin.SongSelect_RegularCrowns_ScoreRank_Offset_X[0], y + OpenTaiko.Skin.SongSelect_RegularCrowns_ScoreRank_Offset_Y[0], new RectangleF((クリア[bestCrown] - 1) * width, 0, width, height)); } if (bestScoreRank >= 0) { - int width = TJAPlayer3.Tx.SongSelect_ScoreRank.szTextureSize.Width; - float height = TJAPlayer3.Tx.SongSelect_ScoreRank.szTextureSize.Height / 7.0f; - TJAPlayer3.Tx.SongSelect_ScoreRank?.t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.SongSelect_RegularCrowns_ScoreRank_Offset_X[1], y + TJAPlayer3.Skin.SongSelect_RegularCrowns_ScoreRank_Offset_Y[1], + int width = OpenTaiko.Tx.SongSelect_ScoreRank.szTextureSize.Width; + float height = OpenTaiko.Tx.SongSelect_ScoreRank.szTextureSize.Height / 7.0f; + OpenTaiko.Tx.SongSelect_ScoreRank?.t2D拡大率考慮中央基準描画(x + OpenTaiko.Skin.SongSelect_RegularCrowns_ScoreRank_Offset_X[1], y + OpenTaiko.Skin.SongSelect_RegularCrowns_ScoreRank_Offset_Y[1], new RectangleF(0, (スコアランク[bestScoreRank] - 1) * height, width, height)); } - if (TJAPlayer3.Tx.Dani_Difficulty_Cymbol != null) { - int dani_difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5; - int dani_difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; + if (OpenTaiko.Tx.Dani_Difficulty_Cymbol != null) { + int dani_difficulty_cymbol_width = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5; + int dani_difficulty_cymbol_height = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = TJAPlayer3.Tx.SongSelect_Favorite.Opacity; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = 0.5f; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = 0.5f; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.Opacity = OpenTaiko.Tx.SongSelect_Favorite.Opacity; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = 0.5f; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = 0.5f; if (bestCrown >= 0) { - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画( - x + TJAPlayer3.Skin.SongSelect_RegularCrowns_Difficulty_Cymbol_Offset_X[0], - y + TJAPlayer3.Skin.SongSelect_RegularCrowns_Difficulty_Cymbol_Offset_Y[0], + OpenTaiko.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画( + x + OpenTaiko.Skin.SongSelect_RegularCrowns_Difficulty_Cymbol_Offset_X[0], + y + OpenTaiko.Skin.SongSelect_RegularCrowns_Difficulty_Cymbol_Offset_Y[0], new Rectangle(bestCrown * dani_difficulty_cymbol_width, 0, dani_difficulty_cymbol_width, dani_difficulty_cymbol_height)); } if (bestScoreRank >= 0) { - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画( - x + TJAPlayer3.Skin.SongSelect_RegularCrowns_Difficulty_Cymbol_Offset_X[1], - y + TJAPlayer3.Skin.SongSelect_RegularCrowns_Difficulty_Cymbol_Offset_Y[1], + OpenTaiko.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画( + x + OpenTaiko.Skin.SongSelect_RegularCrowns_Difficulty_Cymbol_Offset_X[1], + y + OpenTaiko.Skin.SongSelect_RegularCrowns_Difficulty_Cymbol_Offset_Y[1], new Rectangle(bestScoreRank * dani_difficulty_cymbol_width, 0, dani_difficulty_cymbol_width, dani_difficulty_cymbol_height)); } - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = 255; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.Opacity = 255; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.X = 1f; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.vcScaleRatio.Y = 1f; } @@ -2857,37 +2857,37 @@ namespace TJAPlayer3 { public void displayFavoriteStatus(int x, int y, CSongUniqueID csu, float _resize) { if (csu != null - && TJAPlayer3.Tx.SongSelect_Favorite != null - && TJAPlayer3.Favorites.tIsFavorite(csu.data.id)) { - TJAPlayer3.Tx.SongSelect_Favorite.vcScaleRatio.X = _resize; - TJAPlayer3.Tx.SongSelect_Favorite.vcScaleRatio.Y = _resize; - TJAPlayer3.Tx.SongSelect_Favorite.t2D拡大率考慮中央基準描画(x, y); + && OpenTaiko.Tx.SongSelect_Favorite != null + && OpenTaiko.Favorites.tIsFavorite(csu.data.id)) { + OpenTaiko.Tx.SongSelect_Favorite.vcScaleRatio.X = _resize; + OpenTaiko.Tx.SongSelect_Favorite.vcScaleRatio.Y = _resize; + OpenTaiko.Tx.SongSelect_Favorite.t2D拡大率考慮中央基準描画(x, y); } } public void displayVisibleLockStatus(int x, int y, float _resize) { - if (TJAPlayer3.Tx.SongSelect_Lock != null) { - TJAPlayer3.Tx.SongSelect_Lock.vcScaleRatio.X = _resize; - TJAPlayer3.Tx.SongSelect_Lock.vcScaleRatio.Y = _resize; - TJAPlayer3.Tx.SongSelect_Lock.t2D拡大率考慮中央基準描画(x, y); + if (OpenTaiko.Tx.SongSelect_Lock != null) { + OpenTaiko.Tx.SongSelect_Lock.vcScaleRatio.X = _resize; + OpenTaiko.Tx.SongSelect_Lock.vcScaleRatio.Y = _resize; + OpenTaiko.Tx.SongSelect_Lock.t2D拡大率考慮中央基準描画(x, y); } } private TitleTextureKey ttkGenerateSongNameTexture(string str文字, Color forecolor, Color backcolor, CCachedFontRenderer pf) { - return new TitleTextureKey(str文字, pf, forecolor, backcolor, TJAPlayer3.Skin.SongSelect_Title_MaxSize); + return new TitleTextureKey(str文字, pf, forecolor, backcolor, OpenTaiko.Skin.SongSelect_Title_MaxSize); } private TitleTextureKey ttkGenerateSubtitleTexture(string str文字, Color forecolor, Color backcolor) { - return new TitleTextureKey(str文字, pfSubtitle, forecolor, backcolor, TJAPlayer3.Skin.SongSelect_SubTitle_MaxSize); + return new TitleTextureKey(str文字, pfSubtitle, forecolor, backcolor, OpenTaiko.Skin.SongSelect_SubTitle_MaxSize); } private TitleTextureKey ttkGenerateMakerTexture(string str文字, Color forecolor, Color backcolor) { - return new TitleTextureKey(CLangManager.LangInstance.GetString("SONGSELECT_INFO_CHARTER", str文字), pfMaker, forecolor, backcolor, TJAPlayer3.Skin.SongSelect_Maker_MaxSize); + return new TitleTextureKey(CLangManager.LangInstance.GetString("SONGSELECT_INFO_CHARTER", str文字), pfMaker, forecolor, backcolor, OpenTaiko.Skin.SongSelect_Maker_MaxSize); } private TitleTextureKey ttkGenerateBPMTexture(CSongListNode node, Color forecolor, Color backcolor) { var _score = node.arスコア[tFetchDifficulty(node)].譜面情報; - var _speed = TJAPlayer3.ConfigIni.SongPlaybackSpeed; + var _speed = OpenTaiko.ConfigIni.SongPlaybackSpeed; double[] bpms = new double[3] { _score.BaseBpm * _speed, @@ -2905,7 +2905,7 @@ namespace TJAPlayer3 { else if (_speed < 1) _color = Color.LightBlue; - return new TitleTextureKey(bpm_str, pfBPM, _color, backcolor, TJAPlayer3.Skin.SongSelect_BPM_Text_MaxSize); + return new TitleTextureKey(bpm_str, pfBPM, _color, backcolor, OpenTaiko.Skin.SongSelect_BPM_Text_MaxSize); } @@ -2929,7 +2929,7 @@ namespace TJAPlayer3 { } public void tDisplayLevelIcon(int x, int y, CDTX.ELevelIcon icon, CTexture iconTex = null) { - var _tex = (iconTex != null) ? iconTex : TJAPlayer3.Tx.SongSelect_Level_Number_Big_Icon; + var _tex = (iconTex != null) ? iconTex : OpenTaiko.Tx.SongSelect_Level_Number_Big_Icon; if (icon != CDTX.ELevelIcon.eNone && _tex != null) { var __width = _tex.sz画像サイズ.Width / 3; @@ -2948,27 +2948,27 @@ namespace TJAPlayer3 { float[] icon_coords = new float[2] { -999, -999 }; for (int j = 0; j < nums.Length; j++) { float offset = j - (nums.Length / 2.0f); - float _x = x - (TJAPlayer3.Skin.SongSelect_Level_Number_Interval[0] * offset); - float _y = y - (TJAPlayer3.Skin.SongSelect_Level_Number_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.SongSelect_Level_Number_Interval[0] * offset); + float _y = y - (OpenTaiko.Skin.SongSelect_Level_Number_Interval[1] * offset); - float width = TJAPlayer3.Tx.SongSelect_Level_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.SongSelect_Level_Number.sz画像サイズ.Height; + float width = OpenTaiko.Tx.SongSelect_Level_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.SongSelect_Level_Number.sz画像サイズ.Height; var _expand_ratio = 1.0f / (1.0f + (0.25f * (nums.Length - 1))); - TJAPlayer3.Tx.SongSelect_Level_Number.vcScaleRatio.X = _expand_ratio; + OpenTaiko.Tx.SongSelect_Level_Number.vcScaleRatio.X = _expand_ratio; icon_coords[0] = Math.Max(icon_coords[0], _x + width * _expand_ratio); icon_coords[1] = _y; - TJAPlayer3.Tx.SongSelect_Level_Number.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.SongSelect_Level_Number.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); - if (TJAPlayer3.Tx.SongSelect_Level_Number_Colored != null) { - TJAPlayer3.Tx.SongSelect_Level_Number_Colored.vcScaleRatio.X = _expand_ratio; - TJAPlayer3.Tx.SongSelect_Level_Number_Colored.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.SongSelect_Difficulty_Colors[diff]); - TJAPlayer3.Tx.SongSelect_Level_Number_Colored.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + if (OpenTaiko.Tx.SongSelect_Level_Number_Colored != null) { + OpenTaiko.Tx.SongSelect_Level_Number_Colored.vcScaleRatio.X = _expand_ratio; + OpenTaiko.Tx.SongSelect_Level_Number_Colored.color4 = CConversion.ColorToColor4(OpenTaiko.Skin.SongSelect_Difficulty_Colors[diff]); + OpenTaiko.Tx.SongSelect_Level_Number_Colored.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } - tDisplayLevelIcon((int)icon_coords[0], (int)icon_coords[1], icon, TJAPlayer3.Tx.SongSelect_Level_Number_Icon); + tDisplayLevelIcon((int)icon_coords[0], (int)icon_coords[1], icon, OpenTaiko.Tx.SongSelect_Level_Number_Icon); } public void tPrintLevelNumberBig(int x, int y, CSongListNode song) { @@ -2977,32 +2977,32 @@ namespace TJAPlayer3 { int num = song.nLevel[difficulty]; var icon = song.nLevelIcon[difficulty]; - if (TJAPlayer3.Tx.SongSelect_Level_Number_Big == null || num < 0) return; + if (OpenTaiko.Tx.SongSelect_Level_Number_Big == null || num < 0) return; int[] nums = CConversion.SeparateDigits(num); float _ratio = 1f; float[] icon_coords = new float[2] { -999, -999 }; - if (TJAPlayer3.Tx.SongSelect_Level_Number != null) { - _ratio = TJAPlayer3.Tx.SongSelect_Level_Number_Big.szTextureSize.Width / TJAPlayer3.Tx.SongSelect_Level_Number.szTextureSize.Width; + if (OpenTaiko.Tx.SongSelect_Level_Number != null) { + _ratio = OpenTaiko.Tx.SongSelect_Level_Number_Big.szTextureSize.Width / OpenTaiko.Tx.SongSelect_Level_Number.szTextureSize.Width; } for (int j = 0; j < nums.Length; j++) { float offset = j - (nums.Length / 2.0f); - float _x = x - (TJAPlayer3.Skin.SongSelect_Level_Number_Interval[0] * offset * _ratio); - float _y = y - (TJAPlayer3.Skin.SongSelect_Level_Number_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.SongSelect_Level_Number_Interval[0] * offset * _ratio); + float _y = y - (OpenTaiko.Skin.SongSelect_Level_Number_Interval[1] * offset); - float width = TJAPlayer3.Tx.SongSelect_Level_Number_Big.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.SongSelect_Level_Number_Big.sz画像サイズ.Height; + float width = OpenTaiko.Tx.SongSelect_Level_Number_Big.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.SongSelect_Level_Number_Big.sz画像サイズ.Height; var _expand_ratio = 1.0f / (1.0f + (0.25f * (nums.Length - 1))); - TJAPlayer3.Tx.SongSelect_Level_Number_Big.vcScaleRatio.X = _expand_ratio; - TJAPlayer3.Tx.SongSelect_Level_Number_Big.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.SongSelect_Level_Number_Big.vcScaleRatio.X = _expand_ratio; + OpenTaiko.Tx.SongSelect_Level_Number_Big.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); icon_coords[0] = Math.Max(icon_coords[0], _x + width * _expand_ratio); icon_coords[1] = _y; - if (TJAPlayer3.Tx.SongSelect_Level_Number_Big_Colored != null) { - TJAPlayer3.Tx.SongSelect_Level_Number_Big_Colored.vcScaleRatio.X = _expand_ratio; - TJAPlayer3.Tx.SongSelect_Level_Number_Big_Colored.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.SongSelect_Difficulty_Colors[difficulty]); - TJAPlayer3.Tx.SongSelect_Level_Number_Big_Colored.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + if (OpenTaiko.Tx.SongSelect_Level_Number_Big_Colored != null) { + OpenTaiko.Tx.SongSelect_Level_Number_Big_Colored.vcScaleRatio.X = _expand_ratio; + OpenTaiko.Tx.SongSelect_Level_Number_Big_Colored.color4 = CConversion.ColorToColor4(OpenTaiko.Skin.SongSelect_Difficulty_Colors[difficulty]); + OpenTaiko.Tx.SongSelect_Level_Number_Big_Colored.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } @@ -3012,7 +3012,7 @@ namespace TJAPlayer3 { public int tFetchDifficulty(CSongListNode song) { var closest = this.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song); - int defaultTable = Math.Max(0, Math.Min((int)Difficulty.Edit + 1, TJAPlayer3.ConfigIni.nDefaultCourse)); + int defaultTable = Math.Max(0, Math.Min((int)Difficulty.Edit + 1, OpenTaiko.ConfigIni.nDefaultCourse)); if (song.arスコア[defaultTable] == null) return closest; diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelect演奏履歴パネル.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelect演奏履歴パネル.cs index dc2b9628..0033e50c 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelect演奏履歴パネル.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelect演奏履歴パネル.cs @@ -7,7 +7,7 @@ using Color = System.Drawing.Color; using Point = System.Drawing.Point; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSelect演奏履歴パネル : CActivity { // メソッド @@ -59,8 +59,8 @@ namespace TJAPlayer3 { base.IsDeActivated = true; } public void t選択曲が変更された() { - Cスコア cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア; - if ((cスコア != null) && !TJAPlayer3.stageSongSelect.bCurrentlyScrolling) { + Cスコア cスコア = OpenTaiko.stageSongSelect.r現在選択中のスコア; + if ((cスコア != null) && !OpenTaiko.stageSongSelect.bCurrentlyScrolling) { try { foreach (var item in tx文字列パネル) { item.Dispose(); @@ -123,19 +123,19 @@ namespace TJAPlayer3 { public override int Draw() { if (!base.IsDeActivated) { if (base.IsFirstDraw) { - this.ct登場アニメ用 = new CCounter(0, 3000, 1, TJAPlayer3.Timer); + this.ct登場アニメ用 = new CCounter(0, 3000, 1, OpenTaiko.Timer); base.IsFirstDraw = false; } this.ct登場アニメ用.Tick(); int x = 980; int y = 350; - if (TJAPlayer3.stageSongSelect.r現在選択中のスコア != null && this.ct登場アニメ用.CurrentValue >= 2000 && TJAPlayer3.stageSongSelect.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE) { + if (OpenTaiko.stageSongSelect.r現在選択中のスコア != null && this.ct登場アニメ用.CurrentValue >= 2000 && OpenTaiko.stageSongSelect.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE) { //CDTXMania.Tx.SongSelect_ScoreWindow_Text.n透明度 = ct登場アニメ用.n現在の値 - 1745; - if (TJAPlayer3.Tx.SongSelect_ScoreWindow[TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度] != null) { + if (OpenTaiko.Tx.SongSelect_ScoreWindow[OpenTaiko.stageSongSelect.n現在選択中の曲の難易度] != null) { //CDTXMania.Tx.SongSelect_ScoreWindow[CDTXMania.stage選曲.n現在選択中の曲の難易度].n透明度 = ct登場アニメ用.n現在の値 - 1745; - TJAPlayer3.Tx.SongSelect_ScoreWindow[TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度].t2D描画(x, y); - this.t小文字表示(x + 56, y + 160, string.Format("{0,7:######0}", TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nハイスコア[TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度].ToString())); - TJAPlayer3.Tx.SongSelect_ScoreWindow_Text.t2D描画(x + 236, y + 166, new Rectangle(0, 36, 32, 30)); + OpenTaiko.Tx.SongSelect_ScoreWindow[OpenTaiko.stageSongSelect.n現在選択中の曲の難易度].t2D描画(x, y); + this.t小文字表示(x + 56, y + 160, string.Format("{0,7:######0}", OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nハイスコア[OpenTaiko.stageSongSelect.n現在選択中の曲の難易度].ToString())); + OpenTaiko.Tx.SongSelect_ScoreWindow_Text.t2D描画(x + 236, y + 166, new Rectangle(0, 36, 32, 30)); } } } @@ -169,8 +169,8 @@ namespace TJAPlayer3 { for (int i = 0; i < this.st小文字位置.Length; i++) { if (this.st小文字位置[i].ch == ch) { Rectangle rectangle = new Rectangle(this.st小文字位置[i].pt.X, this.st小文字位置[i].pt.Y, 26, 36); - if (TJAPlayer3.Tx.SongSelect_ScoreWindow_Text != null) { - TJAPlayer3.Tx.SongSelect_ScoreWindow_Text.t2D描画(x, y, rectangle); + if (OpenTaiko.Tx.SongSelect_ScoreWindow_Text != null) { + OpenTaiko.Tx.SongSelect_ScoreWindow_Text.t2D描画(x, y, rectangle); } break; } @@ -180,7 +180,7 @@ namespace TJAPlayer3 { } public void tSongChange() { - this.ct登場アニメ用 = new CCounter(0, 3000, 1, TJAPlayer3.Timer); + this.ct登場アニメ用 = new CCounter(0, 3000, 1, OpenTaiko.Timer); } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelect難易度選択画面.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelect難易度選択画面.cs index 9631078f..169c3568 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelect難易度選択画面.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelect難易度選択画面.cs @@ -4,7 +4,7 @@ using Color = System.Drawing.Color; using Rectangle = System.Drawing.Rectangle; using RectangleF = System.Drawing.RectangleF; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 難易度選択画面。 /// この難易度選択画面はAC7～AC14のような方式であり、WiiまたはAC15移行の方式とは異なる。 @@ -26,7 +26,7 @@ namespace TJAPlayer3 { public void t次に移動(int player) { if (n現在の選択行[player] < 5) { - ctBarAnime[player].Start(0, 180, 1, TJAPlayer3.Timer); + ctBarAnime[player].Start(0, 180, 1, OpenTaiko.Timer); if (!b裏譜面) { n現在の選択行[player]++; } else { @@ -37,7 +37,7 @@ namespace TJAPlayer3 { } } } else if (n現在の選択行[player] >= 5) { - if (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[4] < 0 || TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[3] < 0) + if (OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[4] < 0 || OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[3] < 0) return; if (nスイッチカウント < 0) { @@ -47,11 +47,11 @@ namespace TJAPlayer3 { if (!bSelect[i]) { if (n現在の選択行[i] == 5) { // Extreme to Extra - TJAPlayer3.stageSongSelect.actExExtraTransAnime.BeginAnime(true); + OpenTaiko.stageSongSelect.actExExtraTransAnime.BeginAnime(true); n現在の選択行[i] = 6; } else if (n現在の選択行[i] == 6) { //Extra to Extreme - TJAPlayer3.stageSongSelect.actExExtraTransAnime.BeginAnime(false); + OpenTaiko.stageSongSelect.actExExtraTransAnime.BeginAnime(false); n現在の選択行[i] = 5; } } @@ -65,7 +65,7 @@ namespace TJAPlayer3 { public void t前に移動(int player) { if (n現在の選択行[player] - 1 >= 0) { - ctBarAnime[player].Start(0, 180, 1, TJAPlayer3.Timer); + ctBarAnime[player].Start(0, 180, 1, OpenTaiko.Timer); nスイッチカウント = 0; if (n現在の選択行[player] == 6) n現在の選択行[player] -= 2; @@ -75,8 +75,8 @@ namespace TJAPlayer3 { } public void t選択画面初期化() { - this.txTitle = TJAPlayer3.tテクスチャの生成(pfTitle.DrawText(TJAPlayer3.stageSongSelect.rNowSelectedSong.ldTitle.GetString(""), Color.White, Color.Black, null, 30)); - this.txSubTitle = TJAPlayer3.tテクスチャの生成(pfSubTitle.DrawText(TJAPlayer3.stageSongSelect.rNowSelectedSong.ldSubtitle.GetString(""), Color.White, Color.Black, null, 30)); + this.txTitle = OpenTaiko.tテクスチャの生成(pfTitle.DrawText(OpenTaiko.stageSongSelect.rNowSelectedSong.ldTitle.GetString(""), Color.White, Color.Black, null, 30)); + this.txSubTitle = OpenTaiko.tテクスチャの生成(pfSubTitle.DrawText(OpenTaiko.stageSongSelect.rNowSelectedSong.ldSubtitle.GetString(""), Color.White, Color.Black, null, 30)); this.n現在の選択行 = new int[5]; this.bSelect[0] = false; @@ -85,7 +85,7 @@ namespace TJAPlayer3 { this.bSelect[3] = false; this.bSelect[4] = false; - this.b裏譜面 = (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0 && TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] < 0); + this.b裏譜面 = (OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0 && OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] < 0); this.IsFirstDraw = true; } @@ -113,8 +113,8 @@ namespace TJAPlayer3 { base.DeActivate(); } public override void CreateManagedResource() { - this.pfTitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongSelect_MusicName_Scale); - this.pfSubTitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongSelect_Subtitle_Scale); + this.pfTitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongSelect_MusicName_Scale); + this.pfSubTitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongSelect_Subtitle_Scale); // this.soundSelectAnnounce = TJAPlayer3.Sound管理.tサウンドを生成する( CSkin.Path( @"Sounds{Path.DirectorySeparatorChar}DiffSelect.ogg" ), ESoundGroup.SoundEffect ); @@ -135,28 +135,28 @@ namespace TJAPlayer3 { #region [ 初めての進行描画 ] //----------------- if (this.IsFirstDraw) { - ctBarAnimeIn = new CCounter(0, 170, 4, TJAPlayer3.Timer); + ctBarAnimeIn = new CCounter(0, 170, 4, OpenTaiko.Timer); // this.soundSelectAnnounce?.tサウンドを再生する(); //TJAPlayer3.Skin.soundSelectAnnounce.t再生する(); - TJAPlayer3.Skin.voiceMenuDiffSelect[TJAPlayer3.SaveFile]?.tPlay(); + OpenTaiko.Skin.voiceMenuDiffSelect[OpenTaiko.SaveFile]?.tPlay(); base.IsFirstDraw = false; } //----------------- #endregion ctBarAnimeIn.Tick(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { ctBarAnime[i].Tick(); } - bool uraExists = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0; - bool omoteExists = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] >= 0; + bool uraExists = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Edit] >= 0; + bool omoteExists = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[(int)Difficulty.Oni] >= 0; #region [ キー入力 ] if (this.ctBarAnimeIn.IsEnded && exextraAnimation == 0) // Prevent player actions if animation is active { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (!bSelect[i] && !isOnOption()) { bool right = false; bool left = false; @@ -166,53 +166,53 @@ namespace TJAPlayer3 { switch (i) { case 0: - right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)); - left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)); - decide = (TJAPlayer3.Pad.bPressedDGB(EPad.Decide) || - (TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))); - cancel = (TJAPlayer3.Pad.bPressedDGB(EPad.Cancel) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)); + right = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)); + left = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)); + decide = (OpenTaiko.Pad.bPressedDGB(EPad.Decide) || + (OpenTaiko.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))); + cancel = (OpenTaiko.Pad.bPressedDGB(EPad.Cancel) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)); break; case 1: - if (!TJAPlayer3.ConfigIni.bAIBattleMode) { - right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue2P)); - left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue2P)); - decide = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P)); + if (!OpenTaiko.ConfigIni.bAIBattleMode) { + right = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue2P)); + left = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue2P)); + decide = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed2P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed2P)); } break; case 2: - right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue3P)); - left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue3P)); - decide = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed3P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed3P)); + right = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue3P)); + left = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue3P)); + decide = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed3P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed3P)); break; case 3: - right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue4P)); - left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue4P)); - decide = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed4P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed4P)); + right = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue4P)); + left = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue4P)); + decide = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed4P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed4P)); break; case 4: - right = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue5P)); - left = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue5P)); - decide = (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed5P) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed5P)); + right = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RBlue5P)); + left = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LBlue5P)); + decide = (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LRed5P) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RRed5P)); break; } if (right) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); this.t次に移動(i); } else if (left) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); this.t前に移動(i); } if (decide) { if (n現在の選択行[i] == 0) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.stageSongSelect.actSongList.ctBarOpen.Start(100, 260, 2, TJAPlayer3.Timer); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.stageSongSelect.actSongList.ctBarOpen.Start(100, 260, 2, OpenTaiko.Timer); this.bIsDifficltSelect = false; } else if (n現在の選択行[i] == 1) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); bOption[i] = true; } else { - if (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[n現在の選択行[i] - 2] > 0) { + if (OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[n現在の選択行[i] - 2] > 0) { //TJAPlayer3.stage選曲.ctChara_Jump[0].t開始(0, SongSelect_Chara_Jump.Length - 1, 1000 / 45, TJAPlayer3.Timer); @@ -220,8 +220,8 @@ namespace TJAPlayer3 { bool allPlayerSelected = true; - for (int i2 = 0; i2 < TJAPlayer3.ConfigIni.nPlayerCount; i2++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i2 == 1) break; + for (int i2 = 0; i2 < OpenTaiko.ConfigIni.nPlayerCount; i2++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i2 == 1) break; if (!bSelect[i2]) { allPlayerSelected = false; @@ -230,37 +230,37 @@ namespace TJAPlayer3 { } if (allPlayerSelected) { - if (TJAPlayer3.Skin.soundSongDecide_AI.bLoadedSuccessfuly && TJAPlayer3.ConfigIni.bAIBattleMode) { - TJAPlayer3.Skin.soundSongDecide_AI.tPlay(); - } else if (TJAPlayer3.Skin.sound曲決定音.bLoadedSuccessfuly) { - TJAPlayer3.Skin.sound曲決定音.tPlay(); + if (OpenTaiko.Skin.soundSongDecide_AI.bLoadedSuccessfuly && OpenTaiko.ConfigIni.bAIBattleMode) { + OpenTaiko.Skin.soundSongDecide_AI.tPlay(); + } else if (OpenTaiko.Skin.sound曲決定音.bLoadedSuccessfuly) { + OpenTaiko.Skin.sound曲決定音.tPlay(); } else { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } - for (int i2 = 0; i2 < TJAPlayer3.ConfigIni.nPlayerCount; i2++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - TJAPlayer3.Skin.voiceMenuSongDecide_AI[TJAPlayer3.GetActualPlayer(i2)]?.tPlay(); + for (int i2 = 0; i2 < OpenTaiko.ConfigIni.nPlayerCount; i2++) { + if (OpenTaiko.ConfigIni.bAIBattleMode) { + OpenTaiko.Skin.voiceMenuSongDecide_AI[OpenTaiko.GetActualPlayer(i2)]?.tPlay(); } else { - TJAPlayer3.Skin.voiceMenuSongDecide[TJAPlayer3.GetActualPlayer(i2)]?.tPlay(); + OpenTaiko.Skin.voiceMenuSongDecide[OpenTaiko.GetActualPlayer(i2)]?.tPlay(); } CMenuCharacter.tMenuResetTimer(i2, CMenuCharacter.ECharacterAnimation.START); - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - TJAPlayer3.stageSongSelect.t曲を選択する(n現在の選択行[0] - 2, i2); + if (OpenTaiko.ConfigIni.bAIBattleMode) { + OpenTaiko.stageSongSelect.t曲を選択する(n現在の選択行[0] - 2, i2); } else { - TJAPlayer3.stageSongSelect.t曲を選択する(n現在の選択行[i2] - 2, i2); + OpenTaiko.stageSongSelect.t曲を選択する(n現在の選択行[i2] - 2, i2); } } } else { CMenuCharacter.tMenuResetTimer(i, CMenuCharacter.ECharacterAnimation.WAIT); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } } } } if (cancel) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.stageSongSelect.actSongList.ctBarOpen.Start(100, 260, 2, TJAPlayer3.Timer); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.stageSongSelect.actSongList.ctBarOpen.Start(100, 260, 2, OpenTaiko.Timer); this.bIsDifficltSelect = false; } } @@ -269,58 +269,58 @@ namespace TJAPlayer3 { #endregion - bool consideMultiPlay = TJAPlayer3.ConfigIni.nPlayerCount >= 2 && !TJAPlayer3.ConfigIni.bAIBattleMode; + bool consideMultiPlay = OpenTaiko.ConfigIni.nPlayerCount >= 2 && !OpenTaiko.ConfigIni.bAIBattleMode; #region [ 画像描画 ] // int boxType = nStrジャンルtoNum(TJAPlayer3.stage選曲.r現在選択中の曲.strジャンル); - var difficulty_back = HGenreBar.tGetGenreBar(TJAPlayer3.stageSongSelect.rNowSelectedSong.BoxType, TJAPlayer3.Tx.Difficulty_Back); + var difficulty_back = HGenreBar.tGetGenreBar(OpenTaiko.stageSongSelect.rNowSelectedSong.BoxType, OpenTaiko.Tx.Difficulty_Back); difficulty_back.Opacity = - (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); - TJAPlayer3.Tx.Difficulty_Bar.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); - TJAPlayer3.Tx.Difficulty_Number.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); - TJAPlayer3.Tx.Difficulty_Crown.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); - TJAPlayer3.Tx.SongSelect_ScoreRank.vcScaleRatio.X = 0.65f; - TJAPlayer3.Tx.SongSelect_ScoreRank.vcScaleRatio.Y = 0.65f; - TJAPlayer3.Tx.SongSelect_ScoreRank.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); - TJAPlayer3.Tx.Difficulty_Star.Opacity = (TJAPlayer3.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); + (OpenTaiko.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); + OpenTaiko.Tx.Difficulty_Bar.Opacity = (OpenTaiko.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); + OpenTaiko.Tx.Difficulty_Number.Opacity = (OpenTaiko.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); + OpenTaiko.Tx.Difficulty_Crown.Opacity = (OpenTaiko.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); + OpenTaiko.Tx.SongSelect_ScoreRank.vcScaleRatio.X = 0.65f; + OpenTaiko.Tx.SongSelect_ScoreRank.vcScaleRatio.Y = 0.65f; + OpenTaiko.Tx.SongSelect_ScoreRank.Opacity = (OpenTaiko.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); + OpenTaiko.Tx.Difficulty_Star.Opacity = (OpenTaiko.stageSongSelect.actSongList.ctDifficultyIn.CurrentValue - 1255); - difficulty_back.color4 = CConversion.ColorToColor4(TJAPlayer3.stageSongSelect.rNowSelectedSong.BoxColor); + difficulty_back.color4 = CConversion.ColorToColor4(OpenTaiko.stageSongSelect.rNowSelectedSong.BoxColor); - difficulty_back.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Difficulty_Back[0], TJAPlayer3.Skin.SongSelect_Difficulty_Back[1]); + difficulty_back.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Difficulty_Back[0], OpenTaiko.Skin.SongSelect_Difficulty_Back[1]); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; /* Difficulty_Select_Bar[i].Opacity = (int)(ctBarAnimeIn.n現在の値 >= 80 ? (ctBarAnimeIn.n現在の値 - 80) * 2.84f : 0); Difficulty_Select_Bar[i].t2D描画((float)this.BarX[n現在の選択行[i]], 242, new RectangleF(0, (n現在の選択行[i] >= 2 ? 114 : 387), 259, 275 - (n現在の選択行[i] >= 2 ? 0 : 164))); */ - TJAPlayer3.Tx.Difficulty_Select_Bar[i].Opacity = (int)(ctBarAnimeIn.CurrentValue >= 80 ? (ctBarAnimeIn.CurrentValue - 80) * 2.84f : 0); + OpenTaiko.Tx.Difficulty_Select_Bar[i].Opacity = (int)(ctBarAnimeIn.CurrentValue >= 80 ? (ctBarAnimeIn.CurrentValue - 80) * 2.84f : 0); int backType = n現在の選択行[i] >= 2 ? 1 : 2; - TJAPlayer3.Tx.Difficulty_Select_Bar[i].t2D描画( - TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Back_X[n現在の選択行[i]], - TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Back_Y[n現在の選択行[i]], - new RectangleF(TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Rect[backType][0], TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Rect[backType][1], - TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Rect[backType][2], TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Rect[backType][3])); + OpenTaiko.Tx.Difficulty_Select_Bar[i].t2D描画( + OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Back_X[n現在の選択行[i]], + OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Back_Y[n現在の選択行[i]], + new RectangleF(OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Rect[backType][0], OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Rect[backType][1], + OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Rect[backType][2], OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Rect[backType][3])); } - TJAPlayer3.Tx.Difficulty_Bar.color4 = new Color4(1.0f, 1.0f, 1.0f, 1.0f); + OpenTaiko.Tx.Difficulty_Bar.color4 = new Color4(1.0f, 1.0f, 1.0f, 1.0f); //Difficulty_Bar.t2D描画(255, 270, new RectangleF(0, 0, 171, 236)); //閉じる、演奏オプション for (int i = 0; i < 2; i++) { - TJAPlayer3.Tx.Difficulty_Bar.t2D描画(TJAPlayer3.Skin.SongSelect_Difficulty_Bar_X[i], TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Y[i], - new RectangleF(TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i][0], - TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i][1], - TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i][2], - TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i][3])); //閉じる + OpenTaiko.Tx.Difficulty_Bar.t2D描画(OpenTaiko.Skin.SongSelect_Difficulty_Bar_X[i], OpenTaiko.Skin.SongSelect_Difficulty_Bar_Y[i], + new RectangleF(OpenTaiko.Skin.SongSelect_Difficulty_Bar_Rect[i][0], + OpenTaiko.Skin.SongSelect_Difficulty_Bar_Rect[i][1], + OpenTaiko.Skin.SongSelect_Difficulty_Bar_Rect[i][2], + OpenTaiko.Skin.SongSelect_Difficulty_Bar_Rect[i][3])); //閉じる } - exextraAnimation = TJAPlayer3.stageSongSelect.actExExtraTransAnime.Draw(); + exextraAnimation = OpenTaiko.stageSongSelect.actExExtraTransAnime.Draw(); for (int i = 0; i <= (int)Difficulty.Edit; i++) { if (i == (int)Difficulty.Edit && (!uraExists || !b裏譜面)) @@ -329,56 +329,56 @@ namespace TJAPlayer3 { continue; int screenPos = Math.Min((int)Difficulty.Oni, i); - int level = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i]; - bool avaliable = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i] >= 0; + int level = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i]; + bool avaliable = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i] >= 0; if (avaliable) - TJAPlayer3.Tx.Difficulty_Bar.color4 = new Color4(1.0f, 1.0f, 1.0f, 1.0f); + OpenTaiko.Tx.Difficulty_Bar.color4 = new Color4(1.0f, 1.0f, 1.0f, 1.0f); else - TJAPlayer3.Tx.Difficulty_Bar.color4 = new Color4(0.5f, 0.5f, 0.5f, 1.0f); + OpenTaiko.Tx.Difficulty_Bar.color4 = new Color4(0.5f, 0.5f, 0.5f, 1.0f); if (!(i >= (int)Difficulty.Oni && exextraAnimation > 0)) // Hide Oni/Ura during transition { - TJAPlayer3.Tx.Difficulty_Bar.t2D描画(TJAPlayer3.Skin.SongSelect_Difficulty_Bar_X[i + 2], TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Y[i + 2], - new RectangleF(TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i + 2][0], - TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i + 2][1], - TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i + 2][2], - TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Rect[i + 2][3])); + OpenTaiko.Tx.Difficulty_Bar.t2D描画(OpenTaiko.Skin.SongSelect_Difficulty_Bar_X[i + 2], OpenTaiko.Skin.SongSelect_Difficulty_Bar_Y[i + 2], + new RectangleF(OpenTaiko.Skin.SongSelect_Difficulty_Bar_Rect[i + 2][0], + OpenTaiko.Skin.SongSelect_Difficulty_Bar_Rect[i + 2][1], + OpenTaiko.Skin.SongSelect_Difficulty_Bar_Rect[i + 2][2], + OpenTaiko.Skin.SongSelect_Difficulty_Bar_Rect[i + 2][3])); } if (!avaliable) continue; - for (int j = 0; j < TJAPlayer3.ConfigIni.nPlayerCount; j++) { + for (int j = 0; j < OpenTaiko.ConfigIni.nPlayerCount; j++) { if (j >= 2) continue; - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; - int p = TJAPlayer3.GetActualPlayer(j); + int p = OpenTaiko.GetActualPlayer(j); - Cスコア.ST譜面情報 idx = TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報; + Cスコア.ST譜面情報 idx = OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報; //var GPInfo = TJAPlayer3.stageSongSelect.r現在選択中のスコア.GPInfo[p]; - var TableEntry = TJAPlayer3.SaveFileInstances[p].data.tGetSongSelectTableEntry(TJAPlayer3.stageSongSelect.rNowSelectedSong.tGetUniqueId()); + var TableEntry = OpenTaiko.SaveFileInstances[p].data.tGetSongSelectTableEntry(OpenTaiko.stageSongSelect.rNowSelectedSong.tGetUniqueId()); //Difficulty_Crown.t2D描画(445 + screenPos * 144, 284, new RectangleF(idx.nクリア[i] * 24.5f, 0, 24.5f, 26)); - int crown_width = TJAPlayer3.Tx.Difficulty_Crown.szTextureSize.Width / 5; - int crown_height = TJAPlayer3.Tx.Difficulty_Crown.szTextureSize.Height; - TJAPlayer3.Tx.Difficulty_Crown.t2D描画( - TJAPlayer3.Skin.SongSelect_Difficulty_Crown_X[j][i], - TJAPlayer3.Skin.SongSelect_Difficulty_Crown_Y[j][i], + int crown_width = OpenTaiko.Tx.Difficulty_Crown.szTextureSize.Width / 5; + int crown_height = OpenTaiko.Tx.Difficulty_Crown.szTextureSize.Height; + OpenTaiko.Tx.Difficulty_Crown.t2D描画( + OpenTaiko.Skin.SongSelect_Difficulty_Crown_X[j][i], + OpenTaiko.Skin.SongSelect_Difficulty_Crown_Y[j][i], new RectangleF(TableEntry.ClearStatuses[i] * crown_width, 0, crown_width, crown_height)); - int scoreRank_width = TJAPlayer3.Tx.SongSelect_ScoreRank.szTextureSize.Width; - int scoreRank_height = TJAPlayer3.Tx.SongSelect_ScoreRank.szTextureSize.Height / 7; + int scoreRank_width = OpenTaiko.Tx.SongSelect_ScoreRank.szTextureSize.Width; + int scoreRank_height = OpenTaiko.Tx.SongSelect_ScoreRank.szTextureSize.Height / 7; if (TableEntry.ScoreRanks[i] != 0) - TJAPlayer3.Tx.SongSelect_ScoreRank.t2D描画( - TJAPlayer3.Skin.SongSelect_Difficulty_ScoreRank_X[j][i], - TJAPlayer3.Skin.SongSelect_Difficulty_ScoreRank_Y[j][i], + OpenTaiko.Tx.SongSelect_ScoreRank.t2D描画( + OpenTaiko.Skin.SongSelect_Difficulty_ScoreRank_X[j][i], + OpenTaiko.Skin.SongSelect_Difficulty_ScoreRank_Y[j][i], new RectangleF(0, (TableEntry.ScoreRanks[i] - 1) * scoreRank_height, scoreRank_width, scoreRank_height)); /* @@ -388,41 +388,41 @@ namespace TJAPlayer3 { } if (level >= 0 && (!(i >= (int)Difficulty.Oni && exextraAnimation > 0))) - t小文字表示(TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i], - TJAPlayer3.Skin.SongSelect_Difficulty_Number_X[i], - TJAPlayer3.Skin.SongSelect_Difficulty_Number_Y[i], + t小文字表示(OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nレベル[i], + OpenTaiko.Skin.SongSelect_Difficulty_Number_X[i], + OpenTaiko.Skin.SongSelect_Difficulty_Number_Y[i], i, - TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.nLevelIcon[i] + OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.nLevelIcon[i] ); if (!(i >= (int)Difficulty.Oni && exextraAnimation > 0)) { for (int g = 0; g < 10; g++) { if (level > g + 10) { - TJAPlayer3.Tx.Difficulty_Star.color4 = new Color4(1f, 0.2f, 0.2f, 1.0f); - TJAPlayer3.Tx.Difficulty_Star?.t2D描画(TJAPlayer3.Skin.SongSelect_Difficulty_Star_X[i] + g * TJAPlayer3.Skin.SongSelect_Difficulty_Star_Interval[0], TJAPlayer3.Skin.SongSelect_Difficulty_Star_Y[i] + g * TJAPlayer3.Skin.SongSelect_Difficulty_Star_Interval[1]); + OpenTaiko.Tx.Difficulty_Star.color4 = new Color4(1f, 0.2f, 0.2f, 1.0f); + OpenTaiko.Tx.Difficulty_Star?.t2D描画(OpenTaiko.Skin.SongSelect_Difficulty_Star_X[i] + g * OpenTaiko.Skin.SongSelect_Difficulty_Star_Interval[0], OpenTaiko.Skin.SongSelect_Difficulty_Star_Y[i] + g * OpenTaiko.Skin.SongSelect_Difficulty_Star_Interval[1]); } else if (level > g) { - TJAPlayer3.Tx.Difficulty_Star.color4 = new Color4(1f, 1f, 1f, 1.0f); - TJAPlayer3.Tx.Difficulty_Star?.t2D描画(TJAPlayer3.Skin.SongSelect_Difficulty_Star_X[i] + g * TJAPlayer3.Skin.SongSelect_Difficulty_Star_Interval[0], TJAPlayer3.Skin.SongSelect_Difficulty_Star_Y[i] + g * TJAPlayer3.Skin.SongSelect_Difficulty_Star_Interval[1]); + OpenTaiko.Tx.Difficulty_Star.color4 = new Color4(1f, 1f, 1f, 1.0f); + OpenTaiko.Tx.Difficulty_Star?.t2D描画(OpenTaiko.Skin.SongSelect_Difficulty_Star_X[i] + g * OpenTaiko.Skin.SongSelect_Difficulty_Star_Interval[0], OpenTaiko.Skin.SongSelect_Difficulty_Star_Y[i] + g * OpenTaiko.Skin.SongSelect_Difficulty_Star_Interval[1]); } } } - if (TJAPlayer3.stageSongSelect.r現在選択中のスコア.譜面情報.b譜面分岐[i]) - TJAPlayer3.Tx.SongSelect_Branch_Text?.t2D描画( + if (OpenTaiko.stageSongSelect.r現在選択中のスコア.譜面情報.b譜面分岐[i]) + OpenTaiko.Tx.SongSelect_Branch_Text?.t2D描画( - TJAPlayer3.Skin.SongSelect_Difficulty_Bar_X[i + 2] + TJAPlayer3.Skin.SongSelect_Branch_Text_Offset[0], - TJAPlayer3.Skin.SongSelect_Difficulty_Bar_Y[i + 2] + TJAPlayer3.Skin.SongSelect_Branch_Text_Offset[1] + OpenTaiko.Skin.SongSelect_Difficulty_Bar_X[i + 2] + OpenTaiko.Skin.SongSelect_Branch_Text_Offset[0], + OpenTaiko.Skin.SongSelect_Difficulty_Bar_Y[i + 2] + OpenTaiko.Skin.SongSelect_Branch_Text_Offset[1] ); } - this.txTitle.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Difficulty_Select_Title[0], TJAPlayer3.Skin.SongSelect_Difficulty_Select_Title[1]); - this.txSubTitle.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_Difficulty_Select_SubTitle[0], TJAPlayer3.Skin.SongSelect_Difficulty_Select_SubTitle[1]); + this.txTitle.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Difficulty_Select_Title[0], OpenTaiko.Skin.SongSelect_Difficulty_Select_Title[1]); + this.txSubTitle.t2D中心基準描画(OpenTaiko.Skin.SongSelect_Difficulty_Select_SubTitle[0], OpenTaiko.Skin.SongSelect_Difficulty_Select_SubTitle[1]); #region [ バーの描画 ] - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; /* Difficulty_Select_Bar[i].t2D描画( @@ -436,7 +436,7 @@ namespace TJAPlayer3 { int overlapCount = 0; int nowOverlapIndex = 0; - for (int j = 0; j < TJAPlayer3.ConfigIni.nPlayerCount; j++) { + for (int j = 0; j < OpenTaiko.ConfigIni.nPlayerCount; j++) { if (n現在の選択行[i] == n現在の選択行[j] && j != i) overlapCount++; if (j == i) { nowOverlapIndex = overlapCount; @@ -452,26 +452,26 @@ namespace TJAPlayer3 { (((float)Math.Cos((float)ctBarAnimeIn.n現在の値 * (Math.PI / 170)) + 1.0f) * TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Anime[1])); */ - float moveX = TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Move[0] * (nowOverlapIndex - (overlapCount / 2.0f)) * (2.0f / Math.Max(overlapCount, 1)); - float moveY = TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Move[1] * (nowOverlapIndex - (overlapCount / 2.0f)) * (2.0f / Math.Max(overlapCount, 1)); + float moveX = OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Move[0] * (nowOverlapIndex - (overlapCount / 2.0f)) * (2.0f / Math.Max(overlapCount, 1)); + float moveY = OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Move[1] * (nowOverlapIndex - (overlapCount / 2.0f)) * (2.0f / Math.Max(overlapCount, 1)); if (!consideMultiPlay) { moveX = 0; moveY = 0; } - moveX += (((float)Math.Sin((float)ctBarAnime[i].CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Anime[0]) - - (((float)Math.Cos((float)ctBarAnimeIn.CurrentValue * (Math.PI / 170)) + 1.0f) * TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_AnimeIn[0])); - moveY += (((float)Math.Sin((float)ctBarAnime[i].CurrentValue * (Math.PI / 180)) * TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Anime[1]) - - (((float)Math.Cos((float)ctBarAnimeIn.CurrentValue * (Math.PI / 170)) + 1.0f) * TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Anime[1])); + moveX += (((float)Math.Sin((float)ctBarAnime[i].CurrentValue * (Math.PI / 180)) * OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Anime[0]) - + (((float)Math.Cos((float)ctBarAnimeIn.CurrentValue * (Math.PI / 170)) + 1.0f) * OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_AnimeIn[0])); + moveY += (((float)Math.Sin((float)ctBarAnime[i].CurrentValue * (Math.PI / 180)) * OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Anime[1]) - + (((float)Math.Cos((float)ctBarAnimeIn.CurrentValue * (Math.PI / 170)) + 1.0f) * OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Anime[1])); - TJAPlayer3.Tx.Difficulty_Select_Bar[i].t2D描画( - TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_X[n現在の選択行[i]] + moveX, - TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Y[n現在の選択行[i]] + moveY, - new RectangleF(TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Rect[0][0], TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Rect[0][1], - TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Rect[0][2], TJAPlayer3.Skin.SongSelect_Difficulty_Select_Bar_Rect[0][3])); + OpenTaiko.Tx.Difficulty_Select_Bar[i].t2D描画( + OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_X[n現在の選択行[i]] + moveX, + OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Y[n現在の選択行[i]] + moveY, + new RectangleF(OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Rect[0][0], OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Rect[0][1], + OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Rect[0][2], OpenTaiko.Skin.SongSelect_Difficulty_Select_Bar_Rect[0][3])); } #endregion @@ -521,23 +521,23 @@ namespace TJAPlayer3 { float[] icon_coords = new float[2] { -999, -999 }; for (int j = 0; j < nums.Length; j++) { float offset = j - (nums.Length / 2.0f); - float _x = x - (TJAPlayer3.Skin.SongSelect_Difficulty_Number_Interval[0] * offset); - float _y = y - (TJAPlayer3.Skin.SongSelect_Difficulty_Number_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.SongSelect_Difficulty_Number_Interval[0] * offset); + float _y = y - (OpenTaiko.Skin.SongSelect_Difficulty_Number_Interval[1] * offset); - int width = TJAPlayer3.Tx.Difficulty_Number.sz画像サイズ.Width / 10; - int height = TJAPlayer3.Tx.Difficulty_Number.sz画像サイズ.Height; + int width = OpenTaiko.Tx.Difficulty_Number.sz画像サイズ.Width / 10; + int height = OpenTaiko.Tx.Difficulty_Number.sz画像サイズ.Height; icon_coords[0] = Math.Max(icon_coords[0], _x + width); icon_coords[1] = _y; - TJAPlayer3.Tx.Difficulty_Number.t2D描画(_x, _y, new Rectangle(width * nums[j], 0, width, height)); + OpenTaiko.Tx.Difficulty_Number.t2D描画(_x, _y, new Rectangle(width * nums[j], 0, width, height)); - if (TJAPlayer3.Tx.Difficulty_Number_Colored != null) { - TJAPlayer3.Tx.Difficulty_Number_Colored.color4 = CConversion.ColorToColor4(TJAPlayer3.Skin.SongSelect_Difficulty_Colors[diff]); - TJAPlayer3.Tx.Difficulty_Number_Colored.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + if (OpenTaiko.Tx.Difficulty_Number_Colored != null) { + OpenTaiko.Tx.Difficulty_Number_Colored.color4 = CConversion.ColorToColor4(OpenTaiko.Skin.SongSelect_Difficulty_Colors[diff]); + OpenTaiko.Tx.Difficulty_Number_Colored.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } - TJAPlayer3.stageSongSelect.actSongList.tDisplayLevelIcon((int)icon_coords[0], (int)icon_coords[1], icon, TJAPlayer3.Tx.Difficulty_Number_Icon); + OpenTaiko.stageSongSelect.actSongList.tDisplayLevelIcon((int)icon_coords[0], (int)icon_coords[1], icon, OpenTaiko.Tx.Difficulty_Number_Icon); } private bool isOnOption() { diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSortSongs.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSortSongs.cs index b9ea18ca..b90a625a 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSortSongs.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSortSongs.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActSortSongs : CActSelectPopupMenu { // コンストラクタ diff --git a/OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs b/OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs index 11fed663..e5e8733a 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs @@ -5,7 +5,7 @@ using System.Text; using DiscordRPC; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { /* ** class CSongSelectSongManager ** playSongIfPossible : Play song is enabled and not playing, supports both intro and regular song @@ -18,19 +18,19 @@ namespace TJAPlayer3 { static internal class CSongSelectSongManager { public static CSkin.CSystemSound bgmIn { get { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - return TJAPlayer3.Skin.bgmSongSelect_AI_In; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + return OpenTaiko.Skin.bgmSongSelect_AI_In; } else { - return TJAPlayer3.Skin.bgm選曲画面イン; + return OpenTaiko.Skin.bgm選曲画面イン; } } } public static CSkin.CSystemSound bgmLoop { get { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - return TJAPlayer3.Skin.bgmSongSelect_AI; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + return OpenTaiko.Skin.bgmSongSelect_AI; } else { - return TJAPlayer3.Skin.bgm選曲画面; + return OpenTaiko.Skin.bgm選曲画面; } } } @@ -39,7 +39,7 @@ namespace TJAPlayer3 { if (CSongSelectSongManager.isSongDisabled) return; - if (TJAPlayer3.ConfigIni.bBGM音を発声する && !bgmIn.bIsPlaying && !bgmLoop.bIsPlaying) { + if (OpenTaiko.ConfigIni.bBGM音を発声する && !bgmIn.bIsPlaying && !bgmLoop.bIsPlaying) { if (inSongPlayed == false) { bgmIn.tPlay(); CSongSelectSongManager.inSongPlayed = true; @@ -187,25 +187,25 @@ namespace TJAPlayer3 { bool bchangedBGPath = rNowSelectedSong != null && rNowSelectedSong.strSelectBGPath != rPrevSelectedSong.strSelectBGPath; if (bchangedBGPath) - TJAPlayer3.tテクスチャの解放(ref txCustomPrevSelectBG); + OpenTaiko.tテクスチャの解放(ref txCustomPrevSelectBG); txCustomPrevSelectBG = txCustomSelectBG; if (bchangedBGPath) { if (rNowSelectedSong.strSelectBGPath != null && rNowSelectedSong.strSelectBGPath != "") { - txCustomSelectBG = TJAPlayer3.tテクスチャの生成(rNowSelectedSong.strSelectBGPath); + txCustomSelectBG = OpenTaiko.tテクスチャの生成(rNowSelectedSong.strSelectBGPath); } else { txCustomSelectBG = null; } } } - float scale = TJAPlayer3.Skin.Resolution[1] / (float)txGenreBack.szTextureSize.Height; - this.ct背景スクロール用タイマー = new CCounter(0, (int)(txGenreBack.szTextureSize.Width * scale), 30, TJAPlayer3.Timer); + float scale = OpenTaiko.Skin.Resolution[1] / (float)txGenreBack.szTextureSize.Height; + this.ct背景スクロール用タイマー = new CCounter(0, (int)(txGenreBack.szTextureSize.Width * scale), 30, OpenTaiko.Timer); this.ct背景スクロール用タイマー.CurrentValue = Math.Min(scroll, (int)(txGenreBack.szTextureSize.Width * scale)); - float oldScale = TJAPlayer3.Skin.Resolution[1] / (float)txOldGenreBack.szTextureSize.Height; - this.ctOldBGScroll = new CCounter(0, (int)(txOldGenreBack.szTextureSize.Width * oldScale), 30, TJAPlayer3.Timer); + float oldScale = OpenTaiko.Skin.Resolution[1] / (float)txOldGenreBack.szTextureSize.Height; + this.ctOldBGScroll = new CCounter(0, (int)(txOldGenreBack.szTextureSize.Width * oldScale), 30, OpenTaiko.Timer); this.ctOldBGScroll.CurrentValue = Math.Min(scroll, (int)(txOldGenreBack.szTextureSize.Width * oldScale)); this.actPreimageパネル.tSelectedSongChanged(); @@ -217,18 +217,18 @@ namespace TJAPlayer3 { #region [ プラグインにも通知する（BOX, RANDOM, BACK なら通知しない）] //--------------------- - if (TJAPlayer3.app != null) { - var c曲リストノード = TJAPlayer3.stageSongSelect.rNowSelectedSong; - var cスコア = TJAPlayer3.stageSongSelect.r現在選択中のスコア; + if (OpenTaiko.app != null) { + var c曲リストノード = OpenTaiko.stageSongSelect.rNowSelectedSong; + var cスコア = OpenTaiko.stageSongSelect.r現在選択中のスコア; if (c曲リストノード != null && cスコア != null && c曲リストノード.eノード種別 == CSongListNode.ENodeType.SCORE) { string str選択曲ファイル名 = cスコア.ファイル情報.ファイルの絶対パス; - int n曲番号inブロック = TJAPlayer3.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(c曲リストノード); + int n曲番号inブロック = OpenTaiko.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(c曲リストノード); - foreach (TJAPlayer3.STPlugin stPlugin in TJAPlayer3.app.PluginList) { + foreach (OpenTaiko.STPlugin stPlugin in OpenTaiko.app.PluginList) { Directory.SetCurrentDirectory(stPlugin.pluginDirectory); stPlugin.plugin.On選択曲変更(str選択曲ファイル名, n曲番号inブロック); - Directory.SetCurrentDirectory(TJAPlayer3.strEXEのあるフォルダ); + Directory.SetCurrentDirectory(OpenTaiko.strEXEのあるフォルダ); } } } @@ -256,13 +256,13 @@ namespace TJAPlayer3 { // BGM played this.bBGM再生済み = false; - this.ct背景スクロール用タイマー = new CCounter(0, txGenreBack.szTextureSize.Width, 30, TJAPlayer3.Timer); - this.ctOldBGScroll = new CCounter(0, txOldGenreBack.szTextureSize.Width, 30, TJAPlayer3.Timer); + this.ct背景スクロール用タイマー = new CCounter(0, txGenreBack.szTextureSize.Width, 30, OpenTaiko.Timer); + this.ctOldBGScroll = new CCounter(0, txOldGenreBack.szTextureSize.Width, 30, OpenTaiko.Timer); - TJAPlayer3.Skin.voiceMenuSongSelect[TJAPlayer3.SaveFile]?.tPlay(); + OpenTaiko.Skin.voiceMenuSongSelect[OpenTaiko.SaveFile]?.tPlay(); for (int i = 0; i < 2; i++) - this.ctキー反復用[i] = new CCounter(0, 0, 0, TJAPlayer3.Timer); + this.ctキー反復用[i] = new CCounter(0, 0, 0, OpenTaiko.Timer); //ctChara_Normal = new CCounter(0, TJAPlayer3.Tx.SongSelect_Chara_Normal.Length - 1, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.NORMAL); @@ -275,8 +275,8 @@ namespace TJAPlayer3 { CMenuCharacter.tDisableCounter(CMenuCharacter.ECharacterAnimation.START); ctBackgroundFade = new CCounter(); - ctCreditAnime = new CCounter(0, 4500, 1, TJAPlayer3.Timer); - ctTimer = new CCounter(0, 100, 1000, TJAPlayer3.Timer); + ctCreditAnime = new CCounter(0, 4500, 1, OpenTaiko.Timer); + ctTimer = new CCounter(0, 100, 1000, OpenTaiko.Timer); this.PuchiChara.IdleAnimation(); @@ -296,13 +296,13 @@ namespace TJAPlayer3 { this.actステータスパネル.t選択曲が変更された(); // 最大ランクを更新 // Discord Presenceの更新 - TJAPlayer3.DiscordClient?.SetPresence(new RichPresence() { + OpenTaiko.DiscordClient?.SetPresence(new RichPresence() { Details = "", State = "SongSelect", - Timestamps = new Timestamps(TJAPlayer3.StartupTime), + Timestamps = new Timestamps(OpenTaiko.StartupTime), Assets = new Assets() { - LargeImageKey = TJAPlayer3.LargeImageKey, - LargeImageText = TJAPlayer3.LargeImageText, + LargeImageKey = OpenTaiko.LargeImageKey, + LargeImageText = OpenTaiko.LargeImageText, } }); @@ -326,7 +326,7 @@ namespace TJAPlayer3 { this.ctキー反復用[i] = null; } - TJAPlayer3.tDisposeSafely(ref AI_Background); + OpenTaiko.tDisposeSafely(ref AI_Background); base.DeActivate(); } finally { @@ -354,8 +354,8 @@ namespace TJAPlayer3 { #region [ 初めての進行描画 ] //--------------------- if (base.IsFirstDraw) { - this.ct登場時アニメ用共通 = new CCounter(0, 100, 3, TJAPlayer3.Timer); - if (TJAPlayer3.r直前のステージ == TJAPlayer3.stage結果) { + this.ct登場時アニメ用共通 = new CCounter(0, 100, 3, OpenTaiko.Timer); + if (OpenTaiko.r直前のステージ == OpenTaiko.stage結果) { this.actFIfrom結果画面.tフェードイン開始(); base.ePhaseID = CStage.EPhase.SongSelect_FadeInFromResults; } else { @@ -380,12 +380,12 @@ namespace TJAPlayer3 { this.ct登場時アニメ用共通.Tick(); - if (TJAPlayer3.ConfigIni.bAIBattleMode) { + if (OpenTaiko.ConfigIni.bAIBattleMode) { AI_Background?.Update(); AI_Background?.Draw(); } else { - if (TJAPlayer3.Tx.SongSelect_Background != null) - TJAPlayer3.Tx.SongSelect_Background.t2D描画(0, 0); + if (OpenTaiko.Tx.SongSelect_Background != null) + OpenTaiko.Tx.SongSelect_Background.t2D描画(0, 0); } if (this.rNowSelectedSong != null) { @@ -395,10 +395,10 @@ namespace TJAPlayer3 { nGenreBack = this.NowBg; nOldGenreBack = this.OldBg; - if (!TJAPlayer3.ConfigIni.bAIBattleMode) { + if (!OpenTaiko.ConfigIni.bAIBattleMode) { if (txGenreBack != null) { - float scale = TJAPlayer3.Skin.Resolution[1] / (float)txGenreBack.szTextureSize.Height; - for (int i = 0; i < (TJAPlayer3.Skin.Resolution[0] / (txGenreBack.szTextureSize.Width * scale)) + 2; i++) { + float scale = OpenTaiko.Skin.Resolution[1] / (float)txGenreBack.szTextureSize.Height; + for (int i = 0; i < (OpenTaiko.Skin.Resolution[0] / (txGenreBack.szTextureSize.Width * scale)) + 2; i++) { if (txGenreBack != null) { txGenreBack.color4 = CConversion.ColorToColor4(this.NowBgColor); txGenreBack.Opacity = 255; @@ -409,8 +409,8 @@ namespace TJAPlayer3 { } } if (txOldGenreBack != null) { - float scale = TJAPlayer3.Skin.Resolution[1] / (float)txOldGenreBack.szTextureSize.Height; - for (int i = 0; i < (TJAPlayer3.Skin.Resolution[0] / (txOldGenreBack.szTextureSize.Width * scale)) + 2; i++) { + float scale = OpenTaiko.Skin.Resolution[1] / (float)txOldGenreBack.szTextureSize.Height; + for (int i = 0; i < (OpenTaiko.Skin.Resolution[0] / (txOldGenreBack.szTextureSize.Width * scale)) + 2; i++) { if (txOldGenreBack != null) { txOldGenreBack.color4 = CConversion.ColorToColor4(this.OldBgColor); txOldGenreBack.Opacity = 600 - ctBackgroundFade.CurrentValue; @@ -427,20 +427,20 @@ namespace TJAPlayer3 { #region [Song Panel] if (this.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.BOX) { - TJAPlayer3.Tx.SongSelect_Song_Panel[0]?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Song_Panel[0]?.t2D描画(0, 0); } else if (this.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE) { - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(this.rNowSelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(this.rNowSelectedSong); if (HiddenIndex == DBSongUnlockables.EHiddenIndex.GRAYED) { - TJAPlayer3.Tx.SongSelect_Song_Panel[4]?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Song_Panel[4]?.t2D描画(0, 0); } else { - if (TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度 == (int)Difficulty.Dan) - TJAPlayer3.Tx.SongSelect_Song_Panel[2]?.t2D描画(0, 0); - else if (TJAPlayer3.stageSongSelect.n現在選択中の曲の難易度 == (int)Difficulty.Tower) - TJAPlayer3.Tx.SongSelect_Song_Panel[3]?.t2D描画(0, 0); + if (OpenTaiko.stageSongSelect.n現在選択中の曲の難易度 == (int)Difficulty.Dan) + OpenTaiko.Tx.SongSelect_Song_Panel[2]?.t2D描画(0, 0); + else if (OpenTaiko.stageSongSelect.n現在選択中の曲の難易度 == (int)Difficulty.Tower) + OpenTaiko.Tx.SongSelect_Song_Panel[3]?.t2D描画(0, 0); else - TJAPlayer3.Tx.SongSelect_Song_Panel[1]?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Song_Panel[1]?.t2D描画(0, 0); } } @@ -452,11 +452,11 @@ namespace TJAPlayer3 { if (this.ct登場時アニメ用共通.IsTicked) { double db登場割合 = ((double)this.ct登場時アニメ用共通.CurrentValue) / 100.0; // 100が最終値 double dbY表示割合 = Math.Sin(Math.PI / 2 * db登場割合); - y = ((int)(TJAPlayer3.Tx.SongSelect_Header.sz画像サイズ.Height * dbY表示割合)) - TJAPlayer3.Tx.SongSelect_Header.sz画像サイズ.Height; + y = ((int)(OpenTaiko.Tx.SongSelect_Header.sz画像サイズ.Height * dbY表示割合)) - OpenTaiko.Tx.SongSelect_Header.sz画像サイズ.Height; } - TJAPlayer3.Tx.SongSelect_Header?.t2D描画(0, 0); - TJAPlayer3.Tx.SongSelect_Footer?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Header?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Footer?.t2D描画(0, 0); tTimerDraw(100 - ctTimer.CurrentValue); @@ -465,8 +465,8 @@ namespace TJAPlayer3 { if (this.rNowSelectedSong != null) { if (this.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.BOX) { } else if (this.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE) { - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(this.rNowSelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(this.rNowSelectedSong); if (HiddenIndex != DBSongUnlockables.EHiddenIndex.GRAYED) { actSongInfo.Draw(); @@ -482,25 +482,25 @@ namespace TJAPlayer3 { #endregion - tSongNumberDraw(TJAPlayer3.Skin.SongSelect_SongNumber_X[0], TJAPlayer3.Skin.SongSelect_SongNumber_Y[0], NowSong); - tSongNumberDraw(TJAPlayer3.Skin.SongSelect_SongNumber_X[1], TJAPlayer3.Skin.SongSelect_SongNumber_Y[1], MaxSong); + tSongNumberDraw(OpenTaiko.Skin.SongSelect_SongNumber_X[0], OpenTaiko.Skin.SongSelect_SongNumber_Y[0], NowSong); + tSongNumberDraw(OpenTaiko.Skin.SongSelect_SongNumber_X[1], OpenTaiko.Skin.SongSelect_SongNumber_Y[1], MaxSong); this.actInformation.Draw(); #region[Modicons] - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - ModIcons.tDisplayModsMenu(TJAPlayer3.Skin.SongSelect_ModIcons_X[i], TJAPlayer3.Skin.SongSelect_ModIcons_Y[i], i); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + ModIcons.tDisplayModsMenu(OpenTaiko.Skin.SongSelect_ModIcons_X[i], OpenTaiko.Skin.SongSelect_ModIcons_Y[i], i); } - if (TJAPlayer3.ConfigIni.bTokkunMode) - TJAPlayer3.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, "GAME: TRAINING MODE"); - if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー) - TJAPlayer3.actTextConsole.tPrint(0, 16, CTextConsole.EFontType.White, "GAME: SURVIVAL"); - if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー激辛) - TJAPlayer3.actTextConsole.tPrint(0, 16, CTextConsole.EFontType.White, "GAME: SURVIVAL HARD"); - if (TJAPlayer3.ConfigIni.bSuperHard) - TJAPlayer3.actTextConsole.tPrint(0, 32, CTextConsole.EFontType.Cyan, "SUPER HARD MODE : ON"); + if (OpenTaiko.ConfigIni.bTokkunMode) + OpenTaiko.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, "GAME: TRAINING MODE"); + if (OpenTaiko.ConfigIni.eGameMode == EGame.完走叩ききりまショー) + OpenTaiko.actTextConsole.tPrint(0, 16, CTextConsole.EFontType.White, "GAME: SURVIVAL"); + if (OpenTaiko.ConfigIni.eGameMode == EGame.完走叩ききりまショー激辛) + OpenTaiko.actTextConsole.tPrint(0, 16, CTextConsole.EFontType.White, "GAME: SURVIVAL HARD"); + if (OpenTaiko.ConfigIni.bSuperHard) + OpenTaiko.actTextConsole.tPrint(0, 32, CTextConsole.EFontType.Cyan, "SUPER HARD MODE : ON"); #endregion @@ -508,20 +508,20 @@ namespace TJAPlayer3 { if (this.rNowSelectedSong != null && this.rNowSelectedSong.eノード種別 == CSongListNode.ENodeType.SCORE) { - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); - var HiddenIndex = TJAPlayer3.Databases.DBSongUnlockables.tGetSongHiddenIndex(this.rNowSelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); + var HiddenIndex = OpenTaiko.Databases.DBSongUnlockables.tGetSongHiddenIndex(this.rNowSelectedSong); if (this.actDifficultySelectionScreen.bIsDifficltSelect == false || this.actSongList.ctDifficultyIn.CurrentValue < 1000) this.actPreimageパネル.Draw(); if (HiddenIndex == DBSongUnlockables.EHiddenIndex.GRAYED) - TJAPlayer3.Tx.SongSelect_Song_Panel[5]?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Song_Panel[5]?.t2D描画(0, 0); if (IsSongLocked) { - TJAPlayer3.Tx.SongSelect_Unlock_Conditions?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Unlock_Conditions?.t2D描画(0, 0); if (actSongList.ttkNowUnlockConditionText is not null) { - TitleTextureKey.ResolveTitleTexture(actSongList.ttkNowUnlockConditionText)?.t2D描画(TJAPlayer3.Skin.SongSelect_Unlock_Conditions_Text[0], TJAPlayer3.Skin.SongSelect_Unlock_Conditions_Text[1]); + TitleTextureKey.ResolveTitleTexture(actSongList.ttkNowUnlockConditionText)?.t2D描画(OpenTaiko.Skin.SongSelect_Unlock_Conditions_Text[0], OpenTaiko.Skin.SongSelect_Unlock_Conditions_Text[1]); } } } @@ -548,22 +548,22 @@ namespace TJAPlayer3 { //if (this.ctChara_Select.b終了値に達してない) - for (int player = 0; player < TJAPlayer3.ConfigIni.nPlayerCount; player++) { + for (int player = 0; player < OpenTaiko.ConfigIni.nPlayerCount; player++) { CCounter ___cc = CMenuCharacter._getReferenceCounter(CMenuCharacter.ECharacterAnimation.SELECT)[player]; - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character; //int chara_x = TJAPlayer3.Skin.Characters_Menu_X[_charaId][player]; //int chara_y = TJAPlayer3.Skin.Characters_Menu_Y[_charaId][player]; - int chara_x = TJAPlayer3.Skin.SongSelect_NamePlate_X[player] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2; - int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[player]; + int chara_x = OpenTaiko.Skin.SongSelect_NamePlate_X[player] + OpenTaiko.Tx.NamePlateBase.szTextureSize.Width / 2; + int chara_y = OpenTaiko.Skin.SongSelect_NamePlate_Y[player]; //int puchi_x = player == 0 ? 0 + 100 : 981 + 250; //int puchi_y = player == 0 ? 330 + 230 : 330 + 230; - int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[player % 2]; - int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[player % 2]; + int puchi_x = chara_x + OpenTaiko.Skin.Adjustments_MenuPuchichara_X[player % 2]; + int puchi_y = chara_y + OpenTaiko.Skin.Adjustments_MenuPuchichara_Y[player % 2]; if (___cc != null && ___cc.IsUnEnded) { CMenuCharacter.tMenuDisplayCharacter(player, chara_x, chara_y, CMenuCharacter.ECharacterAnimation.SELECT); @@ -593,14 +593,14 @@ namespace TJAPlayer3 { #endregion #region [ Nameplate ] - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[i], TJAPlayer3.Skin.SongSelect_NamePlate_Y[i], i); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + OpenTaiko.NamePlate.tNamePlateDraw(OpenTaiko.Skin.SongSelect_NamePlate_X[i], OpenTaiko.Skin.SongSelect_NamePlate_Y[i], i); } #endregion #region [Pad displayables] - int defaultTable = Math.Max(0, Math.Min((int)Difficulty.Edit + 1, TJAPlayer3.ConfigIni.nDefaultCourse)); + int defaultTable = Math.Max(0, Math.Min((int)Difficulty.Edit + 1, OpenTaiko.ConfigIni.nDefaultCourse)); int[] currentPads = new int[5] { defaultTable, @@ -610,53 +610,53 @@ namespace TJAPlayer3 { defaultTable }; //int currentPad = (int)Difficulty.Edit + 1; - if (TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) { - if (TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[0] >= 2) - currentPads[0] = TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[0] - 2; - if (TJAPlayer3.ConfigIni.nPlayerCount > 1 && TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[1] >= 2) - currentPads[1] = TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[1] - 2; - if (TJAPlayer3.ConfigIni.nPlayerCount > 1 && TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[2] >= 2) - currentPads[2] = TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[2] - 2; - if (TJAPlayer3.ConfigIni.nPlayerCount > 1 && TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[3] >= 2) - currentPads[3] = TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[3] - 2; - if (TJAPlayer3.ConfigIni.nPlayerCount > 1 && TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[4] >= 2) - currentPads[4] = TJAPlayer3.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[4] - 2; + if (OpenTaiko.stageSongSelect.actDifficultySelectionScreen.bIsDifficltSelect) { + if (OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[0] >= 2) + currentPads[0] = OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[0] - 2; + if (OpenTaiko.ConfigIni.nPlayerCount > 1 && OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[1] >= 2) + currentPads[1] = OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[1] - 2; + if (OpenTaiko.ConfigIni.nPlayerCount > 1 && OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[2] >= 2) + currentPads[2] = OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[2] - 2; + if (OpenTaiko.ConfigIni.nPlayerCount > 1 && OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[3] >= 2) + currentPads[3] = OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[3] - 2; + if (OpenTaiko.ConfigIni.nPlayerCount > 1 && OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[4] >= 2) + currentPads[4] = OpenTaiko.stageSongSelect.actDifficultySelectionScreen.n現在の選択行[4] - 2; } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; - int p = TJAPlayer3.GetActualPlayer(i); + int p = OpenTaiko.GetActualPlayer(i); - TJAPlayer3.Tx.SongSelect_Table[currentPads[i]]?.t2D描画(TJAPlayer3.Skin.SongSelect_Table_X[i], TJAPlayer3.Skin.SongSelect_Table_Y[i]); + OpenTaiko.Tx.SongSelect_Table[currentPads[i]]?.t2D描画(OpenTaiko.Skin.SongSelect_Table_X[i], OpenTaiko.Skin.SongSelect_Table_Y[i]); CActSelect曲リスト.CScorePad[] SPArrRef = CSongDict.ScorePads[p]; // Current board for (int j = 0; j < 11; j++) { - tBoardNumberDraw(TJAPlayer3.Skin.SongSelect_BoardNumber_X[i][j], TJAPlayer3.Skin.SongSelect_BoardNumber_Y[i][j], j < 7 ? + tBoardNumberDraw(OpenTaiko.Skin.SongSelect_BoardNumber_X[i][j], OpenTaiko.Skin.SongSelect_BoardNumber_Y[i][j], j < 7 ? SPArrRef[currentPads[i]].ScoreRankCount[j] : SPArrRef[currentPads[i]].CrownCount[j - 7]); } } - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) { - TJAPlayer3.Tx.SongSelect_Coin_Slot[0]?.t2D描画(0, 0, - new Rectangle(0, 0, (TJAPlayer3.Tx.SongSelect_Coin_Slot[0].sz画像サイズ.Width / 2) + ((TJAPlayer3.ConfigIni.nPlayerCount > 1 && !TJAPlayer3.ConfigIni.bAIBattleMode) ? (TJAPlayer3.Tx.SongSelect_Coin_Slot[0].sz画像サイズ.Width / 2) : 0), TJAPlayer3.Tx.SongSelect_Coin_Slot[0].sz画像サイズ.Height)); + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) { + OpenTaiko.Tx.SongSelect_Coin_Slot[0]?.t2D描画(0, 0, + new Rectangle(0, 0, (OpenTaiko.Tx.SongSelect_Coin_Slot[0].sz画像サイズ.Width / 2) + ((OpenTaiko.ConfigIni.nPlayerCount > 1 && !OpenTaiko.ConfigIni.bAIBattleMode) ? (OpenTaiko.Tx.SongSelect_Coin_Slot[0].sz画像サイズ.Width / 2) : 0), OpenTaiko.Tx.SongSelect_Coin_Slot[0].sz画像サイズ.Height)); } else { - TJAPlayer3.Tx.SongSelect_Coin_Slot[TJAPlayer3.ConfigIni.nPlayerCount - 2]?.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Coin_Slot[OpenTaiko.ConfigIni.nPlayerCount - 2]?.t2D描画(0, 0); } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; - int p = TJAPlayer3.GetActualPlayer(i); + int p = OpenTaiko.GetActualPlayer(i); - if (TJAPlayer3.SaveFileInstances[p].data.Medals >= 0) - tBoardNumberDraw(TJAPlayer3.Skin.SongSelect_BoardNumber_X[i][11], TJAPlayer3.Skin.SongSelect_BoardNumber_Y[i][11], (int)TJAPlayer3.SaveFileInstances[p].data.Medals); + if (OpenTaiko.SaveFileInstances[p].data.Medals >= 0) + tBoardNumberDraw(OpenTaiko.Skin.SongSelect_BoardNumber_X[i][11], OpenTaiko.Skin.SongSelect_BoardNumber_Y[i][11], (int)OpenTaiko.SaveFileInstances[p].data.Medals); #region [HiScore plate] @@ -670,7 +670,7 @@ namespace TJAPlayer3 { int displayedScore = 0; int table = 0; - TJAPlayer3.Tx.SongSelect_High_Score?.t2D中心基準描画(TJAPlayer3.Skin.SongSelect_High_Score_X[i], TJAPlayer3.Skin.SongSelect_High_Score_Y[i]); + OpenTaiko.Tx.SongSelect_High_Score?.t2D中心基準描画(OpenTaiko.Skin.SongSelect_High_Score_X[i], OpenTaiko.Skin.SongSelect_High_Score_Y[i]); if (this.n現在選択中の曲の難易度 > (int)Difficulty.Edit) table = 0; @@ -679,21 +679,21 @@ namespace TJAPlayer3 { else table = closest; - var TableEntry = TJAPlayer3.SaveFileInstances[p].data.tGetSongSelectTableEntry(TJAPlayer3.stageSongSelect.rNowSelectedSong.tGetUniqueId()); + var TableEntry = OpenTaiko.SaveFileInstances[p].data.tGetSongSelectTableEntry(OpenTaiko.stageSongSelect.rNowSelectedSong.tGetUniqueId()); displayedScore = TableEntry.HighScore[table]; if (this.n現在選択中の曲の難易度 <= (int)Difficulty.Edit) { - CTexture __tex = (TJAPlayer3.Tx.SongSelect_Difficulty_Cymbol == null) ? TJAPlayer3.Tx.Dani_Difficulty_Cymbol : TJAPlayer3.Tx.SongSelect_Difficulty_Cymbol; + CTexture __tex = (OpenTaiko.Tx.SongSelect_Difficulty_Cymbol == null) ? OpenTaiko.Tx.Dani_Difficulty_Cymbol : OpenTaiko.Tx.SongSelect_Difficulty_Cymbol; int width = __tex.sz画像サイズ.Width / 5; int height = __tex.sz画像サイズ.Height; __tex.t2D中心基準描画( - TJAPlayer3.Skin.SongSelect_High_Score_Difficulty_Cymbol_X[i], - TJAPlayer3.Skin.SongSelect_High_Score_Difficulty_Cymbol_Y[i], + OpenTaiko.Skin.SongSelect_High_Score_Difficulty_Cymbol_X[i], + OpenTaiko.Skin.SongSelect_High_Score_Difficulty_Cymbol_Y[i], new Rectangle(table * width, 0, width, height)); } - tBoardNumberDraw(TJAPlayer3.Skin.SongSelect_BoardNumber_X[i][12], TJAPlayer3.Skin.SongSelect_BoardNumber_Y[i][12], displayedScore); + tBoardNumberDraw(OpenTaiko.Skin.SongSelect_BoardNumber_X[i][12], OpenTaiko.Skin.SongSelect_BoardNumber_Y[i][12], displayedScore); } } @@ -708,7 +708,7 @@ namespace TJAPlayer3 { // キー入力 if (base.ePhaseID == CStage.EPhase.Common_NORMAL - && TJAPlayer3.act現在入力を占有中のプラグイン == null) { + && OpenTaiko.act現在入力を占有中のプラグイン == null) { #region [ 簡易CONFIGでMore、またはShift+F1: 詳細CONFIG呼び出し ] if (actQuickConfig.bGotoDetailConfig) { // 詳細CONFIG呼び出し actQuickConfig.tDeativatePopupMenu(); @@ -716,7 +716,7 @@ namespace TJAPlayer3 { this.eフェードアウト完了時の戻り値 = E戻り値.コンフィグ呼び出し; // #24525 2011.3.16 yyagi: [SHIFT]-[F1]でCONFIG呼び出し this.actFIFO.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); return 0; } #endregion @@ -735,9 +735,9 @@ namespace TJAPlayer3 { CSongSelectSongManager.disable(); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - this.actSongList.ctBarFlash.Start(0, 2700, 1, TJAPlayer3.Timer); - this.actSongList.ctBoxOpen.Start(200, 2700, 1.3f, TJAPlayer3.Timer); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + this.actSongList.ctBarFlash.Start(0, 2700, 1, OpenTaiko.Timer); + this.actSongList.ctBoxOpen.Start(200, 2700, 1.3f, OpenTaiko.Timer); this.actSongList.bBoxOpen = true; //this.ctChara_Select.t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Select.Length - 1, 1000 / 45, TJAPlayer3.Timer); @@ -750,11 +750,11 @@ namespace TJAPlayer3 { this.tSetSongRandomly(); // Called here - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); this.actDifficultySelectionScreen.bIsDifficltSelect = true; this.actDifficultySelectionScreen.t選択画面初期化(); - this.actSongList.ctBarFlash.Start(0, 2700, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval, TJAPlayer3.Timer); - this.actSongList.ctDifficultyIn.Start(0, 3200, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval, TJAPlayer3.Timer); + this.actSongList.ctBarFlash.Start(0, 2700, OpenTaiko.Skin.SongSelect_Box_Opening_Interval, OpenTaiko.Timer); + this.actSongList.ctDifficultyIn.Start(0, 3200, OpenTaiko.Skin.SongSelect_Box_Opening_Interval, OpenTaiko.Timer); //this.ctChara_Select.t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Select.Length - 1, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.SELECT); @@ -766,12 +766,12 @@ namespace TJAPlayer3 { } } else if (!this.actSortSongs.bIsActivePopupMenu && !this.actQuickConfig.bIsActivePopupMenu && !this.actDifficultySelectionScreen.bIsDifficltSelect && !actNewHeya.IsOpend) { #region [ ESC ] - if ((TJAPlayer3.Pad.bPressedDGB(EPad.Cancel) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) && (this.actSongList.rCurrentlySelectedSong != null))// && ( ) ) ) + if ((OpenTaiko.Pad.bPressedDGB(EPad.Cancel) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) && (this.actSongList.rCurrentlySelectedSong != null))// && ( ) ) ) if (this.actSongList.rCurrentlySelectedSong.rParentNode == null) { // [ESC] this.actPresound.tStopSound(); CSongSelectSongManager.enable(); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る; this.actFIFO.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; @@ -781,9 +781,9 @@ namespace TJAPlayer3 { this.actPresound.tStopSound(); CSongSelectSongManager.enable(); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); - this.actSongList.ctBarFlash.Start(0, 2700, 1, TJAPlayer3.Timer); - this.actSongList.ctBoxOpen.Start(200, 2700, 1.3f, TJAPlayer3.Timer); + OpenTaiko.Skin.soundCancelSFX.tPlay(); + this.actSongList.ctBarFlash.Start(0, 2700, 1, OpenTaiko.Timer); + this.actSongList.ctBoxOpen.Start(200, 2700, 1.3f, OpenTaiko.Timer); this.actSongList.bBoxClose = true; //this.ctChara_Select.t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Select.Length - 1, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.SELECT); @@ -791,53 +791,53 @@ namespace TJAPlayer3 { } #endregion #region [ Shift-F1: Config shortcut ] - if ((TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightShift) || TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftShift)) && - TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F1)) { // [SHIFT] + [F1] CONFIG + if ((OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightShift) || OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftShift)) && + OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F1)) { // [SHIFT] + [F1] CONFIG this.actPresound.tStopSound(); this.eフェードアウト完了時の戻り値 = E戻り値.コンフィグ呼び出し; // #24525 2011.3.16 yyagi: [SHIFT]-[F1]でCONFIG呼び出し this.actFIFO.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); return 0; } #endregion #region [ F2 Quick Config ] - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.QuickConfig)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.QuickConfig)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); this.actQuickConfig.tActivatePopupMenu(EInstrumentPad.DRUMS); } #endregion #region [ F3 1P AUTO ] - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.ToggleAutoP1)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.bAutoPlay[0]); + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.ToggleAutoP1)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); + CUtility.ToggleBoolian(ref OpenTaiko.ConfigIni.bAutoPlay[0]); } #endregion #region [ F4 2P AUTO ] - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.ToggleAutoP2)) { - if (TJAPlayer3.ConfigIni.nPlayerCount > 1) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.bAutoPlay[1]); + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.ToggleAutoP2)) { + if (OpenTaiko.ConfigIni.nPlayerCount > 1) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); + CUtility.ToggleBoolian(ref OpenTaiko.ConfigIni.bAutoPlay[1]); } } #endregion #region [ F5 Super Hard Mode (DEPRECATED / UNUSED) ] - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F5)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F5)) { // Deprecated, to delete - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.bSuperHard); + OpenTaiko.Skin.soundChangeSFX.tPlay(); + CUtility.ToggleBoolian(ref OpenTaiko.ConfigIni.bSuperHard); } #endregion #region [ F7 TokkunMode ] - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.ToggleTrainingMode)) { - if (TJAPlayer3.ConfigIni.nPlayerCount < 2) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.bTokkunMode); + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.ToggleTrainingMode)) { + if (OpenTaiko.ConfigIni.nPlayerCount < 2) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); + CUtility.ToggleBoolian(ref OpenTaiko.ConfigIni.bTokkunMode); } } #endregion #region [ F9 New Heya ] - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.NewHeya)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.NewHeya)) { actNewHeya.Open(); } #endregion @@ -847,63 +847,63 @@ namespace TJAPlayer3 { if (this.actSongList.ctBoxOpen.IsEnded || this.actSongList.ctBoxOpen.CurrentValue == 0) { if (!this.bCurrentlyScrolling) { #region [ Decide ] - if ((TJAPlayer3.Pad.bPressedDGB(EPad.Decide) || - ((TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))))) { + if ((OpenTaiko.Pad.bPressedDGB(EPad.Decide) || + ((OpenTaiko.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))))) { if (this.actSongList.rCurrentlySelectedSong != null) { switch (this.actSongList.rCurrentlySelectedSong.eノード種別) { case CSongListNode.ENodeType.SCORE: { - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); if (IsSongLocked) { - var SongToUnlock = TJAPlayer3.Databases.DBSongUnlockables.tGetUnlockableByUniqueId(this.rNowSelectedSong); + var SongToUnlock = OpenTaiko.Databases.DBSongUnlockables.tGetUnlockableByUniqueId(this.rNowSelectedSong); if (SongToUnlock != null) { - (bool, string?) response = SongToUnlock.unlockConditions.tConditionMetWrapper(TJAPlayer3.SaveFile, DBUnlockables.CUnlockConditions.EScreen.SongSelect); + (bool, string?) response = SongToUnlock.unlockConditions.tConditionMetWrapper(OpenTaiko.SaveFile, DBUnlockables.CUnlockConditions.EScreen.SongSelect); Color responseColor = (response.Item1) ? Color.Lime : Color.Red; if (actSongList.ttkNowUnlockConditionText is not null) { actSongList.ttkNowUnlockConditionText = new TitleTextureKey( - response.Item2 ?? actSongList.ttkNowUnlockConditionText.str文字, + response.Item2 ?? actSongList.ttkNowUnlockConditionText.str, actSongList.ttkNowUnlockConditionText.cPrivateFastFont, responseColor, Color.Black, 1000); } if (response.Item1) { - TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data.UnlockedSongs.Add(this.rNowSelectedSong?.tGetUniqueId() ?? ""); + OpenTaiko.SaveFileInstances[OpenTaiko.SaveFile].data.UnlockedSongs.Add(this.rNowSelectedSong?.tGetUniqueId() ?? ""); DBSaves.RegisterStringUnlockedAsset( - TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data.SaveId, + OpenTaiko.SaveFileInstances[OpenTaiko.SaveFile].data.SaveId, "unlocked_songs", this.rNowSelectedSong?.tGetUniqueId() ?? "" // Can't be null in this context ); - TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].tSpendCoins(SongToUnlock.unlockConditions.Values[0]); + OpenTaiko.SaveFileInstances[OpenTaiko.SaveFile].tSpendCoins(SongToUnlock.unlockConditions.Values[0]); // Play modal animation here ? } else - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } else { - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } } else { if (this.n現在選択中の曲の難易度 >= (int)Difficulty.Tower) { - if (TJAPlayer3.ConfigIni.nPlayerCount == 1 && !TJAPlayer3.ConfigIni.bTokkunMode) { + if (OpenTaiko.ConfigIni.nPlayerCount == 1 && !OpenTaiko.ConfigIni.bTokkunMode) { // Init tower variables if (this.n現在選択中の曲の難易度 == (int)Difficulty.Tower) CFloorManagement.reinitialize(this.rNowSelectedSong.arスコア[(int)Difficulty.Tower].譜面情報.nLife); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.Skin.voiceMenuSongDecide[TJAPlayer3.SaveFile]?.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.voiceMenuSongDecide[OpenTaiko.SaveFile]?.tPlay(); this.t曲を選択する(); } else { - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } } else { // Called here - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); this.actDifficultySelectionScreen.bIsDifficltSelect = true; this.actDifficultySelectionScreen.t選択画面初期化(); - this.actSongList.ctBarFlash.Start(0, 2700, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval, TJAPlayer3.Timer); - this.actSongList.ctDifficultyIn.Start(0, 3200, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval, TJAPlayer3.Timer); + this.actSongList.ctBarFlash.Start(0, 2700, OpenTaiko.Skin.SongSelect_Box_Opening_Interval, OpenTaiko.Timer); + this.actSongList.ctDifficultyIn.Start(0, 3200, OpenTaiko.Skin.SongSelect_Box_Opening_Interval, OpenTaiko.Timer); //this.ctChara_Select.t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Select.Length - 1, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.SELECT); } @@ -920,7 +920,7 @@ namespace TJAPlayer3 { this.actSongList.rCurrentlySelectedSong.list子リスト = CSongDict.tFetchRecentlyPlayedSongsFolder(this.actSongList.rCurrentlySelectedSong); } else if (this.actSongList.rCurrentlySelectedSong.strジャンル == "SearchD") { this.actSongList.tMenuContextTrigger(eMenuContext.SearchByDifficulty); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); goto Decided; //this.act曲リスト.r現在選択中の曲.list子リスト = CSongDict.tFetchSongsByDifficulty(this.act曲リスト.r現在選択中の曲, (int)Difficulty.Oni, 8); } @@ -929,9 +929,9 @@ namespace TJAPlayer3 { CSongSelectSongManager.disable(); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - this.actSongList.ctBarFlash.Start(0, 2700, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval, TJAPlayer3.Timer); - this.actSongList.ctBoxOpen.Start(200, 2700, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval * 1.3f, TJAPlayer3.Timer); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + this.actSongList.ctBarFlash.Start(0, 2700, OpenTaiko.Skin.SongSelect_Box_Opening_Interval, OpenTaiko.Timer); + this.actSongList.ctBoxOpen.Start(200, 2700, OpenTaiko.Skin.SongSelect_Box_Opening_Interval * 1.3f, OpenTaiko.Timer); this.actSongList.bBoxOpen = true; //this.ctChara_Select.t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Select.Length - 1, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.SELECT); @@ -941,9 +941,9 @@ namespace TJAPlayer3 { // TOJIRU CSongSelectSongManager.enable(); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); - this.actSongList.ctBarFlash.Start(0, 2700, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval, TJAPlayer3.Timer); - this.actSongList.ctBoxOpen.Start(200, 2700, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval * 1.3f, TJAPlayer3.Timer); + OpenTaiko.Skin.soundCancelSFX.tPlay(); + this.actSongList.ctBarFlash.Start(0, 2700, OpenTaiko.Skin.SongSelect_Box_Opening_Interval, OpenTaiko.Timer); + this.actSongList.ctBoxOpen.Start(200, 2700, OpenTaiko.Skin.SongSelect_Box_Opening_Interval * 1.3f, OpenTaiko.Timer); this.actSongList.bBoxClose = true; //this.ctChara_Select.t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Select.Length - 1, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.SELECT); @@ -953,11 +953,11 @@ namespace TJAPlayer3 { this.tSetSongRandomly(); // Called here - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); this.actDifficultySelectionScreen.bIsDifficltSelect = true; this.actDifficultySelectionScreen.t選択画面初期化(); - this.actSongList.ctBarFlash.Start(0, 2700, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval, TJAPlayer3.Timer); - this.actSongList.ctDifficultyIn.Start(0, 3200, TJAPlayer3.Skin.SongSelect_Box_Opening_Interval, TJAPlayer3.Timer); + this.actSongList.ctBarFlash.Start(0, 2700, OpenTaiko.Skin.SongSelect_Box_Opening_Interval, OpenTaiko.Timer); + this.actSongList.ctDifficultyIn.Start(0, 3200, OpenTaiko.Skin.SongSelect_Box_Opening_Interval, OpenTaiko.Timer); //this.ctChara_Select.t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Select.Length - 1, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.SELECT); @@ -990,14 +990,14 @@ namespace TJAPlayer3 { #region [ Favorite ] if (!this.bCurrentlyScrolling) { - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(this.rNowSelectedSong); - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftControl) && !IsSongLocked) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftControl) && !IsSongLocked) { CSongUniqueID csu = this.rNowSelectedSong.uniqueId; if (csu != null) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.Favorites.tToggleFavorite(csu.data.id); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Favorites.tToggleFavorite(csu.data.id); } } } @@ -1006,13 +1006,13 @@ namespace TJAPlayer3 { #region [ Up ] if (!this.bCurrentlyScrolling) { - this.ctキー反復用.Up.KeyIntervalFunc(TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow), new CCounter.KeyProcess(this.tカーソルを上へ移動する)); + this.ctキー反復用.Up.KeyIntervalFunc(OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow), new CCounter.KeyProcess(this.tカーソルを上へ移動する)); //this.ctキー反復用.Up.tキー反復( CDTXMania.Input管理.Keyboard.bキーが押されている( (int) SlimDXKeys.Key.UpArrow ) || CDTXMania.Input管理.Keyboard.bキーが押されている( (int) SlimDXKeys.Key.LeftArrow ), new CCounter.DGキー処理( this.tカーソルを上へ移動する ) ); - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { this.tカーソルを上へ移動する(); } } else { - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { //this.ctChara_Jump[0].t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Jump.Length + 8, 1000 / 45, TJAPlayer3.Timer); //this.ctChara_Jump[1].t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Jump.Length + 8, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.SELECT); @@ -1024,14 +1024,14 @@ namespace TJAPlayer3 { #region [ Down ] if (!this.bCurrentlyScrolling) { - this.ctキー反復用.Down.KeyIntervalFunc(TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow), new CCounter.KeyProcess(this.tカーソルを下へ移動する)); + this.ctキー反復用.Down.KeyIntervalFunc(OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow), new CCounter.KeyProcess(this.tカーソルを下へ移動する)); //this.ctキー反復用.Down.tキー反復( CDTXMania.Input管理.Keyboard.bキーが押されている( (int) SlimDXKeys.Key.DownArrow ) || CDTXMania.Input管理.Keyboard.bキーが押されている( (int) SlimDXKeys.Key.RightArrow ), new CCounter.DGキー処理( this.tカーソルを下へ移動する ) ); - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { this.tカーソルを下へ移動する(); } } else { - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { //this.ctChara_Jump[0].t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Jump.Length + 8, 1000 / 45, TJAPlayer3.Timer); //this.ctChara_Jump[1].t開始(0, TJAPlayer3.Tx.SongSelect_Chara_Jump.Length + 8, 1000 / 45, TJAPlayer3.Timer); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.SELECT); @@ -1056,19 +1056,19 @@ namespace TJAPlayer3 { */ #endregion #region [ BDx2: 簡易CONFIG ] - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.SortSongs)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.SortSongs)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); this.actSortSongs.tActivatePopupMenu(EInstrumentPad.DRUMS, ref this.actSongList); } #endregion #region [ HHx2: 難易度変更 ] - if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.HH) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.HHO)) { // [HH]x2 難易度変更 + if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.HH) || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.HHO)) { // [HH]x2 難易度変更 CommandHistory.Add(EInstrumentPad.DRUMS, EPadFlag.HH); EPadFlag[] comChangeDifficulty = new EPadFlag[] { EPadFlag.HH, EPadFlag.HH }; if (CommandHistory.CheckCommand(comChangeDifficulty, EInstrumentPad.DRUMS)) { Debug.WriteLine("ドラムス難易度変更"); this.actSongList.t難易度レベルをひとつ進める(); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } } #endregion @@ -1080,7 +1080,7 @@ namespace TJAPlayer3 { #region [ Minus & Equals Sound Group Level ] KeyboardSoundGroupLevelControlHandler.Handle( - TJAPlayer3.InputManager.Keyboard, TJAPlayer3.SoundGroupLevelController, TJAPlayer3.Skin, true); + OpenTaiko.InputManager.Keyboard, OpenTaiko.SoundGroupLevelController, OpenTaiko.Skin, true); #endregion this.actSortSongs.t進行描画(); @@ -1098,7 +1098,7 @@ namespace TJAPlayer3 { //------------------------------ - if (TJAPlayer3.ConfigIni.nPlayerCount == 1) { + if (OpenTaiko.ConfigIni.nPlayerCount == 1) { var opacity = 0; if (ctCreditAnime.CurrentValue <= 510) @@ -1108,9 +1108,9 @@ namespace TJAPlayer3 { else opacity = 255 - ((ctCreditAnime.CurrentValue - (4500 - 510)) / 2); - TJAPlayer3.Tx.SongSelect_Credit.Opacity = opacity; + OpenTaiko.Tx.SongSelect_Credit.Opacity = opacity; - TJAPlayer3.Tx.SongSelect_Credit.t2D描画(0, 0); + OpenTaiko.Tx.SongSelect_Credit.t2D描画(0, 0); } for (int i = 0; i < 5; i++) { @@ -1297,7 +1297,7 @@ namespace TJAPlayer3 { private CTexture txGenreBack { get { if (txCustomSelectBG == null) { - return HGenreBar.tGetGenreBar(nGenreBack, TJAPlayer3.Tx.SongSelect_GenreBack); + return HGenreBar.tGetGenreBar(nGenreBack, OpenTaiko.Tx.SongSelect_GenreBack); } else { return txCustomSelectBG; } @@ -1306,7 +1306,7 @@ namespace TJAPlayer3 { private CTexture txOldGenreBack { get { if (txCustomPrevSelectBG == null) { - return HGenreBar.tGetGenreBar(nOldGenreBack, TJAPlayer3.Tx.SongSelect_GenreBack); + return HGenreBar.tGetGenreBar(nOldGenreBack, OpenTaiko.Tx.SongSelect_GenreBack); } else { return txCustomPrevSelectBG; } @@ -1317,13 +1317,13 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j - (nums.Length / 2.0f); - float _x = x - (TJAPlayer3.Skin.SongSelect_BoardNumber_Interval[0] * offset); - float _y = y - (TJAPlayer3.Skin.SongSelect_BoardNumber_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.SongSelect_BoardNumber_Interval[0] * offset); + float _y = y - (OpenTaiko.Skin.SongSelect_BoardNumber_Interval[1] * offset); - float width = TJAPlayer3.Tx.SongSelect_BoardNumber.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.SongSelect_BoardNumber.sz画像サイズ.Height; + float width = OpenTaiko.Tx.SongSelect_BoardNumber.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.SongSelect_BoardNumber.sz画像サイズ.Height; - TJAPlayer3.Tx.SongSelect_BoardNumber.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.SongSelect_BoardNumber.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } @@ -1331,13 +1331,13 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j - (nums.Length / 2.0f); - float _x = x - (TJAPlayer3.Skin.SongSelect_SongNumber_Interval[0] * offset); - float _y = y - (TJAPlayer3.Skin.SongSelect_SongNumber_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.SongSelect_SongNumber_Interval[0] * offset); + float _y = y - (OpenTaiko.Skin.SongSelect_SongNumber_Interval[1] * offset); - float width = TJAPlayer3.Tx.SongSelect_Song_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.SongSelect_Song_Number.sz画像サイズ.Height; + float width = OpenTaiko.Tx.SongSelect_Song_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.SongSelect_Song_Number.sz画像サイズ.Height; - TJAPlayer3.Tx.SongSelect_Song_Number.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.SongSelect_Song_Number.t2D描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } @@ -1347,15 +1347,15 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { - if (TJAPlayer3.ConfigIni.bEnableCountdownTimer) { + if (OpenTaiko.ConfigIni.bEnableCountdownTimer) { float offset = j - (nums.Length / 2.0f); - float x = TJAPlayer3.Skin.SongSelect_Timer[0] - (int)(TJAPlayer3.Skin.SongSelect_Timer_Interval[0] * offset); - float y = TJAPlayer3.Skin.SongSelect_Timer[1] - (int)(TJAPlayer3.Skin.SongSelect_Timer_Interval[1] * offset); + float x = OpenTaiko.Skin.SongSelect_Timer[0] - (int)(OpenTaiko.Skin.SongSelect_Timer_Interval[0] * offset); + float y = OpenTaiko.Skin.SongSelect_Timer[1] - (int)(OpenTaiko.Skin.SongSelect_Timer_Interval[1] * offset); - float width = TJAPlayer3.Tx.SongSelect_Timer.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.SongSelect_Timer.sz画像サイズ.Height / 2.0f; + float width = OpenTaiko.Tx.SongSelect_Timer.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.SongSelect_Timer.sz画像サイズ.Height / 2.0f; - TJAPlayer3.Tx.SongSelect_Timer.t2D描画(x, y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.SongSelect_Timer.t2D描画(x, y, new RectangleF(width * nums[j], 0, width, height)); } } } @@ -1381,7 +1381,7 @@ namespace TJAPlayer3 { STCommandTime _stct = new STCommandTime { eInst = _eInst, ePad = _ePad, - time = TJAPlayer3.Timer.NowTime + time = OpenTaiko.Timer.NowTime }; if (stct.Count >= buffersize) { @@ -1408,7 +1408,7 @@ namespace TJAPlayer3 { return false; } - long curTime = TJAPlayer3.Timer.NowTime; + long curTime = OpenTaiko.Timer.NowTime; //Debug.WriteLine("Start checking...targetCount=" + targetCount); for (int i = targetCount - 1, j = stciCount - 1; i >= 0; i--, j--) { if (_ePad[i] != stct[j].ePad) { @@ -1439,27 +1439,27 @@ namespace TJAPlayer3 { private void tカーソルを下へ移動する() { if ((this.actSongList.rGetSideSong(1).eノード種別 == CSongListNode.ENodeType.SCORE) || this.actSongList.rGetSideSong(1).eノード種別 == CSongListNode.ENodeType.BACKBOX) { - TJAPlayer3.stageSongSelect.bBGMIn再生した = false; + OpenTaiko.stageSongSelect.bBGMIn再生した = false; CSongSelectSongManager.disable(); } else { CSongSelectSongManager.enable(); CSongSelectSongManager.playSongIfPossible(); } - this.ctBackgroundFade.Start(0, 600, 1, TJAPlayer3.Timer); + this.ctBackgroundFade.Start(0, 600, 1, OpenTaiko.Timer); if (this.actSongList.ctBarOpen.CurrentValue >= 200 || this.ctBackgroundFade.CurrentValue >= 600 - 255) { - TJAPlayer3.stageSongSelect.OldGenre = this.rNowSelectedSong.strジャンル; - TJAPlayer3.stageSongSelect.OldUseGenre = !this.rNowSelectedSong.isChangedBgType; - TJAPlayer3.stageSongSelect.OldBg = this.rNowSelectedSong.BgType; - TJAPlayer3.stageSongSelect.OldBgColor = this.rNowSelectedSong.BgColor; + OpenTaiko.stageSongSelect.OldGenre = this.rNowSelectedSong.strジャンル; + OpenTaiko.stageSongSelect.OldUseGenre = !this.rNowSelectedSong.isChangedBgType; + OpenTaiko.stageSongSelect.OldBg = this.rNowSelectedSong.BgType; + OpenTaiko.stageSongSelect.OldBgColor = this.rNowSelectedSong.BgColor; } this.actSongList.t次に移動(); - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); } private void tカーソルを上へ移動する() { if ((this.actSongList.rGetSideSong(-1).eノード種別 == CSongListNode.ENodeType.SCORE) || this.actSongList.rGetSideSong(-1).eノード種別 == CSongListNode.ENodeType.BACKBOX) { - TJAPlayer3.stageSongSelect.bBGMIn再生した = false; + OpenTaiko.stageSongSelect.bBGMIn再生した = false; CSongSelectSongManager.disable(); } else { @@ -1467,30 +1467,30 @@ namespace TJAPlayer3 { CSongSelectSongManager.playSongIfPossible(); } - this.ctBackgroundFade.Start(0, 600, 1, TJAPlayer3.Timer); + this.ctBackgroundFade.Start(0, 600, 1, OpenTaiko.Timer); if (this.actSongList.ctBarOpen.CurrentValue >= 200 || this.ctBackgroundFade.CurrentValue >= 600 - 255) { - TJAPlayer3.stageSongSelect.OldGenre = this.rNowSelectedSong.strジャンル; - TJAPlayer3.stageSongSelect.OldUseGenre = !this.rNowSelectedSong.isChangedBgType; - TJAPlayer3.stageSongSelect.OldBg = this.rNowSelectedSong.BgType; - TJAPlayer3.stageSongSelect.OldBgColor = this.rNowSelectedSong.BgColor; + OpenTaiko.stageSongSelect.OldGenre = this.rNowSelectedSong.strジャンル; + OpenTaiko.stageSongSelect.OldUseGenre = !this.rNowSelectedSong.isChangedBgType; + OpenTaiko.stageSongSelect.OldBg = this.rNowSelectedSong.BgType; + OpenTaiko.stageSongSelect.OldBgColor = this.rNowSelectedSong.BgColor; } this.actSongList.t前に移動(); - TJAPlayer3.Skin.soundカーソル移動音.tPlay(); + OpenTaiko.Skin.soundカーソル移動音.tPlay(); } private void tカーソルスキップ(bool Up) { - this.ctBackgroundFade.Start(0, 600, 1, TJAPlayer3.Timer); + this.ctBackgroundFade.Start(0, 600, 1, OpenTaiko.Timer); if (this.actSongList.ctBarOpen.CurrentValue >= 200 || this.ctBackgroundFade.CurrentValue >= 600 - 255) { - TJAPlayer3.stageSongSelect.OldGenre = this.rNowSelectedSong.strジャンル; - TJAPlayer3.stageSongSelect.OldUseGenre = !this.rNowSelectedSong.isChangedBgType; - TJAPlayer3.stageSongSelect.OldBg = this.rNowSelectedSong.BgType; - TJAPlayer3.stageSongSelect.OldBgColor = this.rNowSelectedSong.BgColor; + OpenTaiko.stageSongSelect.OldGenre = this.rNowSelectedSong.strジャンル; + OpenTaiko.stageSongSelect.OldUseGenre = !this.rNowSelectedSong.isChangedBgType; + OpenTaiko.stageSongSelect.OldBg = this.rNowSelectedSong.BgType; + OpenTaiko.stageSongSelect.OldBgColor = this.rNowSelectedSong.BgColor; } if (Up) this.actSongList.t前に移動(); else this.actSongList.t次に移動(); - TJAPlayer3.Skin.soundSkip.tPlay(); + OpenTaiko.Skin.soundSkip.tPlay(); } private int tGetRandomSongDifficulty(int contextDiff) { @@ -1519,7 +1519,7 @@ namespace TJAPlayer3 { #region [Fetch context informations] if (this.actSongList.latestContext == eMenuContext.Random) { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { var diff = this.actSongList.tMenuContextGetVar(i); usedDiffs[i] = diff; if (!mandatoryDiffs.Contains(diff)) @@ -1538,9 +1538,9 @@ namespace TJAPlayer3 { return; } - int randomSongIndex = TJAPlayer3.Random.Next(selectableSongCount); + int randomSongIndex = OpenTaiko.Random.Next(selectableSongCount); - if (TJAPlayer3.ConfigIni.bLogDTX詳細ログ出力) { + if (OpenTaiko.ConfigIni.bLogDTX詳細ログ出力) { StringBuilder builder = new StringBuilder(0x400); builder.Append(string.Format("Total number of songs to randomly choose from {0}. Randomly selected index {0}.", selectableSongCount, randomSongIndex)); Trace.TraceInformation(builder.ToString()); @@ -1594,8 +1594,8 @@ namespace TJAPlayer3 { private List t指定された曲が存在する場所の曲を列挙する_子リスト含む(CSongListNode song, ref List mandatory) { List list = new List(); song = song.rParentNode; - if ((song == null) && (TJAPlayer3.Songs管理.list曲ルート.Count > 0)) { - foreach (CSongListNode c曲リストノード in TJAPlayer3.Songs管理.list曲ルート) { + if ((song == null) && (OpenTaiko.Songs管理.list曲ルート.Count > 0)) { + foreach (CSongListNode c曲リストノード in OpenTaiko.Songs管理.list曲ルート) { if ((c曲リストノード.eノード種別 == CSongListNode.ENodeType.SCORE) || (c曲リストノード.eノード種別 == CSongListNode.ENodeType.SCORE_MIDI)) { // Don't add Dan/Tower charts for Random int diff = this.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(c曲リストノード); @@ -1610,7 +1610,7 @@ namespace TJAPlayer3 { } } - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(c曲リストノード); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(c曲リストノード); if (requiredDiffsExist == true && IsSongLocked == false) { list.Add(c曲リストノード); } @@ -1618,7 +1618,7 @@ namespace TJAPlayer3 { } } - if ((c曲リストノード.list子リスト != null) && TJAPlayer3.ConfigIni.bIncludeSubfoldersOnRandomSelect) { + if ((c曲リストノード.list子リスト != null) && OpenTaiko.ConfigIni.bIncludeSubfoldersOnRandomSelect) { this.t指定された曲の子リストの曲を列挙する_孫リスト含む(c曲リストノード, ref list, ref mandatory); } } @@ -1646,14 +1646,14 @@ namespace TJAPlayer3 { } } - var IsSongLocked = TJAPlayer3.Databases.DBSongUnlockables.tIsSongLocked(c曲リストノード); + var IsSongLocked = OpenTaiko.Databases.DBSongUnlockables.tIsSongLocked(c曲リストノード); if (requiredDiffsExist == true && IsSongLocked == false) { list.Add(c曲リストノード); } } } - if ((c曲リストノード.list子リスト != null) && TJAPlayer3.ConfigIni.bIncludeSubfoldersOnRandomSelect) { + if ((c曲リストノード.list子リスト != null) && OpenTaiko.ConfigIni.bIncludeSubfoldersOnRandomSelect) { this.t指定された曲の子リストの曲を列挙する_孫リスト含む(c曲リストノード, ref list, ref mandatory, dan, difficulty); } } diff --git a/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs b/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs index 31a0ae61..ce5a1ea1 100644 --- a/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs +++ b/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CStage曲読み込み : CStage { // コンストラクタ @@ -25,16 +25,16 @@ namespace TJAPlayer3 { this.nBGM再生開始時刻 = -1; this.nBGMの総再生時間ms = 0; if (this.sd読み込み音 != null) { - TJAPlayer3.SoundManager.tDisposeSound(this.sd読み込み音); + OpenTaiko.SoundManager.tDisposeSound(this.sd読み込み音); this.sd読み込み音 = null; } - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] >= 5 || TJAPlayer3.ConfigIni.nPlayerCount != 1) { - TJAPlayer3.ConfigIni.bTokkunMode = false; + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] >= 5 || OpenTaiko.ConfigIni.nPlayerCount != 1) { + OpenTaiko.ConfigIni.bTokkunMode = false; } - if (TJAPlayer3.bコンパクトモード) { - string strDTXファイルパス = TJAPlayer3.strコンパクトモードファイル; + if (OpenTaiko.bコンパクトモード) { + string strDTXファイルパス = OpenTaiko.strコンパクトモードファイル; CDTX cdtx = new CDTX(strDTXファイルパス, true, 1.0, 0, 0); @@ -46,7 +46,7 @@ namespace TJAPlayer3 { cdtx.DeActivate(); } else { - string strDTXファイルパス = TJAPlayer3.stageSongSelect.r確定されたスコア.ファイル情報.ファイルの絶対パス; + string strDTXファイルパス = OpenTaiko.stageSongSelect.r確定されたスコア.ファイル情報.ファイルの絶対パス; var strフォルダ名 = Path.GetDirectoryName(strDTXファイルパス) + Path.DirectorySeparatorChar; @@ -58,7 +58,7 @@ namespace TJAPlayer3 { cdtx.DeActivate(); } else { - var 譜面情報 = TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報; + var 譜面情報 = OpenTaiko.stageSongSelect.r確定されたスコア.譜面情報; this.str曲タイトル = 譜面情報.タイトル; this.strサブタイトル = 譜面情報.strサブタイトル; } @@ -68,9 +68,9 @@ namespace TJAPlayer3 { // calibration via there being an actual single // player and the special song title and subtitle // of the .tja used to perform input calibration - TJAPlayer3.IsPerformingCalibration = - !TJAPlayer3.ConfigIni.bAutoPlay[0] && - TJAPlayer3.ConfigIni.nPlayerCount == 1 && + OpenTaiko.IsPerformingCalibration = + !OpenTaiko.ConfigIni.bAutoPlay[0] && + OpenTaiko.ConfigIni.nPlayerCount == 1 && str曲タイトル == "Input Calibration" && strサブタイトル == "TJAPlayer3 Developers"; @@ -78,23 +78,23 @@ namespace TJAPlayer3 { float wait = 600f; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) wait = 1000f; - else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) + else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) wait = 1200f; - this.ct待機 = new CCounter(0, wait, 5, TJAPlayer3.Timer); - this.ct曲名表示 = new CCounter(1, 30, 30, TJAPlayer3.Timer); + this.ct待機 = new CCounter(0, wait, 5, OpenTaiko.Timer); + this.ct曲名表示 = new CCounter(1, 30, 30, OpenTaiko.Timer); try { // When performing calibration, inform the player that // calibration is about to begin, rather than // displaying the song title and subtitle as usual. - var タイトル = TJAPlayer3.IsPerformingCalibration + var タイトル = OpenTaiko.IsPerformingCalibration ? "Input calibration is about to begin." : this.str曲タイトル; - var サブタイトル = TJAPlayer3.IsPerformingCalibration + var サブタイトル = OpenTaiko.IsPerformingCalibration ? "Please play as accurately as possible." : this.strサブタイトル; @@ -103,14 +103,14 @@ namespace TJAPlayer3 { //this.txタイトル.vc拡大縮小倍率 = new Vector3( 0.5f, 0.5f, 1f ); - using (var bmpSongTitle = this.pfTITLE.DrawText(タイトル, TJAPlayer3.Skin.SongLoading_Title_ForeColor, TJAPlayer3.Skin.SongLoading_Title_BackColor, null, 30)) { + using (var bmpSongTitle = this.pfTITLE.DrawText(タイトル, OpenTaiko.Skin.SongLoading_Title_ForeColor, OpenTaiko.Skin.SongLoading_Title_BackColor, null, 30)) { this.txタイトル = new CTexture(bmpSongTitle); - txタイトル.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref txタイトル, TJAPlayer3.Skin.SongLoading_Title_MaxSize); + txタイトル.vcScaleRatio.X = OpenTaiko.GetSongNameXScaling(ref txタイトル, OpenTaiko.Skin.SongLoading_Title_MaxSize); } - using (var bmpSongSubTitle = this.pfSUBTITLE.DrawText(サブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_ForeColor, TJAPlayer3.Skin.SongLoading_SubTitle_BackColor, null, 30)) { + using (var bmpSongSubTitle = this.pfSUBTITLE.DrawText(サブタイトル, OpenTaiko.Skin.SongLoading_SubTitle_ForeColor, OpenTaiko.Skin.SongLoading_SubTitle_BackColor, null, 30)) { this.txサブタイトル = new CTexture(bmpSongSubTitle); - txサブタイトル.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref txサブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_MaxSize); + txサブタイトル.vcScaleRatio.X = OpenTaiko.GetSongNameXScaling(ref txサブタイトル, OpenTaiko.Skin.SongLoading_SubTitle_MaxSize); } } else { this.txタイトル = null; @@ -135,9 +135,9 @@ namespace TJAPlayer3 { Trace.TraceInformation("曲読み込みステージを非活性化します。"); Trace.Indent(); try { - TJAPlayer3.tテクスチャの解放(ref this.txタイトル); + OpenTaiko.tテクスチャの解放(ref this.txタイトル); //CDTXMania.tテクスチャの解放( ref this.txSongnamePlate ); - TJAPlayer3.tテクスチャの解放(ref this.txサブタイトル); + OpenTaiko.tテクスチャの解放(ref this.txサブタイトル); base.DeActivate(); } finally { Trace.TraceInformation("曲読み込みステージの非活性化を完了しました。"); @@ -145,23 +145,23 @@ namespace TJAPlayer3 { } } public override void CreateManagedResource() { - this.pfTITLE = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongLoading_Title_FontSize); - this.pfSUBTITLE = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.SongLoading_SubTitle_FontSize); - pfDanTitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Game_DanC_Title_Size); - pfDanSubTitle = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Game_DanC_SubTitle_Size); + this.pfTITLE = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongLoading_Title_FontSize); + this.pfSUBTITLE = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.SongLoading_SubTitle_FontSize); + pfDanTitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Game_DanC_Title_Size); + pfDanSubTitle = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Game_DanC_SubTitle_Size); - this.tx背景 = TJAPlayer3.tテクスチャの生成(this.strSTAGEFILE, false); + this.tx背景 = OpenTaiko.tテクスチャの生成(this.strSTAGEFILE, false); //this.txSongnamePlate = CDTXMania.tテクスチャの生成( CSkin.Path( @$"Graphics{Path.DirectorySeparatorChar}6_SongnamePlate.png" ) ); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tDisposeSafely(ref this.pfTITLE); - TJAPlayer3.tDisposeSafely(ref this.pfSUBTITLE); + OpenTaiko.tDisposeSafely(ref this.pfTITLE); + OpenTaiko.tDisposeSafely(ref this.pfSUBTITLE); pfDanTitle?.Dispose(); pfDanSubTitle?.Dispose(); - TJAPlayer3.tテクスチャの解放(ref this.tx背景); + OpenTaiko.tテクスチャの解放(ref this.tx背景); base.ReleaseManagedResource(); } public override int Draw() { @@ -173,18 +173,18 @@ namespace TJAPlayer3 { #region [ 初めての進行描画 ] //----------------------------- if (base.IsFirstDraw) { - Cスコア cスコア1 = TJAPlayer3.stageSongSelect.r確定されたスコア; + Cスコア cスコア1 = OpenTaiko.stageSongSelect.r確定されたスコア; if (this.sd読み込み音 != null) { - if (TJAPlayer3.Skin.sound曲読込開始音.bExclusive && (CSkin.CSystemSound.r最後に再生した排他システムサウンド != null)) { + if (OpenTaiko.Skin.sound曲読込開始音.bExclusive && (CSkin.CSystemSound.r最後に再生した排他システムサウンド != null)) { CSkin.CSystemSound.r最後に再生した排他システムサウンド.tStop(); } this.sd読み込み音.PlayStart(); this.nBGM再生開始時刻 = SoundManager.PlayTimer.NowTime; this.nBGMの総再生時間ms = this.sd読み込み音.TotalPlayTime; } else { - TJAPlayer3.Skin.sound曲読込開始音.tPlay(); + OpenTaiko.Skin.sound曲読込開始音.tPlay(); this.nBGM再生開始時刻 = SoundManager.PlayTimer.NowTime; - this.nBGMの総再生時間ms = TJAPlayer3.Skin.sound曲読込開始音.n長さ_現在のサウンド; + this.nBGMの総再生時間ms = OpenTaiko.Skin.sound曲読込開始音.n長さ_現在のサウンド; } //this.actFI.tフェードイン開始(); // #27787 2012.3.10 yyagi 曲読み込み画面のフェードインの省略 base.ePhaseID = CStage.EPhase.Common_FADEIN; @@ -206,17 +206,17 @@ namespace TJAPlayer3 { } #endregion - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { void drawPlate() { - if (TJAPlayer3.Tx.SongLoading_Plate != null) { - TJAPlayer3.Tx.SongLoading_Plate.bスクリーン合成 = TJAPlayer3.Skin.SongLoading_Plate_ScreenBlend; //あまりにも出番が無い - TJAPlayer3.Tx.SongLoading_Plate.Opacity = 255; - if (TJAPlayer3.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Left) { - TJAPlayer3.Tx.SongLoading_Plate.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X, TJAPlayer3.Skin.SongLoading_Plate_Y - (TJAPlayer3.Tx.SongLoading_Plate.sz画像サイズ.Height / 2)); - } else if (TJAPlayer3.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Right) { - TJAPlayer3.Tx.SongLoading_Plate.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X - TJAPlayer3.Tx.SongLoading_Plate.sz画像サイズ.Width, TJAPlayer3.Skin.SongLoading_Plate_Y - (TJAPlayer3.Tx.SongLoading_Plate.sz画像サイズ.Height / 2)); + if (OpenTaiko.Tx.SongLoading_Plate != null) { + OpenTaiko.Tx.SongLoading_Plate.bスクリーン合成 = OpenTaiko.Skin.SongLoading_Plate_ScreenBlend; //あまりにも出番が無い + OpenTaiko.Tx.SongLoading_Plate.Opacity = 255; + if (OpenTaiko.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Left) { + OpenTaiko.Tx.SongLoading_Plate.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X, OpenTaiko.Skin.SongLoading_Plate_Y - (OpenTaiko.Tx.SongLoading_Plate.sz画像サイズ.Height / 2)); + } else if (OpenTaiko.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Right) { + OpenTaiko.Tx.SongLoading_Plate.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X - OpenTaiko.Tx.SongLoading_Plate.sz画像サイズ.Width, OpenTaiko.Skin.SongLoading_Plate_Y - (OpenTaiko.Tx.SongLoading_Plate.sz画像サイズ.Height / 2)); } else { - TJAPlayer3.Tx.SongLoading_Plate.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X - (TJAPlayer3.Tx.SongLoading_Plate.sz画像サイズ.Width / 2), TJAPlayer3.Skin.SongLoading_Plate_Y - (TJAPlayer3.Tx.SongLoading_Plate.sz画像サイズ.Height / 2)); + OpenTaiko.Tx.SongLoading_Plate.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X - (OpenTaiko.Tx.SongLoading_Plate.sz画像サイズ.Width / 2), OpenTaiko.Skin.SongLoading_Plate_Y - (OpenTaiko.Tx.SongLoading_Plate.sz画像サイズ.Height / 2)); } } //CDTXMania.act文字コンソール.tPrint( 0, 16, C文字コンソール.Eフォント種別.灰, C変換.nParsentTo255( ( this.ct曲名表示.n現在の値 / 30.0 ) ).ToString() ); @@ -224,39 +224,39 @@ namespace TJAPlayer3 { int y = 720 - 45; if (this.txタイトル != null) { - int nサブタイトル補正 = string.IsNullOrEmpty(TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.strサブタイトル) ? 15 : 0; + int nサブタイトル補正 = string.IsNullOrEmpty(OpenTaiko.stageSongSelect.r確定されたスコア.譜面情報.strサブタイトル) ? 15 : 0; this.txタイトル.Opacity = 255; - if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Left) { - this.txタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_Title_X, TJAPlayer3.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); - } else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) { - this.txタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_Title_X - (this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), TJAPlayer3.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); + if (OpenTaiko.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Left) { + this.txタイトル.t2D描画(OpenTaiko.Skin.SongLoading_Title_X, OpenTaiko.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); + } else if (OpenTaiko.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) { + this.txタイトル.t2D描画(OpenTaiko.Skin.SongLoading_Title_X - (this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), OpenTaiko.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); } else { - this.txタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_Title_X - ((this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X) / 2)), TJAPlayer3.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); + this.txタイトル.t2D描画((OpenTaiko.Skin.SongLoading_Title_X - ((this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X) / 2)), OpenTaiko.Skin.SongLoading_Title_Y - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); } } if (this.txサブタイトル != null) { this.txサブタイトル.Opacity = 255; - if (TJAPlayer3.Skin.SongLoading_SubTitle_ReferencePoint == CSkin.ReferencePoint.Left) { - this.txサブタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_SubTitle_X, TJAPlayer3.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2)); - } else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) { - this.txサブタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_SubTitle_X - (this.txサブタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), TJAPlayer3.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2)); + if (OpenTaiko.Skin.SongLoading_SubTitle_ReferencePoint == CSkin.ReferencePoint.Left) { + this.txサブタイトル.t2D描画(OpenTaiko.Skin.SongLoading_SubTitle_X, OpenTaiko.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2)); + } else if (OpenTaiko.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) { + this.txサブタイトル.t2D描画(OpenTaiko.Skin.SongLoading_SubTitle_X - (this.txサブタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), OpenTaiko.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2)); } else { - this.txサブタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_SubTitle_X - ((this.txサブタイトル.sz画像サイズ.Width * txサブタイトル.vcScaleRatio.X) / 2)), TJAPlayer3.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2)); + this.txサブタイトル.t2D描画((OpenTaiko.Skin.SongLoading_SubTitle_X - ((this.txサブタイトル.sz画像サイズ.Width * txサブタイトル.vcScaleRatio.X) / 2)), OpenTaiko.Skin.SongLoading_SubTitle_Y - (this.txサブタイトル.sz画像サイズ.Height / 2)); } } } void drawPlate_AI() { - if (TJAPlayer3.Tx.SongLoading_Plate_AI != null) { - TJAPlayer3.Tx.SongLoading_Plate_AI.bスクリーン合成 = TJAPlayer3.Skin.SongLoading_Plate_ScreenBlend; //あまりにも出番が無い - TJAPlayer3.Tx.SongLoading_Plate_AI.Opacity = 255; - if (TJAPlayer3.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Left) { - TJAPlayer3.Tx.SongLoading_Plate_AI.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X_AI, TJAPlayer3.Skin.SongLoading_Plate_Y_AI - (TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); - } else if (TJAPlayer3.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Right) { - TJAPlayer3.Tx.SongLoading_Plate_AI.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X_AI - TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Width, TJAPlayer3.Skin.SongLoading_Plate_Y_AI - (TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); + if (OpenTaiko.Tx.SongLoading_Plate_AI != null) { + OpenTaiko.Tx.SongLoading_Plate_AI.bスクリーン合成 = OpenTaiko.Skin.SongLoading_Plate_ScreenBlend; //あまりにも出番が無い + OpenTaiko.Tx.SongLoading_Plate_AI.Opacity = 255; + if (OpenTaiko.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Left) { + OpenTaiko.Tx.SongLoading_Plate_AI.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X_AI, OpenTaiko.Skin.SongLoading_Plate_Y_AI - (OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); + } else if (OpenTaiko.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Right) { + OpenTaiko.Tx.SongLoading_Plate_AI.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X_AI - OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Width, OpenTaiko.Skin.SongLoading_Plate_Y_AI - (OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); } else { - TJAPlayer3.Tx.SongLoading_Plate_AI.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X_AI - (TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Width / 2), TJAPlayer3.Skin.SongLoading_Plate_Y_AI - (TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); + OpenTaiko.Tx.SongLoading_Plate_AI.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X_AI - (OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Width / 2), OpenTaiko.Skin.SongLoading_Plate_Y_AI - (OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); } } //CDTXMania.act文字コンソール.tPrint( 0, 16, C文字コンソール.Eフォント種別.灰, C変換.nParsentTo255( ( this.ct曲名表示.n現在の値 / 30.0 ) ).ToString() ); @@ -264,25 +264,25 @@ namespace TJAPlayer3 { int y = 720 - 45; if (this.txタイトル != null) { - int nサブタイトル補正 = string.IsNullOrEmpty(TJAPlayer3.stageSongSelect.r確定されたスコア.譜面情報.strサブタイトル) ? 15 : 0; + int nサブタイトル補正 = string.IsNullOrEmpty(OpenTaiko.stageSongSelect.r確定されたスコア.譜面情報.strサブタイトル) ? 15 : 0; this.txタイトル.Opacity = 255; - if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Left) { - this.txタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_Title_X_AI, TJAPlayer3.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); - } else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) { - this.txタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_Title_X_AI - (this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), TJAPlayer3.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); + if (OpenTaiko.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Left) { + this.txタイトル.t2D描画(OpenTaiko.Skin.SongLoading_Title_X_AI, OpenTaiko.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); + } else if (OpenTaiko.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) { + this.txタイトル.t2D描画(OpenTaiko.Skin.SongLoading_Title_X_AI - (this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), OpenTaiko.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); } else { - this.txタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_Title_X_AI - ((this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X) / 2)), TJAPlayer3.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); + this.txタイトル.t2D描画((OpenTaiko.Skin.SongLoading_Title_X_AI - ((this.txタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X) / 2)), OpenTaiko.Skin.SongLoading_Title_Y_AI - (this.txタイトル.sz画像サイズ.Height / 2) + nサブタイトル補正); } } if (this.txサブタイトル != null) { this.txサブタイトル.Opacity = 255; - if (TJAPlayer3.Skin.SongLoading_SubTitle_ReferencePoint == CSkin.ReferencePoint.Left) { - this.txサブタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_SubTitle_X_AI, TJAPlayer3.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2)); - } else if (TJAPlayer3.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) { - this.txサブタイトル.t2D描画(TJAPlayer3.Skin.SongLoading_SubTitle_X_AI - (this.txサブタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), TJAPlayer3.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2)); + if (OpenTaiko.Skin.SongLoading_SubTitle_ReferencePoint == CSkin.ReferencePoint.Left) { + this.txサブタイトル.t2D描画(OpenTaiko.Skin.SongLoading_SubTitle_X_AI, OpenTaiko.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2)); + } else if (OpenTaiko.Skin.SongLoading_Title_ReferencePoint == CSkin.ReferencePoint.Right) { + this.txサブタイトル.t2D描画(OpenTaiko.Skin.SongLoading_SubTitle_X_AI - (this.txサブタイトル.sz画像サイズ.Width * txタイトル.vcScaleRatio.X), OpenTaiko.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2)); } else { - this.txサブタイトル.t2D描画((TJAPlayer3.Skin.SongLoading_SubTitle_X_AI - ((this.txサブタイトル.sz画像サイズ.Width * txサブタイトル.vcScaleRatio.X) / 2)), TJAPlayer3.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2)); + this.txサブタイトル.t2D描画((OpenTaiko.Skin.SongLoading_SubTitle_X_AI - ((this.txサブタイトル.sz画像サイズ.Width * txサブタイトル.vcScaleRatio.X) / 2)), OpenTaiko.Skin.SongLoading_SubTitle_Y_AI - (this.txサブタイトル.sz画像サイズ.Height / 2)); } } } @@ -291,43 +291,43 @@ namespace TJAPlayer3 { //----------------------------- this.ct曲名表示.Tick(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { #region [Tower loading screen] - if (TJAPlayer3.Skin.Game_Tower_Ptn_Result > 0) { + if (OpenTaiko.Skin.Game_Tower_Ptn_Result > 0) { int xFactor = 0; float yFactor = 1f; - int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType); + int currentTowerType = Array.IndexOf(OpenTaiko.Skin.Game_Tower_Names, OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType); - if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn) + if (currentTowerType < 0 || currentTowerType >= OpenTaiko.Skin.Game_Tower_Ptn) currentTowerType = 0; - if (TJAPlayer3.Tx.TowerResult_Background != null && currentTowerType < TJAPlayer3.Tx.TowerResult_Tower.Length && TJAPlayer3.Tx.TowerResult_Tower[currentTowerType] != null) { - xFactor = (TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Width - TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Width) / 2; - yFactor = TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Height / (float)TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height; + if (OpenTaiko.Tx.TowerResult_Background != null && currentTowerType < OpenTaiko.Tx.TowerResult_Tower.Length && OpenTaiko.Tx.TowerResult_Tower[currentTowerType] != null) { + xFactor = (OpenTaiko.Tx.TowerResult_Background.szTextureSize.Width - OpenTaiko.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Width) / 2; + yFactor = OpenTaiko.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Height / (float)OpenTaiko.Tx.TowerResult_Background.szTextureSize.Height; } - float pos = (TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height - TJAPlayer3.Skin.Resolution[1]) - - ((ct待機.CurrentValue <= 1200 ? ct待機.CurrentValue / 10f : 120) / 120f * (TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height - TJAPlayer3.Skin.Resolution[1])); + float pos = (OpenTaiko.Tx.TowerResult_Background.szTextureSize.Height - OpenTaiko.Skin.Resolution[1]) - + ((ct待機.CurrentValue <= 1200 ? ct待機.CurrentValue / 10f : 120) / 120f * (OpenTaiko.Tx.TowerResult_Background.szTextureSize.Height - OpenTaiko.Skin.Resolution[1])); - TJAPlayer3.Tx.TowerResult_Background?.t2D描画(0, -1 * pos); + OpenTaiko.Tx.TowerResult_Background?.t2D描画(0, -1 * pos); - if (currentTowerType < TJAPlayer3.Tx.TowerResult_Tower.Length) - TJAPlayer3.Tx.TowerResult_Tower[currentTowerType]?.t2D描画(xFactor, -1 * yFactor * pos); + if (currentTowerType < OpenTaiko.Tx.TowerResult_Tower.Length) + OpenTaiko.Tx.TowerResult_Tower[currentTowerType]?.t2D描画(xFactor, -1 * yFactor * pos); } #endregion drawPlate(); - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { - TJAPlayer3.ConfigIni.tInitializeAILevel(); - TJAPlayer3.Tx.SongLoading_Bg_AI_Wait.t2D描画(0, 0); + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { + OpenTaiko.ConfigIni.tInitializeAILevel(); + OpenTaiko.Tx.SongLoading_Bg_AI_Wait.t2D描画(0, 0); drawPlate_AI(); } else { #region [Ensou loading screen] - if (TJAPlayer3.Tx.SongLoading_BgWait != null) TJAPlayer3.Tx.SongLoading_BgWait.t2D描画(0, 0); - if (TJAPlayer3.Tx.SongLoading_Chara != null) TJAPlayer3.Tx.SongLoading_Chara.t2D描画(0, 0); + if (OpenTaiko.Tx.SongLoading_BgWait != null) OpenTaiko.Tx.SongLoading_BgWait.t2D描画(0, 0); + if (OpenTaiko.Tx.SongLoading_Chara != null) OpenTaiko.Tx.SongLoading_Chara.t2D描画(0, 0); drawPlate(); @@ -341,24 +341,24 @@ namespace TJAPlayer3 { } else { #region [ Dan Loading screen　] - TJAPlayer3.Tx.SongLoading_Bg_Dan.t2D描画(0, 0 - (ct待機.CurrentValue <= 600 ? ct待機.CurrentValue / 10f : 60)); + OpenTaiko.Tx.SongLoading_Bg_Dan.t2D描画(0, 0 - (ct待機.CurrentValue <= 600 ? ct待機.CurrentValue / 10f : 60)); - CTexture dp = (TJAPlayer3.stage段位選択.段位リスト.stバー情報 != null) - ? TJAPlayer3.stage段位選択.段位リスト.stバー情報[TJAPlayer3.stage段位選択.段位リスト.n現在の選択行].txDanPlate + CTexture dp = (OpenTaiko.stage段位選択.段位リスト.stバー情報 != null) + ? OpenTaiko.stage段位選択.段位リスト.stバー情報[OpenTaiko.stage段位選択.段位リスト.n現在の選択行].txDanPlate : null; CActSelect段位リスト.tDisplayDanPlate(dp, null, - TJAPlayer3.Skin.SongLoading_DanPlate[0], - TJAPlayer3.Skin.SongLoading_DanPlate[1]); + OpenTaiko.Skin.SongLoading_DanPlate[0], + OpenTaiko.Skin.SongLoading_DanPlate[1]); - if (TJAPlayer3.Tx.Tile_Black != null) { - TJAPlayer3.Tx.Tile_Black.Opacity = (int)(ct待機.CurrentValue <= 51 ? (255 - ct待機.CurrentValue / 0.2f) : (this.ct待機.CurrentValue - 949) / 0.2); - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + if (OpenTaiko.Tx.Tile_Black != null) { + OpenTaiko.Tx.Tile_Black.Opacity = (int)(ct待機.CurrentValue <= 51 ? (255 - ct待機.CurrentValue / 0.2f) : (this.ct待機.CurrentValue - 949) / 0.2); + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / OpenTaiko.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / OpenTaiko.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); } } } @@ -378,37 +378,37 @@ namespace TJAPlayer3 { timeBeginLoad = DateTime.Now; TimeSpan span; str = null; - if (!TJAPlayer3.bコンパクトモード) - str = TJAPlayer3.stageSongSelect.r確定されたスコア.ファイル情報.ファイルの絶対パス; + if (!OpenTaiko.bコンパクトモード) + str = OpenTaiko.stageSongSelect.r確定されたスコア.ファイル情報.ファイルの絶対パス; else - str = TJAPlayer3.strコンパクトモードファイル; + str = OpenTaiko.strコンパクトモードファイル; - if ((TJAPlayer3.DTX != null) && TJAPlayer3.DTX.IsActivated) - TJAPlayer3.DTX.DeActivate(); + if ((OpenTaiko.DTX != null) && OpenTaiko.DTX.IsActivated) + OpenTaiko.DTX.DeActivate(); //if( CDTXMania.DTX == null ) { - TJAPlayer3.DTX = new CDTX(str, false, 1.0, 0, 0, 0, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]); - if (TJAPlayer3.ConfigIni.nPlayerCount >= 2) - TJAPlayer3.DTX_2P = new CDTX(str, false, 1.0, 0, 0, 1, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[1]); - if (TJAPlayer3.ConfigIni.nPlayerCount >= 3) - TJAPlayer3.DTX_3P = new CDTX(str, false, 1.0, 0, 0, 2, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[2]); - if (TJAPlayer3.ConfigIni.nPlayerCount >= 4) - TJAPlayer3.DTX_4P = new CDTX(str, false, 1.0, 0, 0, 3, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[3]); - if (TJAPlayer3.ConfigIni.nPlayerCount >= 5) - TJAPlayer3.DTX_5P = new CDTX(str, false, 1.0, 0, 0, 4, true, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[4]); + OpenTaiko.DTX = new CDTX(str, false, 1.0, 0, 0, 0, true, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]); + if (OpenTaiko.ConfigIni.nPlayerCount >= 2) + OpenTaiko.DTX_2P = new CDTX(str, false, 1.0, 0, 0, 1, true, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[1]); + if (OpenTaiko.ConfigIni.nPlayerCount >= 3) + OpenTaiko.DTX_3P = new CDTX(str, false, 1.0, 0, 0, 2, true, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[2]); + if (OpenTaiko.ConfigIni.nPlayerCount >= 4) + OpenTaiko.DTX_4P = new CDTX(str, false, 1.0, 0, 0, 3, true, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[3]); + if (OpenTaiko.ConfigIni.nPlayerCount >= 5) + OpenTaiko.DTX_5P = new CDTX(str, false, 1.0, 0, 0, 4, true, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[4]); - if (TJAPlayer3.DTX.listErrors.Count != 0) { + if (OpenTaiko.DTX.listErrors.Count != 0) { string message = ""; - foreach (var text in TJAPlayer3.DTX.listErrors) { - TJAPlayer3.VisualLogManager.PushCard(CVisualLogManager.ELogCardType.LogError, text); + foreach (var text in OpenTaiko.DTX.listErrors) { + OpenTaiko.VisualLogManager.PushCard(CVisualLogManager.ELogCardType.LogError, text); //System.Windows.Forms.MessageBox.Show(text, "譜面にエラーが見つかりました"); } } Trace.TraceInformation("---- Song information -----------------"); - Trace.TraceInformation("TITLE: {0}", TJAPlayer3.DTX.TITLE.GetString("")); - Trace.TraceInformation("FILE: {0}", TJAPlayer3.DTX.strファイル名の絶対パス); + Trace.TraceInformation("TITLE: {0}", OpenTaiko.DTX.TITLE.GetString("")); + Trace.TraceInformation("FILE: {0}", OpenTaiko.DTX.strファイル名の絶対パス); Trace.TraceInformation("---------------------------"); span = (TimeSpan)(DateTime.Now - timeBeginLoad); @@ -416,25 +416,25 @@ namespace TJAPlayer3 { // 段位認定モード用。 #region [dan setup] - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan && TJAPlayer3.DTX.List_DanSongs != null) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan && OpenTaiko.DTX.List_DanSongs != null) { - var titleForeColor = TJAPlayer3.Skin.Game_DanC_Title_ForeColor; - var titleBackColor = TJAPlayer3.Skin.Game_DanC_Title_BackColor; - var subtitleForeColor = TJAPlayer3.Skin.Game_DanC_SubTitle_ForeColor; - var subtitleBackColor = TJAPlayer3.Skin.Game_DanC_SubTitle_BackColor; + var titleForeColor = OpenTaiko.Skin.Game_DanC_Title_ForeColor; + var titleBackColor = OpenTaiko.Skin.Game_DanC_Title_BackColor; + var subtitleForeColor = OpenTaiko.Skin.Game_DanC_SubTitle_ForeColor; + var subtitleBackColor = OpenTaiko.Skin.Game_DanC_SubTitle_BackColor; - for (int i = 0; i < TJAPlayer3.DTX.List_DanSongs.Count; i++) { - if (!string.IsNullOrEmpty(TJAPlayer3.DTX.List_DanSongs[i].Title)) { - using (var bmpSongTitle = pfDanTitle.DrawText(TJAPlayer3.DTX.List_DanSongs[i].Title, titleForeColor, titleBackColor, null, 30)) { - TJAPlayer3.DTX.List_DanSongs[i].TitleTex = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false); - TJAPlayer3.DTX.List_DanSongs[i].TitleTex.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref TJAPlayer3.DTX.List_DanSongs[i].TitleTex, TJAPlayer3.Skin.Game_DanC_Title_MaxWidth); + for (int i = 0; i < OpenTaiko.DTX.List_DanSongs.Count; i++) { + if (!string.IsNullOrEmpty(OpenTaiko.DTX.List_DanSongs[i].Title)) { + using (var bmpSongTitle = pfDanTitle.DrawText(OpenTaiko.DTX.List_DanSongs[i].Title, titleForeColor, titleBackColor, null, 30)) { + OpenTaiko.DTX.List_DanSongs[i].TitleTex = OpenTaiko.tテクスチャの生成(bmpSongTitle, false); + OpenTaiko.DTX.List_DanSongs[i].TitleTex.vcScaleRatio.X = OpenTaiko.GetSongNameXScaling(ref OpenTaiko.DTX.List_DanSongs[i].TitleTex, OpenTaiko.Skin.Game_DanC_Title_MaxWidth); } } - if (!string.IsNullOrEmpty(TJAPlayer3.DTX.List_DanSongs[i].SubTitle)) { - using (var bmpSongSubTitle = pfDanSubTitle.DrawText(TJAPlayer3.DTX.List_DanSongs[i].SubTitle, subtitleForeColor, subtitleBackColor, null, 30)) { - TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex = TJAPlayer3.tテクスチャの生成(bmpSongSubTitle, false); - TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref TJAPlayer3.DTX.List_DanSongs[i].SubTitleTex, TJAPlayer3.Skin.Game_DanC_SubTitle_MaxWidth); + if (!string.IsNullOrEmpty(OpenTaiko.DTX.List_DanSongs[i].SubTitle)) { + using (var bmpSongSubTitle = pfDanSubTitle.DrawText(OpenTaiko.DTX.List_DanSongs[i].SubTitle, subtitleForeColor, subtitleBackColor, null, 30)) { + OpenTaiko.DTX.List_DanSongs[i].SubTitleTex = OpenTaiko.tテクスチャの生成(bmpSongSubTitle, false); + OpenTaiko.DTX.List_DanSongs[i].SubTitleTex.vcScaleRatio.X = OpenTaiko.GetSongNameXScaling(ref OpenTaiko.DTX.List_DanSongs[i].SubTitleTex, OpenTaiko.Skin.Game_DanC_SubTitle_MaxWidth); } } @@ -456,33 +456,33 @@ namespace TJAPlayer3 { } case CStage.EPhase.SongLoading_LoadWAVFile: { - int looptime = (TJAPlayer3.ConfigIni.bEnableVSync) ? 3 : 1; // VSyncWait=ON時は1frame(1/60s)あたり3つ読むようにする - for (int i = 0; i < looptime && nWAVcount <= TJAPlayer3.DTX.listWAV.Count; i++) { - if (TJAPlayer3.DTX.listWAV[nWAVcount].listこのWAVを使用するチャンネル番号の集合.Count > 0) // #28674 2012.5.8 yyagi + int looptime = (OpenTaiko.ConfigIni.bEnableVSync) ? 3 : 1; // VSyncWait=ON時は1frame(1/60s)あたり3つ読むようにする + for (int i = 0; i < looptime && nWAVcount <= OpenTaiko.DTX.listWAV.Count; i++) { + if (OpenTaiko.DTX.listWAV[nWAVcount].listこのWAVを使用するチャンネル番号の集合.Count > 0) // #28674 2012.5.8 yyagi { - TJAPlayer3.DTX.tWAVの読み込み(TJAPlayer3.DTX.listWAV[nWAVcount]); + OpenTaiko.DTX.tWAVの読み込み(OpenTaiko.DTX.listWAV[nWAVcount]); } nWAVcount++; } - if (nWAVcount > TJAPlayer3.DTX.listWAV.Count) { + if (nWAVcount > OpenTaiko.DTX.listWAV.Count) { TimeSpan span = (TimeSpan)(DateTime.Now - timeBeginLoadWAV); - Trace.TraceInformation("Song loading time({0,4}): {1}", TJAPlayer3.DTX.listWAV.Count, span.ToString()); + Trace.TraceInformation("Song loading time({0,4}): {1}", OpenTaiko.DTX.listWAV.Count, span.ToString()); timeBeginLoadWAV = DateTime.Now; - if (TJAPlayer3.ConfigIni.bDynamicBassMixerManagement) { - TJAPlayer3.DTX.PlanToAddMixerChannel(); + if (OpenTaiko.ConfigIni.bDynamicBassMixerManagement) { + OpenTaiko.DTX.PlanToAddMixerChannel(); } - var _dtx = new CDTX[5] { TJAPlayer3.DTX, TJAPlayer3.DTX_2P, TJAPlayer3.DTX_3P, TJAPlayer3.DTX_4P, TJAPlayer3.DTX_5P }; + var _dtx = new CDTX[5] { OpenTaiko.DTX, OpenTaiko.DTX_2P, OpenTaiko.DTX_3P, OpenTaiko.DTX_4P, OpenTaiko.DTX_5P }; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { _dtx[i]?.tRandomizeTaikoChips(i); _dtx[i]?.tApplyFunMods(i); - TJAPlayer3.ReplayInstances[i] = new CSongReplay(_dtx[i].strファイル名の絶対パス, i); + OpenTaiko.ReplayInstances[i] = new CSongReplay(_dtx[i].strファイル名の絶対パス, i); } CDTX.tManageKusudama(_dtx); - TJAPlayer3.stage演奏ドラム画面.Activate(); + OpenTaiko.stage演奏ドラム画面.Activate(); span = (TimeSpan)(DateTime.Now - timeBeginLoadWAV); @@ -495,28 +495,28 @@ namespace TJAPlayer3 { TimeSpan span; DateTime timeBeginLoadBMPAVI = DateTime.Now; - if (TJAPlayer3.ConfigIni.bEnableAVI) - TJAPlayer3.DTX.tAVIの読み込み(); + if (OpenTaiko.ConfigIni.bEnableAVI) + OpenTaiko.DTX.tAVIの読み込み(); span = (TimeSpan)(DateTime.Now - timeBeginLoadBMPAVI); span = (TimeSpan)(DateTime.Now - timeBeginLoad); Trace.TraceInformation("総読込時間: {0}", span.ToString()); - if (TJAPlayer3.ConfigIni.FastRender) { + if (OpenTaiko.ConfigIni.FastRender) { var fastRender = new FastRender(); fastRender.Render(); fastRender = null; } - TJAPlayer3.Timer.Update(); + OpenTaiko.Timer.Update(); //CSound管理.rc演奏用タイマ.t更新(); base.ePhaseID = CStage.EPhase.SongLoading_WaitForSoundSystemBGM; return (int)E曲読込画面の戻り値.継続; } case CStage.EPhase.SongLoading_WaitForSoundSystemBGM: { - long nCurrentTime = TJAPlayer3.Timer.NowTime; + long nCurrentTime = OpenTaiko.Timer.NowTime; if (nCurrentTime < this.nBGM再生開始時刻) this.nBGM再生開始時刻 = nCurrentTime; @@ -545,7 +545,7 @@ namespace TJAPlayer3 { /// /// protected bool tキー入力() { - IInputDevice keyboard = TJAPlayer3.InputManager.Keyboard; + IInputDevice keyboard = OpenTaiko.InputManager.Keyboard; if (keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) // escape (exit) { return true; diff --git a/OpenTaiko/src/Stages/06.SongLoading/FastRender.cs b/OpenTaiko/src/Stages/06.SongLoading/FastRender.cs index eb5c884f..c9d306fa 100644 --- a/OpenTaiko/src/Stages/06.SongLoading/FastRender.cs +++ b/OpenTaiko/src/Stages/06.SongLoading/FastRender.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class FastRender { public FastRender() { @@ -15,7 +15,7 @@ namespace TJAPlayer3 { } }*/ - NullCheckAndRender(ref TJAPlayer3.Tx.Effects_GoGoSplash); + NullCheckAndRender(ref OpenTaiko.Tx.Effects_GoGoSplash); //NullCheckAndRender(ref TJAPlayer3.Tx.PuchiChara); diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs index 03b8d23a..65400cd3 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏AVI : CActivity { // コンストラクタ @@ -12,7 +12,7 @@ namespace TJAPlayer3 { // メソッド public void Start(int nチャンネル番号, CVideoDecoder rVD) { - if (nチャンネル番号 == 0x54 && TJAPlayer3.ConfigIni.bEnableAVI) { + if (nチャンネル番号 == 0x54 && OpenTaiko.ConfigIni.bEnableAVI) { this.rVD = rVD; if (this.rVD != null) { this.ratio1 = Math.Min((float)SampleFramework.GameWindowSize.Height / ((float)this.rVD.FrameSize.Height), (float)SampleFramework.GameWindowSize.Width / ((float)this.rVD.FrameSize.Height)); @@ -37,7 +37,7 @@ namespace TJAPlayer3 { this.tx描画用.vcScaleRatio.X = this.ratio1; this.tx描画用.vcScaleRatio.Y = this.ratio1; - if (TJAPlayer3.ConfigIni.eClipDispType.HasFlag(EClipDispType.背景のみ)) { + if (OpenTaiko.ConfigIni.eClipDispType.HasFlag(EClipDispType.背景のみ)) { this.tx描画用.t2D拡大率考慮描画(CTexture.RefPnt.Center, SampleFramework.GameWindowSize.Width / 2, SampleFramework.GameWindowSize.Height / 2); } } @@ -45,7 +45,7 @@ namespace TJAPlayer3 { } public void t窓表示() { - if (this.rVD == null || this.tx描画用 == null || !TJAPlayer3.ConfigIni.eClipDispType.HasFlag(EClipDispType.ウィンドウのみ)) + if (this.rVD == null || this.tx描画用 == null || !OpenTaiko.ConfigIni.eClipDispType.HasFlag(EClipDispType.ウィンドウのみ)) return; float[] fRatio = new float[] { 640.0f - 4.0f, 360.0f - 4.0f }; //中央下表示 diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏Combo共通.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏Combo共通.cs index e7821af6..6d815084 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏Combo共通.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏Combo共通.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏Combo共通 : CActivity { // プロパティ @@ -281,25 +281,25 @@ namespace TJAPlayer3 { private void showComboEffect(int cat, int i, int rightX, int y, int nPlayer) { - if (TJAPlayer3.Tx.Taiko_Combo_Effect != null) { - int a = rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[cat] * i; - float b = (TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0] / 4) * TJAPlayer3.Skin.Game_Taiko_Combo_Scale[cat]; - float c = (TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1] / 4) * TJAPlayer3.Skin.Game_Taiko_Combo_Scale[cat]; + if (OpenTaiko.Tx.Taiko_Combo_Effect != null) { + int a = rightX - OpenTaiko.Skin.Game_Taiko_Combo_Padding[cat] * i; + float b = (OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0] / 4) * OpenTaiko.Skin.Game_Taiko_Combo_Scale[cat]; + float c = (OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[1] / 4) * OpenTaiko.Skin.Game_Taiko_Combo_Scale[cat]; float d = y; if (ctコンボラメ.CurrentValue < 13) // First { // まんなか - TJAPlayer3.Tx.Taiko_Combo_Effect.t2D拡大率考慮下中心基準描画(a, d - c - (int)(1.05 * this.ctコンボラメ.CurrentValue) - 13); + OpenTaiko.Tx.Taiko_Combo_Effect.t2D拡大率考慮下中心基準描画(a, d - c - (int)(1.05 * this.ctコンボラメ.CurrentValue) - 13); } if (ctコンボラメ.CurrentValue >= 8 && ctコンボラメ.CurrentValue < 23) { // みぎ - TJAPlayer3.Tx.Taiko_Combo_Effect.t2D拡大率考慮下中心基準描画(a + b, d - c - (int)(1.05 * (this.ctコンボラメ.CurrentValue - 10)) - 3); + OpenTaiko.Tx.Taiko_Combo_Effect.t2D拡大率考慮下中心基準描画(a + b, d - c - (int)(1.05 * (this.ctコンボラメ.CurrentValue - 10)) - 3); } if (this.ctコンボラメ.CurrentValue >= 17 && this.ctコンボラメ.CurrentValue < 32) { // ひだり - TJAPlayer3.Tx.Taiko_Combo_Effect.t2D拡大率考慮下中心基準描画(a - b, d - c - (int)(1.05 * this.ctコンボラメ.CurrentValue - 20) - 8); + OpenTaiko.Tx.Taiko_Combo_Effect.t2D拡大率考慮下中心基準描画(a - b, d - c - (int)(1.05 * this.ctコンボラメ.CurrentValue - 20) - 8); } } } @@ -351,39 +351,39 @@ namespace TJAPlayer3 { int combo_ex_y; int combo_ex4_x; int combo_ex4_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - combo_text_x = TJAPlayer3.Skin.Game_Taiko_Combo_Text_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * nPlayer); - combo_text_y = TJAPlayer3.Skin.Game_Taiko_Combo_Text_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * nPlayer); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + combo_text_x = OpenTaiko.Skin.Game_Taiko_Combo_Text_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * nPlayer); + combo_text_y = OpenTaiko.Skin.Game_Taiko_Combo_Text_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * nPlayer); - combo_x = TJAPlayer3.Skin.Game_Taiko_Combo_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * nPlayer); - combo_y = TJAPlayer3.Skin.Game_Taiko_Combo_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * nPlayer); - combo_ex_x = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * nPlayer); - combo_ex_y = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * nPlayer); - combo_ex4_x = TJAPlayer3.Skin.Game_Taiko_Combo_Ex4_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * nPlayer); - combo_ex4_y = TJAPlayer3.Skin.Game_Taiko_Combo_Ex4_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * nPlayer); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - combo_text_x = TJAPlayer3.Skin.Game_Taiko_Combo_Text_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * nPlayer); - combo_text_y = TJAPlayer3.Skin.Game_Taiko_Combo_Text_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * nPlayer); + combo_x = OpenTaiko.Skin.Game_Taiko_Combo_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * nPlayer); + combo_y = OpenTaiko.Skin.Game_Taiko_Combo_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * nPlayer); + combo_ex_x = OpenTaiko.Skin.Game_Taiko_Combo_Ex_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * nPlayer); + combo_ex_y = OpenTaiko.Skin.Game_Taiko_Combo_Ex_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * nPlayer); + combo_ex4_x = OpenTaiko.Skin.Game_Taiko_Combo_Ex4_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * nPlayer); + combo_ex4_y = OpenTaiko.Skin.Game_Taiko_Combo_Ex4_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * nPlayer); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + combo_text_x = OpenTaiko.Skin.Game_Taiko_Combo_Text_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * nPlayer); + combo_text_y = OpenTaiko.Skin.Game_Taiko_Combo_Text_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * nPlayer); - combo_x = TJAPlayer3.Skin.Game_Taiko_Combo_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * nPlayer); - combo_y = TJAPlayer3.Skin.Game_Taiko_Combo_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * nPlayer); - combo_ex_x = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * nPlayer); - combo_ex_y = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * nPlayer); - combo_ex4_x = TJAPlayer3.Skin.Game_Taiko_Combo_Ex4_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * nPlayer); - combo_ex4_y = TJAPlayer3.Skin.Game_Taiko_Combo_Ex4_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * nPlayer); + combo_x = OpenTaiko.Skin.Game_Taiko_Combo_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * nPlayer); + combo_y = OpenTaiko.Skin.Game_Taiko_Combo_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * nPlayer); + combo_ex_x = OpenTaiko.Skin.Game_Taiko_Combo_Ex_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * nPlayer); + combo_ex_y = OpenTaiko.Skin.Game_Taiko_Combo_Ex_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * nPlayer); + combo_ex4_x = OpenTaiko.Skin.Game_Taiko_Combo_Ex4_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * nPlayer); + combo_ex4_y = OpenTaiko.Skin.Game_Taiko_Combo_Ex4_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * nPlayer); } else { - combo_text_x = TJAPlayer3.Skin.Game_Taiko_Combo_Text_X[nPlayer]; - combo_text_y = TJAPlayer3.Skin.Game_Taiko_Combo_Text_Y[nPlayer]; + combo_text_x = OpenTaiko.Skin.Game_Taiko_Combo_Text_X[nPlayer]; + combo_text_y = OpenTaiko.Skin.Game_Taiko_Combo_Text_Y[nPlayer]; - combo_x = TJAPlayer3.Skin.Game_Taiko_Combo_X[nPlayer]; - combo_y = TJAPlayer3.Skin.Game_Taiko_Combo_Y[nPlayer]; - combo_ex_x = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_X[nPlayer]; - combo_ex_y = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_Y[nPlayer]; - combo_ex4_x = TJAPlayer3.Skin.Game_Taiko_Combo_Ex4_X[nPlayer]; - combo_ex4_y = TJAPlayer3.Skin.Game_Taiko_Combo_Ex4_Y[nPlayer]; + combo_x = OpenTaiko.Skin.Game_Taiko_Combo_X[nPlayer]; + combo_y = OpenTaiko.Skin.Game_Taiko_Combo_Y[nPlayer]; + combo_ex_x = OpenTaiko.Skin.Game_Taiko_Combo_Ex_X[nPlayer]; + combo_ex_y = OpenTaiko.Skin.Game_Taiko_Combo_Ex_Y[nPlayer]; + combo_ex4_x = OpenTaiko.Skin.Game_Taiko_Combo_Ex4_X[nPlayer]; + combo_ex4_y = OpenTaiko.Skin.Game_Taiko_Combo_Ex4_Y[nPlayer]; } - int nY上辺位置px = TJAPlayer3.ConfigIni.bReverse.Drums ? 350 : 10; + int nY上辺位置px = OpenTaiko.ConfigIni.bReverse.Drums ? 350 : 10; int n数字とCOMBOを合わせた画像の全長px = ((44) * n桁数); int x = 245 + (n数字とCOMBOを合わせた画像の全長px / 2); //int y = 212; @@ -391,18 +391,18 @@ namespace TJAPlayer3 { #region[ Combo text & Combo guides ] - if (!TJAPlayer3.ConfigIni.SimpleMode) { - TJAPlayer3.Tx.Taiko_Combo_Text?.t2D拡大率考慮下中心基準描画(combo_text_x, combo_text_y); + if (!OpenTaiko.ConfigIni.SimpleMode) { + OpenTaiko.Tx.Taiko_Combo_Text?.t2D拡大率考慮下中心基準描画(combo_text_x, combo_text_y); int guide = 2; - var ccf = TJAPlayer3.stage演奏ドラム画面.CChartScore[nPlayer]; + var ccf = OpenTaiko.stage演奏ドラム画面.CChartScore[nPlayer]; if (ccf.nGood > 0) guide = 1; if (ccf.nMiss > 0 || ccf.nMine > 0) guide = 0; - TJAPlayer3.Tx.Taiko_Combo_Guide[guide]?.t2D拡大率考慮下中心基準描画(combo_text_x, combo_text_y); + OpenTaiko.Tx.Taiko_Combo_Guide[guide]?.t2D拡大率考慮下中心基準描画(combo_text_x, combo_text_y); } #endregion @@ -414,13 +414,13 @@ namespace TJAPlayer3 { rightX = combo_x; } else if (n桁数 == 2) { // 二桁ならSkinConfigの座標+パディング/2を使用する - rightX = combo_x + TJAPlayer3.Skin.Game_Taiko_Combo_Padding[0] / 2; + rightX = combo_x + OpenTaiko.Skin.Game_Taiko_Combo_Padding[0] / 2; } else if (n桁数 == 3) { // 三桁ならSkinConfigの座標+パディングを使用する - rightX = combo_ex_x + TJAPlayer3.Skin.Game_Taiko_Combo_Padding[1]; + rightX = combo_ex_x + OpenTaiko.Skin.Game_Taiko_Combo_Padding[1]; } else if (n桁数 == 4) { // 四桁ならSkinconfigの座標+パディング/2 + パディングを使用する - rightX = combo_ex4_x + TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] / 2 + TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2]; + rightX = combo_ex4_x + OpenTaiko.Skin.Game_Taiko_Combo_Padding[2] / 2 + OpenTaiko.Skin.Game_Taiko_Combo_Padding[2]; } else { // 五桁以上の場合 int rightDigit = 0; @@ -430,14 +430,14 @@ namespace TJAPlayer3 { // パディング/2を足す必要がある // 右に表示される桁数を求め、-1する rightDigit = n桁数 / 2 - 1; - rightX = combo_ex4_x + TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] / 2 + TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] * rightDigit; + rightX = combo_ex4_x + OpenTaiko.Skin.Game_Taiko_Combo_Padding[2] / 2 + OpenTaiko.Skin.Game_Taiko_Combo_Padding[2] * rightDigit; break; case 1: // 2で割るとあまりが出る // そのままパディングを足していく // 右に表示される桁数を求める(中央除く -1) rightDigit = (n桁数 - 1) / 2; - rightX = combo_ex4_x + TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] * rightDigit; + rightX = combo_ex4_x + OpenTaiko.Skin.Game_Taiko_Combo_Padding[2] * rightDigit; break; default: break; @@ -448,67 +448,67 @@ namespace TJAPlayer3 { for (int i = 0; i < n桁数; i++) { - TJAPlayer3.Tx.Taiko_Combo[0].Opacity = 255; - TJAPlayer3.Tx.Taiko_Combo[1].Opacity = 255; + OpenTaiko.Tx.Taiko_Combo[0].Opacity = 255; + OpenTaiko.Tx.Taiko_Combo[1].Opacity = 255; if (n桁数 <= 1) { - if (TJAPlayer3.Tx.Taiko_Combo[0] != null) { - var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0]; - TJAPlayer3.Tx.Taiko_Combo[0].t2D拡大率考慮下中心基準描画(rightX, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1])); + if (OpenTaiko.Tx.Taiko_Combo[0] != null) { + var yScalling = OpenTaiko.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.Y = OpenTaiko.Skin.Game_Taiko_Combo_Scale[0] + yScalling; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.X = OpenTaiko.Skin.Game_Taiko_Combo_Scale[0]; + OpenTaiko.Tx.Taiko_Combo[0].t2D拡大率考慮下中心基準描画(rightX, combo_y, new Rectangle(n位の数[i] * OpenTaiko.Skin.Game_Taiko_Combo_Size[0], 0, OpenTaiko.Skin.Game_Taiko_Combo_Size[0], OpenTaiko.Skin.Game_Taiko_Combo_Size[1])); } } else if (n桁数 <= 2) { //int[] arComboX = { CDTXMania.Skin.Game_Taiko_Combo_X[nPlayer] + CDTXMania.Skin.Game_Taiko_Combo_Padding[0], CDTXMania.Skin.Game_Taiko_Combo_X[nPlayer] - CDTXMania.Skin.Game_Taiko_Combo_Padding[0] }; if (nCombo値 < 50) { - if (TJAPlayer3.Tx.Taiko_Combo[0] != null) { - var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0]; - TJAPlayer3.Tx.Taiko_Combo[0].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[0] * i, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1])); + if (OpenTaiko.Tx.Taiko_Combo[0] != null) { + var yScalling = OpenTaiko.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.Y = OpenTaiko.Skin.Game_Taiko_Combo_Scale[0] + yScalling; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.X = OpenTaiko.Skin.Game_Taiko_Combo_Scale[0]; + OpenTaiko.Tx.Taiko_Combo[0].t2D拡大率考慮下中心基準描画(rightX - OpenTaiko.Skin.Game_Taiko_Combo_Padding[0] * i, combo_y, new Rectangle(n位の数[i] * OpenTaiko.Skin.Game_Taiko_Combo_Size[0], 0, OpenTaiko.Skin.Game_Taiko_Combo_Size[0], OpenTaiko.Skin.Game_Taiko_Combo_Size[1])); } } else { - if (TJAPlayer3.Tx.Taiko_Combo[2] != null) { - var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; - TJAPlayer3.Tx.Taiko_Combo[2].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0] + yScalling; - TJAPlayer3.Tx.Taiko_Combo[2].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[0]; - TJAPlayer3.Tx.Taiko_Combo[2].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[0] * i, combo_y, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1])); + if (OpenTaiko.Tx.Taiko_Combo[2] != null) { + var yScalling = OpenTaiko.ConfigIni.SimpleMode ? 0 : ComboScale[this.ctコンボ加算[nPlayer].CurrentValue]; + OpenTaiko.Tx.Taiko_Combo[2].vcScaleRatio.Y = OpenTaiko.Skin.Game_Taiko_Combo_Scale[0] + yScalling; + OpenTaiko.Tx.Taiko_Combo[2].vcScaleRatio.X = OpenTaiko.Skin.Game_Taiko_Combo_Scale[0]; + OpenTaiko.Tx.Taiko_Combo[2].t2D拡大率考慮下中心基準描画(rightX - OpenTaiko.Skin.Game_Taiko_Combo_Padding[0] * i, combo_y, new Rectangle(n位の数[i] * OpenTaiko.Skin.Game_Taiko_Combo_Size[0], 0, OpenTaiko.Skin.Game_Taiko_Combo_Size[0], OpenTaiko.Skin.Game_Taiko_Combo_Size[1])); } - if (!TJAPlayer3.ConfigIni.SimpleMode) showComboEffect(0, i, rightX, combo_ex_y, nPlayer); + if (!OpenTaiko.ConfigIni.SimpleMode) showComboEffect(0, i, rightX, combo_ex_y, nPlayer); } } else if (n桁数 == 3) { - if (nCombo値 >= 300 && TJAPlayer3.Tx.Taiko_Combo[3] != null) { - var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; - TJAPlayer3.Tx.Taiko_Combo[3].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1] + yScalling; - TJAPlayer3.Tx.Taiko_Combo[3].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1]; - var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; - TJAPlayer3.Tx.Taiko_Combo[3].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[1] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1])); - } else if (TJAPlayer3.Tx.Taiko_Combo[1] != null) { - var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; - TJAPlayer3.Tx.Taiko_Combo[1].vcScaleRatio.Y = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1] + yScalling; - TJAPlayer3.Tx.Taiko_Combo[1].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[1]; - var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; - TJAPlayer3.Tx.Taiko_Combo[1].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[1] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1])); + if (nCombo値 >= 300 && OpenTaiko.Tx.Taiko_Combo[3] != null) { + var yScalling = OpenTaiko.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; + OpenTaiko.Tx.Taiko_Combo[3].vcScaleRatio.Y = OpenTaiko.Skin.Game_Taiko_Combo_Scale[1] + yScalling; + OpenTaiko.Tx.Taiko_Combo[3].vcScaleRatio.X = OpenTaiko.Skin.Game_Taiko_Combo_Scale[1]; + var yJumping = OpenTaiko.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; + OpenTaiko.Tx.Taiko_Combo[3].t2D拡大率考慮下中心基準描画(rightX - OpenTaiko.Skin.Game_Taiko_Combo_Padding[1] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0], 0, OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0], OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[1])); + } else if (OpenTaiko.Tx.Taiko_Combo[1] != null) { + var yScalling = OpenTaiko.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; + OpenTaiko.Tx.Taiko_Combo[1].vcScaleRatio.Y = OpenTaiko.Skin.Game_Taiko_Combo_Scale[1] + yScalling; + OpenTaiko.Tx.Taiko_Combo[1].vcScaleRatio.X = OpenTaiko.Skin.Game_Taiko_Combo_Scale[1]; + var yJumping = OpenTaiko.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; + OpenTaiko.Tx.Taiko_Combo[1].t2D拡大率考慮下中心基準描画(rightX - OpenTaiko.Skin.Game_Taiko_Combo_Padding[1] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0], 0, OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0], OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[1])); } - if (!TJAPlayer3.ConfigIni.SimpleMode) showComboEffect(1, i, rightX, combo_ex_y, nPlayer); + if (!OpenTaiko.ConfigIni.SimpleMode) showComboEffect(1, i, rightX, combo_ex_y, nPlayer); } else { - if (nCombo値 >= 300 && TJAPlayer3.Tx.Taiko_Combo[3] != null) { - var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; - TJAPlayer3.Tx.Taiko_Combo[3].vcScaleRatio.Y = 1.0f + yScalling; - TJAPlayer3.Tx.Taiko_Combo[3].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[2]; - var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; - TJAPlayer3.Tx.Taiko_Combo[3].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1])); - } else if (TJAPlayer3.Tx.Taiko_Combo[1] != null) { - var yScalling = TJAPlayer3.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; - TJAPlayer3.Tx.Taiko_Combo[1].vcScaleRatio.Y = 1.0f + yScalling; - TJAPlayer3.Tx.Taiko_Combo[1].vcScaleRatio.X = TJAPlayer3.Skin.Game_Taiko_Combo_Scale[2]; - var yJumping = TJAPlayer3.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; - TJAPlayer3.Tx.Taiko_Combo[1].t2D拡大率考慮下中心基準描画(rightX - TJAPlayer3.Skin.Game_Taiko_Combo_Padding[2] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size_Ex[1])); + if (nCombo値 >= 300 && OpenTaiko.Tx.Taiko_Combo[3] != null) { + var yScalling = OpenTaiko.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; + OpenTaiko.Tx.Taiko_Combo[3].vcScaleRatio.Y = 1.0f + yScalling; + OpenTaiko.Tx.Taiko_Combo[3].vcScaleRatio.X = OpenTaiko.Skin.Game_Taiko_Combo_Scale[2]; + var yJumping = OpenTaiko.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; + OpenTaiko.Tx.Taiko_Combo[3].t2D拡大率考慮下中心基準描画(rightX - OpenTaiko.Skin.Game_Taiko_Combo_Padding[2] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0], 0, OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0], OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[1])); + } else if (OpenTaiko.Tx.Taiko_Combo[1] != null) { + var yScalling = OpenTaiko.ConfigIni.SimpleMode ? 0 : ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 0]; + OpenTaiko.Tx.Taiko_Combo[1].vcScaleRatio.Y = 1.0f + yScalling; + OpenTaiko.Tx.Taiko_Combo[1].vcScaleRatio.X = OpenTaiko.Skin.Game_Taiko_Combo_Scale[2]; + var yJumping = OpenTaiko.Skin.Game_Taiko_Combo_Ex_IsJumping ? (int)ComboScale_Ex[this.ctコンボ加算[nPlayer].CurrentValue, 1] : 0; + OpenTaiko.Tx.Taiko_Combo[1].t2D拡大率考慮下中心基準描画(rightX - OpenTaiko.Skin.Game_Taiko_Combo_Padding[2] * i, combo_ex_y + yJumping, new Rectangle(n位の数[i] * OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0], 0, OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[0], OpenTaiko.Skin.Game_Taiko_Combo_Size_Ex[1])); } - if (!TJAPlayer3.ConfigIni.SimpleMode) showComboEffect(2, i, rightX, combo_ex_y, nPlayer); + if (!OpenTaiko.ConfigIni.SimpleMode) showComboEffect(2, i, rightX, combo_ex_y, nPlayer); } } @@ -533,9 +533,9 @@ namespace TJAPlayer3 { this.status[i].nジャンプインデックス値 = 99999; this.status[i].n前回の時刻_ジャンプ用 = -1; this.status[i].nコンボが切れた時刻 = -1; - this.ctコンボ加算[i] = new CCounter(0, 12, 12, TJAPlayer3.Timer); + this.ctコンボ加算[i] = new CCounter(0, 12, 12, OpenTaiko.Timer); } - this.ctコンボラメ = new CCounter(0, 35, 16, TJAPlayer3.Timer); + this.ctコンボラメ = new CCounter(0, 35, 16, OpenTaiko.Timer); base.Activate(); } public override void DeActivate() { @@ -563,7 +563,7 @@ namespace TJAPlayer3 { e今回の状態遷移イベント = EEvent.同一数値; } else if (this.status[i].n現在表示中のCOMBO値 > this.status[i].nCOMBO値) { e今回の状態遷移イベント = EEvent.ミス通知; - } else if ((this.status[i].n現在表示中のCOMBO値 < TJAPlayer3.ConfigIni.n表示可能な最小コンボ数.Drums) && (this.status[i].nCOMBO値 < TJAPlayer3.ConfigIni.n表示可能な最小コンボ数.Drums)) { + } else if ((this.status[i].n現在表示中のCOMBO値 < OpenTaiko.ConfigIni.n表示可能な最小コンボ数.Drums) && (this.status[i].nCOMBO値 < OpenTaiko.ConfigIni.n表示可能な最小コンボ数.Drums)) { e今回の状態遷移イベント = EEvent.非表示; } else { e今回の状態遷移イベント = EEvent.数値更新; @@ -574,11 +574,11 @@ namespace TJAPlayer3 { #region [ nジャンプインデックス値 の進行。] //----------------- if (this.status[i].nジャンプインデックス値 < 360) { - if ((this.status[i].n前回の時刻_ジャンプ用 == -1) || (TJAPlayer3.Timer.NowTime < this.status[i].n前回の時刻_ジャンプ用)) - this.status[i].n前回の時刻_ジャンプ用 = TJAPlayer3.Timer.NowTime; + if ((this.status[i].n前回の時刻_ジャンプ用 == -1) || (OpenTaiko.Timer.NowTime < this.status[i].n前回の時刻_ジャンプ用)) + this.status[i].n前回の時刻_ジャンプ用 = OpenTaiko.Timer.NowTime; const long INTERVAL = 2; - while ((TJAPlayer3.Timer.NowTime - this.status[i].n前回の時刻_ジャンプ用) >= INTERVAL) { + while ((OpenTaiko.Timer.NowTime - this.status[i].n前回の時刻_ジャンプ用) >= INTERVAL) { if (this.status[i].nジャンプインデックス値 < 2000) this.status[i].nジャンプインデックス値 += 3; @@ -599,7 +599,7 @@ namespace TJAPlayer3 { // モード変更 this.status[i].e現在のモード = EMode.進行表示中; this.status[i].nジャンプインデックス値 = 0; - this.status[i].n前回の時刻_ジャンプ用 = TJAPlayer3.Timer.NowTime; + this.status[i].n前回の時刻_ジャンプ用 = OpenTaiko.Timer.NowTime; goto Retry; } @@ -616,13 +616,13 @@ namespace TJAPlayer3 { // モード変更 this.status[i].e現在のモード = EMode.残像表示中; this.status[i].n残像表示中のCOMBO値 = this.status[i].n現在表示中のCOMBO値; - this.status[i].nコンボが切れた時刻 = TJAPlayer3.Timer.NowTime; + this.status[i].nコンボが切れた時刻 = OpenTaiko.Timer.NowTime; goto Retry; } if (e今回の状態遷移イベント == EEvent.数値更新) { this.status[i].nジャンプインデックス値 = 0; - this.status[i].n前回の時刻_ジャンプ用 = TJAPlayer3.Timer.NowTime; + this.status[i].n前回の時刻_ジャンプ用 = OpenTaiko.Timer.NowTime; } this.status[i].n現在表示中のCOMBO値 = this.status[i].nCOMBO値; @@ -659,7 +659,7 @@ namespace TJAPlayer3 { this.status[i].e現在のモード = EMode.進行表示中; goto Retry; } - if ((TJAPlayer3.Timer.NowTime - this.status[i].nコンボが切れた時刻) > 1000) { + if ((OpenTaiko.Timer.NowTime - this.status[i].nコンボが切れた時刻) > 1000) { // モード変更２ this.status[i].e現在のモード = EMode.非表示中; goto Retry; diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏Combo音声.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏Combo音声.cs index 66679bb2..7dbc73aa 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏Combo音声.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏Combo音声.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏Combo音声 : CActivity { // コンストラクタ @@ -55,19 +55,19 @@ namespace TJAPlayer3 { // フォルダ内を走査してコンボボイスをListに入れていく // 1P、2P コンボボイス - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { #region [Combo voices] - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(i)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(i)].data.Character; - var currentDir = ($@"{TJAPlayer3.strEXEのあるフォルダ}Global{Path.DirectorySeparatorChar}Characters{Path.DirectorySeparatorChar}{TJAPlayer3.Skin.Characters_DirName[_charaId]}{Path.DirectorySeparatorChar}Sounds{Path.DirectorySeparatorChar}Combo{Path.DirectorySeparatorChar}"); + var currentDir = ($@"{OpenTaiko.strEXEのあるフォルダ}Global{Path.DirectorySeparatorChar}Characters{Path.DirectorySeparatorChar}{OpenTaiko.Skin.Characters_DirName[_charaId]}{Path.DirectorySeparatorChar}Sounds{Path.DirectorySeparatorChar}Combo{Path.DirectorySeparatorChar}"); if (Directory.Exists(currentDir)) { foreach (var item in Directory.GetFiles(currentDir)) { var comboVoice = new CComboVoice(); comboVoice.bFileFound = true; comboVoice.nPlayer = i; comboVoice.strFilePath = item; - comboVoice.soundComboVoice = TJAPlayer3.SoundManager.tCreateSound(item, ESoundGroup.Voice); + comboVoice.soundComboVoice = OpenTaiko.SoundManager.tCreateSound(item, ESoundGroup.Voice); /* if (TJAPlayer3.ConfigIni.nPlayerCount >= 2) //2020.05.06 Mr-Ojii 左右に出したかったから追加。 { @@ -77,7 +77,7 @@ namespace TJAPlayer3 { comboVoice.soundComboVoice.n位置 = 100; } */ - comboVoice.soundComboVoice.SoundPosition = TJAPlayer3.ConfigIni.nPanning[TJAPlayer3.ConfigIni.nPlayerCount - 1][i]; + comboVoice.soundComboVoice.SoundPosition = OpenTaiko.ConfigIni.nPanning[OpenTaiko.ConfigIni.nPlayerCount - 1][i]; comboVoice.nCombo = int.Parse(Path.GetFileNameWithoutExtension(item)); ListCombo[i].Add(comboVoice); } @@ -90,14 +90,14 @@ namespace TJAPlayer3 { #region [Floor voices] - currentDir = ($@"{TJAPlayer3.strEXEのあるフォルダ}Global\Characters\{TJAPlayer3.Skin.Characters_DirName[_charaId]}\Sounds\Tower_Combo\"); + currentDir = ($@"{OpenTaiko.strEXEのあるフォルダ}Global\Characters\{OpenTaiko.Skin.Characters_DirName[_charaId]}\Sounds\Tower_Combo\"); if (Directory.Exists(currentDir)) { foreach (var item in Directory.GetFiles(currentDir)) { var comboVoice = new CComboVoice(); comboVoice.bFileFound = true; comboVoice.nPlayer = i; comboVoice.strFilePath = item; - comboVoice.soundComboVoice = TJAPlayer3.SoundManager.tCreateSound(item, ESoundGroup.Voice); + comboVoice.soundComboVoice = OpenTaiko.SoundManager.tCreateSound(item, ESoundGroup.Voice); comboVoice.nCombo = int.Parse(Path.GetFileNameWithoutExtension(item)); ListFloor[i].Add(comboVoice); } @@ -117,12 +117,12 @@ namespace TJAPlayer3 { if (!base.IsDeActivated) { for (int i = 0; i < 5; i++) { foreach (var item in ListCombo[i]) { - TJAPlayer3.SoundManager.tDisposeSound(item.soundComboVoice); + OpenTaiko.SoundManager.tDisposeSound(item.soundComboVoice); } ListCombo[i].Clear(); foreach (var item in ListFloor[i]) { - TJAPlayer3.SoundManager.tDisposeSound(item.soundComboVoice); + OpenTaiko.SoundManager.tDisposeSound(item.soundComboVoice); } ListFloor[i].Clear(); } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏PauseMenu.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏PauseMenu.cs index 36b4268f..c8065a25 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏PauseMenu.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏PauseMenu.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏PauseMenu : CActSelectPopupMenu { // コンストラクタ @@ -12,7 +12,7 @@ namespace TJAPlayer3 { private void CAct演奏PauseMenuMain() { this.bEsc有効 = false; lci = new List>>(); // この画面に来る度に、メニューを作り直す。 - for (int nConfSet = 0; nConfSet < (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan ? 3 : 2); nConfSet++) { + for (int nConfSet = 0; nConfSet < (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan ? 3 : 2); nConfSet++) { lci.Add(new List>()); // ConfSet用の3つ分の枠。 for (int nInst = 0; nInst < 3; nInst++) { lci[nConfSet].Add(null); // Drum/Guitar/Bassで3つ分、枠を作っておく @@ -27,7 +27,7 @@ namespace TJAPlayer3 { #region [ 共通 SET切り替え/More/Return ] l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString("PAUSE_RESUME"), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "" })); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString("PAUSE_RESTART"), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "" })); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString("PAUSE_RESTART"), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "" })); l.Add(new CSwitchItemList(CLangManager.LangInstance.GetString("PAUSE_EXIT"), CItemBase.EPanelType.Normal, 0, "", "", new string[] { "", "" })); #endregion @@ -51,8 +51,8 @@ namespace TJAPlayer3 { if (!sw.IsRunning) this.sw = Stopwatch.StartNew(); if (sw.ElapsedMilliseconds > 1500) { - TJAPlayer3.stage演奏ドラム画面.bPAUSE = false; - TJAPlayer3.stage演奏ドラム画面.t演奏やりなおし(); + OpenTaiko.stage演奏ドラム画面.bPAUSE = false; + OpenTaiko.stage演奏ドラム画面.t演奏やりなおし(); this.tDeativatePopupMenu(); this.sw.Reset(); @@ -63,25 +63,25 @@ namespace TJAPlayer3 { public override void tEnter押下Main(int nSortOrder) { switch (n現在の選択行) { case (int)EOrder.Continue: - TJAPlayer3.stage演奏ドラム画面.bPAUSE = false; + OpenTaiko.stage演奏ドラム画面.bPAUSE = false; SoundManager.PlayTimer.Resume(); - TJAPlayer3.Timer.Resume(); - TJAPlayer3.DTX.t全チップの再生再開(); - TJAPlayer3.stage演奏ドラム画面.actAVI.tPauseControl(); + OpenTaiko.Timer.Resume(); + OpenTaiko.DTX.t全チップの再生再開(); + OpenTaiko.stage演奏ドラム画面.actAVI.tPauseControl(); CActSelectPopupMenu.b選択した = true; this.tDeativatePopupMenu(); break; case (int)EOrder.Redoing: - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { - TJAPlayer3.stage演奏ドラム画面.tResetGameplayFinishedStatus(); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { + OpenTaiko.stage演奏ドラム画面.tResetGameplayFinishedStatus(); this.bやり直しを選択した = true; CActSelectPopupMenu.b選択した = true; } else { SoundManager.PlayTimer.Resume(); - TJAPlayer3.Timer.Resume(); - TJAPlayer3.stage演奏ドラム画面.t演奏中止(); + OpenTaiko.Timer.Resume(); + OpenTaiko.stage演奏ドラム画面.t演奏中止(); CActSelectPopupMenu.b選択した = true; this.tDeativatePopupMenu(); } @@ -89,8 +89,8 @@ namespace TJAPlayer3 { case (int)EOrder.Return: SoundManager.PlayTimer.Resume(); - TJAPlayer3.Timer.Resume(); - TJAPlayer3.stage演奏ドラム画面.t演奏中止(); + OpenTaiko.Timer.Resume(); + OpenTaiko.stage演奏ドラム画面.t演奏中止(); CActSelectPopupMenu.b選択した = true; this.tDeativatePopupMenu(); break; @@ -115,14 +115,14 @@ namespace TJAPlayer3 { public override void CreateManagedResource() { string pathパネル本体 = CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}ScreenSelect popup auto settings.png"); if (File.Exists(pathパネル本体)) { - this.txパネル本体 = TJAPlayer3.tテクスチャの生成(pathパネル本体, true); + this.txパネル本体 = OpenTaiko.tテクスチャの生成(pathパネル本体, true); } base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tテクスチャの解放(ref this.txパネル本体); - TJAPlayer3.tテクスチャの解放(ref this.tx文字列パネル); + OpenTaiko.tテクスチャの解放(ref this.txパネル本体); + OpenTaiko.tテクスチャの解放(ref this.tx文字列パネル); base.ReleaseManagedResource(); } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏ゲージ共通.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏ゲージ共通.cs index 7234e826..f17c5de8 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏ゲージ共通.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏ゲージ共通.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// CAct演奏Drumsゲージ と CAct演奏Gutiarゲージ のbaseクラス。ダメージ計算やDanger/Failed判断もこのクラスで行う。 /// @@ -27,11 +27,11 @@ namespace TJAPlayer3 { dbゲージ増加量_Branch[i, n] = new float[5]; } } - this.DTX[0] = TJAPlayer3.DTX; - this.DTX[1] = TJAPlayer3.DTX_2P; - this.DTX[2] = TJAPlayer3.DTX_3P; - this.DTX[3] = TJAPlayer3.DTX_4P; - this.DTX[4] = TJAPlayer3.DTX_5P; + this.DTX[0] = OpenTaiko.DTX; + this.DTX[1] = OpenTaiko.DTX_2P; + this.DTX[2] = OpenTaiko.DTX_3P; + this.DTX[3] = OpenTaiko.DTX_4P; + this.DTX[4] = OpenTaiko.DTX_5P; actLVLNFont = new CActLVLNFont(); actLVLNFont.Activate(); base.Activate(); @@ -94,7 +94,7 @@ namespace TJAPlayer3 { { //ダメージ値の計算 { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(nPlayer)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(nPlayer)].data.Character]; switch (chara.effect.tGetGaugeType()) { default: case "Normal": @@ -114,14 +114,14 @@ namespace TJAPlayer3 { if (nRiskyTimes_InitialVal > 0) { this.bRisky = true; - this.nRiskyTimes = TJAPlayer3.ConfigIni.nRisky; - this.nRiskyTimes_Initial = TJAPlayer3.ConfigIni.nRisky; + this.nRiskyTimes = OpenTaiko.ConfigIni.nRisky; + this.nRiskyTimes_Initial = OpenTaiko.ConfigIni.nRisky; } float gaugeRate = 0f; float dbDamageRate = 2.0f; - int nanidou = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer]; + int nanidou = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[nPlayer]; switch (this.DTX[nPlayer].LEVELtaiko[nanidou]) { case 0: @@ -269,7 +269,7 @@ namespace TJAPlayer3 { } for (int i = 0; i < 3; i++) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(nPlayer)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(nPlayer)].data.Character]; switch (chara.effect.tGetGaugeType()) { default: case "Normal": @@ -284,7 +284,7 @@ namespace TJAPlayer3 { } } for (int i = 0; i < 3; i++) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(nPlayer)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(nPlayer)].data.Character]; switch (chara.effect.tGetGaugeType()) { default: case "Normal": @@ -355,7 +355,7 @@ namespace TJAPlayer3 { public void Damage(EInstrumentPad screenmode, EInstrumentPad part, ENoteJudge e今回の判定, int nPlayer) { float fDamage; - int nコース = (int)TJAPlayer3.stage演奏ドラム画面.n現在のコース[nPlayer]; + int nコース = (int)OpenTaiko.stage演奏ドラム画面.n現在のコース[nPlayer]; switch (e今回の判定) { case ENoteJudge.Perfect: @@ -384,9 +384,9 @@ namespace TJAPlayer3 { fDamage = -fDamage; } - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(nPlayer)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(nPlayer)].data.Character]; - int nanidou = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer]; + int nanidou = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[nPlayer]; int level = this.DTX[nPlayer].LEVELtaiko[nanidou]; switch (chara.effect.tGetGaugeType()) { diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏スクロール速度.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏スクロール速度.cs index 89dd5f39..f5cd4b51 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏スクロール速度.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏スクロール速度.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏スクロール速度 : CActivity { // プロパティ @@ -18,7 +18,7 @@ namespace TJAPlayer3 { public override void Activate() { for (int i = 0; i < 5; i++) { - this.db現在の譜面スクロール速度[i] = (double)TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.GetActualPlayer(i)]; + this.db現在の譜面スクロール速度[i] = (double)OpenTaiko.ConfigIni.nScrollSpeed[OpenTaiko.GetActualPlayer(i)]; this.n速度変更制御タイマ[i] = -1; } @@ -31,7 +31,7 @@ namespace TJAPlayer3 { if (base.IsFirstDraw) { //this.n速度変更制御タイマ.Drums = this.n速度変更制御タイマ.Guitar = this.n速度変更制御タイマ.Bass = (long)(CSound管理.rc演奏用タイマ.n現在時刻 * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); for (int i = 0; i < 5; i++) { - this.n速度変更制御タイマ[i] = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + this.n速度変更制御タイマ[i] = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); } @@ -39,7 +39,7 @@ namespace TJAPlayer3 { } long n現在時刻 = SoundManager.PlayTimer.NowTime; for (int i = 0; i < 5; i++) { - double db譜面スクロールスピード = (double)TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.GetActualPlayer(i)]; + double db譜面スクロールスピード = (double)OpenTaiko.ConfigIni.nScrollSpeed[OpenTaiko.GetActualPlayer(i)]; if (n現在時刻 < this.n速度変更制御タイマ[i]) { this.n速度変更制御タイマ[i] = n現在時刻; } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏スコア共通.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏スコア共通.cs index cbb0c5e5..793fdcce 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏スコア共通.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏スコア共通.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏スコア共通 : CActivity { // プロパティ @@ -184,13 +184,13 @@ namespace TJAPlayer3 { /// /// public void Add(long delta, int player) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && player == 1) return; + if (OpenTaiko.ConfigIni.bAIBattleMode && player == 1) return; double rev = 1.0; - delta = (long)(delta * TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, player)); + delta = (long)(delta * OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, player)); - this.ctTimer = new CCounter(0, 400, 1, TJAPlayer3.Timer); + this.ctTimer = new CCounter(0, 400, 1, OpenTaiko.Timer); for (int sc = 0; sc < 1; sc++) { for (int i = 0; i < 256; i++) { @@ -198,7 +198,7 @@ namespace TJAPlayer3 { this.stScore[i].b使用中 = true; this.stScore[i].b表示中 = true; this.stScore[i].nAddScore = (int)delta; - this.stScore[i].ctTimer = new CCounter(0, 465, 2, TJAPlayer3.Timer); + this.stScore[i].ctTimer = new CCounter(0, 465, 2, OpenTaiko.Timer); this.stScore[i].bBonusScore = false; this.stScore[i].bAddEnd = false; this.stScore[i].nPlayer = player; @@ -212,7 +212,7 @@ namespace TJAPlayer3 { } public void BonusAdd(int player) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && player == 1) return; + if (OpenTaiko.ConfigIni.bAIBattleMode && player == 1) return; for (int sc = 0; sc < 1; sc++) { for (int i = 0; i < 256; i++) { @@ -220,7 +220,7 @@ namespace TJAPlayer3 { this.stScore[i].b使用中 = true; this.stScore[i].b表示中 = true; this.stScore[i].nAddScore = 10000; - this.stScore[i].ctTimer = new CCounter(0, 100, 4, TJAPlayer3.Timer); + this.stScore[i].ctTimer = new CCounter(0, 100, 4, OpenTaiko.Timer); this.stScore[i].bBonusScore = true; this.stScore[i].bAddEnd = false; this.stScore[i].nPlayer = player; @@ -277,71 +277,71 @@ namespace TJAPlayer3 { foreach (char ch in str) { for (int i = 0; i < this.stFont.Length; i++) { if (this.stFont[i].ch == ch) { - Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_Score_Size[0] * i, 0, TJAPlayer3.Skin.Game_Score_Size[0], TJAPlayer3.Skin.Game_Score_Size[1]); + Rectangle rectangle = new Rectangle(OpenTaiko.Skin.Game_Score_Size[0] * i, 0, OpenTaiko.Skin.Game_Score_Size[0], OpenTaiko.Skin.Game_Score_Size[1]); switch (mode) { case 0: - if (TJAPlayer3.Tx.Taiko_Score[0] != null) { + if (OpenTaiko.Tx.Taiko_Score[0] != null) { //this.txScore.color4 = new SlimDX.Color4( 1.0f, 1.0f, 1.0f ); - TJAPlayer3.Tx.Taiko_Score[0].Opacity = alpha; - if (TJAPlayer3.ConfigIni.SimpleMode) { - TJAPlayer3.Tx.Taiko_Score[0].vcScaleRatio.Y = 1; + OpenTaiko.Tx.Taiko_Score[0].Opacity = alpha; + if (OpenTaiko.ConfigIni.SimpleMode) { + OpenTaiko.Tx.Taiko_Score[0].vcScaleRatio.Y = 1; } else { - TJAPlayer3.Tx.Taiko_Score[0].vcScaleRatio.Y = ScoreScale[this.ct点数アニメタイマ[player].CurrentValue]; + OpenTaiko.Tx.Taiko_Score[0].vcScaleRatio.Y = ScoreScale[this.ct点数アニメタイマ[player].CurrentValue]; } - TJAPlayer3.Tx.Taiko_Score[0].t2D拡大率考慮下基準描画(x, y, rectangle); + OpenTaiko.Tx.Taiko_Score[0].t2D拡大率考慮下基準描画(x, y, rectangle); } break; case 1: - if (TJAPlayer3.Tx.Taiko_Score[1] != null) { + if (OpenTaiko.Tx.Taiko_Score[1] != null) { //this.txScore.color4 = new SlimDX.Color4( 1.0f, 0.5f, 0.4f ); //this.txScore.color4 = CDTXMania.Skin.cScoreColor1P; - TJAPlayer3.Tx.Taiko_Score[1].Opacity = alpha; - TJAPlayer3.Tx.Taiko_Score[1].vcScaleRatio.Y = 1; - TJAPlayer3.Tx.Taiko_Score[1].t2D拡大率考慮下基準描画(x, y, rectangle); + OpenTaiko.Tx.Taiko_Score[1].Opacity = alpha; + OpenTaiko.Tx.Taiko_Score[1].vcScaleRatio.Y = 1; + OpenTaiko.Tx.Taiko_Score[1].t2D拡大率考慮下基準描画(x, y, rectangle); } break; case 2: - if (TJAPlayer3.Tx.Taiko_Score[2] != null) { + if (OpenTaiko.Tx.Taiko_Score[2] != null) { //this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f ); //this.txScore.color4 = CDTXMania.Skin.cScoreColor2P; - TJAPlayer3.Tx.Taiko_Score[2].Opacity = alpha; - TJAPlayer3.Tx.Taiko_Score[2].vcScaleRatio.Y = 1; - TJAPlayer3.Tx.Taiko_Score[2].t2D拡大率考慮下基準描画(x, y, rectangle); + OpenTaiko.Tx.Taiko_Score[2].Opacity = alpha; + OpenTaiko.Tx.Taiko_Score[2].vcScaleRatio.Y = 1; + OpenTaiko.Tx.Taiko_Score[2].t2D拡大率考慮下基準描画(x, y, rectangle); } break; case 3: - if (TJAPlayer3.Tx.Taiko_Score[3] != null) { + if (OpenTaiko.Tx.Taiko_Score[3] != null) { //this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f ); //this.txScore.color4 = CDTXMania.Skin.cScoreColor2P; - TJAPlayer3.Tx.Taiko_Score[3].Opacity = alpha; - TJAPlayer3.Tx.Taiko_Score[3].vcScaleRatio.Y = 1; - TJAPlayer3.Tx.Taiko_Score[3].t2D拡大率考慮下基準描画(x, y, rectangle); + OpenTaiko.Tx.Taiko_Score[3].Opacity = alpha; + OpenTaiko.Tx.Taiko_Score[3].vcScaleRatio.Y = 1; + OpenTaiko.Tx.Taiko_Score[3].t2D拡大率考慮下基準描画(x, y, rectangle); } break; case 4: - if (TJAPlayer3.Tx.Taiko_Score[4] != null) { + if (OpenTaiko.Tx.Taiko_Score[4] != null) { //this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f ); //this.txScore.color4 = CDTXMania.Skin.cScoreColor2P; - TJAPlayer3.Tx.Taiko_Score[4].Opacity = alpha; - TJAPlayer3.Tx.Taiko_Score[4].vcScaleRatio.Y = 1; - TJAPlayer3.Tx.Taiko_Score[4].t2D拡大率考慮下基準描画(x, y, rectangle); + OpenTaiko.Tx.Taiko_Score[4].Opacity = alpha; + OpenTaiko.Tx.Taiko_Score[4].vcScaleRatio.Y = 1; + OpenTaiko.Tx.Taiko_Score[4].t2D拡大率考慮下基準描画(x, y, rectangle); } break; case 5: - if (TJAPlayer3.Tx.Taiko_Score[5] != null) { + if (OpenTaiko.Tx.Taiko_Score[5] != null) { //this.txScore.color4 = new SlimDX.Color4( 0.4f, 0.5f, 1.0f ); //this.txScore.color4 = CDTXMania.Skin.cScoreColor2P; - TJAPlayer3.Tx.Taiko_Score[5].Opacity = alpha; - TJAPlayer3.Tx.Taiko_Score[5].vcScaleRatio.Y = 1; - TJAPlayer3.Tx.Taiko_Score[5].t2D拡大率考慮下基準描画(x, y, rectangle); + OpenTaiko.Tx.Taiko_Score[5].Opacity = alpha; + OpenTaiko.Tx.Taiko_Score[5].vcScaleRatio.Y = 1; + OpenTaiko.Tx.Taiko_Score[5].t2D拡大率考慮下基準描画(x, y, rectangle); } break; } break; } } - x += TJAPlayer3.Skin.Game_Score_Padding; + x += OpenTaiko.Skin.Game_Score_Padding; } } } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏ステージ失敗.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏ステージ失敗.cs index a3dfcdd6..cc1a184c 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏ステージ失敗.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏ステージ失敗.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏ステージ失敗 : CActivity { // コンストラクタ @@ -61,10 +61,10 @@ namespace TJAPlayer3 { // メソッド public void Start() { - this.dbFailedTime = TJAPlayer3.Timer.NowTime; - this.ct進行 = new CCounter(0, 300, 22, TJAPlayer3.Timer); - if (TJAPlayer3.ConfigIni.eGameMode != EGame.OFF) { - this.ct進行 = new CCounter(0, 4000, 2, TJAPlayer3.Timer); + this.dbFailedTime = OpenTaiko.Timer.NowTime; + this.ct進行 = new CCounter(0, 300, 22, OpenTaiko.Timer); + if (OpenTaiko.ConfigIni.eGameMode != EGame.OFF) { + this.ct進行 = new CCounter(0, 4000, 2, OpenTaiko.Timer); } } @@ -80,7 +80,7 @@ namespace TJAPlayer3 { public override void DeActivate() { this.ct進行 = null; if (this.sd効果音 != null) { - TJAPlayer3.SoundManager.tDisposeSound(this.sd効果音); + OpenTaiko.SoundManager.tDisposeSound(this.sd効果音); this.sd効果音 = null; } base.DeActivate(); @@ -91,7 +91,7 @@ namespace TJAPlayer3 { //this.txStageFailed = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\7_stage_failed.jpg" ) ); //this.txGameFailed = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\7_GameFailed.png" ) ); // this.tx数字 = CDTXMania.tテクスチャの生成( CSkin.Path( @"Graphics\7_RollNumber.png" ) ); - this.soundFailed = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Failed.ogg"), ESoundGroup.SoundEffect); + this.soundFailed = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Failed.ogg"), ESoundGroup.SoundEffect); base.CreateManagedResource(); } public override void ReleaseManagedResource() { @@ -239,8 +239,8 @@ namespace TJAPlayer3 { if (ch == '%') { rectangle.Width = 80; } - if (TJAPlayer3.Tx.Balloon_Number_Roll != null) { - TJAPlayer3.Tx.Balloon_Number_Roll.t2D描画(x - (62 * str.Length / 2), y, rectangle); + if (OpenTaiko.Tx.Balloon_Number_Roll != null) { + OpenTaiko.Tx.Balloon_Number_Roll.t2D描画(x - (62 * str.Length / 2), y, rectangle); } break; } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs index d942e9a3..c42aecbd 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs @@ -1,10 +1,10 @@ using System.Diagnostics; using FDK; using SkiaSharp; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; using Color = System.Drawing.Color; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏パネル文字列 : CActivity { public static int tToArgb(int r, int g, int b) { @@ -55,20 +55,20 @@ namespace TJAPlayer3 { /// 曲数 public void SetPanelString(string songName, string genreName, string stageText = null, CSongListNode songNode = null) { if (base.IsActivated) { - TJAPlayer3.tテクスチャの解放(ref this.txPanel); + OpenTaiko.tテクスチャの解放(ref this.txPanel); if ((songName != null) && (songName.Length > 0)) { try { - using (var bmpSongTitle = pfMusicName.DrawText(songName, TJAPlayer3.Skin.Game_MusicName_ForeColor, TJAPlayer3.Skin.Game_MusicName_BackColor, null, 30)) { - this.txMusicName = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false); + using (var bmpSongTitle = pfMusicName.DrawText(songName, OpenTaiko.Skin.Game_MusicName_ForeColor, OpenTaiko.Skin.Game_MusicName_BackColor, null, 30)) { + this.txMusicName = OpenTaiko.tテクスチャの生成(bmpSongTitle, false); } if (txMusicName != null) { - this.txMusicName.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName); + this.txMusicName.vcScaleRatio.X = OpenTaiko.GetSongNameXScaling(ref txMusicName); } SKBitmap bmpDiff; string strDiff = ""; - if (TJAPlayer3.Skin.eDiffDispMode == E難易度表示タイプ.n曲目に表示) { - switch (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]) { + if (OpenTaiko.Skin.eDiffDispMode == E難易度表示タイプ.n曲目に表示) { + switch (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]) { case 0: strDiff = "かんたん "; break; @@ -88,13 +88,13 @@ namespace TJAPlayer3 { strDiff = "おに "; break; } - bmpDiff = pfMusicName.DrawText(strDiff + stageText, TJAPlayer3.Skin.Game_StageText_ForeColor, TJAPlayer3.Skin.Game_StageText_BackColor, null, 30); + bmpDiff = pfMusicName.DrawText(strDiff + stageText, OpenTaiko.Skin.Game_StageText_ForeColor, OpenTaiko.Skin.Game_StageText_BackColor, null, 30); } else { - bmpDiff = pfMusicName.DrawText(stageText, TJAPlayer3.Skin.Game_StageText_ForeColor, TJAPlayer3.Skin.Game_StageText_BackColor, null, 30); + bmpDiff = pfMusicName.DrawText(stageText, OpenTaiko.Skin.Game_StageText_ForeColor, OpenTaiko.Skin.Game_StageText_BackColor, null, 30); } using (bmpDiff) { - txStage = TJAPlayer3.Tx.TxCGen("Songs"); + txStage = OpenTaiko.Tx.TxCGen("Songs"); } } catch (CTextureCreateFailedException e) { Trace.TraceError(e.ToString()); @@ -103,7 +103,7 @@ namespace TJAPlayer3 { } } - this.txGENRE = TJAPlayer3.Tx.TxCGen("Template"); + this.txGENRE = OpenTaiko.Tx.TxCGen("Template"); Color stageColor = Color.White; if (songNode != null && songNode.isChangedBoxColor) @@ -119,11 +119,11 @@ namespace TJAPlayer3 { this.txGENRE.color4 = CConversion.ColorToColor4(stageColor); } - pfGENRE = HPrivateFastFont.tInstantiateBoxFont(TJAPlayer3.Skin.Game_GenreText_FontSize); + pfGENRE = HPrivateFastFont.tInstantiateBoxFont(OpenTaiko.Skin.Game_GenreText_FontSize); this.ttkGENRE = new TitleTextureKey(genreName, this.pfGENRE, Color.White, Color.Black, 1000); - this.ct進行用 = new CCounter(0, 2000, 2, TJAPlayer3.Timer); + this.ct進行用 = new CCounter(0, 2000, 2, OpenTaiko.Timer); this.Start(); @@ -132,23 +132,23 @@ namespace TJAPlayer3 { } public void t歌詞テクスチャを生成する(SKBitmap bmplyric) { - TJAPlayer3.tDisposeSafely(ref this.tx歌詞テクスチャ); - this.tx歌詞テクスチャ = TJAPlayer3.tテクスチャの生成(bmplyric); + OpenTaiko.tDisposeSafely(ref this.tx歌詞テクスチャ); + this.tx歌詞テクスチャ = OpenTaiko.tテクスチャの生成(bmplyric); } public void t歌詞テクスチャを削除する() { - TJAPlayer3.tテクスチャの解放(ref this.tx歌詞テクスチャ); + OpenTaiko.tテクスチャの解放(ref this.tx歌詞テクスチャ); } /// /// レイヤー管理のため、On進行描画から分離。 /// public void t歌詞テクスチャを描画する() { if (this.tx歌詞テクスチャ != null) { - if (TJAPlayer3.Skin.Game_Lyric_ReferencePoint == CSkin.ReferencePoint.Left) { - this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X, TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height)); - } else if (TJAPlayer3.Skin.Game_Lyric_ReferencePoint == CSkin.ReferencePoint.Right) { - this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X - this.tx歌詞テクスチャ.szTextureSize.Width, TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height)); + if (OpenTaiko.Skin.Game_Lyric_ReferencePoint == CSkin.ReferencePoint.Left) { + this.tx歌詞テクスチャ.t2D描画(OpenTaiko.Skin.Game_Lyric_X, OpenTaiko.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height)); + } else if (OpenTaiko.Skin.Game_Lyric_ReferencePoint == CSkin.ReferencePoint.Right) { + this.tx歌詞テクスチャ.t2D描画(OpenTaiko.Skin.Game_Lyric_X - this.tx歌詞テクスチャ.szTextureSize.Width, OpenTaiko.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height)); } else { - this.tx歌詞テクスチャ.t2D描画(TJAPlayer3.Skin.Game_Lyric_X - (this.tx歌詞テクスチャ.szTextureSize.Width / 2), TJAPlayer3.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height)); + this.tx歌詞テクスチャ.t2D描画(OpenTaiko.Skin.Game_Lyric_X - (this.tx歌詞テクスチャ.szTextureSize.Width / 2), OpenTaiko.Skin.Game_Lyric_Y - (this.tx歌詞テクスチャ.szTextureSize.Height)); } } } @@ -164,7 +164,7 @@ namespace TJAPlayer3 { // CActivity 実装 public override void Activate() { - this.pfMusicName = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Game_MusicName_FontSize); + this.pfMusicName = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Game_MusicName_FontSize); this.txPanel = null; this.ct進行用 = new CCounter(); this.Start(); @@ -173,14 +173,14 @@ namespace TJAPlayer3 { } public override void DeActivate() { this.ct進行用 = null; - TJAPlayer3.tDisposeSafely(ref this.txPanel); - TJAPlayer3.tDisposeSafely(ref this.txMusicName); - TJAPlayer3.tDisposeSafely(ref this.txGENRE); - TJAPlayer3.tDisposeSafely(ref this.pfGENRE); - TJAPlayer3.tDisposeSafely(ref this.txPanel); - TJAPlayer3.tDisposeSafely(ref this.pfMusicName); - TJAPlayer3.tDisposeSafely(ref this.pf歌詞フォント); - TJAPlayer3.tDisposeSafely(ref this.tx歌詞テクスチャ); + OpenTaiko.tDisposeSafely(ref this.txPanel); + OpenTaiko.tDisposeSafely(ref this.txMusicName); + OpenTaiko.tDisposeSafely(ref this.txGENRE); + OpenTaiko.tDisposeSafely(ref this.pfGENRE); + OpenTaiko.tDisposeSafely(ref this.txPanel); + OpenTaiko.tDisposeSafely(ref this.pfMusicName); + OpenTaiko.tDisposeSafely(ref this.pf歌詞フォント); + OpenTaiko.tDisposeSafely(ref this.tx歌詞テクスチャ); base.DeActivate(); } public override void CreateManagedResource() { @@ -193,26 +193,26 @@ namespace TJAPlayer3 { throw new InvalidOperationException("t進行描画(x,y)のほうを使用してください。"); } public int t進行描画(int x, int y) { - if (TJAPlayer3.stage演奏ドラム画面.actDan.IsAnimating || TJAPlayer3.ConfigIni.nPlayerCount > 2) return 0; + if (OpenTaiko.stage演奏ドラム画面.actDan.IsAnimating || OpenTaiko.ConfigIni.nPlayerCount > 2) return 0; if (!base.IsDeActivated && !this.bMute) { this.ct進行用.TickLoop(); if (this.txGENRE != null) { - this.txGENRE.t2D描画(TJAPlayer3.Skin.Game_Genre_X, TJAPlayer3.Skin.Game_Genre_Y); - TitleTextureKey.ResolveTitleTexture(this.ttkGENRE).t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Game_Genre_X + TJAPlayer3.Skin.Game_GenreText_Offset[0], TJAPlayer3.Skin.Game_Genre_Y + TJAPlayer3.Skin.Game_GenreText_Offset[1]); + this.txGENRE.t2D描画(OpenTaiko.Skin.Game_Genre_X, OpenTaiko.Skin.Game_Genre_Y); + TitleTextureKey.ResolveTitleTexture(this.ttkGENRE).t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Game_Genre_X + OpenTaiko.Skin.Game_GenreText_Offset[0], OpenTaiko.Skin.Game_Genre_Y + OpenTaiko.Skin.Game_GenreText_Offset[1]); } if (this.txStage != null) - this.txStage.t2D描画(TJAPlayer3.Skin.Game_Genre_X, TJAPlayer3.Skin.Game_Genre_Y); + this.txStage.t2D描画(OpenTaiko.Skin.Game_Genre_X, OpenTaiko.Skin.Game_Genre_Y); - if (TJAPlayer3.Skin.b現在のステージ数を表示しない) { + if (OpenTaiko.Skin.b現在のステージ数を表示しない) { if (this.txMusicName != null) { - float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szTextureSize.Width; - if (this.txMusicName.szTextureSize.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth) + float fRate = (float)OpenTaiko.Skin.Game_MusicName_MaxWidth / this.txMusicName.szTextureSize.Width; + if (this.txMusicName.szTextureSize.Width <= OpenTaiko.Skin.Game_MusicName_MaxWidth) fRate = 1.0f; this.txMusicName.vcScaleRatio.X = fRate; - this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szTextureSize.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y); + this.txMusicName.t2D描画(OpenTaiko.Skin.Game_MusicName_X - (this.txMusicName.szTextureSize.Width * fRate), OpenTaiko.Skin.Game_MusicName_Y); } } else { #region[ 透明度制御 ] @@ -237,13 +237,13 @@ namespace TJAPlayer3 { IsFirstDraw = false; } if (this.txMusicName != null) { - float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szTextureSize.Width; - if (this.txMusicName.szTextureSize.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth) + float fRate = (float)OpenTaiko.Skin.Game_MusicName_MaxWidth / this.txMusicName.szTextureSize.Width; + if (this.txMusicName.szTextureSize.Width <= OpenTaiko.Skin.Game_MusicName_MaxWidth) fRate = 1.0f; this.txMusicName.vcScaleRatio.X = fRate; - this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szTextureSize.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y); + this.txMusicName.t2D描画(OpenTaiko.Skin.Game_MusicName_X - (this.txMusicName.szTextureSize.Width * fRate), OpenTaiko.Skin.Game_MusicName_Y); } } } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs index 52fc6572..56eec924 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏演奏情報 : CActivity { // プロパティ @@ -21,18 +21,18 @@ namespace TJAPlayer3 { public override void Activate() { for (int i = 0; i < 5; i++) { NowMeasure[i] = 0; - this.dbBPM[i] = TJAPlayer3.DTX.BASEBPM; + this.dbBPM[i] = OpenTaiko.DTX.BASEBPM; } this.dbSCROLL = 1.0; - _chipCounts[0] = TJAPlayer3.DTX.listChip.Where(num => NotesManager.IsMissableNote(num)).Count(); - _chipCounts[1] = TJAPlayer3.DTX.listChip_Branch[2].Where(num => NotesManager.IsMissableNote(num)).Count(); + _chipCounts[0] = OpenTaiko.DTX.listChip.Where(num => NotesManager.IsMissableNote(num)).Count(); + _chipCounts[1] = OpenTaiko.DTX.listChip_Branch[2].Where(num => NotesManager.IsMissableNote(num)).Count(); - NotesTextN = string.Format("NoteN: {0:####0}", TJAPlayer3.DTX.nノーツ数_Branch[0]); - NotesTextE = string.Format("NoteE: {0:####0}", TJAPlayer3.DTX.nノーツ数_Branch[1]); - NotesTextM = string.Format("NoteM: {0:####0}", TJAPlayer3.DTX.nノーツ数_Branch[2]); - NotesTextC = string.Format("NoteC: {0:####0}", TJAPlayer3.DTX.nノーツ数[3]); - ScoreModeText = string.Format("SCOREMODE: {0:####0}", TJAPlayer3.DTX.nScoreModeTmp); + NotesTextN = string.Format("NoteN: {0:####0}", OpenTaiko.DTX.nノーツ数_Branch[0]); + NotesTextE = string.Format("NoteE: {0:####0}", OpenTaiko.DTX.nノーツ数_Branch[1]); + NotesTextM = string.Format("NoteM: {0:####0}", OpenTaiko.DTX.nノーツ数_Branch[2]); + NotesTextC = string.Format("NoteC: {0:####0}", OpenTaiko.DTX.nノーツ数[3]); + ScoreModeText = string.Format("SCOREMODE: {0:####0}", OpenTaiko.DTX.nScoreModeTmp); ListChipText = string.Format("ListChip: {0:####0}", _chipCounts[0]); ListChipMText = string.Format("ListChipM: {0:####0}", _chipCounts[1]); @@ -44,33 +44,33 @@ namespace TJAPlayer3 { public void t進行描画(int x, int y) { if (!base.IsDeActivated) { y += 0x153; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("Song/G. Offset:{0:####0}/{1:####0} ms", TJAPlayer3.DTX.nBGMAdjust, TJAPlayer3.ConfigIni.nGlobalOffsetMs)); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("Song/G. Offset:{0:####0}/{1:####0} ms", OpenTaiko.DTX.nBGMAdjust, OpenTaiko.ConfigIni.nGlobalOffsetMs)); y -= 0x10; - int num = (TJAPlayer3.DTX.listChip.Count > 0) ? TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms : 0; - string str = "Time: " + ((((double)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) / 1000.0)).ToString("####0.00") + " / " + ((((double)num) / 1000.0)).ToString("####0.00"); - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, str); + int num = (OpenTaiko.DTX.listChip.Count > 0) ? OpenTaiko.DTX.listChip[OpenTaiko.DTX.listChip.Count - 1].n発声時刻ms : 0; + string str = "Time: " + ((((double)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed)) / 1000.0)).ToString("####0.00") + " / " + ((((double)num) / 1000.0)).ToString("####0.00"); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, str); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("Part: {0:####0}/{1:####0}", NowMeasure[0], NowMeasure[1])); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("Part: {0:####0}/{1:####0}", NowMeasure[0], NowMeasure[1])); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("BPM: {0:####0.0000}", this.dbBPM[0])); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("BPM: {0:####0.0000}", this.dbBPM[0])); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("Frame: {0:####0} fps", TJAPlayer3.FPS.NowFPS)); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("Frame: {0:####0} fps", OpenTaiko.FPS.NowFPS)); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, NotesTextN); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, NotesTextN); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, NotesTextE); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, NotesTextE); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, NotesTextM); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, NotesTextM); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, NotesTextC); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, NotesTextC); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("SCROLL: {0:####0.00}", this.dbSCROLL)); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, string.Format("SCROLL: {0:####0.00}", this.dbSCROLL)); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, ScoreModeText); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, ScoreModeText); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, ListChipText); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, ListChipText); y -= 0x10; - TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, ListChipMText); + OpenTaiko.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, ListChipMText); //CDTXMania.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "Sound CPU : {0:####0.00}%", CDTXMania.Sound管理.GetCPUusage() ) ); //y -= 0x10; diff --git a/OpenTaiko/src/Stages/07.Game/CFloorManagement.cs b/OpenTaiko/src/Stages/07.Game/CFloorManagement.cs index d71411ae..a1b072f1 100644 --- a/OpenTaiko/src/Stages/07.Game/CFloorManagement.cs +++ b/OpenTaiko/src/Stages/07.Game/CFloorManagement.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { // Small static class which refers to the Tower mode important informations static internal class CFloorManagement { public static void reinitialize(int life) { @@ -21,10 +21,10 @@ namespace TJAPlayer3 { return; if (CFloorManagement.CurrentNumberOfLives > 0) { - CFloorManagement.InvincibilityFrames = new CCounter(0, CFloorManagement.InvincibilityDurationSpeedDependent + 1000, 1, TJAPlayer3.Timer); + CFloorManagement.InvincibilityFrames = new CCounter(0, CFloorManagement.InvincibilityDurationSpeedDependent + 1000, 1, OpenTaiko.Timer); CFloorManagement.CurrentNumberOfLives--; //TJAPlayer3.Skin.soundTowerMiss.t再生する(); - TJAPlayer3.Skin.voiceTowerMiss[TJAPlayer3.SaveFile]?.tPlay(); + OpenTaiko.Skin.voiceTowerMiss[OpenTaiko.SaveFile]?.tPlay(); } } @@ -48,7 +48,7 @@ namespace TJAPlayer3 { public static int CurrentNumberOfLives = 5; public static double InvincibilityDurationSpeedDependent { - get => ((double)InvincibilityDuration) / TJAPlayer3.ConfigIni.SongPlaybackSpeed; + get => ((double)InvincibilityDuration) / OpenTaiko.ConfigIni.SongPlaybackSpeed; } // ms diff --git a/OpenTaiko/src/Stages/07.Game/CInvisibleChip.cs b/OpenTaiko/src/Stages/07.Game/CInvisibleChip.cs index be4560e9..4b41fb8b 100644 --- a/OpenTaiko/src/Stages/07.Game/CInvisibleChip.cs +++ b/OpenTaiko/src/Stages/07.Game/CInvisibleChip.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { public class CInvisibleChip : IDisposable { /// ミス後表示する時間(ms) public int nDisplayTimeMs { @@ -65,7 +65,7 @@ namespace TJAPlayer3 { /// /// 楽器パート public void ShowChipTemporally(EInstrumentPad eInst) { - ccounter[(int)eInst].Start(0, nDisplayTimeMs + nFadeoutTimeMs + 1, 1, TJAPlayer3.Timer); + ccounter[(int)eInst].Start(0, nDisplayTimeMs + nFadeoutTimeMs + 1, 1, OpenTaiko.Timer); } /// diff --git a/OpenTaiko/src/Stages/07.Game/CLagLogger.cs b/OpenTaiko/src/Stages/07.Game/CLagLogger.cs index 0559cf27..98f3a593 100644 --- a/OpenTaiko/src/Stages/07.Game/CLagLogger.cs +++ b/OpenTaiko/src/Stages/07.Game/CLagLogger.cs @@ -2,7 +2,7 @@ using System.Text; using FDK.ExtensionMethods; -namespace TJAPlayer3 { +namespace OpenTaiko { internal static class CLagLogger { private const int MaximumLag = 200; private const int MinimumLag = 0 - MaximumLag; diff --git a/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs b/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs index c68e738c..6ec35cde 100644 --- a/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs +++ b/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs @@ -3,7 +3,7 @@ using System.Drawing; using FDK; using FDK.ExtensionMethods; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// 演奏画面の共通クラス (ドラム演奏画面, ギター演奏画面の継承元) /// @@ -17,11 +17,11 @@ namespace TJAPlayer3 { Drums = new CScoreIni.C演奏記録(); { - Drums.nGoodCount = TJAPlayer3.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Perfect : this.nヒット数_Auto含まない.Drums.Perfect; - Drums.nOkCount = TJAPlayer3.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Great : this.nヒット数_Auto含まない.Drums.Great; - Drums.nBadCount = TJAPlayer3.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Miss : this.nヒット数_Auto含まない.Drums.Miss; + Drums.nGoodCount = OpenTaiko.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Perfect : this.nヒット数_Auto含まない.Drums.Perfect; + Drums.nOkCount = OpenTaiko.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Great : this.nヒット数_Auto含まない.Drums.Great; + Drums.nBadCount = OpenTaiko.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Miss : this.nヒット数_Auto含まない.Drums.Miss; - var danC = TJAPlayer3.stage演奏ドラム画面.actDan.GetExam(); + var danC = OpenTaiko.stage演奏ドラム画面.actDan.GetExam(); for (int i = 0; i < danC.Length; i++) { Drums.Dan_C[i] = danC[i]; } @@ -39,7 +39,7 @@ namespace TJAPlayer3 { public override void Activate() { listChip = new List[5]; List[] balloonChips = new List[5]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { nNoteCount[i] = 0; nBalloonCount[i] = 0; nRollTimeMs[i] = 0; @@ -47,23 +47,23 @@ namespace TJAPlayer3 { switch (i) { case 0: - listChip[i] = TJAPlayer3.DTX.listChip; + listChip[i] = OpenTaiko.DTX.listChip; break; case 1: - listChip[i] = TJAPlayer3.DTX_2P.listChip; + listChip[i] = OpenTaiko.DTX_2P.listChip; break; case 2: - listChip[i] = TJAPlayer3.DTX_3P.listChip; + listChip[i] = OpenTaiko.DTX_3P.listChip; break; case 3: - listChip[i] = TJAPlayer3.DTX_4P.listChip; + listChip[i] = OpenTaiko.DTX_4P.listChip; break; case 4: - listChip[i] = TJAPlayer3.DTX_5P.listChip; + listChip[i] = OpenTaiko.DTX_5P.listChip; break; } - if (TJAPlayer3.ConfigIni.nPlayerCount >= 2) { + if (OpenTaiko.ConfigIni.nPlayerCount >= 2) { balloonChips[i] = new(); for (int j = 0; j < listChip[i].Count; j++) { var chip = listChip[i][j]; @@ -90,33 +90,33 @@ namespace TJAPlayer3 { } } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - CDTX _dtx = TJAPlayer3.DTX; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + CDTX _dtx = OpenTaiko.DTX; switch (i) //2017.08.11 kairera0467 { case 0: break; case 1: - _dtx = TJAPlayer3.DTX_2P; + _dtx = OpenTaiko.DTX_2P; break; case 2: - _dtx = TJAPlayer3.DTX_3P; + _dtx = OpenTaiko.DTX_3P; break; case 3: - _dtx = TJAPlayer3.DTX_4P; + _dtx = OpenTaiko.DTX_4P; break; case 4: - _dtx = TJAPlayer3.DTX_5P; + _dtx = OpenTaiko.DTX_5P; break; default: break; } - if (TJAPlayer3.ConfigIni.nPlayerCount >= 2) { + if (OpenTaiko.ConfigIni.nPlayerCount >= 2) { for (int j = 0; j < balloonChips[i].Count; j++) { var chip = balloonChips[i][j]; if (NotesManager.IsKusudama(chip)) { - for (int p = 0; p < TJAPlayer3.ConfigIni.nPlayerCount; p++) { + for (int p = 0; p < OpenTaiko.ConfigIni.nPlayerCount; p++) { if (p == i) continue; var chip2 = balloonChips[p].Find(x => Math.Abs(x.db発声時刻ms - chip.db発声時刻ms) < 100); @@ -197,7 +197,7 @@ namespace TJAPlayer3 { nRollTimeMs[i] = _totalRolls; } - for (int k = 0; k < TJAPlayer3.ConfigIni.nPlayerCount; k++) { + for (int k = 0; k < OpenTaiko.ConfigIni.nPlayerCount; k++) { //nAddScoreNiji = (1000000 - (15 * RollTimems * 100) - (nBalloonCount * 100)) / TJAPlayer3.DTX.listChip.Count; if (nNoteCount[k] == 0 && nBalloonCount[k] == 0) { nAddScoreNiji[k] = 1000000; @@ -208,9 +208,9 @@ namespace TJAPlayer3 { } - for (int index = TJAPlayer3.DTX.listChip.Count - 1; index >= 0; index--) { - if (TJAPlayer3.DTX.listChip[index].nチャンネル番号 == 0x01) { - this.bgmlength = TJAPlayer3.DTX.listChip[index].GetDuration() + TJAPlayer3.DTX.listChip[index].n発声時刻ms; + for (int index = OpenTaiko.DTX.listChip.Count - 1; index >= 0; index--) { + if (OpenTaiko.DTX.listChip[index].nチャンネル番号 == 0x01) { + this.bgmlength = OpenTaiko.DTX.listChip[index].GetDuration() + OpenTaiko.DTX.listChip[index].n発声時刻ms; break; } } @@ -280,7 +280,7 @@ namespace TJAPlayer3 { ctChipAnimeLag[i] = new CCounter(); } - listWAV = TJAPlayer3.DTX.listWAV; + listWAV = OpenTaiko.DTX.listWAV; this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.継続; this.n現在のトップChip = (listChip[0].Count > 0) ? 0 : -1; @@ -290,7 +290,7 @@ namespace TJAPlayer3 { this.n最後に再生したBGMの実WAV番号[i] = -1; } - cInvisibleChip = new CInvisibleChip(TJAPlayer3.ConfigIni.nDisplayTimesMs, TJAPlayer3.ConfigIni.nFadeoutTimeMs); + cInvisibleChip = new CInvisibleChip(OpenTaiko.ConfigIni.nDisplayTimesMs, OpenTaiko.ConfigIni.nFadeoutTimeMs); for (int k = 0; k < 4; k++) { //for ( int n = 0; n < 5; n++ ) //{ @@ -298,10 +298,10 @@ namespace TJAPlayer3 { this.nヒット数_Auto含む[k] = new CHITCOUNTOFRANK(); //} this.r現在の歓声Chip[k] = null; - cInvisibleChip.eInvisibleMode[k] = TJAPlayer3.ConfigIni.eInvisible[k]; + cInvisibleChip.eInvisibleMode[k] = OpenTaiko.ConfigIni.eInvisible[k]; - this.bReverse[k] = TJAPlayer3.ConfigIni.bReverse[k]; + this.bReverse[k] = OpenTaiko.ConfigIni.bReverse[k]; } @@ -328,10 +328,10 @@ namespace TJAPlayer3 { this.CChartScore[i] = new CBRANCHSCORE(); this.CSectionScore[i] = new CBRANCHSCORE(); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.After[i] = CDTX.ECourse.eNormal; - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[i].nAfter = CDTX.ECourse.eNormal; - TJAPlayer3.stage演奏ドラム画面.actMtaiko.Before[i] = CDTX.ECourse.eNormal; - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[i].nBefore = CDTX.ECourse.eNormal; + OpenTaiko.stage演奏ドラム画面.actMtaiko.After[i] = CDTX.ECourse.eNormal; + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.stBranch[i].nAfter = CDTX.ECourse.eNormal; + OpenTaiko.stage演奏ドラム画面.actMtaiko.Before[i] = CDTX.ECourse.eNormal; + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.stBranch[i].nBefore = CDTX.ECourse.eNormal; } for (int i = 0; i < CBranchScore.Length; i++) { @@ -360,31 +360,31 @@ namespace TJAPlayer3 { // Double play set here - this.bDoublePlay = TJAPlayer3.ConfigIni.nPlayerCount >= 2 ? true : false; + this.bDoublePlay = OpenTaiko.ConfigIni.nPlayerCount >= 2 ? true : false; this.nLoopCount_Clear = 1; this.tBranchReset(0); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - actGauge.Init(TJAPlayer3.ConfigIni.nRisky, i); // #23559 2011.7.28 yyagi - eFirstGameType[i] = TJAPlayer3.ConfigIni.nGameType[i]; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + actGauge.Init(OpenTaiko.ConfigIni.nRisky, i); // #23559 2011.7.28 yyagi + eFirstGameType[i] = OpenTaiko.ConfigIni.nGameType[i]; } - this.nPolyphonicSounds = TJAPlayer3.ConfigIni.nPoliphonicSounds; + this.nPolyphonicSounds = OpenTaiko.ConfigIni.nPoliphonicSounds; - TJAPlayer3.Skin.tRemoveMixerAll(); // 効果音のストリームをミキサーから解除しておく + OpenTaiko.Skin.tRemoveMixerAll(); // 効果音のストリームをミキサーから解除しておく queueMixerSound = new Queue(64); - bIsDirectSound = (TJAPlayer3.SoundManager.GetCurrentSoundDeviceType() == "DirectSound"); - bUseOSTimer = TJAPlayer3.ConfigIni.bUseOSTimer; + bIsDirectSound = (OpenTaiko.SoundManager.GetCurrentSoundDeviceType() == "DirectSound"); + bUseOSTimer = OpenTaiko.ConfigIni.bUseOSTimer; this.bPAUSE = false; - if (TJAPlayer3.DTXVmode.Enabled) { - db再生速度 = TJAPlayer3.DTX.dbDTXVPlaySpeed; - TJAPlayer3.ConfigIni.nSongSpeed = (int)(TJAPlayer3.DTX.dbDTXVPlaySpeed * 20 + 0.5); + if (OpenTaiko.DTXVmode.Enabled) { + db再生速度 = OpenTaiko.DTX.dbDTXVPlaySpeed; + OpenTaiko.ConfigIni.nSongSpeed = (int)(OpenTaiko.DTX.dbDTXVPlaySpeed * 20 + 0.5); } else { - db再生速度 = TJAPlayer3.ConfigIni.SongPlaybackSpeed; + db再生速度 = OpenTaiko.ConfigIni.SongPlaybackSpeed; } - bValidScore = (TJAPlayer3.DTXVmode.Enabled) ? false : true; + bValidScore = (OpenTaiko.DTXVmode.Enabled) ? false : true; #region [ 演奏開始前にmixer登録しておくべきサウンド(開幕してすぐに鳴らすことになるチップ音)を登録しておく ] foreach (CDTX.CChip pChip in listChip[0]) { @@ -396,7 +396,7 @@ namespace TJAPlayer3 { if (listWAV.TryGetValue(pChip.n整数値_内部番号, out CDTX.CWAV wc)) { for (int i = 0; i < nPolyphonicSounds; i++) { if (wc.rSound[i] != null) { - TJAPlayer3.SoundManager.AddMixer(wc.rSound[i], db再生速度, pChip.b演奏終了後も再生が続くチップである); + OpenTaiko.SoundManager.AddMixer(wc.rSound[i], db再生速度, pChip.b演奏終了後も再生が続くチップである); //AddMixer( wc.rSound[ i ] ); // 最初はqueueを介さず直接ミキサー登録する } } @@ -409,15 +409,15 @@ namespace TJAPlayer3 { #endregion // Note - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { - n良 = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; - nCombo = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; - nHighestCombo = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; - n可 = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; - n不可 = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; - n連打 = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; - nADLIB = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; - nMine = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + n良 = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; + nCombo = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; + nHighestCombo = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; + n可 = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; + n不可 = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; + n連打 = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; + nADLIB = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; + nMine = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; } @@ -426,8 +426,8 @@ namespace TJAPlayer3 { // this.gclatencymode = GCSettings.LatencyMode; // GCSettings.LatencyMode = GCLatencyMode.Batch; // 演奏画面中はGCを抑止する this.bIsAlreadyCleared = new bool[5]; - for (int player = 0; player < TJAPlayer3.ConfigIni.nPlayerCount; player++) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; + for (int player = 0; player < OpenTaiko.ConfigIni.nPlayerCount; player++) { + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character]; switch (chara.effect.tGetGaugeType()) { default: case "Normal": @@ -461,8 +461,8 @@ namespace TJAPlayer3 { public void ftDanReSetBranches(bool hasBranches) { this.tBranchReset(0); - TJAPlayer3.stage演奏ドラム画面.nレーン用表示コース[0] = CDTX.ECourse.eNormal; - TJAPlayer3.stage演奏ドラム画面.bUseBranch[0] = hasBranches; + OpenTaiko.stage演奏ドラム画面.nレーン用表示コース[0] = CDTX.ECourse.eNormal; + OpenTaiko.stage演奏ドラム画面.bUseBranch[0] = hasBranches; // TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.b譜面分岐[(int)Difficulty.Dan] = hasBranches; } @@ -484,18 +484,18 @@ namespace TJAPlayer3 { this.ctCamRotation = null; this.ctCamZoom = null; - TJAPlayer3.borderColor = new Color4(0f, 0f, 0f, 0f); - TJAPlayer3.fCamXOffset = 0.0f; - TJAPlayer3.fCamYOffset = 0.0f; - TJAPlayer3.fCamXScale = 1.0f; - TJAPlayer3.fCamYScale = 1.0f; - TJAPlayer3.fCamRotation = 0.0f; - TJAPlayer3.fCamZoomFactor = 1.0f; + OpenTaiko.borderColor = new Color4(0f, 0f, 0f, 0f); + OpenTaiko.fCamXOffset = 0.0f; + OpenTaiko.fCamYOffset = 0.0f; + OpenTaiko.fCamXScale = 1.0f; + OpenTaiko.fCamYScale = 1.0f; + OpenTaiko.fCamRotation = 0.0f; + OpenTaiko.fCamZoomFactor = 1.0f; for (int i = 0; i < 5; i++) { ctChipAnime[i] = null; ctChipAnimeLag[i] = null; - TJAPlayer3.ConfigIni.nGameType[i] = eFirstGameType[i]; + OpenTaiko.ConfigIni.nGameType[i] = eFirstGameType[i]; bSplitLane[i] = false; } @@ -510,14 +510,14 @@ namespace TJAPlayer3 { var meanLag = CLagLogger.LogAndReturnMeanLag(); - if (TJAPlayer3.IsPerformingCalibration && meanLag != null) { - var oldInputAdjustTimeMs = TJAPlayer3.ConfigIni.nInputAdjustTimeMs; + if (OpenTaiko.IsPerformingCalibration && meanLag != null) { + var oldInputAdjustTimeMs = OpenTaiko.ConfigIni.nInputAdjustTimeMs; var newInputAdjustTimeMs = oldInputAdjustTimeMs - (int)Math.Round(meanLag.Value); Trace.TraceInformation($"Calibration complete. Updating InputAdjustTime from {oldInputAdjustTimeMs}ms to {newInputAdjustTimeMs}ms."); - TJAPlayer3.ConfigIni.nInputAdjustTimeMs = newInputAdjustTimeMs; + OpenTaiko.ConfigIni.nInputAdjustTimeMs = newInputAdjustTimeMs; } this.actDan.IsAnimating = false;// IsAnimating=trueのときにそのまま選曲画面に戻ると、文字列が描画されない問題修正用。 - TJAPlayer3.tテクスチャの解放(ref this.tx背景); + OpenTaiko.tテクスチャの解放(ref this.tx背景); base.DeActivate(); } @@ -614,30 +614,30 @@ namespace TJAPlayer3 { public int[] JPOSCROLLX = new int[5]; public int GetJPOSCROLLX(int player) { - double screen_ratio = TJAPlayer3.Skin.Resolution[0] / 1280.0; + double screen_ratio = OpenTaiko.Skin.Resolution[0] / 1280.0; return (int)(JPOSCROLLX[player] * screen_ratio); } public int[] NoteOriginX { get { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { return new int[] { - TJAPlayer3.Skin.nScrollField_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * 0) + GetJPOSCROLLX(0), - TJAPlayer3.Skin.nScrollField_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * 1) + GetJPOSCROLLX(1), - TJAPlayer3.Skin.nScrollField_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * 2) + GetJPOSCROLLX(2), - TJAPlayer3.Skin.nScrollField_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * 3) + GetJPOSCROLLX(3), - TJAPlayer3.Skin.nScrollField_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * 4) + GetJPOSCROLLX(4) + OpenTaiko.Skin.nScrollField_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * 0) + GetJPOSCROLLX(0), + OpenTaiko.Skin.nScrollField_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * 1) + GetJPOSCROLLX(1), + OpenTaiko.Skin.nScrollField_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * 2) + GetJPOSCROLLX(2), + OpenTaiko.Skin.nScrollField_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * 3) + GetJPOSCROLLX(3), + OpenTaiko.Skin.nScrollField_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * 4) + GetJPOSCROLLX(4) }; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { return new int[] { - TJAPlayer3.Skin.nScrollField_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * 0) + GetJPOSCROLLX(0), - TJAPlayer3.Skin.nScrollField_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * 1) + GetJPOSCROLLX(1), - TJAPlayer3.Skin.nScrollField_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * 2) + GetJPOSCROLLX(2), - TJAPlayer3.Skin.nScrollField_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * 3) + GetJPOSCROLLX(3) + OpenTaiko.Skin.nScrollField_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * 0) + GetJPOSCROLLX(0), + OpenTaiko.Skin.nScrollField_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * 1) + GetJPOSCROLLX(1), + OpenTaiko.Skin.nScrollField_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * 2) + GetJPOSCROLLX(2), + OpenTaiko.Skin.nScrollField_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * 3) + GetJPOSCROLLX(3) }; } else { return new int[] { - TJAPlayer3.Skin.nScrollFieldX[0] + GetJPOSCROLLX(0), - TJAPlayer3.Skin.nScrollFieldX[1] + GetJPOSCROLLX(1) + OpenTaiko.Skin.nScrollFieldX[0] + GetJPOSCROLLX(0), + OpenTaiko.Skin.nScrollFieldX[1] + GetJPOSCROLLX(1) }; } } @@ -645,30 +645,30 @@ namespace TJAPlayer3 { public int[] JPOSCROLLY = new int[5]; public int GetJPOSCROLLY(int player) { - double screen_ratio = TJAPlayer3.Skin.Resolution[1] / 720.0; + double screen_ratio = OpenTaiko.Skin.Resolution[1] / 720.0; return (int)(JPOSCROLLY[player] * screen_ratio); } public int[] NoteOriginY { get { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { return new int[] { - TJAPlayer3.Skin.nScrollField_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * 0) + GetJPOSCROLLY(0), - TJAPlayer3.Skin.nScrollField_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * 1) + GetJPOSCROLLY(1), - TJAPlayer3.Skin.nScrollField_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * 2) + GetJPOSCROLLY(2), - TJAPlayer3.Skin.nScrollField_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * 3) + GetJPOSCROLLY(3), - TJAPlayer3.Skin.nScrollField_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * 4) + GetJPOSCROLLY(4) + OpenTaiko.Skin.nScrollField_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * 0) + GetJPOSCROLLY(0), + OpenTaiko.Skin.nScrollField_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * 1) + GetJPOSCROLLY(1), + OpenTaiko.Skin.nScrollField_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * 2) + GetJPOSCROLLY(2), + OpenTaiko.Skin.nScrollField_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * 3) + GetJPOSCROLLY(3), + OpenTaiko.Skin.nScrollField_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * 4) + GetJPOSCROLLY(4) }; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { return new int[] { - TJAPlayer3.Skin.nScrollField_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * 0) + GetJPOSCROLLY(0), - TJAPlayer3.Skin.nScrollField_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * 1) + GetJPOSCROLLY(1), - TJAPlayer3.Skin.nScrollField_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * 2) + GetJPOSCROLLY(2), - TJAPlayer3.Skin.nScrollField_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * 3) + GetJPOSCROLLY(3) + OpenTaiko.Skin.nScrollField_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * 0) + GetJPOSCROLLY(0), + OpenTaiko.Skin.nScrollField_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * 1) + GetJPOSCROLLY(1), + OpenTaiko.Skin.nScrollField_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * 2) + GetJPOSCROLLY(2), + OpenTaiko.Skin.nScrollField_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * 3) + GetJPOSCROLLY(3) }; } else { return new int[] { - TJAPlayer3.Skin.nScrollFieldY[0] + GetJPOSCROLLY(0), - TJAPlayer3.Skin.nScrollFieldY[1] + GetJPOSCROLLY(1) + OpenTaiko.Skin.nScrollFieldY[0] + GetJPOSCROLLY(0), + OpenTaiko.Skin.nScrollFieldY[1] + GetJPOSCROLLY(1) }; } } @@ -863,12 +863,12 @@ namespace TJAPlayer3 { private void PassAIBattleSection() { if (AIBattleState >= 0) { NowAIBattleSection.End = AIBattleSection.EndType.Clear; - if (TJAPlayer3.ConfigIni.nAILevel < 10) - TJAPlayer3.ConfigIni.nAILevel++; + if (OpenTaiko.ConfigIni.nAILevel < 10) + OpenTaiko.ConfigIni.nAILevel++; } else { NowAIBattleSection.End = AIBattleSection.EndType.Lose; - if (TJAPlayer3.ConfigIni.nAILevel > 1) - TJAPlayer3.ConfigIni.nAILevel--; + if (OpenTaiko.ConfigIni.nAILevel > 1) + OpenTaiko.ConfigIni.nAILevel--; } actAIBattle.BatchAnimeCounter.CurrentValue = 0; _AIBattleState = 0; @@ -878,12 +878,12 @@ namespace TJAPlayer3 { } int clearCount = 0; - for (int i = 0; i < TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count; i++) { - if (TJAPlayer3.stage演奏ドラム画面.AIBattleSections[i].End == CStage演奏画面共通.AIBattleSection.EndType.Clear) { + for (int i = 0; i < OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count; i++) { + if (OpenTaiko.stage演奏ドラム画面.AIBattleSections[i].End == CStage演奏画面共通.AIBattleSection.EndType.Clear) { clearCount++; } } - bIsAIBattleWin = clearCount >= TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count / 2.0; + bIsAIBattleWin = clearCount >= OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count / 2.0; } private void AIRegisterInput(int nPlayer, float move) { @@ -898,10 +898,10 @@ namespace TJAPlayer3 { private void UpdateCharaCounter(int nPlayer) { for (int i = 0; i < 5; i++) { - ctChipAnime[i] = new CCounter(0, 3, 60.0 / TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i] * 1 / 4 / TJAPlayer3.ConfigIni.SongPlaybackSpeed, SoundManager.PlayTimer); + ctChipAnime[i] = new CCounter(0, 3, 60.0 / OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[i] * 1 / 4 / OpenTaiko.ConfigIni.SongPlaybackSpeed, SoundManager.PlayTimer); } - TJAPlayer3.stage演奏ドラム画面.PuchiChara.ChangeBPM(60.0 / TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] / TJAPlayer3.ConfigIni.SongPlaybackSpeed); + OpenTaiko.stage演奏ドラム画面.PuchiChara.ChangeBPM(60.0 / OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] / OpenTaiko.ConfigIni.SongPlaybackSpeed); } public void AddMixer(CSound cs, bool _b演奏終了後も再生が続くチップである) { @@ -933,9 +933,9 @@ namespace TJAPlayer3 { dtLastQueueOperation = dtnow; stmixer stm = queueMixerSound.Dequeue(); if (stm.bIsAdd) { - TJAPlayer3.SoundManager.AddMixer(stm.csound, db再生速度, stm.b演奏終了後も再生が続くチップである); + OpenTaiko.SoundManager.AddMixer(stm.csound, db再生速度, stm.b演奏終了後も再生が続くチップである); } else { - TJAPlayer3.SoundManager.RemoveMixer(stm.csound); + OpenTaiko.SoundManager.RemoveMixer(stm.csound); } } } @@ -958,7 +958,7 @@ namespace TJAPlayer3 { // current (and soon to be replaced) input adjust time values. // Instead, we want them focused on the sounds of their keyboard, tatacon, // other controller, etc. and the visuals of notes crossing the judgment position. - if (TJAPlayer3.IsPerformingCalibration) { + if (OpenTaiko.IsPerformingCalibration) { return e判定 < ENoteJudge.Good ? ENoteJudge.Good : e判定; } else { return e判定; @@ -968,7 +968,7 @@ namespace TJAPlayer3 { private bool tEasyTimeZones(int nPlayer) { bool _timingzonesAreEasy = false; - int diff = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer]; + int diff = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[nPlayer]; // Diff = Normal or Easy if (diff <= (int)Difficulty.Normal) { @@ -977,8 +977,8 @@ namespace TJAPlayer3 { // Diff = Dan and current song is Normal or Easy if (diff == (int)Difficulty.Dan) { - int _nb = TJAPlayer3.stage演奏ドラム画面.actDan.NowShowingNumber; - var _danSongs = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs; + int _nb = OpenTaiko.stage演奏ドラム画面.actDan.NowShowingNumber; + var _danSongs = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs; if (_nb < _danSongs.Count) { var _currentDiff = _danSongs[_nb].Difficulty; @@ -990,7 +990,7 @@ namespace TJAPlayer3 { // Diff = Tower and SIDE is Normal if (diff == (int)Difficulty.Tower) { - _timingzonesAreEasy = TJAPlayer3.stageSongSelect.rChoosenSong.nSide == CDTX.ESide.eNormal; + _timingzonesAreEasy = OpenTaiko.stageSongSelect.rChoosenSong.nSide == CDTX.ESide.eNormal; } return _timingzonesAreEasy; @@ -1009,11 +1009,11 @@ namespace TJAPlayer3 { int nDeltaTime = Math.Abs(pChip.nLag); //Debug.WriteLine("nAbsTime=" + (nTime - pChip.n発声時刻ms) + ", nDeltaTime=" + (nTime + nInputAdjustTime - pChip.n発声時刻ms)); if (NotesManager.IsRoll(pChip) || NotesManager.IsFuzeRoll(pChip)) { - if ((SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) > pChip.n発声時刻ms && (SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) < pChip.nノーツ終了時刻ms) { + if ((SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed) > pChip.n発声時刻ms && (SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed) < pChip.nノーツ終了時刻ms) { return ENoteJudge.Perfect; } } else if (NotesManager.IsGenericBalloon(pChip)) { - if ((SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) >= pChip.n発声時刻ms - 17 && (SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) < pChip.nノーツ終了時刻ms) { + if ((SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed) >= pChip.n発声時刻ms - 17 && (SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed) < pChip.nノーツ終了時刻ms) { return ENoteJudge.Perfect; } } @@ -1023,26 +1023,26 @@ namespace TJAPlayer3 { // To change later to adapt to Tower Ama-kuchi //diff = Math.Min(diff, (int)Difficulty.Oni); - int actual = TJAPlayer3.GetActualPlayer(player); + int actual = OpenTaiko.GetActualPlayer(player); - int timingShift = TJAPlayer3.ConfigIni.nTimingZones[actual]; + int timingShift = OpenTaiko.ConfigIni.nTimingZones[actual]; bool _timingzonesAreEasy = tEasyTimeZones(player); - CConfigIni.CTimingZones tz = (_timingzonesAreEasy == true) ? TJAPlayer3.ConfigIni.tzLevels[timingShift] : TJAPlayer3.ConfigIni.tzLevels[2 + timingShift]; + CConfigIni.CTimingZones tz = (_timingzonesAreEasy == true) ? OpenTaiko.ConfigIni.tzLevels[timingShift] : OpenTaiko.ConfigIni.tzLevels[2 + timingShift]; - if (nDeltaTime <= tz.nGoodZone * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { + if (nDeltaTime <= tz.nGoodZone * OpenTaiko.ConfigIni.SongPlaybackSpeed) { return ENoteJudge.Perfect; } - if (nDeltaTime <= tz.nOkZone * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { - if (TJAPlayer3.ConfigIni.bJust[actual] == 1 && NotesManager.IsMissableNote(pChip)) // Just + if (nDeltaTime <= tz.nOkZone * OpenTaiko.ConfigIni.SongPlaybackSpeed) { + if (OpenTaiko.ConfigIni.bJust[actual] == 1 && NotesManager.IsMissableNote(pChip)) // Just return ENoteJudge.Poor; return ENoteJudge.Good; } - if (nDeltaTime <= tz.nBadZone * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { - if (TJAPlayer3.ConfigIni.bJust[actual] == 2 || !NotesManager.IsMissableNote(pChip)) // Safe + if (nDeltaTime <= tz.nBadZone * OpenTaiko.ConfigIni.SongPlaybackSpeed) { + if (OpenTaiko.ConfigIni.bJust[actual] == 2 || !NotesManager.IsMissableNote(pChip)) // Safe return ENoteJudge.Good; return ENoteJudge.Poor; } @@ -1130,7 +1130,7 @@ namespace TJAPlayer3 { return nearestChip_Future; } protected void tサウンド再生(CDTX.CChip pChip, int nPlayer) { - var _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; + var _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(nPlayer)]; int index = pChip.nチャンネル番号; if (index == 0x11 || index == 0x13 || index == 0x1A || index == 0x101) { @@ -1168,20 +1168,20 @@ namespace TJAPlayer3 { } this.b連打中[nPlayer] = true; if (this.actRoll.ct連打アニメ[nPlayer].IsUnEnded) { - this.actRoll.ct連打アニメ[nPlayer] = new CCounter(0, 9, 14, TJAPlayer3.Timer); + this.actRoll.ct連打アニメ[nPlayer] = new CCounter(0, 9, 14, OpenTaiko.Timer); this.actRoll.ct連打アニメ[nPlayer].CurrentValue = 1; } else { - this.actRoll.ct連打アニメ[nPlayer] = new CCounter(0, 9, 14, TJAPlayer3.Timer); + this.actRoll.ct連打アニメ[nPlayer] = new CCounter(0, 9, 14, OpenTaiko.Timer); } pChip.RollEffectLevel += 10; if (pChip.RollEffectLevel >= 100) { pChip.RollEffectLevel = 100; - pChip.RollInputTime = new CCounter(0, 1500, 1, TJAPlayer3.Timer); + pChip.RollInputTime = new CCounter(0, 1500, 1, OpenTaiko.Timer); pChip.RollDelay?.Stop(); } else { - pChip.RollInputTime = new CCounter(0, 150, 1, TJAPlayer3.Timer); + pChip.RollInputTime = new CCounter(0, 150, 1, OpenTaiko.Timer); pChip.RollDelay?.Stop(); } @@ -1192,7 +1192,7 @@ namespace TJAPlayer3 { pChip.nRollCount++; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.n連打[actDan.NowShowingNumber]++; this.n現在の連打数[nPlayer]++; @@ -1202,14 +1202,14 @@ namespace TJAPlayer3 { this.CSectionScore[nPlayer].nRoll++; this.n合計連打数[nPlayer]++; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) this.actRollChara.Start(nPlayer); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) this.actRollChara.Start(nPlayer); long nAddScore = 0; - if (!TJAPlayer3.ConfigIni.ShinuchiMode) { + if (!OpenTaiko.ConfigIni.ShinuchiMode) { // 旧配点・旧筐体配点 - if (TJAPlayer3.DTX.nScoreModeTmp == 0 || TJAPlayer3.DTX.nScoreModeTmp == 1) { + if (OpenTaiko.DTX.nScoreModeTmp == 0 || OpenTaiko.DTX.nScoreModeTmp == 1) { if (pChip.nチャンネル番号 == 0x15) nAddScore = 300L; else @@ -1226,7 +1226,7 @@ namespace TJAPlayer3 { nAddScore = 100L; } - if (!TJAPlayer3.ConfigIni.ShinuchiMode && pChip.bGOGOTIME) this.actScore.Add((long)(nAddScore * 1.2f), nPlayer); + if (!OpenTaiko.ConfigIni.ShinuchiMode && pChip.bGOGOTIME) this.actScore.Add((long)(nAddScore * 1.2f), nPlayer); else this.actScore.Add(nAddScore, nPlayer); @@ -1236,7 +1236,7 @@ namespace TJAPlayer3 { this.CChartScore[nPlayer].nScore = __score; this.CSectionScore[nPlayer].nScore = __score; - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(nPlayer)]; //赤か青かの分岐 if (sort == 0 || sort == 2) { @@ -1245,11 +1245,11 @@ namespace TJAPlayer3 { if (pChip.nチャンネル番号 == 0x15 || _gt == EGameType.KONGA || (_gt == EGameType.TAIKO && pChip.nチャンネル番号 == 0x21)) { //CDTXMania.Skin.soundRed.t再生する(); //CDTXMania.stage演奏ドラム画面.actChipFireTaiko.Start( 1, nPlayer ); - TJAPlayer3.stage演奏ドラム画面.FlyingNotes.Start(1, nPlayer, true); + OpenTaiko.stage演奏ドラム画面.FlyingNotes.Start(1, nPlayer, true); } else { //CDTXMania.Skin.soundRed.t再生する(); //CDTXMania.stage演奏ドラム画面.actChipFireTaiko.Start( 3, nPlayer ); - TJAPlayer3.stage演奏ドラム画面.FlyingNotes.Start(3, nPlayer, true); + OpenTaiko.stage演奏ドラム画面.FlyingNotes.Start(3, nPlayer, true); } } else if (sort == 1 || sort == 3) { this.soundBlue[pChip.nPlayerSide]?.PlayStart(); @@ -1257,15 +1257,15 @@ namespace TJAPlayer3 { if (pChip.nチャンネル番号 == 0x15 || _gt == EGameType.KONGA || (_gt == EGameType.TAIKO && pChip.nチャンネル番号 == 0x21)) { //CDTXMania.Skin.soundBlue.t再生する(); //CDTXMania.stage演奏ドラム画面.actChipFireTaiko.Start( 2, nPlayer ); - TJAPlayer3.stage演奏ドラム画面.FlyingNotes.Start(2, nPlayer, true); + OpenTaiko.stage演奏ドラム画面.FlyingNotes.Start(2, nPlayer, true); } else { //CDTXMania.Skin.soundBlue.t再生する(); //CDTXMania.stage演奏ドラム画面.actChipFireTaiko.Start( 4, nPlayer ); - TJAPlayer3.stage演奏ドラム画面.FlyingNotes.Start(4, nPlayer, true); + OpenTaiko.stage演奏ドラム画面.FlyingNotes.Start(4, nPlayer, true); } } else if (sort == 4) { this.soundClap[pChip.nPlayerSide]?.PlayStart(); - TJAPlayer3.stage演奏ドラム画面.FlyingNotes.Start(4, nPlayer, true); + OpenTaiko.stage演奏ドラム画面.FlyingNotes.Start(4, nPlayer, true); } //TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Hit); @@ -1279,7 +1279,7 @@ namespace TJAPlayer3 { protected bool tBalloonProcess(CDTX.CChip pChip, double dbProcess_time, int player) { //if( dbProcess_time >= pChip.n発声時刻ms && dbProcess_time < pChip.nノーツ終了時刻ms ) - long nowTime = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long nowTime = (long)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed); bool IsKusudama = NotesManager.IsKusudama(pChip); bool IsFuze = NotesManager.IsFuzeRoll(pChip); @@ -1298,15 +1298,15 @@ namespace TJAPlayer3 { if (IsKusudama) { if (nCurrentKusudamaCount > 0) { actChara.ChangeAnime(player, CActImplCharacter.Anime.Kusudama_Breaking, true); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { this.b連打中[i] = true; if (this.actBalloon.ct風船アニメ[i].IsUnEnded) { - this.actBalloon.ct風船アニメ[i] = new CCounter(0, 9, 14, TJAPlayer3.Timer); + this.actBalloon.ct風船アニメ[i] = new CCounter(0, 9, 14, OpenTaiko.Timer); this.actBalloon.ct風船アニメ[i].CurrentValue = 1; } else { - this.actBalloon.ct風船アニメ[i] = new CCounter(0, 9, 14, TJAPlayer3.Timer); + this.actBalloon.ct風船アニメ[i] = new CCounter(0, 9, 14, OpenTaiko.Timer); } } } @@ -1316,10 +1316,10 @@ namespace TJAPlayer3 { if (this.actBalloon.ct風船アニメ[player].IsUnEnded) { - this.actBalloon.ct風船アニメ[player] = new CCounter(0, 9, 14, TJAPlayer3.Timer); + this.actBalloon.ct風船アニメ[player] = new CCounter(0, 9, 14, OpenTaiko.Timer); this.actBalloon.ct風船アニメ[player].CurrentValue = 1; } else { - this.actBalloon.ct風船アニメ[player] = new CCounter(0, 9, 14, TJAPlayer3.Timer); + this.actBalloon.ct風船アニメ[player] = new CCounter(0, 9, 14, OpenTaiko.Timer); } } @@ -1329,7 +1329,7 @@ namespace TJAPlayer3 { if (IsKusudama) { //pChip.nRollCount = nCurrentKusudamaRollCount; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { pChip.nRollCount = nCurrentKusudamaRollCount; this.n風船残り[i] = balloon - rollCount; } @@ -1339,7 +1339,7 @@ namespace TJAPlayer3 { this.n風船残り[player] = balloon - rollCount; } - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.n連打[actDan.NowShowingNumber]++; this.CBranchScore[player].nRoll++; this.CChartScore[player].nRoll++; @@ -1353,7 +1353,7 @@ namespace TJAPlayer3 { long nAddScore = 0; - if (!TJAPlayer3.ConfigIni.ShinuchiMode) { + if (!OpenTaiko.ConfigIni.ShinuchiMode) { if (pChip.bGOGOTIME) { if (balloon == rollCount) nAddScore = 6000L; @@ -1382,7 +1382,7 @@ namespace TJAPlayer3 { if (this.n風船残り[player] <= 0) { if (IsKusudama) { - TJAPlayer3.Skin.soundKusudama.tPlay(); + OpenTaiko.Skin.soundKusudama.tPlay(); pChip.bHit = true; pChip.IsHitted = true; chip現在処理中の連打チップ[player].bHit = true; @@ -1390,16 +1390,16 @@ namespace TJAPlayer3 { nCurrentKusudamaCount = 0; actBalloon.KusuBroke(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { actChara.ChangeAnime(i, CActImplCharacter.Anime.Kusudama_Broke, true); - if (actChara.CharaAction_Balloon_Delay[i] != null) actChara.CharaAction_Balloon_Delay[i] = new CCounter(0, TJAPlayer3.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[i]] - 1, 1, TJAPlayer3.Timer); + if (actChara.CharaAction_Balloon_Delay[i] != null) actChara.CharaAction_Balloon_Delay[i] = new CCounter(0, OpenTaiko.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[i]] - 1, 1, OpenTaiko.Timer); } } else { //ﾊﾟｧｰﾝ - TJAPlayer3.Skin.soundBalloon.tPlay(); + OpenTaiko.Skin.soundBalloon.tPlay(); //CDTXMania.stage演奏ドラム画面.actChipFireTaiko.Start( 3, player ); //ここで飛ばす。飛ばされるのは大音符のみ。 - TJAPlayer3.stage演奏ドラム画面.FlyingNotes.Start(3, player); - TJAPlayer3.stage演奏ドラム画面.Rainbow.Start(player); + OpenTaiko.stage演奏ドラム画面.FlyingNotes.Start(3, player); + OpenTaiko.stage演奏ドラム画面.Rainbow.Start(player); //CDTXMania.stage演奏ドラム画面.actChipFireD.Start( 0, player ); pChip.bHit = true; pChip.IsHitted = true; @@ -1409,14 +1409,14 @@ namespace TJAPlayer3 { pChip.b可視 = false; { actChara.ChangeAnime(player, CActImplCharacter.Anime.Balloon_Broke, true); - if (actChara.CharaAction_Balloon_Delay[player] != null) actChara.CharaAction_Balloon_Delay[player] = new CCounter(0, TJAPlayer3.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[player]] - 1, 1, TJAPlayer3.Timer); + if (actChara.CharaAction_Balloon_Delay[player] != null) actChara.CharaAction_Balloon_Delay[player] = new CCounter(0, OpenTaiko.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[player]] - 1, 1, OpenTaiko.Timer); } } this.eRollState = E連打State.none; // Unused variable ? } } else { if (IsKusudama) { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (chip現在処理中の連打チップ[i] != null) chip現在処理中の連打チップ[i].bHit = true; this.b連打中[i] = false; @@ -1442,12 +1442,12 @@ namespace TJAPlayer3 { protected unsafe ENoteJudge tチップのヒット処理(long nHitTime, CDTX.CChip pChip, EInstrumentPad screenmode, bool bCorrectLane, int nNowInput, int nPlayer, bool rollEffectHit = false) { //unsafeコードにつき、デバッグ中の変更厳禁! - bool bAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay[nPlayer]; + bool bAutoPlay = OpenTaiko.ConfigIni.bAutoPlay[nPlayer]; bool bBombHit = false; switch (nPlayer) { case 1: - bAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; + bAutoPlay = OpenTaiko.ConfigIni.bAutoPlay[nPlayer] || OpenTaiko.ConfigIni.bAIBattleMode; break; } @@ -1479,23 +1479,23 @@ namespace TJAPlayer3 { CLagLogger.Add(nPlayer, pChip); } - var puchichara = TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayer))]; + var puchichara = OpenTaiko.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(OpenTaiko.GetActualPlayer(nPlayer))]; if (NotesManager.IsRoll(pChip)) { #region[ Drumroll ] //--------------------------- this.b連打中[nPlayer] = true; if (bAutoPlay || rollEffectHit) { - int rollSpeed = bAutoPlay ? TJAPlayer3.ConfigIni.nRollsPerSec : puchichara.effect.Autoroll; - if (TJAPlayer3.ConfigIni.bAIBattleMode && nPlayer == 1) - rollSpeed = TJAPlayer3.ConfigIni.apAIPerformances[TJAPlayer3.ConfigIni.nAILevel - 1].nRollSpeed; + int rollSpeed = bAutoPlay ? OpenTaiko.ConfigIni.nRollsPerSec : puchichara.effect.Autoroll; + if (OpenTaiko.ConfigIni.bAIBattleMode && nPlayer == 1) + rollSpeed = OpenTaiko.ConfigIni.apAIPerformances[OpenTaiko.ConfigIni.nAILevel - 1].nRollSpeed; if (this.bPAUSE == false && rollSpeed > 0) // && TJAPlayer3.ConfigIni.bAuto先生の連打) { - if (((SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) - * TJAPlayer3.ConfigIni.SongPlaybackSpeed) + if (((SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed) + * OpenTaiko.ConfigIni.SongPlaybackSpeed) > (pChip.n発声時刻ms + (1000.0 / (double)rollSpeed) * pChip.nRollCount)) { - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(nPlayer)]; int nLane = 0; if (this.nHand[nPlayer] == 0) @@ -1503,25 +1503,25 @@ namespace TJAPlayer3 { else this.nHand[nPlayer] = 0; - if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] < 0 && (pChip.eScrollMode == EScrollMode.HBSCROLL)) - pChip.fBMSCROLLTime -= TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] * -0.05; + if (OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] < 0 && (pChip.eScrollMode == EScrollMode.HBSCROLL)) + pChip.fBMSCROLLTime -= OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] * -0.05; - TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Red); + OpenTaiko.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Red); //CDTXMania.stage演奏ドラム画面.actChipFireTaiko.Start( pChip.nチャンネル番号 == 0x15 ? 1 : 3, nPlayer ); - TJAPlayer3.stage演奏ドラム画面.FlyingNotes.Start(pChip.nチャンネル番号 == 0x15 ? 1 : 3, nPlayer, true); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.tMtaikoEvent(pChip.nチャンネル番号, this.nHand[nPlayer], nPlayer); + OpenTaiko.stage演奏ドラム画面.FlyingNotes.Start(pChip.nチャンネル番号 == 0x15 ? 1 : 3, nPlayer, true); + OpenTaiko.stage演奏ドラム画面.actMtaiko.tMtaikoEvent(pChip.nチャンネル番号, this.nHand[nPlayer], nPlayer); if (pChip.nチャンネル番号 == 0x20 && _gt == EGameType.KONGA) nLane = 4; else if (pChip.nチャンネル番号 == 0x21 && _gt == EGameType.KONGA) nLane = 1; - this.tRollProcess(pChip, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 1, nLane, 0, nPlayer); + this.tRollProcess(pChip, (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), 1, nLane, 0, nPlayer); } } } if (!bAutoPlay && !rollEffectHit) { this.eRollState = E連打State.roll; - this.tRollProcess(pChip, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 1, nNowInput, 0, nPlayer); + this.tRollProcess(pChip, (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), 1, nNowInput, 0, nPlayer); } break; @@ -1577,31 +1577,31 @@ namespace TJAPlayer3 { int balloonDuration = bAutoPlay ? (pChip.nノーツ終了時刻ms - pChip.n発声時刻ms) : 1000; - if ((SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) > + if ((SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed) > (pChip.n発声時刻ms + (balloonDuration / (double)rollSpeed) * rollCount)) { if (this.nHand[nPlayer] == 0) this.nHand[nPlayer]++; else this.nHand[nPlayer] = 0; - TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Red); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.tMtaikoEvent(pChip.nチャンネル番号, this.nHand[nPlayer], nPlayer); + OpenTaiko.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Red); + OpenTaiko.stage演奏ドラム画面.actMtaiko.tMtaikoEvent(pChip.nチャンネル番号, this.nHand[nPlayer], nPlayer); - this.tBalloonProcess(pChip, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), nPlayer); + this.tBalloonProcess(pChip, (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), nPlayer); } } } if (!bAutoPlay && !rollEffectHit) { if (!IsKusudama || nCurrentKusudamaCount > 0) { - this.tBalloonProcess(pChip, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), nPlayer); + this.tBalloonProcess(pChip, (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), nPlayer); } } break; #endregion } else if (NotesManager.IsRollEnd(pChip)) { - if (pChip.nノーツ終了時刻ms <= (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) { + if (pChip.nノーツ終了時刻ms <= (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed)) { if (NotesManager.IsKusudama(pChip)) { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { chip現在処理中の連打チップ[i].bHit = true; this.b連打中[i] = false; } @@ -1620,12 +1620,12 @@ namespace TJAPlayer3 { if (eJudgeResult != ENoteJudge.Auto && eJudgeResult != ENoteJudge.Miss) { this.actJudgeString.Start(nPlayer, eJudgeResult != ENoteJudge.Bad ? ENoteJudge.ADLIB : ENoteJudge.Bad); eJudgeResult = ENoteJudge.Perfect; // Prevent ADLIB notes breaking DFC runs - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.Start(0x11, eJudgeResult, true, nPlayer); - TJAPlayer3.stage演奏ドラム画面.actChipFireD.Start(0x11, eJudgeResult, nPlayer); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.Start(0x11, eJudgeResult, true, nPlayer); + OpenTaiko.stage演奏ドラム画面.actChipFireD.Start(0x11, eJudgeResult, nPlayer); this.CChartScore[nPlayer].nADLIB++; this.CSectionScore[nPlayer].nADLIB++; this.CBranchScore[nPlayer].nADLIB++; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.nADLIB[actDan.NowShowingNumber]++; } break; @@ -1634,14 +1634,14 @@ namespace TJAPlayer3 { this.actJudgeString.Start(nPlayer, eJudgeResult != ENoteJudge.Bad ? ENoteJudge.Mine : ENoteJudge.Bad); bBombHit = true; eJudgeResult = ENoteJudge.Bad; - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.Start(0x11, eJudgeResult, true, nPlayer); - TJAPlayer3.stage演奏ドラム画面.actChipFireD.Start(0x11, ENoteJudge.Mine, nPlayer); - TJAPlayer3.Skin.soundBomb?.tPlay(); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.Start(0x11, eJudgeResult, true, nPlayer); + OpenTaiko.stage演奏ドラム画面.actChipFireD.Start(0x11, ENoteJudge.Mine, nPlayer); + OpenTaiko.Skin.soundBomb?.tPlay(); actGauge.MineDamage(nPlayer); this.CChartScore[nPlayer].nMine++; this.CSectionScore[nPlayer].nMine++; this.CBranchScore[nPlayer].nMine++; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.nMine[actDan.NowShowingNumber]++; } break; @@ -1653,9 +1653,9 @@ namespace TJAPlayer3 { if (eJudgeResult != ENoteJudge.Auto && eJudgeResult != ENoteJudge.Miss) { - this.actJudgeString.Start(nPlayer, (bAutoPlay && !TJAPlayer3.ConfigIni.bAIBattleMode) ? ENoteJudge.Auto : eJudgeResult); - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.Start(pChip.nチャンネル番号, eJudgeResult, true, nPlayer); - TJAPlayer3.stage演奏ドラム画面.actChipFireD.Start(pChip.nチャンネル番号, eJudgeResult, nPlayer); + this.actJudgeString.Start(nPlayer, (bAutoPlay && !OpenTaiko.ConfigIni.bAIBattleMode) ? ENoteJudge.Auto : eJudgeResult); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.Start(pChip.nチャンネル番号, eJudgeResult, true, nPlayer); + OpenTaiko.stage演奏ドラム画面.actChipFireD.Start(pChip.nチャンネル番号, eJudgeResult, nPlayer); } } @@ -1673,11 +1673,11 @@ namespace TJAPlayer3 { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(nPlayer)].data.Character]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(nPlayer)].data.Character]; bool cleared = HGaugeMethods.UNSAFE_FastNormaCheck(nPlayer); if (eJudgeResult != ENoteJudge.Poor && eJudgeResult != ENoteJudge.Miss) { - double dbUnit = (((60.0 / (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer])))); + double dbUnit = (((60.0 / (OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer])))); // ランナー(たたけたやつ) this.actRunner.Start(nPlayer, false, pChip); @@ -1685,17 +1685,17 @@ namespace TJAPlayer3 { int Character = this.actChara.iCurrentCharacter[nPlayer]; if (HGaugeMethods.UNSAFE_IsRainbow(nPlayer) && this.bIsAlreadyMaxed[nPlayer] == false) { - if (TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_Become_Maxed_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.Become_Maxed, true); } this.bIsAlreadyMaxed[nPlayer] = true; } if (cleared && this.bIsAlreadyCleared[nPlayer] == false) { - if (TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_Become_Cleared_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.Become_Cleared, true); } this.bIsAlreadyCleared[nPlayer] = true; - TJAPlayer3.stage演奏ドラム画面.actBackground.ClearIn(nPlayer); + OpenTaiko.stage演奏ドラム画面.actBackground.ClearIn(nPlayer); } } @@ -1706,26 +1706,26 @@ namespace TJAPlayer3 { this.actRunner.Start(nPlayer, true, pChip); if (!HGaugeMethods.UNSAFE_IsRainbow(nPlayer) && this.bIsAlreadyMaxed[nPlayer] == true) { this.bIsAlreadyMaxed[nPlayer] = false; - if (TJAPlayer3.Skin.Characters_SoulOut_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_SoulOut_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.SoulOut, true); } } else if (!bIsGOGOTIME[nPlayer]) { if (Chara_MissCount[nPlayer] == 1 - 1) { - if (TJAPlayer3.Skin.Characters_MissIn_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_MissIn_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.MissIn, true); } } else if (Chara_MissCount[nPlayer] == 6 - 1) { - if (TJAPlayer3.Skin.Characters_MissDownIn_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_MissDownIn_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.MissDownIn, true); } } } if (!cleared && this.bIsAlreadyCleared[nPlayer] == true) { this.bIsAlreadyCleared[nPlayer] = false; - if (TJAPlayer3.Skin.Characters_ClearOut_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_ClearOut_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.ClearOut, true); } - TJAPlayer3.stage演奏ドラム画面.actBackground.ClearOut(nPlayer); + OpenTaiko.stage演奏ドラム画面.actBackground.ClearOut(nPlayer); switch (chara.effect.tGetGaugeType()) { case "Hard": @@ -1734,13 +1734,13 @@ namespace TJAPlayer3 { isDeniedPlaying[nPlayer] = true; // Prevents the player to ever be able to hit the drum, without freezing the whole game bool allDeniedPlaying = true; - for (int p = 0; p < TJAPlayer3.ConfigIni.nPlayerCount; p++) { + for (int p = 0; p < OpenTaiko.ConfigIni.nPlayerCount; p++) { if (!isDeniedPlaying[p]) { allDeniedPlaying = false; break; } } - if (allDeniedPlaying) TJAPlayer3.DTX.t全チップの再生停止(); // Stop playing song + if (allDeniedPlaying) OpenTaiko.DTX.t全チップの再生停止(); // Stop playing song // Stop timer : Pauses the whole game (to remove once is denied playing will work) //CSound管理.rc演奏用タイマ.t一時停止(); @@ -1754,10 +1754,10 @@ namespace TJAPlayer3 { void returnChara() { int Character = this.actChara.iCurrentCharacter[nPlayer]; - double dbUnit = (((60.0 / (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer])))); + double dbUnit = (((60.0 / (OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer])))); dbUnit = (((60.0 / pChip.dbBPM))); - if (TJAPlayer3.Skin.Characters_Return_Ptn[Character] != 0 && !bIsGOGOTIME[nPlayer] && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_Return_Ptn[Character] != 0 && !bIsGOGOTIME[nPlayer] && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { { // 魂ゲージMAXではない // ジャンプ_ノーマル @@ -1791,7 +1791,7 @@ namespace TJAPlayer3 { if (nPlayer == 0) this.nヒット数_Auto含まない.Drums.Perfect++; this.actCombo.n現在のコンボ数[nPlayer]++; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { this.n良[actDan.NowShowingNumber]++; this.tIncreaseComboDan(actDan.NowShowingNumber); } @@ -1806,7 +1806,7 @@ namespace TJAPlayer3 { AIRegisterInput(nPlayer, 1); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.BackSymbolEvent(nPlayer); + OpenTaiko.stage演奏ドラム画面.actMtaiko.BackSymbolEvent(nPlayer); if (this.bIsMiss[nPlayer]) { @@ -1826,7 +1826,7 @@ namespace TJAPlayer3 { if (nPlayer == 0) this.nヒット数_Auto含まない.Drums.Great++; this.actCombo.n現在のコンボ数[nPlayer]++; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { this.n可[actDan.NowShowingNumber]++; this.tIncreaseComboDan(actDan.NowShowingNumber); } @@ -1840,7 +1840,7 @@ namespace TJAPlayer3 { AIRegisterInput(nPlayer, 0.5f); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.BackSymbolEvent(nPlayer); + OpenTaiko.stage演奏ドラム画面.actMtaiko.BackSymbolEvent(nPlayer); if (this.bIsMiss[nPlayer]) { returnChara(); @@ -1855,11 +1855,11 @@ namespace TJAPlayer3 { if (!NotesManager.IsMissableNote(pChip) && !bBombHit) break; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) CFloorManagement.damage(); if (!bBombHit) { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.n不可[actDan.NowShowingNumber]++; this.CBranchScore[nPlayer].nMiss++; @@ -1871,7 +1871,7 @@ namespace TJAPlayer3 { } this.actCombo.n現在のコンボ数[nPlayer] = 0; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.nCombo[actDan.NowShowingNumber] = 0; this.actComboVoice.tReset(nPlayer); @@ -1891,7 +1891,7 @@ namespace TJAPlayer3 { if (NotesManager.IsADLIB(pChip)) break; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { this.n良[actDan.NowShowingNumber]++; this.tIncreaseComboDan(actDan.NowShowingNumber); } @@ -1912,7 +1912,7 @@ namespace TJAPlayer3 { AIRegisterInput(nPlayer, 1); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.BackSymbolEvent(nPlayer); + OpenTaiko.stage演奏ドラム画面.actMtaiko.BackSymbolEvent(nPlayer); if (this.bIsMiss[nPlayer]) { returnChara(); @@ -1926,7 +1926,7 @@ namespace TJAPlayer3 { case ENoteJudge.Great: case ENoteJudge.Good: { if (!NotesManager.IsGenericRoll(pChip)) { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { this.n可[actDan.NowShowingNumber]++; this.tIncreaseComboDan(actDan.NowShowingNumber); } @@ -1948,7 +1948,7 @@ namespace TJAPlayer3 { AIRegisterInput(nPlayer, 0.5f); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.BackSymbolEvent(nPlayer); + OpenTaiko.stage演奏ドラム画面.actMtaiko.BackSymbolEvent(nPlayer); if (this.bIsMiss[nPlayer]) { returnChara(); @@ -1964,11 +1964,11 @@ namespace TJAPlayer3 { if (!NotesManager.IsMissableNote(pChip) && !bBombHit) break; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) CFloorManagement.damage(); if (!bBombHit) { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.n不可[actDan.NowShowingNumber]++; @@ -1979,7 +1979,7 @@ namespace TJAPlayer3 { } this.actCombo.n現在のコンボ数[nPlayer] = 0; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.nCombo[actDan.NowShowingNumber] = 0; this.actComboVoice.tReset(nPlayer); @@ -2004,14 +2004,14 @@ namespace TJAPlayer3 { // Combo voice here this.actComboVoice.t再生(this.actCombo.n現在のコンボ数[nPlayer], nPlayer); - double dbUnit = (((60.0 / (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer])))); + double dbUnit = (((60.0 / (OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer])))); dbUnit = (((60.0 / pChip.dbBPM))); //CDTXMania.act文字コンソール.tPrint(620, 80, C文字コンソール.Eフォント種別.白, "BPM: " + dbUnit.ToString()); for (int i = 0; i < 5; i++) { if (this.actCombo.n現在のコンボ数[i] == 50 || this.actCombo.n現在のコンボ数[i] == 300) { - ctChipAnimeLag[i] = new CCounter(0, 664, 1, TJAPlayer3.Timer); + ctChipAnimeLag[i] = new CCounter(0, 664, 1, OpenTaiko.Timer); } } @@ -2022,14 +2022,14 @@ namespace TJAPlayer3 { // Edit character values here if (!pChip.bGOGOTIME) //2018.03.11 kairera0467 チップに埋め込んだフラグから読み取る { - if (TJAPlayer3.Skin.Characters_10Combo_Ptn[Character] != 0 && this.actChara.eNowAnime[nPlayer] != CActImplCharacter.Anime.Combo10 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_10Combo_Ptn[Character] != 0 && this.actChara.eNowAnime[nPlayer] != CActImplCharacter.Anime.Combo10 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { if (!HGaugeMethods.UNSAFE_IsRainbow(nPlayer)) { // 魂ゲージMAXではない // ジャンプ_ノーマル this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.Combo10, true); } } - if (TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0 && this.actChara.eNowAnime[nPlayer] != CActImplCharacter.Anime.Combo10_Max && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0 && this.actChara.eNowAnime[nPlayer] != CActImplCharacter.Anime.Combo10_Max && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { if (HGaugeMethods.UNSAFE_IsRainbow(nPlayer)) { // 魂ゲージMAX // ジャンプ_MAX @@ -2054,11 +2054,11 @@ namespace TJAPlayer3 { } if (((pChip.e楽器パート != EInstrumentPad.UNKNOWN)) && (eJudgeResult != ENoteJudge.Miss) && (eJudgeResult != ENoteJudge.Bad) && (eJudgeResult != ENoteJudge.Poor) && (NotesManager.IsMissableNote(pChip))) { int nCombos = this.actCombo.n現在のコンボ数[nPlayer]; - long nInit = TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer]]; - long nDiff = TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[nPlayer]]; + long nInit = OpenTaiko.DTX.nScoreInit[0, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[nPlayer]]; + long nDiff = OpenTaiko.DTX.nScoreDiff[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[nPlayer]]; long nAddScore = 0; - if (TJAPlayer3.ConfigIni.ShinuchiMode) //2016.07.04 kairera0467 真打モード。 + if (OpenTaiko.ConfigIni.ShinuchiMode) //2016.07.04 kairera0467 真打モード。 { nAddScore = (long)nAddScoreNiji[nPlayer]; @@ -2068,7 +2068,7 @@ namespace TJAPlayer3 { } this.actScore.Add((long)nAddScore, nPlayer); - } else if (TJAPlayer3.DTX.nScoreModeTmp == 2) { + } else if (OpenTaiko.DTX.nScoreModeTmp == 2) { if (nCombos < 10) { nAddScore = this.nScore[0]; } else if (nCombos >= 10 && nCombos <= 29) { @@ -2097,7 +2097,7 @@ namespace TJAPlayer3 { this.actScore.BonusAdd(nPlayer); } this.actScore.ctボーナス加算タイマ[nPlayer].CurrentValue = 0; - this.actScore.ctボーナス加算タイマ[nPlayer] = new CCounter(0, 2, 1000, TJAPlayer3.Timer); + this.actScore.ctボーナス加算タイマ[nPlayer] = new CCounter(0, 2, 1000, OpenTaiko.Timer); } nAddScore = (int)(nAddScore / 10); @@ -2109,7 +2109,7 @@ namespace TJAPlayer3 { } this.actScore.Add(nAddScore, nPlayer); - } else if (TJAPlayer3.DTX.nScoreModeTmp == 1) { + } else if (OpenTaiko.DTX.nScoreModeTmp == 1) { if (nCombos < 10) { nAddScore = this.nScore[0]; } else if (nCombos >= 10 && nCombos <= 19) { @@ -2629,8 +2629,8 @@ namespace TJAPlayer3 { offset = plusminus * 10; } - var newInputAdjustTimeMs = (TJAPlayer3.ConfigIni.nInputAdjustTimeMs + offset).Clamp(-99, 99); - TJAPlayer3.ConfigIni.nInputAdjustTimeMs = newInputAdjustTimeMs; + var newInputAdjustTimeMs = (OpenTaiko.ConfigIni.nInputAdjustTimeMs + offset).Clamp(-99, 99); + OpenTaiko.ConfigIni.nInputAdjustTimeMs = newInputAdjustTimeMs; } protected abstract void t入力処理_ドラム(); @@ -2639,7 +2639,7 @@ namespace TJAPlayer3 { protected void tキー入力() { // Inputs - IInputDevice keyboard = TJAPlayer3.InputManager.Keyboard; + IInputDevice keyboard = OpenTaiko.InputManager.Keyboard; if ((!this.bPAUSE && (base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED)) && (base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut)) { this.t入力処理_ドラム(); @@ -2647,23 +2647,23 @@ namespace TJAPlayer3 { // Individual offset if (keyboard.KeyPressed((int)SlimDXKeys.Key.UpArrow) && (keyboard.KeyPressing((int)SlimDXKeys.Key.RightShift) || keyboard.KeyPressing((int)SlimDXKeys.Key.LeftShift))) { // shift (+ctrl) + UpArrow (BGMAdjust) - TJAPlayer3.DTX.t各自動再生音チップの再生時刻を変更する((keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl) || keyboard.KeyPressing((int)SlimDXKeys.Key.RightControl)) ? 1 : 10); - TJAPlayer3.DTX.tWave再生位置自動補正(); + OpenTaiko.DTX.t各自動再生音チップの再生時刻を変更する((keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl) || keyboard.KeyPressing((int)SlimDXKeys.Key.RightControl)) ? 1 : 10); + OpenTaiko.DTX.tWave再生位置自動補正(); } else if (keyboard.KeyPressed((int)SlimDXKeys.Key.DownArrow) && (keyboard.KeyPressing((int)SlimDXKeys.Key.RightShift) || keyboard.KeyPressing((int)SlimDXKeys.Key.LeftShift))) { // shift + DownArrow (BGMAdjust) - TJAPlayer3.DTX.t各自動再生音チップの再生時刻を変更する((keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl) || keyboard.KeyPressing((int)SlimDXKeys.Key.RightControl)) ? -1 : -10); - TJAPlayer3.DTX.tWave再生位置自動補正(); + OpenTaiko.DTX.t各自動再生音チップの再生時刻を変更する((keyboard.KeyPressing((int)SlimDXKeys.Key.LeftControl) || keyboard.KeyPressing((int)SlimDXKeys.Key.RightControl)) ? -1 : -10); + OpenTaiko.DTX.tWave再生位置自動補正(); } // Tokkun only - else if (TJAPlayer3.ConfigIni.bTokkunMode && - TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingIncreaseScrollSpeed)) { // UpArrow(scrollspeed up) + else if (OpenTaiko.ConfigIni.bTokkunMode && + OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingIncreaseScrollSpeed)) { // UpArrow(scrollspeed up) ドラムスクロール速度アップ(); - } else if (TJAPlayer3.ConfigIni.bTokkunMode && - TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingDecreaseScrollSpeed)) { // DownArrow (scrollspeed down) + } else if (OpenTaiko.ConfigIni.bTokkunMode && + OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingDecreaseScrollSpeed)) { // DownArrow (scrollspeed down) ドラムスクロール速度ダウン(); } // Debug mode - else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.DisplayDebug)) { // del (debug info) - TJAPlayer3.ConfigIni.bDisplayDebugInfo = !TJAPlayer3.ConfigIni.bDisplayDebugInfo; + else if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.DisplayDebug)) { // del (debug info) + OpenTaiko.ConfigIni.bDisplayDebugInfo = !OpenTaiko.ConfigIni.bDisplayDebugInfo; } @@ -2678,37 +2678,37 @@ namespace TJAPlayer3 { } */ - else if ((base.ePhaseID == CStage.EPhase.Common_NORMAL) && (keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || TJAPlayer3.Pad.bPressedGB(EPad.FT)) && !this.actPauseMenu.bIsActivePopupMenu) { // escape (exit) + else if ((base.ePhaseID == CStage.EPhase.Common_NORMAL) && (keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || OpenTaiko.Pad.bPressedGB(EPad.FT)) && !this.actPauseMenu.bIsActivePopupMenu) { // escape (exit) if (!this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE == false) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); SoundManager.PlayTimer.Pause(); - TJAPlayer3.Timer.Pause(); - TJAPlayer3.DTX.t全チップの再生一時停止(); + OpenTaiko.Timer.Pause(); + OpenTaiko.DTX.t全チップの再生一時停止(); this.actAVI.tPauseControl(); this.bPAUSE = true; this.actPauseMenu.tActivatePopupMenu(0); } // this.t演奏中止(); - } else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchNormal) && - (TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.bAutoPlay[0])) { - if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; + } else if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingBranchNormal) && + (OpenTaiko.ConfigIni.bTokkunMode || OpenTaiko.ConfigIni.bAutoPlay[0])) { + if (!OpenTaiko.DTX.bHasBranch[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]]) return; //listBRANCHを廃止したため強制分岐の開始値を //rc演奏用タイマ.n現在時刻msから引っ張ることに //判定枠に一番近いチップの情報を元に一小節分の値を計算する. 2020.04.21 akasoko26 - var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 0); + var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), 0); double db一小節後 = 0.0; if (p判定枠に最も近いチップ != null) db一小節後 = ((15000.0 / p判定枠に最も近いチップ.dbBPM * (p判定枠に最も近いチップ.fNow_Measure_s / p判定枠に最も近いチップ.fNow_Measure_m)) * 16.0); - this.t分岐処理(CDTX.ECourse.eNormal, 0, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) + db一小節後); + this.t分岐処理(CDTX.ECourse.eNormal, 0, (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed) + db一小節後); - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eNormal, 0); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.tBranchEvent(TJAPlayer3.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eNormal, 0); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(OpenTaiko.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eNormal, 0); + OpenTaiko.stage演奏ドラム画面.actMtaiko.tBranchEvent(OpenTaiko.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eNormal, 0); this.n現在のコース[0] = CDTX.ECourse.eNormal; this.n次回のコース[0] = CDTX.ECourse.eNormal; @@ -2716,25 +2716,25 @@ namespace TJAPlayer3 { this.b強制的に分岐させた[0] = true; - } else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchExpert) && - (TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.bAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. + } else if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingBranchExpert) && + (OpenTaiko.ConfigIni.bTokkunMode || OpenTaiko.ConfigIni.bAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. { - if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; + if (!OpenTaiko.DTX.bHasBranch[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]]) return; //listBRANCHを廃止したため強制分岐の開始値を //rc演奏用タイマ.n現在時刻msから引っ張ることに //判定枠に一番近いチップの情報を元に一小節分の値を計算する. 2020.04.21 akasoko26 - var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 0); + var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), 0); double db一小節後 = 0.0; if (p判定枠に最も近いチップ != null) db一小節後 = ((15000.0 / p判定枠に最も近いチップ.dbBPM * (p判定枠に最も近いチップ.fNow_Measure_s / p判定枠に最も近いチップ.fNow_Measure_m)) * 16.0); - this.t分岐処理(CDTX.ECourse.eExpert, 0, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) + db一小節後); + this.t分岐処理(CDTX.ECourse.eExpert, 0, (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed) + db一小節後); - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eExpert, 0); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.tBranchEvent(TJAPlayer3.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eExpert, 0); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(OpenTaiko.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eExpert, 0); + OpenTaiko.stage演奏ドラム画面.actMtaiko.tBranchEvent(OpenTaiko.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eExpert, 0); this.n現在のコース[0] = CDTX.ECourse.eExpert; @@ -2742,25 +2742,25 @@ namespace TJAPlayer3 { this.nレーン用表示コース[0] = CDTX.ECourse.eExpert; this.b強制的に分岐させた[0] = true; - } else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchMaster) && - (TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.bAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. + } else if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingBranchMaster) && + (OpenTaiko.ConfigIni.bTokkunMode || OpenTaiko.ConfigIni.bAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. { - if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; + if (!OpenTaiko.DTX.bHasBranch[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]]) return; //listBRANCHを廃止したため強制分岐の開始値を //rc演奏用タイマ.n現在時刻msから引っ張ることに //判定枠に一番近いチップの情報を元に一小節分の値を計算する. 2020.04.21 akasoko26 - var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 0); + var p判定枠に最も近いチップ = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), 0); double db一小節後 = 0.0; if (p判定枠に最も近いチップ != null) db一小節後 = ((15000.0 / p判定枠に最も近いチップ.dbBPM * (p判定枠に最も近いチップ.fNow_Measure_s / p判定枠に最も近いチップ.fNow_Measure_m)) * 16.0); - this.t分岐処理(CDTX.ECourse.eMaster, 0, (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed) + db一小節後); + this.t分岐処理(CDTX.ECourse.eMaster, 0, (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed) + db一小節後); - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eMaster, 0); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.tBranchEvent(TJAPlayer3.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eMaster, 0); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(OpenTaiko.stage演奏ドラム画面.actLaneTaiko.stBranch[0].nAfter, CDTX.ECourse.eMaster, 0); + OpenTaiko.stage演奏ドラム画面.actMtaiko.tBranchEvent(OpenTaiko.stage演奏ドラム画面.actMtaiko.After[0], CDTX.ECourse.eMaster, 0); this.n現在のコース[0] = CDTX.ECourse.eMaster; this.n次回のコース[0] = CDTX.ECourse.eMaster; @@ -2769,39 +2769,39 @@ namespace TJAPlayer3 { this.b強制的に分岐させた[0] = true; } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.DisplayHits)) { - if (TJAPlayer3.ConfigIni.bJudgeCountDisplay == false) - TJAPlayer3.ConfigIni.bJudgeCountDisplay = true; + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.DisplayHits)) { + if (OpenTaiko.ConfigIni.bJudgeCountDisplay == false) + OpenTaiko.ConfigIni.bJudgeCountDisplay = true; else - TJAPlayer3.ConfigIni.bJudgeCountDisplay = false; + OpenTaiko.ConfigIni.bJudgeCountDisplay = false; } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.CycleVideoDisplayMode)) { - switch (TJAPlayer3.ConfigIni.eClipDispType) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.CycleVideoDisplayMode)) { + switch (OpenTaiko.ConfigIni.eClipDispType) { case EClipDispType.OFF: - TJAPlayer3.ConfigIni.eClipDispType = EClipDispType.背景のみ; + OpenTaiko.ConfigIni.eClipDispType = EClipDispType.背景のみ; break; case EClipDispType.背景のみ: - TJAPlayer3.ConfigIni.eClipDispType = EClipDispType.ウィンドウのみ; + OpenTaiko.ConfigIni.eClipDispType = EClipDispType.ウィンドウのみ; break; case EClipDispType.ウィンドウのみ: - TJAPlayer3.ConfigIni.eClipDispType = EClipDispType.両方; + OpenTaiko.ConfigIni.eClipDispType = EClipDispType.両方; break; case EClipDispType.両方: - TJAPlayer3.ConfigIni.eClipDispType = EClipDispType.OFF; + OpenTaiko.ConfigIni.eClipDispType = EClipDispType.OFF; break; } } - if (TJAPlayer3.ConfigIni.bTokkunMode && TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingToggleAuto)) { - TJAPlayer3.ConfigIni.bAutoPlay[0] = !TJAPlayer3.ConfigIni.bAutoPlay[0]; + if (OpenTaiko.ConfigIni.bTokkunMode && OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingToggleAuto)) { + OpenTaiko.ConfigIni.bAutoPlay[0] = !OpenTaiko.ConfigIni.bAutoPlay[0]; } } #if DEBUG if (keyboard.KeyPressed((int)SlimDXKeys.Key.F7)) { - TJAPlayer3.ConfigIni.bAutoPlay[1] = !TJAPlayer3.ConfigIni.bAutoPlay[1]; + OpenTaiko.ConfigIni.bAutoPlay[1] = !OpenTaiko.ConfigIni.bAutoPlay[1]; } #endif if (!this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE && ((base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED)) && (base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut)) { @@ -2809,32 +2809,32 @@ namespace TJAPlayer3 { ドラムスクロール速度アップ(); } else if (keyboard.KeyPressed((int)SlimDXKeys.Key.DownArrow)) { // DownArrow (scrollspeed down) ドラムスクロール速度ダウン(); - } else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.DisplayDebug)) { // del (debug info) - TJAPlayer3.ConfigIni.bDisplayDebugInfo = !TJAPlayer3.ConfigIni.bDisplayDebugInfo; + } else if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.System.DisplayDebug)) { // del (debug info) + OpenTaiko.ConfigIni.bDisplayDebugInfo = !OpenTaiko.ConfigIni.bDisplayDebugInfo; } else if ((keyboard.KeyPressed((int)SlimDXKeys.Key.Escape))) { // escape (exit) SoundManager.PlayTimer.Resume(); - TJAPlayer3.Timer.Resume(); + OpenTaiko.Timer.Resume(); this.t演奏中止(); } } #region [ Minus & Equals Sound Group Level ] KeyboardSoundGroupLevelControlHandler.Handle( - keyboard, TJAPlayer3.SoundGroupLevelController, TJAPlayer3.Skin, false); + keyboard, OpenTaiko.SoundGroupLevelController, OpenTaiko.Skin, false); #endregion } protected void t入力メソッド記憶(EInstrumentPad part) { - if (TJAPlayer3.Pad.st検知したデバイス.Keyboard) { + if (OpenTaiko.Pad.st検知したデバイス.Keyboard) { this.b演奏にキーボードを使った = true; } - if (TJAPlayer3.Pad.st検知したデバイス.Joypad) { + if (OpenTaiko.Pad.st検知したデバイス.Joypad) { this.b演奏にジョイパッドを使った = true; } - if (TJAPlayer3.Pad.st検知したデバイス.MIDIIN) { + if (OpenTaiko.Pad.st検知したデバイス.MIDIIN) { this.b演奏にMIDI入力を使った = true; } - if (TJAPlayer3.Pad.st検知したデバイス.Mouse) { + if (OpenTaiko.Pad.st検知したデバイス.Mouse) { this.b演奏にマウスを使った = true; } } @@ -2842,7 +2842,7 @@ namespace TJAPlayer3 { protected abstract void t進行描画_AVI(); protected void t進行描画_AVI(int x, int y) { - if (((base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED) && (base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut)) && TJAPlayer3.ConfigIni.bEnableAVI) { + if (((base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED) && (base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut)) && OpenTaiko.ConfigIni.bEnableAVI) { this.actAVI.t進行描画(x, y); } } @@ -2852,7 +2852,7 @@ namespace TJAPlayer3 { || (base.ePhaseID == CStage.EPhase.Game_STAGE_FAILED_FadeOut)) && ((this.actStageFailed.Draw() != 0) && (base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut))) { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージクリア; } else { this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.ステージ失敗; @@ -2874,14 +2874,14 @@ namespace TJAPlayer3 { // calibration is taking place, rather than // displaying the panel title or song title as usual. - var panelString = TJAPlayer3.IsPerformingCalibration + var panelString = OpenTaiko.IsPerformingCalibration ? "Calibrating input..." - : string.IsNullOrEmpty(TJAPlayer3.DTX.PANEL) ? TJAPlayer3.DTX.TITLE.GetString("") : TJAPlayer3.DTX.PANEL; + : string.IsNullOrEmpty(OpenTaiko.DTX.PANEL) ? OpenTaiko.DTX.TITLE.GetString("") : OpenTaiko.DTX.PANEL; this.actPanel.SetPanelString(panelString, - TJAPlayer3.stageSongSelect.rChoosenSong.str本当のジャンル, - TJAPlayer3.Skin.Game_StageText, - songNode: TJAPlayer3.stageSongSelect.rChoosenSong); + OpenTaiko.stageSongSelect.rChoosenSong.str本当のジャンル, + OpenTaiko.Skin.Game_StageText, + songNode: OpenTaiko.stageSongSelect.rChoosenSong); } @@ -2908,7 +2908,7 @@ namespace TJAPlayer3 { return true; } - var n現在時刻ms = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + var n現在時刻ms = (long)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed); NowAIBattleSectionTime = (int)n現在時刻ms - NowAIBattleSection.StartTime; @@ -2927,24 +2927,24 @@ namespace TJAPlayer3 { double ScrollSpeedTaiko = ((db現在の譜面スクロール速度[nPlayer] + 1.0) * speed) * 0.5 * 37.5 / 60000.0; - CConfigIni configIni = TJAPlayer3.ConfigIni; + CConfigIni configIni = OpenTaiko.ConfigIni; - CDTX dTX = TJAPlayer3.DTX; + CDTX dTX = OpenTaiko.DTX; bool bAutoPlay = configIni.bAutoPlay[nPlayer]; switch (nPlayer) //2017.08.11 kairera0467 { case 1: - bAutoPlay = configIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; - dTX = TJAPlayer3.DTX_2P; + bAutoPlay = configIni.bAutoPlay[nPlayer] || OpenTaiko.ConfigIni.bAIBattleMode; + dTX = OpenTaiko.DTX_2P; break; case 2: - dTX = TJAPlayer3.DTX_3P; + dTX = OpenTaiko.DTX_3P; break; case 3: - dTX = TJAPlayer3.DTX_4P; + dTX = OpenTaiko.DTX_4P; break; case 4: - dTX = TJAPlayer3.DTX_5P; + dTX = OpenTaiko.DTX_5P; break; default: break; @@ -2970,10 +2970,10 @@ namespace TJAPlayer3 { double _scrollSpeed = pChip.dbSCROLL * (db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0; double _scrollSpeed_Y = pChip.dbSCROLL_Y * (db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0; - pChip.nバーからの距離dot.Taiko = NotesManager.GetNoteX(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); + pChip.nバーからの距離dot.Taiko = NotesManager.GetNoteX(pChip, time * pChip.dbBPM, _scrollSpeed, OpenTaiko.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); if (pChip.nノーツ終了時刻ms != 0) { - pChip.nバーからのノーツ末端距離dot = NotesManager.GetNoteX(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, true); - pChip.nバーからのノーツ末端距離dot_Y = NotesManager.GetNoteY(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed_Y, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, true); + pChip.nバーからのノーツ末端距離dot = NotesManager.GetNoteX(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed, OpenTaiko.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, true); + pChip.nバーからのノーツ末端距離dot_Y = NotesManager.GetNoteY(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed_Y, OpenTaiko.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, true); } @@ -3037,7 +3037,7 @@ namespace TJAPlayer3 { if (!pChip.bHit && time < 0) { pChip.bHit = true; if (configIni.bBGM音を発声する) { - dTX.tチップの再生(pChip, SoundManager.PlayTimer.PrevResetTime + (long)(pChip.n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed)); + dTX.tチップの再生(pChip, SoundManager.PlayTimer.PrevResetTime + (long)(pChip.n発声時刻ms / OpenTaiko.ConfigIni.SongPlaybackSpeed)); } } break; @@ -3103,7 +3103,7 @@ namespace TJAPlayer3 { if (!this.b連打中[nPlayer] && nPlayer == 0) { actBalloon.KusuIn(); actChara.KusuIn(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { this.b連打中[i] = true; this.actChara.b風船連打中[i] = true; } @@ -3111,7 +3111,7 @@ namespace TJAPlayer3 { nCurrentKusudamaRollCount = 0; nCurrentKusudamaCount += pChip.nBalloon; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { n風船残り[i] = nCurrentKusudamaCount; } pChip.bProcessed = true; @@ -3134,15 +3134,15 @@ namespace TJAPlayer3 { if (nCurrentKusudamaCount > nCurrentKusudamaRollCount) { if (nPlayer == 0) { actBalloon.KusuMiss(); - TJAPlayer3.Skin.soundKusudamaMiss.tPlay(); - for (int p = 0; p < TJAPlayer3.ConfigIni.nPlayerCount; p++) { + OpenTaiko.Skin.soundKusudamaMiss.tPlay(); + for (int p = 0; p < OpenTaiko.ConfigIni.nPlayerCount; p++) { { this.actChara.ChangeAnime(p, CActImplCharacter.Anime.Kusudama_Miss, true); if (actChara.CharaAction_Balloon_Delay[p] != null) actChara.CharaAction_Balloon_Delay[p] = new CCounter(0, - TJAPlayer3.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[p]] - 1, + OpenTaiko.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[p]] - 1, 1, - TJAPlayer3.Timer); + OpenTaiko.Timer); } } nCurrentKusudamaRollCount = 0; @@ -3157,28 +3157,28 @@ namespace TJAPlayer3 { this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.Balloon_Miss, true); if (actChara.CharaAction_Balloon_Delay[nPlayer] != null) actChara.CharaAction_Balloon_Delay[nPlayer] = new CCounter(0, - TJAPlayer3.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[nPlayer]] - 1, + OpenTaiko.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[nPlayer]] - 1, 1, - TJAPlayer3.Timer); + OpenTaiko.Timer); } } } if (chip現在処理中の連打チップ[nPlayer].nBalloon > chip現在処理中の連打チップ[nPlayer].nRollCount) { if (pChip.n連打音符State == 13) { this.actJudgeString.Start(nPlayer, ENoteJudge.Mine); - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.Start(0x11, ENoteJudge.Bad, true, nPlayer); - TJAPlayer3.stage演奏ドラム画面.actChipFireD.Start(0x11, ENoteJudge.Mine, nPlayer); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.Start(0x11, ENoteJudge.Bad, true, nPlayer); + OpenTaiko.stage演奏ドラム画面.actChipFireD.Start(0x11, ENoteJudge.Mine, nPlayer); actGauge.MineDamage(nPlayer); - TJAPlayer3.Skin.soundBomb?.tPlay(); + OpenTaiko.Skin.soundBomb?.tPlay(); this.CChartScore[nPlayer].nMine++; this.CSectionScore[nPlayer].nMine++; this.CBranchScore[nPlayer].nMine++; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) CFloorManagement.damage(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.nMine[actDan.NowShowingNumber]++; this.actCombo.n現在のコンボ数[nPlayer] = 0; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) this.nCombo[actDan.NowShowingNumber] = 0; this.actComboVoice.tReset(nPlayer); this.bIsMiss[nPlayer] = true; @@ -3298,7 +3298,7 @@ namespace TJAPlayer3 { if (configIni.bEnableAVI) { if ((dTX.listVD.TryGetValue(pChip.n整数値_内部番号, out CVideoDecoder vd))) { ShowVideo = true; - if (TJAPlayer3.ConfigIni.bEnableAVI && vd != null) { + if (OpenTaiko.ConfigIni.bEnableAVI && vd != null) { this.actAVI.Start(pChip.nチャンネル番号, vd); this.actAVI.Seek(pChip.VideoStartTimeMs); } @@ -3312,14 +3312,14 @@ namespace TJAPlayer3 { if (configIni.bEnableAVI) { if ((dTX.listVD.TryGetValue(pChip.n整数値_内部番号, out CVideoDecoder vd))) { ShowVideo = false; - if (TJAPlayer3.ConfigIni.bEnableAVI && vd != null) { + if (OpenTaiko.ConfigIni.bEnableAVI && vd != null) { this.actAVI.Stop(); } } if ((dTX.listVD.TryGetValue(1, out CVideoDecoder vd2))) { ShowVideo = true; - if (TJAPlayer3.ConfigIni.bEnableAVI && vd != null) { + if (OpenTaiko.ConfigIni.bEnableAVI && vd != null) { this.actAVI.Start(pChip.nチャンネル番号, vd); } } @@ -3393,7 +3393,7 @@ namespace TJAPlayer3 { this.actDan.Update(); if (ListDan_Number != 0 && actDan.FirstSectionAnime) { if (this.actDan.GetFailedAllChallenges()) { - this.n現在のトップChip = TJAPlayer3.DTX.listChip.Count - 1; // 終端にシーク + this.n現在のトップChip = OpenTaiko.DTX.listChip.Count - 1; // 終端にシーク IsDanFailed = true; return true; } @@ -3419,7 +3419,7 @@ namespace TJAPlayer3 { for (int i = 0; i < 5; i++) { - ctChipAnime[i] = new CCounter(0, 3, 60.0 / TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] * 1 / 4, SoundManager.PlayTimer); + ctChipAnime[i] = new CCounter(0, 3, 60.0 / OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] * 1 / 4, SoundManager.PlayTimer); } UpdateCharaCounter(nPlayer); @@ -3459,20 +3459,20 @@ namespace TJAPlayer3 { int Character = this.actChara.iCurrentCharacter[nPlayer]; { - if (TJAPlayer3.Skin.Characters_GoGoStart_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { - if (!HGaugeMethods.UNSAFE_IsRainbow(nPlayer) && (!HGaugeMethods.UNSAFE_FastNormaCheck(nPlayer) || TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn[Character] == 0)) { + if (OpenTaiko.Skin.Characters_GoGoStart_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (!HGaugeMethods.UNSAFE_IsRainbow(nPlayer) && (!HGaugeMethods.UNSAFE_FastNormaCheck(nPlayer) || OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn[Character] == 0)) { // 魂ゲージMAXではない // ゴーゴースタート_ノーマル this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.GoGoStart, true); //this.actChara.キャラクター_アクション_10コンボ(); } } - if (TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { if (!HGaugeMethods.UNSAFE_IsRainbow(nPlayer) && HGaugeMethods.UNSAFE_FastNormaCheck(nPlayer)) { this.actChara.ChangeAnime(nPlayer, CActImplCharacter.Anime.GoGoStart_Clear, true); } } - if (TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { + if (OpenTaiko.Skin.Characters_GoGoStart_Maxed_Ptn[Character] != 0 && actChara.CharaAction_Balloon_Delay[nPlayer].IsEnded) { if (HGaugeMethods.UNSAFE_IsRainbow(nPlayer)) { // 魂ゲージMAX // ゴーゴースタート_MAX @@ -3481,7 +3481,7 @@ namespace TJAPlayer3 { } } - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.GOGOSTART(); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.GOGOSTART(); } break; case 0x9F: //ゴーゴータイム @@ -3497,7 +3497,7 @@ namespace TJAPlayer3 { if (!pChip.bHit && time < 0) { pChip.bHit = true; this.currentCamVMoveChip = pChip; - this.ctCamVMove = new CCounter(0, pChip.fCamTimeMs, 1, TJAPlayer3.Timer); + this.ctCamVMove = new CCounter(0, pChip.fCamTimeMs, 1, OpenTaiko.Timer); } break; case 0xa1: //camera vertical move end @@ -3509,7 +3509,7 @@ namespace TJAPlayer3 { if (!pChip.bHit && time < 0) { pChip.bHit = true; this.currentCamHMoveChip = pChip; - this.ctCamHMove = new CCounter(0, pChip.fCamTimeMs, 1, TJAPlayer3.Timer); + this.ctCamHMove = new CCounter(0, pChip.fCamTimeMs, 1, OpenTaiko.Timer); } break; case 0xa3: //camera horizontal move end @@ -3521,7 +3521,7 @@ namespace TJAPlayer3 { if (!pChip.bHit && time < 0) { pChip.bHit = true; this.currentCamZoomChip = pChip; - this.ctCamZoom = new CCounter(0, pChip.fCamTimeMs, 1, TJAPlayer3.Timer); + this.ctCamZoom = new CCounter(0, pChip.fCamTimeMs, 1, OpenTaiko.Timer); } break; case 0xa5: //camera zoom end @@ -3533,7 +3533,7 @@ namespace TJAPlayer3 { if (!pChip.bHit && time < 0) { pChip.bHit = true; this.currentCamRotateChip = pChip; - this.ctCamRotation = new CCounter(0, pChip.fCamTimeMs, 1, TJAPlayer3.Timer); + this.ctCamRotation = new CCounter(0, pChip.fCamTimeMs, 1, OpenTaiko.Timer); } break; case 0xa7: //camera rotation end @@ -3545,7 +3545,7 @@ namespace TJAPlayer3 { if (!pChip.bHit && time < 0) { pChip.bHit = true; this.currentCamVScaleChip = pChip; - this.ctCamVScale = new CCounter(0, pChip.fCamTimeMs, 1, TJAPlayer3.Timer); + this.ctCamVScale = new CCounter(0, pChip.fCamTimeMs, 1, OpenTaiko.Timer); } break; case 0xa9: //camera vertical scaling end @@ -3557,7 +3557,7 @@ namespace TJAPlayer3 { if (!pChip.bHit && time < 0) { pChip.bHit = true; this.currentCamHScaleChip = pChip; - this.ctCamHScale = new CCounter(0, pChip.fCamTimeMs, 1, TJAPlayer3.Timer); + this.ctCamHScale = new CCounter(0, pChip.fCamTimeMs, 1, OpenTaiko.Timer); } break; case 0xb1: //camera horizontal scaling end @@ -3568,7 +3568,7 @@ namespace TJAPlayer3 { case 0xb2: //change border color if (!pChip.bHit && time < 0) { pChip.bHit = true; - TJAPlayer3.borderColor = pChip.borderColor; + OpenTaiko.borderColor = pChip.borderColor; } break; case 0xb3: //set camera x offset @@ -3576,7 +3576,7 @@ namespace TJAPlayer3 { pChip.bHit = true; this.currentCamHMoveChip = pChip; - this.ctCamHMove = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamHMove = new CCounter(0, 0, 1, OpenTaiko.Timer); } break; case 0xb4: //set camera y offset @@ -3584,7 +3584,7 @@ namespace TJAPlayer3 { pChip.bHit = true; this.currentCamVMoveChip = pChip; - this.ctCamVMove = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamVMove = new CCounter(0, 0, 1, OpenTaiko.Timer); } break; case 0xb5: //set camera zoom factor @@ -3592,7 +3592,7 @@ namespace TJAPlayer3 { pChip.bHit = true; this.currentCamZoomChip = pChip; - this.ctCamZoom = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamZoom = new CCounter(0, 0, 1, OpenTaiko.Timer); } break; case 0xb6: //set camera rotation @@ -3600,7 +3600,7 @@ namespace TJAPlayer3 { pChip.bHit = true; this.currentCamRotateChip = pChip; - this.ctCamRotation = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamRotation = new CCounter(0, 0, 1, OpenTaiko.Timer); } break; case 0xb7: //set camera x scale @@ -3608,7 +3608,7 @@ namespace TJAPlayer3 { pChip.bHit = true; this.currentCamHScaleChip = pChip; - this.ctCamHScale = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamHScale = new CCounter(0, 0, 1, OpenTaiko.Timer); } break; case 0xb8: //set camera y scale @@ -3616,14 +3616,14 @@ namespace TJAPlayer3 { pChip.bHit = true; this.currentCamVScaleChip = pChip; - this.ctCamVScale = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamVScale = new CCounter(0, 0, 1, OpenTaiko.Timer); } break; case 0xb9: //reset camera if (!pChip.bHit && time < 0) { pChip.bHit = true; - TJAPlayer3.borderColor = new Color4(0f, 0f, 0f, 0f); + OpenTaiko.borderColor = new Color4(0f, 0f, 0f, 0f); this.currentCamVMoveChip = pChip; this.currentCamHMoveChip = pChip; @@ -3634,14 +3634,14 @@ namespace TJAPlayer3 { this.currentCamVScaleChip = pChip; this.currentCamHScaleChip = pChip; - this.ctCamVMove = new CCounter(0, 0, 1, TJAPlayer3.Timer); - this.ctCamHMove = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamVMove = new CCounter(0, 0, 1, OpenTaiko.Timer); + this.ctCamHMove = new CCounter(0, 0, 1, OpenTaiko.Timer); - this.ctCamZoom = new CCounter(0, 0, 1, TJAPlayer3.Timer); - this.ctCamRotation = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamZoom = new CCounter(0, 0, 1, OpenTaiko.Timer); + this.ctCamRotation = new CCounter(0, 0, 1, OpenTaiko.Timer); - this.ctCamVScale = new CCounter(0, 0, 1, TJAPlayer3.Timer); - this.ctCamHScale = new CCounter(0, 0, 1, TJAPlayer3.Timer); + this.ctCamVScale = new CCounter(0, 0, 1, OpenTaiko.Timer); + this.ctCamHScale = new CCounter(0, 0, 1, OpenTaiko.Timer); } break; case 0xba: //enable doron @@ -3684,7 +3684,7 @@ namespace TJAPlayer3 { pChip.bHit = true; dTX.listObj.TryGetValue(pChip.strObjName, out pChip.obj); - objHandlers.Add(pChip, new CCounter(0, pChip.fObjTimeMs, 1, TJAPlayer3.Timer)); + objHandlers.Add(pChip, new CCounter(0, pChip.fObjTimeMs, 1, OpenTaiko.Timer)); } break; case 0xbf: //object animation end @@ -3715,15 +3715,15 @@ namespace TJAPlayer3 { pChip.bHit = true; dTX.listObj.TryGetValue(pChip.strObjName, out pChip.obj); - objHandlers.Add(pChip, new CCounter(0, 0, 1, TJAPlayer3.Timer)); + objHandlers.Add(pChip, new CCounter(0, 0, 1, OpenTaiko.Timer)); } break; case 0xd1: //change texture if (!pChip.bHit && time < 0) { pChip.bHit = true; - if (TJAPlayer3.Tx.trackedTextures.ContainsKey(pChip.strTargetTxName)) { - TJAPlayer3.Tx.trackedTextures.TryGetValue(pChip.strTargetTxName, out CTexture oldTx); + if (OpenTaiko.Tx.trackedTextures.ContainsKey(pChip.strTargetTxName)) { + OpenTaiko.Tx.trackedTextures.TryGetValue(pChip.strTargetTxName, out CTexture oldTx); dTX.listTextures.TryGetValue(pChip.strNewPath, out CTexture newTx); newTx.Opacity = oldTx.Opacity; @@ -3738,8 +3738,8 @@ namespace TJAPlayer3 { if (!pChip.bHit && time < 0) { pChip.bHit = true; - if (TJAPlayer3.Tx.trackedTextures.ContainsKey(pChip.strTargetTxName)) { - TJAPlayer3.Tx.trackedTextures.TryGetValue(pChip.strTargetTxName, out CTexture oldTx); + if (OpenTaiko.Tx.trackedTextures.ContainsKey(pChip.strTargetTxName)) { + OpenTaiko.Tx.trackedTextures.TryGetValue(pChip.strTargetTxName, out CTexture oldTx); dTX.listOriginalTextures.TryGetValue(pChip.strTargetTxName, out CTexture originalTx); originalTx.Opacity = oldTx.Opacity; @@ -3796,7 +3796,7 @@ namespace TJAPlayer3 { #region [ d8-d9: EXTENDED2 ] case 0xd8: if (!pChip.bHit && time < 0) { - TJAPlayer3.ConfigIni.nGameType[nPlayer] = pChip.eGameType; + OpenTaiko.ConfigIni.nGameType[nPlayer] = pChip.eGameType; pChip.bHit = true; } break; @@ -3875,10 +3875,10 @@ namespace TJAPlayer3 { //成仏2000にある-2,-1だったら達人に強制分岐みたいな。 this.t強制用条件かを判断する(pChip.n条件数値A, pChip.n条件数値B, nPlayer); - TJAPlayer3.stage演奏ドラム画面.bUseBranch[nPlayer] = true; + OpenTaiko.stage演奏ドラム画面.bUseBranch[nPlayer] = true; CBRANCHSCORE branchScore; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { + if (OpenTaiko.ConfigIni.bAIBattleMode) { branchScore = this.CBranchScore[0]; } else { branchScore = this.CBranchScore[nPlayer]; @@ -3890,8 +3890,8 @@ namespace TJAPlayer3 { this.t分岐処理(this.n次回のコース[nPlayer], nPlayer, pChip.n分岐時刻ms, pChip.e分岐の種類); - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.stBranch[nPlayer].nAfter, this.n次回のコース[nPlayer], nPlayer); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.tBranchEvent(TJAPlayer3.stage演奏ドラム画面.actMtaiko.After[nPlayer], this.n次回のコース[nPlayer], nPlayer); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.t分岐レイヤー_コース変化(OpenTaiko.stage演奏ドラム画面.actLaneTaiko.stBranch[nPlayer].nAfter, this.n次回のコース[nPlayer], nPlayer); + OpenTaiko.stage演奏ドラム画面.actMtaiko.tBranchEvent(OpenTaiko.stage演奏ドラム画面.actMtaiko.After[nPlayer], this.n次回のコース[nPlayer], nPlayer); this.n現在のコース[nPlayer] = this.n次回のコース[nPlayer]; } this.n分岐した回数[nPlayer]++; @@ -3920,7 +3920,7 @@ namespace TJAPlayer3 { break; case 0xE2: if (!pChip.bHit && time < 0) { - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.t判定枠移動(dTX.listJPOSSCROLL[nJPOSSCROLL[nPlayer]].db移動時間, dTX.listJPOSSCROLL[nJPOSSCROLL[nPlayer]].n移動距離px, dTX.listJPOSSCROLL[nJPOSSCROLL[nPlayer]].n移動方向, nPlayer, dTX.listJPOSSCROLL[nJPOSSCROLL[nPlayer]].nVerticalMove); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.t判定枠移動(dTX.listJPOSSCROLL[nJPOSSCROLL[nPlayer]].db移動時間, dTX.listJPOSSCROLL[nJPOSSCROLL[nPlayer]].n移動距離px, dTX.listJPOSSCROLL[nJPOSSCROLL[nPlayer]].n移動方向, nPlayer, dTX.listJPOSSCROLL[nJPOSSCROLL[nPlayer]].nVerticalMove); this.nJPOSSCROLL[nPlayer]++; pChip.bHit = true; } @@ -3929,7 +3929,7 @@ namespace TJAPlayer3 { #region[ f1: 歌詞 ] case 0xF1: if (!pChip.bHit && time < 0) { - if (TJAPlayer3.ConfigIni.nPlayerCount == 1) { + if (OpenTaiko.ConfigIni.nPlayerCount == 1) { if (dTX.listLyric.Count > ShownLyric[nPlayer] && dTX.nPlayerSide == nPlayer) { this.actPanel.t歌詞テクスチャを生成する(dTX.listLyric[ShownLyric[nPlayer]]); ShownLyric[nPlayer]++; @@ -3943,8 +3943,8 @@ namespace TJAPlayer3 { //バグで譜面がとてつもないことになっているため、#ENDがきたらこれを差し込む。 case 0xFF: if (!pChip.bHit && time < 0) { - if (TJAPlayer3.ConfigIni.bTokkunMode) { - foreach (CDTX.CWAV cwav in TJAPlayer3.DTX.listWAV.Values) { + if (OpenTaiko.ConfigIni.bTokkunMode) { + foreach (CDTX.CWAV cwav in OpenTaiko.DTX.listWAV.Values) { for (int i = 0; i < nPolyphonicSounds; i++) { if ((cwav.rSound[i] != null) && cwav.rSound[i].IsPlaying) { return false; @@ -4011,11 +4011,11 @@ namespace TJAPlayer3 { if (currentCamVMoveChip.strCamEaseType.Equals("IN")) value = easing.EaseIn(ctCamVMove, currentCamVMoveChip.fCamScrollStartY, currentCamVMoveChip.fCamScrollEndY, currentCamVMoveChip.fCamMoveType); if (currentCamVMoveChip.strCamEaseType.Equals("OUT")) value = easing.EaseOut(ctCamVMove, currentCamVMoveChip.fCamScrollStartY, currentCamVMoveChip.fCamScrollEndY, currentCamVMoveChip.fCamMoveType); if (currentCamVMoveChip.strCamEaseType.Equals("IN_OUT")) value = easing.EaseInOut(ctCamVMove, currentCamVMoveChip.fCamScrollStartY, currentCamVMoveChip.fCamScrollEndY, currentCamVMoveChip.fCamMoveType); - TJAPlayer3.fCamYOffset = float.IsNaN(value) ? currentCamVMoveChip.fCamScrollStartY : value; + OpenTaiko.fCamYOffset = float.IsNaN(value) ? currentCamVMoveChip.fCamScrollStartY : value; if (ctCamVMove.IsEnded) { ctCamVMove = null; - TJAPlayer3.fCamYOffset = currentCamVMoveChip.fCamScrollEndY; + OpenTaiko.fCamYOffset = currentCamVMoveChip.fCamScrollEndY; } } @@ -4026,11 +4026,11 @@ namespace TJAPlayer3 { if (currentCamHMoveChip.strCamEaseType.Equals("IN")) value = easing.EaseIn(ctCamHMove, currentCamHMoveChip.fCamScrollStartX, currentCamHMoveChip.fCamScrollEndX, currentCamHMoveChip.fCamMoveType); if (currentCamHMoveChip.strCamEaseType.Equals("OUT")) value = easing.EaseOut(ctCamHMove, currentCamHMoveChip.fCamScrollStartX, currentCamHMoveChip.fCamScrollEndX, currentCamHMoveChip.fCamMoveType); if (currentCamHMoveChip.strCamEaseType.Equals("IN_OUT")) value = easing.EaseInOut(ctCamHMove, currentCamHMoveChip.fCamScrollStartX, currentCamHMoveChip.fCamScrollEndX, currentCamHMoveChip.fCamMoveType); - TJAPlayer3.fCamXOffset = float.IsNaN(value) ? currentCamHMoveChip.fCamScrollStartX : value; + OpenTaiko.fCamXOffset = float.IsNaN(value) ? currentCamHMoveChip.fCamScrollStartX : value; if (ctCamHMove.IsEnded) { ctCamHMove = null; - TJAPlayer3.fCamXOffset = currentCamHMoveChip.fCamScrollEndX; + OpenTaiko.fCamXOffset = currentCamHMoveChip.fCamScrollEndX; } } @@ -4041,11 +4041,11 @@ namespace TJAPlayer3 { if (currentCamZoomChip.strCamEaseType.Equals("IN")) value = easing.EaseIn(ctCamZoom, currentCamZoomChip.fCamZoomStart, currentCamZoomChip.fCamZoomEnd, currentCamZoomChip.fCamMoveType); if (currentCamZoomChip.strCamEaseType.Equals("OUT")) value = easing.EaseOut(ctCamZoom, currentCamZoomChip.fCamZoomStart, currentCamZoomChip.fCamZoomEnd, currentCamZoomChip.fCamMoveType); if (currentCamZoomChip.strCamEaseType.Equals("IN_OUT")) value = easing.EaseInOut(ctCamZoom, currentCamZoomChip.fCamZoomStart, currentCamZoomChip.fCamZoomEnd, currentCamZoomChip.fCamMoveType); - TJAPlayer3.fCamZoomFactor = float.IsNaN(value) ? currentCamZoomChip.fCamZoomStart : value; + OpenTaiko.fCamZoomFactor = float.IsNaN(value) ? currentCamZoomChip.fCamZoomStart : value; if (ctCamZoom.IsEnded) { ctCamZoom = null; - TJAPlayer3.fCamZoomFactor = currentCamZoomChip.fCamZoomEnd; + OpenTaiko.fCamZoomFactor = currentCamZoomChip.fCamZoomEnd; } } @@ -4056,11 +4056,11 @@ namespace TJAPlayer3 { if (currentCamRotateChip.strCamEaseType.Equals("IN")) value = easing.EaseIn(ctCamRotation, currentCamRotateChip.fCamRotationStart, currentCamRotateChip.fCamRotationEnd, currentCamRotateChip.fCamMoveType); if (currentCamRotateChip.strCamEaseType.Equals("OUT")) value = easing.EaseOut(ctCamRotation, currentCamRotateChip.fCamRotationStart, currentCamRotateChip.fCamRotationEnd, currentCamRotateChip.fCamMoveType); if (currentCamRotateChip.strCamEaseType.Equals("IN_OUT")) value = easing.EaseInOut(ctCamRotation, currentCamRotateChip.fCamRotationStart, currentCamRotateChip.fCamRotationEnd, currentCamRotateChip.fCamMoveType); - TJAPlayer3.fCamRotation = float.IsNaN(value) ? currentCamRotateChip.fCamRotationStart : value; + OpenTaiko.fCamRotation = float.IsNaN(value) ? currentCamRotateChip.fCamRotationStart : value; if (ctCamRotation.IsEnded) { ctCamRotation = null; - TJAPlayer3.fCamRotation = currentCamRotateChip.fCamRotationEnd; + OpenTaiko.fCamRotation = currentCamRotateChip.fCamRotationEnd; } } @@ -4071,11 +4071,11 @@ namespace TJAPlayer3 { if (currentCamVScaleChip.strCamEaseType.Equals("IN")) value = easing.EaseIn(ctCamVScale, currentCamVScaleChip.fCamScaleStartY, currentCamVScaleChip.fCamScaleEndY, currentCamVScaleChip.fCamMoveType); if (currentCamVScaleChip.strCamEaseType.Equals("OUT")) value = easing.EaseOut(ctCamVScale, currentCamVScaleChip.fCamScaleStartY, currentCamVScaleChip.fCamScaleEndY, currentCamVScaleChip.fCamMoveType); if (currentCamVScaleChip.strCamEaseType.Equals("IN_OUT")) value = easing.EaseInOut(ctCamVScale, currentCamVScaleChip.fCamScaleStartY, currentCamVScaleChip.fCamScaleEndY, currentCamVScaleChip.fCamMoveType); - TJAPlayer3.fCamYScale = float.IsNaN(value) ? currentCamVScaleChip.fCamScaleStartY : value; + OpenTaiko.fCamYScale = float.IsNaN(value) ? currentCamVScaleChip.fCamScaleStartY : value; if (ctCamVScale.IsEnded) { ctCamVScale = null; - TJAPlayer3.fCamYScale = currentCamVScaleChip.fCamScaleEndY; + OpenTaiko.fCamYScale = currentCamVScaleChip.fCamScaleEndY; } } @@ -4086,11 +4086,11 @@ namespace TJAPlayer3 { if (currentCamHScaleChip.strCamEaseType.Equals("IN")) value = easing.EaseIn(ctCamHScale, currentCamHScaleChip.fCamScaleStartX, currentCamHScaleChip.fCamScaleEndX, currentCamHScaleChip.fCamMoveType); if (currentCamHScaleChip.strCamEaseType.Equals("OUT")) value = easing.EaseOut(ctCamHScale, currentCamHScaleChip.fCamScaleStartX, currentCamHScaleChip.fCamScaleEndX, currentCamHScaleChip.fCamMoveType); if (currentCamHScaleChip.strCamEaseType.Equals("IN_OUT")) value = easing.EaseInOut(ctCamHScale, currentCamHScaleChip.fCamScaleStartX, currentCamHScaleChip.fCamScaleEndX, currentCamHScaleChip.fCamMoveType); - TJAPlayer3.fCamXScale = float.IsNaN(value) ? currentCamHScaleChip.fCamScaleStartX : value; + OpenTaiko.fCamXScale = float.IsNaN(value) ? currentCamHScaleChip.fCamScaleStartX : value; if (ctCamHScale.IsEnded) { ctCamHScale = null; - TJAPlayer3.fCamXScale = currentCamHScaleChip.fCamScaleEndX; + OpenTaiko.fCamXScale = currentCamHScaleChip.fCamScaleEndX; } } @@ -4140,30 +4140,30 @@ namespace TJAPlayer3 { return true; } - CConfigIni configIni = TJAPlayer3.ConfigIni; + CConfigIni configIni = OpenTaiko.ConfigIni; - CDTX dTX = TJAPlayer3.DTX; + CDTX dTX = OpenTaiko.DTX; bool bAutoPlay = configIni.bAutoPlay[nPlayer]; switch (nPlayer) //2017.08.11 kairera0467 { case 1: - bAutoPlay = configIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; - dTX = TJAPlayer3.DTX_2P; + bAutoPlay = configIni.bAutoPlay[nPlayer] || OpenTaiko.ConfigIni.bAIBattleMode; + dTX = OpenTaiko.DTX_2P; break; case 2: - dTX = TJAPlayer3.DTX_3P; + dTX = OpenTaiko.DTX_3P; break; case 3: - dTX = TJAPlayer3.DTX_4P; + dTX = OpenTaiko.DTX_4P; break; case 4: - dTX = TJAPlayer3.DTX_5P; + dTX = OpenTaiko.DTX_5P; break; default: break; } - var n現在時刻ms = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + var n現在時刻ms = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); //for ( int nCurrentTopChip = this.n現在のトップChip; nCurrentTopChip < dTX.listChip.Count; nCurrentTopChip++ ) for (int nCurrentTopChip = dTX.listChip.Count - 1; nCurrentTopChip > 0; nCurrentTopChip--) { @@ -4317,19 +4317,19 @@ namespace TJAPlayer3 { public void t分岐処理(CDTX.ECourse n分岐先, int nPlayer, double n発声位置, CDTX.E分岐種類 e分岐種類 = CDTX.E分岐種類.e精度分岐) { - CDTX dTX = TJAPlayer3.DTX; + CDTX dTX = OpenTaiko.DTX; switch (nPlayer) { case 1: - dTX = TJAPlayer3.DTX_2P; + dTX = OpenTaiko.DTX_2P; break; case 2: - dTX = TJAPlayer3.DTX_3P; + dTX = OpenTaiko.DTX_3P; break; case 3: - dTX = TJAPlayer3.DTX_4P; + dTX = OpenTaiko.DTX_4P; break; case 4: - dTX = TJAPlayer3.DTX_5P; + dTX = OpenTaiko.DTX_5P; break; default: break; @@ -4392,7 +4392,7 @@ namespace TJAPlayer3 { float bpm_time = 0; int last_input = 0; float last_bpm_change_time; - play_time = SoundManager.PlayTimer.NowTimeMs * (float)TJAPlayer3.ConfigIni.SongPlaybackSpeed - tja.nOFFSET; + play_time = SoundManager.PlayTimer.NowTimeMs * (float)OpenTaiko.ConfigIni.SongPlaybackSpeed - tja.nOFFSET; for (int i = 1; ; i++) { //BPMCHANGEの数越えた @@ -4427,7 +4427,7 @@ namespace TJAPlayer3 { } public void t再読込() { - TJAPlayer3.DTX.t全チップの再生停止とミキサーからの削除(); + OpenTaiko.DTX.t全チップの再生停止とミキサーからの削除(); this.eフェードアウト完了時の戻り値 = E演奏画面の戻り値.再読込_再演奏; base.ePhaseID = CStage.EPhase.Game_Reload; this.bPAUSE = false; @@ -4455,19 +4455,19 @@ namespace TJAPlayer3 { AIBattleSections[i].IsAnimated = false; } - TJAPlayer3.fCamXOffset = 0; + OpenTaiko.fCamXOffset = 0; - TJAPlayer3.fCamYOffset = 0; + OpenTaiko.fCamYOffset = 0; - TJAPlayer3.fCamZoomFactor = 1.0f; - TJAPlayer3.fCamRotation = 0; + OpenTaiko.fCamZoomFactor = 1.0f; + OpenTaiko.fCamRotation = 0; - TJAPlayer3.fCamXScale = 1.0f; - TJAPlayer3.fCamYScale = 1.0f; + OpenTaiko.fCamXScale = 1.0f; + OpenTaiko.fCamYScale = 1.0f; - TJAPlayer3.borderColor = new Color4(1f, 0f, 0f, 0f); + OpenTaiko.borderColor = new Color4(1f, 0f, 0f, 0f); - foreach (var chip in TJAPlayer3.DTX.listChip) { + foreach (var chip in OpenTaiko.DTX.listChip) { if (chip.obj == null) continue; chip.obj.isVisible = false; chip.obj.yScale = 1.0f; @@ -4477,10 +4477,10 @@ namespace TJAPlayer3 { chip.obj.frame = 0; } - TJAPlayer3.DTX.t全チップの再生停止とミキサーからの削除(); + OpenTaiko.DTX.t全チップの再生停止とミキサーからの削除(); this.t数値の初期化(true, true); //this.actAVI.Stop(); - foreach (var vd in TJAPlayer3.DTX.listVD) { + foreach (var vd in OpenTaiko.DTX.listVD) { vd.Value.Stop(); } this.actAVI.Stop(); @@ -4495,13 +4495,13 @@ namespace TJAPlayer3 { ifp[i] = false; isDeniedPlaying[i] = false; - TJAPlayer3.ConfigIni.nGameType[i] = eFirstGameType[i]; + OpenTaiko.ConfigIni.nGameType[i] = eFirstGameType[i]; bSplitLane[i] = false; } - TJAPlayer3.stage演奏ドラム画面.Activate(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + OpenTaiko.stage演奏ドラム画面.Activate(); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (!bIsAlreadyCleared[i] && cleared[i]) { - TJAPlayer3.stage演奏ドラム画面.actBackground.ClearOut(i); + OpenTaiko.stage演奏ドラム画面.actBackground.ClearOut(i); } if (NotesManager.IsKusudama(this.chip現在処理中の連打チップ[i]) && this.actChara.b風船連打中[i]) actBalloon.KusuMiss(); @@ -4513,15 +4513,15 @@ namespace TJAPlayer3 { } public void t停止() { - TJAPlayer3.DTX.t全チップの再生停止とミキサーからの削除(); - foreach (var vd in TJAPlayer3.DTX.listVD) { + OpenTaiko.DTX.t全チップの再生停止とミキサーからの削除(); + foreach (var vd in OpenTaiko.DTX.listVD) { vd.Value.Stop(); } this.actAVI.Stop(); this.actPanel.Stop(); // PANEL表示停止 - TJAPlayer3.Timer.Pause(); // 再生時刻カウンタ停止 + OpenTaiko.Timer.Pause(); // 再生時刻カウンタ停止 - this.n現在のトップChip = TJAPlayer3.DTX.listChip.Count - 1; // 終端にシーク + this.n現在のトップChip = OpenTaiko.DTX.listChip.Count - 1; // 終端にシーク // 自分自身のOn活性化()相当の処理もすべき。 } @@ -4542,12 +4542,12 @@ namespace TJAPlayer3 { this.actCombo.Activate(); this.actScore.Activate(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - this.actGauge.Init(TJAPlayer3.ConfigIni.nRisky, i); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + this.actGauge.Init(OpenTaiko.ConfigIni.nRisky, i); } } if (b演奏状態) { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { this.bIsGOGOTIME[i] = false; this.bIsMiss[i] = false; this.bLEVELHOLD[i] = false; @@ -4568,27 +4568,27 @@ namespace TJAPlayer3 { nCurrentKusudamaCount = 0; nCurrentKusudamaRollCount = 0; - this.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]); + this.ReSetScore(OpenTaiko.DTX.nScoreInit[0, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]], OpenTaiko.DTX.nScoreDiff[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]]); this.nHand = new int[] { 0, 0, 0, 0, 0 }; } public void t演奏位置の変更(int nStartBar, int nPlayer) { // まず全サウンドオフにする - TJAPlayer3.DTX.t全チップの再生停止(); + OpenTaiko.DTX.t全チップの再生停止(); this.actAVI.Stop(); - CDTX dTX = TJAPlayer3.DTX; + CDTX dTX = OpenTaiko.DTX; switch (nPlayer) { case 1: - dTX = TJAPlayer3.DTX_2P; + dTX = OpenTaiko.DTX_2P; break; case 2: - dTX = TJAPlayer3.DTX_3P; + dTX = OpenTaiko.DTX_3P; break; case 3: - dTX = TJAPlayer3.DTX_4P; + dTX = OpenTaiko.DTX_4P; break; case 4: - dTX = TJAPlayer3.DTX_5P; + dTX = OpenTaiko.DTX_5P; break; default: break; @@ -4642,12 +4642,12 @@ namespace TJAPlayer3 { // this.n現在のトップChip = CDTXMania.DTX.listChip.Count - 1; this.n現在のトップChip = 0; // 対象小節が存在しないなら、最初から再生 } else { - while (this.n現在のトップChip != 0 && dTX.listChip[this.n現在のトップChip].n発声時刻ms == dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip - 1].n発声時刻ms) - TJAPlayer3.stage演奏ドラム画面.n現在のトップChip--; + while (this.n現在のトップChip != 0 && dTX.listChip[this.n現在のトップChip].n発声時刻ms == dTX.listChip[OpenTaiko.stage演奏ドラム画面.n現在のトップChip - 1].n発声時刻ms) + OpenTaiko.stage演奏ドラム画面.n現在のトップChip--; } #endregion #region [ 演奏開始の発声時刻msを取得し、タイマに設定 ] - int nStartTime = (int)(dTX.listChip[this.n現在のトップChip].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed); + int nStartTime = (int)(dTX.listChip[this.n現在のトップChip].n発声時刻ms / OpenTaiko.ConfigIni.SongPlaybackSpeed); SoundManager.PlayTimer.Reset(); // これでPAUSE解除されるので、次のPAUSEチェックは不要 //if ( !this.bPAUSE ) @@ -4663,7 +4663,7 @@ namespace TJAPlayer3 { for (int i = this.n現在のトップChip; i >= 0; i--) { CDTX.CChip pChip = dTX.listChip[i]; int nDuration = pChip.GetDuration(); - long n発声時刻ms = (long)(pChip.n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long n発声時刻ms = (long)(pChip.n発声時刻ms / OpenTaiko.ConfigIni.SongPlaybackSpeed); if ((n発声時刻ms + nDuration > 0) && (n発声時刻ms <= nStartTime) && (nStartTime <= n発声時刻ms + nDuration)) { if (pChip.nチャンネル番号 == 0x01 && (pChip.nチャンネル番号 >> 4) != 0xB) // wav系チャンネル、且つ、空打ちチップではない @@ -4672,8 +4672,8 @@ namespace TJAPlayer3 { bool b = dTX.listWAV.TryGetValue(pChip.n整数値_内部番号, out wc); if (!b) continue; - if ((wc.bIsBGMSound && TJAPlayer3.ConfigIni.bBGM音を発声する) || (!wc.bIsBGMSound)) { - TJAPlayer3.DTX.tチップの再生(pChip, (long)(SoundManager.PlayTimer.PrevResetTime) + (long)(pChip.n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed)); + if ((wc.bIsBGMSound && OpenTaiko.ConfigIni.bBGM音を発声する) || (!wc.bIsBGMSound)) { + OpenTaiko.DTX.tチップの再生(pChip, (long)(SoundManager.PlayTimer.PrevResetTime) + (long)(pChip.n発声時刻ms / OpenTaiko.ConfigIni.SongPlaybackSpeed)); #region [ PAUSEする ] int j = wc.n現在再生中のサウンド番号; if (wc.rSound[j] != null) { @@ -4705,7 +4705,7 @@ namespace TJAPlayer3 { #endregion #region [ PAUSEしていたサウンドを一斉に再生再開する(ただしタイマを止めているので、ここではまだ再生開始しない) ] - if (!(TJAPlayer3.ConfigIni.b演奏速度が一倍速であるとき以外音声を再生しない && TJAPlayer3.ConfigIni.nSongSpeed != 20)) + if (!(OpenTaiko.ConfigIni.b演奏速度が一倍速であるとき以外音声を再生しない && OpenTaiko.ConfigIni.nSongSpeed != 20)) foreach (CSound cs in pausedCSound) { cs.tPlaySound(); } @@ -4713,8 +4713,8 @@ namespace TJAPlayer3 { pausedCSound.Clear(); #region [ タイマを再開して、PAUSEから復帰する ] SoundManager.PlayTimer.NowTime = nStartTime; - TJAPlayer3.Timer.Reset(); // これでPAUSE解除されるので、3行先の再開()は不要 - TJAPlayer3.Timer.NowTime = nStartTime; // Debug表示のTime: 表記を正しくするために必要 + OpenTaiko.Timer.Reset(); // これでPAUSE解除されるので、3行先の再開()は不要 + OpenTaiko.Timer.NowTime = nStartTime; // Debug表示のTime: 表記を正しくするために必要 SoundManager.PlayTimer.Resume(); //CDTXMania.Timer.t再開(); this.bPAUSE = false; // システムがPAUSE状態だったら、強制解除 @@ -4778,7 +4778,7 @@ namespace TJAPlayer3 { protected abstract void t進行描画_演奏情報(); protected void t進行描画_演奏情報(int x, int y) { - if (!TJAPlayer3.ConfigIni.b演奏情報を表示しない) { + if (!OpenTaiko.ConfigIni.b演奏情報を表示しない) { this.actPlayInfo.t進行描画(x, y); } } @@ -4789,7 +4789,7 @@ namespace TJAPlayer3 { } protected void t進行描画_判定文字列1_通常位置指定の場合() { - if (((E判定文字表示位置)TJAPlayer3.ConfigIni.判定文字表示位置.Drums) != E判定文字表示位置.コンボ下) // 判定ライン上または横 + if (((E判定文字表示位置)OpenTaiko.ConfigIni.判定文字表示位置.Drums) != E判定文字表示位置.コンボ下) // 判定ライン上または横 { this.actJudgeString.Draw(); } @@ -4803,9 +4803,9 @@ namespace TJAPlayer3 { protected void t背景テクスチャの生成(string DefaultBgFilename, Rectangle bgrect, string bgfilename) { try { if (!String.IsNullOrEmpty(bgfilename)) - this.tx背景 = TJAPlayer3.tテクスチャの生成(TJAPlayer3.stageSongSelect.r確定されたスコア.ファイル情報.フォルダの絶対パス + bgfilename); + this.tx背景 = OpenTaiko.tテクスチャの生成(OpenTaiko.stageSongSelect.r確定されたスコア.ファイル情報.フォルダの絶対パス + bgfilename); else - this.tx背景 = TJAPlayer3.tテクスチャの生成(CSkin.Path(DefaultBgFilename)); + this.tx背景 = OpenTaiko.tテクスチャの生成(CSkin.Path(DefaultBgFilename)); } catch (Exception e) { Trace.TraceError(e.ToString()); Trace.TraceError("例外が発生しましたが処理を継続します。 (a80767e1-4de7-4fec-b072-d078b3659e62)"); @@ -4816,15 +4816,15 @@ namespace TJAPlayer3 { private int nDice = 0; public ENoteJudge AlterJudgement(int player, ENoteJudge judgement, bool reroll) { - int AILevel = TJAPlayer3.ConfigIni.nAILevel; - if (TJAPlayer3.ConfigIni.bAIBattleMode && player == 1) { + int AILevel = OpenTaiko.ConfigIni.nAILevel; + if (OpenTaiko.ConfigIni.bAIBattleMode && player == 1) { if (reroll) - nDice = TJAPlayer3.Random.Next(1000); + nDice = OpenTaiko.Random.Next(1000); - if (nDice < TJAPlayer3.ConfigIni.apAIPerformances[AILevel - 1].nBadOdds) + if (nDice < OpenTaiko.ConfigIni.apAIPerformances[AILevel - 1].nBadOdds) return ENoteJudge.Poor; - else if (nDice - TJAPlayer3.ConfigIni.apAIPerformances[AILevel - 1].nBadOdds - < TJAPlayer3.ConfigIni.apAIPerformances[AILevel - 1].nGoodOdds) + else if (nDice - OpenTaiko.ConfigIni.apAIPerformances[AILevel - 1].nBadOdds + < OpenTaiko.ConfigIni.apAIPerformances[AILevel - 1].nGoodOdds) return ENoteJudge.Good; } return judgement; @@ -4838,11 +4838,11 @@ namespace TJAPlayer3 { int nAddScore = 0; int[] n倍率 = { 0, 1, 2, 4, 8 }; - if (TJAPlayer3.DTX.nScoreModeTmp == 1) { + if (OpenTaiko.DTX.nScoreModeTmp == 1) { for (int i = 0; i < 11; i++) { this.nScore[i] = (int)(nInit + (nDiff * (i))); } - } else if (TJAPlayer3.DTX.nScoreModeTmp == 2) { + } else if (OpenTaiko.DTX.nScoreModeTmp == 2) { for (int i = 0; i < 5; i++) { this.nScore[i] = (int)(nInit + (nDiff * n倍率[i])); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/AIBattle.cs b/OpenTaiko/src/Stages/07.Game/Taiko/AIBattle.cs index a6e854ec..eaba3791 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/AIBattle.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/AIBattle.cs @@ -2,7 +2,7 @@ using FDK; // Minimalist menu class to use for custom menus -namespace TJAPlayer3 { +namespace OpenTaiko { class AIBattle : CStage { public AIBattle() { base.IsDeActivated = true; @@ -40,58 +40,58 @@ namespace TJAPlayer3 { BarFlashCounter.TickLoopDB(); BatchAnimeCounter.TickDB(); - TJAPlayer3.Tx.AIBattle_SectionTime_Panel?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Panel[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Panel[1]); + OpenTaiko.Tx.AIBattle_SectionTime_Panel?.t2D描画(OpenTaiko.Skin.Game_AIBattle_SectionTime_Panel[0], OpenTaiko.Skin.Game_AIBattle_SectionTime_Panel[1]); - TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[1], - new System.Drawing.RectangleF(0, 0, TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base.szTextureSize.Width, TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Base.szTextureSize.Height)); + OpenTaiko.Tx.AIBattle_SectionTime_Bar_Base?.t2D描画(OpenTaiko.Skin.Game_AIBattle_SectionTime_Bar[0], OpenTaiko.Skin.Game_AIBattle_SectionTime_Bar[1], + new System.Drawing.RectangleF(0, 0, OpenTaiko.Tx.AIBattle_SectionTime_Bar_Base.szTextureSize.Width, OpenTaiko.Tx.AIBattle_SectionTime_Bar_Base.szTextureSize.Height)); void drawBar(CTexture barTex, float length) { - barTex?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[0], TJAPlayer3.Skin.Game_AIBattle_SectionTime_Bar[1], + barTex?.t2D描画(OpenTaiko.Skin.Game_AIBattle_SectionTime_Bar[0], OpenTaiko.Skin.Game_AIBattle_SectionTime_Bar[1], new System.Drawing.RectangleF(0, 0, barTex.szTextureSize.Width * length, barTex.szTextureSize.Height)); } - var nowSection = TJAPlayer3.stage演奏ドラム画面.NowAIBattleSection; + var nowSection = OpenTaiko.stage演奏ドラム画面.NowAIBattleSection; - float nowLength = TJAPlayer3.stage演奏ドラム画面.NowAIBattleSectionTime / (float)nowSection.Length; + float nowLength = OpenTaiko.stage演奏ドラム画面.NowAIBattleSectionTime / (float)nowSection.Length; nowLength = Math.Min(nowLength, 1.0f); if (nowLength < 0.75) { - drawBar(TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Normal, nowLength); + drawBar(OpenTaiko.Tx.AIBattle_SectionTime_Bar_Normal, nowLength); } else { - TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Finish.Opacity = (int)(Math.Sin((BarFlashCounter.CurrentValue / 1000.0) * Math.PI) * 255); - drawBar(TJAPlayer3.Tx.AIBattle_SectionTime_Bar_Finish, nowLength); + OpenTaiko.Tx.AIBattle_SectionTime_Bar_Finish.Opacity = (int)(Math.Sin((BarFlashCounter.CurrentValue / 1000.0) * Math.PI) * 255); + drawBar(OpenTaiko.Tx.AIBattle_SectionTime_Bar_Finish, nowLength); } - for (int i = 0; i < TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count; i++) { + for (int i = 0; i < OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count; i++) { int upDown = (i % 2); - int base_width = TJAPlayer3.Tx.AIBattle_Batch_Base.szTextureSize.Width / 6; - int base_height = TJAPlayer3.Tx.AIBattle_Batch_Base.szTextureSize.Height; + int base_width = OpenTaiko.Tx.AIBattle_Batch_Base.szTextureSize.Width / 6; + int base_height = OpenTaiko.Tx.AIBattle_Batch_Base.szTextureSize.Height; - int base_x = TJAPlayer3.Skin.Game_AIBattle_Batch_Base[0] + (TJAPlayer3.Skin.Game_AIBattle_Batch_Move[0] * i); - int base_y = TJAPlayer3.Skin.Game_AIBattle_Batch_Base[1] + (TJAPlayer3.Skin.Game_AIBattle_Batch_Move[1] * upDown); + int base_x = OpenTaiko.Skin.Game_AIBattle_Batch_Base[0] + (OpenTaiko.Skin.Game_AIBattle_Batch_Move[0] * i); + int base_y = OpenTaiko.Skin.Game_AIBattle_Batch_Base[1] + (OpenTaiko.Skin.Game_AIBattle_Batch_Move[1] * upDown); int nowBatchBaseRectX; if (i == 0) { nowBatchBaseRectX = 2 + (upDown == 0 ? 0 : 1); - } else if (i == TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count - 1) { + } else if (i == OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count - 1) { nowBatchBaseRectX = 4 + (upDown == 0 ? 0 : 1); } else { nowBatchBaseRectX = (upDown == 0 ? 0 : 1); } - TJAPlayer3.Tx.AIBattle_Batch_Base?.t2D描画(base_x, base_y, new System.Drawing.RectangleF(base_width * nowBatchBaseRectX, 0, base_width, base_height)); + OpenTaiko.Tx.AIBattle_Batch_Base?.t2D描画(base_x, base_y, new System.Drawing.RectangleF(base_width * nowBatchBaseRectX, 0, base_width, base_height)); } - for (int i = 0; i < TJAPlayer3.stage演奏ドラム画面.NowAIBattleSectionCount; i++) { + for (int i = 0; i < OpenTaiko.stage演奏ドラム画面.NowAIBattleSectionCount; i++) { - var section = TJAPlayer3.stage演奏ドラム画面.AIBattleSections[i]; + var section = OpenTaiko.stage演奏ドラム画面.AIBattleSections[i]; int upDown = (i % 2); - int width = TJAPlayer3.Tx.AIBattle_Batch.szTextureSize.Width / 6; - int height = TJAPlayer3.Tx.AIBattle_Batch.szTextureSize.Height / 2; + int width = OpenTaiko.Tx.AIBattle_Batch.szTextureSize.Width / 6; + int height = OpenTaiko.Tx.AIBattle_Batch.szTextureSize.Height / 2; float value = 0.0f; @@ -114,58 +114,58 @@ namespace TJAPlayer3 { } } - float _x = TJAPlayer3.Skin.Game_AIBattle_Batch[0] + (TJAPlayer3.Skin.Game_AIBattle_Batch_Move[0] * i); - float _y = TJAPlayer3.Skin.Game_AIBattle_Batch[1] + (TJAPlayer3.Skin.Game_AIBattle_Batch_Move[1] * upDown); + float _x = OpenTaiko.Skin.Game_AIBattle_Batch[0] + (OpenTaiko.Skin.Game_AIBattle_Batch_Move[0] * i); + float _y = OpenTaiko.Skin.Game_AIBattle_Batch[1] + (OpenTaiko.Skin.Game_AIBattle_Batch_Move[1] * upDown); - _x = TJAPlayer3.Skin.Game_AIBattle_Batch_Anime[0] + ((_x - TJAPlayer3.Skin.Game_AIBattle_Batch_Anime[0]) * value); - _y = TJAPlayer3.Skin.Game_AIBattle_Batch_Anime[1] + ((_y - TJAPlayer3.Skin.Game_AIBattle_Batch_Anime[1]) * value); + _x = OpenTaiko.Skin.Game_AIBattle_Batch_Anime[0] + ((_x - OpenTaiko.Skin.Game_AIBattle_Batch_Anime[0]) * value); + _y = OpenTaiko.Skin.Game_AIBattle_Batch_Anime[1] + ((_y - OpenTaiko.Skin.Game_AIBattle_Batch_Anime[1]) * value); - float size_x = TJAPlayer3.Skin.Game_AIBattle_Batch_Anime_Size[0] + - ((TJAPlayer3.Skin.Game_AIBattle_Batch_Size[0] - TJAPlayer3.Skin.Game_AIBattle_Batch_Anime_Size[0]) * value); + float size_x = OpenTaiko.Skin.Game_AIBattle_Batch_Anime_Size[0] + + ((OpenTaiko.Skin.Game_AIBattle_Batch_Size[0] - OpenTaiko.Skin.Game_AIBattle_Batch_Anime_Size[0]) * value); - float size_y = TJAPlayer3.Skin.Game_AIBattle_Batch_Anime_Size[1] + - ((TJAPlayer3.Skin.Game_AIBattle_Batch_Size[1] - TJAPlayer3.Skin.Game_AIBattle_Batch_Anime_Size[1]) * value); + float size_y = OpenTaiko.Skin.Game_AIBattle_Batch_Anime_Size[1] + + ((OpenTaiko.Skin.Game_AIBattle_Batch_Size[1] - OpenTaiko.Skin.Game_AIBattle_Batch_Anime_Size[1]) * value); - TJAPlayer3.Tx.AIBattle_Batch.vcScaleRatio.X = (size_x / (float)width) + inScale; - TJAPlayer3.Tx.AIBattle_Batch.vcScaleRatio.Y = (size_y / (float)height) + inScale; + OpenTaiko.Tx.AIBattle_Batch.vcScaleRatio.X = (size_x / (float)width) + inScale; + OpenTaiko.Tx.AIBattle_Batch.vcScaleRatio.Y = (size_y / (float)height) + inScale; switch (section.End) { case CStage演奏画面共通.AIBattleSection.EndType.Clear: - TJAPlayer3.Tx.AIBattle_Batch?.t2D拡大率考慮中央基準描画(_x, _y, new System.Drawing.RectangleF(width * drawFrame, 0, width, height)); + OpenTaiko.Tx.AIBattle_Batch?.t2D拡大率考慮中央基準描画(_x, _y, new System.Drawing.RectangleF(width * drawFrame, 0, width, height)); break; case CStage演奏画面共通.AIBattleSection.EndType.Lose: - TJAPlayer3.Tx.AIBattle_Batch?.t2D拡大率考慮中央基準描画(_x, _y, new System.Drawing.RectangleF(width * drawFrame, height, width, height)); + OpenTaiko.Tx.AIBattle_Batch?.t2D拡大率考慮中央基準描画(_x, _y, new System.Drawing.RectangleF(width * drawFrame, height, width, height)); break; } } for (int player = 0; player < 2; player++) { - TJAPlayer3.Tx.AIBattle_Judge_Meter[player]?.t2D描画(TJAPlayer3.Skin.Game_AIBattle_Judge_Meter_X[player], TJAPlayer3.Skin.Game_AIBattle_Judge_Meter_Y[player]); + OpenTaiko.Tx.AIBattle_Judge_Meter[player]?.t2D描画(OpenTaiko.Skin.Game_AIBattle_Judge_Meter_X[player], OpenTaiko.Skin.Game_AIBattle_Judge_Meter_Y[player]); int[] numArr = new int[4] { - TJAPlayer3.stage演奏ドラム画面.CSectionScore[player].nGreat, - TJAPlayer3.stage演奏ドラム画面.CSectionScore[player].nGood, - TJAPlayer3.stage演奏ドラム画面.CSectionScore[player].nMiss, - TJAPlayer3.stage演奏ドラム画面.CSectionScore[player].nRoll + OpenTaiko.stage演奏ドラム画面.CSectionScore[player].nGreat, + OpenTaiko.stage演奏ドラム画面.CSectionScore[player].nGood, + OpenTaiko.stage演奏ドラム画面.CSectionScore[player].nMiss, + OpenTaiko.stage演奏ドラム画面.CSectionScore[player].nRoll }; int[] num_x = new int[4] { - TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Perfect_X[player], - TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Good_X[player], - TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Miss_X[player], - TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Roll_X[player] + OpenTaiko.Skin.Game_AIBattle_Judge_Number_Perfect_X[player], + OpenTaiko.Skin.Game_AIBattle_Judge_Number_Good_X[player], + OpenTaiko.Skin.Game_AIBattle_Judge_Number_Miss_X[player], + OpenTaiko.Skin.Game_AIBattle_Judge_Number_Roll_X[player] }; int[] num_y = new int[4] { - TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Perfect_Y[player], - TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Good_Y[player], - TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Miss_Y[player], - TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Roll_Y[player] + OpenTaiko.Skin.Game_AIBattle_Judge_Number_Perfect_Y[player], + OpenTaiko.Skin.Game_AIBattle_Judge_Number_Good_Y[player], + OpenTaiko.Skin.Game_AIBattle_Judge_Number_Miss_Y[player], + OpenTaiko.Skin.Game_AIBattle_Judge_Number_Roll_Y[player] }; for (int i = 0; i < 4; i++) { @@ -187,13 +187,13 @@ namespace TJAPlayer3 { for (int j = 0; j < nums.Length; j++) { float offset = j - (nums.Length / 2.0f); - float width = TJAPlayer3.Tx.AIBattle_Judge_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.AIBattle_Judge_Number.sz画像サイズ.Height; + float width = OpenTaiko.Tx.AIBattle_Judge_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.AIBattle_Judge_Number.sz画像サイズ.Height; - float _x = x - (TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Interval[0] * offset); - float _y = y - (TJAPlayer3.Skin.Game_AIBattle_Judge_Number_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.Game_AIBattle_Judge_Number_Interval[0] * offset); + float _y = y - (OpenTaiko.Skin.Game_AIBattle_Judge_Number_Interval[1] * offset); - TJAPlayer3.Tx.AIBattle_Judge_Number.t2D拡大率考慮中央基準描画(_x + (width / 2), _y + (height / 2), + OpenTaiko.Tx.AIBattle_Judge_Number.t2D拡大率考慮中央基準描画(_x + (width / 2), _y + (height / 2), new RectangleF(width * nums[j], 0, width, height)); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplBackground.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplBackground.cs index fbc9d1bb..1f00c485 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplBackground.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplBackground.cs @@ -1,9 +1,9 @@ using FDK; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; using Color = System.Drawing.Color; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplBackground : CActivity { // 本家っぽい背景を表示させるメソッド。 // @@ -44,11 +44,11 @@ namespace TJAPlayer3 { var bgOrigindir = CSkin.Path($"{TextureLoader.BASE}{TextureLoader.GAME}{TextureLoader.BACKGROUND}"); var preset = HScenePreset.GetBGPreset(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { bgOrigindir += "Tower"; - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { bgOrigindir += "Dan"; - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { bgOrigindir += "AI"; } else { bgOrigindir += "Normal"; @@ -90,7 +90,7 @@ namespace TJAPlayer3 { IsDownNotFound = true; } - this.pfTowerText = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Game_Tower_Font_TowerText); + this.pfTowerText = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Game_Tower_Font_TowerText); /* if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) @@ -106,54 +106,54 @@ namespace TJAPlayer3 { this.ttkTouTatsuKaiSuu = new TitleTextureKey(CLangManager.LangInstance.GetString("TOWER_FLOOR_REACHED"), pfTowerText, Color.White, Color.Black, 700); this.ttkKai = new TitleTextureKey(CLangManager.LangInstance.GetString("TOWER_FLOOR_INITIAL"), pfTowerText, Color.White, Color.Black, 700); - this.ct炎 = new CCounter(0, 6, 50, TJAPlayer3.Timer); + this.ct炎 = new CCounter(0, 6, 50, OpenTaiko.Timer); - this.currentCharacter = Math.Max(0, Math.Min(TJAPlayer3.SaveFileInstances[0].data.Character, TJAPlayer3.Skin.Characters_Ptn - 1)); + this.currentCharacter = Math.Max(0, Math.Min(OpenTaiko.SaveFileInstances[0].data.Character, OpenTaiko.Skin.Characters_Ptn - 1)); - float resolutionScaleX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[currentCharacter][0]; - float resolutionScaleY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[currentCharacter][1]; + float resolutionScaleX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[currentCharacter][0]; + float resolutionScaleY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[currentCharacter][1]; // Scale tower chara - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Standing[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Standing[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Climbing[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Climbing[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Running[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Running[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Clear[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Clear[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Fail[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Fail[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Standing_Tired[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Standing_Tired[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Climbing_Tired[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Climbing_Tired[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Running_Tired[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Running_Tired[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } - foreach (CTexture texture in TJAPlayer3.Tx.Characters_Tower_Clear_Tired[currentCharacter]) { + foreach (CTexture texture in OpenTaiko.Tx.Characters_Tower_Clear_Tired[currentCharacter]) { texture.vcScaleRatio.X = resolutionScaleX; texture.vcScaleRatio.Y = resolutionScaleY; } this.ctSlideAnimation = new CCounter(); this.ctClimbDuration = new CCounter(); - this.ctStandingAnimation = new CCounter(0, 1000, (60000f / (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) * TJAPlayer3.Skin.Characters_Beat_Tower_Standing[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[currentCharacter], TJAPlayer3.Timer); + this.ctStandingAnimation = new CCounter(0, 1000, (60000f / (float)(OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * OpenTaiko.ConfigIni.SongPlaybackSpeed)) * OpenTaiko.Skin.Characters_Beat_Tower_Standing[currentCharacter] / OpenTaiko.Skin.Characters_Tower_Standing_Ptn[currentCharacter], OpenTaiko.Timer); this.ctClimbingAnimation = new CCounter(); this.ctRunningAnimation = new CCounter(); this.ctClearAnimation = new CCounter(); @@ -172,10 +172,10 @@ namespace TJAPlayer3 { if (this.IsDeActivated) return; - TJAPlayer3.tDisposeSafely(ref UpScript); - TJAPlayer3.tDisposeSafely(ref DownScript); + OpenTaiko.tDisposeSafely(ref UpScript); + OpenTaiko.tDisposeSafely(ref DownScript); - TJAPlayer3.tDisposeSafely(ref pfTowerText); + OpenTaiko.tDisposeSafely(ref pfTowerText); base.DeActivate(); } @@ -207,25 +207,25 @@ namespace TJAPlayer3 { #region [Upper background] if (!IsUpNotFound) { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) UpScript?.Update(); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) UpScript?.Update(); UpScript?.Draw(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { #region [Tower animations variables] - this.bFloorChanged = CFloorManagement.LastRegisteredFloor > 0 && (CFloorManagement.LastRegisteredFloor < TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1); + this.bFloorChanged = CFloorManagement.LastRegisteredFloor > 0 && (CFloorManagement.LastRegisteredFloor < OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1); - int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; + int maxFloor = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; int nightTime = Math.Max(140, maxFloor / 2); - currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); + currentFloorPositionMax140 = Math.Min(OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); #endregion #region [Tower background informations] - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { - TitleTextureKey.ResolveTitleTexture(ttkTouTatsuKaiSuu).t2D描画(TJAPlayer3.Skin.Game_Tower_Font_TouTatsuKaiSuu[0], TJAPlayer3.Skin.Game_Tower_Font_TouTatsuKaiSuu[1]); - TitleTextureKey.ResolveTitleTexture(ttkKai).t2D描画(TJAPlayer3.Skin.Game_Tower_Font_Kai[0], TJAPlayer3.Skin.Game_Tower_Font_Kai[1]); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + TitleTextureKey.ResolveTitleTexture(ttkTouTatsuKaiSuu).t2D描画(OpenTaiko.Skin.Game_Tower_Font_TouTatsuKaiSuu[0], OpenTaiko.Skin.Game_Tower_Font_TouTatsuKaiSuu[1]); + TitleTextureKey.ResolveTitleTexture(ttkKai).t2D描画(OpenTaiko.Skin.Game_Tower_Font_Kai[0], OpenTaiko.Skin.Game_Tower_Font_Kai[1]); this.ct炎.TickLoop(); CFloorManagement.loopFrames(); @@ -233,38 +233,38 @@ namespace TJAPlayer3 { #region [Floor number] if (CFloorManagement.CurrentNumberOfLives > 0) - CFloorManagement.LastRegisteredFloor = TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1; + CFloorManagement.LastRegisteredFloor = OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1; string floorStr = CFloorManagement.LastRegisteredFloor.ToString(); int len = floorStr.Length; - int digitLength = TJAPlayer3.Tx.Taiko_Combo[0].szTextureSize.Width / 10; + int digitLength = OpenTaiko.Tx.Taiko_Combo[0].szTextureSize.Width / 10; - TJAPlayer3.Tx.Taiko_Combo[0].color4 = new Color4(1f, 0.6f, 0.2f, 1f); - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = 1.4f; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1.4f; + OpenTaiko.Tx.Taiko_Combo[0].color4 = new Color4(1f, 0.6f, 0.2f, 1f); + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.X = 1.4f; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1.4f; for (int idx = len - 1; idx >= 0; idx--) { int currentNum = int.Parse(floorStr[idx].ToString()); - TJAPlayer3.Tx.Taiko_Combo[0].t2D描画(TJAPlayer3.Skin.Game_Tower_Floor_Number[0] - ((digitLength - 8) * (len - idx) * 1.4f), - TJAPlayer3.Skin.Game_Tower_Floor_Number[1], + OpenTaiko.Tx.Taiko_Combo[0].t2D描画(OpenTaiko.Skin.Game_Tower_Floor_Number[0] - ((digitLength - 8) * (len - idx) * 1.4f), + OpenTaiko.Skin.Game_Tower_Floor_Number[1], new Rectangle(digitLength * currentNum, 0, - digitLength, TJAPlayer3.Tx.Taiko_Combo[0].szTextureSize.Height)); + digitLength, OpenTaiko.Tx.Taiko_Combo[0].szTextureSize.Height)); } #endregion #region [Life Tamashii icon] - int soulfire_width = TJAPlayer3.Tx.Gauge_Soul_Fire.szTextureSize.Width / 8; - int soulfire_height = TJAPlayer3.Tx.Gauge_Soul_Fire.szTextureSize.Height; + int soulfire_width = OpenTaiko.Tx.Gauge_Soul_Fire.szTextureSize.Width / 8; + int soulfire_height = OpenTaiko.Tx.Gauge_Soul_Fire.szTextureSize.Height; - int soul_height = TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Height / 2; + int soul_height = OpenTaiko.Tx.Gauge_Soul.szTextureSize.Height / 2; - TJAPlayer3.Tx.Gauge_Soul_Fire?.t2D描画(TJAPlayer3.Skin.Gauge_Soul_Fire_X_Tower, TJAPlayer3.Skin.Gauge_Soul_Fire_Y_Tower, new Rectangle(soulfire_width * (this.ct炎.CurrentValue), 0, soulfire_width, soulfire_height)); - TJAPlayer3.Tx.Gauge_Soul?.t2D描画(TJAPlayer3.Skin.Gauge_Soul_X_Tower, TJAPlayer3.Skin.Gauge_Soul_Y_Tower, new Rectangle(0, soul_height, TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Width, soul_height)); + OpenTaiko.Tx.Gauge_Soul_Fire?.t2D描画(OpenTaiko.Skin.Gauge_Soul_Fire_X_Tower, OpenTaiko.Skin.Gauge_Soul_Fire_Y_Tower, new Rectangle(soulfire_width * (this.ct炎.CurrentValue), 0, soulfire_width, soulfire_height)); + OpenTaiko.Tx.Gauge_Soul?.t2D描画(OpenTaiko.Skin.Gauge_Soul_X_Tower, OpenTaiko.Skin.Gauge_Soul_Y_Tower, new Rectangle(0, soul_height, OpenTaiko.Tx.Gauge_Soul.szTextureSize.Width, soul_height)); #endregion @@ -286,20 +286,20 @@ namespace TJAPlayer3 { : ((lifeRatio >= 0.2f && !lifeSpecialCase) ? new Color4(1f, 1f, 0.2f, 1f) : new Color4(1f, 0.2f, 0.2f, 1f)); - TJAPlayer3.Tx.Taiko_Combo[0].color4 = lifeColor; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = 1.1f; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1.1f; + OpenTaiko.Tx.Taiko_Combo[0].color4 = lifeColor; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.X = 1.1f; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1.1f; for (int idx = 0; idx < len; idx++) { int currentNum = int.Parse(lifeStr[len - idx - 1].ToString()); - TJAPlayer3.Tx.Taiko_Combo[0].t2D描画(TJAPlayer3.Skin.Game_Tower_Life_Number[0] + ((digitLength - 8) * (len - idx) * 1.1f), - TJAPlayer3.Skin.Game_Tower_Life_Number[1], + OpenTaiko.Tx.Taiko_Combo[0].t2D描画(OpenTaiko.Skin.Game_Tower_Life_Number[0] + ((digitLength - 8) * (len - idx) * 1.1f), + OpenTaiko.Skin.Game_Tower_Life_Number[1], new Rectangle(digitLength * currentNum, 0, - digitLength, TJAPlayer3.Tx.Taiko_Combo[0].szTextureSize.Height)); + digitLength, OpenTaiko.Tx.Taiko_Combo[0].szTextureSize.Height)); } - TJAPlayer3.Tx.Taiko_Combo[0].color4 = new Color4(1f, 1f, 1f, 1f); + OpenTaiko.Tx.Taiko_Combo[0].color4 = new Color4(1f, 1f, 1f, 1f); #endregion @@ -314,24 +314,24 @@ namespace TJAPlayer3 { #region [Lower background] - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { - int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + int maxFloor = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; - TJAPlayer3.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, maxFloor.ToString()); + OpenTaiko.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, maxFloor.ToString()); int nightTime = Math.Max(140, maxFloor / 2); - int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType); + int currentTowerType = Array.IndexOf(OpenTaiko.Skin.Game_Tower_Names, OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType); - if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn) + if (currentTowerType < 0 || currentTowerType >= OpenTaiko.Skin.Game_Tower_Ptn) currentTowerType = 0; #region [Tower lower background] - float nextPositionMax140 = Math.Min((TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1) / (float)nightTime, 1f); + float nextPositionMax140 = Math.Min((OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1) / (float)nightTime, 1f); if (bFloorChanged == true) - ctSlideAnimation.Start(0, 1000, 120f / ((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.SongPlaybackSpeed), TJAPlayer3.Timer); + ctSlideAnimation.Start(0, 1000, 120f / ((float)OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * OpenTaiko.ConfigIni.SongPlaybackSpeed), OpenTaiko.Timer); float progressFactor = (nextPositionMax140 - currentFloorPositionMax140) * (ctSlideAnimation.CurrentValue / 1000f); @@ -344,7 +344,7 @@ namespace TJAPlayer3 { //TJAPlayer3.Tx.Tower_Sky_Gradient?.t2D描画(TJAPlayer3.Skin.Game_Tower_Sky_Gradient[0], TJAPlayer3.Skin.Game_Tower_Sky_Gradient[1], //new Rectangle(0, skyboxYPosition, TJAPlayer3.Skin.Game_Tower_Sky_Gradient_Size[0], TJAPlayer3.Skin.Game_Tower_Sky_Gradient_Size[1])); - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) DownScript.Update(); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) DownScript.Update(); DownScript.Draw(); #endregion @@ -357,56 +357,56 @@ namespace TJAPlayer3 { int currentTower = currentTowerType; // Will implement the roof later, need the beforehand total floor count calculation before - int nextTowerBase = ((TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1) / 10) % TJAPlayer3.Skin.Game_Tower_Ptn_Base[currentTower]; - int towerBase = (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / 10) % TJAPlayer3.Skin.Game_Tower_Ptn_Base[currentTower]; + int nextTowerBase = ((OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1) / 10) % OpenTaiko.Skin.Game_Tower_Ptn_Base[currentTower]; + int towerBase = (OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / 10) % OpenTaiko.Skin.Game_Tower_Ptn_Base[currentTower]; - int currentDeco = TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] % TJAPlayer3.Skin.Game_Tower_Ptn_Deco[currentTower]; - int nextDeco = (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1) % TJAPlayer3.Skin.Game_Tower_Ptn_Deco[currentTower]; + int currentDeco = OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] % OpenTaiko.Skin.Game_Tower_Ptn_Deco[currentTower]; + int nextDeco = (OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1) % OpenTaiko.Skin.Game_Tower_Ptn_Deco[currentTower]; // Microfix for the first floor suddenly changing texture - if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] == 0 && TJAPlayer3.Skin.Game_Tower_Ptn_Deco[currentTower] > 1) + if (OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] == 0 && OpenTaiko.Skin.Game_Tower_Ptn_Deco[currentTower] > 1) currentDeco++; - if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] == 0 && TJAPlayer3.Skin.Game_Tower_Ptn_Base[currentTower] > 1) + if (OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] == 0 && OpenTaiko.Skin.Game_Tower_Ptn_Base[currentTower] > 1) towerBase++; - int widthChange = (int)(progressFactor * TJAPlayer3.Skin.Game_Tower_Floors_Move[0]); - int heightChange = (int)(progressFactor * TJAPlayer3.Skin.Game_Tower_Floors_Move[1]); + int widthChange = (int)(progressFactor * OpenTaiko.Skin.Game_Tower_Floors_Move[0]); + int heightChange = (int)(progressFactor * OpenTaiko.Skin.Game_Tower_Floors_Move[1]); // Current trunk - if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] < maxFloor) - TJAPlayer3.Tx.Tower_Base[currentTower][towerBase]?.t2D下中央基準描画( - TJAPlayer3.Skin.Game_Tower_Floors_Body[0] + widthChange, - TJAPlayer3.Skin.Game_Tower_Floors_Body[1] + heightChange); // 316 + 360 + if (OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] < maxFloor) + OpenTaiko.Tx.Tower_Base[currentTower][towerBase]?.t2D下中央基準描画( + OpenTaiko.Skin.Game_Tower_Floors_Body[0] + widthChange, + OpenTaiko.Skin.Game_Tower_Floors_Body[1] + heightChange); // 316 + 360 else - TJAPlayer3.Tx.Tower_Top[currentTower]?.t2D下中央基準描画( - TJAPlayer3.Skin.Game_Tower_Floors_Body[0] + widthChange, - TJAPlayer3.Skin.Game_Tower_Floors_Body[1] + heightChange); + OpenTaiko.Tx.Tower_Top[currentTower]?.t2D下中央基準描画( + OpenTaiko.Skin.Game_Tower_Floors_Body[0] + widthChange, + OpenTaiko.Skin.Game_Tower_Floors_Body[1] + heightChange); // Current deco - TJAPlayer3.Tx.Tower_Deco[currentTower][currentDeco]?.t2D下中央基準描画( - TJAPlayer3.Skin.Game_Tower_Floors_Deco[0] + widthChange, - TJAPlayer3.Skin.Game_Tower_Floors_Deco[1] + heightChange); + OpenTaiko.Tx.Tower_Deco[currentTower][currentDeco]?.t2D下中央基準描画( + OpenTaiko.Skin.Game_Tower_Floors_Deco[0] + widthChange, + OpenTaiko.Skin.Game_Tower_Floors_Deco[1] + heightChange); - int originY = TJAPlayer3.Skin.Game_Tower_Floors_Move[1] - heightChange; + int originY = OpenTaiko.Skin.Game_Tower_Floors_Move[1] - heightChange; // Next trunk - if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1 < maxFloor) - TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase]?.t2D下中央基準描画( - TJAPlayer3.Skin.Game_Tower_Floors_Body[0] - TJAPlayer3.Skin.Game_Tower_Floors_Move[0] + widthChange, - TJAPlayer3.Skin.Game_Tower_Floors_Body[1] - TJAPlayer3.Skin.Game_Tower_Floors_Move[1] + heightChange, - new Rectangle(0, originY, TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase].szTextureSize.Width, TJAPlayer3.Tx.Tower_Base[currentTower][nextTowerBase].szTextureSize.Height - originY)); - else if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1 == maxFloor) { - TJAPlayer3.Tx.Tower_Top[currentTower]?.t2D下中央基準描画( - TJAPlayer3.Skin.Game_Tower_Floors_Body[0] - TJAPlayer3.Skin.Game_Tower_Floors_Move[0] + widthChange, - TJAPlayer3.Skin.Game_Tower_Floors_Body[1] - TJAPlayer3.Skin.Game_Tower_Floors_Move[1] + heightChange, - new Rectangle(0, originY, TJAPlayer3.Tx.Tower_Top[currentTower].szTextureSize.Width, TJAPlayer3.Tx.Tower_Top[currentTower].szTextureSize.Height - originY)); + if (OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1 < maxFloor) + OpenTaiko.Tx.Tower_Base[currentTower][nextTowerBase]?.t2D下中央基準描画( + OpenTaiko.Skin.Game_Tower_Floors_Body[0] - OpenTaiko.Skin.Game_Tower_Floors_Move[0] + widthChange, + OpenTaiko.Skin.Game_Tower_Floors_Body[1] - OpenTaiko.Skin.Game_Tower_Floors_Move[1] + heightChange, + new Rectangle(0, originY, OpenTaiko.Tx.Tower_Base[currentTower][nextTowerBase].szTextureSize.Width, OpenTaiko.Tx.Tower_Base[currentTower][nextTowerBase].szTextureSize.Height - originY)); + else if (OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1 == maxFloor) { + OpenTaiko.Tx.Tower_Top[currentTower]?.t2D下中央基準描画( + OpenTaiko.Skin.Game_Tower_Floors_Body[0] - OpenTaiko.Skin.Game_Tower_Floors_Move[0] + widthChange, + OpenTaiko.Skin.Game_Tower_Floors_Body[1] - OpenTaiko.Skin.Game_Tower_Floors_Move[1] + heightChange, + new Rectangle(0, originY, OpenTaiko.Tx.Tower_Top[currentTower].szTextureSize.Width, OpenTaiko.Tx.Tower_Top[currentTower].szTextureSize.Height - originY)); } // Next deco - if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1 <= maxFloor) - TJAPlayer3.Tx.Tower_Deco[currentTower][nextDeco]?.t2D下中央基準描画( - TJAPlayer3.Skin.Game_Tower_Floors_Deco[0] - TJAPlayer3.Skin.Game_Tower_Floors_Move[0] + widthChange, - TJAPlayer3.Skin.Game_Tower_Floors_Deco[1] - TJAPlayer3.Skin.Game_Tower_Floors_Move[1] + heightChange); + if (OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] + 1 <= maxFloor) + OpenTaiko.Tx.Tower_Deco[currentTower][nextDeco]?.t2D下中央基準描画( + OpenTaiko.Skin.Game_Tower_Floors_Deco[0] - OpenTaiko.Skin.Game_Tower_Floors_Move[0] + widthChange, + OpenTaiko.Skin.Game_Tower_Floors_Deco[1] - OpenTaiko.Skin.Game_Tower_Floors_Move[1] + heightChange); #endregion @@ -415,90 +415,90 @@ namespace TJAPlayer3 { bool ctIsTired = !((CFloorManagement.CurrentNumberOfLives / (float)CFloorManagement.MaxNumberOfLives) >= 0.2f && !(CFloorManagement.CurrentNumberOfLives == 1 && CFloorManagement.MaxNumberOfLives != 1)); - bool stageEnded = TJAPlayer3.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_EndStage || TJAPlayer3.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_STAGE_CLEAR_FadeOut || CFloorManagement.CurrentNumberOfLives == 0; + bool stageEnded = OpenTaiko.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_EndStage || OpenTaiko.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_STAGE_CLEAR_FadeOut || CFloorManagement.CurrentNumberOfLives == 0; if (bFloorChanged == true) { - float floorBPM = (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.SongPlaybackSpeed); - ctClimbDuration.Start(0, 1500, 120f / floorBPM, TJAPlayer3.Timer); - ctStandingAnimation.Start(0, 1000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Standing[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[currentCharacter], TJAPlayer3.Timer); - ctClimbingAnimation.Start(0, 1000, (120000f / floorBPM) / TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[currentCharacter], TJAPlayer3.Timer); - ctRunningAnimation.Start(0, 1000, (60000f / floorBPM) / TJAPlayer3.Skin.Characters_Tower_Running_Ptn[currentCharacter], TJAPlayer3.Timer); - ctStandTiredAnimation.Start(0, 1000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Standing_Tired[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Standing_Tired_Ptn[currentCharacter], TJAPlayer3.Timer); - ctClimbTiredAnimation.Start(0, 1000, (120000f / floorBPM) / TJAPlayer3.Skin.Characters_Tower_Climbing_Tired_Ptn[currentCharacter], TJAPlayer3.Timer); - ctRunTiredAnimation.Start(0, 1000, (60000f / floorBPM) / TJAPlayer3.Skin.Characters_Tower_Running_Tired_Ptn[currentCharacter], TJAPlayer3.Timer); + float floorBPM = (float)(OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * OpenTaiko.ConfigIni.SongPlaybackSpeed); + ctClimbDuration.Start(0, 1500, 120f / floorBPM, OpenTaiko.Timer); + ctStandingAnimation.Start(0, 1000, (60000f / floorBPM) * OpenTaiko.Skin.Characters_Beat_Tower_Standing[currentCharacter] / OpenTaiko.Skin.Characters_Tower_Standing_Ptn[currentCharacter], OpenTaiko.Timer); + ctClimbingAnimation.Start(0, 1000, (120000f / floorBPM) / OpenTaiko.Skin.Characters_Tower_Climbing_Ptn[currentCharacter], OpenTaiko.Timer); + ctRunningAnimation.Start(0, 1000, (60000f / floorBPM) / OpenTaiko.Skin.Characters_Tower_Running_Ptn[currentCharacter], OpenTaiko.Timer); + ctStandTiredAnimation.Start(0, 1000, (60000f / floorBPM) * OpenTaiko.Skin.Characters_Beat_Tower_Standing_Tired[currentCharacter] / OpenTaiko.Skin.Characters_Tower_Standing_Tired_Ptn[currentCharacter], OpenTaiko.Timer); + ctClimbTiredAnimation.Start(0, 1000, (120000f / floorBPM) / OpenTaiko.Skin.Characters_Tower_Climbing_Tired_Ptn[currentCharacter], OpenTaiko.Timer); + ctRunTiredAnimation.Start(0, 1000, (60000f / floorBPM) / OpenTaiko.Skin.Characters_Tower_Running_Tired_Ptn[currentCharacter], OpenTaiko.Timer); } bool isClimbing = ctClimbDuration.CurrentValue > 0 && ctClimbDuration.CurrentValue < 1500; if (stageEnded && !TowerFinished && !isClimbing) { - float floorBPM = (float)(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * TJAPlayer3.ConfigIni.SongPlaybackSpeed); - ctClearAnimation.Start(0, 20000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Clear[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[currentCharacter], TJAPlayer3.Timer); - ctClearTiredAnimation.Start(0, 20000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Clear_Tired[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter], TJAPlayer3.Timer); - ctFailAnimation.Start(0, 20000, (60000f / floorBPM) * TJAPlayer3.Skin.Characters_Beat_Tower_Fail[currentCharacter] / TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[currentCharacter], TJAPlayer3.Timer); + float floorBPM = (float)(OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[0] * OpenTaiko.ConfigIni.SongPlaybackSpeed); + ctClearAnimation.Start(0, 20000, (60000f / floorBPM) * OpenTaiko.Skin.Characters_Beat_Tower_Clear[currentCharacter] / OpenTaiko.Skin.Characters_Tower_Clear_Ptn[currentCharacter], OpenTaiko.Timer); + ctClearTiredAnimation.Start(0, 20000, (60000f / floorBPM) * OpenTaiko.Skin.Characters_Beat_Tower_Clear_Tired[currentCharacter] / OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter], OpenTaiko.Timer); + ctFailAnimation.Start(0, 20000, (60000f / floorBPM) * OpenTaiko.Skin.Characters_Beat_Tower_Fail[currentCharacter] / OpenTaiko.Skin.Characters_Tower_Fail_Ptn[currentCharacter], OpenTaiko.Timer); TowerFinished = true; } if (isClimbing) { // Tired Climb - if (ctIsTired && (ctClimbDuration.CurrentValue <= 1000) && TJAPlayer3.Skin.Characters_Tower_Climbing_Tired_Ptn[currentCharacter] > 0) { - int animChar = ctClimbTiredAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[currentCharacter]; - int distDonX = (int)(ctClimbDuration.CurrentValue * (TJAPlayer3.Skin.Game_Tower_Don_Move[0] / 1000f)); - int distDonY = (int)(ctClimbDuration.CurrentValue * (TJAPlayer3.Skin.Game_Tower_Don_Move[1] / 1000f)); - TJAPlayer3.Tx.Characters_Tower_Climbing_Tired[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0] + distDonX, TJAPlayer3.Skin.Game_Tower_Don[1] + distDonY); + if (ctIsTired && (ctClimbDuration.CurrentValue <= 1000) && OpenTaiko.Skin.Characters_Tower_Climbing_Tired_Ptn[currentCharacter] > 0) { + int animChar = ctClimbTiredAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Climbing_Ptn[currentCharacter]; + int distDonX = (int)(ctClimbDuration.CurrentValue * (OpenTaiko.Skin.Game_Tower_Don_Move[0] / 1000f)); + int distDonY = (int)(ctClimbDuration.CurrentValue * (OpenTaiko.Skin.Game_Tower_Don_Move[1] / 1000f)); + OpenTaiko.Tx.Characters_Tower_Climbing_Tired[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0] + distDonX, OpenTaiko.Skin.Game_Tower_Don[1] + distDonY); } // Tired Run - else if (ctIsTired && (ctClimbDuration.CurrentValue > 1000 && ctClimbDuration.CurrentValue < 1500) && TJAPlayer3.Skin.Characters_Tower_Running_Tired_Ptn[currentCharacter] > 0) { - int animChar = ctRunTiredAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Running_Ptn[currentCharacter]; - int distDonX = (int)((1500 - ctClimbDuration.CurrentValue) * (TJAPlayer3.Skin.Game_Tower_Don_Move[0] / 500f)); - int distDonY = (int)((1500 - ctClimbDuration.CurrentValue) * (TJAPlayer3.Skin.Game_Tower_Don_Move[1] / 500f)); - TJAPlayer3.Tx.Characters_Tower_Running_Tired[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0] + distDonX, TJAPlayer3.Skin.Game_Tower_Don[1] + distDonY); + else if (ctIsTired && (ctClimbDuration.CurrentValue > 1000 && ctClimbDuration.CurrentValue < 1500) && OpenTaiko.Skin.Characters_Tower_Running_Tired_Ptn[currentCharacter] > 0) { + int animChar = ctRunTiredAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Running_Ptn[currentCharacter]; + int distDonX = (int)((1500 - ctClimbDuration.CurrentValue) * (OpenTaiko.Skin.Game_Tower_Don_Move[0] / 500f)); + int distDonY = (int)((1500 - ctClimbDuration.CurrentValue) * (OpenTaiko.Skin.Game_Tower_Don_Move[1] / 500f)); + OpenTaiko.Tx.Characters_Tower_Running_Tired[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0] + distDonX, OpenTaiko.Skin.Game_Tower_Don[1] + distDonY); } // Climb - else if ((ctClimbDuration.CurrentValue <= 1000) && TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[currentCharacter] > 0) { - int animChar = ctClimbingAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Climbing_Ptn[currentCharacter]; - int distDonX = (int)(ctClimbDuration.CurrentValue * (TJAPlayer3.Skin.Game_Tower_Don_Move[0] / 1000f)); - int distDonY = (int)(ctClimbDuration.CurrentValue * (TJAPlayer3.Skin.Game_Tower_Don_Move[1] / 1000f)); - TJAPlayer3.Tx.Characters_Tower_Climbing[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0] + distDonX, TJAPlayer3.Skin.Game_Tower_Don[1] + distDonY); + else if ((ctClimbDuration.CurrentValue <= 1000) && OpenTaiko.Skin.Characters_Tower_Climbing_Ptn[currentCharacter] > 0) { + int animChar = ctClimbingAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Climbing_Ptn[currentCharacter]; + int distDonX = (int)(ctClimbDuration.CurrentValue * (OpenTaiko.Skin.Game_Tower_Don_Move[0] / 1000f)); + int distDonY = (int)(ctClimbDuration.CurrentValue * (OpenTaiko.Skin.Game_Tower_Don_Move[1] / 1000f)); + OpenTaiko.Tx.Characters_Tower_Climbing[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0] + distDonX, OpenTaiko.Skin.Game_Tower_Don[1] + distDonY); } // Run - else if ((ctClimbDuration.CurrentValue > 1000 && ctClimbDuration.CurrentValue < 1500) && TJAPlayer3.Skin.Characters_Tower_Running_Ptn[currentCharacter] > 0) { - int animChar = ctRunningAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Running_Ptn[currentCharacter]; - int distDonX = (int)((1500 - ctClimbDuration.CurrentValue) * (TJAPlayer3.Skin.Game_Tower_Don_Move[0] / 500f)); - int distDonY = (int)((1500 - ctClimbDuration.CurrentValue) * (TJAPlayer3.Skin.Game_Tower_Don_Move[1] / 500f)); - TJAPlayer3.Tx.Characters_Tower_Running[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0] + distDonX, TJAPlayer3.Skin.Game_Tower_Don[1] + distDonY); + else if ((ctClimbDuration.CurrentValue > 1000 && ctClimbDuration.CurrentValue < 1500) && OpenTaiko.Skin.Characters_Tower_Running_Ptn[currentCharacter] > 0) { + int animChar = ctRunningAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Running_Ptn[currentCharacter]; + int distDonX = (int)((1500 - ctClimbDuration.CurrentValue) * (OpenTaiko.Skin.Game_Tower_Don_Move[0] / 500f)); + int distDonY = (int)((1500 - ctClimbDuration.CurrentValue) * (OpenTaiko.Skin.Game_Tower_Don_Move[1] / 500f)); + OpenTaiko.Tx.Characters_Tower_Running[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0] + distDonX, OpenTaiko.Skin.Game_Tower_Don[1] + distDonY); } } else { // Fail - if (TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[currentCharacter] > 0 && CFloorManagement.CurrentNumberOfLives == 0) { - int animChar = TJAPlayer3.Skin.Characters_Tower_Fail_IsLooping[currentCharacter] ? - ctFailAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[currentCharacter] : - Math.Min(ctFailAnimation.CurrentValue, TJAPlayer3.Skin.Characters_Tower_Fail_Ptn[currentCharacter] - 1); - TJAPlayer3.Tx.Characters_Tower_Fail[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0], TJAPlayer3.Skin.Game_Tower_Don[1]); + if (OpenTaiko.Skin.Characters_Tower_Fail_Ptn[currentCharacter] > 0 && CFloorManagement.CurrentNumberOfLives == 0) { + int animChar = OpenTaiko.Skin.Characters_Tower_Fail_IsLooping[currentCharacter] ? + ctFailAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Fail_Ptn[currentCharacter] : + Math.Min(ctFailAnimation.CurrentValue, OpenTaiko.Skin.Characters_Tower_Fail_Ptn[currentCharacter] - 1); + OpenTaiko.Tx.Characters_Tower_Fail[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0], OpenTaiko.Skin.Game_Tower_Don[1]); } // Tired Clear - else if (ctIsTired && stageEnded && TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter] > 0 && CFloorManagement.CurrentNumberOfLives > 0) { - int animChar = TJAPlayer3.Skin.Characters_Tower_Clear_Tired_IsLooping[currentCharacter] ? - ctClearTiredAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter] : - Math.Min(ctClearTiredAnimation.CurrentValue, TJAPlayer3.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter] - 1); - TJAPlayer3.Tx.Characters_Tower_Clear_Tired[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0], TJAPlayer3.Skin.Game_Tower_Don[1]); + else if (ctIsTired && stageEnded && OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter] > 0 && CFloorManagement.CurrentNumberOfLives > 0) { + int animChar = OpenTaiko.Skin.Characters_Tower_Clear_Tired_IsLooping[currentCharacter] ? + ctClearTiredAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter] : + Math.Min(ctClearTiredAnimation.CurrentValue, OpenTaiko.Skin.Characters_Tower_Clear_Tired_Ptn[currentCharacter] - 1); + OpenTaiko.Tx.Characters_Tower_Clear_Tired[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0], OpenTaiko.Skin.Game_Tower_Don[1]); } // Clear - else if (stageEnded && TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[currentCharacter] > 0 && CFloorManagement.CurrentNumberOfLives > 0) { - int animChar = TJAPlayer3.Skin.Characters_Tower_Clear_IsLooping[currentCharacter] ? - ctClearAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[currentCharacter] : - Math.Min(ctClearAnimation.CurrentValue, TJAPlayer3.Skin.Characters_Tower_Clear_Ptn[currentCharacter] - 1); - TJAPlayer3.Tx.Characters_Tower_Clear[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0], TJAPlayer3.Skin.Game_Tower_Don[1]); + else if (stageEnded && OpenTaiko.Skin.Characters_Tower_Clear_Ptn[currentCharacter] > 0 && CFloorManagement.CurrentNumberOfLives > 0) { + int animChar = OpenTaiko.Skin.Characters_Tower_Clear_IsLooping[currentCharacter] ? + ctClearAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Clear_Ptn[currentCharacter] : + Math.Min(ctClearAnimation.CurrentValue, OpenTaiko.Skin.Characters_Tower_Clear_Ptn[currentCharacter] - 1); + OpenTaiko.Tx.Characters_Tower_Clear[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0], OpenTaiko.Skin.Game_Tower_Don[1]); } // Tired Stand - else if (ctIsTired && TJAPlayer3.Skin.Characters_Tower_Standing_Tired_Ptn[currentCharacter] > 0) { - int animChar = ctStandTiredAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Standing_Tired_Ptn[currentCharacter]; - TJAPlayer3.Tx.Characters_Tower_Standing_Tired[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0], TJAPlayer3.Skin.Game_Tower_Don[1]); // Center X - 50 + else if (ctIsTired && OpenTaiko.Skin.Characters_Tower_Standing_Tired_Ptn[currentCharacter] > 0) { + int animChar = ctStandTiredAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Standing_Tired_Ptn[currentCharacter]; + OpenTaiko.Tx.Characters_Tower_Standing_Tired[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0], OpenTaiko.Skin.Game_Tower_Don[1]); // Center X - 50 } // Stand - else if (TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[currentCharacter] > 0) { - int animChar = ctStandingAnimation.CurrentValue % TJAPlayer3.Skin.Characters_Tower_Standing_Ptn[currentCharacter]; - TJAPlayer3.Tx.Characters_Tower_Standing[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Tower_Don[0], TJAPlayer3.Skin.Game_Tower_Don[1]); // Center X - 50 + else if (OpenTaiko.Skin.Characters_Tower_Standing_Ptn[currentCharacter] > 0) { + int animChar = ctStandingAnimation.CurrentValue % OpenTaiko.Skin.Characters_Tower_Standing_Ptn[currentCharacter]; + OpenTaiko.Tx.Characters_Tower_Standing[currentCharacter][animChar]?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Tower_Don[0], OpenTaiko.Skin.Game_Tower_Don[1]); // Center X - 50 } } @@ -507,9 +507,9 @@ namespace TJAPlayer3 { #region [Miss icon] if (CFloorManagement.InvincibilityFrames != null && CFloorManagement.InvincibilityFrames.CurrentValue < CFloorManagement.InvincibilityDurationSpeedDependent) { - if (TJAPlayer3.Tx.Tower_Miss != null) - TJAPlayer3.Tx.Tower_Miss.Opacity = Math.Min(255, 1000 - CFloorManagement.InvincibilityFrames.CurrentValue); - TJAPlayer3.Tx.Tower_Miss?.t2D下中央基準描画(TJAPlayer3.Skin.Game_Tower_Miss[0], TJAPlayer3.Skin.Game_Tower_Miss[1]); + if (OpenTaiko.Tx.Tower_Miss != null) + OpenTaiko.Tx.Tower_Miss.Opacity = Math.Min(255, 1000 - CFloorManagement.InvincibilityFrames.CurrentValue); + OpenTaiko.Tx.Tower_Miss?.t2D下中央基準描画(OpenTaiko.Skin.Game_Tower_Miss[0], OpenTaiko.Skin.Game_Tower_Miss[1]); } #endregion @@ -527,9 +527,9 @@ namespace TJAPlayer3 { ctFailAnimation?.Tick(); #endregion - } else if (!TJAPlayer3.stage演奏ドラム画面.bDoublePlay && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { + } else if (!OpenTaiko.stage演奏ドラム画面.bDoublePlay && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { if (!IsDownNotFound) { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) DownScript?.Update(); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) DownScript?.Update(); DownScript?.Draw(); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplBalloon.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplBalloon.cs index c827b722..c67dee5f 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplBalloon.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplBalloon.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplBalloon : CActivity { @@ -19,7 +19,7 @@ namespace TJAPlayer3 { this.ct風船アニメ[i] = new CCounter(); } - this.ct風船ふきだしアニメ = new CCounter(0, 1, 100, TJAPlayer3.Timer); + this.ct風船ふきだしアニメ = new CCounter(0, 1, 100, OpenTaiko.Timer); KusudamaScript = new(CSkin.Path($"{TextureLoader.BASE}{TextureLoader.GAME}{TextureLoader.BALLOON}{TextureLoader.KUSUDAMA}Script.lua")); KusudamaScript.Init(); @@ -59,7 +59,7 @@ namespace TJAPlayer3 { } public void tDrawKusudama() { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) { + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) { KusudamaScript.Update(); } KusudamaScript.Draw(); @@ -91,27 +91,27 @@ namespace TJAPlayer3 { int frame_y; int num_x; int num_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x = TJAPlayer3.Skin.Game_Balloon_Balloon_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * player); - y = TJAPlayer3.Skin.Game_Balloon_Balloon_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * player); - frame_x = TJAPlayer3.Skin.Game_Balloon_Balloon_Frame_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * player); - frame_y = TJAPlayer3.Skin.Game_Balloon_Balloon_Frame_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * player); - num_x = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * player); - num_y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * player); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x = TJAPlayer3.Skin.Game_Balloon_Balloon_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * player); - y = TJAPlayer3.Skin.Game_Balloon_Balloon_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * player); - frame_x = TJAPlayer3.Skin.Game_Balloon_Balloon_Frame_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * player); - frame_y = TJAPlayer3.Skin.Game_Balloon_Balloon_Frame_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * player); - num_x = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * player); - num_y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * player); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x = OpenTaiko.Skin.Game_Balloon_Balloon_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * player); + y = OpenTaiko.Skin.Game_Balloon_Balloon_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * player); + frame_x = OpenTaiko.Skin.Game_Balloon_Balloon_Frame_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * player); + frame_y = OpenTaiko.Skin.Game_Balloon_Balloon_Frame_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * player); + num_x = OpenTaiko.Skin.Game_Balloon_Balloon_Number_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * player); + num_y = OpenTaiko.Skin.Game_Balloon_Balloon_Number_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * player); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x = OpenTaiko.Skin.Game_Balloon_Balloon_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * player); + y = OpenTaiko.Skin.Game_Balloon_Balloon_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * player); + frame_x = OpenTaiko.Skin.Game_Balloon_Balloon_Frame_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * player); + frame_y = OpenTaiko.Skin.Game_Balloon_Balloon_Frame_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * player); + num_x = OpenTaiko.Skin.Game_Balloon_Balloon_Number_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * player); + num_y = OpenTaiko.Skin.Game_Balloon_Balloon_Number_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * player); } else { - x = TJAPlayer3.Skin.Game_Balloon_Balloon_X[player]; - y = TJAPlayer3.Skin.Game_Balloon_Balloon_Y[player]; - frame_x = TJAPlayer3.Skin.Game_Balloon_Balloon_Frame_X[player]; - frame_y = TJAPlayer3.Skin.Game_Balloon_Balloon_Frame_Y[player]; - num_x = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_X[player]; - num_y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Y[player]; + x = OpenTaiko.Skin.Game_Balloon_Balloon_X[player]; + y = OpenTaiko.Skin.Game_Balloon_Balloon_Y[player]; + frame_x = OpenTaiko.Skin.Game_Balloon_Balloon_Frame_X[player]; + frame_y = OpenTaiko.Skin.Game_Balloon_Balloon_Frame_Y[player]; + num_x = OpenTaiko.Skin.Game_Balloon_Balloon_Number_X[player]; + num_y = OpenTaiko.Skin.Game_Balloon_Balloon_Number_Y[player]; } //1P:0 2P:245 //if (CDTXMania.Tx.Chara_Balloon_Breaking != null && CDTXMania.ConfigIni.ShowChara) @@ -119,20 +119,20 @@ namespace TJAPlayer3 { for (int j = 0; j < 5; j++) { if (n残り打数[j] < n連打数 && btype == EBalloonType.BALLOON) { - if (TJAPlayer3.Tx.Balloon_Breaking[j] != null) - TJAPlayer3.Tx.Balloon_Breaking[j].t2D描画(x + (this.ct風船ふきだしアニメ.CurrentValue == 1 ? 3 : 0), y); + if (OpenTaiko.Tx.Balloon_Breaking[j] != null) + OpenTaiko.Tx.Balloon_Breaking[j].t2D描画(x + (this.ct風船ふきだしアニメ.CurrentValue == 1 ? 3 : 0), y); break; } } //1P:31 2P:329 if (btype == EBalloonType.BALLOON) { - if (TJAPlayer3.Tx.Balloon_Balloon != null) - TJAPlayer3.Tx.Balloon_Balloon.t2D描画(frame_x, frame_y); + if (OpenTaiko.Tx.Balloon_Balloon != null) + OpenTaiko.Tx.Balloon_Balloon.t2D描画(frame_x, frame_y); this.t文字表示(num_x, num_y, n連打数, player); } else if (btype == EBalloonType.FUSEROLL) { - if (TJAPlayer3.Tx.Fuse_Balloon != null) - TJAPlayer3.Tx.Fuse_Balloon.t2D描画(frame_x, frame_y); + if (OpenTaiko.Tx.Fuse_Balloon != null) + OpenTaiko.Tx.Fuse_Balloon.t2D描画(frame_x, frame_y); this.tFuseNumber(num_x, num_y, n連打数, player); } else if (btype == EBalloonType.KUSUDAMA && player == 0) { /* @@ -155,9 +155,9 @@ namespace TJAPlayer3 { } */ } else { - if (n連打数 == 0 && TJAPlayer3.stage演奏ドラム画面.actChara.b風船連打中[player]) { - TJAPlayer3.stage演奏ドラム画面.actChara.b風船連打中[player] = false; - TJAPlayer3.stage演奏ドラム画面.b連打中[player] = false; + if (n連打数 == 0 && OpenTaiko.stage演奏ドラム画面.actChara.b風船連打中[player]) { + OpenTaiko.stage演奏ドラム画面.actChara.b風船連打中[player] = false; + OpenTaiko.stage演奏ドラム画面.b連打中[player] = false; } } @@ -199,8 +199,8 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j - (nums.Length / 2.0f); - float _x = x - (TJAPlayer3.Skin.Game_Balloon_Number_Interval[0] * offset); - float _y = y - (TJAPlayer3.Skin.Game_Balloon_Number_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.Game_Balloon_Number_Interval[0] * offset); + float _y = y - (OpenTaiko.Skin.Game_Balloon_Number_Interval[1] * offset); float width = tx.sz画像サイズ.Width / 10.0f; float height = tx.sz画像サイズ.Height; @@ -210,38 +210,38 @@ namespace TJAPlayer3 { } private void tKusudamaNumber(int num) { - if (TJAPlayer3.Tx.Kusudama_Number == null) return; - TJAPlayer3.Tx.Kusudama_Number.vcScaleRatio.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale; - TJAPlayer3.Tx.Kusudama_Number.vcScaleRatio.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale; - int x = TJAPlayer3.Skin.Game_Kusudama_Number_X; - int y = TJAPlayer3.Skin.Game_Kusudama_Number_Y; + if (OpenTaiko.Tx.Kusudama_Number == null) return; + OpenTaiko.Tx.Kusudama_Number.vcScaleRatio.X = OpenTaiko.Skin.Game_Balloon_Balloon_Number_Scale; + OpenTaiko.Tx.Kusudama_Number.vcScaleRatio.Y = OpenTaiko.Skin.Game_Balloon_Balloon_Number_Scale; + int x = OpenTaiko.Skin.Game_Kusudama_Number_X; + int y = OpenTaiko.Skin.Game_Kusudama_Number_Y; int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j - ((nums.Length - 2) / 2.0f); - float width = TJAPlayer3.Tx.Kusudama_Number.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.Kusudama_Number.sz画像サイズ.Height; + float width = OpenTaiko.Tx.Kusudama_Number.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.Kusudama_Number.sz画像サイズ.Height; float _x = x - (width * offset); float _y = y; - TJAPlayer3.Tx.Kusudama_Number.t2D拡大率考慮下基準描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.Kusudama_Number.t2D拡大率考慮下基準描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } private void tFuseNumber(int x, int y, int num, int nPlayer) { - if (TJAPlayer3.Tx.Fuse_Number == null) return; - TJAPlayer3.Tx.Fuse_Number.vcScaleRatio.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale; - TJAPlayer3.Tx.Fuse_Number.vcScaleRatio.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale + RollScale[this.ct風船アニメ[nPlayer].CurrentValue]; + if (OpenTaiko.Tx.Fuse_Number == null) return; + OpenTaiko.Tx.Fuse_Number.vcScaleRatio.X = OpenTaiko.Skin.Game_Balloon_Balloon_Number_Scale; + OpenTaiko.Tx.Fuse_Number.vcScaleRatio.Y = OpenTaiko.Skin.Game_Balloon_Balloon_Number_Scale + RollScale[this.ct風船アニメ[nPlayer].CurrentValue]; - _nbDisplay(TJAPlayer3.Tx.Fuse_Number, num, x, y); + _nbDisplay(OpenTaiko.Tx.Fuse_Number, num, x, y); } private void t文字表示(int x, int y, int num, int nPlayer) { - if (TJAPlayer3.Tx.Balloon_Number_Roll == null) return; - TJAPlayer3.Tx.Balloon_Number_Roll.vcScaleRatio.X = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale; - TJAPlayer3.Tx.Balloon_Number_Roll.vcScaleRatio.Y = TJAPlayer3.Skin.Game_Balloon_Balloon_Number_Scale + RollScale[this.ct風船アニメ[nPlayer].CurrentValue]; + if (OpenTaiko.Tx.Balloon_Number_Roll == null) return; + OpenTaiko.Tx.Balloon_Number_Roll.vcScaleRatio.X = OpenTaiko.Skin.Game_Balloon_Balloon_Number_Scale; + OpenTaiko.Tx.Balloon_Number_Roll.vcScaleRatio.Y = OpenTaiko.Skin.Game_Balloon_Balloon_Number_Scale + RollScale[this.ct風船アニメ[nPlayer].CurrentValue]; - _nbDisplay(TJAPlayer3.Tx.Balloon_Number_Roll, num, x, y); + _nbDisplay(OpenTaiko.Tx.Balloon_Number_Roll, num, x, y); } public void tEnd() { diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplCharacter.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplCharacter.cs index 7b2bbc7f..b1b3df69 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplCharacter.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplCharacter.cs @@ -1,7 +1,7 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { //クラスの設置位置は必ず演奏画面共通に置くこと。 //そうしなければBPM変化に対応できません。 @@ -41,28 +41,28 @@ namespace TJAPlayer3 { ctKusuIn[i] = new(); // Currently used character - int p = TJAPlayer3.GetActualPlayer(i); + int p = OpenTaiko.GetActualPlayer(i); - this.iCurrentCharacter[i] = Math.Max(0, Math.Min(TJAPlayer3.SaveFileInstances[p].data.Character, TJAPlayer3.Skin.Characters_Ptn - 1)); + this.iCurrentCharacter[i] = Math.Max(0, Math.Min(OpenTaiko.SaveFileInstances[p].data.Character, OpenTaiko.Skin.Characters_Ptn - 1)); - if (TJAPlayer3.Skin.Characters_Normal_Ptn[this.iCurrentCharacter[i]] != 0) ChangeAnime(i, Anime.Normal, true); + if (OpenTaiko.Skin.Characters_Normal_Ptn[this.iCurrentCharacter[i]] != 0) ChangeAnime(i, Anime.Normal, true); else ChangeAnime(i, Anime.None, true); this.b風船連打中[i] = false; this.b演奏中[i] = false; // CharaAction_Balloon_FadeOut[i] = new Animations.FadeOut(TJAPlayer3.Skin.Game_Chara_Balloon_FadeOut); - CharaAction_Balloon_FadeOut[i] = new Animations.FadeOut(TJAPlayer3.Skin.Characters_Balloon_FadeOut[this.iCurrentCharacter[i]]); + CharaAction_Balloon_FadeOut[i] = new Animations.FadeOut(OpenTaiko.Skin.Characters_Balloon_FadeOut[this.iCurrentCharacter[i]]); - var tick = TJAPlayer3.Skin.Characters_Balloon_Timer[this.iCurrentCharacter[i]]; + var tick = OpenTaiko.Skin.Characters_Balloon_Timer[this.iCurrentCharacter[i]]; - var balloonBrokePtn = TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]]; - var balloonMissPtn = TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[this.iCurrentCharacter[i]]; + var balloonBrokePtn = OpenTaiko.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]]; + var balloonMissPtn = OpenTaiko.Skin.Characters_Balloon_Miss_Ptn[this.iCurrentCharacter[i]]; CharaAction_Balloon_FadeOut_StartMs[i] = new int[2]; - CharaAction_Balloon_FadeOut_StartMs[i][0] = (balloonBrokePtn * tick) - TJAPlayer3.Skin.Characters_Balloon_FadeOut[this.iCurrentCharacter[i]]; - CharaAction_Balloon_FadeOut_StartMs[i][1] = (balloonMissPtn * tick) - TJAPlayer3.Skin.Characters_Balloon_FadeOut[this.iCurrentCharacter[i]]; + CharaAction_Balloon_FadeOut_StartMs[i][0] = (balloonBrokePtn * tick) - OpenTaiko.Skin.Characters_Balloon_FadeOut[this.iCurrentCharacter[i]]; + CharaAction_Balloon_FadeOut_StartMs[i][1] = (balloonMissPtn * tick) - OpenTaiko.Skin.Characters_Balloon_FadeOut[this.iCurrentCharacter[i]]; if (balloonBrokePtn > 1) CharaAction_Balloon_FadeOut_StartMs[i][0] /= balloonBrokePtn - 1; if (balloonMissPtn > 1) CharaAction_Balloon_FadeOut_StartMs[i][1] /= balloonMissPtn - 1; // - 1はタイマー用 @@ -123,14 +123,14 @@ namespace TJAPlayer3 { } public override int Draw() { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { int Character = this.iCurrentCharacter[i]; - if (TJAPlayer3.Skin.Characters_Ptn == 0) + if (OpenTaiko.Skin.Characters_Ptn == 0) break; // Blinking animation during invincibility frames - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { if (CFloorManagement.isBlinking() == true) break; } @@ -138,13 +138,13 @@ namespace TJAPlayer3 { CTexture nowChara = null; void updateNormal() { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) { - nNowCharaCounter[i] += ((Math.Abs((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i]) / 60.0f) * (float)TJAPlayer3.FPS.DeltaTime) / nCharaBeat[i]; + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) { + nNowCharaCounter[i] += ((Math.Abs((float)OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[i]) / 60.0f) * (float)OpenTaiko.FPS.DeltaTime) / nCharaBeat[i]; } } void updateBalloon() { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) { - nNowCharaCounter[i] += (float)TJAPlayer3.FPS.DeltaTime / nCharaBeat[i]; + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) { + nNowCharaCounter[i] += (float)OpenTaiko.FPS.DeltaTime / nCharaBeat[i]; } } @@ -163,7 +163,7 @@ namespace TJAPlayer3 { case Anime.Normal: { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal[Character][TJAPlayer3.Skin.Characters_Motion_Normal[Character][nNowCharaFrame[i]]]; + nowChara = OpenTaiko.Tx.Characters_Normal[Character][OpenTaiko.Skin.Characters_Motion_Normal[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; nNowCharaFrame[i] = 0; @@ -173,7 +173,7 @@ namespace TJAPlayer3 { case Anime.Miss: { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal_Missed[Character][TJAPlayer3.Skin.Characters_Motion_Miss[Character][nNowCharaFrame[i]]]; + nowChara = OpenTaiko.Tx.Characters_Normal_Missed[Character][OpenTaiko.Skin.Characters_Motion_Miss[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; nNowCharaFrame[i] = 0; @@ -183,7 +183,7 @@ namespace TJAPlayer3 { case Anime.MissDown: { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal_MissedDown[Character][TJAPlayer3.Skin.Characters_Motion_MissDown[Character][nNowCharaFrame[i]]]; + nowChara = OpenTaiko.Tx.Characters_Normal_MissedDown[Character][OpenTaiko.Skin.Characters_Motion_MissDown[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; nNowCharaFrame[i] = 0; @@ -193,7 +193,7 @@ namespace TJAPlayer3 { case Anime.Cleared: { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal_Cleared[Character][TJAPlayer3.Skin.Characters_Motion_Clear[Character][nNowCharaFrame[i]]]; + nowChara = OpenTaiko.Tx.Characters_Normal_Cleared[Character][OpenTaiko.Skin.Characters_Motion_Clear[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; nNowCharaFrame[i] = 0; @@ -203,7 +203,7 @@ namespace TJAPlayer3 { case Anime.Maxed: { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_Normal_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_ClearMax[Character][nNowCharaFrame[i]]]; + nowChara = OpenTaiko.Tx.Characters_Normal_Maxed[Character][OpenTaiko.Skin.Characters_Motion_ClearMax[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; nNowCharaFrame[i] = 0; @@ -212,8 +212,8 @@ namespace TJAPlayer3 { break; case Anime.MissIn: { updateNormal(); - if (TJAPlayer3.Tx.Characters_MissIn[Character] != null && TJAPlayer3.Skin.Characters_MissIn_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_MissIn[Character][TJAPlayer3.Skin.Characters_Motion_MissIn[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_MissIn[Character] != null && OpenTaiko.Skin.Characters_MissIn_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_MissIn[Character][OpenTaiko.Skin.Characters_Motion_MissIn[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -222,8 +222,8 @@ namespace TJAPlayer3 { break; case Anime.MissDownIn: { updateNormal(); - if (TJAPlayer3.Tx.Characters_MissDownIn[Character] != null && TJAPlayer3.Skin.Characters_MissDownIn_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_MissDownIn[Character][TJAPlayer3.Skin.Characters_Motion_MissDownIn[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_MissDownIn[Character] != null && OpenTaiko.Skin.Characters_MissDownIn_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_MissDownIn[Character][OpenTaiko.Skin.Characters_Motion_MissDownIn[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -233,7 +233,7 @@ namespace TJAPlayer3 { case Anime.GoGoTime: { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_GoGoTime[Character][TJAPlayer3.Skin.Characters_Motion_GoGo[Character][nNowCharaFrame[i]]]; + nowChara = OpenTaiko.Tx.Characters_GoGoTime[Character][OpenTaiko.Skin.Characters_Motion_GoGo[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; nNowCharaFrame[i] = 0; @@ -243,7 +243,7 @@ namespace TJAPlayer3 { case Anime.GoGoTime_Maxed: { updateNormal(); ReturnDefaultAnime(i, false); - nowChara = TJAPlayer3.Tx.Characters_GoGoTime_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_GoGoMax[Character][nNowCharaFrame[i]]]; + nowChara = OpenTaiko.Tx.Characters_GoGoTime_Maxed[Character][OpenTaiko.Skin.Characters_Motion_GoGoMax[Character][nNowCharaFrame[i]]]; if (endAnime) { nNowCharaCounter[i] = 0; nNowCharaFrame[i] = 0; @@ -252,8 +252,8 @@ namespace TJAPlayer3 { break; case Anime.Combo10: { updateNormal(); - if (TJAPlayer3.Tx.Characters_10Combo[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_10Combo[Character][TJAPlayer3.Skin.Characters_Motion_10Combo[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_10Combo[Character] != null && OpenTaiko.Skin.Characters_10Combo_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_10Combo[Character][OpenTaiko.Skin.Characters_Motion_10Combo[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -262,8 +262,8 @@ namespace TJAPlayer3 { break; case Anime.Combo10_Clear: { updateNormal(); - if (TJAPlayer3.Tx.Characters_10Combo_Clear[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Clear_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_10Combo_Clear[Character][TJAPlayer3.Skin.Characters_Motion_10Combo_Clear[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_10Combo_Clear[Character] != null && OpenTaiko.Skin.Characters_10Combo_Clear_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_10Combo_Clear[Character][OpenTaiko.Skin.Characters_Motion_10Combo_Clear[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -272,8 +272,8 @@ namespace TJAPlayer3 { break; case Anime.Combo10_Max: { updateNormal(); - if (TJAPlayer3.Tx.Characters_10Combo_Maxed[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_10Combo_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_10ComboMax[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_10Combo_Maxed[Character] != null && OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_10Combo_Maxed[Character][OpenTaiko.Skin.Characters_Motion_10ComboMax[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -282,8 +282,8 @@ namespace TJAPlayer3 { break; case Anime.GoGoStart: { updateNormal(); - if (TJAPlayer3.Tx.Characters_GoGoStart[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_GoGoStart[Character][TJAPlayer3.Skin.Characters_Motion_GoGoStart[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_GoGoStart[Character] != null && OpenTaiko.Skin.Characters_GoGoStart_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_GoGoStart[Character][OpenTaiko.Skin.Characters_Motion_GoGoStart[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -292,8 +292,8 @@ namespace TJAPlayer3 { break; case Anime.GoGoStart_Clear: { updateNormal(); - if (TJAPlayer3.Tx.Characters_GoGoStart_Clear[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Clear_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_GoGoStart_Clear[Character][TJAPlayer3.Skin.Characters_Motion_GoGoStart_Clear[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_GoGoStart_Clear[Character] != null && OpenTaiko.Skin.Characters_GoGoStart_Clear_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_GoGoStart_Clear[Character][OpenTaiko.Skin.Characters_Motion_GoGoStart_Clear[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -302,8 +302,8 @@ namespace TJAPlayer3 { break; case Anime.GoGoStart_Max: { updateNormal(); - if (TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_GoGoStart_Maxed[Character] != null && OpenTaiko.Skin.Characters_GoGoStart_Maxed_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_GoGoStart_Maxed[Character][OpenTaiko.Skin.Characters_Motion_GoGoStartMax[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -312,8 +312,8 @@ namespace TJAPlayer3 { break; case Anime.Become_Cleared: { updateNormal(); - if (TJAPlayer3.Tx.Characters_Become_Cleared[Character] != null && TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_Become_Cleared[Character][TJAPlayer3.Skin.Characters_Motion_ClearIn[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_Become_Cleared[Character] != null && OpenTaiko.Skin.Characters_Become_Cleared_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_Become_Cleared[Character][OpenTaiko.Skin.Characters_Motion_ClearIn[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -322,8 +322,8 @@ namespace TJAPlayer3 { break; case Anime.Become_Maxed: { updateNormal(); - if (TJAPlayer3.Tx.Characters_Become_Maxed[Character] != null && TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_Become_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_SoulIn[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_Become_Maxed[Character] != null && OpenTaiko.Skin.Characters_Become_Maxed_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_Become_Maxed[Character][OpenTaiko.Skin.Characters_Motion_SoulIn[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -332,8 +332,8 @@ namespace TJAPlayer3 { break; case Anime.SoulOut: { updateNormal(); - if (TJAPlayer3.Tx.Characters_SoulOut[Character] != null && TJAPlayer3.Skin.Characters_SoulOut_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_SoulOut[Character][TJAPlayer3.Skin.Characters_Motion_SoulOut[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_SoulOut[Character] != null && OpenTaiko.Skin.Characters_SoulOut_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_SoulOut[Character][OpenTaiko.Skin.Characters_Motion_SoulOut[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -342,8 +342,8 @@ namespace TJAPlayer3 { break; case Anime.ClearOut: { updateNormal(); - if (TJAPlayer3.Tx.Characters_ClearOut[Character] != null && TJAPlayer3.Skin.Characters_ClearOut_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_ClearOut[Character][TJAPlayer3.Skin.Characters_Motion_ClearOut[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_ClearOut[Character] != null && OpenTaiko.Skin.Characters_ClearOut_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_ClearOut[Character][OpenTaiko.Skin.Characters_Motion_ClearOut[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -352,8 +352,8 @@ namespace TJAPlayer3 { break; case Anime.Return: { updateNormal(); - if (TJAPlayer3.Tx.Characters_Return[Character] != null && TJAPlayer3.Skin.Characters_Return_Ptn[Character] != 0) { - nowChara = TJAPlayer3.Tx.Characters_Return[Character][TJAPlayer3.Skin.Characters_Motion_Return[Character][nNowCharaFrame[i]]]; + if (OpenTaiko.Tx.Characters_Return[Character] != null && OpenTaiko.Skin.Characters_Return_Ptn[Character] != 0) { + nowChara = OpenTaiko.Tx.Characters_Return[Character][OpenTaiko.Skin.Characters_Motion_Return[Character][nNowCharaFrame[i]]]; } if (endAnime) { ReturnDefaultAnime(i, true); @@ -384,35 +384,35 @@ namespace TJAPlayer3 { float charaScale = 1.0f; if (nowChara != null) { - bool flipX = TJAPlayer3.ConfigIni.bAIBattleMode ? (i == 1) : false; + bool flipX = OpenTaiko.ConfigIni.bAIBattleMode ? (i == 1) : false; - float resolutionScaleX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[Character][0]; - float resolutionScaleY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[Character][1]; + float resolutionScaleX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[Character][0]; + float resolutionScaleY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[Character][1]; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - chara_x = (TJAPlayer3.Skin.Characters_X_AI[Character][i] * resolutionScaleX); - chara_y = (TJAPlayer3.Skin.Characters_Y_AI[Character][i] * resolutionScaleY); + if (OpenTaiko.ConfigIni.bAIBattleMode) { + chara_x = (OpenTaiko.Skin.Characters_X_AI[Character][i] * resolutionScaleX); + chara_y = (OpenTaiko.Skin.Characters_Y_AI[Character][i] * resolutionScaleY); if (nowChara != null) { charaScale = 0.58f; } - } else if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) { - chara_x = (TJAPlayer3.Skin.Characters_X[Character][i] * resolutionScaleX); - chara_y = (TJAPlayer3.Skin.Characters_Y[Character][i] * resolutionScaleY); + } else if (OpenTaiko.ConfigIni.nPlayerCount <= 2) { + chara_x = (OpenTaiko.Skin.Characters_X[Character][i] * resolutionScaleX); + chara_y = (OpenTaiko.Skin.Characters_Y[Character][i] * resolutionScaleY); if (nowChara != null) { charaScale = 1.0f; } - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - chara_x = (TJAPlayer3.Skin.Characters_5P[Character][0] * resolutionScaleX) + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - chara_y = (TJAPlayer3.Skin.Characters_5P[Character][1] * resolutionScaleY) + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + chara_x = (OpenTaiko.Skin.Characters_5P[Character][0] * resolutionScaleX) + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + chara_y = (OpenTaiko.Skin.Characters_5P[Character][1] * resolutionScaleY) + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); if (nowChara != null) { charaScale = 0.58f; } } else { - chara_x = (TJAPlayer3.Skin.Characters_4P[Character][0] * resolutionScaleX) + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - chara_y = (TJAPlayer3.Skin.Characters_4P[Character][1] * resolutionScaleY) + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + chara_x = (OpenTaiko.Skin.Characters_4P[Character][0] * resolutionScaleX) + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + chara_y = (OpenTaiko.Skin.Characters_4P[Character][1] * resolutionScaleY) + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); if (nowChara != null) { charaScale = 0.58f; @@ -423,8 +423,8 @@ namespace TJAPlayer3 { //chara_x *= resolutionScaleX; //chara_y *= resolutionScaleY; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - chara_x += TJAPlayer3.Skin.Game_AIBattle_CharaMove * TJAPlayer3.stage演奏ドラム画面.AIBattleState; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + chara_x += OpenTaiko.Skin.Game_AIBattle_CharaMove * OpenTaiko.stage演奏ドラム画面.AIBattleState; chara_y -= nowChara.szTextureSize.Height * charaScale; // Center down } @@ -441,13 +441,13 @@ namespace TJAPlayer3 { nowChara.vcScaleRatio.Y = 1.0f; } - if ((this.b風船連打中[i] != true && CharaAction_Balloon_Delay[i].IsEnded) || TJAPlayer3.ConfigIni.nPlayerCount > 2) { - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画(TJAPlayer3.Skin.Game_PuchiChara_X[i], TJAPlayer3.Skin.Game_PuchiChara_Y[i], TJAPlayer3.stage演奏ドラム画面.bIsAlreadyMaxed[i], player: i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画(TJAPlayer3.Skin.Game_PuchiChara_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i), TJAPlayer3.Skin.Game_PuchiChara_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i), TJAPlayer3.stage演奏ドラム画面.bIsAlreadyMaxed[i], player: i, scale: 0.5f); + if ((this.b風船連打中[i] != true && CharaAction_Balloon_Delay[i].IsEnded) || OpenTaiko.ConfigIni.nPlayerCount > 2) { + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) { + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画(OpenTaiko.Skin.Game_PuchiChara_X[i], OpenTaiko.Skin.Game_PuchiChara_Y[i], OpenTaiko.stage演奏ドラム画面.bIsAlreadyMaxed[i], player: i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画(OpenTaiko.Skin.Game_PuchiChara_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i), OpenTaiko.Skin.Game_PuchiChara_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i), OpenTaiko.stage演奏ドラム画面.bIsAlreadyMaxed[i], player: i, scale: 0.5f); } else { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画(TJAPlayer3.Skin.Game_PuchiChara_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i), TJAPlayer3.Skin.Game_PuchiChara_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i), TJAPlayer3.stage演奏ドラム画面.bIsAlreadyMaxed[i], player: i, scale: 0.5f); + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画(OpenTaiko.Skin.Game_PuchiChara_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i), OpenTaiko.Skin.Game_PuchiChara_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i), OpenTaiko.stage演奏ドラム画面.bIsAlreadyMaxed[i], player: i, scale: 0.5f); } } } @@ -455,7 +455,7 @@ namespace TJAPlayer3 { } public void OnDraw_Balloon() { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { //if (TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[iCurrentCharacter[i]] != 0) CharaAction_Balloon_Breaking[i]?.t進行(); //if (TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[iCurrentCharacter[i]] != 0) CharaAction_Balloon_Broke[i]?.t進行(); CharaAction_Balloon_Delay[i]?.Tick(); @@ -466,24 +466,24 @@ namespace TJAPlayer3 { bool endAnime = nNowCharaCounter[i] >= 1; var nowOpacity = 255; - float resolutionScaleX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[this.iCurrentCharacter[i]][0]; - float resolutionScaleY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[this.iCurrentCharacter[i]][1]; + float resolutionScaleX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[this.iCurrentCharacter[i]][0]; + float resolutionScaleY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[this.iCurrentCharacter[i]][1]; float chara_x = 0; float chara_y = 0; - float kusu_chara_x = TJAPlayer3.Skin.Characters_Kusudama_X[this.iCurrentCharacter[i]][i] * resolutionScaleX; - float kusu_chara_y = TJAPlayer3.Skin.Characters_Kusudama_Y[this.iCurrentCharacter[i]][i] * resolutionScaleY; + float kusu_chara_x = OpenTaiko.Skin.Characters_Kusudama_X[this.iCurrentCharacter[i]][i] * resolutionScaleX; + float kusu_chara_y = OpenTaiko.Skin.Characters_Kusudama_Y[this.iCurrentCharacter[i]][i] * resolutionScaleY; - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) { - chara_x = TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][i]; - chara_y = TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]; + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) { + chara_x = OpenTaiko.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][i]; + chara_y = OpenTaiko.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]; } else { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - chara_x = TJAPlayer3.Skin.Characters_Balloon_5P[this.iCurrentCharacter[i]][0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - chara_y = TJAPlayer3.Skin.Characters_Balloon_5P[this.iCurrentCharacter[i]][1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + chara_x = OpenTaiko.Skin.Characters_Balloon_5P[this.iCurrentCharacter[i]][0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + chara_y = OpenTaiko.Skin.Characters_Balloon_5P[this.iCurrentCharacter[i]][1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); } else { - chara_x = TJAPlayer3.Skin.Characters_Balloon_4P[this.iCurrentCharacter[i]][0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - chara_y = TJAPlayer3.Skin.Characters_Balloon_4P[this.iCurrentCharacter[i]][1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + chara_x = OpenTaiko.Skin.Characters_Balloon_4P[this.iCurrentCharacter[i]][0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + chara_y = OpenTaiko.Skin.Characters_Balloon_4P[this.iCurrentCharacter[i]][1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } } @@ -498,19 +498,19 @@ namespace TJAPlayer3 { CharaAction_Balloon_FadeOut[i].Start(); } - if (TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { - TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; - TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; - TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; - TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); + if (OpenTaiko.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]] != 0 && OpenTaiko.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { + OpenTaiko.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; + OpenTaiko.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; + OpenTaiko.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; + OpenTaiko.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); } - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[i], - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player: i); + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(i) + OpenTaiko.Skin.Game_PuchiChara_BalloonX[i], + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(i) + OpenTaiko.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player: i); if (endAnime) { ReturnDefaultAnime(i, true); @@ -520,61 +520,61 @@ namespace TJAPlayer3 { CharaAction_Balloon_FadeOut[i].Start(); } - if (TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { - TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; - TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; - TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; - TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); + if (OpenTaiko.Skin.Characters_Balloon_Miss_Ptn[this.iCurrentCharacter[i]] != 0 && OpenTaiko.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { + OpenTaiko.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; + OpenTaiko.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; + OpenTaiko.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; + OpenTaiko.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); } - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[i], - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player: i); + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(i) + OpenTaiko.Skin.Game_PuchiChara_BalloonX[i], + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(i) + OpenTaiko.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player: i); if (endAnime) { ReturnDefaultAnime(i, true); } } else if (eNowAnime[i] == Anime.Balloon_Breaking) { - if (TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { - TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; - TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; - TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); + if (OpenTaiko.Skin.Characters_Balloon_Breaking_Ptn[this.iCurrentCharacter[i]] != 0 && OpenTaiko.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { + OpenTaiko.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; + OpenTaiko.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; + OpenTaiko.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画( + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(i) + chara_x, + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(i) + chara_y); } - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[i], - TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i) + TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, 255, true, player: i); + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(i) + OpenTaiko.Skin.Game_PuchiChara_BalloonX[i], + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(i) + OpenTaiko.Skin.Game_PuchiChara_BalloonY[i], false, 255, true, player: i); } else if (eNowAnime[i] == Anime.Kusudama_Broke) { if (CharaAction_Balloon_FadeOut[i].Counter.IsStoped && nNowCharaFrame[i] > CharaAction_Balloon_FadeOut_StartMs[i][0]) { CharaAction_Balloon_FadeOut[i].Start(); } - float kusuOutX = ((1.0f - MathF.Cos(nNowCharaCounter[i] * MathF.PI)) * TJAPlayer3.Skin.Resolution[0] / 2.0f) * resolutionScaleX; - float kusuOutY = (MathF.Sin(nNowCharaCounter[i] * MathF.PI / 2) * TJAPlayer3.Skin.Resolution[1] / 2.0f) * resolutionScaleY; + float kusuOutX = ((1.0f - MathF.Cos(nNowCharaCounter[i] * MathF.PI)) * OpenTaiko.Skin.Resolution[0] / 2.0f) * resolutionScaleX; + float kusuOutY = (MathF.Sin(nNowCharaCounter[i] * MathF.PI / 2) * OpenTaiko.Skin.Resolution[1] / 2.0f) * resolutionScaleY; - if (TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { - TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; - TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; - TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; + if (OpenTaiko.Skin.Characters_Kusudama_Broke_Ptn[this.iCurrentCharacter[i]] != 0 && OpenTaiko.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { + OpenTaiko.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; + OpenTaiko.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; + OpenTaiko.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; if (i % 2 == 0) { - TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuOutX, kusu_chara_y - kusuOutY); + OpenTaiko.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuOutX, kusu_chara_y - kusuOutY); } else { - TJAPlayer3.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D左右反転描画(kusu_chara_x + kusuOutX, kusu_chara_y - kusuOutY); + OpenTaiko.Tx.Characters_Kusudama_Broke[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D左右反転描画(kusu_chara_x + kusuOutX, kusu_chara_y - kusuOutY); } } if (i % 2 == 0) { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.Skin.Game_PuchiChara_KusudamaX[i] - (int)kusuOutX, - TJAPlayer3.Skin.Game_PuchiChara_KusudamaY[i] - (int)kusuOutY, false, nowOpacity, true, player: i); + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.Skin.Game_PuchiChara_KusudamaX[i] - (int)kusuOutX, + OpenTaiko.Skin.Game_PuchiChara_KusudamaY[i] - (int)kusuOutY, false, nowOpacity, true, player: i); } else { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.Skin.Game_PuchiChara_KusudamaX[i] + (int)kusuOutX, - TJAPlayer3.Skin.Game_PuchiChara_KusudamaY[i] - (int)kusuOutY, false, nowOpacity, true, player: i); + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.Skin.Game_PuchiChara_KusudamaX[i] + (int)kusuOutX, + OpenTaiko.Skin.Game_PuchiChara_KusudamaY[i] - (int)kusuOutY, false, nowOpacity, true, player: i); } if (endAnime) { @@ -585,78 +585,78 @@ namespace TJAPlayer3 { CharaAction_Balloon_FadeOut[i].Start(); } - float kusuOutY = (Math.Max(nNowCharaCounter[i] - 0.5f, 0) * TJAPlayer3.Skin.Resolution[1] * 2) * resolutionScaleY; + float kusuOutY = (Math.Max(nNowCharaCounter[i] - 0.5f, 0) * OpenTaiko.Skin.Resolution[1] * 2) * resolutionScaleY; - if (TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { - TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; - TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; - TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; + if (OpenTaiko.Skin.Characters_Kusudama_Miss_Ptn[this.iCurrentCharacter[i]] != 0 && OpenTaiko.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { + OpenTaiko.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].Opacity = nowOpacity; + OpenTaiko.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; + OpenTaiko.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; if (i % 2 == 0) { - TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x, kusu_chara_y + kusuOutY); + OpenTaiko.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x, kusu_chara_y + kusuOutY); } else { - TJAPlayer3.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D左右反転描画(kusu_chara_x, kusu_chara_y + kusuOutY); + OpenTaiko.Tx.Characters_Kusudama_Miss[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D左右反転描画(kusu_chara_x, kusu_chara_y + kusuOutY); } } - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.Skin.Game_PuchiChara_KusudamaX[i], - TJAPlayer3.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuOutY, false, nowOpacity, true, player: i); + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.Skin.Game_PuchiChara_KusudamaX[i], + OpenTaiko.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuOutY, false, nowOpacity, true, player: i); if (endAnime) { ReturnDefaultAnime(i, true); } } else if (eNowAnime[i] == Anime.Kusudama_Breaking) { - float kusuInX = ((1.0f - MathF.Sin(ctKusuIn[i].CurrentValue / 2000.0f * MathF.PI)) * TJAPlayer3.Skin.Resolution[0] / 2.0f) * resolutionScaleX; - float kusuInY = -((MathF.Cos(ctKusuIn[i].CurrentValue / 1000.0f * MathF.PI / 2)) * TJAPlayer3.Skin.Resolution[1] / 2.0f) * resolutionScaleY; + float kusuInX = ((1.0f - MathF.Sin(ctKusuIn[i].CurrentValue / 2000.0f * MathF.PI)) * OpenTaiko.Skin.Resolution[0] / 2.0f) * resolutionScaleX; + float kusuInY = -((MathF.Cos(ctKusuIn[i].CurrentValue / 1000.0f * MathF.PI / 2)) * OpenTaiko.Skin.Resolution[1] / 2.0f) * resolutionScaleY; - if (TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { - TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; - TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; + if (OpenTaiko.Skin.Characters_Kusudama_Breaking_Ptn[this.iCurrentCharacter[i]] != 0 && OpenTaiko.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { + OpenTaiko.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; + OpenTaiko.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; if (i % 2 == 0) { - TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuInX, kusu_chara_y + kusuInY); + OpenTaiko.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuInX, kusu_chara_y + kusuInY); } else { - TJAPlayer3.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D左右反転描画(kusu_chara_x + kusuInX, kusu_chara_y + kusuInY); + OpenTaiko.Tx.Characters_Kusudama_Breaking[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D左右反転描画(kusu_chara_x + kusuInX, kusu_chara_y + kusuInY); } } if (i % 2 == 0) { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.Skin.Game_PuchiChara_KusudamaX[i] - (int)kusuInX, - TJAPlayer3.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuInY, false, 255, true, player: i); + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.Skin.Game_PuchiChara_KusudamaX[i] - (int)kusuInX, + OpenTaiko.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuInY, false, 255, true, player: i); } else { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.Skin.Game_PuchiChara_KusudamaX[i] + (int)kusuInX, - TJAPlayer3.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuInY, false, 255, true, player: i); + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.Skin.Game_PuchiChara_KusudamaX[i] + (int)kusuInX, + OpenTaiko.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuInY, false, 255, true, player: i); } if (endAnime) { ChangeAnime(i, Anime.Kusudama_Idle, true); } } else if (eNowAnime[i] == Anime.Kusudama_Idle) { - float kusuInX = ((1.0f - MathF.Sin(ctKusuIn[i].CurrentValue / 2000.0f * MathF.PI)) * TJAPlayer3.Skin.Resolution[0] / 2.0f) * resolutionScaleX; - float kusuInY = -((MathF.Cos(ctKusuIn[i].CurrentValue / 1000.0f * MathF.PI / 2)) * TJAPlayer3.Skin.Resolution[1] / 2.0f) * resolutionScaleY; + float kusuInX = ((1.0f - MathF.Sin(ctKusuIn[i].CurrentValue / 2000.0f * MathF.PI)) * OpenTaiko.Skin.Resolution[0] / 2.0f) * resolutionScaleX; + float kusuInY = -((MathF.Cos(ctKusuIn[i].CurrentValue / 1000.0f * MathF.PI / 2)) * OpenTaiko.Skin.Resolution[1] / 2.0f) * resolutionScaleY; - if (TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[this.iCurrentCharacter[i]] != 0 && TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { - TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; - TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; + if (OpenTaiko.Skin.Characters_Kusudama_Idle_Ptn[this.iCurrentCharacter[i]] != 0 && OpenTaiko.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]] != null) { + OpenTaiko.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.X = charaScale; + OpenTaiko.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].vcScaleRatio.Y = charaScale; if (i % 2 == 0) { - TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuInX, kusu_chara_y + kusuInY); + OpenTaiko.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D描画(kusu_chara_x - kusuInX, kusu_chara_y + kusuInY); } else { - TJAPlayer3.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D左右反転描画(kusu_chara_x + kusuInX, kusu_chara_y + kusuInY); + OpenTaiko.Tx.Characters_Kusudama_Idle[this.iCurrentCharacter[i]][nNowCharaFrame[i]].t2D左右反転描画(kusu_chara_x + kusuInX, kusu_chara_y + kusuInY); } } if (i % 2 == 0) { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.Skin.Game_PuchiChara_KusudamaX[i] - (int)kusuInX, - TJAPlayer3.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuInY, false, 255, true, player: i); + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.Skin.Game_PuchiChara_KusudamaX[i] - (int)kusuInX, + OpenTaiko.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuInY, false, 255, true, player: i); } else { - TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画( - TJAPlayer3.Skin.Game_PuchiChara_KusudamaX[i] + (int)kusuInX, - TJAPlayer3.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuInY, false, 255, true, player: i); + OpenTaiko.stage演奏ドラム画面.PuchiChara.On進行描画( + OpenTaiko.Skin.Game_PuchiChara_KusudamaX[i] + (int)kusuInX, + OpenTaiko.Skin.Game_PuchiChara_KusudamaY[i] + (int)kusuInY, false, 255, true, player: i); } if (endAnime) { @@ -669,25 +669,25 @@ namespace TJAPlayer3 { public void ReturnDefaultAnime(int player, bool resetCounter) { - if (TJAPlayer3.stage演奏ドラム画面.bIsGOGOTIME[player] && TJAPlayer3.Skin.Characters_GoGoTime_Ptn[this.iCurrentCharacter[player]] != 0) { - if (TJAPlayer3.stage演奏ドラム画面.bIsAlreadyMaxed[player] && TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn[this.iCurrentCharacter[player]] != 0) { + if (OpenTaiko.stage演奏ドラム画面.bIsGOGOTIME[player] && OpenTaiko.Skin.Characters_GoGoTime_Ptn[this.iCurrentCharacter[player]] != 0) { + if (OpenTaiko.stage演奏ドラム画面.bIsAlreadyMaxed[player] && OpenTaiko.Skin.Characters_GoGoTime_Maxed_Ptn[this.iCurrentCharacter[player]] != 0) { ChangeAnime(player, Anime.GoGoTime_Maxed, resetCounter); } else { ChangeAnime(player, Anime.GoGoTime, resetCounter); } } else { - if (TJAPlayer3.stage演奏ドラム画面.bIsMiss[player] && TJAPlayer3.Skin.Characters_Normal_Missed_Ptn[this.iCurrentCharacter[player]] != 0) { - if (TJAPlayer3.stage演奏ドラム画面.Chara_MissCount[player] >= 6 && TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn[this.iCurrentCharacter[player]] != 0) { + if (OpenTaiko.stage演奏ドラム画面.bIsMiss[player] && OpenTaiko.Skin.Characters_Normal_Missed_Ptn[this.iCurrentCharacter[player]] != 0) { + if (OpenTaiko.stage演奏ドラム画面.Chara_MissCount[player] >= 6 && OpenTaiko.Skin.Characters_Normal_MissedDown_Ptn[this.iCurrentCharacter[player]] != 0) { ChangeAnime(player, Anime.MissDown, resetCounter); } else { ChangeAnime(player, Anime.Miss, resetCounter); } } else { - if (TJAPlayer3.stage演奏ドラム画面.bIsAlreadyMaxed[player] && TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn[this.iCurrentCharacter[player]] != 0) { + if (OpenTaiko.stage演奏ドラム画面.bIsAlreadyMaxed[player] && OpenTaiko.Skin.Characters_Normal_Maxed_Ptn[this.iCurrentCharacter[player]] != 0) { ChangeAnime(player, Anime.Maxed, resetCounter); - } else if (TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared[player] && TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn[this.iCurrentCharacter[player]] != 0) { + } else if (OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared[player] && OpenTaiko.Skin.Characters_Normal_Cleared_Ptn[this.iCurrentCharacter[player]] != 0) { ChangeAnime(player, Anime.Cleared, resetCounter); - } else if (TJAPlayer3.Skin.Characters_Normal_Ptn[this.iCurrentCharacter[player]] != 0) { + } else if (OpenTaiko.Skin.Characters_Normal_Ptn[this.iCurrentCharacter[player]] != 0) { ChangeAnime(player, Anime.Normal, resetCounter); } else { ChangeAnime(player, Anime.None, resetCounter); @@ -744,9 +744,9 @@ namespace TJAPlayer3 { public CCounter[] ctKusuIn = new CCounter[5]; public void KusuIn() { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { ChangeAnime(i, Anime.Kusudama_Idle, true); - ctKusuIn[i] = new CCounter(0, 1000, 0.4f, TJAPlayer3.Timer); + ctKusuIn[i] = new CCounter(0, 1000, 0.4f, OpenTaiko.Timer); } } @@ -762,111 +762,111 @@ namespace TJAPlayer3 { case Anime.None: break; case Anime.Normal: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_Normal[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_Normal[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_Normal[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_Normal[iCurrentCharacter[player]]; break; case Anime.Miss: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_Miss[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_Miss[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_Miss[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_Miss[iCurrentCharacter[player]]; break; case Anime.MissDown: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_MissDown[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_MissDown[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_MissDown[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_MissDown[iCurrentCharacter[player]]; break; case Anime.Cleared: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_Clear[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_Clear[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_Clear[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_Clear[iCurrentCharacter[player]]; break; case Anime.Maxed: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_ClearMax[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_ClearMax[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_ClearMax[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_ClearMax[iCurrentCharacter[player]]; break; case Anime.MissIn: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_MissIn[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_MissIn[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_MissIn[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_MissIn[iCurrentCharacter[player]]; break; case Anime.MissDownIn: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_MissDownIn[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_MissDownIn[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_MissDownIn[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_MissDownIn[iCurrentCharacter[player]]; break; case Anime.GoGoTime: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_GoGo[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_GoGo[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_GoGo[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_GoGo[iCurrentCharacter[player]]; break; case Anime.GoGoTime_Maxed: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_GoGoMax[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_GoGoMax[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_GoGoMax[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_GoGoMax[iCurrentCharacter[player]]; break; case Anime.Combo10: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_10Combo[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_10Combo[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_10Combo[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_10Combo[iCurrentCharacter[player]]; break; case Anime.Combo10_Clear: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_10Combo_Clear[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_10Combo_Clear[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_10Combo_Clear[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_10Combo_Clear[iCurrentCharacter[player]]; break; case Anime.Combo10_Max: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_10ComboMax[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_10ComboMax[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_10ComboMax[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_10ComboMax[iCurrentCharacter[player]]; break; case Anime.GoGoStart: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_GoGoStart[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_GoGoStart[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_GoGoStart[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_GoGoStart[iCurrentCharacter[player]]; break; case Anime.GoGoStart_Clear: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_GoGoStart_Clear[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_GoGoStart_Clear[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_GoGoStart_Clear[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_GoGoStart_Clear[iCurrentCharacter[player]]; break; case Anime.GoGoStart_Max: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_GoGoStartMax[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_GoGoStartMax[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_GoGoStartMax[iCurrentCharacter[player]]; break; case Anime.Become_Cleared: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_ClearIn[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_ClearIn[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_ClearIn[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_ClearIn[iCurrentCharacter[player]]; break; case Anime.Become_Maxed: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_SoulIn[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_SoulIn[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_SoulIn[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_SoulIn[iCurrentCharacter[player]]; break; case Anime.SoulOut: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_SoulOut[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_SoulOut[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_SoulOut[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_SoulOut[iCurrentCharacter[player]]; break; case Anime.ClearOut: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_ClearOut[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_ClearOut[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_ClearOut[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_ClearOut[iCurrentCharacter[player]]; break; case Anime.Return: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Motion_Return[iCurrentCharacter[player]].Length - 1; - nCharaBeat[player] = TJAPlayer3.Skin.Characters_Beat_Return[iCurrentCharacter[player]]; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Motion_Return[iCurrentCharacter[player]].Length - 1; + nCharaBeat[player] = OpenTaiko.Skin.Characters_Beat_Return[iCurrentCharacter[player]]; break; case Anime.Balloon_Breaking: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[iCurrentCharacter[player]] - 1; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Balloon_Breaking_Ptn[iCurrentCharacter[player]] - 1; nCharaBeat[player] = 0.2f; break; case Anime.Balloon_Broke: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[iCurrentCharacter[player]] - 1; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Balloon_Broke_Ptn[iCurrentCharacter[player]] - 1; nCharaBeat[player] = 0.2f; break; case Anime.Balloon_Miss: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[iCurrentCharacter[player]] - 1; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Balloon_Miss_Ptn[iCurrentCharacter[player]] - 1; nCharaBeat[player] = 0.2f; break; case Anime.Kusudama_Idle: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[iCurrentCharacter[player]] - 1; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Kusudama_Idle_Ptn[iCurrentCharacter[player]] - 1; nCharaBeat[player] = 0.4f; break; case Anime.Kusudama_Breaking: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Kusudama_Breaking_Ptn[iCurrentCharacter[player]] - 1; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Kusudama_Breaking_Ptn[iCurrentCharacter[player]] - 1; nCharaBeat[player] = 0.2f; break; case Anime.Kusudama_Broke: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Kusudama_Broke_Ptn[iCurrentCharacter[player]] - 1; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Kusudama_Broke_Ptn[iCurrentCharacter[player]] - 1; nCharaBeat[player] = 1f; break; case Anime.Kusudama_Miss: - nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Kusudama_Miss_Ptn[iCurrentCharacter[player]] - 1; + nCharaFrameCount[player] = OpenTaiko.Skin.Characters_Kusudama_Miss_Ptn[iCurrentCharacter[player]] - 1; nCharaBeat[player] = 0.5f; break; } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplChipEffects.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplChipEffects.cs index dacc0375..7fccd081 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplChipEffects.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplChipEffects.cs @@ -2,7 +2,7 @@ using FDK; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplChipEffects : CActivity { // コンストラクタ @@ -13,12 +13,12 @@ namespace TJAPlayer3 { // メソッド public virtual void Start(int nPlayer, int Lane) { - if (TJAPlayer3.Tx.Gauge_Soul_Explosion != null && TJAPlayer3.ConfigIni.nPlayerCount <= 2 && !TJAPlayer3.ConfigIni.bAIBattleMode) { + if (OpenTaiko.Tx.Gauge_Soul_Explosion != null && OpenTaiko.ConfigIni.nPlayerCount <= 2 && !OpenTaiko.ConfigIni.bAIBattleMode) { for (int i = 0; i < 128; i++) { if (!st[i].b使用中) { st[i].b使用中 = true; - st[i].ct進行 = new CCounter(0, TJAPlayer3.Skin.Game_Effect_NotesFlash[2], TJAPlayer3.Skin.Game_Effect_NotesFlash_Timer, TJAPlayer3.Timer); - st[i].ctChipEffect = new CCounter(0, 24, 17, TJAPlayer3.Timer); + st[i].ct進行 = new CCounter(0, OpenTaiko.Skin.Game_Effect_NotesFlash[2], OpenTaiko.Skin.Game_Effect_NotesFlash_Timer, OpenTaiko.Timer); + st[i].ctChipEffect = new CCounter(0, 24, 17, OpenTaiko.Timer); st[i].nプレイヤー = nPlayer; st[i].Lane = Lane; break; @@ -59,37 +59,37 @@ namespace TJAPlayer3 { switch (st[i].nプレイヤー) { case 0: - TJAPlayer3.Tx.Gauge_Soul_Explosion[TJAPlayer3.P1IsBlue() ? 1 : 0]?.t2D中心基準描画(TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[0], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[0], new Rectangle(st[i].ct進行.CurrentValue * TJAPlayer3.Skin.Game_Effect_NotesFlash[0], 0, TJAPlayer3.Skin.Game_Effect_NotesFlash[0], TJAPlayer3.Skin.Game_Effect_NotesFlash[1])); + OpenTaiko.Tx.Gauge_Soul_Explosion[OpenTaiko.P1IsBlue() ? 1 : 0]?.t2D中心基準描画(OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[0], OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[0], new Rectangle(st[i].ct進行.CurrentValue * OpenTaiko.Skin.Game_Effect_NotesFlash[0], 0, OpenTaiko.Skin.Game_Effect_NotesFlash[0], OpenTaiko.Skin.Game_Effect_NotesFlash[1])); if (this.st[i].ctChipEffect.CurrentValue < 13) NotesManager.DisplayNote( st[i].nプレイヤー, - TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[0], - TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[0], + OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[0], + OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[0], st[i].Lane); break; case 1: - TJAPlayer3.Tx.Gauge_Soul_Explosion[1]?.t2D中心基準描画(TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[1], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[1], new Rectangle(st[i].ct進行.CurrentValue * TJAPlayer3.Skin.Game_Effect_NotesFlash[0], 0, TJAPlayer3.Skin.Game_Effect_NotesFlash[0], TJAPlayer3.Skin.Game_Effect_NotesFlash[1])); + OpenTaiko.Tx.Gauge_Soul_Explosion[1]?.t2D中心基準描画(OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[1], OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[1], new Rectangle(st[i].ct進行.CurrentValue * OpenTaiko.Skin.Game_Effect_NotesFlash[0], 0, OpenTaiko.Skin.Game_Effect_NotesFlash[0], OpenTaiko.Skin.Game_Effect_NotesFlash[1])); if (this.st[i].ctChipEffect.CurrentValue < 13) NotesManager.DisplayNote( st[i].nプレイヤー, - TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[1], - TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[1], + OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[1], + OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[1], st[i].Lane); break; } - if (TJAPlayer3.Tx.ChipEffect != null) { + if (OpenTaiko.Tx.ChipEffect != null) { if (this.st[i].ctChipEffect.CurrentValue < 12) { - TJAPlayer3.Tx.ChipEffect.color4 = new Color4(1.0f, 1.0f, 0.0f, 1.0f); - TJAPlayer3.Tx.ChipEffect.Opacity = (int)(this.st[i].ctChipEffect.CurrentValue * (float)(225 / 11)); - TJAPlayer3.Tx.ChipEffect.t2D中心基準描画(TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[st[i].nプレイヤー], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[st[i].nプレイヤー], new Rectangle(st[i].Lane * TJAPlayer3.Skin.Game_Notes_Size[0], 0, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.ChipEffect.color4 = new Color4(1.0f, 1.0f, 0.0f, 1.0f); + OpenTaiko.Tx.ChipEffect.Opacity = (int)(this.st[i].ctChipEffect.CurrentValue * (float)(225 / 11)); + OpenTaiko.Tx.ChipEffect.t2D中心基準描画(OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[st[i].nプレイヤー], OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[st[i].nプレイヤー], new Rectangle(st[i].Lane * OpenTaiko.Skin.Game_Notes_Size[0], 0, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); } if (this.st[i].ctChipEffect.CurrentValue > 12 && this.st[i].ctChipEffect.CurrentValue < 24) { - TJAPlayer3.Tx.ChipEffect.color4 = new Color4(1.0f, 1.0f, 1.0f, 1.0f); - TJAPlayer3.Tx.ChipEffect.Opacity = 255 - (int)((this.st[i].ctChipEffect.CurrentValue - 10) * (float)(255 / 14)); - TJAPlayer3.Tx.ChipEffect.t2D中心基準描画(TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[st[i].nプレイヤー], TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[st[i].nプレイヤー], new Rectangle(st[i].Lane * TJAPlayer3.Skin.Game_Notes_Size[0], 0, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.ChipEffect.color4 = new Color4(1.0f, 1.0f, 1.0f, 1.0f); + OpenTaiko.Tx.ChipEffect.Opacity = 255 - (int)((this.st[i].ctChipEffect.CurrentValue - 10) * (float)(255 / 14)); + OpenTaiko.Tx.ChipEffect.t2D中心基準描画(OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[st[i].nプレイヤー], OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[st[i].nプレイヤー], new Rectangle(st[i].Lane * OpenTaiko.Skin.Game_Notes_Size[0], 0, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplClearAnimation.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplClearAnimation.cs index 80b98f7f..b34f2738 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplClearAnimation.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplClearAnimation.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplClearAnimation : CActivity { /// /// 課題 @@ -16,7 +16,7 @@ namespace TJAPlayer3 { bSongsPlayed = false; - this.ct進行メイン = new CCounter(0, 300, 22, TJAPlayer3.Timer); + this.ct進行メイン = new CCounter(0, 300, 22, OpenTaiko.Timer); /* this.ctEnd_ClearFailed = new CCounter(0, 69, 30, TJAPlayer3.Timer); @@ -27,10 +27,10 @@ namespace TJAPlayer3 { */ // モードの決定。クリア失敗・フルコンボも事前に作っとく。 - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { if (CFloorManagement.CurrentNumberOfLives > 0) { - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMine == 0) { - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGood == 0) + if (OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMine == 0) { + if (OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGood == 0) this.Mode[0] = EndMode.Tower_TopReached_Perfect; else this.Mode[0] = EndMode.Tower_TopReached_FullCombo; @@ -38,16 +38,16 @@ namespace TJAPlayer3 { this.Mode[0] = EndMode.Tower_TopReached_Pass; } else this.Mode[0] = EndMode.Tower_Dropout; - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { // 段位認定モード。 - if (!TJAPlayer3.stage演奏ドラム画面.actDan.GetFailedAllChallenges()) { + if (!OpenTaiko.stage演奏ドラム画面.actDan.GetFailedAllChallenges()) { // 段位認定モード、クリア成功 // this.Mode[0] = EndMode.StageCleared; - bool bgold = TJAPlayer3.stage演奏ドラム画面.actDan.GetExamStatus(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C) == Exam.Status.Better_Success; + bool bgold = OpenTaiko.stage演奏ドラム画面.actDan.GetExamStatus(OpenTaiko.stage結果.st演奏記録.Drums.Dan_C) == Exam.Status.Better_Success; - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMine == 0) { - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGood == 0) + if (OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMine == 0) { + if (OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGood == 0) this.Mode[0] = bgold ? EndMode.Dan_Gold_Perfect : EndMode.Dan_Red_Perfect; else this.Mode[0] = bgold ? EndMode.Dan_Gold_FullCombo : EndMode.Dan_Red_FullCombo; @@ -59,10 +59,10 @@ namespace TJAPlayer3 { // 段位認定モード、クリア失敗 this.Mode[0] = EndMode.Dan_Fail; } - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { - if (TJAPlayer3.stage演奏ドラム画面.bIsAIBattleWin) { - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMine == 0) { - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGood == 0) + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { + if (OpenTaiko.stage演奏ドラム画面.bIsAIBattleWin) { + if (OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMine == 0) { + if (OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGood == 0) this.Mode[0] = EndMode.AI_Win_Perfect; else this.Mode[0] = EndMode.AI_Win_FullCombo; @@ -75,12 +75,12 @@ namespace TJAPlayer3 { // 通常のモード。 // ここでフルコンボフラグをチェックするが現時点ではない。 // 今の段階では魂ゲージ80%以上でチェック。 - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (HGaugeMethods.UNSAFE_FastNormaCheck(i)) { - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMiss == 0 && TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMine == 0) + if (OpenTaiko.stage演奏ドラム画面.CChartScore[i].nMiss == 0 && OpenTaiko.stage演奏ドラム画面.CChartScore[i].nMine == 0) //if (TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Miss == 0) { - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGood == 0) + if (OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGood == 0) //if (TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great == 0) { this.Mode[i] = EndMode.StagePerfectCombo; @@ -104,7 +104,7 @@ namespace TJAPlayer3 { var origindir = CSkin.Path($"{TextureLoader.BASE}{TextureLoader.GAME}{TextureLoader.END}"); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { Tower_DropoutScript = new EndAnimeScript($@"{origindir}Tower_Dropout{Path.DirectorySeparatorChar}Script.lua"); Tower_DropoutScript.Init(); @@ -117,11 +117,11 @@ namespace TJAPlayer3 { Tower_TopReached_PerfectScript = new EndAnimeScript($@"{origindir}Tower_TopReached_Perfect{Path.DirectorySeparatorChar}Script.lua"); Tower_TopReached_PerfectScript.Init(); - this.soundTowerDropout = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_Dropout.ogg"), ESoundGroup.SoundEffect); - this.soundTowerTopPass = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Pass.ogg"), ESoundGroup.SoundEffect); - this.soundTowerTopFC = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundTowerTopPerfect = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Perfect.ogg"), ESoundGroup.SoundEffect); - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + this.soundTowerDropout = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_Dropout.ogg"), ESoundGroup.SoundEffect); + this.soundTowerTopPass = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Pass.ogg"), ESoundGroup.SoundEffect); + this.soundTowerTopFC = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundTowerTopPerfect = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Perfect.ogg"), ESoundGroup.SoundEffect); + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { Dan_FailScript = new EndAnimeScript($@"{origindir}Dan_Fail{Path.DirectorySeparatorChar}Script.lua"); Dan_FailScript.Init(); @@ -143,15 +143,15 @@ namespace TJAPlayer3 { Dan_Gold_PerfectScript = new EndAnimeScript($@"{origindir}Dan_Gold_Perfect{Path.DirectorySeparatorChar}Script.lua"); Dan_Gold_PerfectScript.Init(); - this.soundDanFailed = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Fail.ogg"), ESoundGroup.SoundEffect); - this.soundDanRedClear = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_Pass.ogg"), ESoundGroup.SoundEffect); - this.soundDanRedFC = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundDanRedPerfect = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_Perfect.ogg"), ESoundGroup.SoundEffect); - this.soundDanGoldClear = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_Pass.ogg"), ESoundGroup.SoundEffect); - this.soundDanGoldFC = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundDanGoldPerfect = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_Perfect.ogg"), ESoundGroup.SoundEffect); + this.soundDanFailed = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Fail.ogg"), ESoundGroup.SoundEffect); + this.soundDanRedClear = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_Pass.ogg"), ESoundGroup.SoundEffect); + this.soundDanRedFC = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundDanRedPerfect = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_Perfect.ogg"), ESoundGroup.SoundEffect); + this.soundDanGoldClear = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_Pass.ogg"), ESoundGroup.SoundEffect); + this.soundDanGoldFC = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundDanGoldPerfect = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_Perfect.ogg"), ESoundGroup.SoundEffect); - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { AILoseScript = new EndAnimeScript($@"{origindir}AI_Lose{Path.DirectorySeparatorChar}Script.lua"); AILoseScript.Init(); @@ -164,10 +164,10 @@ namespace TJAPlayer3 { AIWin_PerfectScript = new EndAnimeScript($@"{origindir}AI_Win_Perfect{Path.DirectorySeparatorChar}Script.lua"); AIWin_PerfectScript.Init(); - this.soundAILose = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Lose.ogg"), ESoundGroup.SoundEffect); - this.soundAIWin = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win.ogg"), ESoundGroup.SoundEffect); - this.soundAIWinFullCombo = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win_FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundAIWinPerfectCombo = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win_AllPerfect.ogg"), ESoundGroup.SoundEffect); + this.soundAILose = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Lose.ogg"), ESoundGroup.SoundEffect); + this.soundAIWin = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win.ogg"), ESoundGroup.SoundEffect); + this.soundAIWinFullCombo = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win_FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundAIWinPerfectCombo = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win_AllPerfect.ogg"), ESoundGroup.SoundEffect); } else { FailedScript = new EndAnimeScript($@"{origindir}ClearFailed{Path.DirectorySeparatorChar}Script.lua");//ClearFailed FailedScript.Init(); @@ -189,12 +189,12 @@ namespace TJAPlayer3 { public override void DeActivate() { this.ct進行メイン = null; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { Tower_DropoutScript.Dispose(); Tower_TopReached_PassScript.Dispose(); Tower_TopReached_FullComboScript.Dispose(); Tower_TopReached_PerfectScript.Dispose(); - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { Dan_FailScript.Dispose(); Dan_Red_PassScript.Dispose(); Dan_Red_FullComboScript.Dispose(); @@ -202,7 +202,7 @@ namespace TJAPlayer3 { Dan_Gold_PassScript.Dispose(); Dan_Gold_FullComboScript.Dispose(); Dan_Gold_PerfectScript.Dispose(); - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { AILoseScript.Dispose(); AIWinScript.Dispose(); AIWin_FullComboScript.Dispose(); @@ -220,28 +220,28 @@ namespace TJAPlayer3 { public override void CreateManagedResource() { this.b再生済み = false; - this.soundTowerDropout = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_Dropout.ogg"), ESoundGroup.SoundEffect); - this.soundTowerTopPass = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Pass.ogg"), ESoundGroup.SoundEffect); - this.soundTowerTopFC = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundTowerTopPerfect = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Perfect.ogg"), ESoundGroup.SoundEffect); + this.soundTowerDropout = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_Dropout.ogg"), ESoundGroup.SoundEffect); + this.soundTowerTopPass = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Pass.ogg"), ESoundGroup.SoundEffect); + this.soundTowerTopFC = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundTowerTopPerfect = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Tower{Path.DirectorySeparatorChar}Tower_TopReached_Perfect.ogg"), ESoundGroup.SoundEffect); - this.soundDanFailed = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Fail.ogg"), ESoundGroup.SoundEffect); - this.soundDanRedClear = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_Pass.ogg"), ESoundGroup.SoundEffect); - this.soundDanRedFC = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundDanRedPerfect = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_Perfect.ogg"), ESoundGroup.SoundEffect); - this.soundDanGoldClear = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_Pass.ogg"), ESoundGroup.SoundEffect); - this.soundDanGoldFC = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundDanGoldPerfect = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_Perfect.ogg"), ESoundGroup.SoundEffect); + this.soundDanFailed = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Fail.ogg"), ESoundGroup.SoundEffect); + this.soundDanRedClear = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_Pass.ogg"), ESoundGroup.SoundEffect); + this.soundDanRedFC = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundDanRedPerfect = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Red_Perfect.ogg"), ESoundGroup.SoundEffect); + this.soundDanGoldClear = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_Pass.ogg"), ESoundGroup.SoundEffect); + this.soundDanGoldFC = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundDanGoldPerfect = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Dan_Gold_Perfect.ogg"), ESoundGroup.SoundEffect); - this.soundAILose = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Lose.ogg"), ESoundGroup.SoundEffect); - this.soundAIWin = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win.ogg"), ESoundGroup.SoundEffect); - this.soundAIWinFullCombo = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win_FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundAIWinPerfectCombo = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win_AllPerfect.ogg"), ESoundGroup.SoundEffect); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - this.soundClear[i] = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Clear.ogg"), ESoundGroup.SoundEffect); - this.soundFailed[i] = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Failed.ogg"), ESoundGroup.SoundEffect); - this.soundFullCombo[i] = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}FullCombo.ogg"), ESoundGroup.SoundEffect); - this.soundPerfectCombo[i] = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AllPerfect.ogg"), ESoundGroup.SoundEffect); + this.soundAILose = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Lose.ogg"), ESoundGroup.SoundEffect); + this.soundAIWin = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win.ogg"), ESoundGroup.SoundEffect); + this.soundAIWinFullCombo = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win_FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundAIWinPerfectCombo = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AIBattle_Win_AllPerfect.ogg"), ESoundGroup.SoundEffect); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + this.soundClear[i] = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Clear.ogg"), ESoundGroup.SoundEffect); + this.soundFailed[i] = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Failed.ogg"), ESoundGroup.SoundEffect); + this.soundFullCombo[i] = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}FullCombo.ogg"), ESoundGroup.SoundEffect); + this.soundPerfectCombo[i] = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}AllPerfect.ogg"), ESoundGroup.SoundEffect); } base.CreateManagedResource(); @@ -266,7 +266,7 @@ namespace TJAPlayer3 { this.soundAIWinFullCombo?.tDispose(); this.soundAIWinPerfectCombo?.tDispose(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { this.soundClear[i]?.tDispose(); this.soundFailed[i]?.tDispose(); this.soundFullCombo[i]?.tDispose(); @@ -279,7 +279,7 @@ namespace TJAPlayer3 { #region [effects] // ------------------------------------ private void showEndEffect_Failed(int i) { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) FailedScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) FailedScript.Update(i); FailedScript.Draw(i); int[] y = new int[] { 0, 176 }; @@ -306,7 +306,7 @@ namespace TJAPlayer3 { */ } private void showEndEffect_Clear(int i) { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) ClearScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) ClearScript.Update(i); ClearScript.Draw(i); /* @@ -482,7 +482,7 @@ namespace TJAPlayer3 { } private void showEndEffect_FullCombo(int i) { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) FullComboScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) FullComboScript.Update(i); FullComboScript.Draw(i); /* @@ -500,7 +500,7 @@ namespace TJAPlayer3 { } private void showEndEffect_PerfectCombo(int i) { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) PerfectComboScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) PerfectComboScript.Update(i); PerfectComboScript.Draw(i); /* @@ -525,114 +525,114 @@ namespace TJAPlayer3 { if (base.IsFirstDraw) { base.IsFirstDraw = false; } - if (this.ct進行メイン != null && (TJAPlayer3.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_EndStage || TJAPlayer3.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_STAGE_FAILED || TJAPlayer3.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_STAGE_CLEAR_FadeOut)) { + if (this.ct進行メイン != null && (OpenTaiko.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_EndStage || OpenTaiko.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_STAGE_FAILED || OpenTaiko.stage演奏ドラム画面.ePhaseID == CStage.EPhase.Game_STAGE_CLEAR_FadeOut)) { this.ct進行メイン.Tick(); //CDTXMania.act文字コンソール.tPrint( 0, 0, C文字コンソール.Eフォント種別.灰, this.ct進行メイン.n現在の値.ToString() ); //仮置き if (!bSongsPlayed) { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (i == 1 && TJAPlayer3.ConfigIni.bAIBattleMode) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (i == 1 && OpenTaiko.ConfigIni.bAIBattleMode) break; switch (this.Mode[i]) { case EndMode.StageFailed: FailedScript.PlayEndAnime(i); this.soundFailed[i]?.PlayStart(); - TJAPlayer3.Skin.voiceClearFailed[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearFailed[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.StageCleared: ClearScript.PlayEndAnime(i); this.soundClear[i]?.PlayStart(); - TJAPlayer3.Skin.voiceClearClear[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearClear[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.StageFullCombo: FullComboScript.PlayEndAnime(i); this.soundFullCombo[i]?.PlayStart(); - TJAPlayer3.Skin.voiceClearFullCombo[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearFullCombo[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.StagePerfectCombo: PerfectComboScript.PlayEndAnime(i); this.soundPerfectCombo[i]?.PlayStart(); - TJAPlayer3.Skin.voiceClearAllPerfect[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearAllPerfect[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.AI_Lose: AILoseScript.PlayEndAnime(i); this.soundAILose?.PlayStart(); - TJAPlayer3.Skin.voiceAILose[TJAPlayer3.GetActualPlayer(1)]?.tPlay(); + OpenTaiko.Skin.voiceAILose[OpenTaiko.GetActualPlayer(1)]?.tPlay(); break; case EndMode.AI_Win: AIWinScript.PlayEndAnime(i); this.soundAIWin?.PlayStart(); - TJAPlayer3.Skin.voiceAIWin[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceAIWin[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.AI_Win_FullCombo: AIWin_FullComboScript.PlayEndAnime(i); this.soundAIWinFullCombo?.PlayStart(); - TJAPlayer3.Skin.voiceAIWin[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceAIWin[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.AI_Win_Perfect: AIWin_PerfectScript.PlayEndAnime(i); this.soundAIWinPerfectCombo?.PlayStart(); - TJAPlayer3.Skin.voiceAIWin[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceAIWin[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Tower_Dropout: Tower_DropoutScript.PlayEndAnime(i); this.soundTowerDropout?.PlayStart(); - TJAPlayer3.Skin.voiceClearFailed[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearFailed[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Tower_TopReached_Pass: Tower_TopReached_PassScript.PlayEndAnime(i); this.soundTowerTopPass?.PlayStart(); - TJAPlayer3.Skin.voiceClearClear[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearClear[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Tower_TopReached_FullCombo: Tower_TopReached_FullComboScript.PlayEndAnime(i); this.soundTowerTopFC?.PlayStart(); - TJAPlayer3.Skin.voiceClearFullCombo[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearFullCombo[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Tower_TopReached_Perfect: Tower_TopReached_PerfectScript.PlayEndAnime(i); this.soundTowerTopPerfect?.PlayStart(); - TJAPlayer3.Skin.voiceClearAllPerfect[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearAllPerfect[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Dan_Fail: Dan_FailScript.PlayEndAnime(i); this.soundDanFailed?.PlayStart(); - TJAPlayer3.Skin.voiceClearFailed[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearFailed[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Dan_Red_Pass: Dan_Red_PassScript.PlayEndAnime(i); this.soundDanRedClear?.PlayStart(); - TJAPlayer3.Skin.voiceClearClear[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearClear[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Dan_Red_FullCombo: Dan_Red_FullComboScript.PlayEndAnime(i); this.soundDanRedFC?.PlayStart(); - TJAPlayer3.Skin.voiceClearFullCombo[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearFullCombo[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Dan_Red_Perfect: Dan_Red_PerfectScript.PlayEndAnime(i); this.soundDanRedPerfect?.PlayStart(); - TJAPlayer3.Skin.voiceClearAllPerfect[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearAllPerfect[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Dan_Gold_Pass: Dan_Gold_PassScript.PlayEndAnime(i); this.soundDanGoldClear?.PlayStart(); - TJAPlayer3.Skin.voiceClearClear[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearClear[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Dan_Gold_FullCombo: Dan_Gold_FullComboScript.PlayEndAnime(i); this.soundDanGoldFC?.PlayStart(); - TJAPlayer3.Skin.voiceClearFullCombo[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearFullCombo[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; case EndMode.Dan_Gold_Perfect: Dan_Gold_PerfectScript.PlayEndAnime(i); this.soundDanGoldPerfect?.PlayStart(); - TJAPlayer3.Skin.voiceClearAllPerfect[TJAPlayer3.GetActualPlayer(i)]?.tPlay(); + OpenTaiko.Skin.voiceClearAllPerfect[OpenTaiko.GetActualPlayer(i)]?.tPlay(); break; default: @@ -644,8 +644,8 @@ namespace TJAPlayer3 { } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (i == 1 && TJAPlayer3.ConfigIni.bAIBattleMode) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (i == 1 && OpenTaiko.ConfigIni.bAIBattleMode) break; switch (this.Mode[i]) { case EndMode.StageFailed: @@ -662,65 +662,65 @@ namespace TJAPlayer3 { break; case EndMode.AI_Win: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) AIWinScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) AIWinScript.Update(i); AIWinScript.Draw(i); break; case EndMode.AI_Lose: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) AILoseScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) AILoseScript.Update(i); AILoseScript.Draw(i); break; case EndMode.AI_Win_FullCombo: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) AIWin_FullComboScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) AIWin_FullComboScript.Update(i); AIWin_FullComboScript.Draw(i); break; case EndMode.AI_Win_Perfect: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) AIWin_PerfectScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) AIWin_PerfectScript.Update(i); AIWin_PerfectScript.Draw(i); break; case EndMode.Tower_Dropout: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Tower_DropoutScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Tower_DropoutScript.Update(i); Tower_DropoutScript.Draw(i); break; case EndMode.Tower_TopReached_Pass: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Tower_TopReached_PassScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Tower_TopReached_PassScript.Update(i); Tower_TopReached_PassScript.Draw(i); break; case EndMode.Tower_TopReached_FullCombo: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Tower_TopReached_FullComboScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Tower_TopReached_FullComboScript.Update(i); Tower_TopReached_FullComboScript.Draw(i); break; case EndMode.Tower_TopReached_Perfect: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Tower_TopReached_PerfectScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Tower_TopReached_PerfectScript.Update(i); Tower_TopReached_PerfectScript.Draw(i); break; case EndMode.Dan_Fail: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Dan_FailScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Dan_FailScript.Update(i); Dan_FailScript.Draw(i); break; case EndMode.Dan_Red_Pass: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Dan_Red_PassScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Dan_Red_PassScript.Update(i); Dan_Red_PassScript.Draw(i); break; case EndMode.Dan_Red_FullCombo: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Dan_Red_FullComboScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Dan_Red_FullComboScript.Update(i); Dan_Red_FullComboScript.Draw(i); break; case EndMode.Dan_Red_Perfect: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Dan_Red_PerfectScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Dan_Red_PerfectScript.Update(i); Dan_Red_PerfectScript.Draw(i); break; case EndMode.Dan_Gold_Pass: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Dan_Gold_PassScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Dan_Gold_PassScript.Update(i); Dan_Gold_PassScript.Draw(i); break; case EndMode.Dan_Gold_FullCombo: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Dan_Gold_FullComboScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Dan_Gold_FullComboScript.Update(i); Dan_Gold_FullComboScript.Draw(i); break; case EndMode.Dan_Gold_Perfect: - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) Dan_Gold_PerfectScript.Update(i); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) Dan_Gold_PerfectScript.Update(i); Dan_Gold_PerfectScript.Draw(i); break; default: diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplCombo.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplCombo.cs index bca44cfe..1b9f2db6 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplCombo.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplCombo.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplCombo : CAct演奏Combo共通 { // CAct演奏Combo共通 実装 diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplComboBalloon.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplComboBalloon.cs index 26e7cdaf..77507d10 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplComboBalloon.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplComboBalloon.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplComboBalloon : CActivity { // コンストラクタ @@ -22,7 +22,7 @@ namespace TJAPlayer3 { // メソッド public virtual void Start(int nCombo, int player) { this.NowDrawBalloon = 0; - this.ct進行[player] = new CCounter(1, 42, 70, TJAPlayer3.Timer); + this.ct進行[player] = new CCounter(1, 42, 70, OpenTaiko.Timer); this.nCombo_渡[player] = nCombo; } @@ -50,12 +50,12 @@ namespace TJAPlayer3 { } public override int Draw() { if (!base.IsDeActivated) { - if (TJAPlayer3.ConfigIni.nPlayerCount > 2 || TJAPlayer3.ConfigIni.SimpleMode) return 0; + if (OpenTaiko.ConfigIni.nPlayerCount > 2 || OpenTaiko.ConfigIni.SimpleMode) return 0; for (int i = 0; i < 2; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode) break; + if (OpenTaiko.ConfigIni.bAIBattleMode) break; int j = i; - if (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1) + if (OpenTaiko.PlayerSide == 1 && OpenTaiko.ConfigIni.nPlayerCount == 1) j = 1; if (!this.ct進行[i].IsStoped) { @@ -65,48 +65,48 @@ namespace TJAPlayer3 { } } - if (TJAPlayer3.Tx.Balloon_Combo[j] != null && TJAPlayer3.Tx.Balloon_Number_Combo != null) { + if (OpenTaiko.Tx.Balloon_Combo[j] != null && OpenTaiko.Tx.Balloon_Number_Combo != null) { //半透明4f if (this.ct進行[i].CurrentValue == 1 || this.ct進行[i].CurrentValue == 42) { - TJAPlayer3.Tx.Balloon_Number_Combo.Opacity = 0; - TJAPlayer3.Tx.Balloon_Combo[j].Opacity = 64; + OpenTaiko.Tx.Balloon_Number_Combo.Opacity = 0; + OpenTaiko.Tx.Balloon_Combo[j].Opacity = 64; NowDrawBalloon = 0; } else if (this.ct進行[i].CurrentValue == 2 || this.ct進行[i].CurrentValue == 41) { - TJAPlayer3.Tx.Balloon_Number_Combo.Opacity = 0; - TJAPlayer3.Tx.Balloon_Combo[j].Opacity = 128; + OpenTaiko.Tx.Balloon_Number_Combo.Opacity = 0; + OpenTaiko.Tx.Balloon_Combo[j].Opacity = 128; NowDrawBalloon = 0; } else if (this.ct進行[i].CurrentValue == 3 || this.ct進行[i].CurrentValue == 40) { NowDrawBalloon = 1; - TJAPlayer3.Tx.Balloon_Combo[j].Opacity = 255; - TJAPlayer3.Tx.Balloon_Number_Combo.Opacity = 128; + OpenTaiko.Tx.Balloon_Combo[j].Opacity = 255; + OpenTaiko.Tx.Balloon_Number_Combo.Opacity = 128; } else if (this.ct進行[i].CurrentValue == 4 || this.ct進行[i].CurrentValue == 39) { NowDrawBalloon = 2; - TJAPlayer3.Tx.Balloon_Combo[j].Opacity = 255; - TJAPlayer3.Tx.Balloon_Number_Combo.Opacity = 255; + OpenTaiko.Tx.Balloon_Combo[j].Opacity = 255; + OpenTaiko.Tx.Balloon_Number_Combo.Opacity = 255; } else if (this.ct進行[i].CurrentValue == 5 || this.ct進行[i].CurrentValue == 38) { NowDrawBalloon = 2; - TJAPlayer3.Tx.Balloon_Combo[j].Opacity = 255; - TJAPlayer3.Tx.Balloon_Number_Combo.Opacity = 255; + OpenTaiko.Tx.Balloon_Combo[j].Opacity = 255; + OpenTaiko.Tx.Balloon_Number_Combo.Opacity = 255; } else if (this.ct進行[i].CurrentValue >= 6 || this.ct進行[i].CurrentValue <= 37) { NowDrawBalloon = 2; - TJAPlayer3.Tx.Balloon_Combo[j].Opacity = 255; - TJAPlayer3.Tx.Balloon_Number_Combo.Opacity = 255; + OpenTaiko.Tx.Balloon_Combo[j].Opacity = 255; + OpenTaiko.Tx.Balloon_Number_Combo.Opacity = 255; } if (this.ct進行[i].IsTicked) { - int plate_width = TJAPlayer3.Tx.Balloon_Combo[j].szTextureSize.Width / 3; - int plate_height = TJAPlayer3.Tx.Balloon_Combo[j].szTextureSize.Height; - TJAPlayer3.Tx.Balloon_Combo[j].t2D描画(TJAPlayer3.Skin.Game_Balloon_Combo_X[i], TJAPlayer3.Skin.Game_Balloon_Combo_Y[i], new RectangleF(NowDrawBalloon * plate_width, 0, plate_width, plate_height)); + int plate_width = OpenTaiko.Tx.Balloon_Combo[j].szTextureSize.Width / 3; + int plate_height = OpenTaiko.Tx.Balloon_Combo[j].szTextureSize.Height; + OpenTaiko.Tx.Balloon_Combo[j].t2D描画(OpenTaiko.Skin.Game_Balloon_Combo_X[i], OpenTaiko.Skin.Game_Balloon_Combo_Y[i], new RectangleF(NowDrawBalloon * plate_width, 0, plate_width, plate_height)); if (this.nCombo_渡[i] < 1000) //2016.08.23 kairera0467 仮実装。 { - this.t小文字表示(TJAPlayer3.Skin.Game_Balloon_Combo_Number_X[i], TJAPlayer3.Skin.Game_Balloon_Combo_Number_Y[i], this.nCombo_渡[i], j); - TJAPlayer3.Tx.Balloon_Number_Combo.t2D描画(TJAPlayer3.Skin.Game_Balloon_Combo_Text_X[i] + 6 - NowDrawBalloon * 3, TJAPlayer3.Skin.Game_Balloon_Combo_Text_Y[i], - new Rectangle(TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[0], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[1], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[2], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[3])); + this.t小文字表示(OpenTaiko.Skin.Game_Balloon_Combo_Number_X[i], OpenTaiko.Skin.Game_Balloon_Combo_Number_Y[i], this.nCombo_渡[i], j); + OpenTaiko.Tx.Balloon_Number_Combo.t2D描画(OpenTaiko.Skin.Game_Balloon_Combo_Text_X[i] + 6 - NowDrawBalloon * 3, OpenTaiko.Skin.Game_Balloon_Combo_Text_Y[i], + new Rectangle(OpenTaiko.Skin.Game_Balloon_Combo_Text_Rect[0], OpenTaiko.Skin.Game_Balloon_Combo_Text_Rect[1], OpenTaiko.Skin.Game_Balloon_Combo_Text_Rect[2], OpenTaiko.Skin.Game_Balloon_Combo_Text_Rect[3])); } else { - this.t小文字表示(TJAPlayer3.Skin.Game_Balloon_Combo_Number_Ex_X[i], TJAPlayer3.Skin.Game_Balloon_Combo_Number_Ex_Y[i], this.nCombo_渡[i], j); - TJAPlayer3.Tx.Balloon_Number_Combo.vcScaleRatio.X = 1.0f; - TJAPlayer3.Tx.Balloon_Number_Combo.t2D描画(TJAPlayer3.Skin.Game_Balloon_Combo_Text_Ex_X[i] + 6 - NowDrawBalloon * 3, TJAPlayer3.Skin.Game_Balloon_Combo_Text_Ex_Y[i], - new Rectangle(TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[0], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[1], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[2], TJAPlayer3.Skin.Game_Balloon_Combo_Text_Rect[3])); + this.t小文字表示(OpenTaiko.Skin.Game_Balloon_Combo_Number_Ex_X[i], OpenTaiko.Skin.Game_Balloon_Combo_Number_Ex_Y[i], this.nCombo_渡[i], j); + OpenTaiko.Tx.Balloon_Number_Combo.vcScaleRatio.X = 1.0f; + OpenTaiko.Tx.Balloon_Number_Combo.t2D描画(OpenTaiko.Skin.Game_Balloon_Combo_Text_Ex_X[i] + 6 - NowDrawBalloon * 3, OpenTaiko.Skin.Game_Balloon_Combo_Text_Ex_Y[i], + new Rectangle(OpenTaiko.Skin.Game_Balloon_Combo_Text_Rect[0], OpenTaiko.Skin.Game_Balloon_Combo_Text_Rect[1], OpenTaiko.Skin.Game_Balloon_Combo_Text_Rect[2], OpenTaiko.Skin.Game_Balloon_Combo_Text_Rect[3])); } } } @@ -141,13 +141,13 @@ namespace TJAPlayer3 { private void t小文字表示(int x, int y, int num, int player) { int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { - float _x = x - (TJAPlayer3.Skin.Game_Balloon_Combo_Number_Interval[0] * (j - nums.Length)); - float _y = y - (TJAPlayer3.Skin.Game_Balloon_Combo_Number_Interval[1] * (j - nums.Length)); + float _x = x - (OpenTaiko.Skin.Game_Balloon_Combo_Number_Interval[0] * (j - nums.Length)); + float _y = y - (OpenTaiko.Skin.Game_Balloon_Combo_Number_Interval[1] * (j - nums.Length)); - float width = TJAPlayer3.Skin.Game_Balloon_Combo_Number_Size[0]; - float height = TJAPlayer3.Skin.Game_Balloon_Combo_Number_Size[1]; + float width = OpenTaiko.Skin.Game_Balloon_Combo_Number_Size[0]; + float height = OpenTaiko.Skin.Game_Balloon_Combo_Number_Size[1]; - TJAPlayer3.Tx.Balloon_Number_Combo.t2D描画(_x, _y, new RectangleF(width * nums[j], height * player, width, height)); + OpenTaiko.Tx.Balloon_Number_Combo.t2D描画(_x, _y, new RectangleF(width * nums[j], height * player, width, height)); } } //----------------- diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplDancer.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplDancer.cs index c6117776..6fcb4ce8 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplDancer.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplDancer.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplDancer : CActivity { /// /// 踊り子 @@ -13,7 +13,7 @@ namespace TJAPlayer3 { public override void Activate() { //this.ct踊り子モーション = new CCounter(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) return; var preset = HScenePreset.GetBGPreset(); @@ -47,32 +47,32 @@ namespace TJAPlayer3 { nNowDancerInCounter = new float[nDancerCount]; nNowDancerOutCounter = new float[nDancerCount]; - nDancerInPtn = TJAPlayer3.t連番画像の枚数を数える($@"{path}{Path.DirectorySeparatorChar}1_In{Path.DirectorySeparatorChar}"); + nDancerInPtn = OpenTaiko.t連番画像の枚数を数える($@"{path}{Path.DirectorySeparatorChar}1_In{Path.DirectorySeparatorChar}"); if (nDancerInPtn != 0) { for (int i = 0; i < nDancerCount; i++) { Dancer_In[i] = new CTexture[nDancerInPtn]; for (int p = 0; p < nDancerInPtn; p++) { - Dancer_In[i][p] = TJAPlayer3.tテクスチャの生成($@"{path}{Path.DirectorySeparatorChar}{(i + 1)}_In{Path.DirectorySeparatorChar}{p}.png"); + Dancer_In[i][p] = OpenTaiko.tテクスチャの生成($@"{path}{Path.DirectorySeparatorChar}{(i + 1)}_In{Path.DirectorySeparatorChar}{p}.png"); } } } - nDancerOutPtn = TJAPlayer3.t連番画像の枚数を数える($@"{path}{Path.DirectorySeparatorChar}1_Out{Path.DirectorySeparatorChar}"); + nDancerOutPtn = OpenTaiko.t連番画像の枚数を数える($@"{path}{Path.DirectorySeparatorChar}1_Out{Path.DirectorySeparatorChar}"); if (nDancerOutPtn != 0) { for (int i = 0; i < nDancerCount; i++) { Dancer_Out[i] = new CTexture[nDancerOutPtn]; for (int p = 0; p < nDancerOutPtn; p++) { - Dancer_Out[i][p] = TJAPlayer3.tテクスチャの生成($@"{path}{Path.DirectorySeparatorChar}{(i + 1)}_Out{Path.DirectorySeparatorChar}{p}.png"); + Dancer_Out[i][p] = OpenTaiko.tテクスチャの生成($@"{path}{Path.DirectorySeparatorChar}{(i + 1)}_Out{Path.DirectorySeparatorChar}{p}.png"); } } } - nDancerPtn = TJAPlayer3.t連番画像の枚数を数える($@"{path}{Path.DirectorySeparatorChar}1{Path.DirectorySeparatorChar}"); + nDancerPtn = OpenTaiko.t連番画像の枚数を数える($@"{path}{Path.DirectorySeparatorChar}1{Path.DirectorySeparatorChar}"); if (nDancerPtn != 0) { for (int i = 0; i < nDancerCount; i++) { Dancer[i] = new CTexture[nDancerPtn]; for (int p = 0; p < nDancerPtn; p++) { - Dancer[i][p] = TJAPlayer3.tテクスチャの生成($@"{path}{Path.DirectorySeparatorChar}{(i + 1)}{Path.DirectorySeparatorChar}{p}.png"); + Dancer[i][p] = OpenTaiko.tテクスチャの生成($@"{path}{Path.DirectorySeparatorChar}{(i + 1)}{Path.DirectorySeparatorChar}{p}.png"); } } } @@ -85,7 +85,7 @@ namespace TJAPlayer3 { arMotionArray_Out = CConversion.StringToIntArray(Game_Dancer_Out_Motion); if (this.arMotionArray_Out == null) arMotionArray_Out = CConversion.StringToIntArray("0,0"); - this.ar踊り子モーション番号 = CConversion.StringToIntArray(TJAPlayer3.Skin.Game_Dancer_Motion); + this.ar踊り子モーション番号 = CConversion.StringToIntArray(OpenTaiko.Skin.Game_Dancer_Motion); if (this.ar踊り子モーション番号 == null) ar踊り子モーション番号 = CConversion.StringToIntArray("0,0"); nNowDancerCounter = 0; @@ -95,15 +95,15 @@ namespace TJAPlayer3 { } public override void DeActivate() { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) return; //this.ct踊り子モーション = null; for (int i = 0; i < nDancerCount; i++) { - TJAPlayer3.t安全にDisposeする(ref Dancer_In[i]); - TJAPlayer3.t安全にDisposeする(ref Dancer_Out[i]); - TJAPlayer3.t安全にDisposeする(ref Dancer[i]); + OpenTaiko.t安全にDisposeする(ref Dancer_In[i]); + OpenTaiko.t安全にDisposeする(ref Dancer_Out[i]); + OpenTaiko.t安全にDisposeする(ref Dancer[i]); } base.DeActivate(); @@ -122,16 +122,16 @@ namespace TJAPlayer3 { this.IsFirstDraw = true; } - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { - if (TJAPlayer3.ConfigIni.ShowDancer && (this.ar踊り子モーション番号.Length - 1) != 0) { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) nNowDancerCounter += Math.Abs((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] / 60.0f) * (float)TJAPlayer3.FPS.DeltaTime / nDancerBeat; + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { + if (OpenTaiko.ConfigIni.ShowDancer && (this.ar踊り子モーション番号.Length - 1) != 0) { + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) nNowDancerCounter += Math.Abs((float)OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[0] / 60.0f) * (float)OpenTaiko.FPS.DeltaTime / nDancerBeat; if (nNowDancerCounter >= 1) { nNowDancerCounter = 0; } nNowDancerFrame = (int)(nNowDancerCounter * (this.ar踊り子モーション番号.Length - 1)); for (int i = 0; i < nDancerCount; i++) { - if ((int)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[0] >= TJAPlayer3.Skin.Game_Dancer_Gauge[i]) { + if ((int)OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値[0] >= OpenTaiko.Skin.Game_Dancer_Gauge[i]) { if (DancerStates[i] == 0) { DancerStates[i] = 1; nNowDancerInCounter[i] = 0; @@ -150,7 +150,7 @@ namespace TJAPlayer3 { if (nDancerInInterval == 0) { DancerStates[i] = 3; } else { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) nNowDancerInCounter[i] += Math.Abs((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] / nDancerInInterval) * (float)TJAPlayer3.FPS.DeltaTime; + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) nNowDancerInCounter[i] += Math.Abs((float)OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[0] / nDancerInInterval) * (float)OpenTaiko.FPS.DeltaTime; if (nNowDancerInCounter[i] >= 1) { nNowDancerInCounter[i] = 1; @@ -159,7 +159,7 @@ namespace TJAPlayer3 { int frame = (int)(nNowDancerInCounter[i] * (this.arMotionArray_In.Length - 1)); if (this.Dancer_In[i] != null && this.Dancer_In[i].Length > 0 && this.Dancer_In[i][this.arMotionArray_In[frame]] != null) { - this.Dancer_In[i][this.arMotionArray_In[frame]].t2D中心基準描画(TJAPlayer3.Skin.Game_Dancer_X[i], TJAPlayer3.Skin.Game_Dancer_Y[i]); + this.Dancer_In[i][this.arMotionArray_In[frame]].t2D中心基準描画(OpenTaiko.Skin.Game_Dancer_X[i], OpenTaiko.Skin.Game_Dancer_Y[i]); } } @@ -169,7 +169,7 @@ namespace TJAPlayer3 { if (nDancerOutInterval == 0) { DancerStates[i] = 0; } else { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) nNowDancerOutCounter[i] += Math.Abs((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0] / nDancerOutInterval) * (float)TJAPlayer3.FPS.DeltaTime; + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) nNowDancerOutCounter[i] += Math.Abs((float)OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[0] / nDancerOutInterval) * (float)OpenTaiko.FPS.DeltaTime; if (nNowDancerOutCounter[i] >= 1) { nNowDancerOutCounter[i] = 1; @@ -178,14 +178,14 @@ namespace TJAPlayer3 { int frame = (int)(nNowDancerOutCounter[i] * (this.arMotionArray_Out.Length - 1)); if (this.Dancer_Out[i] != null && this.Dancer_Out[i].Length > 0 && this.Dancer_Out[i][this.arMotionArray_Out[frame]] != null) { - this.Dancer_Out[i][this.arMotionArray_Out[frame]].t2D中心基準描画(TJAPlayer3.Skin.Game_Dancer_X[i], TJAPlayer3.Skin.Game_Dancer_Y[i]); + this.Dancer_Out[i][this.arMotionArray_Out[frame]].t2D中心基準描画(OpenTaiko.Skin.Game_Dancer_X[i], OpenTaiko.Skin.Game_Dancer_Y[i]); } } } break; case 3: if (this.Dancer[i] != null && this.Dancer[i].Length > 0 && this.Dancer[i][this.ar踊り子モーション番号[nNowDancerFrame]] != null) { - this.Dancer[i][this.ar踊り子モーション番号[nNowDancerFrame]].t2D中心基準描画(TJAPlayer3.Skin.Game_Dancer_X[i], TJAPlayer3.Skin.Game_Dancer_Y[i]); + this.Dancer[i][this.ar踊り子モーション番号[nNowDancerFrame]].t2D中心基準描画(OpenTaiko.Skin.Game_Dancer_X[i], OpenTaiko.Skin.Game_Dancer_Y[i]); } break; } @@ -222,13 +222,13 @@ namespace TJAPlayer3 { private void LoadDancerConifg(string dancerPath) { var _str = ""; - TJAPlayer3.Skin.LoadSkinConfigFromFile(dancerPath + @$"{Path.DirectorySeparatorChar}DancerConfig.txt", ref _str); + OpenTaiko.Skin.LoadSkinConfigFromFile(dancerPath + @$"{Path.DirectorySeparatorChar}DancerConfig.txt", ref _str); string[] delimiter = { "\n" }; string[] strSingleLine = _str.Split(delimiter, StringSplitOptions.RemoveEmptyEntries); - TJAPlayer3.Skin.Game_Dancer_X = new int[] { 640, 430, 856, 215, 1070 }; - TJAPlayer3.Skin.Game_Dancer_Y = new int[] { 500, 500, 500, 500, 500 }; + OpenTaiko.Skin.Game_Dancer_X = new int[] { 640, 430, 856, 215, 1070 }; + OpenTaiko.Skin.Game_Dancer_Y = new int[] { 500, 500, 500, 500, 500 }; nDancerCount = 5; nDancerInInterval = 0; nDancerOutInterval = 0; @@ -247,20 +247,20 @@ namespace TJAPlayer3 { if (strCommand == "Game_Dancer_Count") { nDancerCount = int.Parse(strParam); - TJAPlayer3.Skin.Game_Dancer_X = new int[nDancerCount]; - TJAPlayer3.Skin.Game_Dancer_Y = new int[nDancerCount]; + OpenTaiko.Skin.Game_Dancer_X = new int[nDancerCount]; + OpenTaiko.Skin.Game_Dancer_Y = new int[nDancerCount]; } else if (strCommand == "Game_Dancer_X") { string[] strSplit = strParam.Split(','); for (int i = 0; i < nDancerCount; i++) { - TJAPlayer3.Skin.Game_Dancer_X[i] = int.Parse(strSplit[i]); + OpenTaiko.Skin.Game_Dancer_X[i] = int.Parse(strSplit[i]); } } else if (strCommand == "Game_Dancer_Y") { string[] strSplit = strParam.Split(','); for (int i = 0; i < nDancerCount; i++) { - TJAPlayer3.Skin.Game_Dancer_Y[i] = int.Parse(strSplit[i]); + OpenTaiko.Skin.Game_Dancer_Y[i] = int.Parse(strSplit[i]); } } else if (strCommand == "Game_Dancer_Motion") { - TJAPlayer3.Skin.Game_Dancer_Motion = strParam; + OpenTaiko.Skin.Game_Dancer_Motion = strParam; } else if (strCommand == "Game_Dancer_In_Motion") { Game_Dancer_In_Motion = strParam; } else if (strCommand == "Game_Dancer_Out_Motion") { @@ -274,7 +274,7 @@ namespace TJAPlayer3 { } else if (strCommand == "Game_Dancer_Gauge") { string[] strSplit = strParam.Split(','); for (int i = 0; i < nDancerCount; i++) { - TJAPlayer3.Skin.Game_Dancer_Gauge[i] = int.Parse(strSplit[i]); + OpenTaiko.Skin.Game_Dancer_Gauge[i] = int.Parse(strSplit[i]); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplFireworks.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplFireworks.cs index 176e12e7..146ecb95 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplFireworks.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplFireworks.cs @@ -2,7 +2,7 @@ using FDK; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplFireworks : CActivity { // コンストラクタ @@ -19,12 +19,12 @@ namespace TJAPlayer3 { /// public virtual void Start(int nLane, int nPlayer) { nY座標P2 = new int[] { 548, 612, 670, 712, 730, 780, 725, 690, 640 }; - if (TJAPlayer3.Tx.Effects_Hit_FireWorks != null && TJAPlayer3.Tx.Effects_Hit_FireWorks != null) { + if (OpenTaiko.Tx.Effects_Hit_FireWorks != null && OpenTaiko.Tx.Effects_Hit_FireWorks != null) { for (int i = 0; i < 9; i++) { for (int j = 0; j < 45; j++) { if (!this.st大音符花火[j].b使用中) { this.st大音符花火[j].b使用中 = true; - this.st大音符花火[j].ct進行 = new CCounter(0, 40, 18, TJAPlayer3.Timer); // カウンタ + this.st大音符花火[j].ct進行 = new CCounter(0, 40, 18, OpenTaiko.Timer); // カウンタ this.st大音符花火[j].fX = this.nX座標[i]; //X座標 this.st大音符花火[j].fY = nPlayer == 0 ? this.nY座標[i] : this.nY座標P2[i]; @@ -92,7 +92,7 @@ namespace TJAPlayer3 { { this.st状態[j].b使用中 = true; //this.st状態[ n ].ct進行 = new CCounter( 0, 9, 20, CDTXMania.Timer ); - this.st状態[j].ct進行 = new CCounter(0, 6, 25, TJAPlayer3.Timer); + this.st状態[j].ct進行 = new CCounter(0, 6, 25, OpenTaiko.Timer); this.st状態[j].judge = judge; this.st状態[j].nPlayer = player; this.st状態_大[j].nPlayer = player; @@ -106,7 +106,7 @@ namespace TJAPlayer3 { case 0x14: case 0x1A: case 0x1B: - this.st状態_大[j].ct進行 = new CCounter(0, 9, 20, TJAPlayer3.Timer); + this.st状態_大[j].ct進行 = new CCounter(0, 9, 20, OpenTaiko.Timer); this.st状態_大[j].judge = judge; this.st状態_大[j].nIsBig = 1; break; @@ -149,10 +149,10 @@ namespace TJAPlayer3 { } public override int Draw() { if (!base.IsDeActivated) { - int nWidth = (TJAPlayer3.Tx.Effects_Hit_Explosion.szTextureSize.Width / 7); - int nHeight = (TJAPlayer3.Tx.Effects_Hit_Explosion.szTextureSize.Height / 4); - int nBombWidth = (TJAPlayer3.Tx.Effects_Hit_Bomb.szTextureSize.Width / 7); - int nBombHeight = (TJAPlayer3.Tx.Effects_Hit_Bomb.szTextureSize.Height / 4); + int nWidth = (OpenTaiko.Tx.Effects_Hit_Explosion.szTextureSize.Width / 7); + int nHeight = (OpenTaiko.Tx.Effects_Hit_Explosion.szTextureSize.Height / 4); + int nBombWidth = (OpenTaiko.Tx.Effects_Hit_Bomb.szTextureSize.Width / 7); + int nBombHeight = (OpenTaiko.Tx.Effects_Hit_Bomb.szTextureSize.Height / 4); for (int i = 0; i < 3 * 4; i++) { if (this.st状態[i].b使用中) { if (!this.st状態[i].ct進行.IsStoped) { @@ -164,36 +164,36 @@ namespace TJAPlayer3 { // (When performing calibration, reduce visual distraction // and current judgment feedback near the judgment position.) - if (TJAPlayer3.Tx.Effects_Hit_Explosion != null && !TJAPlayer3.IsPerformingCalibration) { + if (OpenTaiko.Tx.Effects_Hit_Explosion != null && !OpenTaiko.IsPerformingCalibration) { int n = this.st状態[i].nIsBig == 1 ? (nHeight * 2) : 0; int nX = 0; int nY = 0; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - nX = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * this.st状態[i].nPlayer); - nY = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * this.st状態[i].nPlayer); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - nX = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * this.st状態[i].nPlayer); - nY = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * this.st状態[i].nPlayer); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + nX = OpenTaiko.Skin.Game_Effects_Hit_Explosion_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * this.st状態[i].nPlayer); + nY = OpenTaiko.Skin.Game_Effects_Hit_Explosion_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * this.st状態[i].nPlayer); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + nX = OpenTaiko.Skin.Game_Effects_Hit_Explosion_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * this.st状態[i].nPlayer); + nY = OpenTaiko.Skin.Game_Effects_Hit_Explosion_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * this.st状態[i].nPlayer); } else { - nX = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_X[this.st状態[i].nPlayer]; - nY = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_Y[this.st状態[i].nPlayer]; + nX = OpenTaiko.Skin.Game_Effects_Hit_Explosion_X[this.st状態[i].nPlayer]; + nY = OpenTaiko.Skin.Game_Effects_Hit_Explosion_Y[this.st状態[i].nPlayer]; } - nX += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(this.st状態[i].nPlayer); - nY += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(this.st状態[i].nPlayer); + nX += OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(this.st状態[i].nPlayer); + nY += OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(this.st状態[i].nPlayer); switch (st状態[i].judge) { case ENoteJudge.Perfect: case ENoteJudge.Great: case ENoteJudge.Auto: - if (!TJAPlayer3.ConfigIni.SimpleMode) TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n, nWidth, nHeight)); + if (!OpenTaiko.ConfigIni.SimpleMode) OpenTaiko.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n, nWidth, nHeight)); break; case ENoteJudge.Good: - TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n + nHeight, nWidth, nHeight)); + OpenTaiko.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n + nHeight, nWidth, nHeight)); break; case ENoteJudge.Mine: - TJAPlayer3.Tx.Effects_Hit_Bomb?.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nBombWidth, 0, nBombWidth, nBombHeight)); + OpenTaiko.Tx.Effects_Hit_Bomb?.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nBombWidth, 0, nBombWidth, nBombHeight)); break; case ENoteJudge.Miss: case ENoteJudge.Bad: @@ -210,13 +210,13 @@ namespace TJAPlayer3 { if (this.st状態_大[i].ct進行.IsEnded) { this.st状態_大[i].ct進行.Stop(); } - if (TJAPlayer3.Tx.Effects_Hit_Explosion_Big != null && this.st状態_大[i].nIsBig == 1) { + if (OpenTaiko.Tx.Effects_Hit_Explosion_Big != null && this.st状態_大[i].nIsBig == 1) { switch (st状態_大[i].judge) { case ENoteJudge.Perfect: case ENoteJudge.Great: case ENoteJudge.Auto: - if (this.st状態_大[i].nIsBig == 1 && !TJAPlayer3.ConfigIni.SimpleMode) { + if (this.st状態_大[i].nIsBig == 1 && !OpenTaiko.ConfigIni.SimpleMode) { //float fX = 415 - ((TJAPlayer3.Tx.Effects_Hit_Explosion_Big.sz画像サイズ.Width * TJAPlayer3.Tx.Effects_Hit_Explosion_Big.vc拡大縮小倍率.X ) / 2.0f); //float fY = TJAPlayer3.Skin.nJudgePointY[ this.st状態_大[ i ].nPlayer ] - ((TJAPlayer3.Tx.Effects_Hit_Explosion_Big.sz画像サイズ.Height * TJAPlayer3.Tx.Effects_Hit_Explosion_Big.vc拡大縮小倍率.Y ) / 2.0f); //float fY = 257 - ((this.txアタックエフェクトUpper_big.sz画像サイズ.Height * this.txアタックエフェクトUpper_big.vc拡大縮小倍率.Y ) / 2.0f); @@ -243,25 +243,25 @@ namespace TJAPlayer3 { float x = 0; float y = 0; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * this.st状態[i].nPlayer); - y = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * this.st状態[i].nPlayer); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * this.st状態[i].nPlayer); - y = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * this.st状態[i].nPlayer); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x = OpenTaiko.Skin.Game_Effects_Hit_Explosion_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * this.st状態[i].nPlayer); + y = OpenTaiko.Skin.Game_Effects_Hit_Explosion_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * this.st状態[i].nPlayer); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x = OpenTaiko.Skin.Game_Effects_Hit_Explosion_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * this.st状態[i].nPlayer); + y = OpenTaiko.Skin.Game_Effects_Hit_Explosion_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * this.st状態[i].nPlayer); } else { - x = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_X[this.st状態[i].nPlayer]; - y = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_Y[this.st状態[i].nPlayer]; + x = OpenTaiko.Skin.Game_Effects_Hit_Explosion_X[this.st状態[i].nPlayer]; + y = OpenTaiko.Skin.Game_Effects_Hit_Explosion_Y[this.st状態[i].nPlayer]; } - x += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(this.st状態[i].nPlayer); - y += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(this.st状態[i].nPlayer); + x += OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(this.st状態[i].nPlayer); + y += OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(this.st状態[i].nPlayer); - x -= (TJAPlayer3.Tx.Effects_Hit_Explosion_Big.szTextureSize.Width * (f倍率 - 1.0f) / 2.0f); - y -= (TJAPlayer3.Tx.Effects_Hit_Explosion_Big.szTextureSize.Height * (f倍率 - 1.0f) / 2.0f); + x -= (OpenTaiko.Tx.Effects_Hit_Explosion_Big.szTextureSize.Width * (f倍率 - 1.0f) / 2.0f); + y -= (OpenTaiko.Tx.Effects_Hit_Explosion_Big.szTextureSize.Height * (f倍率 - 1.0f) / 2.0f); - TJAPlayer3.Tx.Effects_Hit_Explosion_Big.vcScaleRatio.X = f倍率; - TJAPlayer3.Tx.Effects_Hit_Explosion_Big.vcScaleRatio.Y = f倍率; - TJAPlayer3.Tx.Effects_Hit_Explosion_Big.t2D描画(x, y); + OpenTaiko.Tx.Effects_Hit_Explosion_Big.vcScaleRatio.X = f倍率; + OpenTaiko.Tx.Effects_Hit_Explosion_Big.vcScaleRatio.Y = f倍率; + OpenTaiko.Tx.Effects_Hit_Explosion_Big.t2D描画(x, y); } break; @@ -277,7 +277,7 @@ namespace TJAPlayer3 { } for (int i = 0; i < 45; i++) { - if (TJAPlayer3.Skin.nScrollFieldX[0] != 414) + if (OpenTaiko.Skin.nScrollFieldX[0] != 414) break; if (this.st大音符花火[i].b使用中) { diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplFooter.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplFooter.cs index 203a8d0e..74718cf0 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplFooter.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplFooter.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplFooter : CActivity { /// /// フッター @@ -23,7 +23,7 @@ namespace TJAPlayer3 { ? _presetPath : upDirs[random.Next(0, upDirs.Length)]; - Mob_Footer = TJAPlayer3.tテクスチャの生成(path); + Mob_Footer = OpenTaiko.tテクスチャの生成(path); } } @@ -31,7 +31,7 @@ namespace TJAPlayer3 { } public override void DeActivate() { - TJAPlayer3.tDisposeSafely(ref Mob_Footer); + OpenTaiko.tDisposeSafely(ref Mob_Footer); base.DeActivate(); } @@ -46,7 +46,7 @@ namespace TJAPlayer3 { public override int Draw() { if (this.Mob_Footer != null) { - this.Mob_Footer.t2D描画(0, TJAPlayer3.Skin.Resolution[1] - this.Mob_Footer.szTextureSize.Height); + this.Mob_Footer.t2D描画(0, OpenTaiko.Skin.Resolution[1] - this.Mob_Footer.szTextureSize.Height); } return base.Draw(); } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplGauge.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplGauge.cs index 671acbb5..3f6ea581 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplGauge.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplGauge.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplGauge : CAct演奏ゲージ共通 { // プロパティ @@ -40,7 +40,7 @@ namespace TJAPlayer3 { for (int j = 0; j < 32; j++) { if (player == 0) { if (!this.st花火状態[player][j].b使用中) { - this.st花火状態[player][j].ct進行 = new CCounter(0, 10, 20, TJAPlayer3.Timer); + this.st花火状態[player][j].ct進行 = new CCounter(0, 10, 20, OpenTaiko.Timer); this.st花火状態[player][j].nPlayer = player; switch (nLane) { @@ -68,7 +68,7 @@ namespace TJAPlayer3 { // CActivity 実装 public override void Activate() { - this.ct炎 = new CCounter(0, 6, 50, TJAPlayer3.Timer); + this.ct炎 = new CCounter(0, 6, 50, OpenTaiko.Timer); for (int player = 0; player < 5; player++) { for (int i = 0; i < 32; i++) { @@ -76,12 +76,12 @@ namespace TJAPlayer3 { } } - if (TJAPlayer3.Skin.Game_Gauge_Rainbow_Timer <= 1) { + if (OpenTaiko.Skin.Game_Gauge_Rainbow_Timer <= 1) { throw new DivideByZeroException("SkinConfigの設定\"Game_Gauge_Rainbow_Timer\"を1以下にすることは出来ません。"); } - this.ct虹アニメ = new CCounter(0, TJAPlayer3.Skin.Game_Gauge_Rainbow_Ptn - 1, TJAPlayer3.Skin.Game_Gauge_Rainbow_Timer, TJAPlayer3.Timer); - this.ct虹透明度 = new CCounter(0, TJAPlayer3.Skin.Game_Gauge_Rainbow_Timer - 1, 1, TJAPlayer3.Timer); - this.ctGaugeFlash = new CCounter(0, 532, 1, TJAPlayer3.Timer); + this.ct虹アニメ = new CCounter(0, OpenTaiko.Skin.Game_Gauge_Rainbow_Ptn - 1, OpenTaiko.Skin.Game_Gauge_Rainbow_Timer, OpenTaiko.Timer); + this.ct虹透明度 = new CCounter(0, OpenTaiko.Skin.Game_Gauge_Rainbow_Timer - 1, 1, OpenTaiko.Timer); + this.ctGaugeFlash = new CCounter(0, 532, 1, OpenTaiko.Timer); base.Activate(); } @@ -114,7 +114,7 @@ namespace TJAPlayer3 { this.ctGaugeFlash.TickLoop(); - int nWidth = (TJAPlayer3.Skin.Game_Gauge_Rect[2] / 50); + int nWidth = (OpenTaiko.Skin.Game_Gauge_Rect[2] / 50); int[] nRectX = new int[] { (int)( this.db現在のゲージ値[ 0 ] / 2 ) * nWidth, (int)( this.db現在のゲージ値[ 1 ] / 2 ) * nWidth, @@ -138,11 +138,11 @@ namespace TJAPlayer3 { */ // No gauge if tower - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || TJAPlayer3.ConfigIni.bTokkunMode) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower || OpenTaiko.ConfigIni.bTokkunMode) return 0; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { #region [Regular gauges] // Flash opacity @@ -160,51 +160,51 @@ namespace TJAPlayer3 { this.ct炎.TickLoop(); int soulFireFrame = this.ct炎.CurrentValue; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) continue; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) continue; HGaugeMethods.UNSAFE_DrawGaugeFast(i, Opacity, rainbowFrame, soulFireFrame); } #endregion } else { float scale = 1.0f; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { + if (OpenTaiko.ConfigIni.bAIBattleMode) { scale = 0.8f; } int[] gauge_x = new int[5]; int[] gauge_y = new int[5]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - gauge_x[i] = TJAPlayer3.Skin.Game_Gauge_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - gauge_y[i] = TJAPlayer3.Skin.Game_Gauge_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - gauge_x[i] = TJAPlayer3.Skin.Game_Gauge_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - gauge_y[i] = TJAPlayer3.Skin.Game_Gauge_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + gauge_x[i] = OpenTaiko.Skin.Game_Gauge_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + gauge_y[i] = OpenTaiko.Skin.Game_Gauge_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + gauge_x[i] = OpenTaiko.Skin.Game_Gauge_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + gauge_y[i] = OpenTaiko.Skin.Game_Gauge_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - gauge_x[i] = TJAPlayer3.Skin.Game_Gauge_X[i]; - gauge_y[i] = TJAPlayer3.Skin.Game_Gauge_Y[i]; + gauge_x[i] = OpenTaiko.Skin.Game_Gauge_X[i]; + gauge_y[i] = OpenTaiko.Skin.Game_Gauge_Y[i]; } } #region [Gauge base] - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { - if (TJAPlayer3.P1IsBlue()) { - TJAPlayer3.Tx.Gauge_Dan[4]?.t2D描画(gauge_x[0], gauge_y[0], - new Rectangle(TJAPlayer3.Skin.Game_Gauge_Rect[0], TJAPlayer3.Skin.Game_Gauge_Rect[1], TJAPlayer3.Skin.Game_Gauge_Rect[2], TJAPlayer3.Skin.Game_Gauge_Rect[3])); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + if (OpenTaiko.P1IsBlue()) { + OpenTaiko.Tx.Gauge_Dan[4]?.t2D描画(gauge_x[0], gauge_y[0], + new Rectangle(OpenTaiko.Skin.Game_Gauge_Rect[0], OpenTaiko.Skin.Game_Gauge_Rect[1], OpenTaiko.Skin.Game_Gauge_Rect[2], OpenTaiko.Skin.Game_Gauge_Rect[3])); } else { - TJAPlayer3.Tx.Gauge_Dan[0]?.t2D描画(gauge_x[0], gauge_y[0], - new Rectangle(TJAPlayer3.Skin.Game_Gauge_Rect[0], TJAPlayer3.Skin.Game_Gauge_Rect[1], TJAPlayer3.Skin.Game_Gauge_Rect[2], TJAPlayer3.Skin.Game_Gauge_Rect[3])); + OpenTaiko.Tx.Gauge_Dan[0]?.t2D描画(gauge_x[0], gauge_y[0], + new Rectangle(OpenTaiko.Skin.Game_Gauge_Rect[0], OpenTaiko.Skin.Game_Gauge_Rect[1], OpenTaiko.Skin.Game_Gauge_Rect[2], OpenTaiko.Skin.Game_Gauge_Rect[3])); } - if (TJAPlayer3.Tx.Gauge_Dan[2] != null) { - for (int i = 0; i < TJAPlayer3.DTX.Dan_C.Length; i++) { - if (TJAPlayer3.DTX.Dan_C[i] != null) { - if (TJAPlayer3.DTX.Dan_C[i].GetExamType() == Exam.Type.Gauge) { - TJAPlayer3.Tx.Gauge_Dan[2].t2D描画(gauge_x[0] + (TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), gauge_y[0], - new Rectangle((TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), 0, TJAPlayer3.Skin.Game_Gauge_Rect[2] - (TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), TJAPlayer3.Skin.Game_Gauge_Rect[3])); + if (OpenTaiko.Tx.Gauge_Dan[2] != null) { + for (int i = 0; i < OpenTaiko.DTX.Dan_C.Length; i++) { + if (OpenTaiko.DTX.Dan_C[i] != null) { + if (OpenTaiko.DTX.Dan_C[i].GetExamType() == Exam.Type.Gauge) { + OpenTaiko.Tx.Gauge_Dan[2].t2D描画(gauge_x[0] + (OpenTaiko.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), gauge_y[0], + new Rectangle((OpenTaiko.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), 0, OpenTaiko.Skin.Game_Gauge_Rect[2] - (OpenTaiko.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), OpenTaiko.Skin.Game_Gauge_Rect[3])); } } } @@ -215,34 +215,34 @@ namespace TJAPlayer3 { #region [ Gauge 1P ] - if (TJAPlayer3.Tx.Gauge[0] != null) { + if (OpenTaiko.Tx.Gauge[0] != null) { int x; int y; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - x = TJAPlayer3.Skin.Game_Gauge_X_AI; - y = TJAPlayer3.Skin.Game_Gauge_Y_AI; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + x = OpenTaiko.Skin.Game_Gauge_X_AI; + y = OpenTaiko.Skin.Game_Gauge_Y_AI; } else { x = gauge_x[0]; y = gauge_y[0]; } - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { - if (TJAPlayer3.P1IsBlue()) - TJAPlayer3.Tx.Gauge_Dan[5]?.t2D描画(x, y, new Rectangle(0, 0, nRectX[0], TJAPlayer3.Skin.Game_Gauge_Rect[3])); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + if (OpenTaiko.P1IsBlue()) + OpenTaiko.Tx.Gauge_Dan[5]?.t2D描画(x, y, new Rectangle(0, 0, nRectX[0], OpenTaiko.Skin.Game_Gauge_Rect[3])); else - TJAPlayer3.Tx.Gauge_Dan[1]?.t2D描画(x, y, new Rectangle(0, 0, nRectX[0], TJAPlayer3.Skin.Game_Gauge_Rect[3])); + OpenTaiko.Tx.Gauge_Dan[1]?.t2D描画(x, y, new Rectangle(0, 0, nRectX[0], OpenTaiko.Skin.Game_Gauge_Rect[3])); - for (int i = 0; i < TJAPlayer3.DTX.Dan_C.Length; i++) { - if (TJAPlayer3.DTX.Dan_C[i] != null && TJAPlayer3.DTX.Dan_C[i].GetExamType() == Exam.Type.Gauge && db現在のゲージ値[0] >= TJAPlayer3.DTX.Dan_C[i].GetValue(false)) { - TJAPlayer3.Tx.Gauge_Dan[3].Opacity = 255; - TJAPlayer3.Tx.Gauge_Dan[3]?.t2D描画(x + (TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), y, new Rectangle(TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * nWidth, 0, nRectX[0] - (TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), TJAPlayer3.Skin.Game_Gauge_Rect[3])); + for (int i = 0; i < OpenTaiko.DTX.Dan_C.Length; i++) { + if (OpenTaiko.DTX.Dan_C[i] != null && OpenTaiko.DTX.Dan_C[i].GetExamType() == Exam.Type.Gauge && db現在のゲージ値[0] >= OpenTaiko.DTX.Dan_C[i].GetValue(false)) { + OpenTaiko.Tx.Gauge_Dan[3].Opacity = 255; + OpenTaiko.Tx.Gauge_Dan[3]?.t2D描画(x + (OpenTaiko.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), y, new Rectangle(OpenTaiko.DTX.Dan_C[i].GetValue(false) / 2 * nWidth, 0, nRectX[0] - (OpenTaiko.DTX.Dan_C[i].GetValue(false) / 2 * nWidth), OpenTaiko.Skin.Game_Gauge_Rect[3])); int Opacity = 0; if (this.ctGaugeFlash.CurrentValue <= 365) Opacity = 0; else if (this.ctGaugeFlash.CurrentValue <= 448) Opacity = (int)((this.ctGaugeFlash.CurrentValue - 365) / 83f * 255f); else if (this.ctGaugeFlash.CurrentValue <= 531) Opacity = 255 - (int)((this.ctGaugeFlash.CurrentValue - 448) / 83f * 255f); - TJAPlayer3.Tx.Gauge_Dan[3].Opacity = Opacity; - TJAPlayer3.Tx.Gauge_Dan[3]?.t2D描画(x, y, new Rectangle(0, 0, TJAPlayer3.DTX.Dan_C[i].GetValue(false) / 2 * nWidth, TJAPlayer3.Skin.Game_Gauge_Rect[3])); + OpenTaiko.Tx.Gauge_Dan[3].Opacity = Opacity; + OpenTaiko.Tx.Gauge_Dan[3]?.t2D描画(x, y, new Rectangle(0, 0, OpenTaiko.DTX.Dan_C[i].GetValue(false) / 2 * nWidth, OpenTaiko.Skin.Game_Gauge_Rect[3])); break; } @@ -251,46 +251,46 @@ namespace TJAPlayer3 { } - if (TJAPlayer3.Tx.Gauge_Line[0] != null) { + if (OpenTaiko.Tx.Gauge_Line[0] != null) { #region [Rainbow] if (this.db現在のゲージ値[0] >= 100.0) { this.ct虹アニメ.TickLoop(); this.ct虹透明度.TickLoop(); - if (TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue] != null) { - TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].vcScaleRatio.X = scale; - TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].vcScaleRatio.Y = scale; + if (OpenTaiko.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue] != null) { + OpenTaiko.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].vcScaleRatio.X = scale; + OpenTaiko.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].vcScaleRatio.Y = scale; - TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].vcScaleRatio.X = scale; - TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].vcScaleRatio.Y = scale; + OpenTaiko.Tx.Gauge_Rainbow[虹ベース].vcScaleRatio.X = scale; + OpenTaiko.Tx.Gauge_Rainbow[虹ベース].vcScaleRatio.Y = scale; - bool smart = TJAPlayer3.ConfigIni.nPlayerCount > 2 || TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan; + bool smart = OpenTaiko.ConfigIni.nPlayerCount > 2 || OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan; - TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].Opacity = 255; - TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].t2D描画(x, y + (smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0), + OpenTaiko.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].Opacity = 255; + OpenTaiko.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].t2D描画(x, y + (smart ? (OpenTaiko.Skin.Game_Gauge_Rect[3] / 2) : 0), new RectangleF(0, - smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0, - TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Width, - smart ? TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Height - (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : TJAPlayer3.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Height)); + smart ? (OpenTaiko.Skin.Game_Gauge_Rect[3] / 2) : 0, + OpenTaiko.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Width, + smart ? OpenTaiko.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Height - (OpenTaiko.Skin.Game_Gauge_Rect[3] / 2) : OpenTaiko.Tx.Gauge_Rainbow[this.ct虹アニメ.CurrentValue].szTextureSize.Height)); - TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].Opacity = (ct虹透明度.CurrentValue * 255 / (int)ct虹透明度.EndValue) / 1; - TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].t2D描画(x, y + (smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0), + OpenTaiko.Tx.Gauge_Rainbow[虹ベース].Opacity = (ct虹透明度.CurrentValue * 255 / (int)ct虹透明度.EndValue) / 1; + OpenTaiko.Tx.Gauge_Rainbow[虹ベース].t2D描画(x, y + (smart ? (OpenTaiko.Skin.Game_Gauge_Rect[3] / 2) : 0), new RectangleF(0, - smart ? (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : 0, - TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Width, - smart ? TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Height - (TJAPlayer3.Skin.Game_Gauge_Rect[3] / 2) : TJAPlayer3.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Height)); + smart ? (OpenTaiko.Skin.Game_Gauge_Rect[3] / 2) : 0, + OpenTaiko.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Width, + smart ? OpenTaiko.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Height - (OpenTaiko.Skin.Game_Gauge_Rect[3] / 2) : OpenTaiko.Tx.Gauge_Rainbow[虹ベース].szTextureSize.Height)); } } #endregion - TJAPlayer3.Tx.Gauge_Line[0].vcScaleRatio.X = scale; - TJAPlayer3.Tx.Gauge_Line[0].vcScaleRatio.Y = scale; + OpenTaiko.Tx.Gauge_Line[0].vcScaleRatio.X = scale; + OpenTaiko.Tx.Gauge_Line[0].vcScaleRatio.Y = scale; - TJAPlayer3.Tx.Gauge_Line[0].t2D描画(x, y); + OpenTaiko.Tx.Gauge_Line[0].t2D描画(x, y); } } @@ -298,72 +298,72 @@ namespace TJAPlayer3 { #endregion // Soul fire here - if (TJAPlayer3.Tx.Gauge_Soul_Fire != null) { + if (OpenTaiko.Tx.Gauge_Soul_Fire != null) { //仮置き - int soulfire_width = TJAPlayer3.Tx.Gauge_Soul_Fire.szTextureSize.Width / 8; - int soulfire_height = TJAPlayer3.Tx.Gauge_Soul_Fire.szTextureSize.Height; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + int soulfire_width = OpenTaiko.Tx.Gauge_Soul_Fire.szTextureSize.Width / 8; + int soulfire_height = OpenTaiko.Tx.Gauge_Soul_Fire.szTextureSize.Height; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; int x; int y; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - x = TJAPlayer3.Skin.Gauge_Soul_Fire_X_AI; - y = TJAPlayer3.Skin.Gauge_Soul_Fire_Y_AI; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + x = OpenTaiko.Skin.Gauge_Soul_Fire_X_AI; + y = OpenTaiko.Skin.Gauge_Soul_Fire_Y_AI; } else { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x = TJAPlayer3.Skin.Gauge_Soul_Fire_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - y = TJAPlayer3.Skin.Gauge_Soul_Fire_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x = TJAPlayer3.Skin.Gauge_Soul_Fire_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - y = TJAPlayer3.Skin.Gauge_Soul_Fire_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x = OpenTaiko.Skin.Gauge_Soul_Fire_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + y = OpenTaiko.Skin.Gauge_Soul_Fire_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x = OpenTaiko.Skin.Gauge_Soul_Fire_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + y = OpenTaiko.Skin.Gauge_Soul_Fire_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - x = TJAPlayer3.Skin.Gauge_Soul_Fire_X[i]; - y = TJAPlayer3.Skin.Gauge_Soul_Fire_Y[i]; + x = OpenTaiko.Skin.Gauge_Soul_Fire_X[i]; + y = OpenTaiko.Skin.Gauge_Soul_Fire_Y[i]; } } if (this.db現在のゲージ値[i] >= 100.0) { this.ct炎.TickLoop(); - TJAPlayer3.Tx.Gauge_Soul_Fire.vcScaleRatio.X = scale; - TJAPlayer3.Tx.Gauge_Soul_Fire.vcScaleRatio.Y = scale; + OpenTaiko.Tx.Gauge_Soul_Fire.vcScaleRatio.X = scale; + OpenTaiko.Tx.Gauge_Soul_Fire.vcScaleRatio.Y = scale; - TJAPlayer3.Tx.Gauge_Soul_Fire.t2D描画(x, y, new Rectangle(soulfire_width * (this.ct炎.CurrentValue), 0, soulfire_width, soulfire_height)); + OpenTaiko.Tx.Gauge_Soul_Fire.t2D描画(x, y, new Rectangle(soulfire_width * (this.ct炎.CurrentValue), 0, soulfire_width, soulfire_height)); } } } - if (TJAPlayer3.Tx.Gauge_Soul != null) { + if (OpenTaiko.Tx.Gauge_Soul != null) { //仮置き - int soul_height = TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Height / 2; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + int soul_height = OpenTaiko.Tx.Gauge_Soul.szTextureSize.Height / 2; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; int x; int y; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - x = TJAPlayer3.Skin.Gauge_Soul_X_AI; - y = TJAPlayer3.Skin.Gauge_Soul_Y_AI; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + x = OpenTaiko.Skin.Gauge_Soul_X_AI; + y = OpenTaiko.Skin.Gauge_Soul_Y_AI; } else { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x = TJAPlayer3.Skin.Gauge_Soul_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - y = TJAPlayer3.Skin.Gauge_Soul_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x = TJAPlayer3.Skin.Gauge_Soul_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - y = TJAPlayer3.Skin.Gauge_Soul_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x = OpenTaiko.Skin.Gauge_Soul_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + y = OpenTaiko.Skin.Gauge_Soul_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x = OpenTaiko.Skin.Gauge_Soul_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + y = OpenTaiko.Skin.Gauge_Soul_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - x = TJAPlayer3.Skin.Gauge_Soul_X[i]; - y = TJAPlayer3.Skin.Gauge_Soul_Y[i]; + x = OpenTaiko.Skin.Gauge_Soul_X[i]; + y = OpenTaiko.Skin.Gauge_Soul_Y[i]; } } - TJAPlayer3.Tx.Gauge_Soul.vcScaleRatio.X = scale; - TJAPlayer3.Tx.Gauge_Soul.vcScaleRatio.Y = scale; + OpenTaiko.Tx.Gauge_Soul.vcScaleRatio.X = scale; + OpenTaiko.Tx.Gauge_Soul.vcScaleRatio.Y = scale; if (this.db現在のゲージ値[i] >= 80.0) { - TJAPlayer3.Tx.Gauge_Soul.t2D描画(x, y, new Rectangle(0, 0, TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Width, soul_height)); + OpenTaiko.Tx.Gauge_Soul.t2D描画(x, y, new Rectangle(0, 0, OpenTaiko.Tx.Gauge_Soul.szTextureSize.Width, soul_height)); } else { - TJAPlayer3.Tx.Gauge_Soul.t2D描画(x, y, new Rectangle(0, soul_height, TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Width, soul_height)); + OpenTaiko.Tx.Gauge_Soul.t2D描画(x, y, new Rectangle(0, soul_height, OpenTaiko.Tx.Gauge_Soul.szTextureSize.Width, soul_height)); } } } @@ -376,7 +376,7 @@ namespace TJAPlayer3 { //仮置き int[] nSoulExplosion = new int[] { 73, 468, 0, 0 }; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { for (int d = 0; d < 32; d++) { if (this.st花火状態[i][d].b使用中) { this.st花火状態[i][d].ct進行.Tick(); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplJudgeText.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplJudgeText.cs index f5f61fe3..7c22822d 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplJudgeText.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplJudgeText.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplJudgeText : CActivity { // コンストラクタ @@ -38,27 +38,27 @@ namespace TJAPlayer3 { } judgeC.counter.Tick(); - if (TJAPlayer3.Tx.Judge != null) { + if (OpenTaiko.Tx.Judge != null) { float moveValue = CubicEaseOut(judgeC.counter.CurrentValue / 410.0f) - 1.0f; float x = 0; float y = 0; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x = TJAPlayer3.Skin.Game_Judge_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * j); - y = TJAPlayer3.Skin.Game_Judge_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * j); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x = TJAPlayer3.Skin.Game_Judge_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * j); - y = TJAPlayer3.Skin.Game_Judge_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * j); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x = OpenTaiko.Skin.Game_Judge_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * j); + y = OpenTaiko.Skin.Game_Judge_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * j); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x = OpenTaiko.Skin.Game_Judge_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * j); + y = OpenTaiko.Skin.Game_Judge_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * j); } else { - x = TJAPlayer3.Skin.Game_Judge_X[j]; - y = TJAPlayer3.Skin.Game_Judge_Y[j]; + x = OpenTaiko.Skin.Game_Judge_X[j]; + y = OpenTaiko.Skin.Game_Judge_Y[j]; } - x += (moveValue * TJAPlayer3.Skin.Game_Judge_Move[0]) + TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(j); - y += (moveValue * TJAPlayer3.Skin.Game_Judge_Move[1]) + TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(j); + x += (moveValue * OpenTaiko.Skin.Game_Judge_Move[0]) + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(j); + y += (moveValue * OpenTaiko.Skin.Game_Judge_Move[1]) + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(j); - TJAPlayer3.Tx.Judge.Opacity = (int)(255f - (judgeC.counter.CurrentValue >= 360 ? ((judgeC.counter.CurrentValue - 360) / 50.0f) * 255f : 0f)); - TJAPlayer3.Tx.Judge.t2D描画(x, y, judgeC.rc); + OpenTaiko.Tx.Judge.Opacity = (int)(255f - (judgeC.counter.CurrentValue >= 360 ? ((judgeC.counter.CurrentValue - 360) / 50.0f) * 255f : 0f)); + OpenTaiko.Tx.Judge.t2D描画(x, y, judgeC.rc); } } } @@ -68,7 +68,7 @@ namespace TJAPlayer3 { public void Start(int player, ENoteJudge judge) { JudgeAnime judgeAnime = new(); - judgeAnime.counter.Start(0, 410, 1, TJAPlayer3.Timer); + judgeAnime.counter.Start(0, 410, 1, OpenTaiko.Timer); judgeAnime.Judge = judge; //int njudge = judge == E判定.Perfect ? 0 : judge == E判定.Good ? 1 : judge == E判定.ADLIB ? 3 : judge == E判定.Auto ? 0 : 2; @@ -78,12 +78,12 @@ namespace TJAPlayer3 { njudge = JudgesDict[judge]; } - if (njudge == 0 && TJAPlayer3.ConfigIni.SimpleMode) { + if (njudge == 0 && OpenTaiko.ConfigIni.SimpleMode) { return; } - int height = TJAPlayer3.Tx.Judge.szTextureSize.Height / 5; - judgeAnime.rc = new Rectangle(0, (int)njudge * height, TJAPlayer3.Tx.Judge.szTextureSize.Width, height); + int height = OpenTaiko.Tx.Judge.szTextureSize.Height / 5; + judgeAnime.rc = new Rectangle(0, (int)njudge * height, OpenTaiko.Tx.Judge.szTextureSize.Width, height); JudgeAnimes[player].Add(judgeAnime); } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplLane.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplLane.cs index 30ad3ca5..e65a0cf7 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplLane.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplLane.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplLane : CActivity { public CActImplLane() { base.IsDeActivated = true; @@ -10,20 +10,20 @@ namespace TJAPlayer3 { this.ct分岐アニメ進行 = new CCounter[5]; this.nBefore = new CDTX.ECourse[5]; this.nAfter = new CDTX.ECourse[5]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { this.ct分岐アニメ進行[i] = new CCounter(); this.nBefore = new CDTX.ECourse[5]; this.nAfter = new CDTX.ECourse[5]; this.bState[i] = false; } - if (TJAPlayer3.Tx.Lane_Base[0] != null) - TJAPlayer3.Tx.Lane_Base[0].Opacity = 255; + if (OpenTaiko.Tx.Lane_Base[0] != null) + OpenTaiko.Tx.Lane_Base[0].Opacity = 255; base.Activate(); } public override void DeActivate() { - TJAPlayer3.tDisposeSafely(ref this.ct分岐アニメ進行); + OpenTaiko.tDisposeSafely(ref this.ct分岐アニメ進行); base.DeActivate(); } @@ -38,7 +38,7 @@ namespace TJAPlayer3 { } public override int Draw() { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (!this.ct分岐アニメ進行[i].IsStoped) { this.ct分岐アニメ進行[i].Tick(); if (this.ct分岐アニメ進行[i].IsEnded) { @@ -51,29 +51,29 @@ namespace TJAPlayer3 { int[] x = new int[5]; int[] y = new int[5]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x[i] = TJAPlayer3.Skin.Game_Lane_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - y[i] = TJAPlayer3.Skin.Game_Lane_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x[i] = TJAPlayer3.Skin.Game_Lane_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - y[i] = TJAPlayer3.Skin.Game_Lane_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x[i] = OpenTaiko.Skin.Game_Lane_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + y[i] = OpenTaiko.Skin.Game_Lane_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x[i] = OpenTaiko.Skin.Game_Lane_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + y[i] = OpenTaiko.Skin.Game_Lane_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - x[i] = TJAPlayer3.Skin.Game_Lane_X[i]; - y[i] = TJAPlayer3.Skin.Game_Lane_Y[i]; + x[i] = OpenTaiko.Skin.Game_Lane_X[i]; + y[i] = OpenTaiko.Skin.Game_Lane_Y[i]; } } //アニメーション中の分岐レイヤー(背景)の描画を行う。 - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.stage演奏ドラム画面.bUseBranch[i] == true) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.stage演奏ドラム画面.bUseBranch[i] == true) { #region NullCheck bool _laneNull = false; - for (int j = 0; j < TJAPlayer3.Tx.Lane_Base.Length; j++) { - if (TJAPlayer3.Tx.Lane_Base[j] == null) { + for (int j = 0; j < OpenTaiko.Tx.Lane_Base.Length; j++) { + if (OpenTaiko.Tx.Lane_Base[j] == null) { _laneNull = true; break; } @@ -81,68 +81,68 @@ namespace TJAPlayer3 { #endregion - if (TJAPlayer3.ConfigIni.SimpleMode) { - TJAPlayer3.Tx.Lane_Base[(int)nAfter[i]].t2D描画(x[i], y[i]); + if (OpenTaiko.ConfigIni.SimpleMode) { + OpenTaiko.Tx.Lane_Base[(int)nAfter[i]].t2D描画(x[i], y[i]); } else if (this.ct分岐アニメ進行[i].IsTicked && !_laneNull) { #region[ 普通譜面_レベルアップ ] //普通→玄人 if (nBefore[i] == 0 && nAfter[i] == CDTX.ECourse.eNormal) { - TJAPlayer3.Tx.Lane_Base[1].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); } //普通→達人 if (nBefore[i] == 0 && nAfter[i] == CDTX.ECourse.eMaster) { - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); if (this.ct分岐アニメ進行[i].CurrentValue < 100) { - TJAPlayer3.Tx.Lane_Base[1].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); } else if (this.ct分岐アニメ進行[i].CurrentValue >= 100 && this.ct分岐アニメ進行[i].CurrentValue < 150) { - TJAPlayer3.Tx.Lane_Base[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].Opacity = 255; + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); } else if (this.ct分岐アニメ進行[i].CurrentValue >= 150) { - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[2].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 250 ? 255 : (((this.ct分岐アニメ進行[i].CurrentValue - 150) * 0xff) / 100); - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 250 ? 255 : (((this.ct分岐アニメ進行[i].CurrentValue - 150) * 0xff) / 100); + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); } } #endregion #region[ 玄人譜面_レベルアップ ] if (nBefore[i] == CDTX.ECourse.eExpert && nAfter[i] == CDTX.ECourse.eMaster) { - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[2].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); } #endregion #region[ 玄人譜面_レベルダウン ] if (nBefore[i] == CDTX.ECourse.eExpert && nAfter[i] == CDTX.ECourse.eNormal) { - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[0].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[0].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); } #endregion #region[ 達人譜面_レベルダウン ] if (nBefore[i] == CDTX.ECourse.eMaster && nAfter[i] == CDTX.ECourse.eNormal) { - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); if (this.ct分岐アニメ進行[i].CurrentValue < 100) { - TJAPlayer3.Tx.Lane_Base[1].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); } else if (this.ct分岐アニメ進行[i].CurrentValue >= 100 && this.ct分岐アニメ進行[i].CurrentValue < 150) { - TJAPlayer3.Tx.Lane_Base[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].Opacity = 255; + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); } else if (this.ct分岐アニメ進行[i].CurrentValue >= 150) { - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[0].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 250 ? 255 : (((this.ct分岐アニメ進行[i].CurrentValue - 150) * 0xff) / 100); - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[0].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 250 ? 255 : (((this.ct分岐アニメ進行[i].CurrentValue - 150) * 0xff) / 100); + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); } } if (nBefore[i] == CDTX.ECourse.eMaster && nAfter[i] == CDTX.ECourse.eExpert) { - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[2].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].Opacity = this.ct分岐アニメ進行[i].CurrentValue > 100 ? 255 : ((this.ct分岐アニメ進行[i].CurrentValue * 0xff) / 100); + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); } #endregion } @@ -155,7 +155,7 @@ namespace TJAPlayer3 { if (n現在 == n次回) { return; } - this.ct分岐アニメ進行[player] = new CCounter(0, 300, 2, TJAPlayer3.Timer); + this.ct分岐アニメ進行[player] = new CCounter(0, 300, 2, OpenTaiko.Timer); this.bState[player] = true; this.nBefore[player] = n現在; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplLaneTaiko.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplLaneTaiko.cs index f8782491..ea637faf 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplLaneTaiko.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplLaneTaiko.cs @@ -2,7 +2,7 @@ using FDK; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplLaneTaiko : CActivity { /// /// レーンを描画するクラス。 @@ -27,7 +27,7 @@ namespace TJAPlayer3 { this.ctゴーゴー = new CCounter(); - this.ctゴーゴー炎 = new CCounter(0, 6, 50, TJAPlayer3.Timer); + this.ctゴーゴー炎 = new CCounter(0, 6, 50, OpenTaiko.Timer); base.Activate(); } @@ -52,13 +52,13 @@ namespace TJAPlayer3 { public override int Draw() { if (base.IsFirstDraw) { for (int i = 0; i < 5; i++) - this.stBranch[i].nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + this.stBranch[i].nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); base.IsFirstDraw = false; } //それぞれが独立したレイヤーでないといけないのでforループはパーツごとに分離すること。 - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2 && !TJAPlayer3.ConfigIni.bAIBattleMode) TJAPlayer3.stage演奏ドラム画面.actMtaiko.DrawBackSymbol(); + if (OpenTaiko.ConfigIni.nPlayerCount <= 2 && !OpenTaiko.ConfigIni.bAIBattleMode) OpenTaiko.stage演奏ドラム画面.actMtaiko.DrawBackSymbol(); #region[ レーン本体 ] @@ -66,31 +66,31 @@ namespace TJAPlayer3 { int[] x = new int[5]; int[] y = new int[5]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x[i] = TJAPlayer3.Skin.Game_Lane_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - y[i] = TJAPlayer3.Skin.Game_Lane_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x[i] = TJAPlayer3.Skin.Game_Lane_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - y[i] = TJAPlayer3.Skin.Game_Lane_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x[i] = OpenTaiko.Skin.Game_Lane_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + y[i] = OpenTaiko.Skin.Game_Lane_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x[i] = OpenTaiko.Skin.Game_Lane_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + y[i] = OpenTaiko.Skin.Game_Lane_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - x[i] = TJAPlayer3.Skin.Game_Lane_X[i]; - y[i] = TJAPlayer3.Skin.Game_Lane_Y[i]; + x[i] = OpenTaiko.Skin.Game_Lane_X[i]; + y[i] = OpenTaiko.Skin.Game_Lane_Y[i]; } } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (i == 1 && TJAPlayer3.ConfigIni.bAIBattleMode && TJAPlayer3.Tx.Lane_Background_AI != null) - TJAPlayer3.Tx.Lane_Background_AI?.t2D描画(x[i], y[i]); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (i == 1 && OpenTaiko.ConfigIni.bAIBattleMode && OpenTaiko.Tx.Lane_Background_AI != null) + OpenTaiko.Tx.Lane_Background_AI?.t2D描画(x[i], y[i]); else - TJAPlayer3.Tx.Lane_Background_Main?.t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Background_Main?.t2D描画(x[i], y[i]); } #endregion - if (TJAPlayer3.ConfigIni.nPlayerCount > 2 && !TJAPlayer3.ConfigIni.bAIBattleMode) TJAPlayer3.stage演奏ドラム画面.actMtaiko.DrawBackSymbol(); + if (OpenTaiko.ConfigIni.nPlayerCount > 2 && !OpenTaiko.ConfigIni.bAIBattleMode) OpenTaiko.stage演奏ドラム画面.actMtaiko.DrawBackSymbol(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { #region[ 分岐アニメ制御タイマー ] long num = FDK.SoundManager.PlayTimer.NowTime; if (num < this.stBranch[i].nフラッシュ制御タイマ) { @@ -121,32 +121,32 @@ namespace TJAPlayer3 { #endregion } #region[ 分岐レイヤー ] - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.stage演奏ドラム画面.bUseBranch[i] == true) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.stage演奏ドラム画面.bUseBranch[i] == true) { #region[ 動いていない ] - switch (TJAPlayer3.stage演奏ドラム画面.nレーン用表示コース[i]) { + switch (OpenTaiko.stage演奏ドラム画面.nレーン用表示コース[i]) { case CDTX.ECourse.eNormal: - if (TJAPlayer3.Tx.Lane_Base[0] != null) { - TJAPlayer3.Tx.Lane_Base[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + if (OpenTaiko.Tx.Lane_Base[0] != null) { + OpenTaiko.Tx.Lane_Base[0].Opacity = 255; + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); } break; case CDTX.ECourse.eExpert: - if (TJAPlayer3.Tx.Lane_Base[1] != null) { - TJAPlayer3.Tx.Lane_Base[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + if (OpenTaiko.Tx.Lane_Base[1] != null) { + OpenTaiko.Tx.Lane_Base[1].Opacity = 255; + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); } break; case CDTX.ECourse.eMaster: - if (TJAPlayer3.Tx.Lane_Base[2] != null) { - TJAPlayer3.Tx.Lane_Base[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + if (OpenTaiko.Tx.Lane_Base[2] != null) { + OpenTaiko.Tx.Lane_Base[2].Opacity = 255; + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); } break; } #endregion - if (TJAPlayer3.ConfigIni.nBranchAnime == 1) { + if (OpenTaiko.ConfigIni.nBranchAnime == 1) { #region[ AC7～14風の背後レイヤー ] if (this.stBranch[i].ct分岐アニメ進行.IsTicked) { int n透明度 = ((100 - this.stBranch[i].ct分岐アニメ進行.CurrentValue) * 0xff) / 100; @@ -159,10 +159,10 @@ namespace TJAPlayer3 { #region[ 普通譜面_レベルアップ ] //普通→玄人 if (this.stBranch[i].nBefore == CDTX.ECourse.eNormal && this.stBranch[i].nAfter == CDTX.ECourse.eExpert) { - if (TJAPlayer3.Tx.Lane_Base[0] != null && TJAPlayer3.Tx.Lane_Base[1] != null) { - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[1].Opacity = this.stBranch[i].nBranchレイヤー透明度; - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + if (OpenTaiko.Tx.Lane_Base[0] != null && OpenTaiko.Tx.Lane_Base[1] != null) { + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[1].Opacity = this.stBranch[i].nBranchレイヤー透明度; + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); } } //普通→達人 @@ -170,84 +170,84 @@ namespace TJAPlayer3 { if (this.stBranch[i].ct分岐アニメ進行.CurrentValue < 100) { n透明度 = ((100 - this.stBranch[i].ct分岐アニメ進行.CurrentValue) * 0xff) / 100; } - if (TJAPlayer3.Tx.Lane_Base[0] != null && TJAPlayer3.Tx.Lane_Base[2] != null) { - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[2].Opacity = this.stBranch[i].nBranchレイヤー透明度; + if (OpenTaiko.Tx.Lane_Base[0] != null && OpenTaiko.Tx.Lane_Base[2] != null) { + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].Opacity = this.stBranch[i].nBranchレイヤー透明度; } } #endregion #region[ 玄人譜面_レベルアップ ] if (this.stBranch[i].nBefore == CDTX.ECourse.eExpert && this.stBranch[i].nAfter == CDTX.ECourse.eMaster) { - if (TJAPlayer3.Tx.Lane_Base[1] != null && TJAPlayer3.Tx.Lane_Base[2] != null) { - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[2].Opacity = this.stBranch[i].nBranchレイヤー透明度; + if (OpenTaiko.Tx.Lane_Base[1] != null && OpenTaiko.Tx.Lane_Base[2] != null) { + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[2].Opacity = this.stBranch[i].nBranchレイヤー透明度; } } #endregion #region[ 玄人譜面_レベルダウン ] if (this.stBranch[i].nBefore == CDTX.ECourse.eExpert && this.stBranch[i].nAfter == CDTX.ECourse.eNormal) { - if (TJAPlayer3.Tx.Lane_Base[1] != null && TJAPlayer3.Tx.Lane_Base[0] != null) { - TJAPlayer3.Tx.Lane_Base[1].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[0].Opacity = this.stBranch[i].nBranchレイヤー透明度; + if (OpenTaiko.Tx.Lane_Base[1] != null && OpenTaiko.Tx.Lane_Base[0] != null) { + OpenTaiko.Tx.Lane_Base[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[0].Opacity = this.stBranch[i].nBranchレイヤー透明度; } } #endregion #region[ 達人譜面_レベルダウン ] if (this.stBranch[i].nBefore == CDTX.ECourse.eMaster && this.stBranch[i].nAfter == CDTX.ECourse.eNormal) { - if (TJAPlayer3.Tx.Lane_Base[2] != null && TJAPlayer3.Tx.Lane_Base[0] != null) { - TJAPlayer3.Tx.Lane_Base[2].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[0].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Base[0].Opacity = this.stBranch[i].nBranchレイヤー透明度; + if (OpenTaiko.Tx.Lane_Base[2] != null && OpenTaiko.Tx.Lane_Base[0] != null) { + OpenTaiko.Tx.Lane_Base[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Base[0].Opacity = this.stBranch[i].nBranchレイヤー透明度; } } #endregion } #endregion - } else if (TJAPlayer3.ConfigIni.nBranchAnime == 0) { - TJAPlayer3.stage演奏ドラム画面.actLane.Draw(); + } else if (OpenTaiko.ConfigIni.nBranchAnime == 0) { + OpenTaiko.stage演奏ドラム画面.actLane.Draw(); } } } #endregion - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { #region[ ゴーゴータイムレーン背景レイヤー ] - if (TJAPlayer3.Tx.Lane_Background_GoGo != null && TJAPlayer3.stage演奏ドラム画面.bIsGOGOTIME[i]) { + if (OpenTaiko.Tx.Lane_Background_GoGo != null && OpenTaiko.stage演奏ドラム画面.bIsGOGOTIME[i]) { if (!this.ctゴーゴー.IsStoped) { this.ctゴーゴー.Tick(); } if (this.ctゴーゴー.CurrentValue <= 4) { - TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.2f; - TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 54); + OpenTaiko.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.2f; + OpenTaiko.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 54); } else if (this.ctゴーゴー.CurrentValue <= 5) { - TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.4f; - TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 40); + OpenTaiko.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.4f; + OpenTaiko.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 40); } else if (this.ctゴーゴー.CurrentValue <= 6) { - TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.6f; - TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 26); + OpenTaiko.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.6f; + OpenTaiko.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 26); } else if (this.ctゴーゴー.CurrentValue <= 8) { - TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.8f; - TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 13); + OpenTaiko.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 0.8f; + OpenTaiko.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i] + 13); } else if (this.ctゴーゴー.CurrentValue >= 9) { - TJAPlayer3.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 1.0f; - TJAPlayer3.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Background_GoGo.vcScaleRatio.Y = 1.0f; + OpenTaiko.Tx.Lane_Background_GoGo.t2D描画(x[i], y[i]); } } #endregion } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.stage演奏ドラム画面.bUseBranch[i] == true) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.stage演奏ドラム画面.bUseBranch[i] == true) { #region NullCheck bool _laneNull = false; - for (int j = 0; j < TJAPlayer3.Tx.Lane_Text.Length; j++) { - if (TJAPlayer3.Tx.Lane_Text[j] == null) { + for (int j = 0; j < OpenTaiko.Tx.Lane_Text.Length; j++) { + if (OpenTaiko.Tx.Lane_Text[j] == null) { _laneNull = true; break; } @@ -255,35 +255,35 @@ namespace TJAPlayer3 { #endregion - if (TJAPlayer3.ConfigIni.SimpleMode) { - switch (TJAPlayer3.stage演奏ドラム画面.nレーン用表示コース[i]) { + if (OpenTaiko.ConfigIni.SimpleMode) { + switch (OpenTaiko.stage演奏ドラム画面.nレーン用表示コース[i]) { case CDTX.ECourse.eNormal: - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], y[i]); break; case CDTX.ECourse.eExpert: - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i]); break; case CDTX.ECourse.eMaster: - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i]); break; } - } else if (TJAPlayer3.ConfigIni.nBranchAnime == 0 && !_laneNull) { + } else if (OpenTaiko.ConfigIni.nBranchAnime == 0 && !_laneNull) { if (!this.stBranch[i].ct分岐アニメ進行.IsTicked) { - switch (TJAPlayer3.stage演奏ドラム画面.nレーン用表示コース[i]) { + switch (OpenTaiko.stage演奏ドラム画面.nレーン用表示コース[i]) { case CDTX.ECourse.eNormal: - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], y[i]); break; case CDTX.ECourse.eExpert: - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i]); break; case CDTX.ECourse.eMaster: - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i]); break; } } @@ -291,34 +291,34 @@ namespace TJAPlayer3 { #region[ 普通譜面_レベルアップ ] //普通→玄人 if (this.stBranch[i].nBefore == 0 && this.stBranch[i].nAfter == CDTX.ECourse.eExpert) { - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[0].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); + OpenTaiko.Tx.Lane_Text[0].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); //CDTXMania.Tx.Lane_Text[1].n透明度 = this.ct分岐アニメ進行.n現在の値 > 100 ? 255 : ( ( ( this.ct分岐アニメ進行.n現在の値 * 0xff ) / 60 ) ); if (this.stBranch[i].ct分岐アニメ進行.CurrentValue < 60) { this.stBranch[i].nY = this.stBranch[i].ct分岐アニメ進行.CurrentValue / 2; - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], y[i] + this.stBranch[i].nY); - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], (y[i] - 30) + this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], y[i] + this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], (y[i] - 30) + this.stBranch[i].nY); } else { - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i]); } } //普通→達人 if (this.stBranch[i].nBefore == 0 && this.stBranch[i].nAfter == CDTX.ECourse.eMaster) { - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; if (this.stBranch[i].ct分岐アニメ進行.CurrentValue < 60) { this.stBranch[i].nY = this.stBranch[i].ct分岐アニメ進行.CurrentValue / 2; - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], (y[i] - 12) + this.stBranch[i].nY); - TJAPlayer3.Tx.Lane_Text[0].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 100)); - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], (y[i] - 20) + this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], (y[i] - 12) + this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[0].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 100)); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], (y[i] - 20) + this.stBranch[i].nY); } //if( this.stBranch[ i ].ct分岐アニメ進行.n現在の値 >= 5 && this.stBranch[ i ].ct分岐アニメ進行.n現在の値 < 60 ) //{ @@ -329,91 +329,91 @@ namespace TJAPlayer3 { //} else if (this.stBranch[i].ct分岐アニメ進行.CurrentValue >= 60 && this.stBranch[i].ct分岐アニメ進行.CurrentValue < 150) { this.stBranch[i].nY = 21; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; } else if (this.stBranch[i].ct分岐アニメ進行.CurrentValue >= 150 && this.stBranch[i].ct分岐アニメ進行.CurrentValue < 210) { this.stBranch[i].nY = ((this.stBranch[i].ct分岐アニメ進行.CurrentValue - 150) / 2); - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i] + this.stBranch[i].nY); - TJAPlayer3.Tx.Lane_Text[1].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 100)); - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], (y[i] - 20) + this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i] + this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 100)); + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], (y[i] - 20) + this.stBranch[i].nY); } else { - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i]); } } #endregion #region[ 玄人譜面_レベルアップ ] //玄人→達人 if (this.stBranch[i].nBefore == CDTX.ECourse.eExpert && this.stBranch[i].nAfter == CDTX.ECourse.eMaster) { - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); + OpenTaiko.Tx.Lane_Text[1].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); if (this.stBranch[i].ct分岐アニメ進行.CurrentValue < 60) { this.stBranch[i].nY = this.stBranch[i].ct分岐アニメ進行.CurrentValue / 2; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i] + this.stBranch[i].nY); - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], (y[i] - 20) + this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i] + this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], (y[i] - 20) + this.stBranch[i].nY); } else { - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i]); } } #endregion #region[ 玄人譜面_レベルダウン ] if (this.stBranch[i].nBefore == CDTX.ECourse.eExpert && this.stBranch[i].nAfter == CDTX.ECourse.eNormal) { - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); + OpenTaiko.Tx.Lane_Text[1].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); if (this.stBranch[i].ct分岐アニメ進行.CurrentValue < 60) { this.stBranch[i].nY = this.stBranch[i].ct分岐アニメ進行.CurrentValue / 2; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i] - this.stBranch[i].nY); - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], (y[i] + 30) - this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i] - this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], (y[i] + 30) - this.stBranch[i].nY); } else { - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], y[i]); } } #endregion #region[ 達人譜面_レベルダウン ] if (this.stBranch[i].nBefore == CDTX.ECourse.eMaster && this.stBranch[i].nAfter == CDTX.ECourse.eNormal) { - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; if (this.stBranch[i].ct分岐アニメ進行.CurrentValue < 60) { this.stBranch[i].nY = this.stBranch[i].ct分岐アニメ進行.CurrentValue / 2; - TJAPlayer3.Tx.Lane_Text[2].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i] - this.stBranch[i].nY); - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], (y[i] + 30) - this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[2].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i] - this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], (y[i] + 30) - this.stBranch[i].nY); } else if (this.stBranch[i].ct分岐アニメ進行.CurrentValue >= 60 && this.stBranch[i].ct分岐アニメ進行.CurrentValue < 150) { this.stBranch[i].nY = 21; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i]); - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; } else if (this.stBranch[i].ct分岐アニメ進行.CurrentValue >= 150 && this.stBranch[i].ct分岐アニメ進行.CurrentValue < 210) { this.stBranch[i].nY = ((this.stBranch[i].ct分岐アニメ進行.CurrentValue - 150) / 2); - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i] - this.stBranch[i].nY); - TJAPlayer3.Tx.Lane_Text[1].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 100)); - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], (y[i] + 30) - this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i] - this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 100)); + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], (y[i] + 30) - this.stBranch[i].nY); } else if (this.stBranch[i].ct分岐アニメ進行.CurrentValue >= 210) { - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], y[i]); } } if (this.stBranch[i].nBefore == CDTX.ECourse.eMaster && this.stBranch[i].nAfter == CDTX.ECourse.eExpert) { - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); + OpenTaiko.Tx.Lane_Text[2].Opacity = this.stBranch[i].ct分岐アニメ進行.CurrentValue > 100 ? 0 : (255 - ((this.stBranch[i].ct分岐アニメ進行.CurrentValue * 0xff) / 60)); if (this.stBranch[i].ct分岐アニメ進行.CurrentValue < 60) { this.stBranch[i].nY = this.stBranch[i].ct分岐アニメ進行.CurrentValue / 2; - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i] - this.stBranch[i].nY); - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], (y[i] + 30) - this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i] - this.stBranch[i].nY); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], (y[i] + 30) - this.stBranch[i].nY); } else { - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i]); } } @@ -425,18 +425,18 @@ namespace TJAPlayer3 { } if (this.stBranch[i].nY座標 == 0) { - switch (TJAPlayer3.stage演奏ドラム画面.nレーン用表示コース[i]) { + switch (OpenTaiko.stage演奏ドラム画面.nレーン用表示コース[i]) { case CDTX.ECourse.eNormal: - TJAPlayer3.Tx.Lane_Text[0].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[0].Opacity = 255; + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], y[i]); break; case CDTX.ECourse.eExpert: - TJAPlayer3.Tx.Lane_Text[1].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[1].Opacity = 255; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i]); break; case CDTX.ECourse.eMaster: - TJAPlayer3.Tx.Lane_Text[2].Opacity = 255; - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i]); + OpenTaiko.Tx.Lane_Text[2].Opacity = 255; + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i]); break; } } @@ -445,42 +445,42 @@ namespace TJAPlayer3 { #region[ 普通譜面_レベルアップ ] //普通→玄人 if (this.stBranch[i].nBefore == CDTX.ECourse.eNormal && this.stBranch[i].nAfter == CDTX.ECourse.eExpert) { - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], y[i] - this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], (y[i] + 20) - this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[0].Opacity = this.stBranch[i].nBranchレイヤー透明度; + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], y[i] - this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], (y[i] + 20) - this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[0].Opacity = this.stBranch[i].nBranchレイヤー透明度; } //普通→達人 if (this.stBranch[i].nBefore == CDTX.ECourse.eNormal && this.stBranch[i].nAfter == CDTX.ECourse.eMaster) { - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], y[i] - this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], (y[i] + 20) - this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[0].Opacity = this.stBranch[i].nBranchレイヤー透明度; + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], y[i] - this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], (y[i] + 20) - this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[0].Opacity = this.stBranch[i].nBranchレイヤー透明度; } #endregion #region[ 玄人譜面_レベルアップ ] //玄人→達人 if (this.stBranch[i].nBefore == CDTX.ECourse.eExpert && this.stBranch[i].nAfter == CDTX.ECourse.eMaster) { - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i] - this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], (y[i] + 20) - this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[1].Opacity = this.stBranch[i].nBranchレイヤー透明度; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i] - this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], (y[i] + 20) - this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[1].Opacity = this.stBranch[i].nBranchレイヤー透明度; } #endregion #region[ 玄人譜面_レベルダウン ] if (this.stBranch[i].nBefore == CDTX.ECourse.eExpert && this.stBranch[i].nAfter == CDTX.ECourse.eNormal) { - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], y[i] + this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], (y[i] - 24) + this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[1].Opacity = this.stBranch[i].nBranchレイヤー透明度; + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], y[i] + this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], (y[i] - 24) + this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[1].Opacity = this.stBranch[i].nBranchレイヤー透明度; } #endregion #region[ 達人譜面_レベルダウン ] if (this.stBranch[i].nBefore == CDTX.ECourse.eMaster && this.stBranch[i].nAfter == CDTX.ECourse.eNormal) { - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i] + this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[0].t2D描画(x[i], (y[i] - 24) + this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[2].Opacity = this.stBranch[i].nBranchレイヤー透明度; + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i] + this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[0].t2D描画(x[i], (y[i] - 24) + this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[2].Opacity = this.stBranch[i].nBranchレイヤー透明度; } if (this.stBranch[i].nBefore == CDTX.ECourse.eMaster && this.stBranch[i].nAfter == CDTX.ECourse.eExpert) { - TJAPlayer3.Tx.Lane_Text[2].t2D描画(x[i], y[i] + this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[1].t2D描画(x[i], (y[i] - 24) + this.stBranch[i].nY座標); - TJAPlayer3.Tx.Lane_Text[2].Opacity = this.stBranch[i].nBranchレイヤー透明度; + OpenTaiko.Tx.Lane_Text[2].t2D描画(x[i], y[i] + this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[1].t2D描画(x[i], (y[i] - 24) + this.stBranch[i].nY座標); + OpenTaiko.Tx.Lane_Text[2].Opacity = this.stBranch[i].nBranchレイヤー透明度; } #endregion } @@ -490,71 +490,71 @@ namespace TJAPlayer3 { } - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) { - if (TJAPlayer3.Tx.Lane_Background_Sub != null) { - TJAPlayer3.Tx.Lane_Background_Sub.t2D描画(TJAPlayer3.Skin.Game_Lane_Sub_X[0], TJAPlayer3.Skin.Game_Lane_Sub_Y[0]); - if (TJAPlayer3.stage演奏ドラム画面.bDoublePlay) { - TJAPlayer3.Tx.Lane_Background_Sub.t2D描画(TJAPlayer3.Skin.Game_Lane_Sub_X[1], TJAPlayer3.Skin.Game_Lane_Sub_Y[1]); + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) { + if (OpenTaiko.Tx.Lane_Background_Sub != null) { + OpenTaiko.Tx.Lane_Background_Sub.t2D描画(OpenTaiko.Skin.Game_Lane_Sub_X[0], OpenTaiko.Skin.Game_Lane_Sub_Y[0]); + if (OpenTaiko.stage演奏ドラム画面.bDoublePlay) { + OpenTaiko.Tx.Lane_Background_Sub.t2D描画(OpenTaiko.Skin.Game_Lane_Sub_X[1], OpenTaiko.Skin.Game_Lane_Sub_Y[1]); } } } - TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.Draw(); + OpenTaiko.stage演奏ドラム画面.actTaikoLaneFlash.Draw(); - if (TJAPlayer3.Tx.Taiko_Frame[0] != null) { + if (OpenTaiko.Tx.Taiko_Frame[0] != null) { // Tower frame (without tamashii jauge) if playing a tower chart - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { int frame_x; int frame_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - frame_x = TJAPlayer3.Skin.Game_Taiko_Frame_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - frame_y = TJAPlayer3.Skin.Game_Taiko_Frame_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - frame_x = TJAPlayer3.Skin.Game_Taiko_Frame_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - frame_y = TJAPlayer3.Skin.Game_Taiko_Frame_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + frame_x = OpenTaiko.Skin.Game_Taiko_Frame_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + frame_y = OpenTaiko.Skin.Game_Taiko_Frame_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + frame_x = OpenTaiko.Skin.Game_Taiko_Frame_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + frame_y = OpenTaiko.Skin.Game_Taiko_Frame_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - frame_x = TJAPlayer3.Skin.Game_Taiko_Frame_X[i]; - frame_y = TJAPlayer3.Skin.Game_Taiko_Frame_Y[i]; + frame_x = OpenTaiko.Skin.Game_Taiko_Frame_X[i]; + frame_y = OpenTaiko.Skin.Game_Taiko_Frame_Y[i]; } CTexture tex = null; switch (i) { case 0: { - if (TJAPlayer3.ConfigIni.bTokkunMode) { - tex = TJAPlayer3.Tx.Taiko_Frame[3]; - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { - tex = TJAPlayer3.Tx.Taiko_Frame[5]; - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { - tex = TJAPlayer3.Tx.Taiko_Frame[2]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount > 2) { - tex = TJAPlayer3.Tx.Taiko_Frame[6]; + if (OpenTaiko.ConfigIni.bTokkunMode) { + tex = OpenTaiko.Tx.Taiko_Frame[3]; + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { + tex = OpenTaiko.Tx.Taiko_Frame[5]; + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + tex = OpenTaiko.Tx.Taiko_Frame[2]; + } else if (OpenTaiko.ConfigIni.nPlayerCount > 2) { + tex = OpenTaiko.Tx.Taiko_Frame[6]; } else { - tex = TJAPlayer3.Tx.Taiko_Frame[0]; + tex = OpenTaiko.Tx.Taiko_Frame[0]; } } break; case 1: { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - tex = TJAPlayer3.Tx.Taiko_Frame[4]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount > 2) { - tex = TJAPlayer3.Tx.Taiko_Frame[6]; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + tex = OpenTaiko.Tx.Taiko_Frame[4]; + } else if (OpenTaiko.ConfigIni.nPlayerCount > 2) { + tex = OpenTaiko.Tx.Taiko_Frame[6]; } else { - tex = TJAPlayer3.Tx.Taiko_Frame[1]; + tex = OpenTaiko.Tx.Taiko_Frame[1]; } } break; case 2: - tex = TJAPlayer3.Tx.Taiko_Frame[6]; + tex = OpenTaiko.Tx.Taiko_Frame[6]; break; case 3: - tex = TJAPlayer3.Tx.Taiko_Frame[6]; + tex = OpenTaiko.Tx.Taiko_Frame[6]; break; case 4: - tex = TJAPlayer3.Tx.Taiko_Frame[6]; + tex = OpenTaiko.Tx.Taiko_Frame[6]; break; } @@ -580,24 +580,24 @@ namespace TJAPlayer3 { } */ } - var nTime = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + var nTime = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (this.n総移動時間[i] != -1) { if (n移動方向[i] == 1) { - TJAPlayer3.stage演奏ドラム画面.JPOSCROLLX[i] = this.n移動開始X[i] + (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.n移動距離px[i]); - TJAPlayer3.stage演奏ドラム画面.JPOSCROLLY[i] = this.n移動開始Y[i] + (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.nVerticalJSPos[i]); + OpenTaiko.stage演奏ドラム画面.JPOSCROLLX[i] = this.n移動開始X[i] + (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.n移動距離px[i]); + OpenTaiko.stage演奏ドラム画面.JPOSCROLLY[i] = this.n移動開始Y[i] + (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.nVerticalJSPos[i]); //TJAPlayer3.stage演奏ドラム画面.FlyingNotes.StartPointX[i] = this.n移動開始X[i] + (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.n移動距離px[i]); } else { - TJAPlayer3.stage演奏ドラム画面.JPOSCROLLX[i] = this.n移動開始X[i] - (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.n移動距離px[i]); - TJAPlayer3.stage演奏ドラム画面.JPOSCROLLY[i] = this.n移動開始Y[i] - (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.nVerticalJSPos[i]); + OpenTaiko.stage演奏ドラム画面.JPOSCROLLX[i] = this.n移動開始X[i] - (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.n移動距離px[i]); + OpenTaiko.stage演奏ドラム画面.JPOSCROLLY[i] = this.n移動開始Y[i] - (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.nVerticalJSPos[i]); //TJAPlayer3.stage演奏ドラム画面.FlyingNotes.StartPointX[i] = this.n移動開始X[i] - (int)((((int)nTime - this.n移動開始時刻[i]) / (double)(this.n総移動時間[i])) * this.n移動距離px[i]); } if (((int)nTime) > this.n移動開始時刻[i] + this.n総移動時間[i]) { this.n総移動時間[i] = -1; - TJAPlayer3.stage演奏ドラム画面.JPOSCROLLX[i] = this.n移動目的場所X[i]; - TJAPlayer3.stage演奏ドラム画面.JPOSCROLLY[i] = this.n移動目的場所Y[i]; + OpenTaiko.stage演奏ドラム画面.JPOSCROLLX[i] = this.n移動目的場所X[i]; + OpenTaiko.stage演奏ドラム画面.JPOSCROLLY[i] = this.n移動目的場所Y[i]; //TJAPlayer3.stage演奏ドラム画面.FlyingNotes.StartPointX[i] = this.n移動目的場所X[i]; } } @@ -606,16 +606,16 @@ namespace TJAPlayer3 { - if (TJAPlayer3.ConfigIni.bEnableAVI && TJAPlayer3.DTX.listVD.Count > 0 && TJAPlayer3.stage演奏ドラム画面.ShowVideo) { - if (TJAPlayer3.Tx.Lane_Background_Main != null) TJAPlayer3.Tx.Lane_Background_Main.Opacity = TJAPlayer3.ConfigIni.nBGAlpha; - if (TJAPlayer3.Tx.Lane_Background_AI != null) TJAPlayer3.Tx.Lane_Background_AI.Opacity = TJAPlayer3.ConfigIni.nBGAlpha; - if (TJAPlayer3.Tx.Lane_Background_Sub != null) TJAPlayer3.Tx.Lane_Background_Sub.Opacity = TJAPlayer3.ConfigIni.nBGAlpha; - if (TJAPlayer3.Tx.Lane_Background_GoGo != null) TJAPlayer3.Tx.Lane_Background_GoGo.Opacity = TJAPlayer3.ConfigIni.nBGAlpha; + if (OpenTaiko.ConfigIni.bEnableAVI && OpenTaiko.DTX.listVD.Count > 0 && OpenTaiko.stage演奏ドラム画面.ShowVideo) { + if (OpenTaiko.Tx.Lane_Background_Main != null) OpenTaiko.Tx.Lane_Background_Main.Opacity = OpenTaiko.ConfigIni.nBGAlpha; + if (OpenTaiko.Tx.Lane_Background_AI != null) OpenTaiko.Tx.Lane_Background_AI.Opacity = OpenTaiko.ConfigIni.nBGAlpha; + if (OpenTaiko.Tx.Lane_Background_Sub != null) OpenTaiko.Tx.Lane_Background_Sub.Opacity = OpenTaiko.ConfigIni.nBGAlpha; + if (OpenTaiko.Tx.Lane_Background_GoGo != null) OpenTaiko.Tx.Lane_Background_GoGo.Opacity = OpenTaiko.ConfigIni.nBGAlpha; } else { - if (TJAPlayer3.Tx.Lane_Background_Main != null) TJAPlayer3.Tx.Lane_Background_Main.Opacity = 255; - if (TJAPlayer3.Tx.Lane_Background_AI != null) TJAPlayer3.Tx.Lane_Background_AI.Opacity = 255; - if (TJAPlayer3.Tx.Lane_Background_Sub != null) TJAPlayer3.Tx.Lane_Background_Sub.Opacity = 255; - if (TJAPlayer3.Tx.Lane_Background_GoGo != null) TJAPlayer3.Tx.Lane_Background_GoGo.Opacity = 255; + if (OpenTaiko.Tx.Lane_Background_Main != null) OpenTaiko.Tx.Lane_Background_Main.Opacity = 255; + if (OpenTaiko.Tx.Lane_Background_AI != null) OpenTaiko.Tx.Lane_Background_AI.Opacity = 255; + if (OpenTaiko.Tx.Lane_Background_Sub != null) OpenTaiko.Tx.Lane_Background_Sub.Opacity = 255; + if (OpenTaiko.Tx.Lane_Background_GoGo != null) OpenTaiko.Tx.Lane_Background_GoGo.Opacity = 255; } return base.Draw(); @@ -623,22 +623,22 @@ namespace TJAPlayer3 { public void ゴーゴー炎() { //判定枠 - if (TJAPlayer3.Tx.Judge_Frame != null) { - TJAPlayer3.Tx.Judge_Frame.b加算合成 = TJAPlayer3.Skin.Game_JudgeFrame_AddBlend; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - TJAPlayer3.Tx.Judge_Frame.t2D描画( - TJAPlayer3.stage演奏ドラム画面.NoteOriginX[i], - TJAPlayer3.stage演奏ドラム画面.NoteOriginY[i], new Rectangle(0, 0, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + if (OpenTaiko.Tx.Judge_Frame != null) { + OpenTaiko.Tx.Judge_Frame.b加算合成 = OpenTaiko.Skin.Game_JudgeFrame_AddBlend; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + OpenTaiko.Tx.Judge_Frame.t2D描画( + OpenTaiko.stage演奏ドラム画面.NoteOriginX[i], + OpenTaiko.stage演奏ドラム画面.NoteOriginY[i], new Rectangle(0, 0, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); } } #region[ ゴーゴー炎 ] - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.stage演奏ドラム画面.bIsGOGOTIME[i] && !TJAPlayer3.ConfigIni.SimpleMode) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.stage演奏ドラム画面.bIsGOGOTIME[i] && !OpenTaiko.ConfigIni.SimpleMode) { this.ctゴーゴー炎.TickLoop(); - if (TJAPlayer3.Tx.Effects_Fire != null) { + if (OpenTaiko.Tx.Effects_Fire != null) { float f倍率 = 1.0f; float[] ar倍率 = new float[] { 0.8f, 1.2f, 1.7f, 2.5f, 2.3f, 2.2f, 2.0f, 1.8f, 1.7f, 1.6f, 1.6f, 1.5f, 1.5f, 1.4f, 1.3f, 1.2f, 1.1f, 1.0f }; @@ -654,33 +654,33 @@ namespace TJAPlayer3 { //this.ctゴーゴー.n現在の値 = 6; - int width = TJAPlayer3.Tx.Effects_Fire.szTextureSize.Width / 7; - int height = TJAPlayer3.Tx.Effects_Fire.szTextureSize.Height; + int width = OpenTaiko.Tx.Effects_Fire.szTextureSize.Width / 7; + int height = OpenTaiko.Tx.Effects_Fire.szTextureSize.Height; float x = -(width * (f倍率 - 1.0f) / 2.0f); float y = -(height * (f倍率 - 1.0f) / 2.0f); - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x += TJAPlayer3.Skin.Game_Effect_Fire_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - y += TJAPlayer3.Skin.Game_Effect_Fire_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x += TJAPlayer3.Skin.Game_Effect_Fire_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - y += TJAPlayer3.Skin.Game_Effect_Fire_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x += OpenTaiko.Skin.Game_Effect_Fire_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + y += OpenTaiko.Skin.Game_Effect_Fire_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x += OpenTaiko.Skin.Game_Effect_Fire_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + y += OpenTaiko.Skin.Game_Effect_Fire_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - x += TJAPlayer3.Skin.Game_Effect_Fire_X[i]; - y += TJAPlayer3.Skin.Game_Effect_Fire_Y[i]; + x += OpenTaiko.Skin.Game_Effect_Fire_X[i]; + y += OpenTaiko.Skin.Game_Effect_Fire_Y[i]; } - TJAPlayer3.Tx.Effects_Fire.vcScaleRatio.X = f倍率; - TJAPlayer3.Tx.Effects_Fire.vcScaleRatio.Y = f倍率; + OpenTaiko.Tx.Effects_Fire.vcScaleRatio.X = f倍率; + OpenTaiko.Tx.Effects_Fire.vcScaleRatio.Y = f倍率; - TJAPlayer3.Tx.Effects_Fire.t2D描画(x, y, + OpenTaiko.Tx.Effects_Fire.t2D描画(x, y, new Rectangle(width * (this.ctゴーゴー炎.CurrentValue), 0, width, height)); } } } #endregion - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (!this.st状態[i].ct進行.IsStoped) { this.st状態[i].ct進行.Tick(); if (this.st状態[i].ct進行.IsEnded) { @@ -694,38 +694,38 @@ namespace TJAPlayer3 { float x = 0; float y = 0; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - y = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - y = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x = OpenTaiko.Skin.Game_Effects_Hit_Explosion_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + y = OpenTaiko.Skin.Game_Effects_Hit_Explosion_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x = OpenTaiko.Skin.Game_Effects_Hit_Explosion_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + y = OpenTaiko.Skin.Game_Effects_Hit_Explosion_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - x = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_X[i]; - y = TJAPlayer3.Skin.Game_Effects_Hit_Explosion_Y[i]; + x = OpenTaiko.Skin.Game_Effects_Hit_Explosion_X[i]; + y = OpenTaiko.Skin.Game_Effects_Hit_Explosion_Y[i]; } - x += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(i); - y += TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(i); + x += OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(i); + y += OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(i); switch (st状態[i].judge) { case ENoteJudge.Perfect: case ENoteJudge.Great: case ENoteJudge.Auto: - if (!TJAPlayer3.ConfigIni.SimpleMode) { + if (!OpenTaiko.ConfigIni.SimpleMode) { //this.txアタックエフェクトLower.t2D描画( CDTXMania.app.Device, 285, 127, new Rectangle( this.st状態[ i ].ct進行.n現在の値 * 260, n, 260, 260 ) ); - if (this.st状態[i].nIsBig == 1 && TJAPlayer3.Tx.Effects_Hit_Great_Big[this.st状態[i].ct進行.CurrentValue] != null) - TJAPlayer3.Tx.Effects_Hit_Great_Big[this.st状態[i].ct進行.CurrentValue].t2D描画(x, y); - else if (TJAPlayer3.Tx.Effects_Hit_Great[this.st状態[i].ct進行.CurrentValue] != null) - TJAPlayer3.Tx.Effects_Hit_Great[this.st状態[i].ct進行.CurrentValue].t2D描画(x, y); + if (this.st状態[i].nIsBig == 1 && OpenTaiko.Tx.Effects_Hit_Great_Big[this.st状態[i].ct進行.CurrentValue] != null) + OpenTaiko.Tx.Effects_Hit_Great_Big[this.st状態[i].ct進行.CurrentValue].t2D描画(x, y); + else if (OpenTaiko.Tx.Effects_Hit_Great[this.st状態[i].ct進行.CurrentValue] != null) + OpenTaiko.Tx.Effects_Hit_Great[this.st状態[i].ct進行.CurrentValue].t2D描画(x, y); } break; case ENoteJudge.Good: //this.txアタックエフェクトLower.t2D描画( CDTXMania.app.Device, 285, 127, new Rectangle( this.st状態[ i ].ct進行.n現在の値 * 260, n + 260, 260, 260 ) ); - if (this.st状態[i].nIsBig == 1 && TJAPlayer3.Tx.Effects_Hit_Good_Big[this.st状態[i].ct進行.CurrentValue] != null) - TJAPlayer3.Tx.Effects_Hit_Good_Big[this.st状態[i].ct進行.CurrentValue].t2D描画(x, y); - else if (TJAPlayer3.Tx.Effects_Hit_Good[this.st状態[i].ct進行.CurrentValue] != null) - TJAPlayer3.Tx.Effects_Hit_Good[this.st状態[i].ct進行.CurrentValue].t2D描画(x, y); + if (this.st状態[i].nIsBig == 1 && OpenTaiko.Tx.Effects_Hit_Good_Big[this.st状態[i].ct進行.CurrentValue] != null) + OpenTaiko.Tx.Effects_Hit_Good_Big[this.st状態[i].ct進行.CurrentValue].t2D描画(x, y); + else if (OpenTaiko.Tx.Effects_Hit_Good[this.st状態[i].ct進行.CurrentValue] != null) + OpenTaiko.Tx.Effects_Hit_Good[this.st状態[i].ct進行.CurrentValue].t2D描画(x, y); break; case ENoteJudge.Miss: @@ -744,7 +744,7 @@ namespace TJAPlayer3 { //for( int n = 0; n < 1; n++ ) { - this.st状態[nPlayer].ct進行 = new CCounter(0, 14, 20, TJAPlayer3.Timer); + this.st状態[nPlayer].ct進行 = new CCounter(0, 14, 20, OpenTaiko.Timer); this.st状態[nPlayer].judge = judge; this.st状態[nPlayer].nPlayer = nPlayer; @@ -769,8 +769,8 @@ namespace TJAPlayer3 { public void GOGOSTART() { - this.ctゴーゴー = new CCounter(0, 17, 18, TJAPlayer3.Timer); - if (TJAPlayer3.ConfigIni.nPlayerCount == 1 && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) TJAPlayer3.stage演奏ドラム画面.GoGoSplash.StartSplash(); + this.ctゴーゴー = new CCounter(0, 17, 18, OpenTaiko.Timer); + if (OpenTaiko.ConfigIni.nPlayerCount == 1 && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) OpenTaiko.stage演奏ドラム画面.GoGoSplash.StartSplash(); } @@ -778,7 +778,7 @@ namespace TJAPlayer3 { if (n現在 == n次回) { return; } - this.stBranch[nPlayer].ct分岐アニメ進行 = new CCounter(0, 300, 2, TJAPlayer3.Timer); + this.stBranch[nPlayer].ct分岐アニメ進行 = new CCounter(0, 300, 2, OpenTaiko.Timer); this.stBranch[nPlayer].nBranchレイヤー透明度 = 6; this.stBranch[nPlayer].nY座標 = 1; @@ -786,23 +786,23 @@ namespace TJAPlayer3 { this.stBranch[nPlayer].nBefore = n現在; this.stBranch[nPlayer].nAfter = n次回; - TJAPlayer3.stage演奏ドラム画面.actLane.t分岐レイヤー_コース変化(n現在, n次回, nPlayer); + OpenTaiko.stage演奏ドラム画面.actLane.t分岐レイヤー_コース変化(n現在, n次回, nPlayer); } public void t判定枠移動(double db移動時間, int n移動px, int n移動方向, int nPlayer, int vJs) { - this.n移動開始時刻[nPlayer] = (int)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); - this.n移動開始X[nPlayer] = TJAPlayer3.stage演奏ドラム画面.JPOSCROLLX[nPlayer]; - this.n移動開始Y[nPlayer] = TJAPlayer3.stage演奏ドラム画面.JPOSCROLLY[nPlayer]; + this.n移動開始時刻[nPlayer] = (int)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); + this.n移動開始X[nPlayer] = OpenTaiko.stage演奏ドラム画面.JPOSCROLLX[nPlayer]; + this.n移動開始Y[nPlayer] = OpenTaiko.stage演奏ドラム画面.JPOSCROLLY[nPlayer]; this.n総移動時間[nPlayer] = (int)(db移動時間 * 1000); this.n移動方向[nPlayer] = n移動方向; this.n移動距離px[nPlayer] = n移動px; this.nVerticalJSPos[nPlayer] = vJs; if (n移動方向 == 0) { - this.n移動目的場所X[nPlayer] = TJAPlayer3.stage演奏ドラム画面.JPOSCROLLX[nPlayer] - n移動px; - this.n移動目的場所Y[nPlayer] = TJAPlayer3.stage演奏ドラム画面.JPOSCROLLY[nPlayer] - vJs; + this.n移動目的場所X[nPlayer] = OpenTaiko.stage演奏ドラム画面.JPOSCROLLX[nPlayer] - n移動px; + this.n移動目的場所Y[nPlayer] = OpenTaiko.stage演奏ドラム画面.JPOSCROLLY[nPlayer] - vJs; } else { - this.n移動目的場所X[nPlayer] = TJAPlayer3.stage演奏ドラム画面.JPOSCROLLX[nPlayer] + n移動px; - this.n移動目的場所Y[nPlayer] = TJAPlayer3.stage演奏ドラム画面.JPOSCROLLY[nPlayer] + vJs; + this.n移動目的場所X[nPlayer] = OpenTaiko.stage演奏ドラム画面.JPOSCROLLX[nPlayer] + n移動px; + this.n移動目的場所Y[nPlayer] = OpenTaiko.stage演奏ドラム画面.JPOSCROLLY[nPlayer] + vJs; } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplMob.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplMob.cs index 2ddbf6a1..3ea4ee1b 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplMob.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplMob.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplMob : CActivity { /// /// 踊り子 @@ -46,9 +46,9 @@ namespace TJAPlayer3 { } public override int Draw() { - if (!TJAPlayer3.stage演奏ドラム画面.bDoublePlay) { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) MobScript?.Update(); + if (!OpenTaiko.stage演奏ドラム画面.bDoublePlay) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) MobScript?.Update(); MobScript?.Draw(); /* diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplMtaiko.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplMtaiko.cs index 03f819b8..4bece99c 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplMtaiko.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplMtaiko.cs @@ -2,7 +2,7 @@ using FDK; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplMtaiko : CActivity { /// /// mtaiko部分を描画するクラス。左側だけ。 @@ -47,11 +47,11 @@ namespace TJAPlayer3 { public override int Draw() { if (base.IsFirstDraw) { - this.nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + this.nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); base.IsFirstDraw = false; } - long num = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long num = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); if (num < this.nフラッシュ制御タイマ) { this.nフラッシュ制御タイマ = num; } @@ -69,58 +69,58 @@ namespace TJAPlayer3 { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { int bg_x; int bg_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - bg_x = TJAPlayer3.Skin.Game_Taiko_Background_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - bg_y = TJAPlayer3.Skin.Game_Taiko_Background_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - bg_x = TJAPlayer3.Skin.Game_Taiko_Background_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - bg_y = TJAPlayer3.Skin.Game_Taiko_Background_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + bg_x = OpenTaiko.Skin.Game_Taiko_Background_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + bg_y = OpenTaiko.Skin.Game_Taiko_Background_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + bg_x = OpenTaiko.Skin.Game_Taiko_Background_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + bg_y = OpenTaiko.Skin.Game_Taiko_Background_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - bg_x = TJAPlayer3.Skin.Game_Taiko_Background_X[i]; - bg_y = TJAPlayer3.Skin.Game_Taiko_Background_Y[i]; + bg_x = OpenTaiko.Skin.Game_Taiko_Background_X[i]; + bg_y = OpenTaiko.Skin.Game_Taiko_Background_Y[i]; } CTexture tex = null; switch (i) { case 0: { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { - tex = TJAPlayer3.Tx.Taiko_Background[2]; - } else if (TJAPlayer3.ConfigIni.bTokkunMode) { - if (TJAPlayer3.P1IsBlue()) - tex = TJAPlayer3.Tx.Taiko_Background[6]; + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + tex = OpenTaiko.Tx.Taiko_Background[2]; + } else if (OpenTaiko.ConfigIni.bTokkunMode) { + if (OpenTaiko.P1IsBlue()) + tex = OpenTaiko.Tx.Taiko_Background[6]; else - tex = TJAPlayer3.Tx.Taiko_Background[5]; + tex = OpenTaiko.Tx.Taiko_Background[5]; } else { - if (TJAPlayer3.P1IsBlue()) - tex = TJAPlayer3.Tx.Taiko_Background[4]; + if (OpenTaiko.P1IsBlue()) + tex = OpenTaiko.Tx.Taiko_Background[4]; else - tex = TJAPlayer3.Tx.Taiko_Background[0]; + tex = OpenTaiko.Tx.Taiko_Background[0]; } } break; case 1: { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - tex = TJAPlayer3.Tx.Taiko_Background[9]; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + tex = OpenTaiko.Tx.Taiko_Background[9]; } else { - if (TJAPlayer3.ConfigIni.nPlayerCount == 2) - tex = TJAPlayer3.Tx.Taiko_Background[1]; + if (OpenTaiko.ConfigIni.nPlayerCount == 2) + tex = OpenTaiko.Tx.Taiko_Background[1]; else - tex = TJAPlayer3.Tx.Taiko_Background[4]; + tex = OpenTaiko.Tx.Taiko_Background[4]; } } break; case 2: - tex = TJAPlayer3.Tx.Taiko_Background[7]; + tex = OpenTaiko.Tx.Taiko_Background[7]; break; case 3: - tex = TJAPlayer3.Tx.Taiko_Background[8]; + tex = OpenTaiko.Tx.Taiko_Background[8]; break; case 4: - tex = TJAPlayer3.Tx.Taiko_Background[11]; + tex = OpenTaiko.Tx.Taiko_Background[11]; break; } @@ -174,56 +174,56 @@ namespace TJAPlayer3 { */ int getMTaikoOpacity(int brightness) { - if (TJAPlayer3.ConfigIni.SimpleMode) { + if (OpenTaiko.ConfigIni.SimpleMode) { return brightness <= 0 ? 0 : 255; } else { return brightness * 73; } } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { int taiko_x; int taiko_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - taiko_x = TJAPlayer3.Skin.Game_Taiko_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - taiko_y = TJAPlayer3.Skin.Game_Taiko_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - taiko_x = TJAPlayer3.Skin.Game_Taiko_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - taiko_y = TJAPlayer3.Skin.Game_Taiko_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + taiko_x = OpenTaiko.Skin.Game_Taiko_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + taiko_y = OpenTaiko.Skin.Game_Taiko_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + taiko_x = OpenTaiko.Skin.Game_Taiko_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + taiko_y = OpenTaiko.Skin.Game_Taiko_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - taiko_x = TJAPlayer3.Skin.Game_Taiko_X[i]; - taiko_y = TJAPlayer3.Skin.Game_Taiko_Y[i]; + taiko_x = OpenTaiko.Skin.Game_Taiko_X[i]; + taiko_y = OpenTaiko.Skin.Game_Taiko_Y[i]; } - int _actual = TJAPlayer3.GetActualPlayer(i); - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[_actual]; + int _actual = OpenTaiko.GetActualPlayer(i); + EGameType _gt = OpenTaiko.ConfigIni.nGameType[_actual]; int playerShift = i * 5; // Drum base - TJAPlayer3.Tx.Taiko_Base[(int)_gt]?.t2D描画(taiko_x, taiko_y); + OpenTaiko.Tx.Taiko_Base[(int)_gt]?.t2D描画(taiko_x, taiko_y); // Taiko hits if (_gt == EGameType.TAIKO) { - if (TJAPlayer3.Tx.Taiko_Don_Left != null && TJAPlayer3.Tx.Taiko_Don_Right != null && TJAPlayer3.Tx.Taiko_Ka_Left != null && TJAPlayer3.Tx.Taiko_Ka_Right != null) { - TJAPlayer3.Tx.Taiko_Ka_Left.Opacity = getMTaikoOpacity(this.stパッド状態[playerShift].n明るさ); - TJAPlayer3.Tx.Taiko_Ka_Right.Opacity = getMTaikoOpacity(this.stパッド状態[1 + playerShift].n明るさ); - TJAPlayer3.Tx.Taiko_Don_Left.Opacity = getMTaikoOpacity(this.stパッド状態[2 + playerShift].n明るさ); - TJAPlayer3.Tx.Taiko_Don_Right.Opacity = getMTaikoOpacity(this.stパッド状態[3 + playerShift].n明るさ); + if (OpenTaiko.Tx.Taiko_Don_Left != null && OpenTaiko.Tx.Taiko_Don_Right != null && OpenTaiko.Tx.Taiko_Ka_Left != null && OpenTaiko.Tx.Taiko_Ka_Right != null) { + OpenTaiko.Tx.Taiko_Ka_Left.Opacity = getMTaikoOpacity(this.stパッド状態[playerShift].n明るさ); + OpenTaiko.Tx.Taiko_Ka_Right.Opacity = getMTaikoOpacity(this.stパッド状態[1 + playerShift].n明るさ); + OpenTaiko.Tx.Taiko_Don_Left.Opacity = getMTaikoOpacity(this.stパッド状態[2 + playerShift].n明るさ); + OpenTaiko.Tx.Taiko_Don_Right.Opacity = getMTaikoOpacity(this.stパッド状態[3 + playerShift].n明るさ); - TJAPlayer3.Tx.Taiko_Ka_Left.t2D描画(taiko_x, taiko_y, new Rectangle(0, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Height)); - TJAPlayer3.Tx.Taiko_Ka_Right.t2D描画(taiko_x + TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, taiko_y, new Rectangle(TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Height)); - TJAPlayer3.Tx.Taiko_Don_Left.t2D描画(taiko_x, taiko_y, new Rectangle(0, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Height)); - TJAPlayer3.Tx.Taiko_Don_Right.t2D描画(taiko_x + TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, taiko_y, new Rectangle(TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, 0, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, TJAPlayer3.Tx.Taiko_Ka_Right.szTextureSize.Height)); + OpenTaiko.Tx.Taiko_Ka_Left.t2D描画(taiko_x, taiko_y, new Rectangle(0, 0, OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Height)); + OpenTaiko.Tx.Taiko_Ka_Right.t2D描画(taiko_x + OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, taiko_y, new Rectangle(OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, 0, OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Height)); + OpenTaiko.Tx.Taiko_Don_Left.t2D描画(taiko_x, taiko_y, new Rectangle(0, 0, OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Height)); + OpenTaiko.Tx.Taiko_Don_Right.t2D描画(taiko_x + OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, taiko_y, new Rectangle(OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, 0, OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Width / 2, OpenTaiko.Tx.Taiko_Ka_Right.szTextureSize.Height)); } } else if (_gt == EGameType.KONGA) { - if (TJAPlayer3.Tx.Taiko_Konga_Clap != null && TJAPlayer3.Tx.Taiko_Konga_Don != null && TJAPlayer3.Tx.Taiko_Konga_Ka != null) { - TJAPlayer3.Tx.Taiko_Konga_Clap.Opacity = getMTaikoOpacity(this.stパッド状態[4 + playerShift].n明るさ); - TJAPlayer3.Tx.Taiko_Konga_Don.Opacity = getMTaikoOpacity(Math.Max(this.stパッド状態[2 + playerShift].n明るさ, this.stパッド状態[3 + playerShift].n明るさ)); - TJAPlayer3.Tx.Taiko_Konga_Ka.Opacity = getMTaikoOpacity(Math.Max(this.stパッド状態[playerShift].n明るさ, this.stパッド状態[1 + playerShift].n明るさ)); + if (OpenTaiko.Tx.Taiko_Konga_Clap != null && OpenTaiko.Tx.Taiko_Konga_Don != null && OpenTaiko.Tx.Taiko_Konga_Ka != null) { + OpenTaiko.Tx.Taiko_Konga_Clap.Opacity = getMTaikoOpacity(this.stパッド状態[4 + playerShift].n明るさ); + OpenTaiko.Tx.Taiko_Konga_Don.Opacity = getMTaikoOpacity(Math.Max(this.stパッド状態[2 + playerShift].n明るさ, this.stパッド状態[3 + playerShift].n明るさ)); + OpenTaiko.Tx.Taiko_Konga_Ka.Opacity = getMTaikoOpacity(Math.Max(this.stパッド状態[playerShift].n明るさ, this.stパッド状態[1 + playerShift].n明るさ)); - TJAPlayer3.Tx.Taiko_Konga_Ka.t2D描画(taiko_x, taiko_y); - TJAPlayer3.Tx.Taiko_Konga_Don.t2D描画(taiko_x, taiko_y); - TJAPlayer3.Tx.Taiko_Konga_Clap.t2D描画(taiko_x, taiko_y); + OpenTaiko.Tx.Taiko_Konga_Ka.t2D描画(taiko_x, taiko_y); + OpenTaiko.Tx.Taiko_Konga_Don.t2D描画(taiko_x, taiko_y); + OpenTaiko.Tx.Taiko_Konga_Clap.t2D描画(taiko_x, taiko_y); } } @@ -232,8 +232,8 @@ namespace TJAPlayer3 { int[] nLVUPY = new int[] { 127, 127, 0, 0 }; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.nPlayerCount > 2 || TJAPlayer3.ConfigIni.SimpleMode) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.nPlayerCount > 2 || OpenTaiko.ConfigIni.SimpleMode) break; if (!this.ctレベルアップダウン[i].IsStoped) { this.ctレベルアップダウン[i].Tick(); @@ -241,7 +241,7 @@ namespace TJAPlayer3 { this.ctレベルアップダウン[i].Stop(); } } - if ((this.ctレベルアップダウン[i].IsTicked && (TJAPlayer3.Tx.Taiko_LevelUp != null && TJAPlayer3.Tx.Taiko_LevelDown != null)) && !TJAPlayer3.ConfigIni.bNoInfo) { + if ((this.ctレベルアップダウン[i].IsTicked && (OpenTaiko.Tx.Taiko_LevelUp != null && OpenTaiko.Tx.Taiko_LevelDown != null)) && !OpenTaiko.ConfigIni.bNoInfo) { //this.ctレベルアップダウン[ i ].n現在の値 = 110; //2017.08.21 kairera0467 t3D描画に変更。 @@ -271,69 +271,69 @@ namespace TJAPlayer3 { fScale = 1.0f; } - if (TJAPlayer3.ConfigIni.nPlayerCount > 2) continue; + if (OpenTaiko.ConfigIni.nPlayerCount > 2) continue; - int levelChange_x = TJAPlayer3.Skin.Game_Taiko_LevelChange_X[i]; - int levelChange_y = TJAPlayer3.Skin.Game_Taiko_LevelChange_Y[i]; + int levelChange_x = OpenTaiko.Skin.Game_Taiko_LevelChange_X[i]; + int levelChange_y = OpenTaiko.Skin.Game_Taiko_LevelChange_Y[i]; if (this.After[i] - this.Before[i] >= 0) { //レベルアップ - TJAPlayer3.Tx.Taiko_LevelUp.vcScaleRatio.X = fScale; - TJAPlayer3.Tx.Taiko_LevelUp.vcScaleRatio.Y = fScale; - TJAPlayer3.Tx.Taiko_LevelUp.Opacity = nAlpha; - TJAPlayer3.Tx.Taiko_LevelUp.t2D拡大率考慮中央基準描画(levelChange_x, + OpenTaiko.Tx.Taiko_LevelUp.vcScaleRatio.X = fScale; + OpenTaiko.Tx.Taiko_LevelUp.vcScaleRatio.Y = fScale; + OpenTaiko.Tx.Taiko_LevelUp.Opacity = nAlpha; + OpenTaiko.Tx.Taiko_LevelUp.t2D拡大率考慮中央基準描画(levelChange_x, levelChange_y); } else { - TJAPlayer3.Tx.Taiko_LevelDown.vcScaleRatio.X = fScale; - TJAPlayer3.Tx.Taiko_LevelDown.vcScaleRatio.Y = fScale; - TJAPlayer3.Tx.Taiko_LevelDown.Opacity = nAlpha; - TJAPlayer3.Tx.Taiko_LevelDown.t2D拡大率考慮中央基準描画(levelChange_x, + OpenTaiko.Tx.Taiko_LevelDown.vcScaleRatio.X = fScale; + OpenTaiko.Tx.Taiko_LevelDown.vcScaleRatio.Y = fScale; + OpenTaiko.Tx.Taiko_LevelDown.Opacity = nAlpha; + OpenTaiko.Tx.Taiko_LevelDown.t2D拡大率考慮中央基準描画(levelChange_x, levelChange_y); } } } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; int modIcons_x; int modIcons_y; int couse_symbol_x; int couse_symbol_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - modIcons_x = TJAPlayer3.Skin.Game_Taiko_ModIcons_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - modIcons_y = TJAPlayer3.Skin.Game_Taiko_ModIcons_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + modIcons_x = OpenTaiko.Skin.Game_Taiko_ModIcons_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + modIcons_y = OpenTaiko.Skin.Game_Taiko_ModIcons_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); - couse_symbol_x = TJAPlayer3.Skin.Game_CourseSymbol_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - couse_symbol_y = TJAPlayer3.Skin.Game_CourseSymbol_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - modIcons_x = TJAPlayer3.Skin.Game_Taiko_ModIcons_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - modIcons_y = TJAPlayer3.Skin.Game_Taiko_ModIcons_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + couse_symbol_x = OpenTaiko.Skin.Game_CourseSymbol_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + couse_symbol_y = OpenTaiko.Skin.Game_CourseSymbol_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + modIcons_x = OpenTaiko.Skin.Game_Taiko_ModIcons_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + modIcons_y = OpenTaiko.Skin.Game_Taiko_ModIcons_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); - couse_symbol_x = TJAPlayer3.Skin.Game_CourseSymbol_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - couse_symbol_y = TJAPlayer3.Skin.Game_CourseSymbol_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + couse_symbol_x = OpenTaiko.Skin.Game_CourseSymbol_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + couse_symbol_y = OpenTaiko.Skin.Game_CourseSymbol_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - modIcons_x = TJAPlayer3.Skin.Game_Taiko_ModIcons_X[i]; - modIcons_y = TJAPlayer3.Skin.Game_Taiko_ModIcons_Y[i]; + modIcons_x = OpenTaiko.Skin.Game_Taiko_ModIcons_X[i]; + modIcons_y = OpenTaiko.Skin.Game_Taiko_ModIcons_Y[i]; - couse_symbol_x = TJAPlayer3.Skin.Game_CourseSymbol_X[i]; - couse_symbol_y = TJAPlayer3.Skin.Game_CourseSymbol_Y[i]; + couse_symbol_x = OpenTaiko.Skin.Game_CourseSymbol_X[i]; + couse_symbol_y = OpenTaiko.Skin.Game_CourseSymbol_Y[i]; } ModIcons.tDisplayMods(modIcons_x, modIcons_y, i); - if (TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] != null) { - TJAPlayer3.Tx.Couse_Symbol[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画( + if (OpenTaiko.Tx.Couse_Symbol[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]] != null) { + OpenTaiko.Tx.Couse_Symbol[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画( couse_symbol_x, couse_symbol_y ); } - if (TJAPlayer3.ConfigIni.ShinuchiMode) { - if (TJAPlayer3.Tx.Couse_Symbol[(int)Difficulty.Total] != null) { - TJAPlayer3.Tx.Couse_Symbol[(int)Difficulty.Total].t2D描画( + if (OpenTaiko.ConfigIni.ShinuchiMode) { + if (OpenTaiko.Tx.Couse_Symbol[(int)Difficulty.Total] != null) { + OpenTaiko.Tx.Couse_Symbol[(int)Difficulty.Total].t2D描画( couse_symbol_x, couse_symbol_y ); @@ -342,49 +342,49 @@ namespace TJAPlayer3 { } } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { int namePlate_x; int namePlate_y; int playerNumber_x; int playerNumber_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - namePlate_x = TJAPlayer3.Skin.Game_Taiko_NamePlate_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - namePlate_y = TJAPlayer3.Skin.Game_Taiko_NamePlate_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + namePlate_x = OpenTaiko.Skin.Game_Taiko_NamePlate_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + namePlate_y = OpenTaiko.Skin.Game_Taiko_NamePlate_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); - playerNumber_x = TJAPlayer3.Skin.Game_Taiko_PlayerNumber_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - playerNumber_y = TJAPlayer3.Skin.Game_Taiko_PlayerNumber_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - namePlate_x = TJAPlayer3.Skin.Game_Taiko_NamePlate_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - namePlate_y = TJAPlayer3.Skin.Game_Taiko_NamePlate_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + playerNumber_x = OpenTaiko.Skin.Game_Taiko_PlayerNumber_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + playerNumber_y = OpenTaiko.Skin.Game_Taiko_PlayerNumber_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + namePlate_x = OpenTaiko.Skin.Game_Taiko_NamePlate_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + namePlate_y = OpenTaiko.Skin.Game_Taiko_NamePlate_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); - playerNumber_x = TJAPlayer3.Skin.Game_Taiko_PlayerNumber_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - playerNumber_y = TJAPlayer3.Skin.Game_Taiko_PlayerNumber_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + playerNumber_x = OpenTaiko.Skin.Game_Taiko_PlayerNumber_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + playerNumber_y = OpenTaiko.Skin.Game_Taiko_PlayerNumber_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - namePlate_x = TJAPlayer3.Skin.Game_Taiko_NamePlate_X[i]; - namePlate_y = TJAPlayer3.Skin.Game_Taiko_NamePlate_Y[i]; + namePlate_x = OpenTaiko.Skin.Game_Taiko_NamePlate_X[i]; + namePlate_y = OpenTaiko.Skin.Game_Taiko_NamePlate_Y[i]; - playerNumber_x = TJAPlayer3.Skin.Game_Taiko_PlayerNumber_X[i]; - playerNumber_y = TJAPlayer3.Skin.Game_Taiko_PlayerNumber_Y[i]; + playerNumber_x = OpenTaiko.Skin.Game_Taiko_PlayerNumber_X[i]; + playerNumber_y = OpenTaiko.Skin.Game_Taiko_PlayerNumber_Y[i]; } - TJAPlayer3.NamePlate.tNamePlateDraw(namePlate_x, namePlate_y, i); + OpenTaiko.NamePlate.tNamePlateDraw(namePlate_x, namePlate_y, i); - if (TJAPlayer3.Tx.Taiko_PlayerNumber[i] != null) { - TJAPlayer3.Tx.Taiko_PlayerNumber[i].t2D描画(playerNumber_x, playerNumber_y); + if (OpenTaiko.Tx.Taiko_PlayerNumber[i] != null) { + OpenTaiko.Tx.Taiko_PlayerNumber[i].t2D描画(playerNumber_x, playerNumber_y); } } return base.Draw(); } public void tMtaikoEvent(int nChannel, int nHand, int nPlayer) { - CConfigIni configIni = TJAPlayer3.ConfigIni; + CConfigIni configIni = OpenTaiko.ConfigIni; bool bAutoPlay = configIni.bAutoPlay[nPlayer]; int playerShift = 5 * nPlayer; - var _gt = configIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; + var _gt = configIni.nGameType[OpenTaiko.GetActualPlayer(nPlayer)]; switch (nPlayer) { case 1: - bAutoPlay = configIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; + bAutoPlay = configIni.bAutoPlay[nPlayer] || OpenTaiko.ConfigIni.bAIBattleMode; break; } @@ -464,7 +464,7 @@ namespace TJAPlayer3 { public void tBranchEvent(CDTX.ECourse Before, CDTX.ECourse After, int player) { if (After != Before) - this.ctレベルアップダウン[player] = new CCounter(0, 1000, 1, TJAPlayer3.Timer); + this.ctレベルアップダウン[player] = new CCounter(0, 1000, 1, OpenTaiko.Timer); this.After[player] = After; this.Before[player] = Before; @@ -472,71 +472,71 @@ namespace TJAPlayer3 { public void BackSymbolEvent(int player) { - ctSymbolFlash[player] = new CCounter(0, 1000, 0.2f, TJAPlayer3.Timer); + ctSymbolFlash[player] = new CCounter(0, 1000, 0.2f, OpenTaiko.Timer); } public void DrawBackSymbol() { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { ctSymbolFlash[i].Tick(); int couse_symbol_x; int couse_symbol_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - couse_symbol_x = TJAPlayer3.Skin.Game_CourseSymbol_Back_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - couse_symbol_y = TJAPlayer3.Skin.Game_CourseSymbol_Back_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - couse_symbol_x = TJAPlayer3.Skin.Game_CourseSymbol_Back_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - couse_symbol_y = TJAPlayer3.Skin.Game_CourseSymbol_Back_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + couse_symbol_x = OpenTaiko.Skin.Game_CourseSymbol_Back_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + couse_symbol_y = OpenTaiko.Skin.Game_CourseSymbol_Back_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + couse_symbol_x = OpenTaiko.Skin.Game_CourseSymbol_Back_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + couse_symbol_y = OpenTaiko.Skin.Game_CourseSymbol_Back_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - couse_symbol_x = TJAPlayer3.Skin.Game_CourseSymbol_Back_X[i]; - couse_symbol_y = TJAPlayer3.Skin.Game_CourseSymbol_Back_Y[i]; + couse_symbol_x = OpenTaiko.Skin.Game_CourseSymbol_Back_X[i]; + couse_symbol_y = OpenTaiko.Skin.Game_CourseSymbol_Back_Y[i]; } - if (TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] != null) { + if (OpenTaiko.Tx.Couse_Symbol_Back[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]] != null) { int originX = 0; int originY = 0; - int width = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Width; - int height = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Height; + int width = OpenTaiko.Tx.Couse_Symbol_Back[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Width; + int height = OpenTaiko.Tx.Couse_Symbol_Back[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Height; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - originX = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_5P[0]; - originY = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_5P[1]; - width = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_5P[2]; - height = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_5P[3]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount > 2) { - originX = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[0]; - originY = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[1]; - width = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[2]; - height = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[3]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + originX = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_5P[0]; + originY = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_5P[1]; + width = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_5P[2]; + height = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_5P[3]; + } else if (OpenTaiko.ConfigIni.nPlayerCount > 2) { + originX = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_4P[0]; + originY = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_4P[1]; + width = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_4P[2]; + height = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_4P[3]; } - TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画( + OpenTaiko.Tx.Couse_Symbol_Back[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画( couse_symbol_x, couse_symbol_y, new System.Drawing.RectangleF(originX, originY, width, height)); } - if (TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]] != null && !TJAPlayer3.ConfigIni.SimpleMode) { + if (OpenTaiko.Tx.Couse_Symbol_Back_Flash[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]] != null && !OpenTaiko.ConfigIni.SimpleMode) { int originX = 0; int originY = 0; - int width = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Width; - int height = TJAPlayer3.Tx.Couse_Symbol_Back[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Height; + int width = OpenTaiko.Tx.Couse_Symbol_Back[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Width; + int height = OpenTaiko.Tx.Couse_Symbol_Back[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]].szTextureSize.Height; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - originX = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_5P[0]; - originY = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_5P[1]; - width = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_5P[2]; - height = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_5P[3]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount > 2) { - originX = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[0]; - originY = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[1]; - width = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[2]; - height = TJAPlayer3.Skin.Game_CourseSymbol_Back_Rect_4P[3]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + originX = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_5P[0]; + originY = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_5P[1]; + width = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_5P[2]; + height = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_5P[3]; + } else if (OpenTaiko.ConfigIni.nPlayerCount > 2) { + originX = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_4P[0]; + originY = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_4P[1]; + width = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_4P[2]; + height = OpenTaiko.Skin.Game_CourseSymbol_Back_Rect_4P[3]; } - TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].Opacity = 255 - (int)((ctSymbolFlash[i].CurrentValue / 1000.0) * 255); - TJAPlayer3.Tx.Couse_Symbol_Back_Flash[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画( + OpenTaiko.Tx.Couse_Symbol_Back_Flash[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]].Opacity = 255 - (int)((ctSymbolFlash[i].CurrentValue / 1000.0) * 255); + OpenTaiko.Tx.Couse_Symbol_Back_Flash[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]].t2D描画( couse_symbol_x, couse_symbol_y, new System.Drawing.RectangleF(originX, originY, width, height)); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplPad.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplPad.cs index a90b0d8f..373f8ed2 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplPad.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplPad.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplPad : CActivity { // コンストラクタ @@ -42,11 +42,11 @@ namespace TJAPlayer3 { public override int Draw() { if (!base.IsDeActivated) { if (base.IsFirstDraw) { - this.nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); - this.nY座標制御タイマ = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + this.nフラッシュ制御タイマ = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); + this.nY座標制御タイマ = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); base.IsFirstDraw = false; } - long num = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long num = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); if (num < this.nフラッシュ制御タイマ) { this.nフラッシュ制御タイマ = num; } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRoll.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRoll.cs index c36fedf6..1de41681 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRoll.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRoll.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplRoll : CActivity { @@ -48,7 +48,7 @@ namespace TJAPlayer3 { } public int On進行描画(int n連打数, int player) { - if (TJAPlayer3.ConfigIni.nPlayerCount > 2) return base.Draw(); + if (OpenTaiko.ConfigIni.nPlayerCount > 2) return base.Draw(); this.ct連打枠カウンター[player].Tick(); this.ct連打アニメ[player].Tick(); @@ -57,7 +57,7 @@ namespace TJAPlayer3 { //仮置き int[] nRollBalloon = new int[] { -3, 514, 0, 0 }; int[] nRollNumber = new int[] { 48, 559, 0, 0 }; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { //CDTXMania.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, this.ct連打枠カウンター[player].n現在の値.ToString()); if (this.ct連打枠カウンター[player].IsUnEnded) { if (ct連打枠カウンター[player].CurrentValue > 66 && !FadeOut[player].Counter.IsTicked) { @@ -67,26 +67,26 @@ namespace TJAPlayer3 { if (ct連打枠カウンター[player].CurrentValue == 0 || ct連打枠カウンター[player].CurrentValue == 60) { bNowRollAnime = 0; - TJAPlayer3.Tx.Balloon_Number_Roll.Opacity = 64; + OpenTaiko.Tx.Balloon_Number_Roll.Opacity = 64; } else if (ct連打枠カウンター[player].CurrentValue == 1 || ct連打枠カウンター[player].CurrentValue == 59) { bNowRollAnime = 1; - TJAPlayer3.Tx.Balloon_Number_Roll.Opacity = 128; + OpenTaiko.Tx.Balloon_Number_Roll.Opacity = 128; } else if (ct連打枠カウンター[player].CurrentValue == 2 || ct連打枠カウンター[player].CurrentValue == 58) { bNowRollAnime = 2; - TJAPlayer3.Tx.Balloon_Number_Roll.Opacity = 192; + OpenTaiko.Tx.Balloon_Number_Roll.Opacity = 192; } else if (ct連打枠カウンター[player].CurrentValue == 3 || ct連打枠カウンター[player].CurrentValue == 57) { bNowRollAnime = 3; - TJAPlayer3.Tx.Balloon_Number_Roll.Opacity = 255; + OpenTaiko.Tx.Balloon_Number_Roll.Opacity = 255; } else if (ct連打枠カウンター[player].CurrentValue >= 4 || ct連打枠カウンター[player].CurrentValue <= 56) { bNowRollAnime = 4; - TJAPlayer3.Tx.Balloon_Number_Roll.Opacity = 255; + OpenTaiko.Tx.Balloon_Number_Roll.Opacity = 255; } - float width = TJAPlayer3.Tx.Balloon_Roll.szTextureSize.Width / 5.0f; - float height = TJAPlayer3.Tx.Balloon_Roll.szTextureSize.Height; + float width = OpenTaiko.Tx.Balloon_Roll.szTextureSize.Width / 5.0f; + float height = OpenTaiko.Tx.Balloon_Roll.szTextureSize.Height; - TJAPlayer3.Tx.Balloon_Roll?.t2D描画(TJAPlayer3.Skin.Game_Balloon_Roll_Frame_X[player], TJAPlayer3.Skin.Game_Balloon_Roll_Frame_Y[player], new RectangleF(0 + bNowRollAnime * width, 0, width, height)); - this.t文字表示(TJAPlayer3.Skin.Game_Balloon_Roll_Number_X[player], TJAPlayer3.Skin.Game_Balloon_Roll_Number_Y[player], n連打数, player); + OpenTaiko.Tx.Balloon_Roll?.t2D描画(OpenTaiko.Skin.Game_Balloon_Roll_Frame_X[player], OpenTaiko.Skin.Game_Balloon_Roll_Frame_Y[player], new RectangleF(0 + bNowRollAnime * width, 0, width, height)); + this.t文字表示(OpenTaiko.Skin.Game_Balloon_Roll_Number_X[player], OpenTaiko.Skin.Game_Balloon_Roll_Number_Y[player], n連打数, player); } } @@ -95,7 +95,7 @@ namespace TJAPlayer3 { public void t枠表示時間延長(int player, bool first) { if ((this.ct連打枠カウンター[player].CurrentValue >= 6 && !first) || first) - this.ct連打枠カウンター[player] = new CCounter(0, 60, 40, TJAPlayer3.Timer); + this.ct連打枠カウンター[player] = new CCounter(0, 60, 40, OpenTaiko.Timer); if (!first) this.ct連打枠カウンター[player].CurrentValue = 5; @@ -131,19 +131,19 @@ namespace TJAPlayer3 { } private void t文字表示(int x, int y, int num, int nPlayer) { - TJAPlayer3.Tx.Balloon_Number_Roll.vcScaleRatio.X = TJAPlayer3.Skin.Game_Balloon_Roll_Number_Scale; - TJAPlayer3.Tx.Balloon_Number_Roll.vcScaleRatio.Y = TJAPlayer3.Skin.Game_Balloon_Roll_Number_Scale + RollScale[this.ct連打アニメ[nPlayer].CurrentValue]; + OpenTaiko.Tx.Balloon_Number_Roll.vcScaleRatio.X = OpenTaiko.Skin.Game_Balloon_Roll_Number_Scale; + OpenTaiko.Tx.Balloon_Number_Roll.vcScaleRatio.Y = OpenTaiko.Skin.Game_Balloon_Roll_Number_Scale + RollScale[this.ct連打アニメ[nPlayer].CurrentValue]; int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j - (nums.Length / 2.0f); - float _x = x - (TJAPlayer3.Skin.Game_Balloon_Number_Interval[0] * offset); - float _y = y - (TJAPlayer3.Skin.Game_Balloon_Number_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.Game_Balloon_Number_Interval[0] * offset); + float _y = y - (OpenTaiko.Skin.Game_Balloon_Number_Interval[1] * offset); - float width = TJAPlayer3.Tx.Balloon_Number_Roll.sz画像サイズ.Width / 10.0f; - float height = TJAPlayer3.Tx.Balloon_Number_Roll.sz画像サイズ.Height; + float width = OpenTaiko.Tx.Balloon_Number_Roll.sz画像サイズ.Width / 10.0f; + float height = OpenTaiko.Tx.Balloon_Number_Roll.sz画像サイズ.Height; - TJAPlayer3.Tx.Balloon_Number_Roll.t2D拡大率考慮下基準描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.Balloon_Number_Roll.t2D拡大率考慮下基準描画(_x, _y, new RectangleF(width * nums[j], 0, width, height)); } } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRollEffect.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRollEffect.cs index 6b953a69..9642eddc 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRollEffect.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRollEffect.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplRollEffect : CActivity { // コンストラクタ @@ -12,36 +12,36 @@ namespace TJAPlayer3 { // メソッド public virtual void Start(int player) { - if (TJAPlayer3.ConfigIni.SimpleMode) return; + if (OpenTaiko.ConfigIni.SimpleMode) return; for (int i = 0; i < 128; i++) { if (!RollCharas[i].IsUsing) { RollCharas[i].IsUsing = true; - RollCharas[i].Type = random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_Ptn); + RollCharas[i].Type = random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_Ptn); RollCharas[i].OldValue = 0; - RollCharas[i].Counter = new CCounter(0, 5000, 1, TJAPlayer3.Timer); - if (TJAPlayer3.stage演奏ドラム画面.bDoublePlay) { + RollCharas[i].Counter = new CCounter(0, 5000, 1, OpenTaiko.Timer); + if (OpenTaiko.stage演奏ドラム画面.bDoublePlay) { switch (player) { case 0: - RollCharas[i].X = TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_1P_X[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_1P_X.Length)]; - RollCharas[i].Y = TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_1P_Y[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_1P_Y.Length)]; - RollCharas[i].XAdd = TJAPlayer3.Skin.Game_Effect_Roll_Speed_1P_X[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_Speed_1P_X.Length)]; - RollCharas[i].YAdd = TJAPlayer3.Skin.Game_Effect_Roll_Speed_1P_Y[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_Speed_1P_Y.Length)]; + RollCharas[i].X = OpenTaiko.Skin.Game_Effect_Roll_StartPoint_1P_X[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_StartPoint_1P_X.Length)]; + RollCharas[i].Y = OpenTaiko.Skin.Game_Effect_Roll_StartPoint_1P_Y[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_StartPoint_1P_Y.Length)]; + RollCharas[i].XAdd = OpenTaiko.Skin.Game_Effect_Roll_Speed_1P_X[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_Speed_1P_X.Length)]; + RollCharas[i].YAdd = OpenTaiko.Skin.Game_Effect_Roll_Speed_1P_Y[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_Speed_1P_Y.Length)]; break; case 1: - RollCharas[i].X = TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_2P_X[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_2P_X.Length)]; - RollCharas[i].Y = TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_2P_Y[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_2P_Y.Length)]; - RollCharas[i].XAdd = TJAPlayer3.Skin.Game_Effect_Roll_Speed_2P_X[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_Speed_2P_X.Length)]; - RollCharas[i].YAdd = TJAPlayer3.Skin.Game_Effect_Roll_Speed_2P_Y[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_Speed_2P_Y.Length)]; + RollCharas[i].X = OpenTaiko.Skin.Game_Effect_Roll_StartPoint_2P_X[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_StartPoint_2P_X.Length)]; + RollCharas[i].Y = OpenTaiko.Skin.Game_Effect_Roll_StartPoint_2P_Y[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_StartPoint_2P_Y.Length)]; + RollCharas[i].XAdd = OpenTaiko.Skin.Game_Effect_Roll_Speed_2P_X[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_Speed_2P_X.Length)]; + RollCharas[i].YAdd = OpenTaiko.Skin.Game_Effect_Roll_Speed_2P_Y[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_Speed_2P_Y.Length)]; break; default: return; } } else { - RollCharas[i].X = TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_X[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_X.Length)]; - RollCharas[i].Y = TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_Y[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_StartPoint_Y.Length)]; - RollCharas[i].XAdd = TJAPlayer3.Skin.Game_Effect_Roll_Speed_X[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_Speed_X.Length)]; - RollCharas[i].YAdd = TJAPlayer3.Skin.Game_Effect_Roll_Speed_Y[random.Next(0, TJAPlayer3.Skin.Game_Effect_Roll_Speed_Y.Length)]; + RollCharas[i].X = OpenTaiko.Skin.Game_Effect_Roll_StartPoint_X[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_StartPoint_X.Length)]; + RollCharas[i].Y = OpenTaiko.Skin.Game_Effect_Roll_StartPoint_Y[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_StartPoint_Y.Length)]; + RollCharas[i].XAdd = OpenTaiko.Skin.Game_Effect_Roll_Speed_X[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_Speed_X.Length)]; + RollCharas[i].YAdd = OpenTaiko.Skin.Game_Effect_Roll_Speed_Y[random.Next(0, OpenTaiko.Skin.Game_Effect_Roll_Speed_Y.Length)]; } break; } @@ -78,9 +78,9 @@ namespace TJAPlayer3 { base.ReleaseManagedResource(); } public override int Draw() { - if (!base.IsDeActivated && !TJAPlayer3.ConfigIni.SimpleMode) { + if (!base.IsDeActivated && !OpenTaiko.ConfigIni.SimpleMode) { - if (TJAPlayer3.ConfigIni.nPlayerCount > 2) return 0; + if (OpenTaiko.ConfigIni.nPlayerCount > 2) return 0; for (int i = 0; i < 128; i++) { if (RollCharas[i].IsUsing) { @@ -95,16 +95,16 @@ namespace TJAPlayer3 { RollCharas[i].Y += RollCharas[i].YAdd; } - if (TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type] != null) { - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type]?.t2D描画(RollCharas[i].X, RollCharas[i].Y); + if (OpenTaiko.Tx.Effects_Roll[RollCharas[i].Type] != null) { + OpenTaiko.Tx.Effects_Roll[RollCharas[i].Type]?.t2D描画(RollCharas[i].X, RollCharas[i].Y); // 画面外にいたら描画をやめさせる - if (RollCharas[i].X < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szTextureSize.Width || RollCharas[i].X > TJAPlayer3.Skin.Resolution[0]) { + if (RollCharas[i].X < 0 - OpenTaiko.Tx.Effects_Roll[RollCharas[i].Type].szTextureSize.Width || RollCharas[i].X > OpenTaiko.Skin.Resolution[0]) { RollCharas[i].Counter.Stop(); RollCharas[i].IsUsing = false; } - if (RollCharas[i].Y < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szTextureSize.Height || RollCharas[i].Y > TJAPlayer3.Skin.Resolution[1]) { + if (RollCharas[i].Y < 0 - OpenTaiko.Tx.Effects_Roll[RollCharas[i].Type].szTextureSize.Height || RollCharas[i].Y > OpenTaiko.Skin.Resolution[1]) { RollCharas[i].Counter.Stop(); RollCharas[i].IsUsing = false; } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRunner.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRunner.cs index 160faa3c..7a3a378e 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRunner.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplRunner.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplRunner : CActivity { /// /// ランナー @@ -13,7 +13,7 @@ namespace TJAPlayer3 { } public void Start(int Player, bool IsMiss, CDTX.CChip pChip) { - if (Runner != null && !TJAPlayer3.ConfigIni.SimpleMode) { + if (Runner != null && !OpenTaiko.ConfigIni.SimpleMode) { while (stRunners[Index].b使用中) { Index += 1; if (Index >= 128) { @@ -30,7 +30,7 @@ namespace TJAPlayer3 { } else { stRunners[Index].nType = random.Next(1, Type + 1); } - stRunners[Index].ct進行 = new CCounter(0, TJAPlayer3.Skin.Resolution[0], Timer, TJAPlayer3.Timer); + stRunners[Index].ct進行 = new CCounter(0, OpenTaiko.Skin.Resolution[0], Timer, OpenTaiko.Timer); stRunners[Index].nOldValue = 0; stRunners[Index].nNowPtn = 0; stRunners[Index].fX = 0; @@ -41,7 +41,7 @@ namespace TJAPlayer3 { } public override void Activate() { - if (TJAPlayer3.ConfigIni.SimpleMode) { + if (OpenTaiko.ConfigIni.SimpleMode) { base.Activate(); return; } @@ -66,7 +66,7 @@ namespace TJAPlayer3 { : dirs[random.Next(0, dirs.Length)]; LoadRunnerConifg(path); - Runner = TJAPlayer3.tテクスチャの生成($@"{path}{Path.DirectorySeparatorChar}Runner.png"); + Runner = OpenTaiko.tテクスチャの生成($@"{path}{Path.DirectorySeparatorChar}Runner.png"); } } @@ -75,7 +75,7 @@ namespace TJAPlayer3 { } public override void DeActivate() { - if (TJAPlayer3.ConfigIni.SimpleMode) { + if (OpenTaiko.ConfigIni.SimpleMode) { base.DeActivate(); return; } @@ -84,7 +84,7 @@ namespace TJAPlayer3 { stRunners[i].ct進行 = null; } - TJAPlayer3.tDisposeSafely(ref Runner); + OpenTaiko.tDisposeSafely(ref Runner); base.DeActivate(); } @@ -98,7 +98,7 @@ namespace TJAPlayer3 { } public override int Draw() { - if (TJAPlayer3.ConfigIni.SimpleMode) { + if (OpenTaiko.ConfigIni.SimpleMode) { return base.Draw(); } @@ -106,13 +106,13 @@ namespace TJAPlayer3 { if (stRunners[i].b使用中) { stRunners[i].nOldValue = stRunners[i].ct進行.CurrentValue; stRunners[i].ct進行.Tick(); - if (stRunners[i].ct進行.IsEnded || stRunners[i].fX > TJAPlayer3.Skin.Resolution[0]) { + if (stRunners[i].ct進行.IsEnded || stRunners[i].fX > OpenTaiko.Skin.Resolution[0]) { stRunners[i].ct進行.Stop(); stRunners[i].b使用中 = false; } for (int n = stRunners[i].nOldValue; n < stRunners[i].ct進行.CurrentValue; n++) { - stRunners[i].fX += (float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[stRunners[i].nPlayer] / 18; - int Width = TJAPlayer3.Skin.Resolution[0] / Ptn; + stRunners[i].fX += (float)OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[stRunners[i].nPlayer] / 18; + int Width = OpenTaiko.Skin.Resolution[0] / Ptn; stRunners[i].nNowPtn = (int)stRunners[i].fX / Width; } if (Runner != null) { @@ -147,7 +147,7 @@ namespace TJAPlayer3 { private void LoadRunnerConifg(string dancerPath) { var _str = ""; - TJAPlayer3.Skin.LoadSkinConfigFromFile(dancerPath + @"\RunnerConfig.txt", ref _str); + OpenTaiko.Skin.LoadSkinConfigFromFile(dancerPath + @"\RunnerConfig.txt", ref _str); string[] delimiter = { "\n" }; string[] strSingleLine = _str.Split(delimiter, StringSplitOptions.RemoveEmptyEntries); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplScore.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplScore.cs index 7f0da2dd..0e45902a 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplScore.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplScore.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActImplScore : CAct演奏スコア共通 { // CActivity 実装（共通クラスからの差分のみ） @@ -34,7 +34,7 @@ namespace TJAPlayer3 { if (!this.ctボーナス加算タイマ[i].IsStoped) { this.ctボーナス加算タイマ[i].Tick(); if (this.ctボーナス加算タイマ[i].IsEnded) { - TJAPlayer3.stage演奏ドラム画面.actScore.BonusAdd(i); + OpenTaiko.stage演奏ドラム画面.actScore.BonusAdd(i); this.ctボーナス加算タイマ[i].Stop(); } } @@ -47,35 +47,35 @@ namespace TJAPlayer3 { int[] addBonus_x = new int[5]; int[] addBonus_y = new int[5]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x[i] = TJAPlayer3.Skin.Game_Score_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - y[i] = TJAPlayer3.Skin.Game_Score_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - add_x[i] = TJAPlayer3.Skin.Game_Score_Add_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - add_y[i] = TJAPlayer3.Skin.Game_Score_Add_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - addBonus_x[i] = TJAPlayer3.Skin.Game_Score_AddBonus_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * i); - addBonus_y[i] = TJAPlayer3.Skin.Game_Score_AddBonus_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * i); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x[i] = TJAPlayer3.Skin.Game_Score_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - y[i] = TJAPlayer3.Skin.Game_Score_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); - add_x[i] = TJAPlayer3.Skin.Game_Score_Add_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - add_y[i] = TJAPlayer3.Skin.Game_Score_Add_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); - addBonus_x[i] = TJAPlayer3.Skin.Game_Score_AddBonus_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * i); - addBonus_y[i] = TJAPlayer3.Skin.Game_Score_AddBonus_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * i); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x[i] = OpenTaiko.Skin.Game_Score_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + y[i] = OpenTaiko.Skin.Game_Score_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + add_x[i] = OpenTaiko.Skin.Game_Score_Add_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + add_y[i] = OpenTaiko.Skin.Game_Score_Add_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + addBonus_x[i] = OpenTaiko.Skin.Game_Score_AddBonus_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * i); + addBonus_y[i] = OpenTaiko.Skin.Game_Score_AddBonus_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * i); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x[i] = OpenTaiko.Skin.Game_Score_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + y[i] = OpenTaiko.Skin.Game_Score_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); + add_x[i] = OpenTaiko.Skin.Game_Score_Add_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + add_y[i] = OpenTaiko.Skin.Game_Score_Add_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); + addBonus_x[i] = OpenTaiko.Skin.Game_Score_AddBonus_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * i); + addBonus_y[i] = OpenTaiko.Skin.Game_Score_AddBonus_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * i); } else { - x[i] = TJAPlayer3.Skin.Game_Score_X[i]; - y[i] = TJAPlayer3.Skin.Game_Score_Y[i]; - add_x[i] = TJAPlayer3.Skin.Game_Score_Add_X[i]; - add_y[i] = TJAPlayer3.Skin.Game_Score_Add_Y[i]; - addBonus_x[i] = TJAPlayer3.Skin.Game_Score_AddBonus_X[i]; - addBonus_y[i] = TJAPlayer3.Skin.Game_Score_AddBonus_Y[i]; + x[i] = OpenTaiko.Skin.Game_Score_X[i]; + y[i] = OpenTaiko.Skin.Game_Score_Y[i]; + add_x[i] = OpenTaiko.Skin.Game_Score_Add_X[i]; + add_y[i] = OpenTaiko.Skin.Game_Score_Add_Y[i]; + addBonus_x[i] = OpenTaiko.Skin.Game_Score_AddBonus_X[i]; + addBonus_y[i] = OpenTaiko.Skin.Game_Score_AddBonus_Y[i]; } } //CDTXMania.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, this.ctボーナス加算タイマ[0].n現在の値.ToString()); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (i == 1 && TJAPlayer3.ConfigIni.bAIBattleMode) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (i == 1 && OpenTaiko.ConfigIni.bAIBattleMode) break; base.t小文字表示(x[i], y[i], string.Format("{0,7:######0}", this.nCurrentlyDisplayedScore[i]), 0, 256, i); } @@ -89,17 +89,17 @@ namespace TJAPlayer3 { this.nNowDisplayedAddScore--; this.stScore[i].ctTimer.Stop(); this.stScore[i].b使用中 = false; - TJAPlayer3.stage演奏ドラム画面.actDan.Update(); + OpenTaiko.stage演奏ドラム画面.actDan.Update(); } if (!stScore[i].bAddEnd) { this.nCurrentlyDisplayedScore[this.stScore[i].nPlayer] += (long)this.stScore[i].nAddScore; stScore[i].bAddEnd = true; if (ct点数アニメタイマ[stScore[i].nPlayer].IsUnEnded) { - this.ct点数アニメタイマ[stScore[i].nPlayer] = new CCounter(0, 11, 13, TJAPlayer3.Timer); + this.ct点数アニメタイマ[stScore[i].nPlayer] = new CCounter(0, 11, 13, OpenTaiko.Timer); this.ct点数アニメタイマ[stScore[i].nPlayer].CurrentValue = 1; } else { - this.ct点数アニメタイマ[stScore[i].nPlayer] = new CCounter(0, 11, 13, TJAPlayer3.Timer); + this.ct点数アニメタイマ[stScore[i].nPlayer] = new CCounter(0, 11, 13, OpenTaiko.Timer); } } @@ -176,12 +176,12 @@ namespace TJAPlayer3 { } int pl = stScore[i].nPlayer; - if (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1) + if (OpenTaiko.PlayerSide == 1 && OpenTaiko.ConfigIni.nPlayerCount == 1) pl = 1; - if (this.nNowDisplayedAddScore < 10 && this.stScore[i].bBonusScore == false && !TJAPlayer3.ConfigIni.SimpleMode) - base.t小文字表示(add_x[this.stScore[i].nPlayer] + xAdd, this.stScore[i].nPlayer == 0 && TJAPlayer3.ConfigIni.nPlayerCount <= 2 ? add_y[this.stScore[i].nPlayer] + yAdd : add_y[this.stScore[i].nPlayer] - yAdd, string.Format("{0,7:######0}", this.stScore[i].nAddScore), pl + 1, alpha, stScore[i].nPlayer); - if (this.nNowDisplayedAddScore < 10 && this.stScore[i].bBonusScore == true && !TJAPlayer3.ConfigIni.SimpleMode) + if (this.nNowDisplayedAddScore < 10 && this.stScore[i].bBonusScore == false && !OpenTaiko.ConfigIni.SimpleMode) + base.t小文字表示(add_x[this.stScore[i].nPlayer] + xAdd, this.stScore[i].nPlayer == 0 && OpenTaiko.ConfigIni.nPlayerCount <= 2 ? add_y[this.stScore[i].nPlayer] + yAdd : add_y[this.stScore[i].nPlayer] - yAdd, string.Format("{0,7:######0}", this.stScore[i].nAddScore), pl + 1, alpha, stScore[i].nPlayer); + if (this.nNowDisplayedAddScore < 10 && this.stScore[i].bBonusScore == true && !OpenTaiko.ConfigIni.SimpleMode) base.t小文字表示(addBonus_x[this.stScore[i].nPlayer] + xAdd, addBonus_y[this.stScore[i].nPlayer], string.Format("{0,7:######0}", this.stScore[i].nAddScore), pl + 1, alpha, stScore[i].nPlayer); else { this.nNowDisplayedAddScore--; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplScoreRank.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplScoreRank.cs index 06bb7d84..6765a391 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplScoreRank.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplScoreRank.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CActImplScoreRank : CActivity { public override void Activate() { double RollTimems = 0; @@ -17,7 +17,7 @@ namespace TJAPlayer3 { for (int player = 0; player < 5; player++) { this.ScoreRank[player] = new int[] { 500000, 600000, 700000, 800000, 900000, 950000, - Math.Max(1000000, (int)(TJAPlayer3.stage演奏ドラム画面.nAddScoreNiji[player] * TJAPlayer3.stage演奏ドラム画面.nNoteCount[player]) + (int)(TJAPlayer3.stage演奏ドラム画面.nBalloonCount[player] * 100) + (int)(Math.Ceiling(TJAPlayer3.stage演奏ドラム画面.nRollTimeMs[player] * 16.6 / 10) * 100 * 10)) }; + Math.Max(1000000, (int)(OpenTaiko.stage演奏ドラム画面.nAddScoreNiji[player] * OpenTaiko.stage演奏ドラム画面.nNoteCount[player]) + (int)(OpenTaiko.stage演奏ドラム画面.nBalloonCount[player] * 100) + (int)(Math.Ceiling(OpenTaiko.stage演奏ドラム画面.nRollTimeMs[player] * 16.6 / 10) * 100 * 10)) }; for (int i = 0; i < 7; i++) { this.counter[player][i] = new CCounter(); @@ -31,14 +31,14 @@ namespace TJAPlayer3 { } public override void CreateManagedResource() { - TowerResult_ScoreRankEffect = TJAPlayer3.tテクスチャの生成(CSkin.Path($"{TextureLoader.BASE}{TextureLoader.TOWERRESULT}ScoreRankEffect.png")); + TowerResult_ScoreRankEffect = OpenTaiko.tテクスチャの生成(CSkin.Path($"{TextureLoader.BASE}{TextureLoader.TOWERRESULT}ScoreRankEffect.png")); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tDisposeSafely(ref TowerResult_ScoreRankEffect); + OpenTaiko.tDisposeSafely(ref TowerResult_ScoreRankEffect); base.ReleaseManagedResource(); } @@ -46,7 +46,7 @@ namespace TJAPlayer3 { private void displayScoreRank(int i, int player, float x, float y, int mode = 0) { CCounter cct = this.counter[player][i]; - CTexture tex = TJAPlayer3.Tx.ScoreRank; + CTexture tex = OpenTaiko.Tx.ScoreRank; if (mode == 1) // tower tex = TowerResult_ScoreRankEffect; @@ -54,12 +54,12 @@ namespace TJAPlayer3 { return; if (!cct.IsTicked) { - cct.Start(0, 3000, 1, TJAPlayer3.Timer); + cct.Start(0, 3000, 1, OpenTaiko.Timer); } if (cct.CurrentValue <= 255) { tex.Opacity = cct.CurrentValue; - x = ((cct.CurrentValue / 255.0f) - 1.0f) * (player == 0 ? -TJAPlayer3.Skin.Game_Judge_Move[0] : TJAPlayer3.Skin.Game_Judge_Move[0]); - y = ((cct.CurrentValue / 255.0f) - 1.0f) * (player == 0 ? -TJAPlayer3.Skin.Game_Judge_Move[1] : TJAPlayer3.Skin.Game_Judge_Move[1]); + x = ((cct.CurrentValue / 255.0f) - 1.0f) * (player == 0 ? -OpenTaiko.Skin.Game_Judge_Move[0] : OpenTaiko.Skin.Game_Judge_Move[0]); + y = ((cct.CurrentValue / 255.0f) - 1.0f) * (player == 0 ? -OpenTaiko.Skin.Game_Judge_Move[1] : OpenTaiko.Skin.Game_Judge_Move[1]); } if (cct.CurrentValue > 255 && cct.CurrentValue <= 255 + 180) { tex.Opacity = 255; @@ -79,21 +79,21 @@ namespace TJAPlayer3 { } if (cct.CurrentValue >= 2745 && cct.CurrentValue <= 3000) { tex.Opacity = 255 - ((cct.CurrentValue - 2745)); - x = ((cct.CurrentValue - 2745) / 255.0f) * (player == 0 || TJAPlayer3.ConfigIni.nPlayerCount >= 2 ? -TJAPlayer3.Skin.Game_Judge_Move[0] : TJAPlayer3.Skin.Game_Judge_Move[0]); - y = ((cct.CurrentValue - 2745) / 255.0f) * (player == 0 || TJAPlayer3.ConfigIni.nPlayerCount >= 2 ? -TJAPlayer3.Skin.Game_Judge_Move[1] : TJAPlayer3.Skin.Game_Judge_Move[1]); + x = ((cct.CurrentValue - 2745) / 255.0f) * (player == 0 || OpenTaiko.ConfigIni.nPlayerCount >= 2 ? -OpenTaiko.Skin.Game_Judge_Move[0] : OpenTaiko.Skin.Game_Judge_Move[0]); + y = ((cct.CurrentValue - 2745) / 255.0f) * (player == 0 || OpenTaiko.ConfigIni.nPlayerCount >= 2 ? -OpenTaiko.Skin.Game_Judge_Move[1] : OpenTaiko.Skin.Game_Judge_Move[1]); } var xpos = 0; var ypos = 0; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - xpos = TJAPlayer3.Skin.Game_ScoreRank_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * player); - ypos = TJAPlayer3.Skin.Game_ScoreRank_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * player); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - xpos = TJAPlayer3.Skin.Game_ScoreRank_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * player); - ypos = TJAPlayer3.Skin.Game_ScoreRank_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * player); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + xpos = OpenTaiko.Skin.Game_ScoreRank_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * player); + ypos = OpenTaiko.Skin.Game_ScoreRank_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * player); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + xpos = OpenTaiko.Skin.Game_ScoreRank_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * player); + ypos = OpenTaiko.Skin.Game_ScoreRank_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * player); } else { - xpos = TJAPlayer3.Skin.Game_ScoreRank_X[player]; - ypos = TJAPlayer3.Skin.Game_ScoreRank_Y[player]; + xpos = OpenTaiko.Skin.Game_ScoreRank_X[player]; + ypos = OpenTaiko.Skin.Game_ScoreRank_Y[player]; } xpos += (int)x; ypos += (int)y; @@ -119,18 +119,18 @@ namespace TJAPlayer3 { } public override int Draw() { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) { float x = 0; float y = 0; for (int i = 0; i < 7; i++) { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { for (int player = 0; player < 5; player++) { #region [Ensou score ranks] counter[player][i].Tick(); - if (TJAPlayer3.stage演奏ドラム画面.actScore.GetScore(player) >= ScoreRank[player][i]) { + if (OpenTaiko.stage演奏ドラム画面.actScore.GetScore(player) >= ScoreRank[player][i]) { displayScoreRank(i, player, x, y); #region [Legacy] @@ -174,10 +174,10 @@ namespace TJAPlayer3 { x = 0; } #endregion - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { #region [Tower score ranks] - double progress = CFloorManagement.LastRegisteredFloor / ((double)TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor); + double progress = CFloorManagement.LastRegisteredFloor / ((double)OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor); bool[] conditions = { @@ -186,8 +186,8 @@ namespace TJAPlayer3 { progress >= 0.5, progress >= 0.75, progress == 1 && CFloorManagement.CurrentNumberOfLives > 0, - TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMine == 0, - TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGood == 0 + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMine == 0, + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGood == 0 }; counter[0][i].Tick(); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplTrainingMode.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplTrainingMode.cs index 1c7afa2c..e15ac84c 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CActImplTrainingMode.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CActImplTrainingMode.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CActImplTrainingMode : CActivity { public CActImplTrainingMode() { base.IsDeActivated = true; @@ -14,7 +14,7 @@ namespace TJAPlayer3 { base.Activate(); - CDTX dTX = TJAPlayer3.DTX; + CDTX dTX = OpenTaiko.DTX; var measureCount = 1; var bIsInGoGo = false; @@ -22,15 +22,15 @@ namespace TJAPlayer3 { int endtime = 1; int bgmlength = 1; - for (int index = 0; index < TJAPlayer3.DTX.listChip.Count; index++) { - if (TJAPlayer3.DTX.listChip[index].nチャンネル番号 == 0xff) { - endtime = TJAPlayer3.DTX.listChip[index].n発声時刻ms; + for (int index = 0; index < OpenTaiko.DTX.listChip.Count; index++) { + if (OpenTaiko.DTX.listChip[index].nチャンネル番号 == 0xff) { + endtime = OpenTaiko.DTX.listChip[index].n発声時刻ms; break; } } - for (int index = 0; index < TJAPlayer3.DTX.listChip.Count; index++) { - if (TJAPlayer3.DTX.listChip[index].nチャンネル番号 == 0x01) { - bgmlength = TJAPlayer3.DTX.listChip[index].GetDuration() + TJAPlayer3.DTX.listChip[index].n発声時刻ms; + for (int index = 0; index < OpenTaiko.DTX.listChip.Count; index++) { + if (OpenTaiko.DTX.listChip[index].nチャンネル番号 == 0x01) { + bgmlength = OpenTaiko.DTX.listChip[index].GetDuration() + OpenTaiko.DTX.listChip[index].n発声時刻ms; break; } } @@ -48,9 +48,9 @@ namespace TJAPlayer3 { if (pChip.nチャンネル番号 == 0x9E && !bIsInGoGo) { bIsInGoGo = true; - var current = ((double)(pChip.db発声時刻ms * TJAPlayer3.ConfigIni.SongPlaybackSpeed)); + var current = ((double)(pChip.db発声時刻ms * OpenTaiko.ConfigIni.SongPlaybackSpeed)); var width = 0; - if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) width = TJAPlayer3.Tx.Tokkun_ProgressBar.szTextureSize.Width; + if (OpenTaiko.Tx.Tokkun_ProgressBar != null) width = OpenTaiko.Tx.Tokkun_ProgressBar.szTextureSize.Width; this.gogoXList.Add((int)(width * (current / length))); } @@ -61,7 +61,7 @@ namespace TJAPlayer3 { this.nMeasureCount = measureCount; - if (TJAPlayer3.Tx.Tokkun_Background_Up != null) this.ctBackgroundScrollTimer = new CCounter(1, TJAPlayer3.Tx.Tokkun_Background_Up.szTextureSize.Width, 16, TJAPlayer3.Timer); + if (OpenTaiko.Tx.Tokkun_Background_Up != null) this.ctBackgroundScrollTimer = new CCounter(1, OpenTaiko.Tx.Tokkun_Background_Up.szTextureSize.Width, 16, OpenTaiko.Timer); } public override void DeActivate() { @@ -88,56 +88,56 @@ namespace TJAPlayer3 { base.IsFirstDraw = false; } - TJAPlayer3.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, "TRAINING MODE (BETA)"); + OpenTaiko.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, "TRAINING MODE (BETA)"); - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingPause)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingPause)) { if (this.bTrainingPAUSE) { - TJAPlayer3.Skin.sound特訓再生音.tPlay(); + OpenTaiko.Skin.sound特訓再生音.tPlay(); this.tResumePlay(); } else { - TJAPlayer3.Skin.sound特訓停止音.tPlay(); + OpenTaiko.Skin.sound特訓停止音.tPlay(); this.tPausePlay(); } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingSkipForwardMeasure)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingSkipForwardMeasure)) { if (this.bTrainingPAUSE) { - this.nCurrentMeasure += TJAPlayer3.ConfigIni.TokkunSkipMeasures; + this.nCurrentMeasure += OpenTaiko.ConfigIni.TokkunSkipMeasures; if (this.nCurrentMeasure > this.nMeasureCount) this.nCurrentMeasure = this.nMeasureCount; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; this.tMatchWithTheChartDisplayPosition(true); - TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay(); + OpenTaiko.Skin.soundTrainingModeScrollSFX.tPlay(); } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingSkipBackMeasure)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingSkipBackMeasure)) { if (this.bTrainingPAUSE) { - this.nCurrentMeasure -= TJAPlayer3.ConfigIni.TokkunSkipMeasures; + this.nCurrentMeasure -= OpenTaiko.ConfigIni.TokkunSkipMeasures; if (this.nCurrentMeasure <= 0) this.nCurrentMeasure = 1; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; this.tMatchWithTheChartDisplayPosition(true); - TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay(); + OpenTaiko.Skin.soundTrainingModeScrollSFX.tPlay(); } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingMoveForwardMeasure)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingMoveForwardMeasure)) { if (this.bTrainingPAUSE) { if (this.nCurrentMeasure < this.nMeasureCount) { this.nCurrentMeasure++; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; this.tMatchWithTheChartDisplayPosition(true); - TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay(); + OpenTaiko.Skin.soundTrainingModeScrollSFX.tPlay(); } - if (t配列の値interval以下か(ref this.RBlue, SoundManager.PlayTimer.SystemTimeMs, TJAPlayer3.ConfigIni.TokkunMashInterval)) { + if (t配列の値interval以下か(ref this.RBlue, SoundManager.PlayTimer.SystemTimeMs, OpenTaiko.ConfigIni.TokkunMashInterval)) { for (int index = 0; index < this.JumpPointList.Count; index++) { - if (this.JumpPointList[index].Time >= SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { + if (this.JumpPointList[index].Time >= SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed) { this.nCurrentMeasure = this.JumpPointList[index].Measure; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; - TJAPlayer3.Skin.soundSkip.tPlay(); + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.Skin.soundSkip.tPlay(); this.tMatchWithTheChartDisplayPosition(false); break; } @@ -146,21 +146,21 @@ namespace TJAPlayer3 { } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingMoveBackMeasure)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingMoveBackMeasure)) { if (this.bTrainingPAUSE) { if (this.nCurrentMeasure > 1) { this.nCurrentMeasure--; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; this.tMatchWithTheChartDisplayPosition(true); - TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay(); + OpenTaiko.Skin.soundTrainingModeScrollSFX.tPlay(); } - if (t配列の値interval以下か(ref this.LBlue, SoundManager.PlayTimer.SystemTimeMs, TJAPlayer3.ConfigIni.TokkunMashInterval)) { + if (t配列の値interval以下か(ref this.LBlue, SoundManager.PlayTimer.SystemTimeMs, OpenTaiko.ConfigIni.TokkunMashInterval)) { for (int index = this.JumpPointList.Count - 1; index >= 0; index--) { - if (this.JumpPointList[index].Time <= SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed) { + if (this.JumpPointList[index].Time <= SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed) { this.nCurrentMeasure = this.JumpPointList[index].Measure; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; - TJAPlayer3.Skin.sound特訓スキップ音.tPlay(); + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.Skin.sound特訓スキップ音.tPlay(); this.tMatchWithTheChartDisplayPosition(false); break; } @@ -168,45 +168,45 @@ namespace TJAPlayer3 { } } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingDecreaseSongSpeed)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingDecreaseSongSpeed)) { if (this.bTrainingPAUSE) { - if (TJAPlayer3.ConfigIni.nSongSpeed > 6) { - TJAPlayer3.ConfigIni.nSongSpeed = TJAPlayer3.ConfigIni.nSongSpeed - 2; + if (OpenTaiko.ConfigIni.nSongSpeed > 6) { + OpenTaiko.ConfigIni.nSongSpeed = OpenTaiko.ConfigIni.nSongSpeed - 2; this.tMatchWithTheChartDisplayPosition(false); } } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingIncreaseSongSpeed)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingIncreaseSongSpeed)) { if (this.bTrainingPAUSE) { - if (TJAPlayer3.ConfigIni.nSongSpeed < 399) { - TJAPlayer3.ConfigIni.nSongSpeed = TJAPlayer3.ConfigIni.nSongSpeed + 2; + if (OpenTaiko.ConfigIni.nSongSpeed < 399) { + OpenTaiko.ConfigIni.nSongSpeed = OpenTaiko.ConfigIni.nSongSpeed + 2; this.tMatchWithTheChartDisplayPosition(false); } } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingJumpToFirstMeasure)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingJumpToFirstMeasure)) { if (this.bTrainingPAUSE) { if (this.nCurrentMeasure > 1) { this.nCurrentMeasure = 1; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; this.tMatchWithTheChartDisplayPosition(true); - TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay(); + OpenTaiko.Skin.soundTrainingModeScrollSFX.tPlay(); } } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingJumpToLastMeasure)) { + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingJumpToLastMeasure)) { if (this.bTrainingPAUSE) { if (this.nCurrentMeasure < this.nMeasureCount) { this.nCurrentMeasure = this.nMeasureCount; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; this.tMatchWithTheChartDisplayPosition(true); - TJAPlayer3.Skin.soundTrainingModeScrollSFX.tPlay(); + OpenTaiko.Skin.soundTrainingModeScrollSFX.tPlay(); } } } - if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBookmark)) + if (OpenTaiko.ConfigIni.KeyAssign.KeyIsPressed(OpenTaiko.ConfigIni.KeyAssign.Drums.TrainingBookmark)) this.tToggleBookmarkAtTheCurrentPosition(); if (this.bCurrentlyScrolling) { @@ -220,38 +220,38 @@ namespace TJAPlayer3 { } } if (!this.bTrainingPAUSE) { - if (this.nCurrentMeasure < TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0]) { - this.nCurrentMeasure = TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0]; + if (this.nCurrentMeasure < OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0]) { + this.nCurrentMeasure = OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0]; } - if (SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed > this.n最終演奏位置ms) { - this.n最終演奏位置ms = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + if (SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed > this.n最終演奏位置ms) { + this.n最終演奏位置ms = (long)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed); } } } - var current = (double)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + var current = (double)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed); var percentage = current / length; var currentWhite = (double)(this.n最終演奏位置ms); var percentageWhite = currentWhite / length; - if (TJAPlayer3.Tx.Tokkun_ProgressBarWhite != null) TJAPlayer3.Tx.Tokkun_ProgressBarWhite.t2D描画(TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0], TJAPlayer3.Skin.Game_Training_ProgressBar_XY[1], new Rectangle(1, 1, (int)(TJAPlayer3.Tx.Tokkun_ProgressBarWhite.szTextureSize.Width * percentageWhite), TJAPlayer3.Tx.Tokkun_ProgressBarWhite.szTextureSize.Height)); - if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) TJAPlayer3.Tx.Tokkun_ProgressBar.t2D描画(TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0], TJAPlayer3.Skin.Game_Training_ProgressBar_XY[1], new Rectangle(1, 1, (int)(TJAPlayer3.Tx.Tokkun_ProgressBar.szTextureSize.Width * percentage), TJAPlayer3.Tx.Tokkun_ProgressBar.szTextureSize.Height)); - if (TJAPlayer3.Tx.Tokkun_GoGoPoint != null) { + if (OpenTaiko.Tx.Tokkun_ProgressBarWhite != null) OpenTaiko.Tx.Tokkun_ProgressBarWhite.t2D描画(OpenTaiko.Skin.Game_Training_ProgressBar_XY[0], OpenTaiko.Skin.Game_Training_ProgressBar_XY[1], new Rectangle(1, 1, (int)(OpenTaiko.Tx.Tokkun_ProgressBarWhite.szTextureSize.Width * percentageWhite), OpenTaiko.Tx.Tokkun_ProgressBarWhite.szTextureSize.Height)); + if (OpenTaiko.Tx.Tokkun_ProgressBar != null) OpenTaiko.Tx.Tokkun_ProgressBar.t2D描画(OpenTaiko.Skin.Game_Training_ProgressBar_XY[0], OpenTaiko.Skin.Game_Training_ProgressBar_XY[1], new Rectangle(1, 1, (int)(OpenTaiko.Tx.Tokkun_ProgressBar.szTextureSize.Width * percentage), OpenTaiko.Tx.Tokkun_ProgressBar.szTextureSize.Height)); + if (OpenTaiko.Tx.Tokkun_GoGoPoint != null) { foreach (int xpos in gogoXList) { - TJAPlayer3.Tx.Tokkun_GoGoPoint.t2D描画(xpos + TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0] - (TJAPlayer3.Tx.Tokkun_GoGoPoint.szTextureSize.Width / 2), TJAPlayer3.Skin.Game_Training_GoGoPoint_Y); + OpenTaiko.Tx.Tokkun_GoGoPoint.t2D描画(xpos + OpenTaiko.Skin.Game_Training_ProgressBar_XY[0] - (OpenTaiko.Tx.Tokkun_GoGoPoint.szTextureSize.Width / 2), OpenTaiko.Skin.Game_Training_GoGoPoint_Y); } } - if (TJAPlayer3.Tx.Tokkun_JumpPoint != null) { + if (OpenTaiko.Tx.Tokkun_JumpPoint != null) { foreach (STJUMPP xpos in JumpPointList) { var width = 0; - if (TJAPlayer3.Tx.Tokkun_ProgressBar != null) width = TJAPlayer3.Tx.Tokkun_ProgressBar.szTextureSize.Width; + if (OpenTaiko.Tx.Tokkun_ProgressBar != null) width = OpenTaiko.Tx.Tokkun_ProgressBar.szTextureSize.Width; int x = (int)((double)width * ((double)xpos.Time / (double)length)); - TJAPlayer3.Tx.Tokkun_JumpPoint.t2D描画(x + TJAPlayer3.Skin.Game_Training_ProgressBar_XY[0] - (TJAPlayer3.Tx.Tokkun_JumpPoint.szTextureSize.Width / 2), TJAPlayer3.Skin.Game_Training_JumpPoint_Y); + OpenTaiko.Tx.Tokkun_JumpPoint.t2D描画(x + OpenTaiko.Skin.Game_Training_ProgressBar_XY[0] - (OpenTaiko.Tx.Tokkun_JumpPoint.szTextureSize.Width / 2), OpenTaiko.Skin.Game_Training_JumpPoint_Y); } } @@ -262,46 +262,46 @@ namespace TJAPlayer3 { if (this.ctBackgroundScrollTimer != null) { this.ctBackgroundScrollTimer.TickLoop(); - double TexSize = TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tokkun_Background_Up.szTextureSize.Width; + double TexSize = OpenTaiko.Skin.Resolution[0] / OpenTaiko.Tx.Tokkun_Background_Up.szTextureSize.Width; // 1280をテクスチャサイズで割ったものを切り上げて、プラス+1足す。 int ForLoop = (int)Math.Ceiling(TexSize) + 1; - TJAPlayer3.Tx.Tokkun_Background_Up.t2D描画(0 - this.ctBackgroundScrollTimer.CurrentValue, TJAPlayer3.Skin.Background_Scroll_Y[0]); + OpenTaiko.Tx.Tokkun_Background_Up.t2D描画(0 - this.ctBackgroundScrollTimer.CurrentValue, OpenTaiko.Skin.Background_Scroll_Y[0]); for (int l = 1; l < ForLoop + 1; l++) { - TJAPlayer3.Tx.Tokkun_Background_Up.t2D描画(+(l * TJAPlayer3.Tx.Tokkun_Background_Up.szTextureSize.Width) - this.ctBackgroundScrollTimer.CurrentValue, TJAPlayer3.Skin.Background_Scroll_Y[0]); + OpenTaiko.Tx.Tokkun_Background_Up.t2D描画(+(l * OpenTaiko.Tx.Tokkun_Background_Up.szTextureSize.Width) - this.ctBackgroundScrollTimer.CurrentValue, OpenTaiko.Skin.Background_Scroll_Y[0]); } } - if (TJAPlayer3.Tx.Tokkun_DownBG != null) TJAPlayer3.Tx.Tokkun_DownBG.t2D描画(TJAPlayer3.Skin.Game_Training_DownBG[0], TJAPlayer3.Skin.Game_Training_DownBG[1]); - if (TJAPlayer3.Tx.Tokkun_BigTaiko != null) TJAPlayer3.Tx.Tokkun_BigTaiko.t2D描画(TJAPlayer3.Skin.Game_Training_BigTaiko[0], TJAPlayer3.Skin.Game_Training_BigTaiko[1]); + if (OpenTaiko.Tx.Tokkun_DownBG != null) OpenTaiko.Tx.Tokkun_DownBG.t2D描画(OpenTaiko.Skin.Game_Training_DownBG[0], OpenTaiko.Skin.Game_Training_DownBG[1]); + if (OpenTaiko.Tx.Tokkun_BigTaiko != null) OpenTaiko.Tx.Tokkun_BigTaiko.t2D描画(OpenTaiko.Skin.Game_Training_BigTaiko[0], OpenTaiko.Skin.Game_Training_BigTaiko[1]); return base.Draw(); } public void On進行描画_小節_速度() { - if (TJAPlayer3.Tx.Tokkun_Speed_Measure != null) - TJAPlayer3.Tx.Tokkun_Speed_Measure.t2D描画(TJAPlayer3.Skin.Game_Training_Speed_Measure[0], TJAPlayer3.Skin.Game_Training_Speed_Measure[1]); + if (OpenTaiko.Tx.Tokkun_Speed_Measure != null) + OpenTaiko.Tx.Tokkun_Speed_Measure.t2D描画(OpenTaiko.Skin.Game_Training_Speed_Measure[0], OpenTaiko.Skin.Game_Training_Speed_Measure[1]); var maxMeasureStr = this.nMeasureCount.ToString(); - var measureStr = TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0].ToString(); - if (TJAPlayer3.Tx.Tokkun_SmallNumber != null) { - var x = TJAPlayer3.Skin.Game_Training_MaxMeasureCount_XY[0]; + var measureStr = OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0].ToString(); + if (OpenTaiko.Tx.Tokkun_SmallNumber != null) { + var x = OpenTaiko.Skin.Game_Training_MaxMeasureCount_XY[0]; foreach (char c in maxMeasureStr) { var currentNum = int.Parse(c.ToString()); - TJAPlayer3.Tx.Tokkun_SmallNumber.t2D描画(x, TJAPlayer3.Skin.Game_Training_MaxMeasureCount_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_SmallNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_SmallNumber_Width, TJAPlayer3.Tx.Tokkun_SmallNumber.szTextureSize.Height)); - x += TJAPlayer3.Skin.Game_Training_SmallNumber_Width - 2; + OpenTaiko.Tx.Tokkun_SmallNumber.t2D描画(x, OpenTaiko.Skin.Game_Training_MaxMeasureCount_XY[1], new Rectangle(OpenTaiko.Skin.Game_Training_SmallNumber_Width * currentNum, 0, OpenTaiko.Skin.Game_Training_SmallNumber_Width, OpenTaiko.Tx.Tokkun_SmallNumber.szTextureSize.Height)); + x += OpenTaiko.Skin.Game_Training_SmallNumber_Width - 2; } } - var subtractVal = (TJAPlayer3.Skin.Game_Training_BigNumber_Width - 2) * (measureStr.Length - 1); + var subtractVal = (OpenTaiko.Skin.Game_Training_BigNumber_Width - 2) * (measureStr.Length - 1); - if (TJAPlayer3.Tx.Tokkun_BigNumber != null) { - var x = TJAPlayer3.Skin.Game_Training_CurrentMeasureCount_XY[0]; + if (OpenTaiko.Tx.Tokkun_BigNumber != null) { + var x = OpenTaiko.Skin.Game_Training_CurrentMeasureCount_XY[0]; foreach (char c in measureStr) { var currentNum = int.Parse(c.ToString()); - TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(x - subtractVal, TJAPlayer3.Skin.Game_Training_CurrentMeasureCount_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szTextureSize.Height)); - x += TJAPlayer3.Skin.Game_Training_BigNumber_Width - 2; + OpenTaiko.Tx.Tokkun_BigNumber.t2D描画(x - subtractVal, OpenTaiko.Skin.Game_Training_CurrentMeasureCount_XY[1], new Rectangle(OpenTaiko.Skin.Game_Training_BigNumber_Width * currentNum, 0, OpenTaiko.Skin.Game_Training_BigNumber_Width, OpenTaiko.Tx.Tokkun_BigNumber.szTextureSize.Height)); + x += OpenTaiko.Skin.Game_Training_BigNumber_Width - 2; } - var PlaySpdtmp = TJAPlayer3.ConfigIni.SongPlaybackSpeed * 10.0d; + var PlaySpdtmp = OpenTaiko.ConfigIni.SongPlaybackSpeed * 10.0d; PlaySpdtmp = Math.Round(PlaySpdtmp, MidpointRounding.AwayFromZero); var playSpd = PlaySpdtmp / 10.0d; @@ -309,26 +309,26 @@ namespace TJAPlayer3 { var playSpdStr = Decimal.Round((decimal)playSpdI, 1, MidpointRounding.AwayFromZero).ToString(); var decimalStr = (playSpdStr == "0") ? "0" : playSpdStr[2].ToString(); - TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[0], TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * int.Parse(decimalStr), 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szTextureSize.Height)); + OpenTaiko.Tx.Tokkun_BigNumber.t2D描画(OpenTaiko.Skin.Game_Training_SpeedDisplay_XY[0], OpenTaiko.Skin.Game_Training_SpeedDisplay_XY[1], new Rectangle(OpenTaiko.Skin.Game_Training_BigNumber_Width * int.Parse(decimalStr), 0, OpenTaiko.Skin.Game_Training_BigNumber_Width, OpenTaiko.Tx.Tokkun_BigNumber.szTextureSize.Height)); - x = TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[0] - 25; + x = OpenTaiko.Skin.Game_Training_SpeedDisplay_XY[0] - 25; - subtractVal = TJAPlayer3.Skin.Game_Training_BigNumber_Width * (((int)playSpd).ToString().Length - 1); + subtractVal = OpenTaiko.Skin.Game_Training_BigNumber_Width * (((int)playSpd).ToString().Length - 1); foreach (char c in ((int)playSpd).ToString()) { var currentNum = int.Parse(c.ToString()); - TJAPlayer3.Tx.Tokkun_BigNumber.t2D描画(x - subtractVal, TJAPlayer3.Skin.Game_Training_SpeedDisplay_XY[1], new Rectangle(TJAPlayer3.Skin.Game_Training_BigNumber_Width * currentNum, 0, TJAPlayer3.Skin.Game_Training_BigNumber_Width, TJAPlayer3.Tx.Tokkun_BigNumber.szTextureSize.Height)); - x += TJAPlayer3.Skin.Game_Training_BigNumber_Width - 2; + OpenTaiko.Tx.Tokkun_BigNumber.t2D描画(x - subtractVal, OpenTaiko.Skin.Game_Training_SpeedDisplay_XY[1], new Rectangle(OpenTaiko.Skin.Game_Training_BigNumber_Width * currentNum, 0, OpenTaiko.Skin.Game_Training_BigNumber_Width, OpenTaiko.Tx.Tokkun_BigNumber.szTextureSize.Height)); + x += OpenTaiko.Skin.Game_Training_BigNumber_Width - 2; } } } public void tPausePlay() { - CDTX dTX = TJAPlayer3.DTX; + CDTX dTX = OpenTaiko.DTX; this.nスクロール後ms = SoundManager.PlayTimer.NowTimeMs; - TJAPlayer3.stage演奏ドラム画面.Activate(); + OpenTaiko.stage演奏ドラム画面.Activate(); SoundManager.PlayTimer.Pause(); for (int i = 0; i < dTX.listChip.Count; i++) { @@ -340,34 +340,34 @@ namespace TJAPlayer3 { } } - TJAPlayer3.DTX.t全チップの再生一時停止(); - TJAPlayer3.stage演奏ドラム画面.bPAUSE = true; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; + OpenTaiko.DTX.t全チップの再生一時停止(); + OpenTaiko.stage演奏ドラム画面.bPAUSE = true; + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = this.nCurrentMeasure; this.bTrainingPAUSE = true; this.tMatchWithTheChartDisplayPosition(false); } public void tResumePlay() { - CDTX dTX = TJAPlayer3.DTX; + CDTX dTX = OpenTaiko.DTX; this.bCurrentlyScrolling = false; SoundManager.PlayTimer.NowTimeMs = this.nスクロール後ms; - int n演奏開始Chip = TJAPlayer3.stage演奏ドラム画面.n現在のトップChip; + int n演奏開始Chip = OpenTaiko.stage演奏ドラム画面.n現在のトップChip; int finalStartBar; finalStartBar = this.nCurrentMeasure - 2; if (finalStartBar < 0) finalStartBar = 0; - TJAPlayer3.stage演奏ドラム画面.t演奏位置の変更(finalStartBar, 0); + OpenTaiko.stage演奏ドラム画面.t演奏位置の変更(finalStartBar, 0); - int n少し戻ってから演奏開始Chip = TJAPlayer3.stage演奏ドラム画面.n現在のトップChip; + int n少し戻ってから演奏開始Chip = OpenTaiko.stage演奏ドラム画面.n現在のトップChip; - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = 0; - TJAPlayer3.stage演奏ドラム画面.t数値の初期化(true, true); - TJAPlayer3.stage演奏ドラム画面.Activate(); + OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] = 0; + OpenTaiko.stage演奏ドラム画面.t数値の初期化(true, true); + OpenTaiko.stage演奏ドラム画面.Activate(); for (int i = 0; i < dTX.listChip.Count; i++) { @@ -391,8 +391,8 @@ namespace TJAPlayer3 { } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - TJAPlayer3.stage演奏ドラム画面.chip現在処理中の連打チップ[i] = null; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + OpenTaiko.stage演奏ドラム画面.chip現在処理中の連打チップ[i] = null; } this.bTrainingPAUSE = false; @@ -401,7 +401,7 @@ namespace TJAPlayer3 { public void tMatchWithTheChartDisplayPosition(bool doScroll) { this.nスクロール前ms = SoundManager.PlayTimer.NowTimeMs; - CDTX dTX = TJAPlayer3.DTX; + CDTX dTX = OpenTaiko.DTX; bool bSuccessSeek = false; for (int i = 0; i < dTX.listChip.Count; i++) { @@ -409,37 +409,37 @@ namespace TJAPlayer3 { if (pChip.nチャンネル番号 == 0x50 && pChip.n整数値_内部番号 > nCurrentMeasure - 1) { bSuccessSeek = true; - TJAPlayer3.stage演奏ドラム画面.n現在のトップChip = i; + OpenTaiko.stage演奏ドラム画面.n現在のトップChip = i; break; } } if (!bSuccessSeek) { - TJAPlayer3.stage演奏ドラム画面.n現在のトップChip = 0; + OpenTaiko.stage演奏ドラム画面.n現在のトップChip = 0; } else { - while (dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms == dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip - 1].n発声時刻ms && TJAPlayer3.stage演奏ドラム画面.n現在のトップChip != 0) - TJAPlayer3.stage演奏ドラム画面.n現在のトップChip--; + while (dTX.listChip[OpenTaiko.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms == dTX.listChip[OpenTaiko.stage演奏ドラム画面.n現在のトップChip - 1].n発声時刻ms && OpenTaiko.stage演奏ドラム画面.n現在のトップChip != 0) + OpenTaiko.stage演奏ドラム画面.n現在のトップChip--; } if (doScroll) { - this.nスクロール後ms = (long)(dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed); + this.nスクロール後ms = (long)(dTX.listChip[OpenTaiko.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms / OpenTaiko.ConfigIni.SongPlaybackSpeed); this.bCurrentlyScrolling = true; - this.ctScrollCounter = new CCounter(0, TJAPlayer3.Skin.Game_Training_ScrollTime, 1, TJAPlayer3.Timer); + this.ctScrollCounter = new CCounter(0, OpenTaiko.Skin.Game_Training_ScrollTime, 1, OpenTaiko.Timer); } else { - SoundManager.PlayTimer.NowTimeMs = (long)(dTX.listChip[TJAPlayer3.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed); + SoundManager.PlayTimer.NowTimeMs = (long)(dTX.listChip[OpenTaiko.stage演奏ドラム画面.n現在のトップChip].n発声時刻ms / OpenTaiko.ConfigIni.SongPlaybackSpeed); this.nスクロール後ms = SoundManager.PlayTimer.NowTimeMs; } } public void tToggleBookmarkAtTheCurrentPosition() { if (!this.bCurrentlyScrolling && this.bTrainingPAUSE) { - STJUMPP _JumpPoint = new STJUMPP() { Time = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed), Measure = this.nCurrentMeasure }; + STJUMPP _JumpPoint = new STJUMPP() { Time = (long)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed), Measure = this.nCurrentMeasure }; if (!JumpPointList.Contains(_JumpPoint)) JumpPointList.Add(_JumpPoint); else JumpPointList.Remove(_JumpPoint); - TJAPlayer3.Skin.soundTrainingToggleBookmarkSFX.tPlay(); + OpenTaiko.Skin.soundTrainingToggleBookmarkSFX.tPlay(); JumpPointList.Sort((a, b) => a.Time.CompareTo(b.Time)); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs index b31b939a..2d8c67e0 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsゲームモード.cs @@ -3,7 +3,7 @@ using FDK; using Point = System.Drawing.Point; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CAct演奏Drumsゲームモード : CActivity { /// /// 現時点では「完走!叩ききりまショー!」のみ。 @@ -86,8 +86,8 @@ namespace TJAPlayer3 { public void t叩ききりまショー_初期化() { this.st叩ききりまショー = new ST叩ききりまショー(); - this.n演奏時間 = (TJAPlayer3.DTX.listChip.Count > 0) ? TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms : 0; - this.st叩ききりまショー.ct残り時間 = new CCounter(0, 25000, 1, TJAPlayer3.Timer); + this.n演奏時間 = (OpenTaiko.DTX.listChip.Count > 0) ? OpenTaiko.DTX.listChip[OpenTaiko.DTX.listChip.Count - 1].n発声時刻ms : 0; + this.st叩ききりまショー.ct残り時間 = new CCounter(0, 25000, 1, OpenTaiko.Timer); this.st叩ききりまショー.ct加算時間表示 = new CCounter(); this.st叩ききりまショー.ct加算審査中 = new CCounter(); this.st叩ききりまショー.b最初のチップが叩かれた = false; @@ -112,14 +112,14 @@ namespace TJAPlayer3 { this.n加算時間 = 0; this.n前回の延長時間 = 0; - this.st叩ききりまショー.ct針アニメ = new CCounter(0, 1000, 1, TJAPlayer3.Timer); + this.st叩ききりまショー.ct針アニメ = new CCounter(0, 1000, 1, OpenTaiko.Timer); this.t叩ききりまショー_判定項目と難易度を決める(); } public void t叩ききりまショー_判定項目と難易度を決める() { //まず通常、激辛時でわける。 - if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー) { + if (OpenTaiko.ConfigIni.eGameMode == EGame.完走叩ききりまショー) { #region[ 通常 ] //通常の査定 // 精度 > 最小ズレ > コンボ > 最大ズレ > ミス @@ -182,7 +182,7 @@ namespace TJAPlayer3 { new STボーナス( 70.0, -0.5 ) }; #endregion - } else if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー激辛) { + } else if (OpenTaiko.ConfigIni.eGameMode == EGame.完走叩ききりまショー激辛) { #region[ 激辛 ] //激ムズの査定 // 最大ズレ > 精度 > コンボ > 最小ズレ > ミス @@ -247,7 +247,7 @@ namespace TJAPlayer3 { }; //★10の場合超激辛モードになる。 - if (TJAPlayer3.DTX.LEVELtaiko[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]] >= 10) { + if (OpenTaiko.DTX.LEVELtaiko[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]] >= 10) { #region[ 超激辛 ] this.st叩ききりまショー.b超激辛 = true; @@ -293,7 +293,7 @@ namespace TJAPlayer3 { #endregion } - if (TJAPlayer3.ConfigIni.bSuperHard) { + if (OpenTaiko.ConfigIni.bSuperHard) { #region[ 超激辛 ] this.st叩ききりまショー.b超激辛 = true; @@ -373,7 +373,7 @@ namespace TJAPlayer3 { } public override int Draw() { - if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー || TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー激辛) { + if (OpenTaiko.ConfigIni.eGameMode == EGame.完走叩ききりまショー || OpenTaiko.ConfigIni.eGameMode == EGame.完走叩ききりまショー激辛) { //if( this.st叩ききりまショー.b最初のチップが叩かれた == true )//&& //CDTXMania.stage演奏ドラム画面.r検索範囲内にチップがあるか調べる( CSound管理.rc演奏用タイマ.n現在時刻ms, 0, 3000 ) ) //this.st叩ききりまショー.ct残り時間.t進行(); @@ -387,7 +387,7 @@ namespace TJAPlayer3 { if (this.st叩ききりまショー.bタイマー使用中) { if (!this.st叩ききりまショー.ct残り時間.IsStoped || this.st叩ききりまショー.b加算アニメ中 == true) { this.st叩ききりまショー.ct残り時間.Tick(); - if (!TJAPlayer3.stage演奏ドラム画面.r検索範囲内にチップがあるか調べる((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), 0, 5000, 0) || this.st叩ききりまショー.b加算アニメ中 == true) { + if (!OpenTaiko.stage演奏ドラム画面.r検索範囲内にチップがあるか調べる((long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), 0, 5000, 0) || this.st叩ききりまショー.b加算アニメ中 == true) { this.st叩ききりまショー.bタイマー使用中 = false; this.st叩ききりまショー.ct残り時間.Stop(); } @@ -395,11 +395,11 @@ namespace TJAPlayer3 { } if (!this.st叩ききりまショー.bタイマー使用中 && this.st叩ききりまショー.b加算アニメ中 == false) { - if ((this.st叩ききりまショー.b最初のチップが叩かれた == true && (TJAPlayer3.stage演奏ドラム画面.r検索範囲内にチップがあるか調べる(SoundManager.PlayTimer.NowTimeMs, 0, 2000, 0)))) { + if ((this.st叩ききりまショー.b最初のチップが叩かれた == true && (OpenTaiko.stage演奏ドラム画面.r検索範囲内にチップがあるか調べる(SoundManager.PlayTimer.NowTimeMs, 0, 2000, 0)))) { this.st叩ききりまショー.bタイマー使用中 = true; int nCount = this.st叩ききりまショー.ct残り時間.CurrentValue; - this.st叩ききりまショー.ct残り時間 = new CCounter(0, 25000, 1, TJAPlayer3.Timer); - this.st叩ききりまショー.ct針アニメ = new CCounter(0, 1000, 1, TJAPlayer3.Timer); + this.st叩ききりまショー.ct残り時間 = new CCounter(0, 25000, 1, OpenTaiko.Timer); + this.st叩ききりまショー.ct針アニメ = new CCounter(0, 1000, 1, OpenTaiko.Timer); this.st叩ききりまショー.ct残り時間.CurrentValue = nCount; } @@ -409,19 +409,19 @@ namespace TJAPlayer3 { if ((this.st叩ききりまショー.ct残り時間.CurrentValue >= 20000) && this.st叩ききりまショー.ct残り時間.CurrentValue != 25000) this.t叩ききりまショー_評価をして残り時間を延長する(); - if (TJAPlayer3.Tx.Tile_Black != null) { + if (OpenTaiko.Tx.Tile_Black != null) { if (this.st叩ききりまショー.ct残り時間.CurrentValue >= 22000 && this.st叩ききりまショー.ct残り時間.CurrentValue < 23000) - TJAPlayer3.Tx.Tile_Black.Opacity = 64; + OpenTaiko.Tx.Tile_Black.Opacity = 64; else if (this.st叩ききりまショー.ct残り時間.CurrentValue >= 23000 && this.st叩ききりまショー.ct残り時間.CurrentValue < 24000) - TJAPlayer3.Tx.Tile_Black.Opacity = 128; + OpenTaiko.Tx.Tile_Black.Opacity = 128; else if (this.st叩ききりまショー.ct残り時間.CurrentValue >= 24000) - TJAPlayer3.Tx.Tile_Black.Opacity = 192; + OpenTaiko.Tx.Tile_Black.Opacity = 192; else - TJAPlayer3.Tx.Tile_Black.Opacity = 0; + OpenTaiko.Tx.Tile_Black.Opacity = 0; for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / 64); i++) { for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / 64); j++) { - TJAPlayer3.Tx.Tile_Black.t2D描画(i * 64, j * 64); + OpenTaiko.Tx.Tile_Black.t2D描画(i * 64, j * 64); } } } @@ -437,9 +437,9 @@ namespace TJAPlayer3 { //CDTXMania.act文字コンソール.tPrint( 100, 16 * 7, C文字コンソール.Eフォント種別.白, this.st叩ききりまショー.ct加算審査中.n現在の値.ToString() ); #region[ 残り時間描画 ] - if (TJAPlayer3.Tx.Taiko_Combo != null) { - if (TJAPlayer3.Tx.GameMode_Timer_Frame != null) - TJAPlayer3.Tx.GameMode_Timer_Frame.t2D描画(230, 84); + if (OpenTaiko.Tx.Taiko_Combo != null) { + if (OpenTaiko.Tx.GameMode_Timer_Frame != null) + OpenTaiko.Tx.GameMode_Timer_Frame.t2D描画(230, 84); this.st叩ききりまショー.ct針アニメ.TickLoop(); int nCenterX = 230; @@ -465,8 +465,8 @@ namespace TJAPlayer3 { string str表示する残り時間 = (this.st叩ききりまショー.ct残り時間.CurrentValue < 1000) ? "25" : ((26000 - this.st叩ききりまショー.ct残り時間.CurrentValue) / 1000).ToString(); - if (TJAPlayer3.Tx.GameMode_Timer_Frame != null) - this.t小文字表示(230 + (str表示する残り時間.Length * TJAPlayer3.Skin.Game_Taiko_Combo_Size[0] / 4), 84 + TJAPlayer3.Tx.GameMode_Timer_Frame.szTextureSize.Height / 2, string.Format("{0,2:#0}", str表示する残り時間)); + if (OpenTaiko.Tx.GameMode_Timer_Frame != null) + this.t小文字表示(230 + (str表示する残り時間.Length * OpenTaiko.Skin.Game_Taiko_Combo_Size[0] / 4), 84 + OpenTaiko.Tx.GameMode_Timer_Frame.szTextureSize.Height / 2, string.Format("{0,2:#0}", str表示する残り時間)); } if (!this.st叩ききりまショー.ct加算審査中.IsStoped) { @@ -497,7 +497,7 @@ namespace TJAPlayer3 { double n延長する時間 = 0; //最後に延長した時刻から11秒経過していなければ延長を行わない。 - if (this.n最後に時間延長した時刻 + 11000 <= (SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) { + if (this.n最後に時間延長した時刻 + 11000 <= (SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed)) { //1項目につき5秒 //-精度 if (this.st叩ききりまショー.nヒット数_PERFECT != 0 || this.st叩ききりまショー.nヒット数_GREAT != 0) { @@ -548,8 +548,8 @@ namespace TJAPlayer3 { } } #region[ 全体 ] - if (TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect != 0 || TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great != 0) { - double db全体精度 = ((double)(TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great) / this.st叩ききりまショー.n区間ノート数) * 100.0; + if (OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect != 0 || OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great != 0) { + double db全体精度 = ((double)(OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect + OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great) / this.st叩ききりまショー.n区間ノート数) * 100.0; for (int i = 0; i < this.n全体精度ボーナス.Length; i++) { if (db全体精度 >= this.n全体精度ボーナス[i].ret) { n延長する時間 += this.n全体精度ボーナス[i].point; @@ -569,8 +569,8 @@ namespace TJAPlayer3 { } } #endregion - if (TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0] != 0) { - double db全体コンボ率 = ((double)TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0] / this.st叩ききりまショー.n現在通過したノート数) * 100.0; + if (OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0] != 0) { + double db全体コンボ率 = ((double)OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0] / this.st叩ききりまショー.n現在通過したノート数) * 100.0; for (int i = 0; i < this.n全体コンボ率ボーナス.Length; i++) { if (db全体コンボ率 >= this.n全体コンボ率ボーナス[i].ret) { n延長する時間 += this.n全体コンボ率ボーナス[i].point; @@ -579,7 +579,7 @@ namespace TJAPlayer3 { } } - double db全体ミス率 = (((double)TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Poor + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Miss) / this.st叩ききりまショー.n現在通過したノート数) * 100.0; + double db全体ミス率 = (((double)OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Poor + OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Miss) / this.st叩ききりまショー.n現在通過したノート数) * 100.0; for (int i = 0; i < this.n全体ミス率ボーナス.Length; i++) { if (db全体ミス率 >= this.n全体ミス率ボーナス[i].ret) { n延長する時間 += this.n全体ミス率ボーナス[i].point; @@ -589,7 +589,7 @@ namespace TJAPlayer3 { #endregion - this.n最後に時間延長した時刻 = (int)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + this.n最後に時間延長した時刻 = (int)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); if (n延長する時間 < 0) n延長する時間 = 0; if (this.st叩ききりまショー.n区間ノート数 == 0) @@ -619,7 +619,7 @@ namespace TJAPlayer3 { return; if (this.st叩ききりまショー.b超激辛 && (((double)this.st叩ききりまショー.nヒット数_POOR + this.st叩ききりまショー.nヒット数_MISS) > 0)) return; //ミスが出るようでは上達しませんよ。お兄様。 - if (TJAPlayer3.ConfigIni.bSuperHard) + if (OpenTaiko.ConfigIni.bSuperHard) return; //スーパーハード時はボーナス加点無し。 @@ -650,7 +650,7 @@ namespace TJAPlayer3 { } - this.n最後に時間延長した時刻 = (int)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + this.n最後に時間延長した時刻 = (int)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); if (n延長する時間 < 0) n延長する時間 = 0; @@ -731,11 +731,11 @@ namespace TJAPlayer3 { } private void t加算審査アニメ_Start() { - this.st叩ききりまショー.ct加算審査中 = new CCounter(0, 2000, 1, TJAPlayer3.Timer); + this.st叩ききりまショー.ct加算審査中 = new CCounter(0, 2000, 1, OpenTaiko.Timer); this.st叩ききりまショー.b加算アニメ中 = true; } private void t加算時間描画_Start() { - this.st叩ききりまショー.ct加算時間表示 = new CCounter(0, 1, 1000, TJAPlayer3.Timer); + this.st叩ききりまショー.ct加算時間表示 = new CCounter(0, 1, 1000, OpenTaiko.Timer); } private void t加算時間描画(int addtime) { @@ -769,22 +769,22 @@ namespace TJAPlayer3 { foreach (char ch in str) { for (int i = 0; i < this.st小文字位置.Length; i++) { if (this.st小文字位置[i].ch == ch) { - Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_Taiko_Combo_Size[0] * i, 0, TJAPlayer3.Skin.Game_Taiko_Combo_Size[0], TJAPlayer3.Skin.Game_Taiko_Combo_Size[1]); - if (TJAPlayer3.Tx.Taiko_Combo[0] != null) { + Rectangle rectangle = new Rectangle(OpenTaiko.Skin.Game_Taiko_Combo_Size[0] * i, 0, OpenTaiko.Skin.Game_Taiko_Combo_Size[0], OpenTaiko.Skin.Game_Taiko_Combo_Size[1]); + if (OpenTaiko.Tx.Taiko_Combo[0] != null) { if (this.st叩ききりまショー.bタイマー使用中) - TJAPlayer3.Tx.Taiko_Combo[0].Opacity = 255; + OpenTaiko.Tx.Taiko_Combo[0].Opacity = 255; else if (this.st叩ききりまショー.b最初のチップが叩かれた && !this.st叩ききりまショー.bタイマー使用中) - TJAPlayer3.Tx.Taiko_Combo[0].Opacity = 128; + OpenTaiko.Tx.Taiko_Combo[0].Opacity = 128; if (this.st叩ききりまショー.b加算アニメ中) - TJAPlayer3.Tx.Taiko_Combo[0].Opacity = 0; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1f; - TJAPlayer3.Tx.Taiko_Combo[0].vcScaleRatio.X = 1f; - TJAPlayer3.Tx.Taiko_Combo[0].t2D中心基準描画(x, y, rectangle); + OpenTaiko.Tx.Taiko_Combo[0].Opacity = 0; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.Y = 1f; + OpenTaiko.Tx.Taiko_Combo[0].vcScaleRatio.X = 1f; + OpenTaiko.Tx.Taiko_Combo[0].t2D中心基準描画(x, y, rectangle); } break; } } - x += TJAPlayer3.Skin.Game_Taiko_Combo_Padding[0] * 2; + x += OpenTaiko.Skin.Game_Taiko_Combo_Padding[0] * 2; } } protected void t加算文字表示(int x, int y, string str) { @@ -792,10 +792,10 @@ namespace TJAPlayer3 { foreach (char ch in str) { for (int i = 0; i < cFont.Length; i++) { if (cFont[i] == ch) { - Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_Score_Size[0] * i, 0, TJAPlayer3.Skin.Game_Score_Size[0], TJAPlayer3.Skin.Game_Score_Size[1]); - if (TJAPlayer3.Tx.Taiko_Score[0] != null) { - TJAPlayer3.Tx.Taiko_Score[0].vcScaleRatio.Y = 1f; - TJAPlayer3.Tx.Taiko_Score[0].t2D描画(x, y, rectangle); + Rectangle rectangle = new Rectangle(OpenTaiko.Skin.Game_Score_Size[0] * i, 0, OpenTaiko.Skin.Game_Score_Size[0], OpenTaiko.Skin.Game_Score_Size[1]); + if (OpenTaiko.Tx.Taiko_Score[0] != null) { + OpenTaiko.Tx.Taiko_Score[0].vcScaleRatio.Y = 1f; + OpenTaiko.Tx.Taiko_Score[0].t2D描画(x, y, rectangle); } } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs index 1ae83b75..4b757afb 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs @@ -5,7 +5,7 @@ using DiscordRPC; using FDK; using Point = System.Drawing.Point; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CStage演奏ドラム画面 : CStage演奏画面共通 { // コンストラクタ @@ -178,7 +178,7 @@ namespace TJAPlayer3 { this.bフィルイン中 = false; this.n待機中の大音符の座標 = 0; this.actGame.t叩ききりまショー_初期化(); - base.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]); + base.ReSetScore(OpenTaiko.DTX.nScoreInit[0, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]], OpenTaiko.DTX.nScoreDiff[OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]]); #region [ branch ] for (int i = 0; i < 5; i++) { @@ -189,7 +189,7 @@ namespace TJAPlayer3 { this.nBranch条件数値B = 0; #endregion - if ((TJAPlayer3.DTX.listVD.TryGetValue(1, out CVideoDecoder vd2))) { + if ((OpenTaiko.DTX.listVD.TryGetValue(1, out CVideoDecoder vd2))) { ShowVideo = true; } else { ShowVideo = false; @@ -207,11 +207,11 @@ namespace TJAPlayer3 { } } - this.nStoredHit = new int[TJAPlayer3.ConfigIni.nPlayerCount]; + this.nStoredHit = new int[OpenTaiko.ConfigIni.nPlayerCount]; dtLastQueueOperation = DateTime.MinValue; - PuchiChara.ChangeBPM(60.0 / TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[0]); + PuchiChara.ChangeBPM(60.0 / OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[0]); //dbUnit = Math.Ceiling( dbUnit * 1000.0 ); //dbUnit = dbUnit / 1000.0; @@ -222,7 +222,7 @@ namespace TJAPlayer3 { //this.actDancer.ctモブ = new CCounter( 1.0, 16.0, ((60.0 / CDTXMania.stage演奏ドラム画面.actPlayInfo.dbBPM / 16.0 )), CSound管理.rc演奏用タイマ ); - this.ct手つなぎ = new CCounter(0, 60, 20, TJAPlayer3.Timer); + this.ct手つなぎ = new CCounter(0, 60, 20, OpenTaiko.Timer); this.ShownLyric2 = 0; @@ -244,15 +244,15 @@ namespace TJAPlayer3 { "+" }; - int level = TJAPlayer3.stageSongSelect.rChoosenSong.nLevel[diff]; - CDTX.ELevelIcon levelIcon = TJAPlayer3.stageSongSelect.rChoosenSong.nLevelIcon[diff]; + int level = OpenTaiko.stageSongSelect.rChoosenSong.nLevel[diff]; + CDTX.ELevelIcon levelIcon = OpenTaiko.stageSongSelect.rChoosenSong.nLevelIcon[diff]; return (diffArr[Math.Min(diff, 6)] + "Lv." + level + diffArrIcon[(int)levelIcon]); } // Discord Presence の更新 - string details = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stageSongSelect.rChoosenSong.ldTitle.GetString("") - + diffToString(TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]) : ""; + string details = OpenTaiko.ConfigIni.SendDiscordPlayingInformation ? OpenTaiko.stageSongSelect.rChoosenSong.ldTitle.GetString("") + + diffToString(OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]) : ""; // Byte count must be used instead of String.Length. // The byte count is what Discord is concerned with. Some chars are greater than one byte. @@ -262,17 +262,17 @@ namespace TJAPlayer3 { details = Encoding.UTF8.GetString(details_byte); } - var difficultyName = TJAPlayer3.DifficultyNumberToEnum(TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]).ToString(); + var difficultyName = OpenTaiko.DifficultyNumberToEnum(OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]).ToString(); - TJAPlayer3.DiscordClient?.SetPresence(new RichPresence() { + OpenTaiko.DiscordClient?.SetPresence(new RichPresence() { Details = details, - State = "Playing" + (TJAPlayer3.ConfigIni.bAutoPlay[0] == true ? " (Auto)" : ""), - Timestamps = new Timestamps(DateTime.UtcNow, DateTime.UtcNow.AddMilliseconds(TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed)), + State = "Playing" + (OpenTaiko.ConfigIni.bAutoPlay[0] == true ? " (Auto)" : ""), + Timestamps = new Timestamps(DateTime.UtcNow, DateTime.UtcNow.AddMilliseconds(OpenTaiko.DTX.listChip[OpenTaiko.DTX.listChip.Count - 1].n発声時刻ms / OpenTaiko.ConfigIni.SongPlaybackSpeed)), Assets = new Assets() { - SmallImageKey = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? difficultyName.ToLower() : "", - SmallImageText = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? String.Format("COURSE:{0} ({1})", difficultyName, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]) : "", - LargeImageKey = TJAPlayer3.LargeImageKey, - LargeImageText = TJAPlayer3.LargeImageText, + SmallImageKey = OpenTaiko.ConfigIni.SendDiscordPlayingInformation ? difficultyName.ToLower() : "", + SmallImageText = OpenTaiko.ConfigIni.SendDiscordPlayingInformation ? String.Format("COURSE:{0} ({1})", difficultyName, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]) : "", + LargeImageKey = OpenTaiko.LargeImageKey, + LargeImageText = OpenTaiko.LargeImageText, } }); @@ -288,23 +288,23 @@ namespace TJAPlayer3 { // their drum sound effects with the sounds of the input calibration file. // Instead, we want them focused on the sounds of their keyboard, tatacon, // other controller, etc. and the sounds of the input calibration audio file. - if (!TJAPlayer3.IsPerformingCalibration) { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - int actual = TJAPlayer3.GetActualPlayer(i); + if (!OpenTaiko.IsPerformingCalibration) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + int actual = OpenTaiko.GetActualPlayer(i); - var hs = TJAPlayer3.Skin.hsHitSoundsInformations; + var hs = OpenTaiko.Skin.hsHitSoundsInformations; //this.soundRed[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.don[actual]), ESoundGroup.SoundEffect); //this.soundBlue[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.ka[actual]), ESoundGroup.SoundEffect); //this.soundAdlib[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.adlib[actual]), ESoundGroup.SoundEffect); //this.soundClap[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.clap[actual]), ESoundGroup.SoundEffect); - this.soundRed[i] = TJAPlayer3.SoundManager.tCreateSound((@$"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + hs.don[actual]), ESoundGroup.SoundEffect); - this.soundBlue[i] = TJAPlayer3.SoundManager.tCreateSound((@$"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + hs.ka[actual]), ESoundGroup.SoundEffect); - this.soundAdlib[i] = TJAPlayer3.SoundManager.tCreateSound((@$"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + hs.adlib[actual]), ESoundGroup.SoundEffect); - this.soundClap[i] = TJAPlayer3.SoundManager.tCreateSound((@$"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + hs.clap[actual]), ESoundGroup.SoundEffect); + this.soundRed[i] = OpenTaiko.SoundManager.tCreateSound((@$"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + hs.don[actual]), ESoundGroup.SoundEffect); + this.soundBlue[i] = OpenTaiko.SoundManager.tCreateSound((@$"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + hs.ka[actual]), ESoundGroup.SoundEffect); + this.soundAdlib[i] = OpenTaiko.SoundManager.tCreateSound((@$"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + hs.adlib[actual]), ESoundGroup.SoundEffect); + this.soundClap[i] = OpenTaiko.SoundManager.tCreateSound((@$"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + hs.clap[actual]), ESoundGroup.SoundEffect); - int _panning = TJAPlayer3.ConfigIni.nPanning[TJAPlayer3.ConfigIni.nPlayerCount - 1][i]; + int _panning = OpenTaiko.ConfigIni.nPanning[OpenTaiko.ConfigIni.nPlayerCount - 1][i]; if (this.soundRed[i] != null) this.soundRed[i].SoundPosition = _panning; if (this.soundBlue[i] != null) this.soundBlue[i].SoundPosition = _panning; if (this.soundAdlib[i] != null) this.soundAdlib[i].SoundPosition = _panning; @@ -336,7 +336,7 @@ namespace TJAPlayer3 { public override void DeActivate() { this.ct手つなぎ = null; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (this.soundRed[i] != null) this.soundRed[i].tDispose(); if (this.soundBlue[i] != null) @@ -380,11 +380,11 @@ namespace TJAPlayer3 { #region [ 初めての進行描画 ] if (base.IsFirstDraw) { SoundManager.PlayTimer.Reset(); - TJAPlayer3.Timer.Reset(); - this.ctチップ模様アニメ.Drums = new CCounter(0, 1, 500, TJAPlayer3.Timer); - this.ctチップ模様アニメ.Guitar = new CCounter(0, 0x17, 20, TJAPlayer3.Timer); - this.ctチップ模様アニメ.Bass = new CCounter(0, 0x17, 20, TJAPlayer3.Timer); - this.ctチップ模様アニメ.Taiko = new CCounter(0, 1, 500, TJAPlayer3.Timer); + OpenTaiko.Timer.Reset(); + this.ctチップ模様アニメ.Drums = new CCounter(0, 1, 500, OpenTaiko.Timer); + this.ctチップ模様アニメ.Guitar = new CCounter(0, 0x17, 20, OpenTaiko.Timer); + this.ctチップ模様アニメ.Bass = new CCounter(0, 0x17, 20, OpenTaiko.Timer); + this.ctチップ模様アニメ.Taiko = new CCounter(0, 1, 500, OpenTaiko.Timer); // this.actChipFireD.Start( Eレーン.HH ); // #31554 2013.6.12 yyagi // 初チップヒット時のもたつき回避。最初にactChipFireD.Start()するときにJITが掛かって？ @@ -395,52 +395,52 @@ namespace TJAPlayer3 { this.actFI.tフェードイン開始(); - if (TJAPlayer3.DTXVmode.Enabled) // DTXVモードなら + if (OpenTaiko.DTXVmode.Enabled) // DTXVモードなら { #region [ DTXV用の再生設定にする(全AUTOなど) ] tDTXV用の設定(); #endregion - t演奏位置の変更(TJAPlayer3.DTXVmode.nStartBar, 0); + t演奏位置の変更(OpenTaiko.DTXVmode.nStartBar, 0); } // TJAPlayer3.Sound管理.tDisableUpdateBufferAutomatically(); base.IsFirstDraw = false; } #endregion - if (((TJAPlayer3.ConfigIni.nRisky != 0 && this.actGauge.IsFailed(EInstrumentPad.TAIKO)) + if (((OpenTaiko.ConfigIni.nRisky != 0 && this.actGauge.IsFailed(EInstrumentPad.TAIKO)) || this.actGame.st叩ききりまショー.ct残り時間.IsEnded - || (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower && CFloorManagement.CurrentNumberOfLives <= 0)) + || (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower && CFloorManagement.CurrentNumberOfLives <= 0)) && (base.ePhaseID == CStage.EPhase.Common_NORMAL)) { this.actStageFailed.Start(); this.actEnd.Start(); - TJAPlayer3.DTX.t全チップの再生停止(); + OpenTaiko.DTX.t全チップの再生停止(); base.ePhaseID = CStage.EPhase.Game_STAGE_FAILED; } - bool BGA_Hidden = TJAPlayer3.ConfigIni.bEnableAVI && TJAPlayer3.DTX.listVD.Count > 0 && ShowVideo; + bool BGA_Hidden = OpenTaiko.ConfigIni.bEnableAVI && OpenTaiko.DTX.listVD.Count > 0 && ShowVideo; // (????) - if (!String.IsNullOrEmpty(TJAPlayer3.DTX.strBGIMAGE_PATH) || (TJAPlayer3.DTX.listVD.Count == 0) || !ShowVideo || !TJAPlayer3.ConfigIni.bEnableAVI) //背景動画があったら背景画像を描画しない。 + if (!String.IsNullOrEmpty(OpenTaiko.DTX.strBGIMAGE_PATH) || (OpenTaiko.DTX.listVD.Count == 0) || !ShowVideo || !OpenTaiko.ConfigIni.bEnableAVI) //背景動画があったら背景画像を描画しない。 { this.t進行描画_背景(); } - if (TJAPlayer3.ConfigIni.bEnableAVI && TJAPlayer3.DTX.listVD.Count > 0 && ShowVideo && !TJAPlayer3.ConfigIni.bTokkunMode) { + if (OpenTaiko.ConfigIni.bEnableAVI && OpenTaiko.DTX.listVD.Count > 0 && ShowVideo && !OpenTaiko.ConfigIni.bTokkunMode) { this.t進行描画_AVI(); - } else if (TJAPlayer3.ConfigIni.bEnableBGA) { - if (TJAPlayer3.ConfigIni.bTokkunMode) actTokkun.On進行描画_背景(); + } else if (OpenTaiko.ConfigIni.bEnableBGA) { + if (OpenTaiko.ConfigIni.bTokkunMode) actTokkun.On進行描画_背景(); else actBackground.Draw(); } - if (!BGA_Hidden && !TJAPlayer3.ConfigIni.bTokkunMode) { + if (!BGA_Hidden && !OpenTaiko.ConfigIni.bTokkunMode) { actRollChara.Draw(); } - if (!BGA_Hidden && !bDoublePlay && TJAPlayer3.ConfigIni.ShowDancer && !TJAPlayer3.ConfigIni.bTokkunMode) { + if (!BGA_Hidden && !bDoublePlay && OpenTaiko.ConfigIni.ShowDancer && !OpenTaiko.ConfigIni.bTokkunMode) { actDancer.Draw(); } - if (!BGA_Hidden && !bDoublePlay && TJAPlayer3.ConfigIni.ShowFooter && !TJAPlayer3.ConfigIni.bTokkunMode) + if (!BGA_Hidden && !bDoublePlay && OpenTaiko.ConfigIni.ShowFooter && !OpenTaiko.ConfigIni.bTokkunMode) this.actFooter.Draw(); //this.t進行描画_グラフ(); // #24074 2011.01.23 add ikanick @@ -449,14 +449,14 @@ namespace TJAPlayer3 { //this.t進行描画_DANGER(); //this.t進行描画_判定ライン(); - if (TJAPlayer3.ConfigIni.ShowChara && TJAPlayer3.ConfigIni.nPlayerCount <= 2) { + if (OpenTaiko.ConfigIni.ShowChara && OpenTaiko.ConfigIni.nPlayerCount <= 2) { this.actChara.Draw(); } - if (!BGA_Hidden && TJAPlayer3.ConfigIni.ShowMob && !TJAPlayer3.ConfigIni.bTokkunMode) + if (!BGA_Hidden && OpenTaiko.ConfigIni.ShowMob && !OpenTaiko.ConfigIni.bTokkunMode) this.actMob.Draw(); - if (TJAPlayer3.ConfigIni.eGameMode != EGame.OFF) + if (OpenTaiko.ConfigIni.eGameMode != EGame.OFF) this.actGame.Draw(); this.t進行描画_譜面スクロール速度(); @@ -464,16 +464,16 @@ namespace TJAPlayer3 { this.actLaneTaiko.Draw(); - if (TJAPlayer3.ConfigIni.ShowRunner && !TJAPlayer3.ConfigIni.bAIBattleMode && TJAPlayer3.ConfigIni.nPlayerCount <= 2) + if (OpenTaiko.ConfigIni.ShowRunner && !OpenTaiko.ConfigIni.bAIBattleMode && OpenTaiko.ConfigIni.nPlayerCount <= 2) this.actRunner.Draw(); //this.t進行描画_レーン(); //this.t進行描画_レーンフラッシュD(); - if ((TJAPlayer3.ConfigIni.eClipDispType == EClipDispType.ウィンドウのみ || TJAPlayer3.ConfigIni.eClipDispType == EClipDispType.両方) && TJAPlayer3.ConfigIni.nPlayerCount == 1) + if ((OpenTaiko.ConfigIni.eClipDispType == EClipDispType.ウィンドウのみ || OpenTaiko.ConfigIni.eClipDispType == EClipDispType.両方) && OpenTaiko.ConfigIni.nPlayerCount == 1) this.actAVI.t窓表示(); - if (!TJAPlayer3.ConfigIni.bNoInfo && !TJAPlayer3.ConfigIni.bTokkunMode) + if (!OpenTaiko.ConfigIni.bNoInfo && !OpenTaiko.ConfigIni.bTokkunMode) this.t進行描画_ゲージ(); this.actLaneTaiko.ゴーゴー炎(); @@ -482,14 +482,14 @@ namespace TJAPlayer3 { this.actDan.Draw(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { // bIsFinishedPlaying = this.t進行描画_チップ(E楽器パート.DRUMS, i); bool btmp = this.t進行描画_チップ(EInstrumentPad.DRUMS, i); if (btmp == true) ifp[i] = true; #if DEBUG - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.D0)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.D0)) { ifp[i] = true; } #endif @@ -499,21 +499,21 @@ namespace TJAPlayer3 { this.actMtaiko.Draw(); - if (TJAPlayer3.ConfigIni.bAIBattleMode) { + if (OpenTaiko.ConfigIni.bAIBattleMode) { this.actAIBattle.Draw(); } this.GoGoSplash.Draw(); this.t進行描画_リアルタイム判定数表示(); - if (TJAPlayer3.ConfigIni.bTokkunMode) + if (OpenTaiko.ConfigIni.bTokkunMode) this.actTokkun.On進行描画_小節_速度(); - if (!TJAPlayer3.ConfigIni.bNoInfo) + if (!OpenTaiko.ConfigIni.bNoInfo) this.t進行描画_コンボ(); - if (!TJAPlayer3.ConfigIni.bNoInfo && !TJAPlayer3.ConfigIni.bTokkunMode) + if (!OpenTaiko.ConfigIni.bNoInfo && !OpenTaiko.ConfigIni.bTokkunMode) this.t進行描画_スコア(); - if (TJAPlayer3.ConfigIni.ShowChara && TJAPlayer3.ConfigIni.nPlayerCount > 2) { + if (OpenTaiko.ConfigIni.ShowChara && OpenTaiko.ConfigIni.nPlayerCount > 2) { this.actChara.Draw(); } @@ -523,23 +523,23 @@ namespace TJAPlayer3 { this.FlyingNotes.Draw(); this.t進行描画_チップファイアD(); - if (!TJAPlayer3.ConfigIni.bNoInfo) + if (!OpenTaiko.ConfigIni.bNoInfo) this.t進行描画_パネル文字列(); this.actComboBalloon.Draw(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { this.actRoll.On進行描画(this.n現在の連打数[i], i); } - if (!TJAPlayer3.ConfigIni.bNoInfo) + if (!OpenTaiko.ConfigIni.bNoInfo) this.t進行描画_判定文字列1_通常位置指定の場合(); this.t進行描画_演奏情報(); - if (TJAPlayer3.DTX.listLyric2.Count > ShownLyric2 && TJAPlayer3.DTX.listLyric2[ShownLyric2].Time < (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) { - this.actPanel.t歌詞テクスチャを生成する(TJAPlayer3.DTX.listLyric2[ShownLyric2++].TextTex); + if (OpenTaiko.DTX.listLyric2.Count > ShownLyric2 && OpenTaiko.DTX.listLyric2[ShownLyric2].Time < (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed)) { + this.actPanel.t歌詞テクスチャを生成する(OpenTaiko.DTX.listLyric2[ShownLyric2++].TextTex); } this.actPanel.t歌詞テクスチャを描画する(); @@ -547,7 +547,7 @@ namespace TJAPlayer3 { actChara.OnDraw_Balloon(); // Floor voice - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) this.actComboVoice.tPlayFloorSound(); this.t全体制御メソッド(); @@ -557,7 +557,7 @@ namespace TJAPlayer3 { this.ScoreRank.Draw(); - if (TJAPlayer3.ConfigIni.bTokkunMode) { + if (OpenTaiko.ConfigIni.bTokkunMode) { actTokkun.Draw(); } @@ -566,7 +566,7 @@ namespace TJAPlayer3 { bIsFinishedFadeout = this.t進行描画_フェードイン_アウト(); bIsFinishedPlaying = true; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { if (!ifp[i]) bIsFinishedPlaying = false; } @@ -574,14 +574,14 @@ namespace TJAPlayer3 { //演奏終了→演出表示→フェードアウト if (bIsFinishedPlaying && base.ePhaseID == CStage.EPhase.Common_NORMAL) { - if (TJAPlayer3.ConfigIni.bTokkunMode) { + if (OpenTaiko.ConfigIni.bTokkunMode) { bIsFinishedPlaying = false; - TJAPlayer3.Skin.sound特訓停止音.tPlay(); + OpenTaiko.Skin.sound特訓停止音.tPlay(); actTokkun.tPausePlay(); actTokkun.tMatchWithTheChartDisplayPosition(true); } else { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { base.ePhaseID = CStage.EPhase.Game_EndStage; this.actEnd.Start(); @@ -589,18 +589,18 @@ namespace TJAPlayer3 { int Character = this.actChara.iCurrentCharacter[i]; if (HGaugeMethods.UNSAFE_IsRainbow(i)) { - if (TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0) { + if (OpenTaiko.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0) { if (HGaugeMethods.UNSAFE_IsRainbow(i)) { - double dbUnit = (((60.0 / (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i])))); + double dbUnit = (((60.0 / (OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM[i])))); this.actChara.ChangeAnime(i, CActImplCharacter.Anime.Combo10_Max, true); } } } else if (HGaugeMethods.UNSAFE_FastNormaCheck(i)) { - if (TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[Character] != 0) { + if (OpenTaiko.Skin.Characters_Become_Cleared_Ptn[Character] != 0) { this.actChara.ChangeAnime(i, CActImplCharacter.Anime.Cleared, true); ; } } else { - if (TJAPlayer3.Skin.Characters_ClearOut_Ptn[Character] != 0) { + if (OpenTaiko.Skin.Characters_ClearOut_Ptn[Character] != 0) { this.actChara.ChangeAnime(i, CActImplCharacter.Anime.ClearOut, true); } } @@ -621,7 +621,7 @@ namespace TJAPlayer3 { // キー入力 - if (TJAPlayer3.act現在入力を占有中のプラグイン == null) + if (OpenTaiko.act現在入力を占有中のプラグイン == null) this.tキー入力(); @@ -705,7 +705,7 @@ namespace TJAPlayer3 { } private int ChannelNumToFlyNoteNum(CDTX.CChip pChip, int nPlayer, bool b両手入力 = false, int nInput = 0) { - var _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; + var _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(nPlayer)]; int nFly = 0; switch (pChip.nチャンネル番号) { @@ -802,7 +802,7 @@ namespace TJAPlayer3 { this.tチップのヒット処理(nHitTime, pChip, EInstrumentPad.TAIKO, true, nInput, nPlayer); if ((e判定 != ENoteJudge.Poor) && (e判定 != ENoteJudge.Miss)) { - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.Start(pChip.nチャンネル番号, e判定, b両手入力, nPlayer); + OpenTaiko.stage演奏ドラム画面.actLaneTaiko.Start(pChip.nチャンネル番号, e判定, b両手入力, nPlayer); int nFly = ChannelNumToFlyNoteNum(pChip, nPlayer, b両手入力, nInput); @@ -814,10 +814,10 @@ namespace TJAPlayer3 { } protected override void ドラムスクロール速度アップ() { - TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.SaveFile] = Math.Min(TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.SaveFile] + 1, 1999); + OpenTaiko.ConfigIni.nScrollSpeed[OpenTaiko.SaveFile] = Math.Min(OpenTaiko.ConfigIni.nScrollSpeed[OpenTaiko.SaveFile] + 1, 1999); } protected override void ドラムスクロール速度ダウン() { - TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.SaveFile] = Math.Max(TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.SaveFile] - 1, 0); + OpenTaiko.ConfigIni.nScrollSpeed[OpenTaiko.SaveFile] = Math.Max(OpenTaiko.ConfigIni.nScrollSpeed[OpenTaiko.SaveFile] - 1, 0); } @@ -851,7 +851,7 @@ namespace TJAPlayer3 { for (int nPad = 0; nPad < (int)EPad.MAX; nPad++) // #27029 2012.1.4 from: <10 to <=10; Eパッドの要素が１つ（HP）増えたため。 // 2012.1.5 yyagi: (int)Eパッド.MAX に変更。Eパッドの要素数への依存を無くすため。 { - List listInputEvent = TJAPlayer3.Pad.GetEvents(EInstrumentPad.DRUMS, (EPad)nPad); + List listInputEvent = OpenTaiko.Pad.GetEvents(EInstrumentPad.DRUMS, (EPad)nPad); if ((listInputEvent == null) || (listInputEvent.Count == 0)) continue; @@ -862,7 +862,7 @@ namespace TJAPlayer3 { if (!inputEvent.Pressed) continue; - long nTime = (long)(((SoundManager.PlayTimer.NowTimeMs + nInputAdjustTimeMs) * TJAPlayer3.ConfigIni.SongPlaybackSpeed)); + long nTime = (long)(((SoundManager.PlayTimer.NowTimeMs + nInputAdjustTimeMs) * OpenTaiko.ConfigIni.SongPlaybackSpeed)); //int nPad09 = ( nPad == (int) Eパッド.HP ) ? (int) Eパッド.BD : nPad; // #27029 2012.1.5 yyagi bool bHitted = false; @@ -889,33 +889,33 @@ namespace TJAPlayer3 { nUsePlayer = 0; } else if (isPad2P) { nUsePlayer = 1; - if (TJAPlayer3.ConfigIni.nPlayerCount < 2) //プレイ人数が2人以上でなければ入力をキャンセル + if (OpenTaiko.ConfigIni.nPlayerCount < 2) //プレイ人数が2人以上でなければ入力をキャンセル break; } else if (isPad3P) { nUsePlayer = 2; - if (TJAPlayer3.ConfigIni.nPlayerCount < 3) //プレイ人数が3人以上でなければ入力をキャンセル + if (OpenTaiko.ConfigIni.nPlayerCount < 3) //プレイ人数が3人以上でなければ入力をキャンセル break; } else if (isPad4P) { nUsePlayer = 3; - if (TJAPlayer3.ConfigIni.nPlayerCount < 4) //プレイ人数が4人以上でなければ入力をキャンセル + if (OpenTaiko.ConfigIni.nPlayerCount < 4) //プレイ人数が4人以上でなければ入力をキャンセル break; } else if (isPad5P) { nUsePlayer = 4; - if (TJAPlayer3.ConfigIni.nPlayerCount < 5) //プレイ人数が5人以上でなければ入力をキャンセル + if (OpenTaiko.ConfigIni.nPlayerCount < 5) //プレイ人数が5人以上でなければ入力をキャンセル break; } - if (TJAPlayer3.stage演奏ドラム画面.isDeniedPlaying[nUsePlayer]) break; + if (OpenTaiko.stage演奏ドラム画面.isDeniedPlaying[nUsePlayer]) break; - if (!TJAPlayer3.ConfigIni.bTokkunMode && TJAPlayer3.ConfigIni.bAutoPlay[0] && isPad1P)//2020.05.18 Mr-Ojii オート時の入力キャンセル + if (!OpenTaiko.ConfigIni.bTokkunMode && OpenTaiko.ConfigIni.bAutoPlay[0] && isPad1P)//2020.05.18 Mr-Ojii オート時の入力キャンセル break; - else if ((TJAPlayer3.ConfigIni.bAutoPlay[1] || TJAPlayer3.ConfigIni.bAIBattleMode) && isPad2P) + else if ((OpenTaiko.ConfigIni.bAutoPlay[1] || OpenTaiko.ConfigIni.bAIBattleMode) && isPad2P) break; - else if (TJAPlayer3.ConfigIni.bAutoPlay[2] && isPad3P) + else if (OpenTaiko.ConfigIni.bAutoPlay[2] && isPad3P) break; - else if (TJAPlayer3.ConfigIni.bAutoPlay[3] && isPad4P) + else if (OpenTaiko.ConfigIni.bAutoPlay[3] && isPad4P) break; - else if (TJAPlayer3.ConfigIni.bAutoPlay[4] && isPad5P) + else if (OpenTaiko.ConfigIni.bAutoPlay[4] && isPad5P) break; //var padTo = nUsePlayer == 0 ? nPad - 12 : nPad - 12 - 4; var padTo = nPad - 12; @@ -1099,7 +1099,7 @@ namespace TJAPlayer3 { break; // Clap case (int)EPad.CLAP: - if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(0)] == EGameType.KONGA) { + if (OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(0)] == EGameType.KONGA) { nLane = (int)PlayerLane.FlashType.Clap; nHand = 0; nChannel = 0x14; @@ -1111,7 +1111,7 @@ namespace TJAPlayer3 { } break; case (int)EPad.CLAP2P: - if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA) { + if (OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(1)] == EGameType.KONGA) { nLane = (int)PlayerLane.FlashType.Clap; nHand = 0; nChannel = 0x14; @@ -1123,7 +1123,7 @@ namespace TJAPlayer3 { } break; case (int)EPad.CLAP3P: - if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA) { + if (OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(1)] == EGameType.KONGA) { nLane = (int)PlayerLane.FlashType.Clap; nHand = 0; nChannel = 0x14; @@ -1135,7 +1135,7 @@ namespace TJAPlayer3 { } break; case (int)EPad.CLAP4P: - if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA) { + if (OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(1)] == EGameType.KONGA) { nLane = (int)PlayerLane.FlashType.Clap; nHand = 0; nChannel = 0x14; @@ -1147,7 +1147,7 @@ namespace TJAPlayer3 { } break; case (int)EPad.CLAP5P: - if (TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(1)] == EGameType.KONGA) { + if (OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(1)] == EGameType.KONGA) { nLane = (int)PlayerLane.FlashType.Clap; nHand = 0; nChannel = 0x14; @@ -1164,13 +1164,13 @@ namespace TJAPlayer3 { break; } - TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nUsePlayer].Start((PlayerLane.FlashType)nLane); - TJAPlayer3.stage演奏ドラム画面.actMtaiko.tMtaikoEvent(nChannel, nHand, nUsePlayer); + OpenTaiko.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nUsePlayer].Start((PlayerLane.FlashType)nLane); + OpenTaiko.stage演奏ドラム画面.actMtaiko.tMtaikoEvent(nChannel, nHand, nUsePlayer); #endregion // Chip bools - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nUsePlayer)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(nUsePlayer)]; bool _isBigKaTaiko = NotesManager.IsBigKaTaiko(chipNoHit, _gt); bool _isBigDonTaiko = NotesManager.IsBigDonTaiko(chipNoHit, _gt); bool _isClapKonga = NotesManager.IsClapKonga(chipNoHit, _gt); @@ -1246,7 +1246,7 @@ namespace TJAPlayer3 { #endregion // Register to replay file - TJAPlayer3.ReplayInstances[nUsePlayer]?.tRegisterInput(nTime, (byte)_pad); + OpenTaiko.ReplayInstances[nUsePlayer]?.tRegisterInput(nTime, (byte)_pad); // Process small note if (e判定 != ENoteJudge.Miss && _isSmallNote) { @@ -1255,7 +1255,7 @@ namespace TJAPlayer3 { } // Process big notes (judge big notes off) - if (e判定 != ENoteJudge.Miss && _isBigNoteTaiko && !TJAPlayer3.ConfigIni.bJudgeBigNotes) { + if (e判定 != ENoteJudge.Miss && _isBigNoteTaiko && !OpenTaiko.ConfigIni.bJudgeBigNotes) { this.tドラムヒット処理(nTime, _pad, chipNoHit, true, nUsePlayer); bHitted = true; //this.nWaitButton = 0; @@ -1264,10 +1264,10 @@ namespace TJAPlayer3 { } // Process big notes (judge big notes on) - if (e判定 != ENoteJudge.Miss && ((_isBigNoteTaiko && TJAPlayer3.ConfigIni.bJudgeBigNotes) || _isPinkKonga)) { - double divided_songspeed = TJAPlayer3.ConfigIni.SongPlaybackSpeed; + if (e判定 != ENoteJudge.Miss && ((_isBigNoteTaiko && OpenTaiko.ConfigIni.bJudgeBigNotes) || _isPinkKonga)) { + double divided_songspeed = OpenTaiko.ConfigIni.SongPlaybackSpeed; float time = chipNoHit.n発声時刻ms - (float)(SoundManager.PlayTimer.NowTimeMs * divided_songspeed); - int nWaitTime = TJAPlayer3.ConfigIni.nBigNoteWaitTimems; + int nWaitTime = OpenTaiko.ConfigIni.nBigNoteWaitTimems; bool _timeB110 = time <= 110; @@ -1647,7 +1647,7 @@ namespace TJAPlayer3 { //----------------------------- int pad = nPad; // 以下、nPad の代わりに pad を用いる。（成りすまし用） // BAD or TIGHT 時の処理。 - if (TJAPlayer3.ConfigIni.bTight && !b連打中[nUsePlayer]) // 18/8/13 - 連打時にこれが発動すると困る!!! (AioiLight) + if (OpenTaiko.ConfigIni.bTight && !b連打中[nUsePlayer]) // 18/8/13 - 連打時にこれが発動すると困る!!! (AioiLight) this.tチップのヒット処理_BadならびにTight時のMiss(chipNoHit.nコース, EInstrumentPad.DRUMS, 0, EInstrumentPad.TAIKO); //----------------------------- #endregion @@ -1659,25 +1659,25 @@ namespace TJAPlayer3 { Rectangle bgrect = new Rectangle(0, 0, 1280, 720); string DefaultBgFilename = @$"Graphics{Path.DirectorySeparatorChar}5_Game{Path.DirectorySeparatorChar}5_Background{Path.DirectorySeparatorChar}0{Path.DirectorySeparatorChar}Background.png"; string BgFilename = ""; - if (!String.IsNullOrEmpty(TJAPlayer3.DTX.strBGIMAGE_PATH)) - BgFilename = TJAPlayer3.DTX.strBGIMAGE_PATH; + if (!String.IsNullOrEmpty(OpenTaiko.DTX.strBGIMAGE_PATH)) + BgFilename = OpenTaiko.DTX.strBGIMAGE_PATH; base.t背景テクスチャの生成(DefaultBgFilename, bgrect, BgFilename); } protected override void t進行描画_チップ_Taiko(CConfigIni configIni, ref CDTX dTX, ref CDTX.CChip pChip, int nPlayer) { int nLane = (int)PlayerLane.FlashType.Red; - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(nPlayer)]; #region[ 作り直したもの ] if (pChip.b可視) { if (!pChip.bHit) { - long nPlayTime = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long nPlayTime = (long)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed); if ((!pChip.bHit) && (pChip.n発声時刻ms <= nPlayTime)) { - bool bAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay[nPlayer]; + bool bAutoPlay = OpenTaiko.ConfigIni.bAutoPlay[nPlayer]; switch (nPlayer) { case 1: - bAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; + bAutoPlay = OpenTaiko.ConfigIni.bAutoPlay[nPlayer] || OpenTaiko.ConfigIni.bAIBattleMode; break; } @@ -1691,8 +1691,8 @@ namespace TJAPlayer3 { if (pChip.nチャンネル番号 == 0x14 && _gt == EGameType.KONGA) nLane = (int)PlayerLane.FlashType.Clap; - TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start((PlayerLane.FlashType)nLane); - TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Hit); + OpenTaiko.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start((PlayerLane.FlashType)nLane); + OpenTaiko.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Hit); this.actMtaiko.tMtaikoEvent(pChip.nチャンネル番号, this.nHand[nPlayer], nPlayer); @@ -1774,12 +1774,12 @@ namespace TJAPlayer3 { #endregion #region[ HIDSUD & STEALTH ] - if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == EStealthMode.STEALTH || TJAPlayer3.stage演奏ドラム画面.bCustomDoron) { + if (OpenTaiko.ConfigIni.eSTEALTH[OpenTaiko.GetActualPlayer(nPlayer)] == EStealthMode.STEALTH || OpenTaiko.stage演奏ドラム画面.bCustomDoron) { pChip.bShow = false; } #endregion - long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed); long time = pChip.n発声時刻ms - __dbt; if (pChip.dbSCROLL_Y != 0.0) { @@ -1791,14 +1791,14 @@ namespace TJAPlayer3 { double _scrollSpeed = pChip.dbSCROLL_Y * (this.act譜面スクロール速度.db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0; float play_bpm_time = this.GetNowPBMTime(dTX, 0); - y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); + y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, OpenTaiko.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); } - if (bSplitLane[nPlayer] || TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayer))].effect.SplitLane) { + if (bSplitLane[nPlayer] || OpenTaiko.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(OpenTaiko.GetActualPlayer(nPlayer))].effect.SplitLane) { if (NotesManager.IsDonNote(pChip)) { - y -= TJAPlayer3.Skin.Game_Notes_Size[1] / 3; + y -= OpenTaiko.Skin.Game_Notes_Size[1] / 3; } else if (NotesManager.IsKaNote(pChip)) { - y += TJAPlayer3.Skin.Game_Notes_Size[1] / 3; + y += OpenTaiko.Skin.Game_Notes_Size[1] / 3; } } @@ -1806,36 +1806,36 @@ namespace TJAPlayer3 { this.actGame.st叩ききりまショー.b最初のチップが叩かれた = true; } - if (x > 0 - TJAPlayer3.Skin.Game_Notes_Size[0] && x < TJAPlayer3.Skin.Resolution[0]) { - if (TJAPlayer3.Tx.Notes[(int)_gt] != null) { + if (x > 0 - OpenTaiko.Skin.Game_Notes_Size[0] && x < OpenTaiko.Skin.Resolution[0]) { + if (OpenTaiko.Tx.Notes[(int)_gt] != null) { //int num9 = this.actCombo.n現在のコンボ数.Drums >= 50 ? this.ctチップ模様アニメ.Drums.n現在の値 * 130 : 0; int num9 = 0; - if (TJAPlayer3.Skin.Game_Notes_Anime && !TJAPlayer3.ConfigIni.SimpleMode) { + if (OpenTaiko.Skin.Game_Notes_Anime && !OpenTaiko.ConfigIni.SimpleMode) { if (this.actCombo.n現在のコンボ数[nPlayer] >= 300 && ctChipAnimeLag[nPlayer].IsEnded) { //num9 = ctChipAnime[nPlayer].n現在の値 != 0 ? 260 : 0; if ((int)ctChipAnime[nPlayer].CurrentValue == 1 || (int)ctChipAnime[nPlayer].CurrentValue == 3) { - num9 = TJAPlayer3.Skin.Game_Notes_Size[1] * 2; + num9 = OpenTaiko.Skin.Game_Notes_Size[1] * 2; } else { num9 = 0; } } else if (this.actCombo.n現在のコンボ数[nPlayer] >= 300 && !ctChipAnimeLag[nPlayer].IsEnded) { //num9 = base.n現在の音符の顔番号 != 0 ? base.n現在の音符の顔番号 * 130 : 0; if ((int)ctChipAnime[nPlayer].CurrentValue == 1 || (int)ctChipAnime[nPlayer].CurrentValue == 3) { - num9 = TJAPlayer3.Skin.Game_Notes_Size[1]; + num9 = OpenTaiko.Skin.Game_Notes_Size[1]; } else { num9 = 0; } } else if (this.actCombo.n現在のコンボ数[nPlayer] >= 150) { //num9 = base.n現在の音符の顔番号 != 0 ? base.n現在の音符の顔番号 * 130 : 0; if ((int)ctChipAnime[nPlayer].CurrentValue == 1 || (int)ctChipAnime[nPlayer].CurrentValue == 3) { - num9 = TJAPlayer3.Skin.Game_Notes_Size[1]; + num9 = OpenTaiko.Skin.Game_Notes_Size[1]; } else { num9 = 0; } } else if (this.actCombo.n現在のコンボ数[nPlayer] >= 50 && ctChipAnimeLag[nPlayer].IsEnded) { //num9 = base.n現在の音符の顔番号 != 0 ? base.n現在の音符の顔番号 * 130 : 0; if ((int)ctChipAnime[nPlayer].CurrentValue <= 1) { - num9 = TJAPlayer3.Skin.Game_Notes_Size[1]; + num9 = OpenTaiko.Skin.Game_Notes_Size[1]; } else { num9 = 0; } @@ -1852,20 +1852,20 @@ namespace TJAPlayer3 { int nSenotesX = 0; int nSenotesY = 0; - switch (TJAPlayer3.ConfigIni.nPlayerCount) { + switch (OpenTaiko.ConfigIni.nPlayerCount) { case 1: case 2: - nSenotesX = TJAPlayer3.Skin.nSENotesX[nPlayer]; - nSenotesY = TJAPlayer3.Skin.nSENotesY[nPlayer]; + nSenotesX = OpenTaiko.Skin.nSENotesX[nPlayer]; + nSenotesY = OpenTaiko.Skin.nSENotesY[nPlayer]; break; case 3: case 4: - nSenotesX = TJAPlayer3.Skin.nSENotes_4P[0]; - nSenotesY = TJAPlayer3.Skin.nSENotes_4P[1]; + nSenotesX = OpenTaiko.Skin.nSENotes_4P[0]; + nSenotesY = OpenTaiko.Skin.nSENotes_4P[1]; break; case 5: - nSenotesX = TJAPlayer3.Skin.nSENotes_5P[0]; - nSenotesY = TJAPlayer3.Skin.nSENotes_5P[1]; + nSenotesX = OpenTaiko.Skin.nSENotes_5P[0]; + nSenotesY = OpenTaiko.Skin.nSENotes_5P[1]; break; } @@ -1894,26 +1894,26 @@ namespace TJAPlayer3 { case 0x1A: case 0x1B: { - int moveX = (int)(fHand * TJAPlayer3.Skin.Game_Notes_Arm_Move[0]); - int moveY = (int)(fHand * TJAPlayer3.Skin.Game_Notes_Arm_Move[1]); - if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == EStealthMode.OFF && pChip.bShow) { - if (nPlayer != TJAPlayer3.ConfigIni.nPlayerCount - 1) { + int moveX = (int)(fHand * OpenTaiko.Skin.Game_Notes_Arm_Move[0]); + int moveY = (int)(fHand * OpenTaiko.Skin.Game_Notes_Arm_Move[1]); + if (OpenTaiko.ConfigIni.eSTEALTH[OpenTaiko.GetActualPlayer(nPlayer)] == EStealthMode.OFF && pChip.bShow) { + if (nPlayer != OpenTaiko.ConfigIni.nPlayerCount - 1) { //上から下 - TJAPlayer3.Tx.Notes_Arm?.t2D上下反転描画( - x + TJAPlayer3.Skin.Game_Notes_Arm_Offset_Left_X[0] + moveX, - y + TJAPlayer3.Skin.Game_Notes_Arm_Offset_Left_Y[0] + moveY); - TJAPlayer3.Tx.Notes_Arm?.t2D上下反転描画( - x + TJAPlayer3.Skin.Game_Notes_Arm_Offset_Right_X[0] - moveX, - y + TJAPlayer3.Skin.Game_Notes_Arm_Offset_Right_Y[0] - moveY); + OpenTaiko.Tx.Notes_Arm?.t2D上下反転描画( + x + OpenTaiko.Skin.Game_Notes_Arm_Offset_Left_X[0] + moveX, + y + OpenTaiko.Skin.Game_Notes_Arm_Offset_Left_Y[0] + moveY); + OpenTaiko.Tx.Notes_Arm?.t2D上下反転描画( + x + OpenTaiko.Skin.Game_Notes_Arm_Offset_Right_X[0] - moveX, + y + OpenTaiko.Skin.Game_Notes_Arm_Offset_Right_Y[0] - moveY); } if (nPlayer != 0) { //下から上 - TJAPlayer3.Tx.Notes_Arm?.t2D描画( - x + TJAPlayer3.Skin.Game_Notes_Arm_Offset_Left_X[1] + moveX, - y + TJAPlayer3.Skin.Game_Notes_Arm_Offset_Left_Y[1] + moveY); - TJAPlayer3.Tx.Notes_Arm?.t2D描画( - x + TJAPlayer3.Skin.Game_Notes_Arm_Offset_Right_X[1] - moveX, - y + TJAPlayer3.Skin.Game_Notes_Arm_Offset_Right_Y[1] - moveY); + OpenTaiko.Tx.Notes_Arm?.t2D描画( + x + OpenTaiko.Skin.Game_Notes_Arm_Offset_Left_X[1] + moveX, + y + OpenTaiko.Skin.Game_Notes_Arm_Offset_Left_Y[1] + moveY); + OpenTaiko.Tx.Notes_Arm?.t2D描画( + x + OpenTaiko.Skin.Game_Notes_Arm_Offset_Right_X[1] - moveX, + y + OpenTaiko.Skin.Game_Notes_Arm_Offset_Right_Y[1] - moveY); } NotesManager.DisplayNote(nPlayer, x, y, pChip, num9); NotesManager.DisplaySENotes(nPlayer, x + nSenotesX, y + nSenotesY, pChip); @@ -1942,22 +1942,22 @@ namespace TJAPlayer3 { protected override void t進行描画_チップ_Taiko連打(CConfigIni configIni, ref CDTX dTX, ref CDTX.CChip pChip, int nPlayer) { int nSenotesX = 0; int nSenotesY = 0; - long nowTime = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long nowTime = (long)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed); - switch (TJAPlayer3.ConfigIni.nPlayerCount) { + switch (OpenTaiko.ConfigIni.nPlayerCount) { case 1: case 2: - nSenotesX = TJAPlayer3.Skin.nSENotesX[nPlayer]; - nSenotesY = TJAPlayer3.Skin.nSENotesY[nPlayer]; + nSenotesX = OpenTaiko.Skin.nSENotesX[nPlayer]; + nSenotesY = OpenTaiko.Skin.nSENotesY[nPlayer]; break; case 3: case 4: - nSenotesX = TJAPlayer3.Skin.nSENotes_4P[0]; - nSenotesY = TJAPlayer3.Skin.nSENotes_4P[1]; + nSenotesX = OpenTaiko.Skin.nSENotes_4P[0]; + nSenotesY = OpenTaiko.Skin.nSENotes_4P[1]; break; case 5: - nSenotesX = TJAPlayer3.Skin.nSENotes_5P[0]; - nSenotesY = TJAPlayer3.Skin.nSENotes_5P[1]; + nSenotesX = OpenTaiko.Skin.nSENotes_5P[0]; + nSenotesY = OpenTaiko.Skin.nSENotes_5P[1]; break; } @@ -1966,7 +1966,7 @@ namespace TJAPlayer3 { int nノート末端座標_Y = pChip.nバーからのノーツ末端距離dot_Y; int n先頭発声位置 = 0; - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(nPlayer)]; // 2016.11.2 kairera0467 // 黄連打音符を赤くするやつの実装方法メモ @@ -1990,7 +1990,7 @@ namespace TJAPlayer3 { CDTX.CChip cChip = null; if (pChip.nノーツ移動開始時刻ms != 0) // n先頭発声位置 value is only used when this condition is met { - cChip = TJAPlayer3.stage演奏ドラム画面.r指定時刻に一番近い連打Chip_ヒット未済問わず不可視考慮(pChip.n発声時刻ms, 0x10 + pChip.n連打音符State, 0, nPlayer); + cChip = OpenTaiko.stage演奏ドラム画面.r指定時刻に一番近い連打Chip_ヒット未済問わず不可視考慮(pChip.n発声時刻ms, 0x10 + pChip.n連打音符State, 0, nPlayer); if (cChip != null) { n先頭発声位置 = cChip.n発声時刻ms; } @@ -2007,25 +2007,25 @@ namespace TJAPlayer3 { long __dbt = nowTime; long time = pChip.n発声時刻ms - __dbt; float play_bpm_time = this.GetNowPBMTime(dTX, 0); - y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); + y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, OpenTaiko.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); } - if (bSplitLane[nPlayer] || TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayer))].effect.SplitLane) { - if (TJAPlayer3.ConfigIni.nGameType[nPlayer] == EGameType.KONGA) { + if (bSplitLane[nPlayer] || OpenTaiko.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(OpenTaiko.GetActualPlayer(nPlayer))].effect.SplitLane) { + if (OpenTaiko.ConfigIni.nGameType[nPlayer] == EGameType.KONGA) { if (NotesManager.IsClapRoll(pChip)) { } else if (NotesManager.IsYellowRoll(pChip)) { - y += TJAPlayer3.Skin.Game_Notes_Size[1] / 2; - y末端 += TJAPlayer3.Skin.Game_Notes_Size[1] / 2; + y += OpenTaiko.Skin.Game_Notes_Size[1] / 2; + y末端 += OpenTaiko.Skin.Game_Notes_Size[1] / 2; } else if (NotesManager.IsRoll(pChip)) { - y -= TJAPlayer3.Skin.Game_Notes_Size[1] / 2; - y末端 -= TJAPlayer3.Skin.Game_Notes_Size[1] / 2; + y -= OpenTaiko.Skin.Game_Notes_Size[1] / 2; + y末端 -= OpenTaiko.Skin.Game_Notes_Size[1] / 2; } } } #region[ HIDSUD & STEALTH ] - if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == EStealthMode.STEALTH || TJAPlayer3.stage演奏ドラム画面.bCustomDoron) { + if (OpenTaiko.ConfigIni.eSTEALTH[OpenTaiko.GetActualPlayer(nPlayer)] == EStealthMode.STEALTH || OpenTaiko.stage演奏ドラム画面.bCustomDoron) { pChip.bShow = false; } @@ -2035,8 +2035,8 @@ namespace TJAPlayer3 { //x -= 10; //if(x末端 > 0 - TJAPlayer3.Skin.Game_Notes_Size[0] && x < TJAPlayer3.Skin.Resolution[0]) - if ((Math.Min(x, x末端) < TJAPlayer3.Skin.Resolution[0] && Math.Max(x, x末端) > 0 - TJAPlayer3.Skin.Game_Notes_Size[0])) { - if (TJAPlayer3.Tx.Notes[(int)_gt] != null) { + if ((Math.Min(x, x末端) < OpenTaiko.Skin.Resolution[0] && Math.Max(x, x末端) > 0 - OpenTaiko.Skin.Game_Notes_Size[0])) { + if (OpenTaiko.Tx.Notes[(int)_gt] != null) { //int num9 = this.actCombo.n現在のコンボ数.Drums >= 50 ? this.ctチップ模様アニメ.Drums.n現在の値 * 130 : 0; //int num9 = this.actCombo.n現在のコンボ数.Drums >= 50 ? base.n現在の音符の顔番号 * 130 : 0; int num9 = 0; @@ -2048,32 +2048,32 @@ namespace TJAPlayer3 { //{ // num9 = base.n現在の音符の顔番号 != 0 ? base.n現在の音符の顔番号 * 130 : 0; //} - if (TJAPlayer3.Skin.Game_Notes_Anime && !TJAPlayer3.ConfigIni.SimpleMode) { + if (OpenTaiko.Skin.Game_Notes_Anime && !OpenTaiko.ConfigIni.SimpleMode) { if (this.actCombo.n現在のコンボ数[nPlayer] >= 300 && ctChipAnimeLag[nPlayer].IsEnded) { //num9 = ctChipAnime[nPlayer].db現在の値 != 0 ? 260 : 0; if ((int)ctChipAnime[nPlayer].CurrentValue == 1 || (int)ctChipAnime[nPlayer].CurrentValue == 3) { - num9 = TJAPlayer3.Skin.Game_Notes_Size[1] * 2; + num9 = OpenTaiko.Skin.Game_Notes_Size[1] * 2; } else { num9 = 0; } } else if (this.actCombo.n現在のコンボ数[nPlayer] >= 300 && !ctChipAnimeLag[nPlayer].IsEnded) { //num9 = base.n現在の音符の顔番号 != 0 ? base.n現在の音符の顔番号 * 130 : 0; if ((int)ctChipAnime[nPlayer].CurrentValue == 1 || (int)ctChipAnime[nPlayer].CurrentValue == 3) { - num9 = TJAPlayer3.Skin.Game_Notes_Size[1]; + num9 = OpenTaiko.Skin.Game_Notes_Size[1]; } else { num9 = 0; } } else if (this.actCombo.n現在のコンボ数[nPlayer] >= 150) { //num9 = base.n現在の音符の顔番号 != 0 ? base.n現在の音符の顔番号 * 130 : 0; if ((int)ctChipAnime[nPlayer].CurrentValue == 1 || (int)ctChipAnime[nPlayer].CurrentValue == 3) { - num9 = TJAPlayer3.Skin.Game_Notes_Size[1]; + num9 = OpenTaiko.Skin.Game_Notes_Size[1]; } else { num9 = 0; } } else if (this.actCombo.n現在のコンボ数[nPlayer] >= 50 && ctChipAnimeLag[nPlayer].IsEnded) { //num9 = base.n現在の音符の顔番号 != 0 ? base.n現在の音符の顔番号 * 130 : 0; if ((int)ctChipAnime[nPlayer].CurrentValue <= 1) { - num9 = TJAPlayer3.Skin.Game_Notes_Size[1]; + num9 = OpenTaiko.Skin.Game_Notes_Size[1]; } else { num9 = 0; } @@ -2092,12 +2092,12 @@ namespace TJAPlayer3 { if (pChip.RollInputTime != null && pChip.RollInputTime.IsEnded) { pChip.RollInputTime.Stop(); pChip.RollInputTime.CurrentValue = 0; - pChip.RollDelay = new CCounter(0, 1, 1, TJAPlayer3.Timer); + pChip.RollDelay = new CCounter(0, 1, 1, OpenTaiko.Timer); } if (pChip.RollDelay != null && pChip.RollDelay.IsEnded && pChip.RollEffectLevel > 0) { pChip.RollEffectLevel--; - pChip.RollDelay = new CCounter(0, 1, 1, TJAPlayer3.Timer); + pChip.RollDelay = new CCounter(0, 1, 1, OpenTaiko.Timer); pChip.RollDelay.CurrentValue = 0; } @@ -2107,7 +2107,7 @@ namespace TJAPlayer3 { //float f末端ノーツのテクスチャ位置調整 = 65f; //136, 30 - var _size = TJAPlayer3.Skin.Game_SENote_Size; + var _size = OpenTaiko.Skin.Game_SENote_Size; int _60_cut = 60 * _size[0] / 136; int _58_cut = 58 * _size[0] / 136; int _78_cut = 78 * _size[0] / 136; @@ -2122,15 +2122,15 @@ namespace TJAPlayer3 { NotesManager.DisplayRoll(nPlayer, x, y, pChip, num9, normalColor, effectedColor, x末端, y末端); - if (TJAPlayer3.Tx.SENotes[(int)_gt] != null) { + if (OpenTaiko.Tx.SENotes[(int)_gt] != null) { int _shift = NotesManager.IsBigRoll(pChip) ? 26 : 0; if (!NotesManager.IsFuzeRoll(pChip)) { - TJAPlayer3.Tx.SENotes[(int)_gt].vcScaleRatio.X = x末端 - x - 44 - _shift; - TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x + 90 + _shift, y + nSenotesY, new Rectangle(_60_cut, 8 * _size[1], 1, _size[1])); - TJAPlayer3.Tx.SENotes[(int)_gt].vcScaleRatio.X = 1.0f; - TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x + 30 + _shift, y + nSenotesY, new Rectangle(0, 8 * _size[1], _60_cut, _size[1])); - TJAPlayer3.Tx.SENotes[(int)_gt].t2D描画(x - (_shift / 13), y + nSenotesY, new Rectangle(0, _size[1] * pChip.nSenote, _size[0], _size[1])); + OpenTaiko.Tx.SENotes[(int)_gt].vcScaleRatio.X = x末端 - x - 44 - _shift; + OpenTaiko.Tx.SENotes[(int)_gt].t2D描画(x + 90 + _shift, y + nSenotesY, new Rectangle(_60_cut, 8 * _size[1], 1, _size[1])); + OpenTaiko.Tx.SENotes[(int)_gt].vcScaleRatio.X = 1.0f; + OpenTaiko.Tx.SENotes[(int)_gt].t2D描画(x + 30 + _shift, y + nSenotesY, new Rectangle(0, 8 * _size[1], _60_cut, _size[1])); + OpenTaiko.Tx.SENotes[(int)_gt].t2D描画(x - (_shift / 13), y + nSenotesY, new Rectangle(0, _size[1] * pChip.nSenote, _size[0], _size[1])); } else { NotesManager.DisplaySENotes(nPlayer, x + nSenotesX, y + nSenotesY, pChip); } @@ -2146,7 +2146,7 @@ namespace TJAPlayer3 { else if (nowTime >= pChip.nノーツ終了時刻ms) x = (NoteOriginX[nPlayer] + pChip.nバーからのノーツ末端距離dot); - NotesManager.DisplayNote(nPlayer, x, y, pChip, num9, TJAPlayer3.Skin.Game_Notes_Size[0] * 2); + NotesManager.DisplayNote(nPlayer, x, y, pChip, num9, OpenTaiko.Skin.Game_Notes_Size[0] * 2); NotesManager.DisplaySENotes(nPlayer, x + nSenotesX, y + nSenotesY, pChip); /* @@ -2159,8 +2159,8 @@ namespace TJAPlayer3 { } if (NotesManager.IsRollEnd(pChip)) { //大きい連打か小さい連打かの区別方法を考えてなかったよちくしょう - if (TJAPlayer3.Tx.Notes[(int)_gt] != null) - TJAPlayer3.Tx.Notes[(int)_gt].vcScaleRatio.X = 1.0f; + if (OpenTaiko.Tx.Notes[(int)_gt] != null) + OpenTaiko.Tx.Notes[(int)_gt].vcScaleRatio.X = 1.0f; int n = 0; switch (pChip.n連打音符State) { case 5: @@ -2176,7 +2176,7 @@ namespace TJAPlayer3 { if (pChip.n連打音符State != 7 && pChip.n連打音符State != 9 && pChip.n連打音符State != 13) { //if( CDTXMania.ConfigIni.eSTEALTH != Eステルスモード.DORON ) // CDTXMania.Tx.Notes.t2D描画( CDTXMania.app.Device, x, y, new Rectangle( n, num9, 130, 130 ) );//大音符:1170 - TJAPlayer3.Tx.SENotes[(int)_gt]?.t2D描画(x + 56, y + nSenotesY, new Rectangle(_58_cut, 9 * _size[1], _78_cut, _size[1])); + OpenTaiko.Tx.SENotes[(int)_gt]?.t2D描画(x + 56, y + nSenotesY, new Rectangle(_58_cut, 9 * _size[1], _78_cut, _size[1])); } } @@ -2184,12 +2184,12 @@ namespace TJAPlayer3 { } if (pChip.n発声時刻ms < nowTime && pChip.nノーツ終了時刻ms > nowTime) { - var puchichara = TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayer))]; + var puchichara = OpenTaiko.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(OpenTaiko.GetActualPlayer(nPlayer))]; //時間内でかつ0x9Aじゃないならならヒット処理 if (!NotesManager.IsRollEnd(pChip) && - ((nPlayer != 1 ? TJAPlayer3.ConfigIni.bAutoPlay[nPlayer] : - (TJAPlayer3.ConfigIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode)) || + ((nPlayer != 1 ? OpenTaiko.ConfigIni.bAutoPlay[nPlayer] : + (OpenTaiko.ConfigIni.bAutoPlay[nPlayer] || OpenTaiko.ConfigIni.bAIBattleMode)) || puchichara.effect.Autoroll > 0)) this.tチップのヒット処理(pChip.n発声時刻ms, pChip, EInstrumentPad.TAIKO, false, 0, nPlayer, puchichara.effect.Autoroll > 0); } @@ -2215,22 +2215,22 @@ namespace TJAPlayer3 { if (pChip.dbSCROLL_Y != 0.0) { double _scrollSpeed = pChip.dbSCROLL_Y * (this.act譜面スクロール速度.db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0; - long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * OpenTaiko.ConfigIni.SongPlaybackSpeed); long time = pChip.n発声時刻ms - __dbt; float play_bpm_time = this.GetNowPBMTime(dTX, 0); - y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); + y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, OpenTaiko.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); //y += (int)(((pChip.n発声時刻ms - (CSound管理.rc演奏用タイマ.n現在時刻 * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))) * pChip.dbBPM * pChip.dbSCROLL_Y * (this.act譜面スクロール速度.db現在の譜面スクロール速度[nPlayer] + 1.5)) / 628.7); } - if ((pChip.b可視 && !pChip.bHideBarLine) && (TJAPlayer3.Tx.Bar != null)) { + if ((pChip.b可視 && !pChip.bHideBarLine) && (OpenTaiko.Tx.Bar != null)) { if (x >= 0 && x <= SampleFramework.GameWindowSize.Width) { if (pChip.bBranch) { //this.tx小節線_branch.t2D描画( CDTXMania.app.Device, x - 3, y, new Rectangle( 0, 0, 3, 130 ) ); - TJAPlayer3.Tx.Bar_Branch?.t2D描画(x + ((TJAPlayer3.Skin.Game_Notes_Size[0] - TJAPlayer3.Tx.Bar_Branch.szTextureSize.Width) / 2), y, new Rectangle(0, 0, TJAPlayer3.Tx.Bar_Branch.szTextureSize.Width, TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Bar_Branch?.t2D描画(x + ((OpenTaiko.Skin.Game_Notes_Size[0] - OpenTaiko.Tx.Bar_Branch.szTextureSize.Width) / 2), y, new Rectangle(0, 0, OpenTaiko.Tx.Bar_Branch.szTextureSize.Width, OpenTaiko.Skin.Game_Notes_Size[1])); } else { //this.tx小節線.t2D描画( CDTXMania.app.Device, x - 3, y, new Rectangle( 0, 0, 3, 130 ) ); - TJAPlayer3.Tx.Bar?.t2D描画(x + ((TJAPlayer3.Skin.Game_Notes_Size[0] - TJAPlayer3.Tx.Bar.szTextureSize.Width) / 2), y, new Rectangle(0, 0, TJAPlayer3.Tx.Bar.szTextureSize.Width, TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Bar?.t2D描画(x + ((OpenTaiko.Skin.Game_Notes_Size[0] - OpenTaiko.Tx.Bar.szTextureSize.Width) / 2), y, new Rectangle(0, 0, OpenTaiko.Tx.Bar.szTextureSize.Width, OpenTaiko.Skin.Game_Notes_Size[1])); } } } @@ -2245,10 +2245,10 @@ namespace TJAPlayer3 { this.actBalloon.tDrawKusudama(); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { var chkChip = this.chip現在処理中の連打チップ[i]; if (chkChip != null) { - long nowTime = (long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); + long nowTime = (long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); //int n = this.chip現在処理中の連打チップ[i].nチャンネル番号; if ((NotesManager.IsGenericBalloon(chkChip) || NotesManager.IsKusudama(chkChip)) && (this.b連打中[i] == true)) { //if (this.chip現在処理中の連打チップ.n発声時刻ms <= (int)CSound管理.rc演奏用タイマ.n現在時刻ms && this.chip現在処理中の連打チップ.nノーツ終了時刻ms >= (int)CSound管理.rc演奏用タイマ.n現在時刻ms) @@ -2276,19 +2276,19 @@ namespace TJAPlayer3 { #region [ Treat big notes hit with a single hand ] //常時イベントが発生しているメソッドのほうがいいんじゃないかという予想。 //CDTX.CChip chipNoHit = this.r指定時刻に一番近い未ヒットChip((int)CSound管理.rc演奏用タイマ.n現在時刻ms, 0); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - CDTX.CChip chipNoHit = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed), i); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + CDTX.CChip chipNoHit = r指定時刻に一番近い未ヒットChipを過去方向優先で検索する((long)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed), i); - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(i)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(i)]; bool _isBigKaTaiko = NotesManager.IsBigKaTaiko(chipNoHit, _gt); bool _isBigDonTaiko = NotesManager.IsBigDonTaiko(chipNoHit, _gt); bool _isSwapNote = NotesManager.IsSwapNote(chipNoHit, _gt); if (chipNoHit != null && (_isBigDonTaiko || _isBigKaTaiko)) { - float timeC = chipNoHit.n発声時刻ms - (float)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed); - int nWaitTime = TJAPlayer3.ConfigIni.nBigNoteWaitTimems; + float timeC = chipNoHit.n発声時刻ms - (float)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed); + int nWaitTime = OpenTaiko.ConfigIni.nBigNoteWaitTimems; if (chipNoHit.eNoteState == ENoteState.wait && timeC <= 110 - && chipNoHit.nProcessTime + nWaitTime <= (int)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) { + && chipNoHit.nProcessTime + nWaitTime <= (int)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed)) { if (!_isSwapNote) { this.tドラムヒット処理(chipNoHit.nProcessTime, EPad.RRed, chipNoHit, false, i); //this.nWaitButton = 0; @@ -2307,13 +2307,13 @@ namespace TJAPlayer3 { //string strNull = "Found"; - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F1)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.F1)) { if (!this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE == false) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); SoundManager.PlayTimer.Pause(); - TJAPlayer3.Timer.Pause(); - TJAPlayer3.DTX.t全チップの再生一時停止(); + OpenTaiko.Timer.Pause(); + OpenTaiko.DTX.t全チップの再生一時停止(); this.actAVI.tPauseControl(); this.bPAUSE = true; @@ -2327,25 +2327,25 @@ namespace TJAPlayer3 { private void t進行描画_リアルタイム判定数表示() { var showJudgeInfo = false; - if (TJAPlayer3.ConfigIni.nPlayerCount == 1 ? (TJAPlayer3.ConfigIni.bJudgeCountDisplay && !TJAPlayer3.ConfigIni.bAutoPlay[0]) : false) showJudgeInfo = true; - if (TJAPlayer3.ConfigIni.bTokkunMode) showJudgeInfo = true; + if (OpenTaiko.ConfigIni.nPlayerCount == 1 ? (OpenTaiko.ConfigIni.bJudgeCountDisplay && !OpenTaiko.ConfigIni.bAutoPlay[0]) : false) showJudgeInfo = true; + if (OpenTaiko.ConfigIni.bTokkunMode) showJudgeInfo = true; if (showJudgeInfo) { //ボードの横幅は333px //数字フォントの小さいほうはリザルトのものと同じ。 - if (TJAPlayer3.Tx.Judge_Meter != null) - TJAPlayer3.Tx.Judge_Meter.t2D描画(TJAPlayer3.Skin.Game_Judge_Meter[0], TJAPlayer3.Skin.Game_Judge_Meter[1]); + if (OpenTaiko.Tx.Judge_Meter != null) + OpenTaiko.Tx.Judge_Meter.t2D描画(OpenTaiko.Skin.Game_Judge_Meter[0], OpenTaiko.Skin.Game_Judge_Meter[1]); - this.t小文字表示(TJAPlayer3.Skin.Game_Judge_Meter_Perfect[0], TJAPlayer3.Skin.Game_Judge_Meter_Perfect[1], this.nヒット数_Auto含まない.Drums.Perfect, false, false); - this.t小文字表示(TJAPlayer3.Skin.Game_Judge_Meter_Good[0], TJAPlayer3.Skin.Game_Judge_Meter_Good[1], this.nヒット数_Auto含まない.Drums.Great, false, false); - this.t小文字表示(TJAPlayer3.Skin.Game_Judge_Meter_Miss[0], TJAPlayer3.Skin.Game_Judge_Meter_Miss[1], this.nヒット数_Auto含まない.Drums.Miss, false, false); - this.t小文字表示(TJAPlayer3.Skin.Game_Judge_Meter_Roll[0], TJAPlayer3.Skin.Game_Judge_Meter_Roll[1], GetRoll(0), false, false); + this.t小文字表示(OpenTaiko.Skin.Game_Judge_Meter_Perfect[0], OpenTaiko.Skin.Game_Judge_Meter_Perfect[1], this.nヒット数_Auto含まない.Drums.Perfect, false, false); + this.t小文字表示(OpenTaiko.Skin.Game_Judge_Meter_Good[0], OpenTaiko.Skin.Game_Judge_Meter_Good[1], this.nヒット数_Auto含まない.Drums.Great, false, false); + this.t小文字表示(OpenTaiko.Skin.Game_Judge_Meter_Miss[0], OpenTaiko.Skin.Game_Judge_Meter_Miss[1], this.nヒット数_Auto含まない.Drums.Miss, false, false); + this.t小文字表示(OpenTaiko.Skin.Game_Judge_Meter_Roll[0], OpenTaiko.Skin.Game_Judge_Meter_Roll[1], GetRoll(0), false, false); int nNowTotal = this.nヒット数_Auto含まない.Drums.Perfect + this.nヒット数_Auto含まない.Drums.Great + this.nヒット数_Auto含まない.Drums.Miss; - double dbたたけた率 = Math.Round((100.0 * (TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great)) / (double)nNowTotal); - double dbPERFECT率 = Math.Round((100.0 * TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect) / (double)nNowTotal); - double dbGREAT率 = Math.Round((100.0 * TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great / (double)nNowTotal)); - double dbMISS率 = Math.Round((100.0 * TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Miss / (double)nNowTotal)); + double dbたたけた率 = Math.Round((100.0 * (OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect + OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great)) / (double)nNowTotal); + double dbPERFECT率 = Math.Round((100.0 * OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect) / (double)nNowTotal); + double dbGREAT率 = Math.Round((100.0 * OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great / (double)nNowTotal)); + double dbMISS率 = Math.Round((100.0 * OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Miss / (double)nNowTotal)); if (double.IsNaN(dbたたけた率)) dbたたけた率 = 0; @@ -2356,31 +2356,31 @@ namespace TJAPlayer3 { if (double.IsNaN(dbMISS率)) dbMISS率 = 0; - this.t大文字表示(TJAPlayer3.Skin.Game_Judge_Meter_HitRate[0], TJAPlayer3.Skin.Game_Judge_Meter_HitRate[1], (int)dbたたけた率); - this.t小文字表示(TJAPlayer3.Skin.Game_Judge_Meter_PerfectRate[0], TJAPlayer3.Skin.Game_Judge_Meter_PerfectRate[1], (int)dbPERFECT率, false, true); - this.t小文字表示(TJAPlayer3.Skin.Game_Judge_Meter_GoodRate[0], TJAPlayer3.Skin.Game_Judge_Meter_GoodRate[1], (int)dbGREAT率, false, true); - this.t小文字表示(TJAPlayer3.Skin.Game_Judge_Meter_MissRate[0], TJAPlayer3.Skin.Game_Judge_Meter_MissRate[1], (int)dbMISS率, false, true); + this.t大文字表示(OpenTaiko.Skin.Game_Judge_Meter_HitRate[0], OpenTaiko.Skin.Game_Judge_Meter_HitRate[1], (int)dbたたけた率); + this.t小文字表示(OpenTaiko.Skin.Game_Judge_Meter_PerfectRate[0], OpenTaiko.Skin.Game_Judge_Meter_PerfectRate[1], (int)dbPERFECT率, false, true); + this.t小文字表示(OpenTaiko.Skin.Game_Judge_Meter_GoodRate[0], OpenTaiko.Skin.Game_Judge_Meter_GoodRate[1], (int)dbGREAT率, false, true); + this.t小文字表示(OpenTaiko.Skin.Game_Judge_Meter_MissRate[0], OpenTaiko.Skin.Game_Judge_Meter_MissRate[1], (int)dbMISS率, false, true); } } private void t小文字表示(int x, int y, int num, bool bOrange, bool drawPercent) { - float width = TJAPlayer3.Tx.Result_Number.sz画像サイズ.Width / 11.0f; - float height = TJAPlayer3.Tx.Result_Number.sz画像サイズ.Height / 2.0f; + float width = OpenTaiko.Tx.Result_Number.sz画像サイズ.Width / 11.0f; + float height = OpenTaiko.Tx.Result_Number.sz画像サイズ.Height / 2.0f; int[] nums = CConversion.SeparateDigits(num); if (drawPercent) { - TJAPlayer3.Tx.Result_Number.t2D拡大率考慮中央基準描画(x + (TJAPlayer3.Skin.Result_Number_Interval[0] * 3.0f) + (width / 2), - y + (TJAPlayer3.Skin.Result_Number_Interval[1] * 3.0f) + (height / 2), + OpenTaiko.Tx.Result_Number.t2D拡大率考慮中央基準描画(x + (OpenTaiko.Skin.Result_Number_Interval[0] * 3.0f) + (width / 2), + y + (OpenTaiko.Skin.Result_Number_Interval[1] * 3.0f) + (height / 2), new System.Drawing.RectangleF(width * 10, 0, width, height)); } for (int j = 0; j < nums.Length; j++) { float offset = j - 1.5f; - float _x = x - (TJAPlayer3.Skin.Result_Number_Interval[0] * offset); - float _y = y - (TJAPlayer3.Skin.Result_Number_Interval[1] * offset); + float _x = x - (OpenTaiko.Skin.Result_Number_Interval[0] * offset); + float _y = y - (OpenTaiko.Skin.Result_Number_Interval[1] * offset); - TJAPlayer3.Tx.Result_Number.t2D拡大率考慮中央基準描画(_x + (width / 2), _y + (height / 2), + OpenTaiko.Tx.Result_Number.t2D拡大率考慮中央基準描画(_x + (width / 2), _y + (height / 2), new System.Drawing.RectangleF(width * nums[j], 0, width, height)); } } @@ -2389,13 +2389,13 @@ namespace TJAPlayer3 { int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j - 1.5f; - float _x = x - ((TJAPlayer3.Skin.Result_Number_Interval[0] * 1.27f) * offset); - float _y = y - ((TJAPlayer3.Skin.Result_Number_Interval[1] * 1.27f) * offset); + float _x = x - ((OpenTaiko.Skin.Result_Number_Interval[0] * 1.27f) * offset); + float _y = y - ((OpenTaiko.Skin.Result_Number_Interval[1] * 1.27f) * offset); - float width = TJAPlayer3.Tx.Result_Number.sz画像サイズ.Width / 11.0f; - float height = TJAPlayer3.Tx.Result_Number.sz画像サイズ.Height / 2.0f; + float width = OpenTaiko.Tx.Result_Number.sz画像サイズ.Width / 11.0f; + float height = OpenTaiko.Tx.Result_Number.sz画像サイズ.Height / 2.0f; - TJAPlayer3.Tx.Result_Number.t2D拡大率考慮中央基準描画(_x + (width / 2), _y + (height / 2), + OpenTaiko.Tx.Result_Number.t2D拡大率考慮中央基準描画(_x + (width / 2), _y + (height / 2), new System.Drawing.RectangleF(width * nums[j], height, width, height)); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/Dan_Cert.cs b/OpenTaiko/src/Stages/07.Game/Taiko/Dan_Cert.cs index 2580690a..f68edf8e 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/Dan_Cert.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/Dan_Cert.cs @@ -1,11 +1,11 @@ using System.Runtime.InteropServices; using FDK; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; using Color = System.Drawing.Color; using Rectangle = System.Drawing.Rectangle; using RectangleF = System.Drawing.RectangleF; -namespace TJAPlayer3 { +namespace OpenTaiko { static internal class CExamInfo { // Includes the gauge exam, DanCert max number of exams is 6 public static readonly int cMaxExam = 7; @@ -30,9 +30,9 @@ namespace TJAPlayer3 { public void Start(int number) { NowShowingNumber = number; if (number == 0) { - Counter_Wait = new CCounter(0, 2299, 1, TJAPlayer3.Timer); + Counter_Wait = new CCounter(0, 2299, 1, OpenTaiko.Timer); } else { - Counter_In = new CCounter(0, 999, 1, TJAPlayer3.Timer); + Counter_In = new CCounter(0, 999, 1, OpenTaiko.Timer); } bExamChangeCheck = false; @@ -41,15 +41,15 @@ namespace TJAPlayer3 { ExamChange[i] = false; for (int j = 0; j < CExamInfo.cMaxExam; j++) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[0].Dan_C[j] != null) { - Challenge[j] = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j]; - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count - 1].Dan_C[j] != null - && TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count > 1) // Individual exams, not counted if dan is only a single song + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[0].Dan_C[j] != null) { + Challenge[j] = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j]; + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count - 1].Dan_C[j] != null + && OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count > 1) // Individual exams, not counted if dan is only a single song { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].GetExamRange() == Exam.Range.Less) { - TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Amount = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Value[0]; + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].GetExamRange() == Exam.Range.Less) { + OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Amount = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Value[0]; } else { - TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Amount = 0; + OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j].Amount = 0; } ExamChange[j] = true; @@ -58,18 +58,18 @@ namespace TJAPlayer3 { } } - ScreenPoint = new double[] { TJAPlayer3.Skin.Game_Lane_X[0] - TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Skin.Resolution[0] }; + ScreenPoint = new double[] { OpenTaiko.Skin.Game_Lane_X[0] - OpenTaiko.Tx.DanC_Screen.szTextureSize.Width / 2, OpenTaiko.Skin.Resolution[0] }; - TJAPlayer3.stage演奏ドラム画面.ReSetScore(TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].ScoreInit, TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].ScoreDiff); + OpenTaiko.stage演奏ドラム画面.ReSetScore(OpenTaiko.DTX.List_DanSongs[NowShowingNumber].ScoreInit, OpenTaiko.DTX.List_DanSongs[NowShowingNumber].ScoreDiff); - TJAPlayer3.stage演奏ドラム画面.ftDanReSetScoreNiji(TJAPlayer3.DTX.nDan_NotesCount[NowShowingNumber], TJAPlayer3.DTX.nDan_BalloonCount[NowShowingNumber]); - TJAPlayer3.stage演奏ドラム画面.ftDanReSetBranches(TJAPlayer3.DTX.bHasBranchDan[NowShowingNumber]); + OpenTaiko.stage演奏ドラム画面.ftDanReSetScoreNiji(OpenTaiko.DTX.nDan_NotesCount[NowShowingNumber], OpenTaiko.DTX.nDan_BalloonCount[NowShowingNumber]); + OpenTaiko.stage演奏ドラム画面.ftDanReSetBranches(OpenTaiko.DTX.bHasBranchDan[NowShowingNumber]); IsAnimating = true; //段位道場 //TJAPlayer3.stage演奏ドラム画面.actPanel.SetPanelString(TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].Title, TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].Genre, 1 + NowShowingNumber + "曲目"); - TJAPlayer3.stage演奏ドラム画面.actPanel.SetPanelString(TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].Title, + OpenTaiko.stage演奏ドラム画面.actPanel.SetPanelString(OpenTaiko.DTX.List_DanSongs[NowShowingNumber].Title, CLangManager.LangInstance.GetString("TITLE_MODE_DAN"), 1 + NowShowingNumber + "曲目"); @@ -79,27 +79,27 @@ namespace TJAPlayer3 { public override void Activate() { for (int i = 0; i < CExamInfo.cMaxExam; i++) { - if (TJAPlayer3.DTX.Dan_C[i] != null) Challenge[i] = new Dan_C(TJAPlayer3.DTX.Dan_C[i]); + if (OpenTaiko.DTX.Dan_C[i] != null) Challenge[i] = new Dan_C(OpenTaiko.DTX.Dan_C[i]); - for (int j = 0; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; j++) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] != null) { - TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] = new Dan_C(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i]); + for (int j = 0; j < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; j++) { + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] != null) { + OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] = new Dan_C(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i]); } } } - if (TJAPlayer3.stage演奏ドラム画面.ListDan_Number >= 1 && FirstSectionAnime) - TJAPlayer3.stage演奏ドラム画面.ListDan_Number = 0; + if (OpenTaiko.stage演奏ドラム画面.ListDan_Number >= 1 && FirstSectionAnime) + OpenTaiko.stage演奏ドラム画面.ListDan_Number = 0; FirstSectionAnime = false; // 始点を決定する。 // ExamCount = 0; - songsnotesremain = new int[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; - this.ct虹アニメ = new CCounter(0, TJAPlayer3.Skin.Game_Gauge_Dan_Rainbow_Ptn - 1, 30, TJAPlayer3.Timer); - this.ct虹透明度 = new CCounter(0, TJAPlayer3.Skin.Game_Gauge_Rainbow_Timer - 1, 1, TJAPlayer3.Timer); + songsnotesremain = new int[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; + this.ct虹アニメ = new CCounter(0, OpenTaiko.Skin.Game_Gauge_Dan_Rainbow_Ptn - 1, 30, OpenTaiko.Timer); + this.ct虹透明度 = new CCounter(0, OpenTaiko.Skin.Game_Gauge_Rainbow_Timer - 1, 1, OpenTaiko.Timer); - this.pfExamFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Game_DanC_ExamFont_Size); + this.pfExamFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Game_DanC_ExamFont_Size); this.ttkExams = new TitleTextureKey[(int)Exam.Type.Total]; for (int i = 0; i < this.ttkExams.Length; i++) { @@ -116,11 +116,11 @@ namespace TJAPlayer3 { Status[i].Timer_Failed = new CCounter(); } - IsEnded = new bool[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; + IsEnded = new bool[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) IsAnimating = true; + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) IsAnimating = true; - Dan_Plate = TJAPlayer3.tテクスチャの生成(Path.GetDirectoryName(TJAPlayer3.DTX.strファイル名の絶対パス) + @$"{Path.DirectorySeparatorChar}Dan_Plate.png"); + Dan_Plate = OpenTaiko.tテクスチャの生成(Path.GetDirectoryName(OpenTaiko.DTX.strファイル名の絶対パス) + @$"{Path.DirectorySeparatorChar}Dan_Plate.png"); base.Activate(); } @@ -128,33 +128,33 @@ namespace TJAPlayer3 { public void Update() { for (int i = 0; i < CExamInfo.cMaxExam; i++) { if (Challenge[i] == null || !Challenge[i].GetEnable()) continue; - if (ExamChange[i] && Challenge[i] != TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[i]) continue; + if (ExamChange[i] && Challenge[i] != OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[i]) continue; var oldReached = Challenge[i].GetReached(); var isChangedAmount = false; - int totalGoods = (int)TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含む.Drums.Perfect + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect; - int totalOks = (int)TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含む.Drums.Great + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great; - int totalBads = (int)TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Miss; - int totalCombo = (int)TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0]; + int totalGoods = (int)OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含む.Drums.Perfect + OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect; + int totalOks = (int)OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含む.Drums.Great + OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great; + int totalBads = (int)OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Miss; + int totalCombo = (int)OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0]; - int individualGoods = TJAPlayer3.stage演奏ドラム画面.n良[NowShowingNumber]; - int individualOks = TJAPlayer3.stage演奏ドラム画面.n可[NowShowingNumber]; - int individualBads = TJAPlayer3.stage演奏ドラム画面.n不可[NowShowingNumber]; - int individualCombo = TJAPlayer3.stage演奏ドラム画面.nHighestCombo[NowShowingNumber]; + int individualGoods = OpenTaiko.stage演奏ドラム画面.n良[NowShowingNumber]; + int individualOks = OpenTaiko.stage演奏ドラム画面.n可[NowShowingNumber]; + int individualBads = OpenTaiko.stage演奏ドラム画面.n不可[NowShowingNumber]; + int individualCombo = OpenTaiko.stage演奏ドラム画面.nHighestCombo[NowShowingNumber]; - int totalADLIBs = TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nADLIB; - int totalMines = TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMine; + int totalADLIBs = OpenTaiko.stage演奏ドラム画面.CChartScore[0].nADLIB; + int totalMines = OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMine; - int individualADLIBs = TJAPlayer3.stage演奏ドラム画面.nADLIB[NowShowingNumber]; - int individualMines = TJAPlayer3.stage演奏ドラム画面.nMine[NowShowingNumber]; + int individualADLIBs = OpenTaiko.stage演奏ドラム画面.nADLIB[NowShowingNumber]; + int individualMines = OpenTaiko.stage演奏ドラム画面.nMine[NowShowingNumber]; double accuracy = (totalGoods * 100 + totalOks * 50) / (double)(totalGoods + totalOks + totalBads); double individualAccuracy = (individualGoods * 100 + individualOks * 50) / (double)(individualGoods + individualOks + individualBads); switch (Challenge[i].GetExamType()) { case Exam.Type.Gauge: - isChangedAmount = Challenge[i].Update((int)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[0]); + isChangedAmount = Challenge[i].Update((int)OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値[0]); break; case Exam.Type.JudgePerfect: isChangedAmount = Challenge[i].Update(ExamChange[i] ? individualGoods : totalGoods); @@ -172,13 +172,13 @@ namespace TJAPlayer3 { isChangedAmount = Challenge[i].Update(ExamChange[i] ? individualMines : totalMines); break; case Exam.Type.Score: - isChangedAmount = Challenge[i].Update((int)TJAPlayer3.stage演奏ドラム画面.actScore.GetScore(0)); + isChangedAmount = Challenge[i].Update((int)OpenTaiko.stage演奏ドラム画面.actScore.GetScore(0)); break; case Exam.Type.Roll: - isChangedAmount = Challenge[i].Update(ExamChange[i] ? TJAPlayer3.stage演奏ドラム画面.n連打[NowShowingNumber] : (int)(TJAPlayer3.stage演奏ドラム画面.GetRoll(0))); + isChangedAmount = Challenge[i].Update(ExamChange[i] ? OpenTaiko.stage演奏ドラム画面.n連打[NowShowingNumber] : (int)(OpenTaiko.stage演奏ドラム画面.GetRoll(0))); break; case Exam.Type.Hit: - isChangedAmount = Challenge[i].Update(ExamChange[i] ? TJAPlayer3.stage演奏ドラム画面.n良[NowShowingNumber] + TJAPlayer3.stage演奏ドラム画面.n可[NowShowingNumber] + TJAPlayer3.stage演奏ドラム画面.n連打[NowShowingNumber] : (int)(TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含む.Drums.Perfect + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含む.Drums.Great + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great + TJAPlayer3.stage演奏ドラム画面.GetRoll(0))); + isChangedAmount = Challenge[i].Update(ExamChange[i] ? OpenTaiko.stage演奏ドラム画面.n良[NowShowingNumber] + OpenTaiko.stage演奏ドラム画面.n可[NowShowingNumber] + OpenTaiko.stage演奏ドラム画面.n連打[NowShowingNumber] : (int)(OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含む.Drums.Perfect + OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Perfect + OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含む.Drums.Great + OpenTaiko.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Great + OpenTaiko.stage演奏ドラム画面.GetRoll(0))); break; case Exam.Type.Combo: isChangedAmount = Challenge[i].Update(ExamChange[i] ? individualCombo : totalCombo); @@ -193,10 +193,10 @@ namespace TJAPlayer3 { // 値が変更されていたらアニメーションを行う。 if (isChangedAmount) { if (Status[i].Timer_Amount != null && Status[i].Timer_Amount.IsUnEnded) { - Status[i].Timer_Amount = new CCounter(0, 11, 12, TJAPlayer3.Timer); + Status[i].Timer_Amount = new CCounter(0, 11, 12, OpenTaiko.Timer); Status[i].Timer_Amount.CurrentValue = 1; } else { - Status[i].Timer_Amount = new CCounter(0, 11, 12, TJAPlayer3.Timer); + Status[i].Timer_Amount = new CCounter(0, 11, 12, OpenTaiko.Timer); } } @@ -204,10 +204,10 @@ namespace TJAPlayer3 { if (Challenge[i].GetExamRange() == Exam.Range.Less) { Challenge[i].SetReached(!Challenge[i].IsCleared[0]); } else { - songsnotesremain[NowShowingNumber] = TJAPlayer3.DTX.nDan_NotesCount[NowShowingNumber] - - (TJAPlayer3.stage演奏ドラム画面.n良[NowShowingNumber] - + TJAPlayer3.stage演奏ドラム画面.n可[NowShowingNumber] - + TJAPlayer3.stage演奏ドラム画面.n不可[NowShowingNumber]); + songsnotesremain[NowShowingNumber] = OpenTaiko.DTX.nDan_NotesCount[NowShowingNumber] + - (OpenTaiko.stage演奏ドラム画面.n良[NowShowingNumber] + + OpenTaiko.stage演奏ドラム画面.n可[NowShowingNumber] + + OpenTaiko.stage演奏ドラム画面.n不可[NowShowingNumber]); /* notesremain = TJAPlayer3.DTX.nノーツ数[3] @@ -219,10 +219,10 @@ namespace TJAPlayer3 { + TJAPlayer3.stage演奏ドラム画面.nヒット数_Auto含まない.Drums.Miss); */ - notesremain = TJAPlayer3.DTX.nノーツ数[3] - - (TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGood - + TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGreat - + TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMiss); + notesremain = OpenTaiko.DTX.nノーツ数[3] + - (OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGood + + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGreat + + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMiss); // 残り音符数が0になったときに判断されるやつ @@ -252,8 +252,8 @@ namespace TJAPlayer3 { : notesremain < (Challenge[i].Value[0] - Challenge[i].Amount)) Challenge[i].SetReached(true); break; case Exam.Type.Combo: - if (notesremain + TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.P1 < ((Challenge[i].Value[0])) - && TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0] < (Challenge[i].Value[0])) Challenge[i].SetReached(true); + if (notesremain + OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.P1 < ((Challenge[i].Value[0])) + && OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0] < (Challenge[i].Value[0])) Challenge[i].SetReached(true); break; default: break; @@ -264,10 +264,10 @@ namespace TJAPlayer3 { // Check challenge fails at the end of each songs - if (TJAPlayer3.DTX.listChip.Count > 0) { + if (OpenTaiko.DTX.listChip.Count > 0) { if (ExamChange[i] - ? TJAPlayer3.DTX.pDan_LastChip[NowShowingNumber].n発声時刻ms <= SoundManager.PlayTimer.NowTime//TJAPlayer3.Timer.n現在時刻 - : TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms <= SoundManager.PlayTimer.NowTime)//TJAPlayer3.Timer.n現在時刻) + ? OpenTaiko.DTX.pDan_LastChip[NowShowingNumber].n発声時刻ms <= SoundManager.PlayTimer.NowTime//TJAPlayer3.Timer.n現在時刻 + : OpenTaiko.DTX.listChip[OpenTaiko.DTX.listChip.Count - 1].n発声時刻ms <= SoundManager.PlayTimer.NowTime)//TJAPlayer3.Timer.n現在時刻) { switch (Challenge[i].GetExamType()) { case Exam.Type.Score: @@ -317,7 +317,7 @@ namespace TJAPlayer3 { for (int i = 0; i < IsEnded.Length; i++) IsEnded[i] = false; - TJAPlayer3.tDisposeSafely(ref this.pfExamFont); + OpenTaiko.tDisposeSafely(ref this.pfExamFont); Dan_Plate?.Dispose(); @@ -325,9 +325,9 @@ namespace TJAPlayer3 { } public override void CreateManagedResource() { - Sound_Section = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Section.ogg"), ESoundGroup.SoundEffect); - Sound_Section_First = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Section_First.wav"), ESoundGroup.SoundEffect); - Sound_Failed = TJAPlayer3.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Failed.ogg"), ESoundGroup.SoundEffect); + Sound_Section = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Section.ogg"), ESoundGroup.SoundEffect); + Sound_Section_First = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Section_First.wav"), ESoundGroup.SoundEffect); + Sound_Failed = OpenTaiko.SoundManager.tCreateSound(CSkin.Path(@$"Sounds{Path.DirectorySeparatorChar}Dan{Path.DirectorySeparatorChar}Failed.ogg"), ESoundGroup.SoundEffect); base.CreateManagedResource(); } @@ -339,7 +339,7 @@ namespace TJAPlayer3 { } public override int Draw() { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) return base.Draw(); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan) return base.Draw(); Counter_In?.Tick(); Counter_Wait?.Tick(); Counter_Out?.Tick(); @@ -349,20 +349,20 @@ namespace TJAPlayer3 { if (Counter_Text.CurrentValue >= 2000) { for (int i = Counter_Text_Old; i < Counter_Text.CurrentValue; i++) { if (i % 2 == 0) { - if (TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].TitleTex != null) { - TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].TitleTex.Opacity--; + if (OpenTaiko.DTX.List_DanSongs[NowShowingNumber].TitleTex != null) { + OpenTaiko.DTX.List_DanSongs[NowShowingNumber].TitleTex.Opacity--; } - if (TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].SubTitleTex != null) { - TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].SubTitleTex.Opacity--; + if (OpenTaiko.DTX.List_DanSongs[NowShowingNumber].SubTitleTex != null) { + OpenTaiko.DTX.List_DanSongs[NowShowingNumber].SubTitleTex.Opacity--; } } } } else { - if (TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].TitleTex != null) { - TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].TitleTex.Opacity = 255; + if (OpenTaiko.DTX.List_DanSongs[NowShowingNumber].TitleTex != null) { + OpenTaiko.DTX.List_DanSongs[NowShowingNumber].TitleTex.Opacity = 255; } - if (TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].SubTitleTex != null) { - TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].SubTitleTex.Opacity = 255; + if (OpenTaiko.DTX.List_DanSongs[NowShowingNumber].SubTitleTex != null) { + OpenTaiko.DTX.List_DanSongs[NowShowingNumber].SubTitleTex.Opacity = 255; } } Counter_Text_Old = Counter_Text.CurrentValue; @@ -374,7 +374,7 @@ namespace TJAPlayer3 { // 背景を描画する。 - TJAPlayer3.Tx.DanC_Background?.t2D描画(0, 0); + OpenTaiko.Tx.DanC_Background?.t2D描画(0, 0); DrawExam(Challenge); @@ -382,23 +382,23 @@ namespace TJAPlayer3 { if (Counter_In != null) { if (Counter_In.IsUnEnded) { for (int i = Counter_In_Old; i < Counter_In.CurrentValue; i++) { - ScreenPoint[0] += (TJAPlayer3.Skin.Game_Lane_X[0] - ScreenPoint[0]) / 180.0; - ScreenPoint[1] += ((TJAPlayer3.Skin.Resolution[0] / 2 + TJAPlayer3.Skin.Game_Lane_X[0] / 2) - ScreenPoint[1]) / 180.0; + ScreenPoint[0] += (OpenTaiko.Skin.Game_Lane_X[0] - ScreenPoint[0]) / 180.0; + ScreenPoint[1] += ((OpenTaiko.Skin.Resolution[0] / 2 + OpenTaiko.Skin.Game_Lane_X[0] / 2) - ScreenPoint[1]) / 180.0; } Counter_In_Old = Counter_In.CurrentValue; - TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[0], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(0, 0, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Height)); - TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[1], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, 0, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Height)); + OpenTaiko.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[0], OpenTaiko.Skin.Game_Lane_Y[0], new Rectangle(0, 0, OpenTaiko.Tx.DanC_Screen.szTextureSize.Width / 2, OpenTaiko.Tx.DanC_Screen.szTextureSize.Height)); + OpenTaiko.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[1], OpenTaiko.Skin.Game_Lane_Y[0], new Rectangle(OpenTaiko.Tx.DanC_Screen.szTextureSize.Width / 2, 0, OpenTaiko.Tx.DanC_Screen.szTextureSize.Width / 2, OpenTaiko.Tx.DanC_Screen.szTextureSize.Height)); //CDTXMania.act文字コンソール.tPrint(0, 420, C文字コンソール.Eフォント種別.白, String.Format("{0} : {1}", ScreenPoint[0], ScreenPoint[1])); } if (Counter_In.IsEnded) { Counter_In = null; - Counter_Wait = new CCounter(0, 2299, 1, TJAPlayer3.Timer); + Counter_Wait = new CCounter(0, 2299, 1, OpenTaiko.Timer); } } if (Counter_Wait != null) { if (Counter_Wait.IsUnEnded) { - TJAPlayer3.Tx.DanC_Screen?.t2D描画(TJAPlayer3.Skin.Game_Lane_X[0], TJAPlayer3.Skin.Game_Lane_Y[0]); + OpenTaiko.Tx.DanC_Screen?.t2D描画(OpenTaiko.Skin.Game_Lane_X[0], OpenTaiko.Skin.Game_Lane_Y[0]); if (NowShowingNumber != 0) { if (Counter_Wait.CurrentValue >= 800) { @@ -407,10 +407,10 @@ namespace TJAPlayer3 { ExamChange[i] = false; for (int j = 0; j < CExamInfo.cMaxExam; j++) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[0].Dan_C[j] != null) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count - 1].Dan_C[j] != null) //個別の条件がありますよー + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[0].Dan_C[j] != null) { + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count - 1].Dan_C[j] != null) //個別の条件がありますよー { - Challenge[j] = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j]; + Challenge[j] = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[j]; ExamChange[j] = true; } } @@ -423,19 +423,19 @@ namespace TJAPlayer3 { } if (Counter_Wait.IsEnded) { Counter_Wait = null; - Counter_Out = new CCounter(0, 90, 3, TJAPlayer3.Timer); - Counter_Text = new CCounter(0, 2899, 1, TJAPlayer3.Timer); + Counter_Out = new CCounter(0, 90, 3, OpenTaiko.Timer); + Counter_Text = new CCounter(0, 2899, 1, OpenTaiko.Timer); } } if (Counter_Text != null) { if (Counter_Text.IsUnEnded) { - var title = TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].TitleTex; - var subTitle = TJAPlayer3.DTX.List_DanSongs[NowShowingNumber].SubTitleTex; + var title = OpenTaiko.DTX.List_DanSongs[NowShowingNumber].TitleTex; + var subTitle = OpenTaiko.DTX.List_DanSongs[NowShowingNumber].SubTitleTex; if (subTitle == null) - title?.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Game_DanC_Title_X[0], TJAPlayer3.Skin.Game_DanC_Title_Y[0]); + title?.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Game_DanC_Title_X[0], OpenTaiko.Skin.Game_DanC_Title_Y[0]); else { - title?.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Game_DanC_Title_X[1], TJAPlayer3.Skin.Game_DanC_Title_Y[1]); - subTitle?.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Game_DanC_SubTitle[0], TJAPlayer3.Skin.Game_DanC_SubTitle[1]); + title?.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Game_DanC_Title_X[1], OpenTaiko.Skin.Game_DanC_Title_Y[1]); + subTitle?.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Game_DanC_SubTitle[0], OpenTaiko.Skin.Game_DanC_SubTitle[1]); } } if (Counter_Text.IsEnded) { @@ -445,10 +445,10 @@ namespace TJAPlayer3 { } if (Counter_Out != null) { if (Counter_Out.IsUnEnded) { - ScreenPoint[0] = TJAPlayer3.Skin.Game_Lane_X[0] - Math.Sin(Counter_Out.CurrentValue * (Math.PI / 180)) * 500; - ScreenPoint[1] = TJAPlayer3.Skin.Game_Lane_X[0] + TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2 + Math.Sin(Counter_Out.CurrentValue * (Math.PI / 180)) * 500; - TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[0], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(0, 0, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Height)); - TJAPlayer3.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[1], TJAPlayer3.Skin.Game_Lane_Y[0], new Rectangle(TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, 0, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Width / 2, TJAPlayer3.Tx.DanC_Screen.szTextureSize.Height)); + ScreenPoint[0] = OpenTaiko.Skin.Game_Lane_X[0] - Math.Sin(Counter_Out.CurrentValue * (Math.PI / 180)) * 500; + ScreenPoint[1] = OpenTaiko.Skin.Game_Lane_X[0] + OpenTaiko.Tx.DanC_Screen.szTextureSize.Width / 2 + Math.Sin(Counter_Out.CurrentValue * (Math.PI / 180)) * 500; + OpenTaiko.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[0], OpenTaiko.Skin.Game_Lane_Y[0], new Rectangle(0, 0, OpenTaiko.Tx.DanC_Screen.szTextureSize.Width / 2, OpenTaiko.Tx.DanC_Screen.szTextureSize.Height)); + OpenTaiko.Tx.DanC_Screen?.t2D描画((int)ScreenPoint[1], OpenTaiko.Skin.Game_Lane_Y[0], new Rectangle(OpenTaiko.Tx.DanC_Screen.szTextureSize.Width / 2, 0, OpenTaiko.Tx.DanC_Screen.szTextureSize.Width / 2, OpenTaiko.Tx.DanC_Screen.szTextureSize.Height)); //CDTXMania.act文字コンソール.tPrint(0, 420, C文字コンソール.Eフォント種別.白, String.Format("{0} : {1}", ScreenPoint[0], ScreenPoint[1])); } if (Counter_Out.IsEnded) { @@ -460,8 +460,8 @@ namespace TJAPlayer3 { CActSelect段位リスト.tDisplayDanPlate(Dan_Plate, null, - TJAPlayer3.Skin.Game_DanC_Dan_Plate[0], - TJAPlayer3.Skin.Game_DanC_Dan_Plate[1]); + OpenTaiko.Skin.Game_DanC_Dan_Plate[0], + OpenTaiko.Skin.Game_DanC_Dan_Plate[1]); #endregion @@ -519,15 +519,15 @@ namespace TJAPlayer3 { // Panel origin - int xOrigin = (isResult) ? TJAPlayer3.Skin.DanResult_Exam[0] + offX : TJAPlayer3.Skin.Game_DanC_X[1]; - int yOrigin = (isResult) ? TJAPlayer3.Skin.DanResult_Exam[1] : TJAPlayer3.Skin.Game_DanC_Y[1]; + int xOrigin = (isResult) ? OpenTaiko.Skin.DanResult_Exam[0] + offX : OpenTaiko.Skin.Game_DanC_X[1]; + int yOrigin = (isResult) ? OpenTaiko.Skin.DanResult_Exam[1] : OpenTaiko.Skin.Game_DanC_Y[1]; // Origin position which will be used as a reference for bar elements - int barXOffset = xOrigin + (currentPosition >= 3 ? TJAPlayer3.Skin.Game_DanC_Base_Offset_X[1] : TJAPlayer3.Skin.Game_DanC_Base_Offset_X[0]); - int barYOffset = yOrigin + (currentPosition >= 3 ? TJAPlayer3.Skin.Game_DanC_Base_Offset_Y[1] : TJAPlayer3.Skin.Game_DanC_Base_Offset_Y[0]) + TJAPlayer3.Skin.Game_DanC_Size[1] * yIndex + (yIndex * TJAPlayer3.Skin.Game_DanC_Padding); + int barXOffset = xOrigin + (currentPosition >= 3 ? OpenTaiko.Skin.Game_DanC_Base_Offset_X[1] : OpenTaiko.Skin.Game_DanC_Base_Offset_X[0]); + int barYOffset = yOrigin + (currentPosition >= 3 ? OpenTaiko.Skin.Game_DanC_Base_Offset_Y[1] : OpenTaiko.Skin.Game_DanC_Base_Offset_Y[0]) + OpenTaiko.Skin.Game_DanC_Size[1] * yIndex + (yIndex * OpenTaiko.Skin.Game_DanC_Padding); // Small bar - int lowerBarYOffset = barYOffset + TJAPlayer3.Skin.Game_DanC_Size[1] + TJAPlayer3.Skin.Game_DanC_Padding; + int lowerBarYOffset = barYOffset + OpenTaiko.Skin.Game_DanC_Size[1] + OpenTaiko.Skin.Game_DanC_Padding; // Skin X : 70 // Skin Y : 292 @@ -536,9 +536,9 @@ namespace TJAPlayer3 { #region [Gauge base] if (!isSmallGauge) - TJAPlayer3.Tx.DanC_Base?.t2D描画(barXOffset, barYOffset, new RectangleF(0, ExamChange[i] ? TJAPlayer3.Tx.DanC_Base.szTextureSize.Height / 2 : 0, TJAPlayer3.Tx.DanC_Base.szTextureSize.Width, TJAPlayer3.Tx.DanC_Base.szTextureSize.Height / 2)); + OpenTaiko.Tx.DanC_Base?.t2D描画(barXOffset, barYOffset, new RectangleF(0, ExamChange[i] ? OpenTaiko.Tx.DanC_Base.szTextureSize.Height / 2 : 0, OpenTaiko.Tx.DanC_Base.szTextureSize.Width, OpenTaiko.Tx.DanC_Base.szTextureSize.Height / 2)); else - TJAPlayer3.Tx.DanC_Base_Small?.t2D描画(barXOffset, barYOffset, new RectangleF(0, ExamChange[i] ? TJAPlayer3.Tx.DanC_Base_Small.szTextureSize.Height / 2 : 0, TJAPlayer3.Tx.DanC_Base_Small.szTextureSize.Width, TJAPlayer3.Tx.DanC_Base_Small.szTextureSize.Height / 2)); + OpenTaiko.Tx.DanC_Base_Small?.t2D描画(barXOffset, barYOffset, new RectangleF(0, ExamChange[i] ? OpenTaiko.Tx.DanC_Base_Small.szTextureSize.Height / 2 : 0, OpenTaiko.Tx.DanC_Base_Small.szTextureSize.Width, OpenTaiko.Tx.DanC_Base_Small.szTextureSize.Height / 2)); #endregion @@ -552,26 +552,26 @@ namespace TJAPlayer3 { #region [Small bars] if (ExamChange[i] == true) { - for (int j = 1; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; j++) { + for (int j = 1; j < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; j++) { - if (!(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i] != null && TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[i] != null)) + if (!(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i] != null && OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[NowShowingNumber].Dan_C[i] != null)) continue; // rainbowBetterSuccess (bool) : is current minibar better success ? | drawGaugeTypetwo (int) : Gauge style [0,2] #region [Success type variables] - bool rainbowBetterSuccess = GetExamStatus(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]) == Exam.Status.Better_Success - && GetExamConfirmStatus(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]); + bool rainbowBetterSuccess = GetExamStatus(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]) == Exam.Status.Better_Success + && GetExamConfirmStatus(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]); int amountToPercent; int drawGaugeTypetwo = 0; if (!rainbowBetterSuccess) { - amountToPercent = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent(); + amountToPercent = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent(); if (amountToPercent >= 100) drawGaugeTypetwo = 2; - else if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetExamRange() == Exam.Range.More && amountToPercent >= 70 || amountToPercent > 70) + else if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetExamRange() == Exam.Range.More && amountToPercent >= 70 || amountToPercent > 70) drawGaugeTypetwo = 1; } @@ -580,13 +580,13 @@ namespace TJAPlayer3 { // Small bar elements base opacity #region [Default opacity] - TJAPlayer3.Tx.DanC_SmallBase.Opacity = 255; - TJAPlayer3.Tx.DanC_Small_ExamCymbol.Opacity = 255; + OpenTaiko.Tx.DanC_SmallBase.Opacity = 255; + OpenTaiko.Tx.DanC_Small_ExamCymbol.Opacity = 255; - TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].Opacity = 255; - TJAPlayer3.Tx.DanC_MiniNumber.Opacity = 255; + OpenTaiko.Tx.Gauge_Dan_Rainbow[0].Opacity = 255; + OpenTaiko.Tx.DanC_MiniNumber.Opacity = 255; - TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].Opacity = 255; + OpenTaiko.Tx.DanC_Gauge[drawGaugeTypetwo].Opacity = 255; int miniIconOpacity = 255; @@ -597,13 +597,13 @@ namespace TJAPlayer3 { if (Counter_Wait != null && Counter_Wait.CurrentValue >= 800) { #region [counter800 opacity] - TJAPlayer3.Tx.DanC_SmallBase.Opacity = counter800; - TJAPlayer3.Tx.DanC_Small_ExamCymbol.Opacity = counter800; + OpenTaiko.Tx.DanC_SmallBase.Opacity = counter800; + OpenTaiko.Tx.DanC_Small_ExamCymbol.Opacity = counter800; - TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].Opacity = counter800; - TJAPlayer3.Tx.DanC_MiniNumber.Opacity = counter800; + OpenTaiko.Tx.Gauge_Dan_Rainbow[0].Opacity = counter800; + OpenTaiko.Tx.DanC_MiniNumber.Opacity = counter800; - TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].Opacity = counter800; + OpenTaiko.Tx.DanC_Gauge[drawGaugeTypetwo].Opacity = counter800; miniIconOpacity = counter800; @@ -611,13 +611,13 @@ namespace TJAPlayer3 { } else if (Counter_In != null || (Counter_Wait != null && Counter_Wait.CurrentValue < 800)) { #region [0 opacity] - TJAPlayer3.Tx.DanC_SmallBase.Opacity = 0; - TJAPlayer3.Tx.DanC_Small_ExamCymbol.Opacity = 0; + OpenTaiko.Tx.DanC_SmallBase.Opacity = 0; + OpenTaiko.Tx.DanC_Small_ExamCymbol.Opacity = 0; - TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].Opacity = 0; - TJAPlayer3.Tx.DanC_MiniNumber.Opacity = 0; + OpenTaiko.Tx.Gauge_Dan_Rainbow[0].Opacity = 0; + OpenTaiko.Tx.DanC_MiniNumber.Opacity = 0; - TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].Opacity = 0; + OpenTaiko.Tx.DanC_Gauge[drawGaugeTypetwo].Opacity = 0; miniIconOpacity = 0; @@ -628,49 +628,49 @@ namespace TJAPlayer3 { // Bars starting from the song N if (NowShowingNumber >= j && (j - NowShowingNumber) > -2) { // Determine bars width - TJAPlayer3.Tx.DanC_SmallBase.vcScaleRatio.X = isSmallGauge ? 0.34f : 1f; + OpenTaiko.Tx.DanC_SmallBase.vcScaleRatio.X = isSmallGauge ? 0.34f : 1f; - int smallBarGap = (int)(33f * TJAPlayer3.Skin.Resolution[1] / 720f); + int smallBarGap = (int)(33f * OpenTaiko.Skin.Resolution[1] / 720f); // 815 : Small base (70 + 745) - int miniBarPositionX = barXOffset + (isSmallGauge ? TJAPlayer3.Skin.Game_DanC_SmallBase_Offset_X[1] : TJAPlayer3.Skin.Game_DanC_SmallBase_Offset_X[0]); + int miniBarPositionX = barXOffset + (isSmallGauge ? OpenTaiko.Skin.Game_DanC_SmallBase_Offset_X[1] : OpenTaiko.Skin.Game_DanC_SmallBase_Offset_X[0]); // 613 + (j - 1) * 33 : Small base (barYoffset for 3rd exam : 494 + 119 + Local song offset (j - 1) * 33) - int miniBarPositionY = (barYOffset + (isSmallGauge ? TJAPlayer3.Skin.Game_DanC_SmallBase_Offset_Y[1] : TJAPlayer3.Skin.Game_DanC_SmallBase_Offset_Y[0])) + ((j - 1) % 2) * smallBarGap - (TJAPlayer3.Skin.Game_DanC_Size[1] + (TJAPlayer3.Skin.Game_DanC_Padding)); + int miniBarPositionY = (barYOffset + (isSmallGauge ? OpenTaiko.Skin.Game_DanC_SmallBase_Offset_Y[1] : OpenTaiko.Skin.Game_DanC_SmallBase_Offset_Y[0])) + ((j - 1) % 2) * smallBarGap - (OpenTaiko.Skin.Game_DanC_Size[1] + (OpenTaiko.Skin.Game_DanC_Padding)); // Display bars #region [Displayables] // Display mini-bar base and small symbol - TJAPlayer3.Tx.DanC_SmallBase?.t2D描画(miniBarPositionX, miniBarPositionY); - TJAPlayer3.Tx.DanC_Small_ExamCymbol?.t2D描画(miniBarPositionX - 30, miniBarPositionY - 3, new RectangleF(0, (j - 1) * 28, 30, 28)); + OpenTaiko.Tx.DanC_SmallBase?.t2D描画(miniBarPositionX, miniBarPositionY); + OpenTaiko.Tx.DanC_Small_ExamCymbol?.t2D描画(miniBarPositionX - 30, miniBarPositionY - 3, new RectangleF(0, (j - 1) * 28, 30, 28)); // Display bar content if (rainbowBetterSuccess) { - TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.X = 0.23875f * TJAPlayer3.Tx.DanC_SmallBase.vcScaleRatio.X * (isSmallGauge ? 0.94f : 1f); - TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.Y = 0.35185f; + OpenTaiko.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.X = 0.23875f * OpenTaiko.Tx.DanC_SmallBase.vcScaleRatio.X * (isSmallGauge ? 0.94f : 1f); + OpenTaiko.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.Y = 0.35185f; - TJAPlayer3.Tx.Gauge_Dan_Rainbow[0]?.t2D描画(miniBarPositionX + 3, miniBarPositionY + 2, - new Rectangle(0, 0, (int)(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].szTextureSize.Height)); + OpenTaiko.Tx.Gauge_Dan_Rainbow[0]?.t2D描画(miniBarPositionX + 3, miniBarPositionY + 2, + new Rectangle(0, 0, (int)(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent() * (OpenTaiko.Tx.Gauge_Dan_Rainbow[0].szTextureSize.Width / 100.0)), OpenTaiko.Tx.Gauge_Dan_Rainbow[0].szTextureSize.Height)); } else { - TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].vcScaleRatio.X = 0.23875f * TJAPlayer3.Tx.DanC_SmallBase.vcScaleRatio.X * (isSmallGauge ? 0.94f : 1f); - TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].vcScaleRatio.Y = 0.35185f; + OpenTaiko.Tx.DanC_Gauge[drawGaugeTypetwo].vcScaleRatio.X = 0.23875f * OpenTaiko.Tx.DanC_SmallBase.vcScaleRatio.X * (isSmallGauge ? 0.94f : 1f); + OpenTaiko.Tx.DanC_Gauge[drawGaugeTypetwo].vcScaleRatio.Y = 0.35185f; - TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo]?.t2D描画(miniBarPositionX + 3, miniBarPositionY + 2, - new Rectangle(0, 0, (int)(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.DanC_Gauge[drawGaugeTypetwo].szTextureSize.Height)); + OpenTaiko.Tx.DanC_Gauge[drawGaugeTypetwo]?.t2D描画(miniBarPositionX + 3, miniBarPositionY + 2, + new Rectangle(0, 0, (int)(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmountToPercent() * (OpenTaiko.Tx.DanC_Gauge[drawGaugeTypetwo].szTextureSize.Width / 100.0)), OpenTaiko.Tx.DanC_Gauge[drawGaugeTypetwo].szTextureSize.Height)); } - int _tmpMiniPadding = (int)(14f * TJAPlayer3.Skin.Resolution[0] / 1280f); + int _tmpMiniPadding = (int)(14f * OpenTaiko.Skin.Resolution[0] / 1280f); // Usually +23 for gold and +17 for white, to test DrawMiniNumber( - TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmount(), + OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i].GetAmount(), miniBarPositionX + 11, miniBarPositionY + 20, _tmpMiniPadding, - TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]); + OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]); - CActSelect段位リスト.tDisplayDanIcon(j, miniBarPositionX + TJAPlayer3.Skin.Game_DanC_DanIcon_Offset_Mini[0], miniBarPositionY + TJAPlayer3.Skin.Game_DanC_DanIcon_Offset_Mini[1], miniIconOpacity, 0.5f, false); + CActSelect段位リスト.tDisplayDanIcon(j, miniBarPositionX + OpenTaiko.Skin.Game_DanC_DanIcon_Offset_Mini[0], miniBarPositionY + OpenTaiko.Skin.Game_DanC_DanIcon_Offset_Mini[1], miniIconOpacity, 0.5f, false); #endregion } @@ -681,21 +681,21 @@ namespace TJAPlayer3 { #region [Currently playing song icons] - TJAPlayer3.Tx.DanC_ExamCymbol.Opacity = 255; + OpenTaiko.Tx.DanC_ExamCymbol.Opacity = 255; if (ExamChange[i] && NowShowingNumber != 0) { if (Counter_Wait != null) { if (Counter_Wait.CurrentValue >= 800) - TJAPlayer3.Tx.DanC_ExamCymbol.Opacity = counter800; + OpenTaiko.Tx.DanC_ExamCymbol.Opacity = counter800; else if (Counter_Wait.CurrentValue >= 800 - 255) - TJAPlayer3.Tx.DanC_ExamCymbol.Opacity = counter255M255; + OpenTaiko.Tx.DanC_ExamCymbol.Opacity = counter255M255; } } //75, 418 // 292 - 228 = 64 if (ExamChange[i]) { - TJAPlayer3.Tx.DanC_ExamCymbol.t2D描画(barXOffset + 5, lowerBarYOffset - 64, new RectangleF(0, 41 * NowCymbolShowingNumber, 197, 41)); + OpenTaiko.Tx.DanC_ExamCymbol.t2D描画(barXOffset + 5, lowerBarYOffset - 64, new RectangleF(0, 41 * NowCymbolShowingNumber, 197, 41)); } #endregion @@ -742,13 +742,13 @@ namespace TJAPlayer3 { #region [Default opacity] - TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].Opacity = 255; + OpenTaiko.Tx.DanC_Gauge[LdrawGaugeTypetwo].Opacity = 255; - TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].Opacity = 255; + OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex].Opacity = 255; - TJAPlayer3.Tx.DanC_Number.Opacity = 255; - TJAPlayer3.Tx.DanC_ExamRange.Opacity = 255; - TJAPlayer3.Tx.DanC_Small_Number.Opacity = 255; + OpenTaiko.Tx.DanC_Number.Opacity = 255; + OpenTaiko.Tx.DanC_ExamRange.Opacity = 255; + OpenTaiko.Tx.DanC_Small_Number.Opacity = 255; #endregion @@ -758,13 +758,13 @@ namespace TJAPlayer3 { if (Counter_Wait.CurrentValue >= 800) { #region [counter800 opacity] - TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].Opacity = counter800; + OpenTaiko.Tx.DanC_Gauge[LdrawGaugeTypetwo].Opacity = counter800; - TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].Opacity = counter800; + OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex].Opacity = counter800; - TJAPlayer3.Tx.DanC_Number.Opacity = counter800; - TJAPlayer3.Tx.DanC_ExamRange.Opacity = counter800; - TJAPlayer3.Tx.DanC_Small_Number.Opacity = counter800; + OpenTaiko.Tx.DanC_Number.Opacity = counter800; + OpenTaiko.Tx.DanC_ExamRange.Opacity = counter800; + OpenTaiko.Tx.DanC_Small_Number.Opacity = counter800; iconOpacity = counter800; @@ -772,13 +772,13 @@ namespace TJAPlayer3 { } else if (Counter_Wait.CurrentValue >= 800 - 255) { #region [counter255M255 opacity] - TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].Opacity = counter255M255; + OpenTaiko.Tx.DanC_Gauge[LdrawGaugeTypetwo].Opacity = counter255M255; - TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].Opacity = counter255M255; + OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex].Opacity = counter255M255; - TJAPlayer3.Tx.DanC_Number.Opacity = counter255M255; - TJAPlayer3.Tx.DanC_ExamRange.Opacity = counter255M255; - TJAPlayer3.Tx.DanC_Small_Number.Opacity = counter255M255; + OpenTaiko.Tx.DanC_Number.Opacity = counter255M255; + OpenTaiko.Tx.DanC_ExamRange.Opacity = counter255M255; + OpenTaiko.Tx.DanC_Small_Number.Opacity = counter255M255; iconOpacity = counter255M255; @@ -796,37 +796,37 @@ namespace TJAPlayer3 { if (LrainbowBetterSuccess) { #region [Rainbow gauge display] - TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].vcScaleRatio.X = xExtend; + OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex].vcScaleRatio.X = xExtend; // Reset base since it was used for minibars - TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.X = xExtend; - TJAPlayer3.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.Y = 1.0f; + OpenTaiko.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.X = xExtend; + OpenTaiko.Tx.Gauge_Dan_Rainbow[0].vcScaleRatio.Y = 1.0f; if (Counter_Wait != null && !(Counter_Wait.CurrentValue <= 1055 && Counter_Wait.CurrentValue >= 800 - 255)) { - TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].Opacity = 255; + OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex].Opacity = 255; } - TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex]?.t2D拡大率考慮下基準描画( - barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1], - new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Height)); + OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex]?.t2D拡大率考慮下基準描画( + barXOffset + OpenTaiko.Skin.Game_DanC_Offset[0], lowerBarYOffset - OpenTaiko.Skin.Game_DanC_Offset[1], + new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Width / 100.0)), OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Height)); if (Counter_Wait != null && !(Counter_Wait.CurrentValue <= 1055 && Counter_Wait.CurrentValue >= 800 - 255)) { - TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowBase].Opacity = (ct虹透明度.CurrentValue * 255 / (int)ct虹透明度.EndValue) / 1; + OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowBase].Opacity = (ct虹透明度.CurrentValue * 255 / (int)ct虹透明度.EndValue) / 1; } - TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowBase]?.t2D拡大率考慮下基準描画( - barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1], - new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowBase].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Height)); + OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowBase]?.t2D拡大率考慮下基準描画( + barXOffset + OpenTaiko.Skin.Game_DanC_Offset[0], lowerBarYOffset - OpenTaiko.Skin.Game_DanC_Offset[1], + new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowBase].szTextureSize.Width / 100.0)), OpenTaiko.Tx.Gauge_Dan_Rainbow[rainbowIndex].szTextureSize.Height)); #endregion } else { #region [Regular gauge display] - TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].vcScaleRatio.X = xExtend; - TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].vcScaleRatio.Y = 1.0f; - TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo]?.t2D拡大率考慮下基準描画( - barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1], - new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].szTextureSize.Width / 100.0)), TJAPlayer3.Tx.DanC_Gauge[LdrawGaugeTypetwo].szTextureSize.Height)); + OpenTaiko.Tx.DanC_Gauge[LdrawGaugeTypetwo].vcScaleRatio.X = xExtend; + OpenTaiko.Tx.DanC_Gauge[LdrawGaugeTypetwo].vcScaleRatio.Y = 1.0f; + OpenTaiko.Tx.DanC_Gauge[LdrawGaugeTypetwo]?.t2D拡大率考慮下基準描画( + barXOffset + OpenTaiko.Skin.Game_DanC_Offset[0], lowerBarYOffset - OpenTaiko.Skin.Game_DanC_Offset[1], + new Rectangle(0, 0, (int)(dan_C[i].GetAmountToPercent() * (OpenTaiko.Tx.DanC_Gauge[LdrawGaugeTypetwo].szTextureSize.Width / 100.0)), OpenTaiko.Tx.DanC_Gauge[LdrawGaugeTypetwo].szTextureSize.Height)); #endregion } @@ -845,13 +845,13 @@ namespace TJAPlayer3 { if (nowAmount < 0) nowAmount = 0; - float numberXScale = isSmallGauge ? TJAPlayer3.Skin.Game_DanC_Number_Small_Scale * 0.6f : TJAPlayer3.Skin.Game_DanC_Number_Small_Scale; - float numberYScale = isSmallGauge ? TJAPlayer3.Skin.Game_DanC_Number_Small_Scale * 0.8f : TJAPlayer3.Skin.Game_DanC_Number_Small_Scale; - int numberPadding = (int)(TJAPlayer3.Skin.Game_DanC_Number_Padding * (isSmallGauge ? 0.6f : 1f)); + float numberXScale = isSmallGauge ? OpenTaiko.Skin.Game_DanC_Number_Small_Scale * 0.6f : OpenTaiko.Skin.Game_DanC_Number_Small_Scale; + float numberYScale = isSmallGauge ? OpenTaiko.Skin.Game_DanC_Number_Small_Scale * 0.8f : OpenTaiko.Skin.Game_DanC_Number_Small_Scale; + int numberPadding = (int)(OpenTaiko.Skin.Game_DanC_Number_Padding * (isSmallGauge ? 0.6f : 1f)); DrawNumber(nowAmount, - barXOffset + TJAPlayer3.Skin.Game_DanC_Number_Small_Number_Offset[0], - lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Number_Small_Number_Offset[1], + barXOffset + OpenTaiko.Skin.Game_DanC_Number_Small_Number_Offset[0], + lowerBarYOffset - OpenTaiko.Skin.Game_DanC_Number_Small_Number_Offset[1], numberPadding, true, dan_C[i], @@ -862,49 +862,49 @@ namespace TJAPlayer3 { #endregion if (ExamChange[i]) { - CActSelect段位リスト.tDisplayDanIcon(NowShowingNumber + 1, barXOffset + TJAPlayer3.Skin.Game_DanC_DanIcon_Offset[0], barYOffset + TJAPlayer3.Skin.Game_DanC_DanIcon_Offset[1], iconOpacity, 0.6f, true); + CActSelect段位リスト.tDisplayDanIcon(NowShowingNumber + 1, barXOffset + OpenTaiko.Skin.Game_DanC_DanIcon_Offset[0], barYOffset + OpenTaiko.Skin.Game_DanC_DanIcon_Offset[1], iconOpacity, 0.6f, true); } #region [Dan conditions display] - int offset = TJAPlayer3.Skin.Game_DanC_Exam_Offset[0]; + int offset = OpenTaiko.Skin.Game_DanC_Exam_Offset[0]; - TJAPlayer3.Tx.DanC_ExamType.vcScaleRatio.X = 1.0f; - TJAPlayer3.Tx.DanC_ExamType.vcScaleRatio.Y = 1.0f; + OpenTaiko.Tx.DanC_ExamType.vcScaleRatio.X = 1.0f; + OpenTaiko.Tx.DanC_ExamType.vcScaleRatio.Y = 1.0f; // Exam range (Less than/More) - TJAPlayer3.Tx.DanC_ExamRange?.t2D拡大率考慮下基準描画( - barXOffset + offset - TJAPlayer3.Tx.DanC_ExamRange.szTextureSize.Width, - lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Exam_Offset[1], - new Rectangle(0, TJAPlayer3.Skin.Game_DanC_ExamRange_Size[1] * (int)dan_C[i].GetExamRange(), TJAPlayer3.Skin.Game_DanC_ExamRange_Size[0], TJAPlayer3.Skin.Game_DanC_ExamRange_Size[1])); + OpenTaiko.Tx.DanC_ExamRange?.t2D拡大率考慮下基準描画( + barXOffset + offset - OpenTaiko.Tx.DanC_ExamRange.szTextureSize.Width, + lowerBarYOffset - OpenTaiko.Skin.Game_DanC_Exam_Offset[1], + new Rectangle(0, OpenTaiko.Skin.Game_DanC_ExamRange_Size[1] * (int)dan_C[i].GetExamRange(), OpenTaiko.Skin.Game_DanC_ExamRange_Size[0], OpenTaiko.Skin.Game_DanC_ExamRange_Size[1])); - offset -= TJAPlayer3.Skin.Game_DanC_ExamRange_Padding; + offset -= OpenTaiko.Skin.Game_DanC_ExamRange_Padding; // Condition number DrawNumber( dan_C[i].Value[0], - barXOffset + offset - dan_C[i].Value[0].ToString().Length * (int)(TJAPlayer3.Skin.Game_DanC_Number_Small_Padding * TJAPlayer3.Skin.Game_DanC_Exam_Number_Scale), - lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Exam_Offset[1] - 1, - (int)(TJAPlayer3.Skin.Game_DanC_Number_Small_Padding * TJAPlayer3.Skin.Game_DanC_Exam_Number_Scale), + barXOffset + offset - dan_C[i].Value[0].ToString().Length * (int)(OpenTaiko.Skin.Game_DanC_Number_Small_Padding * OpenTaiko.Skin.Game_DanC_Exam_Number_Scale), + lowerBarYOffset - OpenTaiko.Skin.Game_DanC_Exam_Offset[1] - 1, + (int)(OpenTaiko.Skin.Game_DanC_Number_Small_Padding * OpenTaiko.Skin.Game_DanC_Exam_Number_Scale), false, dan_C[i]); - int _offexX = (int)(22f * TJAPlayer3.Skin.Resolution[0] / 1280f); - int _offexY = (int)(48f * TJAPlayer3.Skin.Resolution[1] / 720f); - int _examX = barXOffset + TJAPlayer3.Skin.Game_DanC_Exam_Offset[0] - TJAPlayer3.Tx.DanC_ExamType.szTextureSize.Width + _offexX; - int _examY = lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Exam_Offset[1] - _offexY; + int _offexX = (int)(22f * OpenTaiko.Skin.Resolution[0] / 1280f); + int _offexY = (int)(48f * OpenTaiko.Skin.Resolution[1] / 720f); + int _examX = barXOffset + OpenTaiko.Skin.Game_DanC_Exam_Offset[0] - OpenTaiko.Tx.DanC_ExamType.szTextureSize.Width + _offexX; + int _examY = lowerBarYOffset - OpenTaiko.Skin.Game_DanC_Exam_Offset[1] - _offexY; // Exam type flag - TJAPlayer3.Tx.DanC_ExamType?.t2D拡大率考慮下基準描画( + OpenTaiko.Tx.DanC_ExamType?.t2D拡大率考慮下基準描画( _examX, _examY, - new Rectangle(0, 0, TJAPlayer3.Skin.Game_DanC_ExamType_Size[0], TJAPlayer3.Skin.Game_DanC_ExamType_Size[1])); + new Rectangle(0, 0, OpenTaiko.Skin.Game_DanC_ExamType_Size[0], OpenTaiko.Skin.Game_DanC_ExamType_Size[1])); if ((int)dan_C[i].GetExamType() < this.ttkExams.Length) TitleTextureKey.ResolveTitleTexture(this.ttkExams[(int)dan_C[i].GetExamType()]).t2D拡大率考慮中央基準描画( - _examX + TJAPlayer3.Skin.Game_DanC_ExamType_Size[0] / 2, - _examY - TJAPlayer3.Skin.Game_DanC_ExamType_Size[1] / 2); + _examX + OpenTaiko.Skin.Game_DanC_ExamType_Size[0] / 2, + _examY - OpenTaiko.Skin.Game_DanC_ExamType_Size[1] / 2); /* @@ -918,12 +918,12 @@ namespace TJAPlayer3 { #region [Failed condition box] - TJAPlayer3.Tx.DanC_Failed.vcScaleRatio.X = isSmallGauge ? 0.33f : 1f; + OpenTaiko.Tx.DanC_Failed.vcScaleRatio.X = isSmallGauge ? 0.33f : 1f; if (dan_C[i].GetReached()) { - TJAPlayer3.Tx.DanC_Failed.t2D拡大率考慮下基準描画( - barXOffset + TJAPlayer3.Skin.Game_DanC_Offset[0], - lowerBarYOffset - TJAPlayer3.Skin.Game_DanC_Offset[1]); + OpenTaiko.Tx.DanC_Failed.t2D拡大率考慮下基準描画( + barXOffset + OpenTaiko.Skin.Game_DanC_Offset[0], + lowerBarYOffset - OpenTaiko.Skin.Game_DanC_Offset[1]); } #endregion @@ -931,26 +931,26 @@ namespace TJAPlayer3 { } else { #region [Gauge dan condition] - int _scale = (int)(14f * TJAPlayer3.Skin.Resolution[0] / 1280f); - int _nbX = (int)(292f * TJAPlayer3.Skin.Resolution[0] / 1280f); - int _nbY = (int)(64f * TJAPlayer3.Skin.Resolution[0] / 1280f); - int _offexX = (int)(104f * TJAPlayer3.Skin.Resolution[0] / 1280f); - int _offexY = (int)(21f * TJAPlayer3.Skin.Resolution[1] / 720f); + int _scale = (int)(14f * OpenTaiko.Skin.Resolution[0] / 1280f); + int _nbX = (int)(292f * OpenTaiko.Skin.Resolution[0] / 1280f); + int _nbY = (int)(64f * OpenTaiko.Skin.Resolution[0] / 1280f); + int _offexX = (int)(104f * OpenTaiko.Skin.Resolution[0] / 1280f); + int _offexY = (int)(21f * OpenTaiko.Skin.Resolution[1] / 720f); - TJAPlayer3.Tx.DanC_Gauge_Base?.t2D描画( - TJAPlayer3.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + 4, - TJAPlayer3.Skin.Game_DanC_Y[0]); + OpenTaiko.Tx.DanC_Gauge_Base?.t2D描画( + OpenTaiko.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + 4, + OpenTaiko.Skin.Game_DanC_Y[0]); TitleTextureKey.ResolveTitleTexture(this.ttkExams[(int)Exam.Type.Gauge]).t2D拡大率考慮中央基準描画( - TJAPlayer3.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + _offexX, - TJAPlayer3.Skin.Game_DanC_Y[0] + _offexY); + OpenTaiko.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + _offexX, + OpenTaiko.Skin.Game_DanC_Y[0] + _offexY); // Display percentage here DrawNumber( dan_C[i].Value[0], - TJAPlayer3.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + _nbX - dan_C[i].Value[0].ToString().Length * (int)(TJAPlayer3.Skin.Game_DanC_Number_Small_Padding * TJAPlayer3.Skin.Game_DanC_Exam_Number_Scale), - TJAPlayer3.Skin.Game_DanC_Y[0] - TJAPlayer3.Skin.Game_DanC_Exam_Offset[1] + _nbY, - (int)(TJAPlayer3.Skin.Game_DanC_Number_Small_Padding * TJAPlayer3.Skin.Game_DanC_Exam_Number_Scale), + OpenTaiko.Skin.Game_DanC_X[0] - ((50 - dan_C[i].GetValue(false) / 2) * _scale) + _nbX - dan_C[i].Value[0].ToString().Length * (int)(OpenTaiko.Skin.Game_DanC_Number_Small_Padding * OpenTaiko.Skin.Game_DanC_Exam_Number_Scale), + OpenTaiko.Skin.Game_DanC_Y[0] - OpenTaiko.Skin.Game_DanC_Exam_Offset[1] + _nbY, + (int)(OpenTaiko.Skin.Game_DanC_Number_Small_Padding * OpenTaiko.Skin.Game_DanC_Exam_Number_Scale), false, dan_C[i]); @@ -971,46 +971,46 @@ namespace TJAPlayer3 { /// アニメーション用拡大率(Yに加算される)。 private void DrawNumber(int value, int x, int y, int padding, bool bBig, Dan_C dan_c, float scaleX = 1.0f, float scaleY = 1.0f, float scaleJump = 0.0f) { - if (TJAPlayer3.Tx.DanC_Number == null || TJAPlayer3.Tx.DanC_Small_Number == null || value < 0) + if (OpenTaiko.Tx.DanC_Number == null || OpenTaiko.Tx.DanC_Small_Number == null || value < 0) return; if (value == 0) { - TJAPlayer3.Tx.DanC_Number.color4 = CConversion.ColorToColor4(Color.Gray); - TJAPlayer3.Tx.DanC_Small_Number.color4 = CConversion.ColorToColor4(Color.Gray); + OpenTaiko.Tx.DanC_Number.color4 = CConversion.ColorToColor4(Color.Gray); + OpenTaiko.Tx.DanC_Small_Number.color4 = CConversion.ColorToColor4(Color.Gray); } else { - TJAPlayer3.Tx.DanC_Number.color4 = CConversion.ColorToColor4(Color.White); - TJAPlayer3.Tx.DanC_Small_Number.color4 = CConversion.ColorToColor4(Color.White); + OpenTaiko.Tx.DanC_Number.color4 = CConversion.ColorToColor4(Color.White); + OpenTaiko.Tx.DanC_Small_Number.color4 = CConversion.ColorToColor4(Color.White); } if (bBig) { var notesRemainDigit = 0; for (int i = 0; i < value.ToString().Length; i++) { var number = Convert.ToInt32(value.ToString()[i].ToString()); - Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_DanC_Number_Size[0] * number - 1, GetExamConfirmStatus(dan_c) ? TJAPlayer3.Skin.Game_DanC_Number_Size[1] : 0, TJAPlayer3.Skin.Game_DanC_Number_Size[0], TJAPlayer3.Skin.Game_DanC_Number_Size[1]); - if (TJAPlayer3.Tx.DanC_Number != null) { - TJAPlayer3.Tx.DanC_Number.vcScaleRatio.X = scaleX; - TJAPlayer3.Tx.DanC_Number.vcScaleRatio.Y = scaleY + scaleJump; + Rectangle rectangle = new Rectangle(OpenTaiko.Skin.Game_DanC_Number_Size[0] * number - 1, GetExamConfirmStatus(dan_c) ? OpenTaiko.Skin.Game_DanC_Number_Size[1] : 0, OpenTaiko.Skin.Game_DanC_Number_Size[0], OpenTaiko.Skin.Game_DanC_Number_Size[1]); + if (OpenTaiko.Tx.DanC_Number != null) { + OpenTaiko.Tx.DanC_Number.vcScaleRatio.X = scaleX; + OpenTaiko.Tx.DanC_Number.vcScaleRatio.Y = scaleY + scaleJump; } - TJAPlayer3.Tx.DanC_Number?.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle); + OpenTaiko.Tx.DanC_Number?.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle); notesRemainDigit--; } } else { var notesRemainDigit = 0; for (int i = 0; i < value.ToString().Length; i++) { var number = Convert.ToInt32(value.ToString()[i].ToString()); - Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_DanC_Small_Number_Size[0] * number - 1, 0, TJAPlayer3.Skin.Game_DanC_Small_Number_Size[0], TJAPlayer3.Skin.Game_DanC_Small_Number_Size[1]); - if (TJAPlayer3.Tx.DanC_Small_Number != null) { - TJAPlayer3.Tx.DanC_Small_Number.vcScaleRatio.X = scaleX; - TJAPlayer3.Tx.DanC_Small_Number.vcScaleRatio.Y = scaleY + scaleJump; + Rectangle rectangle = new Rectangle(OpenTaiko.Skin.Game_DanC_Small_Number_Size[0] * number - 1, 0, OpenTaiko.Skin.Game_DanC_Small_Number_Size[0], OpenTaiko.Skin.Game_DanC_Small_Number_Size[1]); + if (OpenTaiko.Tx.DanC_Small_Number != null) { + OpenTaiko.Tx.DanC_Small_Number.vcScaleRatio.X = scaleX; + OpenTaiko.Tx.DanC_Small_Number.vcScaleRatio.Y = scaleY + scaleJump; } - TJAPlayer3.Tx.DanC_Small_Number?.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle); + OpenTaiko.Tx.DanC_Small_Number?.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle); notesRemainDigit--; } } } public void DrawMiniNumber(int value, int x, int y, int padding, Dan_C dan_c) { - if (TJAPlayer3.Tx.DanC_MiniNumber == null || value < 0) + if (OpenTaiko.Tx.DanC_MiniNumber == null || value < 0) return; var notesRemainDigit = 0; @@ -1018,8 +1018,8 @@ namespace TJAPlayer3 { return; for (int i = 0; i < value.ToString().Length; i++) { var number = Convert.ToInt32(value.ToString()[i].ToString()); - Rectangle rectangle = new Rectangle(TJAPlayer3.Skin.Game_DanC_MiniNumber_Size[0] * number - 1, GetExamConfirmStatus(dan_c) ? TJAPlayer3.Skin.Game_DanC_MiniNumber_Size[1] : 0, TJAPlayer3.Skin.Game_DanC_MiniNumber_Size[0], TJAPlayer3.Skin.Game_DanC_MiniNumber_Size[1]); - TJAPlayer3.Tx.DanC_MiniNumber.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle); + Rectangle rectangle = new Rectangle(OpenTaiko.Skin.Game_DanC_MiniNumber_Size[0] * number - 1, GetExamConfirmStatus(dan_c) ? OpenTaiko.Skin.Game_DanC_MiniNumber_Size[1] : 0, OpenTaiko.Skin.Game_DanC_MiniNumber_Size[0], OpenTaiko.Skin.Game_DanC_MiniNumber_Size[1]); + OpenTaiko.Tx.DanC_MiniNumber.t2D拡大率考慮下中心基準描画(x - (notesRemainDigit * padding), y, rectangle); notesRemainDigit--; } } @@ -1033,9 +1033,9 @@ namespace TJAPlayer3 { for (int i = 0; i < CExamInfo.cMaxExam; i++) { if (Challenge[i] == null) continue; - for (int j = 0; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; j++) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] != null) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i].GetReached()) isFailed = true; + for (int j = 0; j < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; j++) { + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i] != null) { + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j].Dan_C[i].GetReached()) isFailed = true; } } if (Challenge[i].GetReached()) isFailed = true; @@ -1055,11 +1055,11 @@ namespace TJAPlayer3 { if (ExamChange[i] == true) { - for (int j = 1; j < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; j++) { - if (!(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i] != null)) + for (int j = 1; j < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; j++) { + if (!(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i] != null)) continue; - bool rainbowBetterSuccess = GetExamStatus(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]) == Exam.Status.Better_Success; + bool rainbowBetterSuccess = GetExamStatus(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[j - 1].Dan_C[i]) == Exam.Status.Better_Success; if (!rainbowBetterSuccess) status = Exam.Status.Success; } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/EndAnimeScript.cs b/OpenTaiko/src/Stages/07.Game/Taiko/EndAnimeScript.cs index 3c853a16..67eb9d63 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/EndAnimeScript.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/EndAnimeScript.cs @@ -1,6 +1,6 @@ using NLua; -namespace TJAPlayer3 { +namespace OpenTaiko { class EndAnimeScript : ScriptBG { private LuaFunction LuaPlayEndAnime; @@ -28,19 +28,19 @@ namespace TJAPlayer3 { try { float currentFloorPositionMax140 = 0; - if (TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5] != null) { - int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; + if (OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5] != null) { + int maxFloor = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; int nightTime = Math.Max(140, maxFloor / 2); - currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); + currentFloorPositionMax140 = Math.Min(OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); } - LuaUpdateValues.Call(TJAPlayer3.FPS.DeltaTime, TJAPlayer3.FPS.NowFPS, TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared, (double)currentFloorPositionMax140); + LuaUpdateValues.Call(OpenTaiko.FPS.DeltaTime, OpenTaiko.FPS.NowFPS, OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared, (double)currentFloorPositionMax140); /*LuaScript.SetObjectToPath("fps", TJAPlayer3.FPS.n現在のFPS); LuaScript.SetObjectToPath("deltaTime", TJAPlayer3.FPS.DeltaTime); LuaScript.SetObjectToPath("isClear", TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared); LuaScript.SetObjectToPath("towerNightOpacity", (double)(255 * currentFloorPositionMax140));*/ - if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) LuaUpdate.Call(player); + if (!OpenTaiko.stage演奏ドラム画面.bPAUSE) LuaUpdate.Call(player); } catch (Exception ex) { LuaScript.Dispose(); LuaScript = null; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/FireWorks.cs b/OpenTaiko/src/Stages/07.Game/Taiko/FireWorks.cs index 5fc87394..062134e5 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/FireWorks.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/FireWorks.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class FireWorks : CActivity { // コンストラクタ @@ -18,7 +18,7 @@ namespace TJAPlayer3 { /// /// public virtual void Start(int nLane, int nPlayer, double x, double y) { - if (TJAPlayer3.ConfigIni.SimpleMode) return; + if (OpenTaiko.ConfigIni.SimpleMode) return; for (int i = 0; i < 32; i++) { if (!FireWork[i].IsUsing) { @@ -27,7 +27,7 @@ namespace TJAPlayer3 { FireWork[i].Player = nPlayer; FireWork[i].X = x; FireWork[i].Y = y; - FireWork[i].Counter = new CCounter(0, TJAPlayer3.Skin.Game_Effect_FireWorks[2] - 1, TJAPlayer3.Skin.Game_Effect_FireWorks_Timer, TJAPlayer3.Timer); + FireWork[i].Counter = new CCounter(0, OpenTaiko.Skin.Game_Effect_FireWorks[2] - 1, OpenTaiko.Skin.Game_Effect_FireWorks_Timer, OpenTaiko.Timer); break; } } @@ -56,11 +56,11 @@ namespace TJAPlayer3 { base.ReleaseManagedResource(); } public override int Draw() { - if (!base.IsDeActivated && !TJAPlayer3.ConfigIni.SimpleMode) { + if (!base.IsDeActivated && !OpenTaiko.ConfigIni.SimpleMode) { for (int i = 0; i < 32; i++) { if (FireWork[i].IsUsing) { FireWork[i].Counter.Tick(); - TJAPlayer3.Tx.Effects_Hit_FireWorks?.t2D中心基準描画((float)FireWork[i].X, (float)FireWork[i].Y, 1, new Rectangle(FireWork[i].Counter.CurrentValue * TJAPlayer3.Skin.Game_Effect_FireWorks[0], 0, TJAPlayer3.Skin.Game_Effect_FireWorks[0], TJAPlayer3.Skin.Game_Effect_FireWorks[1])); + OpenTaiko.Tx.Effects_Hit_FireWorks?.t2D中心基準描画((float)FireWork[i].X, (float)FireWork[i].Y, 1, new Rectangle(FireWork[i].Counter.CurrentValue * OpenTaiko.Skin.Game_Effect_FireWorks[0], 0, OpenTaiko.Skin.Game_Effect_FireWorks[0], OpenTaiko.Skin.Game_Effect_FireWorks[1])); if (FireWork[i].Counter.IsEnded) { FireWork[i].Counter.Stop(); FireWork[i].IsUsing = false; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/FlyingNotes.cs b/OpenTaiko/src/Stages/07.Game/Taiko/FlyingNotes.cs index e350c69a..96f67e58 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/FlyingNotes.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/FlyingNotes.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class FlyingNotes : CActivity { // コンストラクタ @@ -12,10 +12,10 @@ namespace TJAPlayer3 { // メソッド public virtual void Start(int nLane, int nPlayer, bool isRoll = false) { - if (TJAPlayer3.ConfigIni.nPlayerCount > 2 || TJAPlayer3.ConfigIni.SimpleMode) return; - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; + if (OpenTaiko.ConfigIni.nPlayerCount > 2 || OpenTaiko.ConfigIni.SimpleMode) return; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(nPlayer)]; - if (TJAPlayer3.Tx.Notes[(int)_gt] != null) { + if (OpenTaiko.Tx.Notes[(int)_gt] != null) { for (int i = 0; i < 128; i++) { if (!Flying[i].IsUsing) { // 初期化 @@ -25,19 +25,19 @@ namespace TJAPlayer3 { Flying[i].X = -100; //StartPointX[nPlayer]; Flying[i].Y = -100; //TJAPlayer3.Skin.Game_Effect_FlyingNotes_StartPoint_Y[nPlayer]; Flying[i].StartPointX = StartPointX[nPlayer]; - Flying[i].StartPointY = TJAPlayer3.Skin.Game_Effect_FlyingNotes_StartPoint_Y[nPlayer]; + Flying[i].StartPointY = OpenTaiko.Skin.Game_Effect_FlyingNotes_StartPoint_Y[nPlayer]; Flying[i].OldValue = 0; Flying[i].IsRoll = isRoll; // 角度の決定 - Flying[i].Height = Math.Abs(TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[nPlayer] - TJAPlayer3.Skin.Game_Effect_FlyingNotes_StartPoint_Y[nPlayer]); - Flying[i].Width = (Math.Abs((TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[nPlayer] - StartPointX[nPlayer])) / 2); + Flying[i].Height = Math.Abs(OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[nPlayer] - OpenTaiko.Skin.Game_Effect_FlyingNotes_StartPoint_Y[nPlayer]); + Flying[i].Width = (Math.Abs((OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[nPlayer] - StartPointX[nPlayer])) / 2); //Console.WriteLine("{0}, {1}", width2P, height2P); Flying[i].Theta = ((Math.Atan2(Flying[i].Height, Flying[i].Width) * 180.0) / Math.PI); - Flying[i].Counter = new CCounter(0, 140, TJAPlayer3.Skin.Game_Effect_FlyingNotes_Timer, TJAPlayer3.Timer); + Flying[i].Counter = new CCounter(0, 140, OpenTaiko.Skin.Game_Effect_FlyingNotes_Timer, OpenTaiko.Timer); //Flying[i].Counter = new CCounter(0, 200000, CDTXMania.Skin.Game_Effect_FlyingNotes_Timer, CDTXMania.Timer); - Flying[i].IncreaseX = (1.00 * Math.Abs((TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[nPlayer] - StartPointX[nPlayer]))) / (180); - Flying[i].IncreaseY = (1.00 * Math.Abs((TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[nPlayer] - TJAPlayer3.Skin.Game_Effect_FlyingNotes_StartPoint_Y[nPlayer]))) / (180); + Flying[i].IncreaseX = (1.00 * Math.Abs((OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[nPlayer] - StartPointX[nPlayer]))) / (180); + Flying[i].IncreaseY = (1.00 * Math.Abs((OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[nPlayer] - OpenTaiko.Skin.Game_Effect_FlyingNotes_StartPoint_Y[nPlayer]))) / (180); break; } } @@ -53,7 +53,7 @@ namespace TJAPlayer3 { Flying[i].Counter = new CCounter(); } for (int i = 0; i < 2; i++) { - StartPointX[i] = TJAPlayer3.Skin.Game_Effect_FlyingNotes_StartPoint_X[i]; + StartPointX[i] = OpenTaiko.Skin.Game_Effect_FlyingNotes_StartPoint_X[i]; } base.Activate(); } @@ -70,7 +70,7 @@ namespace TJAPlayer3 { base.ReleaseManagedResource(); } public override int Draw() { - if (!base.IsDeActivated && !TJAPlayer3.ConfigIni.SimpleMode) { + if (!base.IsDeActivated && !OpenTaiko.ConfigIni.SimpleMode) { for (int i = 0; i < 128; i++) { if (Flying[i].IsUsing) { Flying[i].OldValue = Flying[i].Counter.CurrentValue; @@ -78,23 +78,23 @@ namespace TJAPlayer3 { if (Flying[i].Counter.IsEnded) { Flying[i].Counter.Stop(); Flying[i].IsUsing = false; - TJAPlayer3.stage演奏ドラム画面.actGauge.Start(Flying[i].Lane, ENoteJudge.Perfect, Flying[i].Player); - TJAPlayer3.stage演奏ドラム画面.actChipEffects.Start(Flying[i].Player, Flying[i].Lane); + OpenTaiko.stage演奏ドラム画面.actGauge.Start(Flying[i].Lane, ENoteJudge.Perfect, Flying[i].Player); + OpenTaiko.stage演奏ドラム画面.actChipEffects.Start(Flying[i].Player, Flying[i].Lane); } for (int n = Flying[i].OldValue; n < Flying[i].Counter.CurrentValue; n += 16) { int endX; int endY; - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - endX = TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X_AI[Flying[i].Player]; - endY = TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y_AI[Flying[i].Player]; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + endX = OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X_AI[Flying[i].Player]; + endY = OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y_AI[Flying[i].Player]; } else { - endX = TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_X[Flying[i].Player]; - endY = TJAPlayer3.Skin.Game_Effect_FlyingNotes_EndPoint_Y[Flying[i].Player]; + endX = OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_X[Flying[i].Player]; + endY = OpenTaiko.Skin.Game_Effect_FlyingNotes_EndPoint_Y[Flying[i].Player]; } int movingDistanceX = endX - StartPointX[Flying[i].Player]; - int movingDistanceY = endY - TJAPlayer3.Skin.Game_Effect_FlyingNotes_StartPoint_Y[Flying[i].Player]; + int movingDistanceY = endY - OpenTaiko.Skin.Game_Effect_FlyingNotes_StartPoint_Y[Flying[i].Player]; /* if (TJAPlayer3.Skin.Game_Effect_FlyingNotes_IsUsingEasing) @@ -110,22 +110,22 @@ namespace TJAPlayer3 { double value = (Flying[i].Counter.CurrentValue / 140.0); - Flying[i].X = StartPointX[Flying[i].Player] + TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLX(Flying[i].Player) + (movingDistanceX * value); - Flying[i].Y = TJAPlayer3.Skin.Game_Effect_FlyingNotes_StartPoint_Y[Flying[i].Player] + TJAPlayer3.stage演奏ドラム画面.GetJPOSCROLLY(Flying[i].Player) + (int)(movingDistanceY * value); + Flying[i].X = StartPointX[Flying[i].Player] + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLX(Flying[i].Player) + (movingDistanceX * value); + Flying[i].Y = OpenTaiko.Skin.Game_Effect_FlyingNotes_StartPoint_Y[Flying[i].Player] + OpenTaiko.stage演奏ドラム画面.GetJPOSCROLLY(Flying[i].Player) + (int)(movingDistanceY * value); - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - Flying[i].Y += Math.Sin(value * Math.PI) * ((Flying[i].Player == 0 ? -TJAPlayer3.Skin.Game_Effect_FlyingNotes_Sine : TJAPlayer3.Skin.Game_Effect_FlyingNotes_Sine) / 3.0); + if (OpenTaiko.ConfigIni.bAIBattleMode) { + Flying[i].Y += Math.Sin(value * Math.PI) * ((Flying[i].Player == 0 ? -OpenTaiko.Skin.Game_Effect_FlyingNotes_Sine : OpenTaiko.Skin.Game_Effect_FlyingNotes_Sine) / 3.0); } else { - Flying[i].Y += Math.Sin(value * Math.PI) * (Flying[i].Player == 0 ? -TJAPlayer3.Skin.Game_Effect_FlyingNotes_Sine : TJAPlayer3.Skin.Game_Effect_FlyingNotes_Sine); + Flying[i].Y += Math.Sin(value * Math.PI) * (Flying[i].Player == 0 ? -OpenTaiko.Skin.Game_Effect_FlyingNotes_Sine : OpenTaiko.Skin.Game_Effect_FlyingNotes_Sine); } - if (TJAPlayer3.Skin.Game_Effect_FlyingNotes_IsUsingEasing) { + if (OpenTaiko.Skin.Game_Effect_FlyingNotes_IsUsingEasing) { } else { } - if (n % TJAPlayer3.Skin.Game_Effect_FireWorks_Timing == 0 && !Flying[i].IsRoll && Flying[i].Counter.CurrentValue > 18) { + if (n % OpenTaiko.Skin.Game_Effect_FireWorks_Timing == 0 && !Flying[i].IsRoll && Flying[i].Counter.CurrentValue > 18) { if (Flying[i].Lane == 3 || Flying[i].Lane == 4) { - TJAPlayer3.stage演奏ドラム画面.FireWorks.Start(Flying[i].Lane, Flying[i].Player, Flying[i].X, Flying[i].Y); + OpenTaiko.stage演奏ドラム画面.FireWorks.Start(Flying[i].Lane, Flying[i].Player, Flying[i].X, Flying[i].Y); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/GoGoSplash.cs b/OpenTaiko/src/Stages/07.Game/Taiko/GoGoSplash.cs index 8b23be7a..00bdd1fa 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/GoGoSplash.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/GoGoSplash.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class GoGoSplash : CActivity { public GoGoSplash() { this.IsDeActivated = true; @@ -22,38 +22,38 @@ namespace TJAPlayer3 { /// /// public override int Draw() { - if (Splash == null || TJAPlayer3.ConfigIni.SimpleMode) return base.Draw(); + if (Splash == null || OpenTaiko.ConfigIni.SimpleMode) return base.Draw(); Splash.Tick(); if (Splash.IsEnded) { Splash.CurrentValue = 0; Splash.Stop(); } if (Splash.IsTicked) { - for (int i = 0; i < TJAPlayer3.Skin.Game_Effect_GoGoSplash_X.Length; i++) { - if (i > TJAPlayer3.Skin.Game_Effect_GoGoSplash_Y.Length) break; + for (int i = 0; i < OpenTaiko.Skin.Game_Effect_GoGoSplash_X.Length; i++) { + if (i > OpenTaiko.Skin.Game_Effect_GoGoSplash_Y.Length) break; // Yの配列がiよりも小さかったらそこでキャンセルする。 - if (TJAPlayer3.Skin.Game_Effect_GoGoSplash_Rotate && TJAPlayer3.Tx.Effects_GoGoSplash != null) { + if (OpenTaiko.Skin.Game_Effect_GoGoSplash_Rotate && OpenTaiko.Tx.Effects_GoGoSplash != null) { // Switch文を使いたかったが、定数じゃないから使えねぇ!!!! if (i == 0) { - TJAPlayer3.Tx.Effects_GoGoSplash.fZ軸中心回転 = -0.2792526803190927f; + OpenTaiko.Tx.Effects_GoGoSplash.fZ軸中心回転 = -0.2792526803190927f; } else if (i == 1) { - TJAPlayer3.Tx.Effects_GoGoSplash.fZ軸中心回転 = -0.13962634015954636f; - } else if (i == TJAPlayer3.Skin.Game_Effect_GoGoSplash_X.Length - 2) { - TJAPlayer3.Tx.Effects_GoGoSplash.fZ軸中心回転 = 0.13962634015954636f; - } else if (i == TJAPlayer3.Skin.Game_Effect_GoGoSplash_X.Length - 1) { - TJAPlayer3.Tx.Effects_GoGoSplash.fZ軸中心回転 = 0.2792526803190927f; + OpenTaiko.Tx.Effects_GoGoSplash.fZ軸中心回転 = -0.13962634015954636f; + } else if (i == OpenTaiko.Skin.Game_Effect_GoGoSplash_X.Length - 2) { + OpenTaiko.Tx.Effects_GoGoSplash.fZ軸中心回転 = 0.13962634015954636f; + } else if (i == OpenTaiko.Skin.Game_Effect_GoGoSplash_X.Length - 1) { + OpenTaiko.Tx.Effects_GoGoSplash.fZ軸中心回転 = 0.2792526803190927f; } else { - TJAPlayer3.Tx.Effects_GoGoSplash.fZ軸中心回転 = 0.0f; + OpenTaiko.Tx.Effects_GoGoSplash.fZ軸中心回転 = 0.0f; } } - TJAPlayer3.Tx.Effects_GoGoSplash?.t2D拡大率考慮下中心基準描画(TJAPlayer3.Skin.Game_Effect_GoGoSplash_X[i], TJAPlayer3.Skin.Game_Effect_GoGoSplash_Y[i], new Rectangle(TJAPlayer3.Skin.Game_Effect_GoGoSplash[0] * Splash.CurrentValue, 0, TJAPlayer3.Skin.Game_Effect_GoGoSplash[0], TJAPlayer3.Skin.Game_Effect_GoGoSplash[1])); + OpenTaiko.Tx.Effects_GoGoSplash?.t2D拡大率考慮下中心基準描画(OpenTaiko.Skin.Game_Effect_GoGoSplash_X[i], OpenTaiko.Skin.Game_Effect_GoGoSplash_Y[i], new Rectangle(OpenTaiko.Skin.Game_Effect_GoGoSplash[0] * Splash.CurrentValue, 0, OpenTaiko.Skin.Game_Effect_GoGoSplash[0], OpenTaiko.Skin.Game_Effect_GoGoSplash[1])); } } return base.Draw(); } public void StartSplash() { - Splash = new CCounter(0, TJAPlayer3.Skin.Game_Effect_GoGoSplash[2] - 1, TJAPlayer3.Skin.Game_Effect_GoGoSplash_Timer, TJAPlayer3.Timer); + Splash = new CCounter(0, OpenTaiko.Skin.Game_Effect_GoGoSplash[2] - 1, OpenTaiko.Skin.Game_Effect_GoGoSplash_Timer, OpenTaiko.Timer); } private CCounter Splash; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/KusudamaScript.cs b/OpenTaiko/src/Stages/07.Game/Taiko/KusudamaScript.cs index 4aa83a5f..ce736f2c 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/KusudamaScript.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/KusudamaScript.cs @@ -1,6 +1,6 @@ using NLua; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class KusudamaScript : ScriptBG { private LuaFunction LuaKusuIn; private LuaFunction LuaKusuBroke; diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/LaneFlash.cs b/OpenTaiko/src/Stages/07.Game/Taiko/LaneFlash.cs index 4af31068..76198a4a 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/LaneFlash.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/LaneFlash.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// レーンフラッシュのクラス。 /// @@ -13,7 +13,7 @@ namespace TJAPlayer3 { } public void Start() { - Counter = new CCounter(0, 100, 1, TJAPlayer3.Timer); + Counter = new CCounter(0, 100, 1, OpenTaiko.Timer); } public override void Activate() { @@ -32,15 +32,15 @@ namespace TJAPlayer3 { int x; int y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - x = TJAPlayer3.Skin.Game_Lane_5P[0] + (TJAPlayer3.Skin.Game_UIMove_5P[0] * Player); - y = TJAPlayer3.Skin.Game_Lane_5P[1] + (TJAPlayer3.Skin.Game_UIMove_5P[1] * Player); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - x = TJAPlayer3.Skin.Game_Lane_4P[0] + (TJAPlayer3.Skin.Game_UIMove_4P[0] * Player); - y = TJAPlayer3.Skin.Game_Lane_4P[1] + (TJAPlayer3.Skin.Game_UIMove_4P[1] * Player); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + x = OpenTaiko.Skin.Game_Lane_5P[0] + (OpenTaiko.Skin.Game_UIMove_5P[0] * Player); + y = OpenTaiko.Skin.Game_Lane_5P[1] + (OpenTaiko.Skin.Game_UIMove_5P[1] * Player); + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + x = OpenTaiko.Skin.Game_Lane_4P[0] + (OpenTaiko.Skin.Game_UIMove_4P[0] * Player); + y = OpenTaiko.Skin.Game_Lane_4P[1] + (OpenTaiko.Skin.Game_UIMove_4P[1] * Player); } else { - x = TJAPlayer3.Skin.Game_Lane_X[Player]; - y = TJAPlayer3.Skin.Game_Lane_Y[Player]; + x = OpenTaiko.Skin.Game_Lane_X[Player]; + y = OpenTaiko.Skin.Game_Lane_Y[Player]; } Counter.Tick(); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/ModIcons.cs b/OpenTaiko/src/Stages/07.Game/Taiko/ModIcons.cs index 6f9ab310..d35c712e 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/ModIcons.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/ModIcons.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class ModIcons { static Dictionary> __methods = new Dictionary>() { @@ -14,25 +14,25 @@ static public void tDisplayMods(int x, int y, int player) { // +30 x/y - int actual = TJAPlayer3.GetActualPlayer(player); + int actual = OpenTaiko.GetActualPlayer(player); for (int i = 0; i < 8; i++) { - __methods[i](x + TJAPlayer3.Skin.ModIcons_OffsetX[i], y + TJAPlayer3.Skin.ModIcons_OffsetY[i], actual, player); + __methods[i](x + OpenTaiko.Skin.ModIcons_OffsetX[i], y + OpenTaiko.Skin.ModIcons_OffsetY[i], actual, player); } } static public void tDisplayModsMenu(int x, int y, int player) { - if (TJAPlayer3.Tx.Mod_None != null) - TJAPlayer3.Tx.Mod_None.Opacity = 0; + if (OpenTaiko.Tx.Mod_None != null) + OpenTaiko.Tx.Mod_None.Opacity = 0; - int actual = TJAPlayer3.GetActualPlayer(player); + int actual = OpenTaiko.GetActualPlayer(player); for (int i = 0; i < 8; i++) { - __methods[i](x + TJAPlayer3.Skin.ModIcons_OffsetX_Menu[i], y + TJAPlayer3.Skin.ModIcons_OffsetY_Menu[i], actual, player); + __methods[i](x + OpenTaiko.Skin.ModIcons_OffsetX_Menu[i], y + OpenTaiko.Skin.ModIcons_OffsetY_Menu[i], actual, player); } - if (TJAPlayer3.Tx.Mod_None != null) - TJAPlayer3.Tx.Mod_None.Opacity = 255; + if (OpenTaiko.Tx.Mod_None != null) + OpenTaiko.Tx.Mod_None.Opacity = 255; } #region [Displayables] @@ -43,96 +43,96 @@ int _i = -1; for (int j = 0; j < _vals.Length; j++) { - if (TJAPlayer3.ConfigIni.nScrollSpeed[player] >= _vals[j] && j < TJAPlayer3.Tx.HiSp.Length) + if (OpenTaiko.ConfigIni.nScrollSpeed[player] >= _vals[j] && j < OpenTaiko.Tx.HiSp.Length) _i = j; else break; } if (_i >= 0) - TJAPlayer3.Tx.HiSp[_i]?.t2D描画(x, y); + OpenTaiko.Tx.HiSp[_i]?.t2D描画(x, y); else - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } static private void tDisplayAutoIcon(int x, int y, int player) { bool _displayed = false; - if (TJAPlayer3.ConfigIni.bAutoPlay[player]) + if (OpenTaiko.ConfigIni.bAutoPlay[player]) _displayed = true; if (_displayed == true) - TJAPlayer3.Tx.Mod_Auto?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Auto?.t2D描画(x, y); else - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } static private void tDisplayDoronIcon(int x, int y, int player) { - var conf_ = TJAPlayer3.ConfigIni.eSTEALTH[player]; + var conf_ = OpenTaiko.ConfigIni.eSTEALTH[player]; if (conf_ == EStealthMode.DORON) - TJAPlayer3.Tx.Mod_Doron?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Doron?.t2D描画(x, y); else if (conf_ == EStealthMode.STEALTH) - TJAPlayer3.Tx.Mod_Stealth?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Stealth?.t2D描画(x, y); else - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } static private void tDisplayJustIcon(int x, int y, int player) { - var conf_ = TJAPlayer3.ConfigIni.bJust[player]; + var conf_ = OpenTaiko.ConfigIni.bJust[player]; if (conf_ == 1) - TJAPlayer3.Tx.Mod_Just?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Just?.t2D描画(x, y); else if (conf_ == 2) - TJAPlayer3.Tx.Mod_Safe?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Safe?.t2D描画(x, y); else - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } static private void tDisplayRandomIcon(int x, int y, int player) { - var rand_ = TJAPlayer3.ConfigIni.eRandom[player]; + var rand_ = OpenTaiko.ConfigIni.eRandom[player]; if (rand_ == ERandomMode.MIRROR) - TJAPlayer3.Tx.Mod_Mirror?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Mirror?.t2D描画(x, y); else if (rand_ == ERandomMode.RANDOM) - TJAPlayer3.Tx.Mod_Random?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Random?.t2D描画(x, y); else if (rand_ == ERandomMode.SUPERRANDOM) - TJAPlayer3.Tx.Mod_Super?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Super?.t2D描画(x, y); else if (rand_ == ERandomMode.MIRRORRANDOM) - TJAPlayer3.Tx.Mod_Hyper?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Hyper?.t2D描画(x, y); else - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } static private void tDisplaySongSpeedIcon(int x, int y, int player) { - if (TJAPlayer3.ConfigIni.nSongSpeed > 20) - TJAPlayer3.Tx.Mod_SongSpeed[1]?.t2D描画(x, y); - else if (TJAPlayer3.ConfigIni.nSongSpeed < 20) - TJAPlayer3.Tx.Mod_SongSpeed[0]?.t2D描画(x, y); + if (OpenTaiko.ConfigIni.nSongSpeed > 20) + OpenTaiko.Tx.Mod_SongSpeed[1]?.t2D描画(x, y); + else if (OpenTaiko.ConfigIni.nSongSpeed < 20) + OpenTaiko.Tx.Mod_SongSpeed[0]?.t2D描画(x, y); else - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } static private void tDisplayFunModIcon(int x, int y, int player) { - int nFun = (int)TJAPlayer3.ConfigIni.nFunMods[player]; + int nFun = (int)OpenTaiko.ConfigIni.nFunMods[player]; if (nFun > 0) - TJAPlayer3.Tx.Mod_Fun[nFun]?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Fun[nFun]?.t2D描画(x, y); else - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } static private void tDisplayTimingIcon(int x, int y, int player) { - int zones = TJAPlayer3.ConfigIni.nTimingZones[player]; + int zones = OpenTaiko.ConfigIni.nTimingZones[player]; if (zones != 2) - TJAPlayer3.Tx.Mod_Timing[zones]?.t2D描画(x, y); + OpenTaiko.Tx.Mod_Timing[zones]?.t2D描画(x, y); else - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } static private void PLACEHOLDER_tDisplayNoneIcon(int x, int y, int player) { - TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); + OpenTaiko.Tx.Mod_None?.t2D描画(x, y); } #endregion @@ -140,29 +140,29 @@ #region [Mod flags] static public bool tPlayIsStock(int player) { - int actual = TJAPlayer3.GetActualPlayer(player); + int actual = OpenTaiko.GetActualPlayer(player); - if (TJAPlayer3.ConfigIni.nFunMods[actual] != EFunMods.NONE) return false; - if (TJAPlayer3.ConfigIni.bJust[actual] != 0) return false; - if (TJAPlayer3.ConfigIni.nTimingZones[actual] != 2) return false; - if (TJAPlayer3.ConfigIni.nSongSpeed != 20) return false; - if (TJAPlayer3.ConfigIni.eRandom[actual] != ERandomMode.OFF) return false; - if (TJAPlayer3.ConfigIni.eSTEALTH[actual] != EStealthMode.OFF) return false; - if (TJAPlayer3.ConfigIni.nScrollSpeed[actual] != 9) return false; + if (OpenTaiko.ConfigIni.nFunMods[actual] != EFunMods.NONE) return false; + if (OpenTaiko.ConfigIni.bJust[actual] != 0) return false; + if (OpenTaiko.ConfigIni.nTimingZones[actual] != 2) return false; + if (OpenTaiko.ConfigIni.nSongSpeed != 20) return false; + if (OpenTaiko.ConfigIni.eRandom[actual] != ERandomMode.OFF) return false; + if (OpenTaiko.ConfigIni.eSTEALTH[actual] != EStealthMode.OFF) return false; + if (OpenTaiko.ConfigIni.nScrollSpeed[actual] != 9) return false; return true; } static public Int64 tModsToPlayModsFlags(int player) { byte[] _flags = new byte[8] { 0, 0, 0, 0, 0, 0, 0, 0 }; - int actual = TJAPlayer3.GetActualPlayer(player); + int actual = OpenTaiko.GetActualPlayer(player); - _flags[0] = (byte)Math.Min(255, TJAPlayer3.ConfigIni.nScrollSpeed[actual]); - _flags[1] = (byte)TJAPlayer3.ConfigIni.eSTEALTH[actual]; - _flags[2] = (byte)TJAPlayer3.ConfigIni.eRandom[actual]; - _flags[3] = (byte)Math.Min(255, TJAPlayer3.ConfigIni.nSongSpeed); - _flags[4] = (byte)TJAPlayer3.ConfigIni.nTimingZones[actual]; - _flags[5] = (byte)TJAPlayer3.ConfigIni.bJust[actual]; - _flags[7] = (byte)TJAPlayer3.ConfigIni.nFunMods[actual]; + _flags[0] = (byte)Math.Min(255, OpenTaiko.ConfigIni.nScrollSpeed[actual]); + _flags[1] = (byte)OpenTaiko.ConfigIni.eSTEALTH[actual]; + _flags[2] = (byte)OpenTaiko.ConfigIni.eRandom[actual]; + _flags[3] = (byte)Math.Min(255, OpenTaiko.ConfigIni.nSongSpeed); + _flags[4] = (byte)OpenTaiko.ConfigIni.nTimingZones[actual]; + _flags[5] = (byte)OpenTaiko.ConfigIni.bJust[actual]; + _flags[7] = (byte)OpenTaiko.ConfigIni.nFunMods[actual]; return BitConverter.ToInt64(_flags, 0); } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/NotesManager.cs b/OpenTaiko/src/Stages/07.Game/Taiko/NotesManager.cs index 2d182121..6519d309 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/NotesManager.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/NotesManager.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { // Simple class containing functions to simplify readability of CChip elements class NotesManager { @@ -51,7 +51,7 @@ namespace TJAPlayer3 { public static int GetNoteX(CDTX.CChip pChip, double timems, double scroll, int interval, float play_bpm_time, EScrollMode eScrollMode, bool roll) { double hbtime = ((roll ? pChip.fBMSCROLLTime_end : pChip.fBMSCROLLTime) - (play_bpm_time)); - double screen_ratio = TJAPlayer3.Skin.Resolution[0] / 1280.0; + double screen_ratio = OpenTaiko.Skin.Resolution[0] / 1280.0; switch (eScrollMode) { case EScrollMode.Normal: return (int)((timems / 240000.0) * interval * scroll * screen_ratio); @@ -68,7 +68,7 @@ namespace TJAPlayer3 { public static int GetNoteY(CDTX.CChip pChip, double timems, double scroll, int interval, float play_bpm_time, EScrollMode eScrollMode, bool roll) { double hbtime = ((roll ? pChip.fBMSCROLLTime_end : pChip.fBMSCROLLTime) - (play_bpm_time)); - double screen_ratio = TJAPlayer3.Skin.Resolution[1] / 720.0; + double screen_ratio = OpenTaiko.Skin.Resolution[1] / 720.0; switch (eScrollMode) { case EScrollMode.Normal: return (int)((timems / 240000.0) * interval * scroll * screen_ratio); @@ -271,31 +271,31 @@ namespace TJAPlayer3 { // Flying notes public static void DisplayNote(int player, int x, int y, int Lane) { - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(player)]; switch (Lane) { case 1: case 2: case 3: case 4: - TJAPlayer3.Tx.Notes[(int)_gt]?.t2D中心基準描画(x, y, new Rectangle(Lane * TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1] * 3, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Notes[(int)_gt]?.t2D中心基準描画(x, y, new Rectangle(Lane * OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1] * 3, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); break; case 5: - TJAPlayer3.Tx.Note_Swap?.t2D中心基準描画(x, y, new Rectangle(0, TJAPlayer3.Skin.Game_Notes_Size[1] * 3, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Note_Swap?.t2D中心基準描画(x, y, new Rectangle(0, OpenTaiko.Skin.Game_Notes_Size[1] * 3, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); break; } } // Regular display public static void DisplayNote(int player, int x, int y, CDTX.CChip chip, int frame, int length = -1) { - if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(player)] != EStealthMode.OFF || !chip.bShow) + if (OpenTaiko.ConfigIni.eSTEALTH[OpenTaiko.GetActualPlayer(player)] != EStealthMode.OFF || !chip.bShow) return; if (length == -1) { - length = TJAPlayer3.Skin.Game_Notes_Size[0]; + length = OpenTaiko.Skin.Game_Notes_Size[0]; } - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(player)]; int noteType = 1; if (IsSmallNote(chip, true)) noteType = 2; @@ -304,51 +304,51 @@ namespace TJAPlayer3 { else if (IsBalloon(chip)) noteType = 11; else if (IsMine(chip)) { - TJAPlayer3.Tx.Note_Mine?.t2D描画(x, y); + OpenTaiko.Tx.Note_Mine?.t2D描画(x, y); return; } else if (IsPurpleNote(chip)) { - TJAPlayer3.Tx.Note_Swap?.t2D描画(x, y, new Rectangle(0, frame, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Note_Swap?.t2D描画(x, y, new Rectangle(0, frame, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); return; } else if (IsKusudama(chip)) { - TJAPlayer3.Tx.Note_Kusu?.t2D描画(x, y, new Rectangle(0, frame, length, TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Note_Kusu?.t2D描画(x, y, new Rectangle(0, frame, length, OpenTaiko.Skin.Game_Notes_Size[1])); return; } else if (IsADLIB(chip)) { - var puchichara = TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(player))]; + var puchichara = OpenTaiko.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(OpenTaiko.GetActualPlayer(player))]; if (puchichara.effect.ShowAdlib) { - TJAPlayer3.Tx.Note_Adlib?.tUpdateOpacity(50); - TJAPlayer3.Tx.Note_Adlib?.t2D描画(x, y, new Rectangle(0, frame, length, TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Note_Adlib?.tUpdateOpacity(50); + OpenTaiko.Tx.Note_Adlib?.t2D描画(x, y, new Rectangle(0, frame, length, OpenTaiko.Skin.Game_Notes_Size[1])); } return; } - TJAPlayer3.Tx.Notes[(int)_gt]?.t2D描画(x, y, new Rectangle(noteType * TJAPlayer3.Skin.Game_Notes_Size[0], frame, length, TJAPlayer3.Skin.Game_Notes_Size[1])); + OpenTaiko.Tx.Notes[(int)_gt]?.t2D描画(x, y, new Rectangle(noteType * OpenTaiko.Skin.Game_Notes_Size[0], frame, length, OpenTaiko.Skin.Game_Notes_Size[1])); } // Roll display public static void DisplayRoll(int player, int x, int y, CDTX.CChip chip, int frame, Color4 normalColor, Color4 effectedColor, int x末端, int y末端) { - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(player)]; - if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(player)] != EStealthMode.OFF || !chip.bShow) + if (OpenTaiko.ConfigIni.eSTEALTH[OpenTaiko.GetActualPlayer(player)] != EStealthMode.OFF || !chip.bShow) return; int _offset = 0; - var _texarr = TJAPlayer3.Tx.Notes[(int)_gt]; - int rollOrigin = (TJAPlayer3.Skin.Game_Notes_Size[0] * 5); - float _adjust = TJAPlayer3.Skin.Game_Notes_Size[0] / 2.0f; - float image_size = TJAPlayer3.Skin.Game_Notes_Size[0]; + var _texarr = OpenTaiko.Tx.Notes[(int)_gt]; + int rollOrigin = (OpenTaiko.Skin.Game_Notes_Size[0] * 5); + float _adjust = OpenTaiko.Skin.Game_Notes_Size[0] / 2.0f; + float image_size = OpenTaiko.Skin.Game_Notes_Size[0]; if (IsSmallRoll(chip) || (_gt == EGameType.TAIKO && IsYellowRoll(chip))) { _offset = 0; } if (IsBigRoll(chip) || (_gt == EGameType.TAIKO && IsClapRoll(chip))) { - _offset = TJAPlayer3.Skin.Game_Notes_Size[0] * 3; + _offset = OpenTaiko.Skin.Game_Notes_Size[0] * 3; } else if (IsClapRoll(chip) && _gt == EGameType.KONGA) { - _offset = TJAPlayer3.Skin.Game_Notes_Size[0] * 11; + _offset = OpenTaiko.Skin.Game_Notes_Size[0] * 11; } else if (IsYellowRoll(chip) && _gt == EGameType.KONGA) { - _offset = TJAPlayer3.Skin.Game_Notes_Size[0] * 8; + _offset = OpenTaiko.Skin.Game_Notes_Size[0] * 8; } else if (IsFuzeRoll(chip)) { - _texarr = TJAPlayer3.Tx.Note_FuseRoll; + _texarr = OpenTaiko.Tx.Note_FuseRoll; _offset = -rollOrigin; } @@ -368,7 +368,7 @@ namespace TJAPlayer3 { var div = dist / image_size; //var odiv = (index - _adjust + _adjust + 1) / TJAPlayer3.Skin.Game_Notes_Size[0]; - if (TJAPlayer3.Skin.Game_RollColorMode != CSkin.RollColorMode.None) + if (OpenTaiko.Skin.Game_RollColorMode != CSkin.RollColorMode.None) _texarr.color4 = effectedColor; else _texarr.color4 = normalColor; @@ -382,7 +382,7 @@ namespace TJAPlayer3 { var _center_x = (x + x末端 + image_size) / 2; var _center_y = _adjust + (y + y末端) / 2; //TJAPlayer3.Tx.Notes[(int)_gt].t2D描画(_x0, _y0, new Rectangle(rollOrigin + TJAPlayer3.Skin.Game_Notes_Size[0] + _offset, 0, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); - _texarr.t2D_DisplayImage_RollNote((int)_center_x, (int)_center_y, new Rectangle(rollOrigin + TJAPlayer3.Skin.Game_Notes_Size[0] + _offset, 0, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + _texarr.t2D_DisplayImage_RollNote((int)_center_x, (int)_center_y, new Rectangle(rollOrigin + OpenTaiko.Skin.Game_Notes_Size[0] + _offset, 0, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); //t2D拡大率考慮中央基準描画 t2D中心基準描画 // Tail @@ -401,38 +401,38 @@ namespace TJAPlayer3 { var _xc = x2 + (x2 - x1) * _d / dist; var _yc = y2 + (y2 - y1) * _d / dist; //TJAPlayer3.Tx.Notes[(int)_gt].t2D描画((int)_x0, (int)_y0, 0, new Rectangle(rollOrigin + (TJAPlayer3.Skin.Game_Notes_Size[0] * 2) + _offset, frame, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); - _texarr.t2D中心基準描画((int)_xc, (int)_yc, 0, new Rectangle(rollOrigin + (TJAPlayer3.Skin.Game_Notes_Size[0] * 2) + _offset, frame, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + _texarr.t2D中心基準描画((int)_xc, (int)_yc, 0, new Rectangle(rollOrigin + (OpenTaiko.Skin.Game_Notes_Size[0] * 2) + _offset, frame, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); } _texarr.fZ軸中心回転 = 0; - if (TJAPlayer3.Skin.Game_RollColorMode == CSkin.RollColorMode.All) + if (OpenTaiko.Skin.Game_RollColorMode == CSkin.RollColorMode.All) _texarr.color4 = effectedColor; else _texarr.color4 = normalColor; // Head - _texarr.t2D描画(x, y, 0, new Rectangle(rollOrigin + _offset, frame, TJAPlayer3.Skin.Game_Notes_Size[0], TJAPlayer3.Skin.Game_Notes_Size[1])); + _texarr.t2D描画(x, y, 0, new Rectangle(rollOrigin + _offset, frame, OpenTaiko.Skin.Game_Notes_Size[0], OpenTaiko.Skin.Game_Notes_Size[1])); _texarr.color4 = normalColor; } // SENotes public static void DisplaySENotes(int player, int x, int y, CDTX.CChip chip) { - if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(player)] == EStealthMode.STEALTH) + if (OpenTaiko.ConfigIni.eSTEALTH[OpenTaiko.GetActualPlayer(player)] == EStealthMode.STEALTH) return; - EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; + EGameType _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(player)]; if (IsMine(chip)) { - TJAPlayer3.Tx.SENotesExtension?.t2D描画(x, y, new Rectangle(0, TJAPlayer3.Skin.Game_SENote_Size[1], TJAPlayer3.Skin.Game_SENote_Size[0], TJAPlayer3.Skin.Game_SENote_Size[1])); + OpenTaiko.Tx.SENotesExtension?.t2D描画(x, y, new Rectangle(0, OpenTaiko.Skin.Game_SENote_Size[1], OpenTaiko.Skin.Game_SENote_Size[0], OpenTaiko.Skin.Game_SENote_Size[1])); } else if (IsPurpleNote(chip) && _gt != EGameType.KONGA) { - TJAPlayer3.Tx.SENotesExtension?.t2D描画(x, y, new Rectangle(0, 0, TJAPlayer3.Skin.Game_SENote_Size[0], TJAPlayer3.Skin.Game_SENote_Size[1])); + OpenTaiko.Tx.SENotesExtension?.t2D描画(x, y, new Rectangle(0, 0, OpenTaiko.Skin.Game_SENote_Size[0], OpenTaiko.Skin.Game_SENote_Size[1])); } else if (IsFuzeRoll(chip)) { - TJAPlayer3.Tx.SENotesExtension?.t2D描画(x, y, new Rectangle(0, TJAPlayer3.Skin.Game_SENote_Size[1] * 2, TJAPlayer3.Skin.Game_SENote_Size[0], TJAPlayer3.Skin.Game_SENote_Size[1])); + OpenTaiko.Tx.SENotesExtension?.t2D描画(x, y, new Rectangle(0, OpenTaiko.Skin.Game_SENote_Size[1] * 2, OpenTaiko.Skin.Game_SENote_Size[0], OpenTaiko.Skin.Game_SENote_Size[1])); } else if (IsKusudama(chip)) { - TJAPlayer3.Tx.SENotesExtension?.t2D描画(x, y, new Rectangle(0, TJAPlayer3.Skin.Game_SENote_Size[1] * 3, TJAPlayer3.Skin.Game_SENote_Size[0], TJAPlayer3.Skin.Game_SENote_Size[1])); + OpenTaiko.Tx.SENotesExtension?.t2D描画(x, y, new Rectangle(0, OpenTaiko.Skin.Game_SENote_Size[1] * 3, OpenTaiko.Skin.Game_SENote_Size[0], OpenTaiko.Skin.Game_SENote_Size[1])); } else { - TJAPlayer3.Tx.SENotes[(int)_gt]?.t2D描画(x, y, new Rectangle(0, TJAPlayer3.Skin.Game_SENote_Size[1] * chip.nSenote, TJAPlayer3.Skin.Game_SENote_Size[0], TJAPlayer3.Skin.Game_SENote_Size[1])); + OpenTaiko.Tx.SENotes[(int)_gt]?.t2D描画(x, y, new Rectangle(0, OpenTaiko.Skin.Game_SENote_Size[1] * chip.nSenote, OpenTaiko.Skin.Game_SENote_Size[0], OpenTaiko.Skin.Game_SENote_Size[1])); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/Rainbow.cs b/OpenTaiko/src/Stages/07.Game/Taiko/Rainbow.cs index e32935a6..6804b4d5 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/Rainbow.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/Rainbow.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class Rainbow : CActivity { // コンストラクタ @@ -11,17 +11,17 @@ namespace TJAPlayer3 { } public virtual void Start(int player) { - if (TJAPlayer3.Tx.Effects_Rainbow != null && !TJAPlayer3.ConfigIni.SimpleMode) { + if (OpenTaiko.Tx.Effects_Rainbow != null && !OpenTaiko.ConfigIni.SimpleMode) { for (int i = 0; i < 2; i++) { if (!this.Rainbow1P[i].IsUsing && player == 0) { this.Rainbow1P[i].IsUsing = true; - this.Rainbow1P[i].Counter = new CCounter(0, 164, TJAPlayer3.Skin.Game_Effect_Rainbow_Timer, TJAPlayer3.Timer); // カウンタ + this.Rainbow1P[i].Counter = new CCounter(0, 164, OpenTaiko.Skin.Game_Effect_Rainbow_Timer, OpenTaiko.Timer); // カウンタ this.Rainbow1P[i].Player = player; break; } if (!this.Rainbow2P[i].IsUsing && player == 1) { this.Rainbow2P[i].IsUsing = true; - this.Rainbow2P[i].Counter = new CCounter(0, 164, TJAPlayer3.Skin.Game_Effect_Rainbow_Timer, TJAPlayer3.Timer); // カウンタ + this.Rainbow2P[i].Counter = new CCounter(0, 164, OpenTaiko.Skin.Game_Effect_Rainbow_Timer, OpenTaiko.Timer); // カウンタ this.Rainbow2P[i].Player = player; break; } @@ -53,8 +53,8 @@ namespace TJAPlayer3 { base.ReleaseManagedResource(); } public override int Draw() { - if (!base.IsDeActivated && !TJAPlayer3.ConfigIni.SimpleMode) { - if (TJAPlayer3.ConfigIni.nPlayerCount > 2) return base.Draw(); + if (!base.IsDeActivated && !OpenTaiko.ConfigIni.SimpleMode) { + if (OpenTaiko.ConfigIni.nPlayerCount > 2) return base.Draw(); for (int f = 0; f < 2; f++) { if (this.Rainbow1P[f].IsUsing) { this.Rainbow1P[f].Counter.Tick(); @@ -63,18 +63,18 @@ namespace TJAPlayer3 { this.Rainbow1P[f].IsUsing = false; } - if (TJAPlayer3.Tx.Effects_Rainbow != null && this.Rainbow1P[f].Player == 0) //画像が出来るまで + if (OpenTaiko.Tx.Effects_Rainbow != null && this.Rainbow1P[f].Player == 0) //画像が出来るまで { //this.st虹[f].ct進行.n現在の値 = 164; if (this.Rainbow1P[f].Counter.CurrentValue < 82) { - int nRectX = ((this.Rainbow1P[f].Counter.CurrentValue * TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width) / 85); - TJAPlayer3.Tx.Effects_Rainbow.t2D描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0], TJAPlayer3.Skin.Game_Effect_Rainbow_Y[0], - new Rectangle(0, 0, nRectX, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Height)); + int nRectX = ((this.Rainbow1P[f].Counter.CurrentValue * OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Width) / 85); + OpenTaiko.Tx.Effects_Rainbow.t2D描画(OpenTaiko.Skin.Game_Effect_Rainbow_X[0], OpenTaiko.Skin.Game_Effect_Rainbow_Y[0], + new Rectangle(0, 0, nRectX, OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Height)); } else if (this.Rainbow1P[f].Counter.CurrentValue >= 82) { - int nRectX = (((this.Rainbow1P[f].Counter.CurrentValue - 82) * TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width) / 85); - TJAPlayer3.Tx.Effects_Rainbow.t2D描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0] + nRectX, TJAPlayer3.Skin.Game_Effect_Rainbow_Y[0], - new Rectangle(nRectX, 0, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width - nRectX, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Height)); + int nRectX = (((this.Rainbow1P[f].Counter.CurrentValue - 82) * OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Width) / 85); + OpenTaiko.Tx.Effects_Rainbow.t2D描画(OpenTaiko.Skin.Game_Effect_Rainbow_X[0] + nRectX, OpenTaiko.Skin.Game_Effect_Rainbow_Y[0], + new Rectangle(nRectX, 0, OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Width - nRectX, OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Height)); } } @@ -89,18 +89,18 @@ namespace TJAPlayer3 { this.Rainbow2P[f].IsUsing = false; } - if (TJAPlayer3.Tx.Effects_Rainbow != null && this.Rainbow2P[f].Player == 1) //画像が出来るまで + if (OpenTaiko.Tx.Effects_Rainbow != null && this.Rainbow2P[f].Player == 1) //画像が出来るまで { //this.st虹[f].ct進行.n現在の値 = 164; if (this.Rainbow2P[f].Counter.CurrentValue < 82) { - int nRectX = ((this.Rainbow2P[f].Counter.CurrentValue * TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width) / 85); - TJAPlayer3.Tx.Effects_Rainbow.t2D上下反転描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0], TJAPlayer3.Skin.Game_Effect_Rainbow_Y[1], - new Rectangle(0, 0, nRectX, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Height)); + int nRectX = ((this.Rainbow2P[f].Counter.CurrentValue * OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Width) / 85); + OpenTaiko.Tx.Effects_Rainbow.t2D上下反転描画(OpenTaiko.Skin.Game_Effect_Rainbow_X[0], OpenTaiko.Skin.Game_Effect_Rainbow_Y[1], + new Rectangle(0, 0, nRectX, OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Height)); } else if (this.Rainbow2P[f].Counter.CurrentValue >= 82) { - int nRectX = (((this.Rainbow2P[f].Counter.CurrentValue - 82) * TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width) / 85); - TJAPlayer3.Tx.Effects_Rainbow.t2D上下反転描画(TJAPlayer3.Skin.Game_Effect_Rainbow_X[0] + nRectX, TJAPlayer3.Skin.Game_Effect_Rainbow_Y[1], - new Rectangle(nRectX, 0, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Width - nRectX, TJAPlayer3.Tx.Effects_Rainbow.szTextureSize.Height)); + int nRectX = (((this.Rainbow2P[f].Counter.CurrentValue - 82) * OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Width) / 85); + OpenTaiko.Tx.Effects_Rainbow.t2D上下反転描画(OpenTaiko.Skin.Game_Effect_Rainbow_X[0] + nRectX, OpenTaiko.Skin.Game_Effect_Rainbow_Y[1], + new Rectangle(nRectX, 0, OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Width - nRectX, OpenTaiko.Tx.Effects_Rainbow.szTextureSize.Height)); } } diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs b/OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs index 67f0c7a8..9c47c08c 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs @@ -2,7 +2,7 @@ using FDK; using NLua; -namespace TJAPlayer3 { +namespace OpenTaiko { class ScriptBGFunc { private Dictionary Textures; private string DirPath; @@ -12,15 +12,15 @@ namespace TJAPlayer3 { DirPath = dirPath; } public void DrawText(double x, double y, string text) { - TJAPlayer3.actTextConsole.tPrint((int)x, (int)y, CTextConsole.EFontType.White, text); + OpenTaiko.actTextConsole.tPrint((int)x, (int)y, CTextConsole.EFontType.White, text); } public void DrawNum(double x, double y, double text) { - TJAPlayer3.actTextConsole.tPrint((int)x, (int)y, CTextConsole.EFontType.White, text.ToString()); + OpenTaiko.actTextConsole.tPrint((int)x, (int)y, CTextConsole.EFontType.White, text.ToString()); } public void AddGraph(string fileName) { string trueFileName = fileName.Replace('/', Path.DirectorySeparatorChar); trueFileName = trueFileName.Replace('\\', Path.DirectorySeparatorChar); - Textures.Add(fileName, TJAPlayer3.tテクスチャの生成($@"{DirPath}{Path.DirectorySeparatorChar}{trueFileName}")); + Textures.Add(fileName, OpenTaiko.tテクスチャの生成($@"{DirPath}{Path.DirectorySeparatorChar}{trueFileName}")); } public void DrawGraph(double x, double y, string fileName) { Textures[fileName]?.t2D描画((int)x, (int)y); @@ -160,7 +160,7 @@ namespace TJAPlayer3 { } for (int i = 0; i < texs.Count; i++) { var tex = texs[i]; - TJAPlayer3.tテクスチャの解放(ref tex); + OpenTaiko.tテクスチャの解放(ref tex); } Textures.Clear(); @@ -201,30 +201,30 @@ namespace TJAPlayer3 { string[] raritiesP = { "Common", "Common", "Common", "Common", "Common" }; string[] raritiesC = { "Common", "Common", "Common", "Common", "Common" }; - if (TJAPlayer3.Tx.Puchichara != null && TJAPlayer3.Tx.Characters != null) { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - raritiesP[i] = TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(i))].metadata.Rarity; - raritiesC[i] = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(i)].data.Character].metadata.Rarity; + if (OpenTaiko.Tx.Puchichara != null && OpenTaiko.Tx.Characters != null) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + raritiesP[i] = OpenTaiko.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(OpenTaiko.GetActualPlayer(i))].metadata.Rarity; + raritiesC[i] = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(i)].data.Character].metadata.Rarity; } } // Initialisation - LuaSetConstValues.Call(TJAPlayer3.ConfigIni.nPlayerCount, - TJAPlayer3.P1IsBlue(), - TJAPlayer3.ConfigIni.sLang, - TJAPlayer3.ConfigIni.SimpleMode, + LuaSetConstValues.Call(OpenTaiko.ConfigIni.nPlayerCount, + OpenTaiko.P1IsBlue(), + OpenTaiko.ConfigIni.sLang, + OpenTaiko.ConfigIni.SimpleMode, raritiesP, raritiesC ); - LuaUpdateValues.Call(TJAPlayer3.FPS.DeltaTime, - TJAPlayer3.FPS.NowFPS, - TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared, + LuaUpdateValues.Call(OpenTaiko.FPS.DeltaTime, + OpenTaiko.FPS.NowFPS, + OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared, 0, - TJAPlayer3.stage演奏ドラム画面.AIBattleState, - TJAPlayer3.stage演奏ドラム画面.bIsAIBattleWin, - TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値, - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM, + OpenTaiko.stage演奏ドラム画面.AIBattleState, + OpenTaiko.stage演奏ドラム画面.bIsAIBattleWin, + OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値, + OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM, new bool[] { false, false, false, false, false }, -1 ); @@ -240,32 +240,32 @@ namespace TJAPlayer3 { try { float currentFloorPositionMax140 = 0; - if (TJAPlayer3.stageSongSelect.rChoosenSong != null && TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5] != null) { - int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; + if (OpenTaiko.stageSongSelect.rChoosenSong != null && OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5] != null) { + int maxFloor = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; int nightTime = Math.Max(140, maxFloor / 2); - currentFloorPositionMax140 = Math.Min(TJAPlayer3.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); + currentFloorPositionMax140 = Math.Min(OpenTaiko.stage演奏ドラム画面.actPlayInfo.NowMeasure[0] / (float)nightTime, 1f); } double timestamp = -1.0; - if (TJAPlayer3.DTX != null) { - double timeoffset = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan ? -2.0 : -8.2; + if (OpenTaiko.DTX != null) { + double timeoffset = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan ? -2.0 : -8.2; // Due to the fact that all Dans use DELAY to offset instead of OFFSET, Dan offset can't be properly synced. ¯\_(ツ)_/¯ - timestamp = (((double)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) / 1000.0) + - (-(TJAPlayer3.ConfigIni.MusicPreTimeMs + TJAPlayer3.DTX.nOFFSET) / 1000.0) + + timestamp = (((double)(SoundManager.PlayTimer.NowTime * OpenTaiko.ConfigIni.SongPlaybackSpeed)) / 1000.0) + + (-(OpenTaiko.ConfigIni.MusicPreTimeMs + OpenTaiko.DTX.nOFFSET) / 1000.0) + timeoffset; } - LuaUpdateValues.Call(TJAPlayer3.FPS.DeltaTime, - TJAPlayer3.FPS.NowFPS, - TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared, + LuaUpdateValues.Call(OpenTaiko.FPS.DeltaTime, + OpenTaiko.FPS.NowFPS, + OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared, (double)currentFloorPositionMax140, - TJAPlayer3.stage演奏ドラム画面.AIBattleState, - TJAPlayer3.stage演奏ドラム画面.bIsAIBattleWin, - TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値, - TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM, - TJAPlayer3.stage演奏ドラム画面.bIsGOGOTIME, + OpenTaiko.stage演奏ドラム画面.AIBattleState, + OpenTaiko.stage演奏ドラム画面.bIsAIBattleWin, + OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値, + OpenTaiko.stage演奏ドラム画面.actPlayInfo.dbBPM, + OpenTaiko.stage演奏ドラム画面.bIsGOGOTIME, timestamp); /*LuaScript.SetObjectToPath("fps", TJAPlayer3.FPS.n現在のFPS); LuaScript.SetObjectToPath("deltaTime", TJAPlayer3.FPS.DeltaTime); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/TaikoLaneFlash.cs b/OpenTaiko/src/Stages/07.Game/Taiko/TaikoLaneFlash.cs index 5f082e54..85a64ba8 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/TaikoLaneFlash.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/TaikoLaneFlash.cs @@ -1,7 +1,7 @@ using FDK; -using static TJAPlayer3.PlayerLane; +using static OpenTaiko.PlayerLane; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class TaikoLaneFlash : CActivity { // コンストラクタ @@ -11,21 +11,21 @@ namespace TJAPlayer3 { public override void Activate() { - PlayerLane = new PlayerLane[TJAPlayer3.ConfigIni.nPlayerCount]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + PlayerLane = new PlayerLane[OpenTaiko.ConfigIni.nPlayerCount]; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { PlayerLane[i] = new PlayerLane(i); } base.Activate(); } public override void DeActivate() { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { PlayerLane[i] = null; } base.DeActivate(); } public override int Draw() { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { for (int j = 0; j < (int)FlashType.Total; j++) { PlayerLane[i].Flash[j].Draw(); } @@ -39,21 +39,21 @@ namespace TJAPlayer3 { public class PlayerLane { public PlayerLane(int player) { Flash = new LaneFlash[(int)FlashType.Total]; - var _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; + var _gt = OpenTaiko.ConfigIni.nGameType[OpenTaiko.GetActualPlayer(player)]; for (int i = 0; i < (int)FlashType.Total; i++) { switch (i) { case (int)FlashType.Red: - Flash[i] = new LaneFlash(ref TJAPlayer3.Tx.Lane_Red[(int)_gt], player); + Flash[i] = new LaneFlash(ref OpenTaiko.Tx.Lane_Red[(int)_gt], player); break; case (int)FlashType.Blue: - Flash[i] = new LaneFlash(ref TJAPlayer3.Tx.Lane_Blue[(int)_gt], player); + Flash[i] = new LaneFlash(ref OpenTaiko.Tx.Lane_Blue[(int)_gt], player); break; case (int)FlashType.Clap: - Flash[i] = new LaneFlash(ref TJAPlayer3.Tx.Lane_Clap[(int)_gt], player); + Flash[i] = new LaneFlash(ref OpenTaiko.Tx.Lane_Clap[(int)_gt], player); break; case (int)FlashType.Hit: - Flash[i] = new LaneFlash(ref TJAPlayer3.Tx.Lane_Yellow, player); + Flash[i] = new LaneFlash(ref OpenTaiko.Tx.Lane_Yellow, player); break; default: break; diff --git a/OpenTaiko/src/Stages/08.Result/CActResultImage.cs b/OpenTaiko/src/Stages/08.Result/CActResultImage.cs index b3322842..b6c492d2 100644 --- a/OpenTaiko/src/Stages/08.Result/CActResultImage.cs +++ b/OpenTaiko/src/Stages/08.Result/CActResultImage.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActResultImage : CActivity { // コンストラクタ /// @@ -43,7 +43,7 @@ namespace TJAPlayer3 { return 0; } if (base.IsFirstDraw) { - this.ct登場用 = new CCounter(0, 100, 5, TJAPlayer3.Timer); + this.ct登場用 = new CCounter(0, 100, 5, OpenTaiko.Timer); base.IsFirstDraw = false; } this.ct登場用.Tick(); @@ -64,17 +64,17 @@ namespace TJAPlayer3 { private CTexture txリザルト画像; private bool tプレビュー画像の指定があれば構築する() { - if (string.IsNullOrEmpty(TJAPlayer3.DTX.PREIMAGE)) { + if (string.IsNullOrEmpty(OpenTaiko.DTX.PREIMAGE)) { return false; } - TJAPlayer3.tDisposeSafely(ref this.txリザルト画像); + OpenTaiko.tDisposeSafely(ref this.txリザルト画像); this.r表示するリザルト画像 = null; - string path = TJAPlayer3.DTX.strフォルダ名 + TJAPlayer3.DTX.PREIMAGE; + string path = OpenTaiko.DTX.strフォルダ名 + OpenTaiko.DTX.PREIMAGE; if (!File.Exists(path)) { Trace.TraceWarning("ファイルが存在しません。({0})", new object[] { path }); return false; } - this.txリザルト画像 = TJAPlayer3.tテクスチャの生成(path); + this.txリザルト画像 = OpenTaiko.tテクスチャの生成(path); this.r表示するリザルト画像 = this.txリザルト画像; return (this.r表示するリザルト画像 != null); } diff --git a/OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs b/OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs index 21710d5d..aa36e3fe 100644 --- a/OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs +++ b/OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActResultParameterPanel : CActivity { // コンストラクタ @@ -159,7 +159,7 @@ namespace TJAPlayer3 { public void tSkipResultAnimations() { - TJAPlayer3.stage結果.Background.SkipAnimation(); + OpenTaiko.stage結果.Background.SkipAnimation(); ctMainCounter.CurrentValue = (int)MountainAppearValue; for (int i = 0; i < b音声再生.Length; i++) { @@ -168,11 +168,11 @@ namespace TJAPlayer3 { for (int i = 0; i < 5; i++) { if (!ctゲージアニメ[i].IsTicked) - ctゲージアニメ[i].Start(0, gaugeValues[i] / 2, 59, TJAPlayer3.Timer); + ctゲージアニメ[i].Start(0, gaugeValues[i] / 2, 59, OpenTaiko.Timer); ctゲージアニメ[i].CurrentValue = (int)ctゲージアニメ[i].EndValue; } - TJAPlayer3.Skin.soundGauge.tStop(); + OpenTaiko.Skin.soundGauge.tStop(); } // CActivity 実装 @@ -180,7 +180,7 @@ namespace TJAPlayer3 { public override void Activate() { this.sdDTXで指定されたフルコンボ音 = null; - ttkAISection = new TitleTextureKey[TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count]; + ttkAISection = new TitleTextureKey[OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count]; for (int i = 0; i < ttkAISection.Length; i++) { ttkAISection[i] = new TitleTextureKey($"{i + 1}区", pfAISectionText, Color.White, Color.Black, 1280); @@ -189,17 +189,17 @@ namespace TJAPlayer3 { for (int i = 0; i < 5; i++) { ttkSpeechText[i] = new TitleTextureKey[6]; - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(i)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(i)].data.Character; for (int j = 0; j < 6; j++) { // { "simplestyleSweat", "...", "○", "◎", "★", "!!!!" } ttkSpeechText[i][j] = new TitleTextureKey( - TJAPlayer3.Tx.Characters[_charaId].metadata.SpeechText[j].GetString(""), - pfSpeechText, Color.White, Color.Black, TJAPlayer3.Skin.Result_Speech_Text_MaxWidth); + OpenTaiko.Tx.Characters[_charaId].metadata.SpeechText[j].GetString(""), + pfSpeechText, Color.White, Color.Black, OpenTaiko.Skin.Result_Speech_Text_MaxWidth); } } - ctMainCounter = new CCounter(0, 50000, 1, TJAPlayer3.Timer); + ctMainCounter = new CCounter(0, 50000, 1, OpenTaiko.Timer); ctゲージアニメ = new CCounter[5]; for (int i = 0; i < 5; i++) @@ -210,17 +210,17 @@ namespace TJAPlayer3 { ctSoul = new CCounter(); ctEndAnime = new CCounter(); - ctBackgroundAnime = new CCounter(0, 1000, 1, TJAPlayer3.Timer); - ctBackgroundAnime_Clear = new CCounter(0, 1000, 1, TJAPlayer3.Timer); + ctBackgroundAnime = new CCounter(0, 1000, 1, OpenTaiko.Timer); + ctBackgroundAnime_Clear = new CCounter(0, 1000, 1, OpenTaiko.Timer); ctMountain_ClearIn = new CCounter(); - RandomText = TJAPlayer3.Random.Next(3); + RandomText = OpenTaiko.Random.Next(3); - ctFlash_Icon = new CCounter(0, 3000, 1, TJAPlayer3.Timer); - ctRotate_Flowers = new CCounter(0, 1500, 1, TJAPlayer3.Timer); - ctShine_Plate = new CCounter(0, 1000, 1, TJAPlayer3.Timer); + ctFlash_Icon = new CCounter(0, 3000, 1, OpenTaiko.Timer); + ctRotate_Flowers = new CCounter(0, 1500, 1, OpenTaiko.Timer); + ctShine_Plate = new CCounter(0, 1000, 1, OpenTaiko.Timer); - ctAISectionChange = new CCounter(0, 2000, 1, TJAPlayer3.Timer); + ctAISectionChange = new CCounter(0, 2000, 1, OpenTaiko.Timer); ctAISectionChange.CurrentValue = 255; ctUIMove = new CCounter(); @@ -233,8 +233,8 @@ namespace TJAPlayer3 { } gaugeValues = new int[5]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - gaugeValues[i] = (int)TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値[i]; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + gaugeValues[i] = (int)OpenTaiko.stage演奏ドラム画面.actGauge.db現在のゲージ値[i]; } // Replace by max between 2 gauges if 2p @@ -256,20 +256,20 @@ namespace TJAPlayer3 { } if (this.sdDTXで指定されたフルコンボ音 != null) { - TJAPlayer3.SoundManager.tDisposeSound(this.sdDTXで指定されたフルコンボ音); + OpenTaiko.SoundManager.tDisposeSound(this.sdDTXで指定されたフルコンボ音); this.sdDTXで指定されたフルコンボ音 = null; } base.DeActivate(); } public override void CreateManagedResource() { - pfSpeechText = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Result_Speech_Text_Size); - pfAISectionText = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Result_AIBattle_SectionText_Scale); + pfSpeechText = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Result_Speech_Text_Size); + pfAISectionText = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Result_AIBattle_SectionText_Scale); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tDisposeSafely(ref pfSpeechText); - TJAPlayer3.tDisposeSafely(ref pfAISectionText); + OpenTaiko.tDisposeSafely(ref pfSpeechText); + OpenTaiko.tDisposeSafely(ref pfAISectionText); base.ReleaseManagedResource(); } @@ -278,7 +278,7 @@ namespace TJAPlayer3 { return 0; } if (base.IsFirstDraw) { - this.ct表示用 = new CCounter(0, 0x3e7, 2, TJAPlayer3.Timer); + this.ct表示用 = new CCounter(0, 0x3e7, 2, OpenTaiko.Timer); base.IsFirstDraw = false; } this.ct表示用.Tick(); @@ -300,23 +300,23 @@ namespace TJAPlayer3 { // this.PuchiChara.IdleAnimation(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { int[] namePlate_x = new int[5]; int[] namePlate_y = new int[5]; - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - namePlate_x[i] = TJAPlayer3.Skin.Result_NamePlate_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[i]; - namePlate_y[i] = TJAPlayer3.Skin.Result_NamePlate_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[i]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - namePlate_x[i] = TJAPlayer3.Skin.Result_NamePlate_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[i]; - namePlate_y[i] = TJAPlayer3.Skin.Result_NamePlate_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[i]; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + namePlate_x[i] = OpenTaiko.Skin.Result_NamePlate_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[i]; + namePlate_y[i] = OpenTaiko.Skin.Result_NamePlate_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[i]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + namePlate_x[i] = OpenTaiko.Skin.Result_NamePlate_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[i]; + namePlate_y[i] = OpenTaiko.Skin.Result_NamePlate_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[i]; } else { int pos = i; - if (TJAPlayer3.P1IsBlue()) + if (OpenTaiko.P1IsBlue()) pos = 1; - namePlate_x[pos] = TJAPlayer3.Skin.Result_NamePlate_X[pos]; - namePlate_y[pos] = TJAPlayer3.Skin.Result_NamePlate_Y[pos]; + namePlate_x[pos] = OpenTaiko.Skin.Result_NamePlate_X[pos]; + namePlate_y[pos] = OpenTaiko.Skin.Result_NamePlate_Y[pos]; } } @@ -327,20 +327,20 @@ namespace TJAPlayer3 { int AnimeCount = 3000 + GaugeFactor * 59; int ScoreApparitionTimeStamp = AnimeCount + 420 * 4 + 840; - bool is1P = (TJAPlayer3.ConfigIni.nPlayerCount == 1); - bool is2PSide = TJAPlayer3.P1IsBlue(); + bool is1P = (OpenTaiko.ConfigIni.nPlayerCount == 1); + bool is2PSide = OpenTaiko.P1IsBlue(); int shift = 635; int uioffset_x = 0; double uioffset_value = Math.Sin((ctUIMove.CurrentValue / 1000.0) * Math.PI / 2.0); if (is1P) { - uioffset_x = (int)(uioffset_value * TJAPlayer3.Skin.Resolution[0] / 2.0); + uioffset_x = (int)(uioffset_value * OpenTaiko.Skin.Resolution[0] / 2.0); if (is2PSide) uioffset_x *= -1; } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; // 1 if right, 0 if left int shiftPos = (i == 1 || is2PSide) ? 1 : i; @@ -351,21 +351,21 @@ namespace TJAPlayer3 { #region [General plate animations] - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) { + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) { if (shiftPos == 0) - TJAPlayer3.Tx.Result_Panel.t2D描画(0 + uioffset_x, 0); + OpenTaiko.Tx.Result_Panel.t2D描画(0 + uioffset_x, 0); else - TJAPlayer3.Tx.Result_Panel_2P.t2D描画(0 + uioffset_x, 0); + OpenTaiko.Tx.Result_Panel_2P.t2D描画(0 + uioffset_x, 0); } else { - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - TJAPlayer3.Tx.Result_Panel_5P[i].t2D描画(TJAPlayer3.Skin.Result_UIMove_5P_X[i], TJAPlayer3.Skin.Result_UIMove_5P_Y[i]); + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + OpenTaiko.Tx.Result_Panel_5P[i].t2D描画(OpenTaiko.Skin.Result_UIMove_5P_X[i], OpenTaiko.Skin.Result_UIMove_5P_Y[i]); } else { - TJAPlayer3.Tx.Result_Panel_4P[i].t2D描画(TJAPlayer3.Skin.Result_UIMove_4P_X[i], TJAPlayer3.Skin.Result_UIMove_4P_Y[i]); + OpenTaiko.Tx.Result_Panel_4P[i].t2D描画(OpenTaiko.Skin.Result_UIMove_4P_X[i], OpenTaiko.Skin.Result_UIMove_4P_Y[i]); } } //if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) - var _frame = TJAPlayer3.Tx.Result_Gauge_Frame; + var _frame = OpenTaiko.Tx.Result_Gauge_Frame; if (_frame != null) { int bar_x; int bar_y; @@ -373,28 +373,28 @@ namespace TJAPlayer3 { int gauge_base_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { _frame.vcScaleRatio.X = 0.5f; - bar_x = TJAPlayer3.Skin.Result_DifficultyBar_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - bar_y = TJAPlayer3.Skin.Result_DifficultyBar_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - gauge_base_y = TJAPlayer3.Skin.Result_Gauge_Base_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { + bar_x = OpenTaiko.Skin.Result_DifficultyBar_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + bar_y = OpenTaiko.Skin.Result_DifficultyBar_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + gauge_base_x = OpenTaiko.Skin.Result_Gauge_Base_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + gauge_base_y = OpenTaiko.Skin.Result_Gauge_Base_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { _frame.vcScaleRatio.X = 0.5f; - bar_x = TJAPlayer3.Skin.Result_DifficultyBar_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - bar_y = TJAPlayer3.Skin.Result_DifficultyBar_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; - gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - gauge_base_y = TJAPlayer3.Skin.Result_Gauge_Base_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + bar_x = OpenTaiko.Skin.Result_DifficultyBar_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + bar_y = OpenTaiko.Skin.Result_DifficultyBar_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; + gauge_base_x = OpenTaiko.Skin.Result_Gauge_Base_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + gauge_base_y = OpenTaiko.Skin.Result_Gauge_Base_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { _frame.vcScaleRatio.X = 1.0f; - bar_x = TJAPlayer3.Skin.Result_DifficultyBar_X[pos] + uioffset_x; - bar_y = TJAPlayer3.Skin.Result_DifficultyBar_Y[pos]; - gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_X[pos] + uioffset_x; - gauge_base_y = TJAPlayer3.Skin.Result_Gauge_Base_Y[pos]; + bar_x = OpenTaiko.Skin.Result_DifficultyBar_X[pos] + uioffset_x; + bar_y = OpenTaiko.Skin.Result_DifficultyBar_Y[pos]; + gauge_base_x = OpenTaiko.Skin.Result_Gauge_Base_X[pos] + uioffset_x; + gauge_base_y = OpenTaiko.Skin.Result_Gauge_Base_Y[pos]; } - TJAPlayer3.Tx.Result_Diff_Bar.t2D描画(bar_x, bar_y, - new RectangleF(0, TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i] * TJAPlayer3.Skin.Result_DifficultyBar_Size[1], TJAPlayer3.Skin.Result_DifficultyBar_Size[0], TJAPlayer3.Skin.Result_DifficultyBar_Size[1])); + OpenTaiko.Tx.Result_Diff_Bar.t2D描画(bar_x, bar_y, + new RectangleF(0, OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i] * OpenTaiko.Skin.Result_DifficultyBar_Size[1], OpenTaiko.Skin.Result_DifficultyBar_Size[0], OpenTaiko.Skin.Result_DifficultyBar_Size[1])); _frame.t2D描画(gauge_base_x, gauge_base_y); _frame.vcScaleRatio.X = 1.0f; @@ -404,13 +404,13 @@ namespace TJAPlayer3 { #region [ Gauge updates ] if (!b音声再生[0]) { - TJAPlayer3.Skin.soundGauge.tPlay(); + OpenTaiko.Skin.soundGauge.tPlay(); b音声再生[0] = true; } // Split gauge counter, one for each player in two if (!ctゲージアニメ[i].IsTicked) { - ctゲージアニメ[i].Start(0, gaugeValues[i] / 2, 59, TJAPlayer3.Timer); + ctゲージアニメ[i].Start(0, gaugeValues[i] / 2, 59, OpenTaiko.Timer); if (ctMainCounter.CurrentValue >= MountainAppearValue) ctゲージアニメ[i].CurrentValue = (int)ctゲージアニメ[i].EndValue; } @@ -419,20 +419,20 @@ namespace TJAPlayer3 { if (ctゲージアニメ[i].IsEnded) { if (ctゲージアニメ[i].CurrentValue != 50) { // Gauge didn't reach rainbow - if (TJAPlayer3.ConfigIni.nPlayerCount < 2 + if (OpenTaiko.ConfigIni.nPlayerCount < 2 || ctゲージアニメ[(i == 0) ? 1 : 0].IsEnded) - TJAPlayer3.Skin.soundGauge.tStop(); + OpenTaiko.Skin.soundGauge.tStop(); } else { // Gauge reached rainbow - if (!TJAPlayer3.Skin.soundGauge.bIsPlaying) { - TJAPlayer3.Skin.soundGauge.tStop(); + if (!OpenTaiko.Skin.soundGauge.bIsPlaying) { + OpenTaiko.Skin.soundGauge.tStop(); } if (!ct虹ゲージアニメ.IsTicked) - ct虹ゲージアニメ.Start(0, TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn - 1, TJAPlayer3.Skin.Result_Gauge_Rainbow_Interval, TJAPlayer3.Timer); + ct虹ゲージアニメ.Start(0, OpenTaiko.Skin.Result_Gauge_Rainbow_Ptn - 1, OpenTaiko.Skin.Result_Gauge_Rainbow_Interval, OpenTaiko.Timer); if (!ctSoul.IsTicked) - ctSoul.Start(0, 8, 33, TJAPlayer3.Timer); + ctSoul.Start(0, 8, 33, OpenTaiko.Timer); ct虹ゲージアニメ.TickLoop(); ctSoul.TickLoop(); @@ -455,85 +455,85 @@ namespace TJAPlayer3 { int[] scoresArr = { - TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGreat, - TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGood, - TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMiss, - TJAPlayer3.stage演奏ドラム画面.GetRoll(i), - TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[i], - TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nADLIB, - TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMine, + OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGreat, + OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGood, + OpenTaiko.stage演奏ドラム画面.CChartScore[i].nMiss, + OpenTaiko.stage演奏ドラム画面.GetRoll(i), + OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[i], + OpenTaiko.stage演奏ドラム画面.CChartScore[i].nADLIB, + OpenTaiko.stage演奏ドラム画面.CChartScore[i].nMine, }; int[][] num_x; int[][] num_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { num_x = new int[][] { new int[5], new int[5], new int[5], new int[5], new int[5], new int[5], new int[5] }; num_y = new int[][] { new int[5], new int[5], new int[5], new int[5], new int[5], new int[5], new int[5] }; - num_x[0][pos] = TJAPlayer3.Skin.Result_Perfect_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - num_y[0][pos] = TJAPlayer3.Skin.Result_Perfect_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; + num_x[0][pos] = OpenTaiko.Skin.Result_Perfect_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + num_y[0][pos] = OpenTaiko.Skin.Result_Perfect_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; - num_x[1][pos] = TJAPlayer3.Skin.Result_Good_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - num_y[1][pos] = TJAPlayer3.Skin.Result_Good_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; + num_x[1][pos] = OpenTaiko.Skin.Result_Good_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + num_y[1][pos] = OpenTaiko.Skin.Result_Good_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; - num_x[2][pos] = TJAPlayer3.Skin.Result_Miss_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - num_y[2][pos] = TJAPlayer3.Skin.Result_Miss_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; + num_x[2][pos] = OpenTaiko.Skin.Result_Miss_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + num_y[2][pos] = OpenTaiko.Skin.Result_Miss_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; - num_x[3][pos] = TJAPlayer3.Skin.Result_Roll_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - num_y[3][pos] = TJAPlayer3.Skin.Result_Roll_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; + num_x[3][pos] = OpenTaiko.Skin.Result_Roll_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + num_y[3][pos] = OpenTaiko.Skin.Result_Roll_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; - num_x[4][pos] = TJAPlayer3.Skin.Result_MaxCombo_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - num_y[4][pos] = TJAPlayer3.Skin.Result_MaxCombo_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; + num_x[4][pos] = OpenTaiko.Skin.Result_MaxCombo_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + num_y[4][pos] = OpenTaiko.Skin.Result_MaxCombo_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; - num_x[5][pos] = TJAPlayer3.Skin.Result_ADLib_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - num_y[5][pos] = TJAPlayer3.Skin.Result_ADLib_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; + num_x[5][pos] = OpenTaiko.Skin.Result_ADLib_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + num_y[5][pos] = OpenTaiko.Skin.Result_ADLib_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; - num_x[6][pos] = TJAPlayer3.Skin.Result_Bomb_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - num_y[6][pos] = TJAPlayer3.Skin.Result_Bomb_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount > 2) { + num_x[6][pos] = OpenTaiko.Skin.Result_Bomb_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + num_y[6][pos] = OpenTaiko.Skin.Result_Bomb_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount > 2) { num_x = new int[][] { new int[5], new int[5], new int[5], new int[5], new int[5], new int[5], new int[5] }; num_y = new int[][] { new int[5], new int[5], new int[5], new int[5], new int[5], new int[5], new int[5] }; - num_x[0][pos] = TJAPlayer3.Skin.Result_Perfect_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - num_y[0][pos] = TJAPlayer3.Skin.Result_Perfect_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + num_x[0][pos] = OpenTaiko.Skin.Result_Perfect_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + num_y[0][pos] = OpenTaiko.Skin.Result_Perfect_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; - num_x[1][pos] = TJAPlayer3.Skin.Result_Good_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - num_y[1][pos] = TJAPlayer3.Skin.Result_Good_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + num_x[1][pos] = OpenTaiko.Skin.Result_Good_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + num_y[1][pos] = OpenTaiko.Skin.Result_Good_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; - num_x[2][pos] = TJAPlayer3.Skin.Result_Miss_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - num_y[2][pos] = TJAPlayer3.Skin.Result_Miss_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + num_x[2][pos] = OpenTaiko.Skin.Result_Miss_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + num_y[2][pos] = OpenTaiko.Skin.Result_Miss_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; - num_x[3][pos] = TJAPlayer3.Skin.Result_Roll_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - num_y[3][pos] = TJAPlayer3.Skin.Result_Roll_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + num_x[3][pos] = OpenTaiko.Skin.Result_Roll_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + num_y[3][pos] = OpenTaiko.Skin.Result_Roll_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; - num_x[4][pos] = TJAPlayer3.Skin.Result_MaxCombo_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - num_y[4][pos] = TJAPlayer3.Skin.Result_MaxCombo_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + num_x[4][pos] = OpenTaiko.Skin.Result_MaxCombo_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + num_y[4][pos] = OpenTaiko.Skin.Result_MaxCombo_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; - num_x[5][pos] = TJAPlayer3.Skin.Result_ADLib_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - num_y[5][pos] = TJAPlayer3.Skin.Result_ADLib_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + num_x[5][pos] = OpenTaiko.Skin.Result_ADLib_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + num_y[5][pos] = OpenTaiko.Skin.Result_ADLib_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; - num_x[6][pos] = TJAPlayer3.Skin.Result_Bomb_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - num_y[6][pos] = TJAPlayer3.Skin.Result_Bomb_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + num_x[6][pos] = OpenTaiko.Skin.Result_Bomb_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + num_y[6][pos] = OpenTaiko.Skin.Result_Bomb_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { num_x = new int[][] { - TJAPlayer3.Skin.Result_Perfect_X, - TJAPlayer3.Skin.Result_Good_X, - TJAPlayer3.Skin.Result_Miss_X, - TJAPlayer3.Skin.Result_Roll_X, - TJAPlayer3.Skin.Result_MaxCombo_X, - TJAPlayer3.Skin.Result_ADLib_X, - TJAPlayer3.Skin.Result_Bomb_X + OpenTaiko.Skin.Result_Perfect_X, + OpenTaiko.Skin.Result_Good_X, + OpenTaiko.Skin.Result_Miss_X, + OpenTaiko.Skin.Result_Roll_X, + OpenTaiko.Skin.Result_MaxCombo_X, + OpenTaiko.Skin.Result_ADLib_X, + OpenTaiko.Skin.Result_Bomb_X }; num_y = new int[][] { - TJAPlayer3.Skin.Result_Perfect_Y, - TJAPlayer3.Skin.Result_Good_Y, - TJAPlayer3.Skin.Result_Miss_Y, - TJAPlayer3.Skin.Result_Roll_Y, - TJAPlayer3.Skin.Result_MaxCombo_Y, - TJAPlayer3.Skin.Result_ADLib_Y, - TJAPlayer3.Skin.Result_Bomb_Y + OpenTaiko.Skin.Result_Perfect_Y, + OpenTaiko.Skin.Result_Good_Y, + OpenTaiko.Skin.Result_Miss_Y, + OpenTaiko.Skin.Result_Roll_Y, + OpenTaiko.Skin.Result_MaxCombo_Y, + OpenTaiko.Skin.Result_ADLib_Y, + OpenTaiko.Skin.Result_Bomb_Y }; } @@ -541,24 +541,24 @@ namespace TJAPlayer3 { if (ctMainCounter.CurrentValue >= AnimeCount + (Interval * k)) { float numScale = 1.0f; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - numScale = TJAPlayer3.Skin.Result_Number_Scale_5P; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 3 || TJAPlayer3.ConfigIni.nPlayerCount == 4) { - numScale = TJAPlayer3.Skin.Result_Number_Scale_4P; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + numScale = OpenTaiko.Skin.Result_Number_Scale_5P; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 3 || OpenTaiko.ConfigIni.nPlayerCount == 4) { + numScale = OpenTaiko.Skin.Result_Number_Scale_4P; } - TJAPlayer3.Tx.Result_Number.vcScaleRatio.X = ctMainCounter.CurrentValue <= AnimeCount + (Interval * k) + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - (AnimeCount + (Interval * k))) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f; - TJAPlayer3.Tx.Result_Number.vcScaleRatio.Y = ctMainCounter.CurrentValue <= AnimeCount + (Interval * k) + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - (AnimeCount + (Interval * k))) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f; + OpenTaiko.Tx.Result_Number.vcScaleRatio.X = ctMainCounter.CurrentValue <= AnimeCount + (Interval * k) + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - (AnimeCount + (Interval * k))) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f; + OpenTaiko.Tx.Result_Number.vcScaleRatio.Y = ctMainCounter.CurrentValue <= AnimeCount + (Interval * k) + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - (AnimeCount + (Interval * k))) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f; - if ((k != 5 || TJAPlayer3.Skin.Result_ADLib_Show) && (k != 6 || TJAPlayer3.Skin.Result_Bomb_Show)) { + if ((k != 5 || OpenTaiko.Skin.Result_ADLib_Show) && (k != 6 || OpenTaiko.Skin.Result_Bomb_Show)) { this.t小文字表示(num_x[k][pos] + uioffset_x, num_y[k][pos], scoresArr[k], numScale); } - TJAPlayer3.Tx.Result_Number.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.Result_Number.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.Result_Number.vcScaleRatio.X = 1f; + OpenTaiko.Tx.Result_Number.vcScaleRatio.Y = 1f; if (!this.b音声再生[1 + k]) { - if ((k != 5 || TJAPlayer3.Skin.Result_ADLib_Show) && (k != 6 || TJAPlayer3.Skin.Result_Bomb_Show)) { - TJAPlayer3.Skin.soundPon.tPlay(); + if ((k != 5 || OpenTaiko.Skin.Result_ADLib_Show) && (k != 6 || OpenTaiko.Skin.Result_Bomb_Show)) { + OpenTaiko.Skin.soundPon.tPlay(); } this.b音声再生[1 + k] = true; } @@ -574,30 +574,30 @@ namespace TJAPlayer3 { float numScale = 1.0f; int score_x; int score_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - numScale = TJAPlayer3.Skin.Result_Score_Scale_5P; - score_x = TJAPlayer3.Skin.Result_Score_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - score_y = TJAPlayer3.Skin.Result_Score_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - numScale = TJAPlayer3.Skin.Result_Score_Scale_4P; - score_x = TJAPlayer3.Skin.Result_Score_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - score_y = TJAPlayer3.Skin.Result_Score_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + numScale = OpenTaiko.Skin.Result_Score_Scale_5P; + score_x = OpenTaiko.Skin.Result_Score_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + score_y = OpenTaiko.Skin.Result_Score_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + numScale = OpenTaiko.Skin.Result_Score_Scale_4P; + score_x = OpenTaiko.Skin.Result_Score_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + score_y = OpenTaiko.Skin.Result_Score_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { - score_x = TJAPlayer3.Skin.Result_Score_X[pos] + uioffset_x; - score_y = TJAPlayer3.Skin.Result_Score_Y[pos]; + score_x = OpenTaiko.Skin.Result_Score_X[pos] + uioffset_x; + score_y = OpenTaiko.Skin.Result_Score_Y[pos]; } int AnimeCount1 = AnimeCount + Interval * 4 + 840; - TJAPlayer3.Tx.Result_Score_Number.vcScaleRatio.X = ctMainCounter.CurrentValue <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f : + OpenTaiko.Tx.Result_Score_Number.vcScaleRatio.X = ctMainCounter.CurrentValue <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f : ctMainCounter.CurrentValue <= AnimeCount1 + 360 ? 1.0f - (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1 - 270) * (Math.PI / 180)) * 0.1f : 1.0f; - TJAPlayer3.Tx.Result_Score_Number.vcScaleRatio.Y = ctMainCounter.CurrentValue <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f : + OpenTaiko.Tx.Result_Score_Number.vcScaleRatio.Y = ctMainCounter.CurrentValue <= AnimeCount1 + 270 ? 1.0f + (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1) / 1.5f * (Math.PI / 180)) * 0.65f : ctMainCounter.CurrentValue <= AnimeCount1 + 360 ? 1.0f - (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1 - 270) * (Math.PI / 180)) * 0.1f : 1.0f; - this.tスコア文字表示(score_x, score_y, (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(i), numScale);// TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nScore.ToString())); + this.tスコア文字表示(score_x, score_y, (int)OpenTaiko.stage演奏ドラム画面.actScore.Get(i), numScale);// TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nScore.ToString())); if (!b音声再生[8]) { - TJAPlayer3.Skin.soundScoreDon.tPlay(); + OpenTaiko.Skin.soundScoreDon.tPlay(); b音声再生[8] = true; } } @@ -610,74 +610,74 @@ namespace TJAPlayer3 { } - if (ctAISectionChange.CurrentValue == ctAISectionChange.EndValue && TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count > 5) { + if (ctAISectionChange.CurrentValue == ctAISectionChange.EndValue && OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count > 5) { NextAISection(); - } else if (nNowAISection > 0 && TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count <= 5) { + } else if (nNowAISection > 0 && OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count <= 5) { // Fix locked sections nNowAISection = 0; } - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - TJAPlayer3.Tx.Result_AIBattle_Panel_AI.t2D描画(0, 0); + if (OpenTaiko.ConfigIni.bAIBattleMode) { + OpenTaiko.Tx.Result_AIBattle_Panel_AI.t2D描画(0, 0); - int batch_width = TJAPlayer3.Tx.Result_AIBattle_Batch.szTextureSize.Width / 3; - int batch_height = TJAPlayer3.Tx.Result_AIBattle_Batch.szTextureSize.Height; + int batch_width = OpenTaiko.Tx.Result_AIBattle_Batch.szTextureSize.Width / 3; + int batch_height = OpenTaiko.Tx.Result_AIBattle_Batch.szTextureSize.Height; - for (int i = 0; i < TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count; i++) { + for (int i = 0; i < OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count; i++) { int nowIndex = (i / 5); - int drawCount = Math.Min(TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count - (nowIndex * 5), 5); + int drawCount = Math.Min(OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count - (nowIndex * 5), 5); int drawPos = i % 5; - int batch_total_width = TJAPlayer3.Skin.Result_AIBattle_Batch_Move[0] * drawCount; + int batch_total_width = OpenTaiko.Skin.Result_AIBattle_Batch_Move[0] * drawCount; - var section = TJAPlayer3.stage演奏ドラム画面.AIBattleSections[i]; + var section = OpenTaiko.stage演奏ドラム画面.AIBattleSections[i]; int upDown = (drawPos % 2); - int x = TJAPlayer3.Skin.Result_AIBattle_Batch[0] + (TJAPlayer3.Skin.Result_AIBattle_Batch_Move[0] * drawPos) - (batch_total_width / 2); - int y = TJAPlayer3.Skin.Result_AIBattle_Batch[1] + (TJAPlayer3.Skin.Result_AIBattle_Batch_Move[1] * upDown); + int x = OpenTaiko.Skin.Result_AIBattle_Batch[0] + (OpenTaiko.Skin.Result_AIBattle_Batch_Move[0] * drawPos) - (batch_total_width / 2); + int y = OpenTaiko.Skin.Result_AIBattle_Batch[1] + (OpenTaiko.Skin.Result_AIBattle_Batch_Move[1] * upDown); int opacityCounter = Math.Min(ctAISectionChange.CurrentValue, 255); if (nowIndex == nNowAISection) { - TJAPlayer3.Tx.Result_AIBattle_Batch.Opacity = opacityCounter; - TJAPlayer3.Tx.Result_AIBattle_SectionPlate.Opacity = opacityCounter; + OpenTaiko.Tx.Result_AIBattle_Batch.Opacity = opacityCounter; + OpenTaiko.Tx.Result_AIBattle_SectionPlate.Opacity = opacityCounter; if (TitleTextureKey.ResolveTitleTexture(ttkAISection[i]) != null) TitleTextureKey.ResolveTitleTexture(ttkAISection[i]).Opacity = opacityCounter; } else { - TJAPlayer3.Tx.Result_AIBattle_Batch.Opacity = 255 - opacityCounter; - TJAPlayer3.Tx.Result_AIBattle_SectionPlate.Opacity = 255 - opacityCounter; + OpenTaiko.Tx.Result_AIBattle_Batch.Opacity = 255 - opacityCounter; + OpenTaiko.Tx.Result_AIBattle_SectionPlate.Opacity = 255 - opacityCounter; if (TitleTextureKey.ResolveTitleTexture(ttkAISection[i]) != null) TitleTextureKey.ResolveTitleTexture(ttkAISection[i]).Opacity = 255 - opacityCounter; } - TJAPlayer3.Tx.Result_AIBattle_Batch.t2D描画(x, y, new RectangleF(batch_width * 0, 0, batch_width, batch_height)); + OpenTaiko.Tx.Result_AIBattle_Batch.t2D描画(x, y, new RectangleF(batch_width * 0, 0, batch_width, batch_height)); switch (section.End) { case CStage演奏画面共通.AIBattleSection.EndType.Clear: - TJAPlayer3.Tx.Result_AIBattle_Batch.t2D描画(x, y, new Rectangle(batch_width * 1, 0, batch_width, batch_height)); + OpenTaiko.Tx.Result_AIBattle_Batch.t2D描画(x, y, new Rectangle(batch_width * 1, 0, batch_width, batch_height)); break; case CStage演奏画面共通.AIBattleSection.EndType.Lose: - TJAPlayer3.Tx.Result_AIBattle_Batch.t2D描画(x, y, new Rectangle(batch_width * 2, 0, batch_width, batch_height)); + OpenTaiko.Tx.Result_AIBattle_Batch.t2D描画(x, y, new Rectangle(batch_width * 2, 0, batch_width, batch_height)); break; } - TJAPlayer3.Tx.Result_AIBattle_Batch.Opacity = 255; + OpenTaiko.Tx.Result_AIBattle_Batch.Opacity = 255; - TJAPlayer3.Tx.Result_AIBattle_SectionPlate.t2D描画(x + TJAPlayer3.Skin.Result_AIBattle_SectionPlate_Offset[0], y + TJAPlayer3.Skin.Result_AIBattle_SectionPlate_Offset[1]); + OpenTaiko.Tx.Result_AIBattle_SectionPlate.t2D描画(x + OpenTaiko.Skin.Result_AIBattle_SectionPlate_Offset[0], y + OpenTaiko.Skin.Result_AIBattle_SectionPlate_Offset[1]); - TitleTextureKey.ResolveTitleTexture(ttkAISection[i])?.t2D中心基準描画(x + TJAPlayer3.Skin.Result_AIBattle_SectionText_Offset[0], y + TJAPlayer3.Skin.Result_AIBattle_SectionText_Offset[1]); + TitleTextureKey.ResolveTitleTexture(ttkAISection[i])?.t2D中心基準描画(x + OpenTaiko.Skin.Result_AIBattle_SectionText_Offset[0], y + OpenTaiko.Skin.Result_AIBattle_SectionText_Offset[1]); } if (ctMainCounter.CurrentValue >= MountainAppearValue) { float flagScale = 2.0f - (Math.Min(Math.Max(ctMainCounter.CurrentValue - MountainAppearValue, 0), 200) / 200.0f); - CTexture tex = TJAPlayer3.stage結果.bClear[0] ? TJAPlayer3.Tx.Result_AIBattle_WinFlag_Clear : TJAPlayer3.Tx.Result_AIBattle_WinFlag_Lose; + CTexture tex = OpenTaiko.stage結果.bClear[0] ? OpenTaiko.Tx.Result_AIBattle_WinFlag_Clear : OpenTaiko.Tx.Result_AIBattle_WinFlag_Lose; tex.vcScaleRatio.X = flagScale; tex.vcScaleRatio.Y = flagScale; - tex.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_AIBattle_WinFlag[0], TJAPlayer3.Skin.Result_AIBattle_WinFlag[1]); + tex.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Result_AIBattle_WinFlag[0], OpenTaiko.Skin.Result_AIBattle_WinFlag[1]); } } @@ -690,8 +690,8 @@ namespace TJAPlayer3 { #region [Character related animations] - for (int p = 0; p < TJAPlayer3.ConfigIni.nPlayerCount; p++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && p == 1) break; + for (int p = 0; p < OpenTaiko.ConfigIni.nPlayerCount; p++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && p == 1) break; int pos = p; if (is2PSide) @@ -701,11 +701,11 @@ namespace TJAPlayer3 { #region [Mountain animation counter setup] if (!this.ctMountain_ClearIn.IsTicked) - this.ctMountain_ClearIn.Start(0, 515, 3, TJAPlayer3.Timer); + this.ctMountain_ClearIn.Start(0, 515, 3, OpenTaiko.Timer); - if (ctUIMove.EndValue != 1000 && TJAPlayer3.Skin.Result_Use1PUI && is1P) ctUIMove = new CCounter(0, 1000, 0.5, TJAPlayer3.Timer); + if (ctUIMove.EndValue != 1000 && OpenTaiko.Skin.Result_Use1PUI && is1P) ctUIMove = new CCounter(0, 1000, 0.5, OpenTaiko.Timer); - if (TJAPlayer3.stage結果.bClear[p]) { + if (OpenTaiko.stage結果.bClear[p]) { if (!CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.CLEAR)) CResultCharacter.tMenuResetTimer(p, CResultCharacter.ECharacterResult.CLEAR); } else { @@ -726,24 +726,24 @@ namespace TJAPlayer3 { #region [Character Animations] - int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(p)].data.Character; + int _charaId = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(p)].data.Character; //int chara_x = TJAPlayer3.Skin.Characters_Result_X[_charaId][pos]; //int chara_y = TJAPlayer3.Skin.Characters_Result_Y[_charaId][pos]; - int chara_x = namePlate_x[pos] - (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] ? uioffset_x : 0) + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2; + int chara_x = namePlate_x[pos] - (OpenTaiko.Skin.Characters_UseResult1P[_charaId] ? uioffset_x : 0) + OpenTaiko.Tx.NamePlateBase.szTextureSize.Width / 2; int chara_y = namePlate_y[pos]; - int p1chara_x = is2PSide ? TJAPlayer3.Skin.Resolution[0] / 2 : 0; - int p1chara_y = TJAPlayer3.Skin.Resolution[1] - (int)(uioffset_value * TJAPlayer3.Skin.Resolution[1]); - float renderRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][0]; - float renderRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][1]; + int p1chara_x = is2PSide ? OpenTaiko.Skin.Resolution[0] / 2 : 0; + int p1chara_y = OpenTaiko.Skin.Resolution[1] - (int)(uioffset_value * OpenTaiko.Skin.Resolution[1]); + float renderRatioX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[_charaId][0]; + float renderRatioY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[_charaId][1]; if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.CLEAR)) { CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.CLEAR, pos); - var tex = pos == 0 ? TJAPlayer3.Tx.Characters_Result_Clear_1P[_charaId] : TJAPlayer3.Tx.Characters_Result_Clear_2P[_charaId]; - if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI && tex != null) { + var tex = pos == 0 ? OpenTaiko.Tx.Characters_Result_Clear_1P[_charaId] : OpenTaiko.Tx.Characters_Result_Clear_2P[_charaId]; + if (OpenTaiko.Skin.Characters_UseResult1P[_charaId] && OpenTaiko.Skin.Result_Use1PUI && tex != null) { tex.vcScaleRatio.X = renderRatioX; tex.vcScaleRatio.Y = renderRatioY; if (is2PSide) { @@ -754,24 +754,24 @@ namespace TJAPlayer3 { } } else if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.FAILED)) { CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED, pos); - if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI && TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId] != null) { - TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.X = renderRatioX; - TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.Y = renderRatioY; + if (OpenTaiko.Skin.Characters_UseResult1P[_charaId] && OpenTaiko.Skin.Result_Use1PUI && OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId] != null) { + OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.X = renderRatioX; + OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.Y = renderRatioY; if (is2PSide) { - TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y); + OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y); } else { - TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D描画(p1chara_x, p1chara_y); + OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId].t2D描画(p1chara_x, p1chara_y); } } - } else if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.FAILED_IN) && TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId] != null) { + } else if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.FAILED_IN) && OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId] != null) { CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED_IN, pos); - if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI) { - TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.X = renderRatioX; - TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.Y = renderRatioY; + if (OpenTaiko.Skin.Characters_UseResult1P[_charaId] && OpenTaiko.Skin.Result_Use1PUI) { + OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.X = renderRatioX; + OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId].vcScaleRatio.Y = renderRatioY; if (is2PSide) { - TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y); + OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y); } else { - TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D描画(p1chara_x, p1chara_y); + OpenTaiko.Tx.Characters_Result_Failed_1P[_charaId].t2D描画(p1chara_x, p1chara_y); } } } else @@ -782,8 +782,8 @@ namespace TJAPlayer3 { #region [PuchiChara] - int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[TJAPlayer3.ConfigIni.nPlayerCount <= 2 ? pos : 0]; - int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[TJAPlayer3.ConfigIni.nPlayerCount <= 2 ? pos : 0]; + int puchi_x = chara_x + OpenTaiko.Skin.Adjustments_MenuPuchichara_X[OpenTaiko.ConfigIni.nPlayerCount <= 2 ? pos : 0]; + int puchi_y = chara_y + OpenTaiko.Skin.Adjustments_MenuPuchichara_Y[OpenTaiko.ConfigIni.nPlayerCount <= 2 ? pos : 0]; //int ttdiff = 640 - 152; //int ttps = 640 + ((pos == 1) ? ttdiff + 60 : -ttdiff); @@ -802,14 +802,14 @@ namespace TJAPlayer3 { #region [Cherry blossom animation] - if (gaugeValues[p] >= 80.0f && TJAPlayer3.ConfigIni.nPlayerCount <= 2) { - TJAPlayer3.Tx.Result_Flower.vcScaleRatio.X = 0.6f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); - TJAPlayer3.Tx.Result_Flower.vcScaleRatio.Y = 0.6f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); + if (gaugeValues[p] >= 80.0f && OpenTaiko.ConfigIni.nPlayerCount <= 2) { + OpenTaiko.Tx.Result_Flower.vcScaleRatio.X = 0.6f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); + OpenTaiko.Tx.Result_Flower.vcScaleRatio.Y = 0.6f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); - int flower_width = TJAPlayer3.Tx.Result_Flower.szTextureSize.Width; - int flower_height = TJAPlayer3.Tx.Result_Flower.szTextureSize.Height / 2; + int flower_width = OpenTaiko.Tx.Result_Flower.szTextureSize.Width; + int flower_height = OpenTaiko.Tx.Result_Flower.szTextureSize.Height / 2; - TJAPlayer3.Tx.Result_Flower.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_Flower_X[pos], TJAPlayer3.Skin.Result_Flower_Y[pos], + OpenTaiko.Tx.Result_Flower.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Result_Flower_X[pos], OpenTaiko.Skin.Result_Flower_Y[pos], new Rectangle(0, 0, flower_width, flower_height)); } @@ -817,15 +817,15 @@ namespace TJAPlayer3 { #region [Cherry blossom Rotating flowers] - if (gaugeValues[p] >= 80.0f && TJAPlayer3.ConfigIni.nPlayerCount <= 2) { + if (gaugeValues[p] >= 80.0f && OpenTaiko.ConfigIni.nPlayerCount <= 2) { float FlowerTime = ctRotate_Flowers.CurrentValue; for (int i = 0; i < 5; i++) { if ((int)FlowerTime < ApparitionTimeStamps[i] || (int)FlowerTime > ApparitionTimeStamps[i] + 2 * ApparitionFade + ApparitionDuration) - TJAPlayer3.Tx.Result_Flower_Rotate[i].Opacity = 0; + OpenTaiko.Tx.Result_Flower_Rotate[i].Opacity = 0; else if ((int)FlowerTime <= ApparitionTimeStamps[i] + ApparitionDuration + ApparitionFade && (int)FlowerTime >= ApparitionTimeStamps[i] + ApparitionFade) - TJAPlayer3.Tx.Result_Flower_Rotate[i].Opacity = 255; + OpenTaiko.Tx.Result_Flower_Rotate[i].Opacity = 255; else { int CurrentGradiant = 0; if ((int)FlowerTime >= ApparitionTimeStamps[i] + ApparitionFade + ApparitionDuration) @@ -834,14 +834,14 @@ namespace TJAPlayer3 { CurrentGradiant = (int)FlowerTime - ApparitionTimeStamps[i]; - TJAPlayer3.Tx.Result_Flower_Rotate[i].Opacity = (255 * CurrentGradiant) / ApparitionFade; + OpenTaiko.Tx.Result_Flower_Rotate[i].Opacity = (255 * CurrentGradiant) / ApparitionFade; } - TJAPlayer3.Tx.Result_Flower_Rotate[i].vcScaleRatio.X = 0.6f; - TJAPlayer3.Tx.Result_Flower_Rotate[i].vcScaleRatio.Y = 0.6f; - TJAPlayer3.Tx.Result_Flower_Rotate[i].fZ軸中心回転 = (float)(FlowerTime - ApparitionTimeStamps[i]) / (FlowerRotationSpeeds[i] * 360f); + OpenTaiko.Tx.Result_Flower_Rotate[i].vcScaleRatio.X = 0.6f; + OpenTaiko.Tx.Result_Flower_Rotate[i].vcScaleRatio.Y = 0.6f; + OpenTaiko.Tx.Result_Flower_Rotate[i].fZ軸中心回転 = (float)(FlowerTime - ApparitionTimeStamps[i]) / (FlowerRotationSpeeds[i] * 360f); - TJAPlayer3.Tx.Result_Flower_Rotate[i].t2D中心基準描画(TJAPlayer3.Skin.Result_Flower_Rotate_X[pos][i], TJAPlayer3.Skin.Result_Flower_Rotate_Y[pos][i]); + OpenTaiko.Tx.Result_Flower_Rotate[i].t2D中心基準描画(OpenTaiko.Skin.Result_Flower_Rotate_X[pos][i], OpenTaiko.Skin.Result_Flower_Rotate_Y[pos][i]); } } @@ -850,22 +850,22 @@ namespace TJAPlayer3 { #region [Panel shines] - if (gaugeValues[p] >= 80.0f && TJAPlayer3.ConfigIni.nPlayerCount <= 2) { + if (gaugeValues[p] >= 80.0f && OpenTaiko.ConfigIni.nPlayerCount <= 2) { int ShineTime = (int)ctShine_Plate.CurrentValue; int Quadrant500 = ShineTime % 500; - for (int i = 0; i < TJAPlayer3.Skin.Result_PlateShine_Count; i++) { + for (int i = 0; i < OpenTaiko.Skin.Result_PlateShine_Count; i++) { if (i < 3 && ShineTime >= 500 || i >= 3 && ShineTime < 500) - TJAPlayer3.Tx.Result_Shine.Opacity = 0; + OpenTaiko.Tx.Result_Shine.Opacity = 0; else if (Quadrant500 >= ShinePFade && Quadrant500 <= 500 - ShinePFade) - TJAPlayer3.Tx.Result_Shine.Opacity = 255; + OpenTaiko.Tx.Result_Shine.Opacity = 255; else - TJAPlayer3.Tx.Result_Shine.Opacity = (255 * Math.Min(Quadrant500, 500 - Quadrant500)) / ShinePFade; + OpenTaiko.Tx.Result_Shine.Opacity = (255 * Math.Min(Quadrant500, 500 - Quadrant500)) / ShinePFade; - TJAPlayer3.Tx.Result_Shine.vcScaleRatio.X = 0.15f; - TJAPlayer3.Tx.Result_Shine.vcScaleRatio.Y = 0.15f; + OpenTaiko.Tx.Result_Shine.vcScaleRatio.X = 0.15f; + OpenTaiko.Tx.Result_Shine.vcScaleRatio.Y = 0.15f; - TJAPlayer3.Tx.Result_Shine.t2D中心基準描画(TJAPlayer3.Skin.Result_PlateShine_X[pos][i], TJAPlayer3.Skin.Result_PlateShine_Y[pos][i]); + OpenTaiko.Tx.Result_Shine.t2D中心基準描画(OpenTaiko.Skin.Result_PlateShine_X[pos][i], OpenTaiko.Skin.Result_PlateShine_Y[pos][i]); } } @@ -886,17 +886,17 @@ namespace TJAPlayer3 { else if (gaugeValues[p] >= 40.0f) Mood = 1; - if (TJAPlayer3.stage結果.nクリア[p] == 4) { + if (OpenTaiko.stage結果.nクリア[p] == 4) { MoodV2 = 5; - } else if (TJAPlayer3.stage結果.nクリア[p] == 3) { + } else if (OpenTaiko.stage結果.nクリア[p] == 3) { MoodV2 = 4; - } else if (TJAPlayer3.stage結果.nクリア[p] >= 1) { + } else if (OpenTaiko.stage結果.nクリア[p] >= 1) { if (gaugeValues[p] >= 100.0f) { MoodV2 = 3; } else { MoodV2 = 2; } - } else if (TJAPlayer3.stage結果.nクリア[p] == 0) { + } else if (OpenTaiko.stage結果.nクリア[p] == 0) { if (gaugeValues[p] >= 40.0f) { MoodV2 = 1; } else { @@ -904,62 +904,62 @@ namespace TJAPlayer3 { } } - if (TJAPlayer3.ConfigIni.nPlayerCount <= 2) { - int speechBuddle_width = TJAPlayer3.Tx.Result_Speech_Bubble[pos].szTextureSize.Width / 4; - int speechBuddle_height = TJAPlayer3.Tx.Result_Speech_Bubble[pos].szTextureSize.Height / 3; + if (OpenTaiko.ConfigIni.nPlayerCount <= 2) { + int speechBuddle_width = OpenTaiko.Tx.Result_Speech_Bubble[pos].szTextureSize.Width / 4; + int speechBuddle_height = OpenTaiko.Tx.Result_Speech_Bubble[pos].szTextureSize.Height / 3; - TJAPlayer3.Tx.Result_Speech_Bubble[pos].vcScaleRatio.X = 0.9f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); - TJAPlayer3.Tx.Result_Speech_Bubble[pos].vcScaleRatio.Y = 0.9f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); - TJAPlayer3.Tx.Result_Speech_Bubble[pos].t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_Speech_Bubble_X[pos], TJAPlayer3.Skin.Result_Speech_Bubble_Y[pos], + OpenTaiko.Tx.Result_Speech_Bubble[pos].vcScaleRatio.X = 0.9f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); + OpenTaiko.Tx.Result_Speech_Bubble[pos].vcScaleRatio.Y = 0.9f * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); + OpenTaiko.Tx.Result_Speech_Bubble[pos].t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Result_Speech_Bubble_X[pos], OpenTaiko.Skin.Result_Speech_Bubble_Y[pos], new Rectangle(Mood * speechBuddle_width, RandomText * speechBuddle_height, speechBuddle_width, speechBuddle_height)); } - int speech_vubble_index = TJAPlayer3.ConfigIni.nPlayerCount <= 2 ? pos : 2; - if (TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index] != null) { - int speechBuddle_width = TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szTextureSize.Width; - int speechBuddle_height = TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szTextureSize.Height / 6; + int speech_vubble_index = OpenTaiko.ConfigIni.nPlayerCount <= 2 ? pos : 2; + if (OpenTaiko.Tx.Result_Speech_Bubble_V2[speech_vubble_index] != null) { + int speechBuddle_width = OpenTaiko.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szTextureSize.Width; + int speechBuddle_height = OpenTaiko.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szTextureSize.Height / 6; int speech_bubble_x; int speech_bubble_y; float scale; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - speech_bubble_x = TJAPlayer3.Skin.Result_Speech_Bubble_V2_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - speech_bubble_y = TJAPlayer3.Skin.Result_Speech_Bubble_V2_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + speech_bubble_x = OpenTaiko.Skin.Result_Speech_Bubble_V2_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + speech_bubble_y = OpenTaiko.Skin.Result_Speech_Bubble_V2_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; scale = 0.5f; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - speech_bubble_x = TJAPlayer3.Skin.Result_Speech_Bubble_V2_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - speech_bubble_y = TJAPlayer3.Skin.Result_Speech_Bubble_V2_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + speech_bubble_x = OpenTaiko.Skin.Result_Speech_Bubble_V2_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + speech_bubble_y = OpenTaiko.Skin.Result_Speech_Bubble_V2_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; scale = 0.5f; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 2) { - speech_bubble_x = TJAPlayer3.Skin.Result_Speech_Bubble_V2_2P_X[pos]; - speech_bubble_y = TJAPlayer3.Skin.Result_Speech_Bubble_V2_2P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 2) { + speech_bubble_x = OpenTaiko.Skin.Result_Speech_Bubble_V2_2P_X[pos]; + speech_bubble_y = OpenTaiko.Skin.Result_Speech_Bubble_V2_2P_Y[pos]; scale = 0.5f; } else { - speech_bubble_x = TJAPlayer3.Skin.Result_Speech_Bubble_V2_X[pos]; - speech_bubble_y = TJAPlayer3.Skin.Result_Speech_Bubble_V2_Y[pos]; + speech_bubble_x = OpenTaiko.Skin.Result_Speech_Bubble_V2_X[pos]; + speech_bubble_y = OpenTaiko.Skin.Result_Speech_Bubble_V2_Y[pos]; scale = 1.0f; } - TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vcScaleRatio.X = 0.9f * scale * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); - TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vcScaleRatio.Y = 0.9f * scale * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); - TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].t2D拡大率考慮中央基準描画(speech_bubble_x, speech_bubble_y, + OpenTaiko.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vcScaleRatio.X = 0.9f * scale * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); + OpenTaiko.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vcScaleRatio.Y = 0.9f * scale * (ctMainCounter.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ctMainCounter.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f); + OpenTaiko.Tx.Result_Speech_Bubble_V2[speech_vubble_index].t2D拡大率考慮中央基準描画(speech_bubble_x, speech_bubble_y, new Rectangle(0, MoodV2 * speechBuddle_height, speechBuddle_width, speechBuddle_height)); TitleTextureKey.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).vcScaleRatio.X = scale; TitleTextureKey.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).vcScaleRatio.Y = scale; TitleTextureKey.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).t2D拡大率考慮中央基準描画( - speech_bubble_x + (int)(TJAPlayer3.Skin.Result_Speech_Text_Offset[0] * scale), - speech_bubble_y + (int)(TJAPlayer3.Skin.Result_Speech_Text_Offset[1] * scale)); + speech_bubble_x + (int)(OpenTaiko.Skin.Result_Speech_Text_Offset[0] * scale), + speech_bubble_y + (int)(OpenTaiko.Skin.Result_Speech_Text_Offset[1] * scale)); } if (!b音声再生[11]) { if (gaugeValues[p] >= 80.0f) { //TJAPlayer3.Skin.soundDonClear.t再生する(); - TJAPlayer3.Skin.voiceResultClearSuccess[TJAPlayer3.GetActualPlayer(p)]?.tPlay(); + OpenTaiko.Skin.voiceResultClearSuccess[OpenTaiko.GetActualPlayer(p)]?.tPlay(); } else { //TJAPlayer3.Skin.soundDonFailed.t再生する(); - TJAPlayer3.Skin.voiceResultClearFailed[TJAPlayer3.GetActualPlayer(p)]?.tPlay(); + OpenTaiko.Skin.voiceResultClearFailed[OpenTaiko.GetActualPlayer(p)]?.tPlay(); } - if (p == TJAPlayer3.ConfigIni.nPlayerCount - 1) + if (p == OpenTaiko.ConfigIni.nPlayerCount - 1) b音声再生[11] = true; } @@ -976,23 +976,23 @@ namespace TJAPlayer3 { { #region [Score rank apparition] - int scoreRank_width = TJAPlayer3.Tx.Result_ScoreRankEffect.szTextureSize.Width / 7; - int scoreRank_height = TJAPlayer3.Tx.Result_ScoreRankEffect.szTextureSize.Height / 4; + int scoreRank_width = OpenTaiko.Tx.Result_ScoreRankEffect.szTextureSize.Width / 7; + int scoreRank_height = OpenTaiko.Tx.Result_ScoreRankEffect.szTextureSize.Height / 4; if (ctMainCounter.CurrentValue <= ScoreApparitionTimeStamp + 1180) { - TJAPlayer3.Tx.Result_ScoreRankEffect.Opacity = (int)((ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1000)) / 180.0f * 255.0f); - TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 910)) / 1.5f * (Math.PI / 180)) * 1.4f; - TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 910)) / 1.5f * (Math.PI / 180)) * 1.4f; + OpenTaiko.Tx.Result_ScoreRankEffect.Opacity = (int)((ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1000)) / 180.0f * 255.0f); + OpenTaiko.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 910)) / 1.5f * (Math.PI / 180)) * 1.4f; + OpenTaiko.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 910)) / 1.5f * (Math.PI / 180)) * 1.4f; } else if (ctMainCounter.CurrentValue <= ScoreApparitionTimeStamp + 1270) { - TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1180)) * (Math.PI / 180)) * 0.5f; - TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1180)) * (Math.PI / 180)) * 0.5f; + OpenTaiko.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1180)) * (Math.PI / 180)) * 0.5f; + OpenTaiko.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 1180)) * (Math.PI / 180)) * 0.5f; } else { - TJAPlayer3.Tx.Result_ScoreRankEffect.Opacity = 255; - TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.Result_ScoreRankEffect.Opacity = 255; + OpenTaiko.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 1f; + OpenTaiko.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 1f; } - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stage結果.nスコアランク[p] > 0) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && OpenTaiko.stage結果.nスコアランク[p] > 0) { int CurrentFlash = 0; int[] FlashTimes = { 1500, 1540, 1580, 1620, 1660, 1700, 1740, 1780 }; @@ -1006,22 +1006,22 @@ namespace TJAPlayer3 { int scoreRankEffect_x; int scoreRankEffect_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - scoreRankEffect_x = TJAPlayer3.Skin.Result_ScoreRankEffect_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - scoreRankEffect_y = TJAPlayer3.Skin.Result_ScoreRankEffect_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - scoreRankEffect_x = TJAPlayer3.Skin.Result_ScoreRankEffect_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - scoreRankEffect_y = TJAPlayer3.Skin.Result_ScoreRankEffect_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + scoreRankEffect_x = OpenTaiko.Skin.Result_ScoreRankEffect_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + scoreRankEffect_y = OpenTaiko.Skin.Result_ScoreRankEffect_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + scoreRankEffect_x = OpenTaiko.Skin.Result_ScoreRankEffect_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + scoreRankEffect_y = OpenTaiko.Skin.Result_ScoreRankEffect_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { - scoreRankEffect_x = TJAPlayer3.Skin.Result_ScoreRankEffect_X[pos] + uioffset_x; - scoreRankEffect_y = TJAPlayer3.Skin.Result_ScoreRankEffect_Y[pos]; + scoreRankEffect_x = OpenTaiko.Skin.Result_ScoreRankEffect_X[pos] + uioffset_x; + scoreRankEffect_y = OpenTaiko.Skin.Result_ScoreRankEffect_Y[pos]; } - TJAPlayer3.Tx.Result_ScoreRankEffect.t2D拡大率考慮中央基準描画(scoreRankEffect_x, scoreRankEffect_y, - new Rectangle((TJAPlayer3.stage結果.nスコアランク[p] - 1) * scoreRank_width, CurrentFlash * scoreRank_height, scoreRank_width, scoreRank_height)); + OpenTaiko.Tx.Result_ScoreRankEffect.t2D拡大率考慮中央基準描画(scoreRankEffect_x, scoreRankEffect_y, + new Rectangle((OpenTaiko.stage結果.nスコアランク[p] - 1) * scoreRank_width, CurrentFlash * scoreRank_height, scoreRank_width, scoreRank_height)); if (!b音声再生[9] && ctMainCounter.CurrentValue >= ScoreApparitionTimeStamp + 1180) { - TJAPlayer3.Skin.soundRankIn.tPlay(); + OpenTaiko.Skin.soundRankIn.tPlay(); b音声再生[9] = true; } } @@ -1036,25 +1036,25 @@ namespace TJAPlayer3 { { #region [Crown apparition] - int crownEffect_width = TJAPlayer3.Tx.Result_CrownEffect.szTextureSize.Width / 4; - int crownEffect_height = TJAPlayer3.Tx.Result_CrownEffect.szTextureSize.Height / 4; + int crownEffect_width = OpenTaiko.Tx.Result_CrownEffect.szTextureSize.Width / 4; + int crownEffect_height = OpenTaiko.Tx.Result_CrownEffect.szTextureSize.Height / 4; if (ctMainCounter.CurrentValue <= ScoreApparitionTimeStamp + 2680) { - TJAPlayer3.Tx.Result_CrownEffect.Opacity = (int)((ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2500)) / 180.0f * 255.0f); - TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.X = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2410)) / 1.5f * (Math.PI / 180)) * 1.4f; - TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.Y = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2410)) / 1.5f * (Math.PI / 180)) * 1.4f; + OpenTaiko.Tx.Result_CrownEffect.Opacity = (int)((ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2500)) / 180.0f * 255.0f); + OpenTaiko.Tx.Result_CrownEffect.vcScaleRatio.X = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2410)) / 1.5f * (Math.PI / 180)) * 1.4f; + OpenTaiko.Tx.Result_CrownEffect.vcScaleRatio.Y = 1.0f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2410)) / 1.5f * (Math.PI / 180)) * 1.4f; } else if (ctMainCounter.CurrentValue <= ScoreApparitionTimeStamp + 2770) { - TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2680)) * (Math.PI / 180)) * 0.5f; - TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2680)) * (Math.PI / 180)) * 0.5f; + OpenTaiko.Tx.Result_CrownEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2680)) * (Math.PI / 180)) * 0.5f; + OpenTaiko.Tx.Result_CrownEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(ctMainCounter.CurrentValue - (ScoreApparitionTimeStamp + 2680)) * (Math.PI / 180)) * 0.5f; } else { - TJAPlayer3.Tx.Result_CrownEffect.Opacity = 255; - TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.Result_CrownEffect.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.Result_CrownEffect.Opacity = 255; + OpenTaiko.Tx.Result_CrownEffect.vcScaleRatio.X = 1f; + OpenTaiko.Tx.Result_CrownEffect.vcScaleRatio.Y = 1f; } - int ClearType = TJAPlayer3.stage結果.nクリア[p] - 1; + int ClearType = OpenTaiko.stage結果.nクリア[p] - 1; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)(Difficulty.Dan) && ClearType >= 0) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)(Difficulty.Dan) && ClearType >= 0) { int CurrentFlash = 0; int[] FlashTimes = { 2000, 2040, 2080, 2120, 2160, 2200, 2240, 2280 }; @@ -1068,22 +1068,22 @@ namespace TJAPlayer3 { int crownEffect_x; int crownEffect_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - crownEffect_x = TJAPlayer3.Skin.Result_CrownEffect_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - crownEffect_y = TJAPlayer3.Skin.Result_CrownEffect_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - crownEffect_x = TJAPlayer3.Skin.Result_CrownEffect_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - crownEffect_y = TJAPlayer3.Skin.Result_CrownEffect_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + crownEffect_x = OpenTaiko.Skin.Result_CrownEffect_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + crownEffect_y = OpenTaiko.Skin.Result_CrownEffect_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + crownEffect_x = OpenTaiko.Skin.Result_CrownEffect_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + crownEffect_y = OpenTaiko.Skin.Result_CrownEffect_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { - crownEffect_x = TJAPlayer3.Skin.Result_CrownEffect_X[pos] + uioffset_x; - crownEffect_y = TJAPlayer3.Skin.Result_CrownEffect_Y[pos]; + crownEffect_x = OpenTaiko.Skin.Result_CrownEffect_X[pos] + uioffset_x; + crownEffect_y = OpenTaiko.Skin.Result_CrownEffect_Y[pos]; } - TJAPlayer3.Tx.Result_CrownEffect.t2D拡大率考慮中央基準描画(crownEffect_x, crownEffect_y, + OpenTaiko.Tx.Result_CrownEffect.t2D拡大率考慮中央基準描画(crownEffect_x, crownEffect_y, new Rectangle(ClearType * crownEffect_width, CurrentFlash * crownEffect_height, crownEffect_width, crownEffect_height)); if (!b音声再生[10] && ctMainCounter.CurrentValue >= ScoreApparitionTimeStamp + 2680) { - TJAPlayer3.Skin.soundCrownIn.tPlay(); + OpenTaiko.Skin.soundCrownIn.tPlay(); b音声再生[10] = true; } } @@ -1179,30 +1179,30 @@ namespace TJAPlayer3 { private int nNowAISection; private void NextAISection() { - ctAISectionChange = new CCounter(0, 2000, 1, TJAPlayer3.Timer); + ctAISectionChange = new CCounter(0, 2000, 1, OpenTaiko.Timer); ctAISectionChange.CurrentValue = 0; nNowAISection++; - if (nNowAISection >= Math.Ceiling(TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count / 5.0)) { + if (nNowAISection >= Math.Ceiling(OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count / 5.0)) { nNowAISection = 0; } } public void t小文字表示(int x, int y, int num, float scale) { - TJAPlayer3.Tx.Result_Number.vcScaleRatio.X *= scale; - TJAPlayer3.Tx.Result_Number.vcScaleRatio.Y *= scale; + OpenTaiko.Tx.Result_Number.vcScaleRatio.X *= scale; + OpenTaiko.Tx.Result_Number.vcScaleRatio.Y *= scale; int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j; - float width = (TJAPlayer3.Tx.Result_Number.sz画像サイズ.Width / 11.0f); - float height = (TJAPlayer3.Tx.Result_Number.sz画像サイズ.Height / 2.0f); + float width = (OpenTaiko.Tx.Result_Number.sz画像サイズ.Width / 11.0f); + float height = (OpenTaiko.Tx.Result_Number.sz画像サイズ.Height / 2.0f); - float _x = x - ((TJAPlayer3.Skin.Result_Number_Interval[0] * scale) * offset) + (width * 2); - float _y = y - ((TJAPlayer3.Skin.Result_Number_Interval[1] * scale) * offset); + float _x = x - ((OpenTaiko.Skin.Result_Number_Interval[0] * scale) * offset) + (width * 2); + float _y = y - ((OpenTaiko.Skin.Result_Number_Interval[1] * scale) * offset); - TJAPlayer3.Tx.Result_Number.t2D拡大率考慮中央基準描画(_x + (width * scale / 2), _y + (height * scale / 2), + OpenTaiko.Tx.Result_Number.t2D拡大率考慮中央基準描画(_x + (width * scale / 2), _y + (height * scale / 2), new RectangleF(width * nums[j], 0, width, height)); } } @@ -1218,8 +1218,8 @@ namespace TJAPlayer3 { rectangle.Width -= 2; rectangle.Height -= 2; } - if (TJAPlayer3.Tx.Result_Number != null) { - TJAPlayer3.Tx.Result_Number.t2D描画(x, y, rectangle); + if (OpenTaiko.Tx.Result_Number != null) { + OpenTaiko.Tx.Result_Number.t2D描画(x, y, rectangle); } break; } @@ -1229,18 +1229,18 @@ namespace TJAPlayer3 { } public void tスコア文字表示(int x, int y, int num, float scale) { - TJAPlayer3.Tx.Result_Score_Number.vcScaleRatio.X *= scale; - TJAPlayer3.Tx.Result_Score_Number.vcScaleRatio.Y *= scale; + OpenTaiko.Tx.Result_Score_Number.vcScaleRatio.X *= scale; + OpenTaiko.Tx.Result_Score_Number.vcScaleRatio.Y *= scale; int[] nums = CConversion.SeparateDigits(num); for (int j = 0; j < nums.Length; j++) { float offset = j; - float _x = x - (TJAPlayer3.Skin.Result_Score_Number_Interval[0] * scale * offset); - float _y = y - (TJAPlayer3.Skin.Result_Score_Number_Interval[1] * scale * offset); + float _x = x - (OpenTaiko.Skin.Result_Score_Number_Interval[0] * scale * offset); + float _y = y - (OpenTaiko.Skin.Result_Score_Number_Interval[1] * scale * offset); - float width = (TJAPlayer3.Tx.Result_Score_Number.sz画像サイズ.Width / 10.0f); - float height = (TJAPlayer3.Tx.Result_Score_Number.sz画像サイズ.Height); + float width = (OpenTaiko.Tx.Result_Score_Number.sz画像サイズ.Width / 10.0f); + float height = (OpenTaiko.Tx.Result_Score_Number.sz画像サイズ.Height); - TJAPlayer3.Tx.Result_Score_Number.t2D拡大率考慮中央基準描画(_x, _y + (height * scale / 2), new RectangleF(width * nums[j], 0, width, height)); + OpenTaiko.Tx.Result_Score_Number.t2D拡大率考慮中央基準描画(_x, _y + (height * scale / 2), new RectangleF(width * nums[j], 0, width, height)); } } //----------------- diff --git a/OpenTaiko/src/Stages/08.Result/CActResultRank.cs b/OpenTaiko/src/Stages/08.Result/CActResultRank.cs index a4af3f1a..af766a6c 100644 --- a/OpenTaiko/src/Stages/08.Result/CActResultRank.cs +++ b/OpenTaiko/src/Stages/08.Result/CActResultRank.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActResultRank : CActivity { // コンストラクタ diff --git a/OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs b/OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs index 79ddf053..e7166a57 100644 --- a/OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs +++ b/OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActResultSongBar : CActivity { // コンストラクタ @@ -25,13 +25,13 @@ namespace TJAPlayer3 { // displaying the song title as usual. - var title = TJAPlayer3.IsPerformingCalibration - ? $"Calibration complete. InputAdjustTime is now {TJAPlayer3.ConfigIni.nInputAdjustTimeMs}ms (Note : InputAdjust is deprecated, please transfer the value to GlobalOffset and reload the songs" - : TJAPlayer3.DTX.TITLE.GetString(""); + var title = OpenTaiko.IsPerformingCalibration + ? $"Calibration complete. InputAdjustTime is now {OpenTaiko.ConfigIni.nInputAdjustTimeMs}ms (Note : InputAdjust is deprecated, please transfer the value to GlobalOffset and reload the songs" + : OpenTaiko.DTX.TITLE.GetString(""); - using (var bmpSongTitle = pfMusicName.DrawText(title, TJAPlayer3.Skin.Result_MusicName_ForeColor, TJAPlayer3.Skin.Result_MusicName_BackColor, null, 30)) { - this.txMusicName = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false); - txMusicName.vcScaleRatio.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName, TJAPlayer3.Skin.Result_MusicName_MaxSize); + using (var bmpSongTitle = pfMusicName.DrawText(title, OpenTaiko.Skin.Result_MusicName_ForeColor, OpenTaiko.Skin.Result_MusicName_BackColor, null, 30)) { + this.txMusicName = OpenTaiko.tテクスチャの生成(bmpSongTitle, false); + txMusicName.vcScaleRatio.X = OpenTaiko.GetSongNameXScaling(ref txMusicName, OpenTaiko.Skin.Result_MusicName_MaxSize); } base.Activate(); @@ -41,15 +41,15 @@ namespace TJAPlayer3 { this.ct登場用 = null; } - TJAPlayer3.tテクスチャの解放(ref this.txMusicName); + OpenTaiko.tテクスチャの解放(ref this.txMusicName); base.DeActivate(); } public override void CreateManagedResource() { - this.pfMusicName = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Result_MusicName_FontSize); + this.pfMusicName = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Result_MusicName_FontSize); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tDisposeSafely(ref this.pfMusicName); + OpenTaiko.tDisposeSafely(ref this.pfMusicName); base.ReleaseManagedResource(); } public override int Draw() { @@ -57,17 +57,17 @@ namespace TJAPlayer3 { return 0; } if (base.IsFirstDraw) { - this.ct登場用 = new CCounter(0, 270, 4, TJAPlayer3.Timer); + this.ct登場用 = new CCounter(0, 270, 4, OpenTaiko.Timer); base.IsFirstDraw = false; } this.ct登場用.Tick(); - if (TJAPlayer3.Skin.Result_MusicName_ReferencePoint == CSkin.ReferencePoint.Center) { - this.txMusicName.t2D描画(TJAPlayer3.Skin.Result_MusicName_X - ((this.txMusicName.szTextureSize.Width * txMusicName.vcScaleRatio.X) / 2), TJAPlayer3.Skin.Result_MusicName_Y); - } else if (TJAPlayer3.Skin.Result_MusicName_ReferencePoint == CSkin.ReferencePoint.Left) { - this.txMusicName.t2D描画(TJAPlayer3.Skin.Result_MusicName_X, TJAPlayer3.Skin.Result_MusicName_Y); + if (OpenTaiko.Skin.Result_MusicName_ReferencePoint == CSkin.ReferencePoint.Center) { + this.txMusicName.t2D描画(OpenTaiko.Skin.Result_MusicName_X - ((this.txMusicName.szTextureSize.Width * txMusicName.vcScaleRatio.X) / 2), OpenTaiko.Skin.Result_MusicName_Y); + } else if (OpenTaiko.Skin.Result_MusicName_ReferencePoint == CSkin.ReferencePoint.Left) { + this.txMusicName.t2D描画(OpenTaiko.Skin.Result_MusicName_X, OpenTaiko.Skin.Result_MusicName_Y); } else { - this.txMusicName.t2D描画(TJAPlayer3.Skin.Result_MusicName_X - this.txMusicName.szTextureSize.Width * txMusicName.vcScaleRatio.X, TJAPlayer3.Skin.Result_MusicName_Y); + this.txMusicName.t2D描画(OpenTaiko.Skin.Result_MusicName_X - this.txMusicName.szTextureSize.Width * txMusicName.vcScaleRatio.X, OpenTaiko.Skin.Result_MusicName_Y); } if (!this.ct登場用.IsEnded) { diff --git a/OpenTaiko/src/Stages/08.Result/CStage結果.cs b/OpenTaiko/src/Stages/08.Result/CStage結果.cs index 447af05d..754ef2ce 100644 --- a/OpenTaiko/src/Stages/08.Result/CStage結果.cs +++ b/OpenTaiko/src/Stages/08.Result/CStage結果.cs @@ -3,9 +3,9 @@ using System.Drawing; using System.Text; using DiscordRPC; using FDK; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CStage結果 : CStage { // Modals Lua management @@ -65,14 +65,14 @@ namespace TJAPlayer3 { public bool isAutoDisabled(int player) { - return ((player != 1 && !TJAPlayer3.ConfigIni.bAutoPlay[player]) - || (player == 1 && !TJAPlayer3.ConfigIni.bAutoPlay[player] && !TJAPlayer3.ConfigIni.bAIBattleMode)); + return ((player != 1 && !OpenTaiko.ConfigIni.bAutoPlay[player]) + || (player == 1 && !OpenTaiko.ConfigIni.bAutoPlay[player] && !OpenTaiko.ConfigIni.bAIBattleMode)); } public int GetTowerScoreRank() { int tmpClear = 0; - double progress = CFloorManagement.LastRegisteredFloor / ((double)TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor); + double progress = CFloorManagement.LastRegisteredFloor / ((double)OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor); // Clear badges : 10% (E), 25% (D), 50% (C), 75% (B), Clear (A), FC (S), DFC (X) bool[] conditions = @@ -82,8 +82,8 @@ namespace TJAPlayer3 { progress >= 0.5, progress >= 0.75, progress == 1 && CFloorManagement.CurrentNumberOfLives > 0, - TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMine == 0, - TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGood == 0 + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMiss == 0 && OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMine == 0, + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGood == 0 /* progress == 1 && CFloorManagement.CurrentNumberOfLives > 0, this.st演奏記録.Drums.nMiss数 == 0, @@ -139,11 +139,11 @@ namespace TJAPlayer3 { bool[] assistedClear = { - (TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 0) < 1f), - (TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 1) < 1f), - (TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 2) < 1f), - (TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 3) < 1f), - (TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 4) < 1f) + (OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 0) < 1f), + (OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 1) < 1f), + (OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 2) < 1f), + (OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 3) < 1f), + (OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, 4) < 1f) }; { @@ -166,9 +166,9 @@ namespace TJAPlayer3 { #region [ Results calculus ] //--------------------- - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { - for (int p = 0; p < TJAPlayer3.ConfigIni.nPlayerCount; p++) { - var ccf = TJAPlayer3.stage演奏ドラム画面.CChartScore[p]; + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { + for (int p = 0; p < OpenTaiko.ConfigIni.nPlayerCount; p++) { + var ccf = OpenTaiko.stage演奏ドラム画面.CChartScore[p]; this.nクリア[p] = 0; if (HGaugeMethods.UNSAFE_FastNormaCheck(p)) { @@ -184,13 +184,13 @@ namespace TJAPlayer3 { } - if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(p) < 500000) { + if ((int)OpenTaiko.stage演奏ドラム画面.actScore.Get(p) < 500000) { this.nスコアランク[p] = 0; } else { - var sr = TJAPlayer3.stage演奏ドラム画面.ScoreRank.ScoreRank[p]; + var sr = OpenTaiko.stage演奏ドラム画面.ScoreRank.ScoreRank[p]; for (int i = 0; i < 7; i++) { - if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(p) >= sr[i]) { + if ((int)OpenTaiko.stage演奏ドラム画面.actScore.Get(p) >= sr[i]) { this.nスコアランク[p] = i + 1; } } @@ -212,13 +212,13 @@ namespace TJAPlayer3 { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { // Regular (Ensou game) Score and Score Rank saves #region [Regular saves] - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - int diff = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + int diff = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]; ClearStatus_Replay[i] = this.nクリア[i]; ScoreRank_Replay[i] = this.nスコアランク[i]; @@ -226,7 +226,7 @@ namespace TJAPlayer3 { #endregion - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { /* == Specific format for DaniDoujou charts == ** ** Higher is better, takes the Clear0 spot (Usually the spot allocated for Kantan Clear crowns) @@ -240,7 +240,7 @@ namespace TJAPlayer3 { #region [Dan scores] - Exam.Status examStatus = TJAPlayer3.stage演奏ドラム画面.actDan.GetExamStatus(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C); + Exam.Status examStatus = OpenTaiko.stage演奏ドラム画面.actDan.GetExamStatus(OpenTaiko.stage結果.st演奏記録.Drums.Dan_C); int clearValue = 0; @@ -273,7 +273,7 @@ namespace TJAPlayer3 { // this.st演奏記録[0].nクリア[0] = Math.Max(ini[0].stセクション[0].nクリア[0], clearValue); // Unlock dan grade - if (clearValue > 0 && !TJAPlayer3.ConfigIni.bAutoPlay[0]) { + if (clearValue > 0 && !OpenTaiko.ConfigIni.bAutoPlay[0]) { /* this.newGradeGranted = TJAPlayer3.NamePlateConfig.tUpdateDanTitle(TJAPlayer3.stage選曲.r確定された曲.strタイトル.Substring(0, 2), clearValue % 2 == 0, @@ -281,14 +281,14 @@ namespace TJAPlayer3 { TJAPlayer3.SaveFile); */ - this.newGradeGranted = TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].tUpdateDanTitle(TJAPlayer3.stageSongSelect.rChoosenSong.ldTitle.GetString("").Substring(0, 2), + this.newGradeGranted = OpenTaiko.SaveFileInstances[OpenTaiko.SaveFile].tUpdateDanTitle(OpenTaiko.stageSongSelect.rChoosenSong.ldTitle.GetString("").Substring(0, 2), clearValue % 2 == 0, (clearValue - 1) / 2); } #endregion - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { // Clear if top reached, then FC or DFC like any regular chart // Score Rank cointains highest reached floor @@ -329,14 +329,14 @@ namespace TJAPlayer3 { "+" }; - int level = TJAPlayer3.stageSongSelect.rChoosenSong.nLevel[diff]; - CDTX.ELevelIcon levelIcon = TJAPlayer3.stageSongSelect.rChoosenSong.nLevelIcon[diff]; + int level = OpenTaiko.stageSongSelect.rChoosenSong.nLevel[diff]; + CDTX.ELevelIcon levelIcon = OpenTaiko.stageSongSelect.rChoosenSong.nLevelIcon[diff]; return (diffArr[Math.Min(diff, 6)] + "Lv." + level + diffArrIcon[(int)levelIcon]); } - string details = TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stageSongSelect.rChoosenSong.ldTitle.GetString("") - + diffToString(TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]) : ""; + string details = OpenTaiko.ConfigIni.SendDiscordPlayingInformation ? OpenTaiko.stageSongSelect.rChoosenSong.ldTitle.GetString("") + + diffToString(OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0]) : ""; // Byte count must be used instead of String.Length. // The byte count is what Discord is concerned with. Some chars are greater than one byte. @@ -347,13 +347,13 @@ namespace TJAPlayer3 { } // Discord Presenseの更新 - TJAPlayer3.DiscordClient?.SetPresence(new RichPresence() { + OpenTaiko.DiscordClient?.SetPresence(new RichPresence() { Details = details, - State = "Result" + (TJAPlayer3.ConfigIni.bAutoPlay[0] == true ? " (Auto)" : ""), - Timestamps = new Timestamps(TJAPlayer3.StartupTime), + State = "Result" + (OpenTaiko.ConfigIni.bAutoPlay[0] == true ? " (Auto)" : ""), + Timestamps = new Timestamps(OpenTaiko.StartupTime), Assets = new Assets() { - LargeImageKey = TJAPlayer3.LargeImageKey, - LargeImageText = TJAPlayer3.LargeImageText, + LargeImageKey = OpenTaiko.LargeImageKey, + LargeImageText = OpenTaiko.LargeImageText, } }); @@ -381,30 +381,30 @@ namespace TJAPlayer3 { float[] modMultipliers = { - TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 0), - TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 1), - TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 2), - TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 3), - TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 4) + OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 0), + OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 1), + OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 2), + OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 3), + OpenTaiko.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.COINS, false, 4) }; float getCoinMul(int player) { - var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character]; - var puchichara = TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(player))]; + var chara = OpenTaiko.Tx.Characters[OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(player)].data.Character]; + var puchichara = OpenTaiko.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(OpenTaiko.GetActualPlayer(player))]; return chara.GetEffectCoinMultiplier() * puchichara.GetEffectCoinMultiplier(); } - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { diffModifier = 3; - int stars = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nレベル[(int)Difficulty.Tower]; + int stars = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nレベル[(int)Difficulty.Tower]; starRate = Math.Min(10, stars) / 2; redStarRate = Math.Max(0, stars - 10) * 4; - int maxFloors = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nTotalFloor; + int maxFloors = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nTotalFloor; double floorRate = Math.Pow(CFloorManagement.LastRegisteredFloor / (double)maxFloors, 2); double lengthBonus = Math.Max(1, maxFloors / 140.0); @@ -425,12 +425,12 @@ namespace TJAPlayer3 { // this.nEarnedMedalsCount[0] = stars; this.nEarnedMedalsCount[0] = 5 + (int)((diffModifier * (starRate + redStarRate)) * (floorRate * lengthBonus)) + clearModifier; this.nEarnedMedalsCount[0] = Math.Max(5, (int)(this.nEarnedMedalsCount[0] * modMultipliers[0] * getCoinMul(0))); - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { int partialScore = 0; #region [Clear and Goukaku modifier] - Exam.Status examStatus = TJAPlayer3.stage演奏ドラム画面.actDan.GetExamStatus(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C); + Exam.Status examStatus = OpenTaiko.stage演奏ドラム画面.actDan.GetExamStatus(OpenTaiko.stage結果.st演奏記録.Drums.Dan_C); int clearModifier = -1; int goukakuModifier = 0; @@ -451,10 +451,10 @@ namespace TJAPlayer3 { #region [Partial scores] - for (int i = 0; i < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; i++) { - if (TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i] != null) { - int diff = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Difficulty; - int stars = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Level; + for (int i = 0; i < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; i++) { + if (OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i] != null) { + int diff = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Difficulty; + int stars = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Level; diffModifier = Math.Max(1, Math.Min(3, diff)); @@ -475,9 +475,9 @@ namespace TJAPlayer3 { this.nEarnedMedalsCount[0] = Math.Max(10, (int)(this.nEarnedMedalsCount[0] * modMultipliers[0] * getCoinMul(0))); } } else { - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - int diff = TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[i]; - int stars = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[diff].譜面情報.nレベル[diff]; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + int diff = OpenTaiko.stageSongSelect.nChoosenSongDifficulty[i]; + int stars = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[diff].譜面情報.nレベル[diff]; diffModifier = Math.Max(1, Math.Min(3, diff)); @@ -492,9 +492,9 @@ namespace TJAPlayer3 { if (HGaugeMethods.UNSAFE_FastNormaCheck(i)) { clearModifier = modifiers[1] * diffModifier; - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMiss == 0) { + if (OpenTaiko.stage演奏ドラム画面.CChartScore[i].nMiss == 0) { clearModifier = modifiers[2] * diffModifier; - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGood == 0) + if (OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGood == 0) clearModifier = modifiers[3] * diffModifier; } } @@ -510,15 +510,15 @@ namespace TJAPlayer3 { int scoreRankModifier = srModifiers[0] * diffModifier; for (int j = 1; j < 8; j++) { - if (TJAPlayer3.stage演奏ドラム画面.actScore.GetScore(i) >= TJAPlayer3.stage演奏ドラム画面.ScoreRank.ScoreRank[i][j - 1]) + if (OpenTaiko.stage演奏ドラム画面.actScore.GetScore(i) >= OpenTaiko.stage演奏ドラム画面.ScoreRank.ScoreRank[i][j - 1]) scoreRankModifier = srModifiers[j] * diffModifier; } #endregion - nTotalHits = TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGood + TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMiss + TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGreat; + nTotalHits = OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGood + OpenTaiko.stage演奏ドラム画面.CChartScore[i].nMiss + OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGreat; - dAccuracyRate = Math.Pow((50 * TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGood + 100 * TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGreat) / (double)(100 * nTotalHits), 3); + dAccuracyRate = Math.Pow((50 * OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGood + 100 * OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGreat) / (double)(100 * nTotalHits), 3); if (clearModifier < 0) this.nEarnedMedalsCount[i] = 5; @@ -530,32 +530,32 @@ namespace TJAPlayer3 { } // ADLIB bonuses : 1 coin per ADLIB - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { // Too broken on some charts, ADLibs should get either no bonus or just extra stats //this.nEarnedMedalsCount[i] += Math.Min(10, TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nADLIB); - if (TJAPlayer3.ConfigIni.bAutoPlay[i]) + if (OpenTaiko.ConfigIni.bAutoPlay[i]) this.nEarnedMedalsCount[i] = 0; - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) this.nEarnedMedalsCount[i] = 0; - var _sf = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(i)]; + var _sf = OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(i)]; - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 0) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 0) { _sf.tRegisterAIBattleModePlay(bClear[0]); } if (this.nEarnedMedalsCount[i] > 0) _sf.tEarnCoins(this.nEarnedMedalsCount[i]); - if (!TJAPlayer3.ConfigIni.bAutoPlay[i] - && !(TJAPlayer3.ConfigIni.bAIBattleMode && i == 1)) { + if (!OpenTaiko.ConfigIni.bAutoPlay[i] + && !(OpenTaiko.ConfigIni.bAIBattleMode && i == 1)) { int _cs = -1; if (HGaugeMethods.UNSAFE_FastNormaCheck(i)) { _cs = 0; - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMiss == 0) { + if (OpenTaiko.stage演奏ドラム画面.CChartScore[i].nMiss == 0) { _cs = 1; - if (TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGood == 0) + if (OpenTaiko.stage演奏ドラム画面.CChartScore[i].nGood == 0) _cs = 2; } } @@ -572,31 +572,31 @@ namespace TJAPlayer3 { #region [Replay files generation] - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAutoPlay[i]) + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAutoPlay[i]) continue; - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) continue; - TJAPlayer3.ReplayInstances[i].tResultsRegisterReplayInformations(this.nEarnedMedalsCount[i], ClearStatus_Replay[i], ScoreRank_Replay[i]); - TJAPlayer3.ReplayInstances[i].tSaveReplayFile(); + OpenTaiko.ReplayInstances[i].tResultsRegisterReplayInformations(this.nEarnedMedalsCount[i], ClearStatus_Replay[i], ScoreRank_Replay[i]); + OpenTaiko.ReplayInstances[i].tSaveReplayFile(); } #endregion #region [Modals preprocessing] - if (TJAPlayer3.ConfigIni.nPlayerCount == 1 || TJAPlayer3.ConfigIni.bAIBattleMode) { + if (OpenTaiko.ConfigIni.nPlayerCount == 1 || OpenTaiko.ConfigIni.bAIBattleMode) { mqModals = new ModalQueue(Modal.EModalFormat.Full); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 2) { + } else if (OpenTaiko.ConfigIni.nPlayerCount == 2) { mqModals = new ModalQueue(Modal.EModalFormat.Half); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 3 || TJAPlayer3.ConfigIni.nPlayerCount == 4) { + } else if (OpenTaiko.ConfigIni.nPlayerCount == 3 || OpenTaiko.ConfigIni.nPlayerCount == 4) { mqModals = new ModalQueue(Modal.EModalFormat.Half_4P); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { + } else if (OpenTaiko.ConfigIni.nPlayerCount == 5) { mqModals = new ModalQueue(Modal.EModalFormat.Half_5P); } - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAutoPlay[i] || TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) continue; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAutoPlay[i] || OpenTaiko.ConfigIni.bAIBattleMode && i == 1) continue; if (this.nEarnedMedalsCount[i] > 0) mqModals.tAddModal( @@ -604,20 +604,20 @@ namespace TJAPlayer3 { Modal.EModalType.Coin, 0, (long)this.nEarnedMedalsCount[i], - TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(i)].data.Medals + OpenTaiko.SaveFileInstances[OpenTaiko.GetActualPlayer(i)].data.Medals ), i); // Check unlockables { - TJAPlayer3.Databases.DBNameplateUnlockables.tGetUnlockedItems(i, mqModals); - TJAPlayer3.Databases.DBSongUnlockables.tGetUnlockedItems(i, mqModals); + OpenTaiko.Databases.DBNameplateUnlockables.tGetUnlockedItems(i, mqModals); + OpenTaiko.Databases.DBSongUnlockables.tGetUnlockedItems(i, mqModals); - foreach (var puchi in TJAPlayer3.Tx.Puchichara) { + foreach (var puchi in OpenTaiko.Tx.Puchichara) { puchi.tGetUnlockedItems(i, mqModals); } - foreach (var chara in TJAPlayer3.Tx.Characters) { + foreach (var chara in OpenTaiko.Tx.Characters) { chara.tGetUnlockedItems(i, mqModals); } } @@ -628,45 +628,45 @@ namespace TJAPlayer3 { #endregion - TJAPlayer3.stageSongSelect.actSongList.bFirstCrownLoad = false; + OpenTaiko.stageSongSelect.actSongList.bFirstCrownLoad = false; this.ctPhase1 = null; this.ctPhase2 = null; this.ctPhase3 = null; examsShift = 0; - Dan_Plate = TJAPlayer3.tテクスチャの生成(Path.GetDirectoryName(TJAPlayer3.DTX.strファイル名の絶対パス) + @$"{Path.DirectorySeparatorChar}Dan_Plate.png"); + Dan_Plate = OpenTaiko.tテクスチャの生成(Path.GetDirectoryName(OpenTaiko.DTX.strファイル名の絶対パス) + @$"{Path.DirectorySeparatorChar}Dan_Plate.png"); base.Activate(); - ctShine_Plate = new CCounter(0, 1000, 1, TJAPlayer3.Timer); - ctWork_Plate = new CCounter(0, 4000, 1, TJAPlayer3.Timer); + ctShine_Plate = new CCounter(0, 1000, 1, OpenTaiko.Timer); + ctWork_Plate = new CCounter(0, 4000, 1, OpenTaiko.Timer); - if (TJAPlayer3.Tx.TowerResult_Background != null) - ctTower_Animation = new CCounter(0, TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height - TJAPlayer3.Skin.Resolution[1], 25, TJAPlayer3.Timer); + if (OpenTaiko.Tx.TowerResult_Background != null) + ctTower_Animation = new CCounter(0, OpenTaiko.Tx.TowerResult_Background.szTextureSize.Height - OpenTaiko.Skin.Resolution[1], 25, OpenTaiko.Timer); else ctTower_Animation = new CCounter(); - ctDanSongInfoChange = new CCounter(0, 3000, 1, TJAPlayer3.Timer); + ctDanSongInfoChange = new CCounter(0, 3000, 1, OpenTaiko.Timer); ctDanSongInfoChange.CurrentValue = 255; b音声再生 = false; this.EndAnime = false; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { - this.ttkMaxFloors = new TitleTextureKey("/" + TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor.ToString() + CLangManager.LangInstance.GetString("TOWER_FLOOR_INITIAL"), pfTowerText48, Color.Black, Color.Transparent, 700); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + this.ttkMaxFloors = new TitleTextureKey("/" + OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor.ToString() + CLangManager.LangInstance.GetString("TOWER_FLOOR_INITIAL"), pfTowerText48, Color.Black, Color.Transparent, 700); this.ttkToutatsu = new TitleTextureKey(CLangManager.LangInstance.GetString("TOWER_FLOOR_REACHED"), pfTowerText48, Color.White, Color.Black, 700); this.ttkTen = new TitleTextureKey(CLangManager.LangInstance.GetString("TOWER_SCORE"), pfTowerText, Color.Black, Color.Transparent, 700); this.ttkReachedFloor = new TitleTextureKey(CFloorManagement.LastRegisteredFloor.ToString(), pfTowerText72, Color.Orange, Color.Black, 700); this.ttkScore = new TitleTextureKey(CLangManager.LangInstance.GetString("TOWER_SCORE_INITIAL"), pfTowerText, Color.Black, Color.Transparent, 700); this.ttkRemaningLifes = new TitleTextureKey(CFloorManagement.CurrentNumberOfLives.ToString() + " / " + CFloorManagement.MaxNumberOfLives.ToString(), pfTowerText, Color.Black, Color.Transparent, 700); - this.ttkScoreCount = new TitleTextureKey(TJAPlayer3.stage演奏ドラム画面.actScore.GetScore(0).ToString(), pfTowerText, Color.Black, Color.Transparent, 700); - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + this.ttkScoreCount = new TitleTextureKey(OpenTaiko.stage演奏ドラム画面.actScore.GetScore(0).ToString(), pfTowerText, Color.Black, Color.Transparent, 700); + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { Background = new ResultBG(CSkin.Path($@"{TextureLoader.BASE}{TextureLoader.DANRESULT}Script.lua")); Background.Init(); - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { Background = new ResultBG(CSkin.Path($@"{TextureLoader.BASE}{TextureLoader.RESULT}AIBattle{Path.DirectorySeparatorChar}Script.lua")); Background.Init(); } else { @@ -675,12 +675,12 @@ namespace TJAPlayer3 { Background.Init(); } - this.ttkDanTitles = new TitleTextureKey[TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count]; + this.ttkDanTitles = new TitleTextureKey[OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count]; - for (int i = 0; i < TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; i++) { - this.ttkDanTitles[i] = new TitleTextureKey(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].bTitleShow + for (int i = 0; i < OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; i++) { + this.ttkDanTitles[i] = new TitleTextureKey(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].bTitleShow ? "???" - : TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i].Title, + : OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i].Title, pfDanTitles, Color.White, Color.Black, @@ -691,14 +691,14 @@ namespace TJAPlayer3 { Trace.Unindent(); } - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) bgmResultIn.tPlay(); } public override void DeActivate() { - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); if (this.rResultSound != null) { - TJAPlayer3.SoundManager.tDisposeSound(this.rResultSound); + OpenTaiko.SoundManager.tDisposeSound(this.rResultSound); this.rResultSound = null; } @@ -710,22 +710,22 @@ namespace TJAPlayer3 { base.DeActivate(); } public override void CreateManagedResource() { - this.pfTowerText = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.TowerResult_Font_TowerText); - this.pfTowerText48 = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.TowerResult_Font_TowerText48); - this.pfTowerText72 = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.TowerResult_Font_TowerText72); + this.pfTowerText = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.TowerResult_Font_TowerText); + this.pfTowerText48 = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.TowerResult_Font_TowerText48); + this.pfTowerText72 = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.TowerResult_Font_TowerText72); - this.pfDanTitles = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.DanResult_Font_DanTitles_Size); + this.pfDanTitles = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.DanResult_Font_DanTitles_Size); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { - TJAPlayer3.tDisposeSafely(ref pfTowerText); - TJAPlayer3.tDisposeSafely(ref pfTowerText48); - TJAPlayer3.tDisposeSafely(ref pfTowerText72); - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { - TJAPlayer3.tDisposeSafely(ref pfDanTitles); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Tower) { + OpenTaiko.tDisposeSafely(ref pfTowerText); + OpenTaiko.tDisposeSafely(ref pfTowerText48); + OpenTaiko.tDisposeSafely(ref pfTowerText72); + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + OpenTaiko.tDisposeSafely(ref pfDanTitles); } base.ReleaseManagedResource(); @@ -738,7 +738,7 @@ namespace TJAPlayer3 { // int num; if (base.IsFirstDraw) { - this.ct登場用 = new CCounter(0, 100, 5, TJAPlayer3.Timer); + this.ct登場用 = new CCounter(0, 100, 5, OpenTaiko.Timer); this.actFI.tフェードイン開始(); base.ePhaseID = CStage.EPhase.Common_FADEIN; @@ -763,14 +763,14 @@ namespace TJAPlayer3 { Background?.Update(); Background?.Draw(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Dan && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] != (int)Difficulty.Tower) { #region [Ensou game result screen] if (!b音声再生 && !bgmResultIn.bIsPlaying) { bgmResultLoop.tPlay(); b音声再生 = true; } - if (!TJAPlayer3.ConfigIni.bAIBattleMode) { + if (!OpenTaiko.ConfigIni.bAIBattleMode) { /* if (TJAPlayer3.Tx.Result_Background != null) { @@ -1018,12 +1018,12 @@ namespace TJAPlayer3 { } } */ - if (TJAPlayer3.Tx.Result_Header != null) { - TJAPlayer3.Tx.Result_Header.t2D描画(0, 0); + if (OpenTaiko.Tx.Result_Header != null) { + OpenTaiko.Tx.Result_Header.t2D描画(0, 0); } } - if (this.ct登場用.IsTicked && (TJAPlayer3.Tx.Result_Header != null)) { + if (this.ct登場用.IsTicked && (OpenTaiko.Tx.Result_Header != null)) { double num2 = ((double)this.ct登場用.CurrentValue) / 100.0; double num3 = Math.Sin(Math.PI / 2 * num2); @@ -1045,12 +1045,12 @@ namespace TJAPlayer3 { #endregion } else { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { - double screen_ratio_x = TJAPlayer3.Skin.Resolution[0] / 1280.0; + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + double screen_ratio_x = OpenTaiko.Skin.Resolution[0] / 1280.0; #region [Counter processings] - int songCount = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count; + int songCount = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count; /* ** 1600 => Dan plate @@ -1060,7 +1060,7 @@ namespace TJAPlayer3 { ** ??? => Success/Fail animation */ if (ctPhase1 == null) { - ctPhase1 = new CCounter(0, 8200 + songCount * 300, 0.5f, TJAPlayer3.Timer); + ctPhase1 = new CCounter(0, 8200 + songCount * 300, 0.5f, OpenTaiko.Timer); ctPhase1.CurrentValue = 0; } @@ -1074,13 +1074,13 @@ namespace TJAPlayer3 { #region [DaniDoujou result screen] - if (!b音声再生 && !TJAPlayer3.Skin.bgmDanResult.bIsPlaying) { - TJAPlayer3.Skin.bgmDanResult.tPlay(); + if (!b音声再生 && !OpenTaiko.Skin.bgmDanResult.bIsPlaying) { + OpenTaiko.Skin.bgmDanResult.tPlay(); b音声再生 = true; } //DanResult_Background.t2D描画(0, 0); - TJAPlayer3.Tx.DanResult_SongPanel_Base.t2D描画(0, 0); + OpenTaiko.Tx.DanResult_SongPanel_Base.t2D描画(0, 0); #region [DanPlate] @@ -1134,15 +1134,15 @@ namespace TJAPlayer3 { #region [PassLogo] - Exam.Status examStatus = TJAPlayer3.stage演奏ドラム画面.actDan.GetExamStatus(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C); + Exam.Status examStatus = OpenTaiko.stage演奏ドラム画面.actDan.GetExamStatus(OpenTaiko.stage結果.st演奏記録.Drums.Dan_C); int unitsBeforeAppearance = Math.Max(0, 8200 + 300 * songCount - ctPhase1.CurrentValue); if (unitsBeforeAppearance <= 270) { - TJAPlayer3.Tx.DanResult_Rank.Opacity = 255; + OpenTaiko.Tx.DanResult_Rank.Opacity = 255; - int rank_width = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Width / 7; - int rank_height = TJAPlayer3.Tx.DanResult_Rank.szTextureSize.Height; + int rank_width = OpenTaiko.Tx.DanResult_Rank.szTextureSize.Width / 7; + int rank_height = OpenTaiko.Tx.DanResult_Rank.szTextureSize.Height; if (examStatus != Exam.Status.Failure) { #region [Goukaku] @@ -1150,15 +1150,15 @@ namespace TJAPlayer3 { #region [ Appear animation ] if (unitsBeforeAppearance >= 90) { - TJAPlayer3.Tx.DanResult_Rank.Opacity = (int)((270 - unitsBeforeAppearance) / 180.0f * 255.0f); - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 1.0f + (float)Math.Sin((360 - unitsBeforeAppearance) / 1.5f * (Math.PI / 180)) * 1.4f; - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 1.0f + (float)Math.Sin((360 - unitsBeforeAppearance) / 1.5f * (Math.PI / 180)) * 1.4f; + OpenTaiko.Tx.DanResult_Rank.Opacity = (int)((270 - unitsBeforeAppearance) / 180.0f * 255.0f); + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.X = 1.0f + (float)Math.Sin((360 - unitsBeforeAppearance) / 1.5f * (Math.PI / 180)) * 1.4f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.Y = 1.0f + (float)Math.Sin((360 - unitsBeforeAppearance) / 1.5f * (Math.PI / 180)) * 1.4f; } else if (unitsBeforeAppearance > 0) { - TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(90 - unitsBeforeAppearance) * (Math.PI / 180)) * 0.5f; - TJAPlayer3.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(90 - unitsBeforeAppearance) * (Math.PI / 180)) * 0.5f; + OpenTaiko.Tx.Result_ScoreRankEffect.vcScaleRatio.X = 0.5f + (float)Math.Sin((float)(90 - unitsBeforeAppearance) * (Math.PI / 180)) * 0.5f; + OpenTaiko.Tx.Result_ScoreRankEffect.vcScaleRatio.Y = 0.5f + (float)Math.Sin((float)(90 - unitsBeforeAppearance) * (Math.PI / 180)) * 0.5f; } else { - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.X = 1f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.Y = 1f; } #endregion @@ -1180,7 +1180,7 @@ namespace TJAPlayer3 { #endregion - TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.DanResult_Rank[0], TJAPlayer3.Skin.DanResult_Rank[1], + OpenTaiko.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.DanResult_Rank[0], OpenTaiko.Skin.DanResult_Rank[1], new Rectangle(rank_width * (2 * comboType + successType + 1), 0, rank_width, rank_height)); #endregion @@ -1190,15 +1190,15 @@ namespace TJAPlayer3 { #region [ Appear animation ] if (unitsBeforeAppearance >= 90) { - TJAPlayer3.Tx.DanResult_Rank.Opacity = (int)((270 - unitsBeforeAppearance) / 180.0f * 255.0f); + OpenTaiko.Tx.DanResult_Rank.Opacity = (int)((270 - unitsBeforeAppearance) / 180.0f * 255.0f); } - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.DanResult_Rank.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.X = 1f; + OpenTaiko.Tx.DanResult_Rank.vcScaleRatio.Y = 1f; #endregion - TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.DanResult_Rank[0], TJAPlayer3.Skin.DanResult_Rank[1] - (unitsBeforeAppearance / 10f), + OpenTaiko.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.DanResult_Rank[0], OpenTaiko.Skin.DanResult_Rank[1] - (unitsBeforeAppearance / 10f), new Rectangle(0, 0, rank_width, rank_height)); #endregion @@ -1207,8 +1207,8 @@ namespace TJAPlayer3 { #endregion - if (!b音声再生 && !TJAPlayer3.Skin.bgmDanResult.bIsPlaying) { - TJAPlayer3.Skin.bgmDanResult.tPlay(); + if (!b音声再生 && !OpenTaiko.Skin.bgmDanResult.bIsPlaying) { + OpenTaiko.Skin.bgmDanResult.tPlay(); b音声再生 = true; } @@ -1217,8 +1217,8 @@ namespace TJAPlayer3 { } else { #region [Tower result screen] - if (!b音声再生 && !TJAPlayer3.Skin.bgmTowerResult.bIsPlaying) { - TJAPlayer3.Skin.bgmTowerResult.tPlay(); + if (!b音声再生 && !OpenTaiko.Skin.bgmTowerResult.bIsPlaying) { + OpenTaiko.Skin.bgmTowerResult.tPlay(); b音声再生 = true; } @@ -1228,44 +1228,44 @@ namespace TJAPlayer3 { #region [Tower background] - if (TJAPlayer3.Skin.Game_Tower_Ptn_Result > 0) { + if (OpenTaiko.Skin.Game_Tower_Ptn_Result > 0) { int xFactor = 0; float yFactor = 1f; - int currentTowerType = Array.IndexOf(TJAPlayer3.Skin.Game_Tower_Names, TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType); + int currentTowerType = Array.IndexOf(OpenTaiko.Skin.Game_Tower_Names, OpenTaiko.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTowerType); - if (currentTowerType < 0 || currentTowerType >= TJAPlayer3.Skin.Game_Tower_Ptn_Result) + if (currentTowerType < 0 || currentTowerType >= OpenTaiko.Skin.Game_Tower_Ptn_Result) currentTowerType = 0; - if (TJAPlayer3.Tx.TowerResult_Background != null && TJAPlayer3.Tx.TowerResult_Tower[currentTowerType] != null) { - xFactor = (TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Width - TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Width) / 2; - yFactor = TJAPlayer3.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Height / (float)TJAPlayer3.Tx.TowerResult_Background.szTextureSize.Height; + if (OpenTaiko.Tx.TowerResult_Background != null && OpenTaiko.Tx.TowerResult_Tower[currentTowerType] != null) { + xFactor = (OpenTaiko.Tx.TowerResult_Background.szTextureSize.Width - OpenTaiko.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Width) / 2; + yFactor = OpenTaiko.Tx.TowerResult_Tower[currentTowerType].szTextureSize.Height / (float)OpenTaiko.Tx.TowerResult_Background.szTextureSize.Height; } - TJAPlayer3.Tx.TowerResult_Background?.t2D描画(0, -1 * this.ctTower_Animation.CurrentValue); - TJAPlayer3.Tx.TowerResult_Tower[currentTowerType]?.t2D描画(xFactor, -1 * yFactor * this.ctTower_Animation.CurrentValue); + OpenTaiko.Tx.TowerResult_Background?.t2D描画(0, -1 * this.ctTower_Animation.CurrentValue); + OpenTaiko.Tx.TowerResult_Tower[currentTowerType]?.t2D描画(xFactor, -1 * yFactor * this.ctTower_Animation.CurrentValue); } #endregion - TJAPlayer3.Tx.TowerResult_Panel?.t2D描画(0, 0); + OpenTaiko.Tx.TowerResult_Panel?.t2D描画(0, 0); #region [Score Rank] int sc = GetTowerScoreRank() - 1; - TJAPlayer3.actTextConsole.tPrint(0, 40, CTextConsole.EFontType.White, sc.ToString()); + OpenTaiko.actTextConsole.tPrint(0, 40, CTextConsole.EFontType.White, sc.ToString()); - if (sc >= 0 && TJAPlayer3.Tx.TowerResult_ScoreRankEffect != null) { - int scoreRankEffect_width = TJAPlayer3.Tx.TowerResult_ScoreRankEffect.szTextureSize.Width / 7; - int scoreRankEffect_height = TJAPlayer3.Tx.TowerResult_ScoreRankEffect.szTextureSize.Height; + if (sc >= 0 && OpenTaiko.Tx.TowerResult_ScoreRankEffect != null) { + int scoreRankEffect_width = OpenTaiko.Tx.TowerResult_ScoreRankEffect.szTextureSize.Width / 7; + int scoreRankEffect_height = OpenTaiko.Tx.TowerResult_ScoreRankEffect.szTextureSize.Height; - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.Opacity = 255; - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.X = 1f; - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.Y = 1f; - TJAPlayer3.Tx.TowerResult_ScoreRankEffect.t2D拡大率考慮中央基準描画( - TJAPlayer3.Skin.TowerResult_ScoreRankEffect[0], - TJAPlayer3.Skin.TowerResult_ScoreRankEffect[1], + OpenTaiko.Tx.TowerResult_ScoreRankEffect.Opacity = 255; + OpenTaiko.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.X = 1f; + OpenTaiko.Tx.TowerResult_ScoreRankEffect.vcScaleRatio.Y = 1f; + OpenTaiko.Tx.TowerResult_ScoreRankEffect.t2D拡大率考慮中央基準描画( + OpenTaiko.Skin.TowerResult_ScoreRankEffect[0], + OpenTaiko.Skin.TowerResult_ScoreRankEffect[1], new Rectangle(sc * scoreRankEffect_width, 0, scoreRankEffect_width, scoreRankEffect_height)); } @@ -1275,28 +1275,28 @@ namespace TJAPlayer3 { #region [Text elements] - TitleTextureKey.ResolveTitleTexture(this.ttkToutatsu)?.t2D描画(TJAPlayer3.Skin.TowerResult_Toutatsu[0], TJAPlayer3.Skin.TowerResult_Toutatsu[1]); - TitleTextureKey.ResolveTitleTexture(this.ttkMaxFloors)?.t2D描画(TJAPlayer3.Skin.TowerResult_MaxFloors[0], TJAPlayer3.Skin.TowerResult_MaxFloors[1]); - TitleTextureKey.ResolveTitleTexture(this.ttkTen)?.t2D描画(TJAPlayer3.Skin.TowerResult_Ten[0], TJAPlayer3.Skin.TowerResult_Ten[1]); - TitleTextureKey.ResolveTitleTexture(this.ttkScore)?.t2D描画(TJAPlayer3.Skin.TowerResult_Score[0], TJAPlayer3.Skin.TowerResult_Score[1]); + TitleTextureKey.ResolveTitleTexture(this.ttkToutatsu)?.t2D描画(OpenTaiko.Skin.TowerResult_Toutatsu[0], OpenTaiko.Skin.TowerResult_Toutatsu[1]); + TitleTextureKey.ResolveTitleTexture(this.ttkMaxFloors)?.t2D描画(OpenTaiko.Skin.TowerResult_MaxFloors[0], OpenTaiko.Skin.TowerResult_MaxFloors[1]); + TitleTextureKey.ResolveTitleTexture(this.ttkTen)?.t2D描画(OpenTaiko.Skin.TowerResult_Ten[0], OpenTaiko.Skin.TowerResult_Ten[1]); + TitleTextureKey.ResolveTitleTexture(this.ttkScore)?.t2D描画(OpenTaiko.Skin.TowerResult_Score[0], OpenTaiko.Skin.TowerResult_Score[1]); CTexture tmpScoreCount = TitleTextureKey.ResolveTitleTexture(this.ttkScoreCount); CTexture tmpCurrentFloor = TitleTextureKey.ResolveTitleTexture(this.ttkReachedFloor); CTexture tmpRemainingLifes = TitleTextureKey.ResolveTitleTexture(this.ttkRemaningLifes); - tmpCurrentFloor?.t2D描画(TJAPlayer3.Skin.TowerResult_CurrentFloor[0] - tmpCurrentFloor.szTextureSize.Width, TJAPlayer3.Skin.TowerResult_CurrentFloor[1]); - tmpScoreCount?.t2D描画(TJAPlayer3.Skin.TowerResult_ScoreCount[0] - tmpScoreCount.szTextureSize.Width, TJAPlayer3.Skin.TowerResult_ScoreCount[1]); - tmpRemainingLifes?.t2D描画(TJAPlayer3.Skin.TowerResult_RemainingLifes[0] - tmpRemainingLifes.szTextureSize.Width, TJAPlayer3.Skin.TowerResult_RemainingLifes[1]); + tmpCurrentFloor?.t2D描画(OpenTaiko.Skin.TowerResult_CurrentFloor[0] - tmpCurrentFloor.szTextureSize.Width, OpenTaiko.Skin.TowerResult_CurrentFloor[1]); + tmpScoreCount?.t2D描画(OpenTaiko.Skin.TowerResult_ScoreCount[0] - tmpScoreCount.szTextureSize.Width, OpenTaiko.Skin.TowerResult_ScoreCount[1]); + tmpRemainingLifes?.t2D描画(OpenTaiko.Skin.TowerResult_RemainingLifes[0] - tmpRemainingLifes.szTextureSize.Width, OpenTaiko.Skin.TowerResult_RemainingLifes[1]); - int soul_width = TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Width; - int soul_height = TJAPlayer3.Tx.Gauge_Soul.szTextureSize.Height / 2; + int soul_width = OpenTaiko.Tx.Gauge_Soul.szTextureSize.Width; + int soul_height = OpenTaiko.Tx.Gauge_Soul.szTextureSize.Height / 2; - TJAPlayer3.Tx.Gauge_Soul?.t2D描画(TJAPlayer3.Skin.TowerResult_Gauge_Soul[0], TJAPlayer3.Skin.TowerResult_Gauge_Soul[1], new Rectangle(0, 0, soul_width, soul_height)); + OpenTaiko.Tx.Gauge_Soul?.t2D描画(OpenTaiko.Skin.TowerResult_Gauge_Soul[0], OpenTaiko.Skin.TowerResult_Gauge_Soul[1], new Rectangle(0, 0, soul_width, soul_height)); #endregion - if (!b音声再生 && !TJAPlayer3.Skin.bgmTowerResult.bIsPlaying) { - TJAPlayer3.Skin.bgmTowerResult.tPlay(); + if (!b音声再生 && !OpenTaiko.Skin.bgmTowerResult.bIsPlaying) { + OpenTaiko.Skin.bgmTowerResult.tPlay(); b音声再生 = true; } @@ -1324,11 +1324,11 @@ namespace TJAPlayer3 { #region Nameplate - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break; + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + if (OpenTaiko.ConfigIni.bAIBattleMode && i == 1) break; int pos = i; - if (TJAPlayer3.P1IsBlue() && TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] < (int)Difficulty.Tower) + if (OpenTaiko.P1IsBlue() && OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] < (int)Difficulty.Tower) pos = 1; int namePlate_x; @@ -1336,24 +1336,24 @@ namespace TJAPlayer3 { int modIcons_x; int modIcons_y; - if (TJAPlayer3.ConfigIni.nPlayerCount == 5) { - namePlate_x = TJAPlayer3.Skin.Result_NamePlate_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - namePlate_y = TJAPlayer3.Skin.Result_NamePlate_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - modIcons_x = TJAPlayer3.Skin.Result_ModIcons_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos]; - modIcons_y = TJAPlayer3.Skin.Result_ModIcons_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos]; - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3) { - namePlate_x = TJAPlayer3.Skin.Result_NamePlate_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - namePlate_y = TJAPlayer3.Skin.Result_NamePlate_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; - modIcons_x = TJAPlayer3.Skin.Result_ModIcons_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos]; - modIcons_y = TJAPlayer3.Skin.Result_ModIcons_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos]; + if (OpenTaiko.ConfigIni.nPlayerCount == 5) { + namePlate_x = OpenTaiko.Skin.Result_NamePlate_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + namePlate_y = OpenTaiko.Skin.Result_NamePlate_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + modIcons_x = OpenTaiko.Skin.Result_ModIcons_5P[0] + OpenTaiko.Skin.Result_UIMove_5P_X[pos]; + modIcons_y = OpenTaiko.Skin.Result_ModIcons_5P[1] + OpenTaiko.Skin.Result_UIMove_5P_Y[pos]; + } else if (OpenTaiko.ConfigIni.nPlayerCount == 4 || OpenTaiko.ConfigIni.nPlayerCount == 3) { + namePlate_x = OpenTaiko.Skin.Result_NamePlate_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + namePlate_y = OpenTaiko.Skin.Result_NamePlate_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; + modIcons_x = OpenTaiko.Skin.Result_ModIcons_4P[0] + OpenTaiko.Skin.Result_UIMove_4P_X[pos]; + modIcons_y = OpenTaiko.Skin.Result_ModIcons_4P[1] + OpenTaiko.Skin.Result_UIMove_4P_Y[pos]; } else { - namePlate_x = TJAPlayer3.Skin.Result_NamePlate_X[pos]; - namePlate_y = TJAPlayer3.Skin.Result_NamePlate_Y[pos]; - modIcons_x = TJAPlayer3.Skin.Result_ModIcons_X[pos]; - modIcons_y = TJAPlayer3.Skin.Result_ModIcons_Y[pos]; + namePlate_x = OpenTaiko.Skin.Result_NamePlate_X[pos]; + namePlate_y = OpenTaiko.Skin.Result_NamePlate_Y[pos]; + modIcons_x = OpenTaiko.Skin.Result_ModIcons_X[pos]; + modIcons_y = OpenTaiko.Skin.Result_ModIcons_Y[pos]; } - TJAPlayer3.NamePlate.tNamePlateDraw(namePlate_x, namePlate_y, i); + OpenTaiko.NamePlate.tNamePlateDraw(namePlate_x, namePlate_y, i); #region Mods @@ -1387,12 +1387,12 @@ namespace TJAPlayer3 { #region [ #24609 2011.3.14 yyagi ランク更新or演奏型スキル更新時、リザルト画像をpngで保存する ] if (this.bアニメが完了 == true && this.bIsCheckedWhetherResultScreenShouldSaveOrNot == false // #24609 2011.3.14 yyagi; to save result screen in case BestRank or HiSkill. - && TJAPlayer3.ConfigIni.bIsAutoResultCapture) // #25399 2011.6.9 yyagi + && OpenTaiko.ConfigIni.bIsAutoResultCapture) // #25399 2011.6.9 yyagi { string strFullPath = - Path.Combine(TJAPlayer3.strEXEのあるフォルダ, "Capture_img"); + Path.Combine(OpenTaiko.strEXEのあるフォルダ, "Capture_img"); strFullPath = Path.Combine(strFullPath, DateTime.Now.ToString("yyyyMMddHHmmss") + ".png"); - TJAPlayer3.app.SaveResultScreen(strFullPath); + OpenTaiko.app.SaveResultScreen(strFullPath); this.bIsCheckedWhetherResultScreenShouldSaveOrNot = true; } @@ -1400,20 +1400,20 @@ namespace TJAPlayer3 { // キー入力 - if (TJAPlayer3.act現在入力を占有中のプラグイン == null) { + if (OpenTaiko.act現在入力を占有中のプラグイン == null) { if (base.ePhaseID == CStage.EPhase.Common_NORMAL) { - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) { #region [ Return to song select screen (Faster method) ] bgmResultLoop.tStop(); - TJAPlayer3.Skin.bgmDanResult.tStop(); - TJAPlayer3.Skin.bgmTowerResult.tStop(); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.bgmDanResult.tStop(); + OpenTaiko.Skin.bgmTowerResult.tStop(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); actFI.tフェードアウト開始(); - if (TJAPlayer3.latestSongSelect == TJAPlayer3.stageSongSelect)// TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) - if (TJAPlayer3.stageSongSelect.rNowSelectedSong.rParentNode != null) - TJAPlayer3.stageSongSelect.actSongList.tCloseBOX(); + if (OpenTaiko.latestSongSelect == OpenTaiko.stageSongSelect)// TJAPlayer3.stage選曲.n確定された曲の難易度[0] != (int)Difficulty.Dan) + if (OpenTaiko.stageSongSelect.rNowSelectedSong.rParentNode != null) + OpenTaiko.stageSongSelect.actSongList.tCloseBOX(); tPostprocessing(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; @@ -1421,22 +1421,22 @@ namespace TJAPlayer3 { #endregion } - if (((TJAPlayer3.Pad.bPressedDGB(EPad.CY) - || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RD)) - || (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LC) - || (TJAPlayer3.Pad.bPressedDGB(EPad.Decide) - || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))))) { + if (((OpenTaiko.Pad.bPressedDGB(EPad.CY) + || OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RD)) + || (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LC) + || (OpenTaiko.Pad.bPressedDGB(EPad.Decide) + || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))))) { #region [ Skip animations ] - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] < (int)Difficulty.Tower + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] < (int)Difficulty.Tower && this.actParameterPanel.ctMainCounter.CurrentValue < this.actParameterPanel.MountainAppearValue) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); this.actParameterPanel.tSkipResultAnimations(); - } else if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan + } else if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan && (ctPhase1 != null && ctPhase1.IsUnEnded)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); ctPhase1.CurrentValue = (int)ctPhase1.EndValue; } @@ -1444,15 +1444,15 @@ namespace TJAPlayer3 { else { if ((lcModal?.AnimationFinished() ?? true)) { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); if (!mqModals.tAreBothQueuesEmpty() - && (TJAPlayer3.Pad.bPressedDGB(EPad.Decide) - || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))) { + && (OpenTaiko.Pad.bPressedDGB(EPad.Decide) + || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))) { displayedModals = mqModals.tPopModalInOrder(); - } else if (TJAPlayer3.ConfigIni.nPlayerCount == 1 || mqModals.tAreBothQueuesEmpty()) { + } else if (OpenTaiko.ConfigIni.nPlayerCount == 1 || mqModals.tAreBothQueuesEmpty()) { if (!mqModals.tAreBothQueuesEmpty()) LogNotification.PopError("Unexpected Error: Exited results screen with remaining modals, this is likely due to a Lua script issue."); @@ -1461,9 +1461,9 @@ namespace TJAPlayer3 { actFI.tフェードアウト開始(); - if (TJAPlayer3.latestSongSelect == TJAPlayer3.stageSongSelect) - if (TJAPlayer3.stageSongSelect.rNowSelectedSong.rParentNode != null) - TJAPlayer3.stageSongSelect.actSongList.tCloseBOX(); + if (OpenTaiko.latestSongSelect == OpenTaiko.stageSongSelect) + if (OpenTaiko.stageSongSelect.rNowSelectedSong.rParentNode != null) + OpenTaiko.stageSongSelect.actSongList.tCloseBOX(); tPostprocessing(); @@ -1471,8 +1471,8 @@ namespace TJAPlayer3 { base.ePhaseID = CStage.EPhase.Common_FADEOUT; this.eフェードアウト完了時の戻り値 = E戻り値.完了; bgmResultLoop.tStop(); - TJAPlayer3.Skin.bgmDanResult.tStop(); - TJAPlayer3.Skin.bgmTowerResult.tStop(); + OpenTaiko.Skin.bgmDanResult.tStop(); + OpenTaiko.Skin.bgmTowerResult.tStop(); } #endregion @@ -1483,15 +1483,15 @@ namespace TJAPlayer3 { } - if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || - TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + if (OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) || + OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { #region [ Phase 2 (Swap freely between Exams and Songs) ] if (ctPhase1 != null && ctPhase1.IsEnded && (ctPhase2 == null || ctPhase2.IsEnded)) { - ctPhase2 = new CCounter(0, 1280, 0.5f, TJAPlayer3.Timer); + ctPhase2 = new CCounter(0, 1280, 0.5f, OpenTaiko.Timer); ctPhase2.CurrentValue = 0; if (examsShift == 0) @@ -1499,7 +1499,7 @@ namespace TJAPlayer3 { else examsShift = -examsShift; - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } #endregion @@ -1514,45 +1514,45 @@ namespace TJAPlayer3 { #region [Dan result exam information] private void ftDanDisplayExamInfo(int offset = 0) { - int baseX = TJAPlayer3.Skin.DanResult_StatePanel[0] + offset; - int baseY = TJAPlayer3.Skin.DanResult_StatePanel[1]; + int baseX = OpenTaiko.Skin.DanResult_StatePanel[0] + offset; + int baseY = OpenTaiko.Skin.DanResult_StatePanel[1]; - TJAPlayer3.Tx.DanResult_StatePanel_Base.t2D描画(baseX, baseY); - TJAPlayer3.Tx.DanResult_StatePanel_Main.t2D描画(baseX, baseY); + OpenTaiko.Tx.DanResult_StatePanel_Base.t2D描画(baseX, baseY); + OpenTaiko.Tx.DanResult_StatePanel_Main.t2D描画(baseX, baseY); #region [ Global scores ] - int totalHit = TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGreat - + TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGood - + TJAPlayer3.stage演奏ドラム画面.GetRoll(0); + int totalHit = OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGreat + + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGood + + OpenTaiko.stage演奏ドラム画面.GetRoll(0); // Small digits - this.actParameterPanel.t小文字表示(TJAPlayer3.Skin.DanResult_Perfect[0] + offset, TJAPlayer3.Skin.DanResult_Perfect[1], - TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGreat, 1.0f); + this.actParameterPanel.t小文字表示(OpenTaiko.Skin.DanResult_Perfect[0] + offset, OpenTaiko.Skin.DanResult_Perfect[1], + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGreat, 1.0f); - this.actParameterPanel.t小文字表示(TJAPlayer3.Skin.DanResult_Good[0] + offset, TJAPlayer3.Skin.DanResult_Good[1], - TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nGood, 1.0f); + this.actParameterPanel.t小文字表示(OpenTaiko.Skin.DanResult_Good[0] + offset, OpenTaiko.Skin.DanResult_Good[1], + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nGood, 1.0f); - this.actParameterPanel.t小文字表示(TJAPlayer3.Skin.DanResult_Miss[0] + offset, TJAPlayer3.Skin.DanResult_Miss[1], - TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMiss, 1.0f); + this.actParameterPanel.t小文字表示(OpenTaiko.Skin.DanResult_Miss[0] + offset, OpenTaiko.Skin.DanResult_Miss[1], + OpenTaiko.stage演奏ドラム画面.CChartScore[0].nMiss, 1.0f); - this.actParameterPanel.t小文字表示(TJAPlayer3.Skin.DanResult_Roll[0] + offset, TJAPlayer3.Skin.DanResult_Roll[1], - TJAPlayer3.stage演奏ドラム画面.GetRoll(0), 1.0f); + this.actParameterPanel.t小文字表示(OpenTaiko.Skin.DanResult_Roll[0] + offset, OpenTaiko.Skin.DanResult_Roll[1], + OpenTaiko.stage演奏ドラム画面.GetRoll(0), 1.0f); - this.actParameterPanel.t小文字表示(TJAPlayer3.Skin.DanResult_MaxCombo[0] + offset, TJAPlayer3.Skin.DanResult_MaxCombo[1], - TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0], 1.0f); + this.actParameterPanel.t小文字表示(OpenTaiko.Skin.DanResult_MaxCombo[0] + offset, OpenTaiko.Skin.DanResult_MaxCombo[1], + OpenTaiko.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[0], 1.0f); - this.actParameterPanel.t小文字表示(TJAPlayer3.Skin.DanResult_TotalHit[0] + offset, TJAPlayer3.Skin.DanResult_TotalHit[1], + this.actParameterPanel.t小文字表示(OpenTaiko.Skin.DanResult_TotalHit[0] + offset, OpenTaiko.Skin.DanResult_TotalHit[1], totalHit, 1.0f); // Large digits - this.actParameterPanel.tスコア文字表示(TJAPlayer3.Skin.DanResult_Score[0] + offset, TJAPlayer3.Skin.DanResult_Score[1], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(0), 1.0f); + this.actParameterPanel.tスコア文字表示(OpenTaiko.Skin.DanResult_Score[0] + offset, OpenTaiko.Skin.DanResult_Score[1], (int)OpenTaiko.stage演奏ドラム画面.actScore.Get(0), 1.0f); #endregion #region [ Display exams ] - TJAPlayer3.stage演奏ドラム画面.actDan.DrawExam(TJAPlayer3.stage結果.st演奏記録.Drums.Dan_C, true, offset); + OpenTaiko.stage演奏ドラム画面.actDan.DrawExam(OpenTaiko.stage結果.st演奏記録.Drums.Dan_C, true, offset); #endregion } @@ -1580,58 +1580,58 @@ namespace TJAPlayer3 { int baseY = 100 + 183 * i; */ - var song = TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs[i]; + var song = OpenTaiko.stageSongSelect.rChoosenSong.DanSongs[i]; // TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(scroll + 377, 180 + i * 73, new Rectangle(song.Difficulty * 53, 0, 53, 53)); - int songPanel_main_width = TJAPlayer3.Tx.DanResult_SongPanel_Main.szTextureSize.Width; - int songPanel_main_height = TJAPlayer3.Tx.DanResult_SongPanel_Main.szTextureSize.Height / 3; + int songPanel_main_width = OpenTaiko.Tx.DanResult_SongPanel_Main.szTextureSize.Width; + int songPanel_main_height = OpenTaiko.Tx.DanResult_SongPanel_Main.szTextureSize.Height / 3; - TJAPlayer3.Tx.DanResult_SongPanel_Main.Opacity = opacity; - TJAPlayer3.Tx.DanResult_SongPanel_Main.t2D描画(TJAPlayer3.Skin.DanResult_SongPanel_Main_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_SongPanel_Main_Y[drawPos], new Rectangle(0, songPanel_main_height * Math.Min(i, 2), songPanel_main_width, songPanel_main_height)); + OpenTaiko.Tx.DanResult_SongPanel_Main.Opacity = opacity; + OpenTaiko.Tx.DanResult_SongPanel_Main.t2D描画(OpenTaiko.Skin.DanResult_SongPanel_Main_X[drawPos] + offset, OpenTaiko.Skin.DanResult_SongPanel_Main_Y[drawPos], new Rectangle(0, songPanel_main_height * Math.Min(i, 2), songPanel_main_width, songPanel_main_height)); - int difficulty_cymbol_width = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5; - int difficulty_cymbol_height = TJAPlayer3.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; + int difficulty_cymbol_width = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Width / 5; + int difficulty_cymbol_height = OpenTaiko.Tx.Dani_Difficulty_Cymbol.szTextureSize.Height; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = opacity; - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.Skin.DanResult_Difficulty_Cymbol_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_Difficulty_Cymbol_Y[drawPos], new Rectangle(song.Difficulty * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height)); - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = 255; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.Opacity = opacity; + OpenTaiko.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(OpenTaiko.Skin.DanResult_Difficulty_Cymbol_X[drawPos] + offset, OpenTaiko.Skin.DanResult_Difficulty_Cymbol_Y[drawPos], new Rectangle(song.Difficulty * difficulty_cymbol_width, 0, difficulty_cymbol_width, difficulty_cymbol_height)); + OpenTaiko.Tx.Dani_Difficulty_Cymbol.Opacity = 255; - TJAPlayer3.Tx.Dani_Level_Number.Opacity = opacity; - TJAPlayer3.stage段位選択.段位リスト.tLevelNumberDraw(TJAPlayer3.Skin.DanResult_Level_Number_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_Level_Number_Y[drawPos], song.Level); - TJAPlayer3.Tx.Dani_Level_Number.Opacity = 255; + OpenTaiko.Tx.Dani_Level_Number.Opacity = opacity; + OpenTaiko.stage段位選択.段位リスト.tLevelNumberDraw(OpenTaiko.Skin.DanResult_Level_Number_X[drawPos] + offset, OpenTaiko.Skin.DanResult_Level_Number_Y[drawPos], song.Level); + OpenTaiko.Tx.Dani_Level_Number.Opacity = 255; int[] scoresArr = { - TJAPlayer3.stage演奏ドラム画面.n良[i], - TJAPlayer3.stage演奏ドラム画面.n可[i], - TJAPlayer3.stage演奏ドラム画面.n不可[i], - TJAPlayer3.stage演奏ドラム画面.n連打[i] + OpenTaiko.stage演奏ドラム画面.n良[i], + OpenTaiko.stage演奏ドラム画面.n可[i], + OpenTaiko.stage演奏ドラム画面.n不可[i], + OpenTaiko.stage演奏ドラム画面.n連打[i] }; int[] num_x = { - TJAPlayer3.Skin.DanResult_Sections_Perfect_X[drawPos], - TJAPlayer3.Skin.DanResult_Sections_Good_X[drawPos], - TJAPlayer3.Skin.DanResult_Sections_Miss_X[drawPos], - TJAPlayer3.Skin.DanResult_Sections_Roll_X[drawPos], + OpenTaiko.Skin.DanResult_Sections_Perfect_X[drawPos], + OpenTaiko.Skin.DanResult_Sections_Good_X[drawPos], + OpenTaiko.Skin.DanResult_Sections_Miss_X[drawPos], + OpenTaiko.Skin.DanResult_Sections_Roll_X[drawPos], }; int[] num_y = { - TJAPlayer3.Skin.DanResult_Sections_Perfect_Y[drawPos], - TJAPlayer3.Skin.DanResult_Sections_Good_Y[drawPos], - TJAPlayer3.Skin.DanResult_Sections_Miss_Y[drawPos], - TJAPlayer3.Skin.DanResult_Sections_Roll_Y[drawPos], + OpenTaiko.Skin.DanResult_Sections_Perfect_Y[drawPos], + OpenTaiko.Skin.DanResult_Sections_Good_Y[drawPos], + OpenTaiko.Skin.DanResult_Sections_Miss_Y[drawPos], + OpenTaiko.Skin.DanResult_Sections_Roll_Y[drawPos], }; - TJAPlayer3.Tx.Result_Number.Opacity = opacity; + OpenTaiko.Tx.Result_Number.Opacity = opacity; for (int j = 0; j < 4; j++) this.actParameterPanel.t小文字表示(num_x[j] + offset, num_y[j], scoresArr[j], 1.0f); - TJAPlayer3.Tx.Result_Number.Opacity = 255; + OpenTaiko.Tx.Result_Number.Opacity = 255; TitleTextureKey.ResolveTitleTexture(this.ttkDanTitles[i]).Opacity = opacity; - TitleTextureKey.ResolveTitleTexture(this.ttkDanTitles[i]).t2D描画(TJAPlayer3.Skin.DanResult_DanTitles_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_DanTitles_Y[drawPos]); + TitleTextureKey.ResolveTitleTexture(this.ttkDanTitles[i]).t2D描画(OpenTaiko.Skin.DanResult_DanTitles_X[drawPos] + offset, OpenTaiko.Skin.DanResult_DanTitles_Y[drawPos]); - CActSelect段位リスト.tDisplayDanIcon(i + 1, TJAPlayer3.Skin.DanResult_DanIcon_X[drawPos] + offset, TJAPlayer3.Skin.DanResult_DanIcon_Y[drawPos], opacity, 1.0f); + CActSelect段位リスト.tDisplayDanIcon(i + 1, OpenTaiko.Skin.DanResult_DanIcon_X[drawPos] + offset, OpenTaiko.Skin.DanResult_DanIcon_Y[drawPos], opacity, 1.0f); } @@ -1643,7 +1643,7 @@ namespace TJAPlayer3 { if (!bAddedToRecentlyPlayedSongs) { // Song added to recently added songs here - TJAPlayer3.RecentlyPlayedSongs.tAddChart(TJAPlayer3.stageSongSelect.rChoosenSong.uniqueId.data.id); + OpenTaiko.RecentlyPlayedSongs.tAddChart(OpenTaiko.stageSongSelect.rChoosenSong.uniqueId.data.id); bAddedToRecentlyPlayedSongs = true; } @@ -1682,16 +1682,16 @@ namespace TJAPlayer3 { public bool[] bClear { get { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { + if (OpenTaiko.ConfigIni.bAIBattleMode) { int clearCount = 0; - for (int i = 0; i < TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count; i++) { - if (TJAPlayer3.stage演奏ドラム画面.AIBattleSections[i].End == CStage演奏画面共通.AIBattleSection.EndType.Clear) { + for (int i = 0; i < OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count; i++) { + if (OpenTaiko.stage演奏ドラム画面.AIBattleSections[i].End == CStage演奏画面共通.AIBattleSection.EndType.Clear) { clearCount++; } } - return new bool[] { clearCount >= TJAPlayer3.stage演奏ドラム画面.AIBattleSections.Count / 2.0, false }; + return new bool[] { clearCount >= OpenTaiko.stage演奏ドラム画面.AIBattleSections.Count / 2.0, false }; } else { - return new bool[] { TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared[0], TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared[1], TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared[2], TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared[3], TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared[4] }; + return new bool[] { OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared[0], OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared[1], OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared[2], OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared[3], OpenTaiko.stage演奏ドラム画面.bIsAlreadyCleared[4] }; } } } @@ -1701,11 +1701,11 @@ namespace TJAPlayer3 { private int nNowDanSongInfo; private void NextDanSongInfo() { - ctDanSongInfoChange = new CCounter(0, 2000, 1, TJAPlayer3.Timer); + ctDanSongInfoChange = new CCounter(0, 2000, 1, OpenTaiko.Timer); ctDanSongInfoChange.CurrentValue = 0; nNowDanSongInfo++; - if (nNowDanSongInfo >= Math.Ceiling(TJAPlayer3.stageSongSelect.rChoosenSong.DanSongs.Count / 3.0)) { + if (nNowDanSongInfo >= Math.Ceiling(OpenTaiko.stageSongSelect.rChoosenSong.DanSongs.Count / 3.0)) { nNowDanSongInfo = 0; } } @@ -1764,20 +1764,20 @@ namespace TJAPlayer3 { private CSkin.CSystemSound bgmResultIn { get { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - return TJAPlayer3.Skin.bgmResultIn_AI; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + return OpenTaiko.Skin.bgmResultIn_AI; } else { - return TJAPlayer3.Skin.bgmリザルトイン音; + return OpenTaiko.Skin.bgmリザルトイン音; } } } private CSkin.CSystemSound bgmResultLoop { get { - if (TJAPlayer3.ConfigIni.bAIBattleMode) { - return TJAPlayer3.Skin.bgmResult_AI; + if (OpenTaiko.ConfigIni.bAIBattleMode) { + return OpenTaiko.Skin.bgmResult_AI; } else { - return TJAPlayer3.Skin.bgmリザルト音; + return OpenTaiko.Skin.bgmリザルト音; } } } diff --git a/OpenTaiko/src/Stages/08.Result/ResultBG.cs b/OpenTaiko/src/Stages/08.Result/ResultBG.cs index acae8bfd..bb17ecf7 100644 --- a/OpenTaiko/src/Stages/08.Result/ResultBG.cs +++ b/OpenTaiko/src/Stages/08.Result/ResultBG.cs @@ -1,6 +1,6 @@ using NLua; -namespace TJAPlayer3 { +namespace OpenTaiko { class ResultBG : ScriptBG { private LuaFunction LuaSkipAnimation; diff --git a/OpenTaiko/src/Stages/09.Ending/CStage終了.cs b/OpenTaiko/src/Stages/09.Ending/CStage終了.cs index 0e08a80b..3e90df6d 100644 --- a/OpenTaiko/src/Stages/09.Ending/CStage終了.cs +++ b/OpenTaiko/src/Stages/09.Ending/CStage終了.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CStage終了 : CStage { // コンストラクタ @@ -33,7 +33,7 @@ namespace TJAPlayer3 { Trace.TraceInformation("終了ステージを非活性化します。"); Trace.Indent(); try { - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); base.DeActivate(); } finally { Trace.TraceInformation("終了ステージの非活性化を完了しました。"); @@ -70,8 +70,8 @@ namespace TJAPlayer3 { if (!base.IsDeActivated) { if (base.IsFirstDraw) { - TJAPlayer3.Skin.soundゲーム終了音.tPlay(); - this.ct時間稼ぎ.Start(0, TJAPlayer3.Skin.Exit_Duration, 1, TJAPlayer3.Timer); + OpenTaiko.Skin.soundゲーム終了音.tPlay(); + this.ct時間稼ぎ.Start(0, OpenTaiko.Skin.Exit_Duration, 1, OpenTaiko.Timer); base.IsFirstDraw = false; } @@ -83,7 +83,7 @@ namespace TJAPlayer3 { //TJAPlayer3.Tx.Exit_Background?.t2D描画( 0, 0 ); - if (this.ct時間稼ぎ.IsEnded && !TJAPlayer3.Skin.soundゲーム終了音.bIsPlaying) { + if (this.ct時間稼ぎ.IsEnded && !OpenTaiko.Skin.soundゲーム終了音.bIsPlaying) { return 1; } } diff --git a/OpenTaiko/src/Stages/10.ChangeSkin/CStageChangeSkin.cs b/OpenTaiko/src/Stages/10.ChangeSkin/CStageChangeSkin.cs index 18843a97..4fa3b741 100644 --- a/OpenTaiko/src/Stages/10.ChangeSkin/CStageChangeSkin.cs +++ b/OpenTaiko/src/Stages/10.ChangeSkin/CStageChangeSkin.cs @@ -1,7 +1,7 @@ using System.Diagnostics; -namespace TJAPlayer3 { +namespace OpenTaiko { /// /// box.defによるスキン変更時に一時的に遷移する、スキン画像の一切無いステージ。 /// @@ -54,7 +54,7 @@ namespace TJAPlayer3 { } //スキン変更処理 - TJAPlayer3.app.RefreshSkin(); + OpenTaiko.app.RefreshSkin(); return 1; } diff --git a/OpenTaiko/src/Stages/11.Heya/CHeyaDisplayAssetInformations.cs b/OpenTaiko/src/Stages/11.Heya/CHeyaDisplayAssetInformations.cs index 1b2fbe5d..61981bb5 100644 --- a/OpenTaiko/src/Stages/11.Heya/CHeyaDisplayAssetInformations.cs +++ b/OpenTaiko/src/Stages/11.Heya/CHeyaDisplayAssetInformations.cs @@ -1,8 +1,8 @@ using FDK; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; using Color = System.Drawing.Color; -namespace TJAPlayer3 { +namespace OpenTaiko { class CHeyaDisplayAssetInformations { private static TitleTextureKey? ttkDescription = null; @@ -10,13 +10,13 @@ namespace TJAPlayer3 { private static int XOrigin { get { - return TJAPlayer3.Skin.Heya_DescriptionTextOrigin[0]; + return OpenTaiko.Skin.Heya_DescriptionTextOrigin[0]; } } private static int YOrigin { get { - return TJAPlayer3.Skin.Heya_DescriptionTextOrigin[1]; + return OpenTaiko.Skin.Heya_DescriptionTextOrigin[1]; } } @@ -57,11 +57,11 @@ namespace TJAPlayer3 { description += $"{CLangManager.LangInstance.GetString("HEYA_DESCRIPTION_COIN_MULTIPLIER").SafeFormat(character.effect.GetCoinMultiplier())}\n"; - if (ttkDescription is null || ttkDescription.str文字 != description) { + if (ttkDescription is null || ttkDescription.str != description) { ttkDescription = new TitleTextureKey(description, pf, Color.White, Color.Black, 1000); } - TJAPlayer3.Tx.Heya_Description_Panel?.t2D描画(0, 0); + OpenTaiko.Tx.Heya_Description_Panel?.t2D描画(0, 0); TitleTextureKey.ResolveTitleTexture(ttkDescription).t2D描画(XOrigin, YOrigin); } @@ -82,11 +82,11 @@ namespace TJAPlayer3 { if (puchi.effect.SplitLane) description += "Split Lanes\n"; description += $"{CLangManager.LangInstance.GetString("HEYA_DESCRIPTION_COIN_MULTIPLIER").SafeFormat(puchi.effect.GetCoinMultiplier())}\n"; - if (ttkDescription is null || ttkDescription.str文字 != description) { + if (ttkDescription is null || ttkDescription.str != description) { ttkDescription = new TitleTextureKey(description, pf, Color.White, Color.Black, 1000); } - TJAPlayer3.Tx.Heya_Description_Panel?.t2D描画(0, 0); + OpenTaiko.Tx.Heya_Description_Panel?.t2D描画(0, 0); TitleTextureKey.ResolveTitleTexture(ttkDescription).t2D描画(XOrigin, YOrigin); } diff --git a/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs b/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs index 87a38f25..4a387e95 100644 --- a/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs +++ b/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs @@ -1,9 +1,8 @@ using FDK; -using static TJAPlayer3.CActSelect曲リスト; using Color = System.Drawing.Color; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { class CStageHeya : CStage { public CStageHeya() { base.eStageID = EStage.Heya; @@ -29,12 +28,12 @@ namespace TJAPlayer3 { bInSongPlayed = false; - this.pfHeyaFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Heya_Font_Scale); + this.pfHeyaFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Heya_Font_Scale); - ScrollCounter = new CCounter(0, 1000, 0.15f, TJAPlayer3.Timer); + ScrollCounter = new CCounter(0, 1000, 0.15f, OpenTaiko.Timer); // 1P, configure later for default 2P - iPlayer = TJAPlayer3.SaveFile; + iPlayer = OpenTaiko.SaveFile; #region [Main menu] @@ -55,8 +54,8 @@ namespace TJAPlayer3 { #region [Dan title] int amount = 1; - if (TJAPlayer3.SaveFileInstances[iPlayer].data.DanTitles != null) - amount += TJAPlayer3.SaveFileInstances[iPlayer].data.DanTitles.Count; + if (OpenTaiko.SaveFileInstances[iPlayer].data.DanTitles != null) + amount += OpenTaiko.SaveFileInstances[iPlayer].data.DanTitles.Count; this.ttkDanTitles = new TitleTextureKey[amount]; this.sDanTitles = new string[amount]; @@ -66,8 +65,8 @@ namespace TJAPlayer3 { this.sDanTitles[0] = "新人"; int idx = 1; - if (TJAPlayer3.SaveFileInstances[iPlayer].data.DanTitles != null) { - foreach (var item in TJAPlayer3.SaveFileInstances[iPlayer].data.DanTitles) { + if (OpenTaiko.SaveFileInstances[iPlayer].data.DanTitles != null) { + foreach (var item in OpenTaiko.SaveFileInstances[iPlayer].data.DanTitles) { this.sDanTitles[idx] = item.Key; if (item.Value.isGold == true) this.ttkDanTitles[idx] = new TitleTextureKey($"{item.Key}", this.pfHeyaFont, Color.Gold, Color.Black, 1000); @@ -82,8 +81,8 @@ namespace TJAPlayer3 { #region [Plate title] amount = 1; - if (TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null) - amount += TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds.Count; + if (OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null) + amount += OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds.Count; this.ttkTitles = new TitleTextureKey[amount]; this.titlesKeys = new int[amount]; @@ -93,9 +92,9 @@ namespace TJAPlayer3 { this.titlesKeys[0] = 0; // Regular nameplate unlockable start by 1 (Important) idx = 1; - if (TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null) { - foreach (var _ref in TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds) { - var item = TJAPlayer3.Databases.DBNameplateUnlockables.data?[_ref]; + if (OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null) { + foreach (var _ref in OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds) { + var item = OpenTaiko.Databases.DBNameplateUnlockables.data?[_ref]; if (item != null) { this.ttkTitles[idx] = new TitleTextureKey(item.nameplateInfo.cld.GetString(""), this.pfHeyaFont, Color.Black, Color.Transparent, 1000); this.titlesKeys[idx] = _ref; @@ -113,30 +112,30 @@ namespace TJAPlayer3 { #region [PuchiChara stuff] - iPuchiCharaCount = TJAPlayer3.Skin.Puchichara_Ptn; + iPuchiCharaCount = OpenTaiko.Skin.Puchichara_Ptn; ttkPuchiCharaNames = new TitleTextureKey[iPuchiCharaCount]; ttkPuchiCharaAuthors = new TitleTextureKey[iPuchiCharaCount]; for (int i = 0; i < iPuchiCharaCount; i++) { - var textColor = HRarity.tRarityToColor(TJAPlayer3.Tx.Puchichara[i].metadata.Rarity); - ttkPuchiCharaNames[i] = new TitleTextureKey(TJAPlayer3.Tx.Puchichara[i].metadata.tGetName(), this.pfHeyaFont, textColor, Color.Black, 1000); - ttkPuchiCharaAuthors[i] = new TitleTextureKey(TJAPlayer3.Tx.Puchichara[i].metadata.tGetAuthor(), this.pfHeyaFont, Color.White, Color.Black, 1000); + var textColor = HRarity.tRarityToColor(OpenTaiko.Tx.Puchichara[i].metadata.Rarity); + ttkPuchiCharaNames[i] = new TitleTextureKey(OpenTaiko.Tx.Puchichara[i].metadata.tGetName(), this.pfHeyaFont, textColor, Color.Black, 1000); + ttkPuchiCharaAuthors[i] = new TitleTextureKey(OpenTaiko.Tx.Puchichara[i].metadata.tGetAuthor(), this.pfHeyaFont, Color.White, Color.Black, 1000); } #endregion #region [Character stuff] - iCharacterCount = TJAPlayer3.Skin.Characters_Ptn; + iCharacterCount = OpenTaiko.Skin.Characters_Ptn; ttkCharacterAuthors = new TitleTextureKey[iCharacterCount]; ttkCharacterNames = new TitleTextureKey[iCharacterCount]; for (int i = 0; i < iCharacterCount; i++) { - var textColor = HRarity.tRarityToColor(TJAPlayer3.Tx.Characters[i].metadata.Rarity); - ttkCharacterNames[i] = new TitleTextureKey(TJAPlayer3.Tx.Characters[i].metadata.tGetName(), this.pfHeyaFont, textColor, Color.Black, 1000); - ttkCharacterAuthors[i] = new TitleTextureKey(TJAPlayer3.Tx.Characters[i].metadata.tGetAuthor(), this.pfHeyaFont, Color.White, Color.Black, 1000); + var textColor = HRarity.tRarityToColor(OpenTaiko.Tx.Characters[i].metadata.Rarity); + ttkCharacterNames[i] = new TitleTextureKey(OpenTaiko.Tx.Characters[i].metadata.tGetName(), this.pfHeyaFont, textColor, Color.Black, 1000); + ttkCharacterAuthors[i] = new TitleTextureKey(OpenTaiko.Tx.Characters[i].metadata.tGetAuthor(), this.pfHeyaFont, Color.White, Color.Black, 1000); } #endregion @@ -152,7 +151,7 @@ namespace TJAPlayer3 { } public override void DeActivate() { - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); base.DeActivate(); } @@ -185,14 +184,14 @@ namespace TJAPlayer3 { if (iCurrentMenu != -1 || iMainMenuCurrent != i) { tmpTex.color4 = CConversion.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.Heya_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); } else { tmpTex.color4 = CConversion.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Heya_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); } - TJAPlayer3.Tx.Heya_Side_Menu?.t2D拡大率考慮上中央基準描画(TJAPlayer3.Skin.Heya_Main_Menu_X[i], TJAPlayer3.Skin.Heya_Main_Menu_Y[i]); - tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.Skin.Heya_Main_Menu_X[i] + TJAPlayer3.Skin.Heya_Main_Menu_Font_Offset[0], TJAPlayer3.Skin.Heya_Main_Menu_Y[i] + TJAPlayer3.Skin.Heya_Main_Menu_Font_Offset[1]); + OpenTaiko.Tx.Heya_Side_Menu?.t2D拡大率考慮上中央基準描画(OpenTaiko.Skin.Heya_Main_Menu_X[i], OpenTaiko.Skin.Heya_Main_Menu_Y[i]); + tmpTex.t2D拡大率考慮上中央基準描画(OpenTaiko.Skin.Heya_Main_Menu_X[i] + OpenTaiko.Skin.Heya_Main_Menu_Font_Offset[0], OpenTaiko.Skin.Heya_Main_Menu_Y[i] + OpenTaiko.Skin.Heya_Main_Menu_Font_Offset[1]); } #endregion @@ -200,7 +199,7 @@ namespace TJAPlayer3 { #region [Background center] if (iCurrentMenu >= 0) { - TJAPlayer3.Tx.Heya_Center_Menu_Background?.t2D描画(0, 0); + OpenTaiko.Tx.Heya_Center_Menu_Background?.t2D描画(0, 0); } #endregion @@ -210,18 +209,18 @@ namespace TJAPlayer3 { float renderRatioX = 1.0f; float renderRatioY = 1.0f; - if (TJAPlayer3.Skin.Characters_Resolution[iCharacterCurrent] != null) { - renderRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[iCharacterCurrent][0]; - renderRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[iCharacterCurrent][1]; + if (OpenTaiko.Skin.Characters_Resolution[iCharacterCurrent] != null) { + renderRatioX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[iCharacterCurrent][0]; + renderRatioY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[iCharacterCurrent][1]; } - if (TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent] != null) { - TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent].vcScaleRatio.X = renderRatioX; - TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent].vcScaleRatio.Y = renderRatioY; + if (OpenTaiko.Tx.Characters_Heya_Render[iCharacterCurrent] != null) { + OpenTaiko.Tx.Characters_Heya_Render[iCharacterCurrent].vcScaleRatio.X = renderRatioX; + OpenTaiko.Tx.Characters_Heya_Render[iCharacterCurrent].vcScaleRatio.Y = renderRatioY; } - if (iCurrentMenu == 0 || iCurrentMenu == 1) TJAPlayer3.Tx.Heya_Render_Field?.t2D描画(0, 0); - if (iCurrentMenu == 0) TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].render?.t2D描画(0, 0); - if (iCurrentMenu == 1) TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent]?.t2D描画(TJAPlayer3.Skin.Characters_Heya_Render_Offset[iCharacterCurrent][0] * renderRatioX, TJAPlayer3.Skin.Characters_Heya_Render_Offset[iCharacterCurrent][1] * renderRatioY); + if (iCurrentMenu == 0 || iCurrentMenu == 1) OpenTaiko.Tx.Heya_Render_Field?.t2D描画(0, 0); + if (iCurrentMenu == 0) OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent].render?.t2D描画(0, 0); + if (iCurrentMenu == 1) OpenTaiko.Tx.Characters_Heya_Render[iCharacterCurrent]?.t2D描画(OpenTaiko.Skin.Characters_Heya_Render_Offset[iCharacterCurrent][0] * renderRatioX, OpenTaiko.Skin.Characters_Heya_Render_Offset[iCharacterCurrent][1] * renderRatioY); #endregion @@ -230,59 +229,59 @@ namespace TJAPlayer3 { #region [Petit chara] if (iCurrentMenu == 0) { - for (int i = -(TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2); i < (TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2) + 1; i++) { + for (int i = -(OpenTaiko.Skin.Heya_Center_Menu_Box_Count / 2); i < (OpenTaiko.Skin.Heya_Center_Menu_Box_Count / 2) + 1; i++) { int pos = (iPuchiCharaCount * 5 + iPuchiCharaCurrent + i) % iPuchiCharaCount; if (i != 0) { - TJAPlayer3.Tx.Puchichara[pos].tx?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); - TJAPlayer3.Tx.Heya_Lock?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.Puchichara[pos].tx?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.Heya_Lock?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); } else { - TJAPlayer3.Tx.Puchichara[pos].tx?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); - TJAPlayer3.Tx.Heya_Lock?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Puchichara[pos].tx?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Heya_Lock?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); } - var scroll = DrawBox_Slot(i + (TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2)); + var scroll = DrawBox_Slot(i + (OpenTaiko.Skin.Heya_Center_Menu_Box_Count / 2)); int puriColumn = pos % 5; int puriRow = pos / 5; - if (TJAPlayer3.Tx.Puchichara[pos].tx != null) { - float puchiScale = TJAPlayer3.Skin.Resolution[1] / 1080.0f; + if (OpenTaiko.Tx.Puchichara[pos].tx != null) { + float puchiScale = OpenTaiko.Skin.Resolution[1] / 1080.0f; - TJAPlayer3.Tx.Puchichara[pos].tx.vcScaleRatio.X = puchiScale; - TJAPlayer3.Tx.Puchichara[pos].tx.vcScaleRatio.Y = puchiScale; + OpenTaiko.Tx.Puchichara[pos].tx.vcScaleRatio.X = puchiScale; + OpenTaiko.Tx.Puchichara[pos].tx.vcScaleRatio.Y = puchiScale; } - TJAPlayer3.Tx.Puchichara[pos].tx?.t2D拡大率考慮中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0], - scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[1] + (int)(PuchiChara.sineY), - new Rectangle((PuchiChara.Counter.CurrentValue + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0], - puriRow * TJAPlayer3.Skin.Game_PuchiChara[1], - TJAPlayer3.Skin.Game_PuchiChara[0], - TJAPlayer3.Skin.Game_PuchiChara[1])); + OpenTaiko.Tx.Puchichara[pos].tx?.t2D拡大率考慮中央基準描画(scroll.Item1 + OpenTaiko.Skin.Heya_Center_Menu_Box_Item_Offset[0], + scroll.Item2 + OpenTaiko.Skin.Heya_Center_Menu_Box_Item_Offset[1] + (int)(PuchiChara.sineY), + new Rectangle((PuchiChara.Counter.CurrentValue + 2 * puriColumn) * OpenTaiko.Skin.Game_PuchiChara[0], + puriRow * OpenTaiko.Skin.Game_PuchiChara[1], + OpenTaiko.Skin.Game_PuchiChara[0], + OpenTaiko.Skin.Game_PuchiChara[1])); - TJAPlayer3.Tx.Puchichara[pos].tx?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Puchichara[pos].tx?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); #region [Database related values] if (ttkPuchiCharaNames[pos] != null) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(ttkPuchiCharaNames[pos]); - tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[0], - scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + OpenTaiko.Skin.Heya_Center_Menu_Box_Name_Offset[0], + scroll.Item2 + OpenTaiko.Skin.Heya_Center_Menu_Box_Name_Offset[1]); } if (ttkPuchiCharaAuthors[pos] != null) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(ttkPuchiCharaAuthors[pos]); - tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[0], - scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + OpenTaiko.Skin.Heya_Center_Menu_Box_Authors_Offset[0], + scroll.Item2 + OpenTaiko.Skin.Heya_Center_Menu_Box_Authors_Offset[1]); } - if (TJAPlayer3.Tx.Puchichara[pos].unlock != null - && !TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedPuchicharas.Contains(TJAPlayer3.Skin.Puchicharas_Name[pos])) - TJAPlayer3.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(scroll.Item1, scroll.Item2); + if (OpenTaiko.Tx.Puchichara[pos].unlock != null + && !OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedPuchicharas.Contains(OpenTaiko.Skin.Puchicharas_Name[pos])) + OpenTaiko.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(scroll.Item1, scroll.Item2); #endregion @@ -295,58 +294,58 @@ namespace TJAPlayer3 { #region [Character] if (iCurrentMenu == 1) { - for (int i = -(TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2); i < (TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2) + 1; i++) { + for (int i = -(OpenTaiko.Skin.Heya_Center_Menu_Box_Count / 2); i < (OpenTaiko.Skin.Heya_Center_Menu_Box_Count / 2) + 1; i++) { int pos = (iCharacterCount * 5 + iCharacterCurrent + i) % iCharacterCount; float charaRatioX = 1.0f; float charaRatioY = 1.0f; if (i != 0) { - TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); - TJAPlayer3.Tx.Heya_Lock?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.Characters_Heya_Preview[pos]?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.Heya_Lock?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); } else { - TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); - TJAPlayer3.Tx.Heya_Lock?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Characters_Heya_Preview[pos]?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Heya_Lock?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); } - var scroll = DrawBox_Slot(i + (TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2)); + var scroll = DrawBox_Slot(i + (OpenTaiko.Skin.Heya_Center_Menu_Box_Count / 2)); - if (TJAPlayer3.Skin.Characters_Resolution[pos] != null) { - charaRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[pos][0]; - charaRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[pos][1]; + if (OpenTaiko.Skin.Characters_Resolution[pos] != null) { + charaRatioX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[pos][0]; + charaRatioY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[pos][1]; } - if (TJAPlayer3.Tx.Characters_Heya_Preview[pos] != null) { - TJAPlayer3.Tx.Characters_Heya_Preview[pos].vcScaleRatio.X = charaRatioX; - TJAPlayer3.Tx.Characters_Heya_Preview[pos].vcScaleRatio.Y = charaRatioY; + if (OpenTaiko.Tx.Characters_Heya_Preview[pos] != null) { + OpenTaiko.Tx.Characters_Heya_Preview[pos].vcScaleRatio.X = charaRatioX; + OpenTaiko.Tx.Characters_Heya_Preview[pos].vcScaleRatio.Y = charaRatioY; } - TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0], - scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[1]); + OpenTaiko.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(scroll.Item1 + OpenTaiko.Skin.Heya_Center_Menu_Box_Item_Offset[0], + scroll.Item2 + OpenTaiko.Skin.Heya_Center_Menu_Box_Item_Offset[1]); - TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Characters_Heya_Preview[pos]?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); #region [Database related values] if (ttkCharacterNames[pos] != null) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(ttkCharacterNames[pos]); - tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[0], - scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + OpenTaiko.Skin.Heya_Center_Menu_Box_Name_Offset[0], + scroll.Item2 + OpenTaiko.Skin.Heya_Center_Menu_Box_Name_Offset[1]); } if (ttkCharacterAuthors[pos] != null) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(ttkCharacterAuthors[pos]); - tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[0], - scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + OpenTaiko.Skin.Heya_Center_Menu_Box_Authors_Offset[0], + scroll.Item2 + OpenTaiko.Skin.Heya_Center_Menu_Box_Authors_Offset[1]); } - if (TJAPlayer3.Tx.Characters[pos].unlock != null - && !TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedCharacters.Contains(TJAPlayer3.Skin.Characters_DirName[pos])) - TJAPlayer3.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(scroll.Item1, scroll.Item2); + if (OpenTaiko.Tx.Characters[pos].unlock != null + && !OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedCharacters.Contains(OpenTaiko.Skin.Characters_DirName[pos])) + OpenTaiko.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(scroll.Item1, scroll.Item2); #endregion } @@ -357,27 +356,27 @@ namespace TJAPlayer3 { #region [Dan title] if (iCurrentMenu == 2) { - for (int i = -(TJAPlayer3.Skin.Heya_Side_Menu_Count / 2); i < (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2) + 1; i++) { + for (int i = -(OpenTaiko.Skin.Heya_Side_Menu_Count / 2); i < (OpenTaiko.Skin.Heya_Side_Menu_Count / 2) + 1; i++) { int pos = (this.ttkDanTitles.Length * 5 + iDanTitleCurrent + i) % this.ttkDanTitles.Length; CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(this.ttkDanTitles[pos]); if (i != 0) { tmpTex.color4 = CConversion.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = CConversion.ColorToColor4(Color.DarkGray); + OpenTaiko.Tx.Heya_Side_Menu.color4 = CConversion.ColorToColor4(Color.DarkGray); //TJAPlayer3.Tx.NamePlateBase.color4 = CConversion.ColorToColor4(Color.DarkGray); } else { tmpTex.color4 = CConversion.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = CConversion.ColorToColor4(Color.White); + OpenTaiko.Tx.Heya_Side_Menu.color4 = CConversion.ColorToColor4(Color.White); //TJAPlayer3.Tx.NamePlateBase.color4 = CConversion.ColorToColor4(Color.White); } int danGrade = 0; if (pos > 0) { - danGrade = TJAPlayer3.SaveFileInstances[iPlayer].data.DanTitles[this.sDanTitles[pos]].clearStatus; + danGrade = OpenTaiko.SaveFileInstances[iPlayer].data.DanTitles[this.sDanTitles[pos]].clearStatus; } - var scroll = DrawSide_Menu(i + (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2)); + var scroll = DrawSide_Menu(i + (OpenTaiko.Skin.Heya_Side_Menu_Count / 2)); /* TJAPlayer3.NamePlate.tNamePlateDisplayNamePlateBase( @@ -388,7 +387,7 @@ namespace TJAPlayer3 { tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[0], scroll.Item2 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[1]); */ - TJAPlayer3.NamePlate.lcNamePlate.DrawDan(scroll.Item1, scroll.Item2, 255, danGrade, tmpTex); + OpenTaiko.NamePlate.lcNamePlate.DrawDan(scroll.Item1, scroll.Item2, 255, danGrade, tmpTex); } } @@ -398,28 +397,28 @@ namespace TJAPlayer3 { #region [Title plate] if (iCurrentMenu == 3) { - for (int i = -(TJAPlayer3.Skin.Heya_Side_Menu_Count / 2); i < (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2) + 1; i++) { + for (int i = -(OpenTaiko.Skin.Heya_Side_Menu_Count / 2); i < (OpenTaiko.Skin.Heya_Side_Menu_Count / 2) + 1; i++) { int pos = (this.ttkTitles.Length * 5 + iTitleCurrent + i) % this.ttkTitles.Length; CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(this.ttkTitles[pos]); if (i != 0) { tmpTex.color4 = CConversion.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = CConversion.ColorToColor4(Color.DarkGray); + OpenTaiko.Tx.Heya_Side_Menu.color4 = CConversion.ColorToColor4(Color.DarkGray); } else { tmpTex.color4 = CConversion.ColorToColor4(Color.White); - TJAPlayer3.Tx.Heya_Side_Menu.color4 = CConversion.ColorToColor4(Color.White); + OpenTaiko.Tx.Heya_Side_Menu.color4 = CConversion.ColorToColor4(Color.White); } - var scroll = DrawSide_Menu(i + (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2)); + var scroll = DrawSide_Menu(i + (OpenTaiko.Skin.Heya_Side_Menu_Count / 2)); int iType = -1; int _rarity = 1; int _titleid = -1; - if (TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null && - TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds.Contains(this.titlesKeys[pos])) { - var _dc = TJAPlayer3.Databases.DBNameplateUnlockables.data[this.titlesKeys[pos]]; + if (OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null && + OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds.Contains(this.titlesKeys[pos])) { + var _dc = OpenTaiko.Databases.DBNameplateUnlockables.data[this.titlesKeys[pos]]; iType = _dc.nameplateInfo.iType; _rarity = HRarity.tRarityToLangInt(_dc.rarity); _titleid = this.titlesKeys[pos]; @@ -436,7 +435,7 @@ namespace TJAPlayer3 { } */ - TJAPlayer3.NamePlate.lcNamePlate.DrawTitlePlate(scroll.Item1, scroll.Item2, 255, iType, tmpTex, _rarity, _titleid); + OpenTaiko.NamePlate.lcNamePlate.DrawTitlePlate(scroll.Item1, scroll.Item2, 255, iType, tmpTex, _rarity, _titleid); //tmpTex.t2D拡大率考慮上中央基準描画(scroll.Item1 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[0], scroll.Item2 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[1]); @@ -452,20 +451,20 @@ namespace TJAPlayer3 { if (iCurrentMenu >= 0) { #region [Unlockable information zone] - if (this.ttkInfoSection != null && this.ttkInfoSection.str文字 != "") - TJAPlayer3.Tx.Heya_Box?.t2D描画(0, 0); + if (this.ttkInfoSection != null && this.ttkInfoSection.str != "") + OpenTaiko.Tx.Heya_Box?.t2D描画(0, 0); if (this.ttkInfoSection != null) TitleTextureKey.ResolveTitleTexture(this.ttkInfoSection) - .t2D拡大率考慮上中央基準描画(TJAPlayer3.Skin.Heya_InfoSection[0], TJAPlayer3.Skin.Heya_InfoSection[1]); + .t2D拡大率考慮上中央基準描画(OpenTaiko.Skin.Heya_InfoSection[0], OpenTaiko.Skin.Heya_InfoSection[1]); #endregion #region [Asset description] - if (this.ttkInfoSection == null || this.ttkInfoSection.str文字 == "") { - if (iCurrentMenu == 0) CHeyaDisplayAssetInformations.DisplayPuchicharaInfo(this.pfHeyaFont, TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent]); - if (iCurrentMenu == 1) CHeyaDisplayAssetInformations.DisplayCharacterInfo(this.pfHeyaFont, TJAPlayer3.Tx.Characters[iCharacterCurrent]); + if (this.ttkInfoSection == null || this.ttkInfoSection.str == "") { + if (iCurrentMenu == 0) CHeyaDisplayAssetInformations.DisplayPuchicharaInfo(this.pfHeyaFont, OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent]); + if (iCurrentMenu == 1) CHeyaDisplayAssetInformations.DisplayCharacterInfo(this.pfHeyaFont, OpenTaiko.Tx.Characters[iCharacterCurrent]); } #endregion @@ -476,8 +475,8 @@ namespace TJAPlayer3 { #region [General Chara animations] if (!ctChara_In.IsStarted) { - TJAPlayer3.Skin.soundHeyaBGM.tPlay(); - ctChara_In.Start(0, 180, 1.25f, TJAPlayer3.Timer); + OpenTaiko.Skin.soundHeyaBGM.tPlay(); + ctChara_In.Start(0, 180, 1.25f, OpenTaiko.Timer); } #region [ キャラ関連 ] @@ -493,11 +492,11 @@ namespace TJAPlayer3 { //int chara_x = (int)(TJAPlayer3.Skin.Characters_Menu_X[_charaId][0] + (-200 + CharaX)); //int chara_y = (int)(TJAPlayer3.Skin.Characters_Menu_Y[_charaId][0] - CharaY); - int chara_x = (int)CharaX + TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szTextureSize.Width / 2; - int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] - (int)CharaY; + int chara_x = (int)CharaX + OpenTaiko.Skin.SongSelect_NamePlate_X[0] + OpenTaiko.Tx.NamePlateBase.szTextureSize.Width / 2; + int chara_y = OpenTaiko.Skin.SongSelect_NamePlate_Y[0] - (int)CharaY; - int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[0]; - int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[0]; + int puchi_x = chara_x + OpenTaiko.Skin.Adjustments_MenuPuchichara_X[0]; + int puchi_y = chara_y + OpenTaiko.Skin.Adjustments_MenuPuchichara_Y[0]; //TJAPlayer3.Tx.SongSelect_Chara_Normal[ctChara_Normal.n現在の値].Opacity = ctChara_In.n現在の値 * 2; //TJAPlayer3.Tx.SongSelect_Chara_Normal[ctChara_Normal.n現在の値].t2D描画(-200 + CharaX, 336 - CharaY); @@ -513,7 +512,7 @@ namespace TJAPlayer3 { #endregion - TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[0], TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] + 5, 0); + OpenTaiko.NamePlate.tNamePlateDraw(OpenTaiko.Skin.SongSelect_NamePlate_X[0], OpenTaiko.Skin.SongSelect_NamePlate_Y[0] + 5, 0); #endregion @@ -521,18 +520,18 @@ namespace TJAPlayer3 { #region [ Inputs ] - if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { if (this.tMove(1)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { if (this.tMove(-1)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { #region [Decide] @@ -540,7 +539,7 @@ namespace TJAPlayer3 { // Return to main menu if (iCurrentMenu == -1 && iMainMenuCurrent == 0) { - TJAPlayer3.Skin.soundHeyaBGM.tStop(); + OpenTaiko.Skin.soundHeyaBGM.tStop(); this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る; this.actFOtoTitle.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; @@ -558,18 +557,18 @@ namespace TJAPlayer3 { //PuchiChara.tGetPuchiCharaIndexByName(p); //TJAPlayer3.NamePlateConfig.data.PuchiChara[iPlayer] = TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent];// iPuchiCharaCurrent; //TJAPlayer3.NamePlateConfig.tApplyHeyaChanges(); - TJAPlayer3.SaveFileInstances[iPlayer].data.PuchiChara = TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent];// iPuchiCharaCurrent; - TJAPlayer3.SaveFileInstances[iPlayer].tApplyHeyaChanges(); - TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].welcome.tPlay(); + OpenTaiko.SaveFileInstances[iPlayer].data.PuchiChara = OpenTaiko.Skin.Puchicharas_Name[iPuchiCharaCurrent];// iPuchiCharaCurrent; + OpenTaiko.SaveFileInstances[iPlayer].tApplyHeyaChanges(); + OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent].welcome.tPlay(); iCurrentMenu = -1; this.tResetOpts(); } else if (ess == ESelectStatus.SUCCESS) { //TJAPlayer3.NamePlateConfig.data.UnlockedPuchicharas[iPlayer].Add(TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent]); //TJAPlayer3.NamePlateConfig.tSpendCoins(TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].unlock.Values[0], iPlayer); - TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedPuchicharas.Add(TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent]); - DBSaves.RegisterStringUnlockedAsset(TJAPlayer3.SaveFileInstances[iPlayer].data.SaveId, "unlocked_puchicharas", TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent]); - TJAPlayer3.SaveFileInstances[iPlayer].tSpendCoins(TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].unlock.Values[0]); + OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedPuchicharas.Add(OpenTaiko.Skin.Puchicharas_Name[iPuchiCharaCurrent]); + DBSaves.RegisterStringUnlockedAsset(OpenTaiko.SaveFileInstances[iPlayer].data.SaveId, "unlocked_puchicharas", OpenTaiko.Skin.Puchicharas_Name[iPuchiCharaCurrent]); + OpenTaiko.SaveFileInstances[iPlayer].tSpendCoins(OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent].unlock.Values[0]); } } else if (iCurrentMenu == 1) { @@ -579,25 +578,25 @@ namespace TJAPlayer3 { //TJAPlayer3.Tx.Loading?.t2D描画(18, 7); // Reload character, a bit time expensive but with a O(N) memory complexity instead of O(N * M) - TJAPlayer3.Tx.ReloadCharacter(TJAPlayer3.SaveFileInstances[iPlayer].data.Character, iCharacterCurrent, iPlayer); - TJAPlayer3.SaveFileInstances[iPlayer].data.Character = iCharacterCurrent; + OpenTaiko.Tx.ReloadCharacter(OpenTaiko.SaveFileInstances[iPlayer].data.Character, iCharacterCurrent, iPlayer); + OpenTaiko.SaveFileInstances[iPlayer].data.Character = iCharacterCurrent; // Update the character - TJAPlayer3.SaveFileInstances[iPlayer].tUpdateCharacterName(TJAPlayer3.Skin.Characters_DirName[iCharacterCurrent]); + OpenTaiko.SaveFileInstances[iPlayer].tUpdateCharacterName(OpenTaiko.Skin.Characters_DirName[iCharacterCurrent]); // Welcome voice using Sanka - TJAPlayer3.Skin.voiceTitleSanka[iPlayer]?.tPlay(); + OpenTaiko.Skin.voiceTitleSanka[iPlayer]?.tPlay(); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.NORMAL); - TJAPlayer3.SaveFileInstances[iPlayer].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[iPlayer].tApplyHeyaChanges(); iCurrentMenu = -1; this.tResetOpts(); } else if (ess == ESelectStatus.SUCCESS) { - TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedCharacters.Add(TJAPlayer3.Skin.Characters_DirName[iCharacterCurrent]); - DBSaves.RegisterStringUnlockedAsset(TJAPlayer3.SaveFileInstances[iPlayer].data.SaveId, "unlocked_characters", TJAPlayer3.Skin.Characters_DirName[iCharacterCurrent]); - TJAPlayer3.SaveFileInstances[iPlayer].tSpendCoins(TJAPlayer3.Tx.Characters[iCharacterCurrent].unlock.Values[0]); + OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedCharacters.Add(OpenTaiko.Skin.Characters_DirName[iCharacterCurrent]); + DBSaves.RegisterStringUnlockedAsset(OpenTaiko.SaveFileInstances[iPlayer].data.SaveId, "unlocked_characters", OpenTaiko.Skin.Characters_DirName[iCharacterCurrent]); + OpenTaiko.SaveFileInstances[iPlayer].tSpendCoins(OpenTaiko.Tx.Characters[iCharacterCurrent].unlock.Values[0]); // Play modal animation here ? } } else if (iCurrentMenu == 2) { @@ -605,63 +604,63 @@ namespace TJAPlayer3 { int cs = 0; if (iDanTitleCurrent > 0) { - iG = TJAPlayer3.SaveFileInstances[iPlayer].data.DanTitles[this.sDanTitles[iDanTitleCurrent]].isGold; - cs = TJAPlayer3.SaveFileInstances[iPlayer].data.DanTitles[this.sDanTitles[iDanTitleCurrent]].clearStatus; + iG = OpenTaiko.SaveFileInstances[iPlayer].data.DanTitles[this.sDanTitles[iDanTitleCurrent]].isGold; + cs = OpenTaiko.SaveFileInstances[iPlayer].data.DanTitles[this.sDanTitles[iDanTitleCurrent]].clearStatus; } - TJAPlayer3.SaveFileInstances[iPlayer].data.Dan = this.sDanTitles[iDanTitleCurrent]; - TJAPlayer3.SaveFileInstances[iPlayer].data.DanGold = iG; - TJAPlayer3.SaveFileInstances[iPlayer].data.DanType = cs; + OpenTaiko.SaveFileInstances[iPlayer].data.Dan = this.sDanTitles[iDanTitleCurrent]; + OpenTaiko.SaveFileInstances[iPlayer].data.DanGold = iG; + OpenTaiko.SaveFileInstances[iPlayer].data.DanType = cs; - TJAPlayer3.NamePlate.tNamePlateRefreshTitles(0); + OpenTaiko.NamePlate.tNamePlateRefreshTitles(0); - TJAPlayer3.SaveFileInstances[iPlayer].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[iPlayer].tApplyHeyaChanges(); iCurrentMenu = -1; this.tResetOpts(); } else if (iCurrentMenu == 3) { - TJAPlayer3.SaveFileInstances[iPlayer].data.Title = this.ttkTitles[iTitleCurrent].str文字; + OpenTaiko.SaveFileInstances[iPlayer].data.Title = this.ttkTitles[iTitleCurrent].str; - if (TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null - && TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds.Contains(this.titlesKeys[iTitleCurrent])) { - var _dc = TJAPlayer3.Databases.DBNameplateUnlockables.data[this.titlesKeys[iTitleCurrent]]; - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleType = _dc.nameplateInfo.iType; - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleId = this.titlesKeys[iTitleCurrent]; - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleRarityInt = HRarity.tRarityToLangInt(_dc.rarity); + if (OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds != null + && OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds.Contains(this.titlesKeys[iTitleCurrent])) { + var _dc = OpenTaiko.Databases.DBNameplateUnlockables.data[this.titlesKeys[iTitleCurrent]]; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleType = _dc.nameplateInfo.iType; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleId = this.titlesKeys[iTitleCurrent]; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleRarityInt = HRarity.tRarityToLangInt(_dc.rarity); } else if (iTitleCurrent == 0) { - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleType = 0; - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleId = -1; - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleRarityInt = 1; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleType = 0; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleId = -1; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleRarityInt = 1; } else { - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleType = -1; - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleId = -1; - TJAPlayer3.SaveFileInstances[iPlayer].data.TitleRarityInt = 1; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleType = -1; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleId = -1; + OpenTaiko.SaveFileInstances[iPlayer].data.TitleRarityInt = 1; } - TJAPlayer3.NamePlate.tNamePlateRefreshTitles(0); + OpenTaiko.NamePlate.tNamePlateRefreshTitles(0); - TJAPlayer3.SaveFileInstances[iPlayer].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[iPlayer].tApplyHeyaChanges(); iCurrentMenu = -1; this.tResetOpts(); } if (ess == ESelectStatus.SELECTED) - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); else if (ess == ESelectStatus.FAILED) - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); else - TJAPlayer3.Skin.SoundBanapas.tPlay(); // To change with a more appropriate sfx sooner or later + OpenTaiko.Skin.SoundBanapas.tPlay(); // To change with a more appropriate sfx sooner or later #endregion - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); if (iCurrentMenu == -1) { - TJAPlayer3.Skin.soundHeyaBGM.tStop(); + OpenTaiko.Skin.soundHeyaBGM.tStop(); this.eフェードアウト完了時の戻り値 = E戻り値.タイトルに戻る; this.actFOtoTitle.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; @@ -722,10 +721,10 @@ namespace TJAPlayer3 { private void tResetOpts() { // Retrieve titles if they exist //var _titles = TJAPlayer3.SaveFileInstances[iPlayer].data.NamePlateTitles; - var _titles = TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedNameplateIds; - var _title = TJAPlayer3.SaveFileInstances[iPlayer].data.Title; - var _dans = TJAPlayer3.SaveFileInstances[iPlayer].data.DanTitles; - var _dan = TJAPlayer3.SaveFileInstances[iPlayer].data.Dan; + var _titles = OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedNameplateIds; + var _title = OpenTaiko.SaveFileInstances[iPlayer].data.Title; + var _dans = OpenTaiko.SaveFileInstances[iPlayer].data.DanTitles; + var _dan = OpenTaiko.SaveFileInstances[iPlayer].data.Dan; iTitleCurrent = 0; @@ -741,11 +740,11 @@ namespace TJAPlayer3 { iDanTitleCurrent = _dans.Keys.ToList().IndexOf(_dan) + 1; foreach (var plate in _titles.Select((value, i) => new { i, value })) { - if (TJAPlayer3.SaveFileInstances[iPlayer].data.TitleId == plate.value) + if (OpenTaiko.SaveFileInstances[iPlayer].data.TitleId == plate.value) iTitleCurrent = plate.i + 1; } - iCharacterCurrent = Math.Max(0, Math.Min(TJAPlayer3.Skin.Characters_Ptn - 1, TJAPlayer3.SaveFileInstances[iPlayer].data.Character)); + iCharacterCurrent = Math.Max(0, Math.Min(OpenTaiko.Skin.Characters_Ptn - 1, OpenTaiko.SaveFileInstances[iPlayer].data.Character)); //iPuchiCharaCurrent = Math.Max(0, Math.Min(TJAPlayer3.Skin.Puchichara_Ptn - 1, TJAPlayer3.NamePlateConfig.data.PuchiChara[this.iPlayer])); iPuchiCharaCurrent = PuchiChara.tGetPuchiCharaIndexByName(this.iPlayer); @@ -755,8 +754,8 @@ namespace TJAPlayer3 { private bool tMove(int off) { if (ScrollCounter.CurrentValue < ScrollCounter.EndValue - && (TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) - || TJAPlayer3.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow))) + && (OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.RightArrow) + || OpenTaiko.InputManager.Keyboard.KeyPressing((int)SlimDXKeys.Key.LeftArrow))) return false; ScrollMode = off; @@ -784,13 +783,13 @@ namespace TJAPlayer3 { double value = (1.0 - Math.Sin((((ScrollCounter.CurrentValue) / 2000.0)) * Math.PI)); int nextIndex = i + ScrollMode; - nextIndex = Math.Min(TJAPlayer3.Skin.Heya_Center_Menu_Box_Count - 1, nextIndex); + nextIndex = Math.Min(OpenTaiko.Skin.Heya_Center_Menu_Box_Count - 1, nextIndex); nextIndex = Math.Max(0, nextIndex); - int x = TJAPlayer3.Skin.Heya_Center_Menu_Box_X[i] + (int)((TJAPlayer3.Skin.Heya_Center_Menu_Box_X[nextIndex] - TJAPlayer3.Skin.Heya_Center_Menu_Box_X[i]) * value); - int y = TJAPlayer3.Skin.Heya_Center_Menu_Box_Y[i] + (int)((TJAPlayer3.Skin.Heya_Center_Menu_Box_Y[nextIndex] - TJAPlayer3.Skin.Heya_Center_Menu_Box_Y[i]) * value); + int x = OpenTaiko.Skin.Heya_Center_Menu_Box_X[i] + (int)((OpenTaiko.Skin.Heya_Center_Menu_Box_X[nextIndex] - OpenTaiko.Skin.Heya_Center_Menu_Box_X[i]) * value); + int y = OpenTaiko.Skin.Heya_Center_Menu_Box_Y[i] + (int)((OpenTaiko.Skin.Heya_Center_Menu_Box_Y[nextIndex] - OpenTaiko.Skin.Heya_Center_Menu_Box_Y[i]) * value); - TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.t2D拡大率考慮上中央基準描画(x, y); + OpenTaiko.Tx.Heya_Center_Menu_Box_Slot?.t2D拡大率考慮上中央基準描画(x, y); return (x, y); } @@ -798,13 +797,13 @@ namespace TJAPlayer3 { double value = (1.0 - Math.Sin((((ScrollCounter.CurrentValue) / 2000.0)) * Math.PI)); int nextIndex = i + ScrollMode; - nextIndex = Math.Min(TJAPlayer3.Skin.Heya_Side_Menu_Count - 1, nextIndex); + nextIndex = Math.Min(OpenTaiko.Skin.Heya_Side_Menu_Count - 1, nextIndex); nextIndex = Math.Max(0, nextIndex); - int x = TJAPlayer3.Skin.Heya_Side_Menu_X[i] + (int)((TJAPlayer3.Skin.Heya_Side_Menu_X[nextIndex] - TJAPlayer3.Skin.Heya_Side_Menu_X[i]) * value); - int y = TJAPlayer3.Skin.Heya_Side_Menu_Y[i] + (int)((TJAPlayer3.Skin.Heya_Side_Menu_Y[nextIndex] - TJAPlayer3.Skin.Heya_Side_Menu_Y[i]) * value); + int x = OpenTaiko.Skin.Heya_Side_Menu_X[i] + (int)((OpenTaiko.Skin.Heya_Side_Menu_X[nextIndex] - OpenTaiko.Skin.Heya_Side_Menu_X[i]) * value); + int y = OpenTaiko.Skin.Heya_Side_Menu_Y[i] + (int)((OpenTaiko.Skin.Heya_Side_Menu_Y[nextIndex] - OpenTaiko.Skin.Heya_Side_Menu_Y[i]) * value); - TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(x, y); + OpenTaiko.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(x, y); return (x, y); } @@ -827,12 +826,12 @@ namespace TJAPlayer3 { private void tUpdateUnlockableTextChara() { #region [Check unlockable] - if (TJAPlayer3.Tx.Characters[iCharacterCurrent].unlock != null - && !TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedCharacters.Contains(TJAPlayer3.Skin.Characters_DirName[iCharacterCurrent])) { + if (OpenTaiko.Tx.Characters[iCharacterCurrent].unlock != null + && !OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedCharacters.Contains(OpenTaiko.Skin.Characters_DirName[iCharacterCurrent])) { string _cond = "???"; - if (HRarity.tRarityToModalInt(TJAPlayer3.Tx.Characters[iCharacterCurrent].metadata.Rarity) + if (HRarity.tRarityToModalInt(OpenTaiko.Tx.Characters[iCharacterCurrent].metadata.Rarity) < HRarity.tRarityToModalInt("Epic")) - _cond = TJAPlayer3.Tx.Characters[iCharacterCurrent].unlock.tConditionMessage(); + _cond = OpenTaiko.Tx.Characters[iCharacterCurrent].unlock.tConditionMessage(); this.ttkInfoSection = new TitleTextureKey(_cond, this.pfHeyaFont, Color.White, Color.Black, 1000); } else this.ttkInfoSection = null; @@ -842,9 +841,9 @@ namespace TJAPlayer3 { private ESelectStatus tSelectChara() { // Add "If unlocked" to select directly - if (TJAPlayer3.Tx.Characters[iCharacterCurrent].unlock != null - && !TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedCharacters.Contains(TJAPlayer3.Skin.Characters_DirName[iCharacterCurrent])) { - (bool, string?) response = TJAPlayer3.Tx.Characters[iCharacterCurrent].unlock.tConditionMetWrapper(TJAPlayer3.SaveFile); + if (OpenTaiko.Tx.Characters[iCharacterCurrent].unlock != null + && !OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedCharacters.Contains(OpenTaiko.Skin.Characters_DirName[iCharacterCurrent])) { + (bool, string?) response = OpenTaiko.Tx.Characters[iCharacterCurrent].unlock.tConditionMetWrapper(OpenTaiko.SaveFile); //TJAPlayer3.Tx.Characters[iCharacterCurrent].unlock.tConditionMet( //new int[] { TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data.Medals }); @@ -852,7 +851,7 @@ namespace TJAPlayer3 { // Send coins here for the unlock, considering that only coin-paid puchicharas can be unlocked directly from the Heya menu - this.ttkInfoSection = new TitleTextureKey(response.Item2 ?? this.ttkInfoSection.str文字, this.pfHeyaFont, responseColor, Color.Black, 1000); + this.ttkInfoSection = new TitleTextureKey(response.Item2 ?? this.ttkInfoSection.str, this.pfHeyaFont, responseColor, Color.Black, 1000); return (response.Item1) ? ESelectStatus.SUCCESS : ESelectStatus.FAILED; } @@ -867,12 +866,12 @@ namespace TJAPlayer3 { private void tUpdateUnlockableTextPuchi() { #region [Check unlockable] - if (TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].unlock != null - && !TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedPuchicharas.Contains(TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent])) { + if (OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent].unlock != null + && !OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedPuchicharas.Contains(OpenTaiko.Skin.Puchicharas_Name[iPuchiCharaCurrent])) { string _cond = "???"; - if (HRarity.tRarityToModalInt(TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].metadata.Rarity) + if (HRarity.tRarityToModalInt(OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent].metadata.Rarity) < HRarity.tRarityToModalInt("Epic")) - _cond = TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].unlock.tConditionMessage(); + _cond = OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent].unlock.tConditionMessage(); this.ttkInfoSection = new TitleTextureKey(_cond, this.pfHeyaFont, Color.White, Color.Black, 1000); } else this.ttkInfoSection = null; @@ -883,9 +882,9 @@ namespace TJAPlayer3 { private ESelectStatus tSelectPuchi() { // Add "If unlocked" to select directly - if (TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].unlock != null - && !TJAPlayer3.SaveFileInstances[iPlayer].data.UnlockedPuchicharas.Contains(TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent])) { - (bool, string?) response = TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].unlock.tConditionMetWrapper(TJAPlayer3.SaveFile); + if (OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent].unlock != null + && !OpenTaiko.SaveFileInstances[iPlayer].data.UnlockedPuchicharas.Contains(OpenTaiko.Skin.Puchicharas_Name[iPuchiCharaCurrent])) { + (bool, string?) response = OpenTaiko.Tx.Puchichara[iPuchiCharaCurrent].unlock.tConditionMetWrapper(OpenTaiko.SaveFile); //tConditionMet( //new int[] { TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data.Medals }); @@ -893,7 +892,7 @@ namespace TJAPlayer3 { // Send coins here for the unlock, considering that only coin-paid puchicharas can be unlocked directly from the Heya menu - this.ttkInfoSection = new TitleTextureKey(response.Item2 ?? this.ttkInfoSection.str文字, this.pfHeyaFont, responseColor, Color.Black, 1000); + this.ttkInfoSection = new TitleTextureKey(response.Item2 ?? this.ttkInfoSection.str, this.pfHeyaFont, responseColor, Color.Black, 1000); return (response.Item1) ? ESelectStatus.SUCCESS : ESelectStatus.FAILED; } diff --git a/OpenTaiko/src/Stages/12.OnlineLounge/API.cs b/OpenTaiko/src/Stages/12.OnlineLounge/API.cs index 605f73c0..25ddce78 100644 --- a/OpenTaiko/src/Stages/12.OnlineLounge/API.cs +++ b/OpenTaiko/src/Stages/12.OnlineLounge/API.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class API { public class APICharterInfo { public string charter_name; @@ -41,8 +41,8 @@ namespace TJAPlayer3 { private Dictionary PropertyMappings { get; set; } private string GetAssignedLanguageValue(Dictionary ens) { - if (ens.ContainsKey(TJAPlayer3.ConfigIni.sLang)) - return ens[TJAPlayer3.ConfigIni.sLang]; + if (ens.ContainsKey(OpenTaiko.ConfigIni.sLang)) + return ens[OpenTaiko.ConfigIni.sLang]; return ens["default"]; } diff --git a/OpenTaiko/src/Stages/12.OnlineLounge/CStageOnlineLounge.cs b/OpenTaiko/src/Stages/12.OnlineLounge/CStageOnlineLounge.cs index c3827c4c..f085ebbb 100644 --- a/OpenTaiko/src/Stages/12.OnlineLounge/CStageOnlineLounge.cs +++ b/OpenTaiko/src/Stages/12.OnlineLounge/CStageOnlineLounge.cs @@ -2,9 +2,9 @@ using System.Drawing; using System.Text; using FDK; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; -namespace TJAPlayer3 { +namespace OpenTaiko { class CStageOnlineLounge : CStage { public CStageOnlineLounge() { @@ -49,7 +49,7 @@ namespace TJAPlayer3 { base.ePhaseID = CStage.EPhase.Common_NORMAL; this.eフェードアウト完了時の戻り値 = EReturnValue.Continuation; - TJAPlayer3.Skin.soundOnlineLoungeBGM?.tPlay(); + OpenTaiko.Skin.soundOnlineLoungeBGM?.tPlay(); this.currentMenu = ECurrentMenu.MAIN; this.menuPointer = ECurrentMenu.CDN_SELECT; @@ -60,7 +60,7 @@ namespace TJAPlayer3 { - dbCDN = TJAPlayer3.Databases.DBCDN; + dbCDN = OpenTaiko.Databases.DBCDN; dbCDNData = null; IsDownloading = false; @@ -119,9 +119,9 @@ namespace TJAPlayer3 { public override void DeActivate() { // On de-activation - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); - TJAPlayer3.Songs管理.UpdateDownloadBox(); + OpenTaiko.Songs管理.UpdateDownloadBox(); base.DeActivate(); } @@ -129,8 +129,8 @@ namespace TJAPlayer3 { public override void CreateManagedResource() { // Ressource allocation - this.pfOLFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.OnlineLounge_Font_OLFont); - this.pfOLFontLarge = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.OnlineLounge_Font_OLFontLarge); + this.pfOLFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.OnlineLounge_Font_OLFont); + this.pfOLFontLarge = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.OnlineLounge_Font_OLFontLarge); base.CreateManagedResource(); } @@ -169,25 +169,25 @@ namespace TJAPlayer3 { if (currentMenu == ECurrentMenu.MAIN || currentMenu == ECurrentMenu.CDN_SELECT || currentMenu == ECurrentMenu.CDN_OPTION) { - int baseX = TJAPlayer3.Skin.OnlineLounge_Side_Menu[0] - _ref.Length * (TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[0] / 2); - int baseY = TJAPlayer3.Skin.OnlineLounge_Side_Menu[1] - _ref.Length * (TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[1] / 2); + int baseX = OpenTaiko.Skin.OnlineLounge_Side_Menu[0] - _ref.Length * (OpenTaiko.Skin.OnlineLounge_Side_Menu_Move[0] / 2); + int baseY = OpenTaiko.Skin.OnlineLounge_Side_Menu[1] - _ref.Length * (OpenTaiko.Skin.OnlineLounge_Side_Menu_Move[1] / 2); for (int i = 0; i < _ref.Length; i++) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(_ref[i]); if (_selector != i) { tmpTex.color4 = CConversion.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.OnlineLounge_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.OnlineLounge_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); } else { tmpTex.color4 = CConversion.ColorToColor4(Color.White); - TJAPlayer3.Tx.OnlineLounge_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.OnlineLounge_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); } - TJAPlayer3.Tx.OnlineLounge_Side_Menu?.t2D拡大率考慮上中央基準描画(baseX + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[0] * i, - baseY + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[1] * i); + OpenTaiko.Tx.OnlineLounge_Side_Menu?.t2D拡大率考慮上中央基準描画(baseX + OpenTaiko.Skin.OnlineLounge_Side_Menu_Move[0] * i, + baseY + OpenTaiko.Skin.OnlineLounge_Side_Menu_Move[1] * i); tmpTex.t2D拡大率考慮上中央基準描画( - baseX + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Text_Offset[0] + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[0] * i, - baseY + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Text_Offset[1] + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[1] * i); + baseX + OpenTaiko.Skin.OnlineLounge_Side_Menu_Text_Offset[0] + OpenTaiko.Skin.OnlineLounge_Side_Menu_Move[0] * i, + baseY + OpenTaiko.Skin.OnlineLounge_Side_Menu_Text_Offset[1] + OpenTaiko.Skin.OnlineLounge_Side_Menu_Move[1] * i); } } @@ -199,8 +199,8 @@ namespace TJAPlayer3 { _ref = this.ttkCDNSongList; _selector = cdnSongListIndex; - int baseX = TJAPlayer3.Skin.OnlineLounge_Song[0]; - int baseY = TJAPlayer3.Skin.OnlineLounge_Song[1]; + int baseX = OpenTaiko.Skin.OnlineLounge_Song[0]; + int baseY = OpenTaiko.Skin.OnlineLounge_Song[1]; for (int i = -4; i < 4; i++) { int pos = (_ref.Length * 5 + _selector + i) % _ref.Length; @@ -224,23 +224,23 @@ namespace TJAPlayer3 { tmpTex.color4 = _color; tmpSubtitle.color4 = _color; - int x = baseX + TJAPlayer3.Skin.OnlineLounge_Song_Move[0] * i; - int y = baseY + TJAPlayer3.Skin.OnlineLounge_Song_Move[1] * i; + int x = baseX + OpenTaiko.Skin.OnlineLounge_Song_Move[0] * i; + int y = baseY + OpenTaiko.Skin.OnlineLounge_Song_Move[1] * i; if (pos == 0) { - TJAPlayer3.Tx.OnlineLounge_Return_Box?.tUpdateColor4(_color); - TJAPlayer3.Tx.OnlineLounge_Return_Box?.t2D拡大率考慮上中央基準描画(x, y); + OpenTaiko.Tx.OnlineLounge_Return_Box?.tUpdateColor4(_color); + OpenTaiko.Tx.OnlineLounge_Return_Box?.t2D拡大率考慮上中央基準描画(x, y); } else { - TJAPlayer3.Tx.OnlineLounge_Song_Box?.tUpdateColor4(_color); - TJAPlayer3.Tx.OnlineLounge_Song_Box?.t2D拡大率考慮上中央基準描画(x, y); + OpenTaiko.Tx.OnlineLounge_Song_Box?.tUpdateColor4(_color); + OpenTaiko.Tx.OnlineLounge_Song_Box?.t2D拡大率考慮上中央基準描画(x, y); } - tmpTex.t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.OnlineLounge_Song_Title_Offset[0], y + TJAPlayer3.Skin.OnlineLounge_Song_Title_Offset[1]); - tmpSubtitle.t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.OnlineLounge_Song_SubTitle_Offset[0], y + TJAPlayer3.Skin.OnlineLounge_Song_SubTitle_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.OnlineLounge_Song_Title_Offset[0], y + OpenTaiko.Skin.OnlineLounge_Song_Title_Offset[1]); + tmpSubtitle.t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.OnlineLounge_Song_SubTitle_Offset[0], y + OpenTaiko.Skin.OnlineLounge_Song_SubTitle_Offset[1]); if (pos != 0 && i == 0) { - TJAPlayer3.Tx.OnlineLounge_Context.t2D描画(0, 0); + OpenTaiko.Tx.OnlineLounge_Context.t2D描画(0, 0); var song_ = apiMethods.FetchedSongsList[pos - 1]; @@ -260,7 +260,7 @@ namespace TJAPlayer3 { if (song_.charter != null && song_.charter.charter_name != null && song_.charter.charter_name != "") { var charter_ = TitleTextureKey.ResolveTitleTexture( new TitleTextureKey("Charter : " + song_.charter.charter_name, this.pfOLFontLarge, Color.White, Color.Black, 1000)); - charter_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Charter[0], TJAPlayer3.Skin.OnlineLounge_Context_Charter[1]); + charter_?.t2D中心基準描画(OpenTaiko.Skin.OnlineLounge_Context_Charter[0], OpenTaiko.Skin.OnlineLounge_Context_Charter[1]); } #endregion @@ -270,7 +270,7 @@ namespace TJAPlayer3 { if (song_.Genre != null && song_.Genre.genre != null && song_.Genre.genre != "") { var genre_ = TitleTextureKey.ResolveTitleTexture( new TitleTextureKey(song_.Genre.genre, this.pfOLFontLarge, Color.White, Color.Black, 1000)); - genre_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Genre[0], TJAPlayer3.Skin.OnlineLounge_Context_Genre[1]); + genre_?.t2D中心基準描画(OpenTaiko.Skin.OnlineLounge_Context_Genre[0], OpenTaiko.Skin.OnlineLounge_Context_Genre[1]); } #endregion @@ -280,17 +280,17 @@ namespace TJAPlayer3 { for (int k = 0; k < (int)Difficulty.Total; k++) { int diff = diffs[k]; - int column = (k >= 3) ? TJAPlayer3.Skin.OnlineLounge_Context_Couse_Move[0] : 0; - int row = TJAPlayer3.Skin.OnlineLounge_Context_Couse_Move[1] * (k % 3); + int column = (k >= 3) ? OpenTaiko.Skin.OnlineLounge_Context_Couse_Move[0] : 0; + int row = OpenTaiko.Skin.OnlineLounge_Context_Couse_Move[1] * (k % 3); if (diff > 0) { - TJAPlayer3.Tx.Couse_Symbol[k]?.t2D中心基準描画( - TJAPlayer3.Skin.OnlineLounge_Context_Couse_Symbol[0] + column, - TJAPlayer3.Skin.OnlineLounge_Context_Couse_Symbol[1] + row); + OpenTaiko.Tx.Couse_Symbol[k]?.t2D中心基準描画( + OpenTaiko.Skin.OnlineLounge_Context_Couse_Symbol[0] + column, + OpenTaiko.Skin.OnlineLounge_Context_Couse_Symbol[1] + row); var difnb_ = TitleTextureKey.ResolveTitleTexture( new TitleTextureKey(diff.ToString(), this.pfOLFontLarge, (diff > 10) ? Color.Red : Color.White, Color.Black, 1000)); - difnb_?.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Context_Level[0] + column, TJAPlayer3.Skin.OnlineLounge_Context_Level[1] + row); + difnb_?.t2D中心基準描画(OpenTaiko.Skin.OnlineLounge_Context_Level[0] + column, OpenTaiko.Skin.OnlineLounge_Context_Level[1] + row); } } @@ -306,11 +306,11 @@ namespace TJAPlayer3 { #endregion if (IsDownloading) { - TJAPlayer3.Tx.OnlineLounge_Box.t2D描画(0, 0); + OpenTaiko.Tx.OnlineLounge_Box.t2D描画(0, 0); var text = TitleTextureKey.ResolveTitleTexture( new TitleTextureKey("Downloading...", this.pfOLFontLarge, Color.White, Color.Black, 1000)); - text.t2D中心基準描画(TJAPlayer3.Skin.OnlineLounge_Downloading[0], TJAPlayer3.Skin.OnlineLounge_Downloading[1]); + text.t2D中心基準描画(OpenTaiko.Skin.OnlineLounge_Downloading[0], OpenTaiko.Skin.OnlineLounge_Downloading[1]); } #endregion @@ -321,26 +321,26 @@ namespace TJAPlayer3 { //if (!IsDownloading) { - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { if (this.tMove(1)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { if (this.tMove(-1)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { #region [Fast return (Escape)] - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); if (currentMenu == ECurrentMenu.MAIN) { // Return to title screen - TJAPlayer3.Skin.soundOnlineLoungeBGM?.tStop(); + OpenTaiko.Skin.soundOnlineLoungeBGM?.tStop(); this.eフェードアウト完了時の戻り値 = EReturnValue.ReturnToTitle; this.actFOtoTitle.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; @@ -358,8 +358,8 @@ namespace TJAPlayer3 { return 0; #endregion - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { #region [Decide] @@ -369,32 +369,32 @@ namespace TJAPlayer3 { currentMenu = mainMenu[mainMenuIndex]; if (currentMenu == ECurrentMenu.RETURN) { // Quit - TJAPlayer3.Skin.soundCancelSFX.tPlay(); - TJAPlayer3.Skin.soundOnlineLoungeBGM?.tStop(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundOnlineLoungeBGM?.tStop(); this.eフェードアウト完了時の戻り値 = EReturnValue.ReturnToTitle; this.actFOtoTitle.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; } else { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } } else { - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } } else if (currentMenu == ECurrentMenu.CDN_SELECT) { // CDN Select Menu if (CDNSelectIndex > 0) { currentMenu = ECurrentMenu.CDN_OPTION; dbCDNData = dbCDN.data.ElementAt(CDNSelectIndex - 1).Value; - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } else { currentMenu = ECurrentMenu.MAIN; - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); } } else if (currentMenu == ECurrentMenu.CDN_OPTION) { // CDN Option Menu currentMenu = cdnOptMenu[cdnOptMenuIndex]; if (currentMenu == ECurrentMenu.CDN_SELECT) - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); else { if (currentMenu == ECurrentMenu.CDN_SONGS) { apiMethods = new API(dbCDNData); @@ -423,12 +423,12 @@ namespace TJAPlayer3 { #endregion } - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } } else if (currentMenu == ECurrentMenu.CDN_SONGS) { if (this.cdnSongListIndex == 0) { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); currentMenu = ECurrentMenu.CDN_OPTION; } else { if (this.cdnSongListIndex < apiMethods.FetchedSongsList.Length) { @@ -437,9 +437,9 @@ namespace TJAPlayer3 { var downloadLink = GetDownloadLink(song); if (CSongDict.tContainsSongUrl(downloadLink) || song.DownloadNow) { - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } else { - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); System.Threading.Thread download = new System.Threading.Thread(new System.Threading.ThreadStart(DownloadSong)); download.Start(); @@ -505,8 +505,8 @@ namespace TJAPlayer3 { } private string GetAssignedLanguageValue(Dictionary ens) { - if (ens.ContainsKey(TJAPlayer3.ConfigIni.sLang)) - return ens[TJAPlayer3.ConfigIni.sLang]; + if (ens.ContainsKey(OpenTaiko.ConfigIni.sLang)) + return ens[OpenTaiko.ConfigIni.sLang]; return ens["default"]; } @@ -539,9 +539,9 @@ namespace TJAPlayer3 { // Fetch closest Download folder node CSongListNode downloadBox = null; - for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++) { - if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == "Download") { - downloadBox = TJAPlayer3.Songs管理.list曲ルート[i]; + for (int i = 0; i < OpenTaiko.Songs管理.list曲ルート.Count; i++) { + if (OpenTaiko.Songs管理.list曲ルート[i].strジャンル == "Download") { + downloadBox = OpenTaiko.Songs管理.list曲ルート[i]; if (downloadBox.rParentNode != null) downloadBox = downloadBox.rParentNode; break; } @@ -558,10 +558,10 @@ namespace TJAPlayer3 { // Search a corresponding box-def if exists CSongListNode correspondingBox = null; - for (int i = 0; i < TJAPlayer3.Songs管理.list曲ルート.Count; i++) { - if (TJAPlayer3.Songs管理.list曲ルート[i].strジャンル == song.Genre.genre - && TJAPlayer3.Songs管理.list曲ルート[i].eノード種別 == CSongListNode.ENodeType.BOX) - correspondingBox = TJAPlayer3.Songs管理.list曲ルート[i]; + for (int i = 0; i < OpenTaiko.Songs管理.list曲ルート.Count; i++) { + if (OpenTaiko.Songs管理.list曲ルート[i].strジャンル == song.Genre.genre + && OpenTaiko.Songs管理.list曲ルート[i].eノード種別 == CSongListNode.ENodeType.BOX) + correspondingBox = OpenTaiko.Songs管理.list曲ルート[i]; } var newBoxDef = $@"{genredPath}{Path.DirectorySeparatorChar}box.def"; @@ -571,7 +571,7 @@ namespace TJAPlayer3 { //File.Create(newBoxDef); - StreamWriter sw = new StreamWriter(newBoxDef, false, Encoding.GetEncoding(TJAPlayer3.sEncType)); + StreamWriter sw = new StreamWriter(newBoxDef, false, Encoding.GetEncoding(OpenTaiko.sEncType)); sw.WriteLine($@"#TITLE:{song.Genre.genre}"); sw.WriteLine($@"#GENRE:{song.Genre.genre}"); @@ -618,7 +618,7 @@ namespace TJAPlayer3 { //System.IO.Compression.ZipFile.ExtractToDirectory(zipPath, $@"Songs{Path.DirectorySeparatorChar}S3 Download{Path.DirectorySeparatorChar}{song.Md5}"); } catch (Exception e) { Trace.TraceInformation(e.ToString()); - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } diff --git a/OpenTaiko/src/Stages/13.TowerSelect/CStageTowerSelect.cs b/OpenTaiko/src/Stages/13.TowerSelect/CStageTowerSelect.cs index 2fddadda..d004baa9 100644 --- a/OpenTaiko/src/Stages/13.TowerSelect/CStageTowerSelect.cs +++ b/OpenTaiko/src/Stages/13.TowerSelect/CStageTowerSelect.cs @@ -4,7 +4,7 @@ using System.Text; using FDK; // Minimalist menu class to use for custom menus -namespace TJAPlayer3 { +namespace OpenTaiko { class CStageTowerSelect : CStage { public CStageTowerSelect() { base.eStageID = EStage.TaikoTowers; @@ -28,7 +28,7 @@ namespace TJAPlayer3 { this.eフェードアウト完了時の戻り値 = EReturnValue.Continuation; if (listSongs == null) - listSongs = TJAPlayer3.Songs管理.list曲ルート_Tower; + listSongs = OpenTaiko.Songs管理.list曲ルート_Tower; tUpdateBarInfos(); @@ -41,7 +41,7 @@ namespace TJAPlayer3 { public override void DeActivate() { // On de-activation - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); base.DeActivate(); } @@ -49,8 +49,8 @@ namespace TJAPlayer3 { public override void CreateManagedResource() { // Ressource allocation - pfTitleFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.TowerSelect_Title_Size); - pfSubTitleFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.TowerSelect_SubTitle_Size); + pfTitleFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.TowerSelect_Title_Size); + pfSubTitleFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.TowerSelect_SubTitle_Size); base.CreateManagedResource(); } @@ -68,13 +68,13 @@ namespace TJAPlayer3 { Background.Update(); Background.Draw(); - for (int i = 0; i < TJAPlayer3.Skin.TowerSelect_Bar_Count; i++) { - int currentSong = nCurrentSongIndex + i - ((TJAPlayer3.Skin.TowerSelect_Bar_Count - 1) / 2); + for (int i = 0; i < OpenTaiko.Skin.TowerSelect_Bar_Count; i++) { + int currentSong = nCurrentSongIndex + i - ((OpenTaiko.Skin.TowerSelect_Bar_Count - 1) / 2); if (currentSong < 0 || currentSong >= BarInfos.Length) continue; var bar = BarInfos[currentSong]; - int x = TJAPlayer3.Skin.TowerSelect_Bar_X[i]; - int y = TJAPlayer3.Skin.TowerSelect_Bar_Y[i]; + int x = OpenTaiko.Skin.TowerSelect_Bar_X[i]; + int y = OpenTaiko.Skin.TowerSelect_Bar_Y[i]; tDrawTower(x, y, bar); } @@ -82,41 +82,41 @@ namespace TJAPlayer3 { if (this.eフェードアウト完了時の戻り値 == EReturnValue.Continuation) { int returnTitle() { - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); this.eフェードアウト完了時の戻り値 = EReturnValue.ReturnToTitle; this.actFOtoTitle.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; return 0; } - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); if (nCurrentSongIndex < BarInfos.Length - 1) { nCurrentSongIndex++; } - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); if (nCurrentSongIndex > 0) { nCurrentSongIndex--; } - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { #region [Fast return (Escape)] - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); returnTitle(); #endregion - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { #region [Decide] - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); switch (currentSong.eノード種別) { case CSongListNode.ENodeType.SCORE: @@ -129,7 +129,7 @@ namespace TJAPlayer3 { tOpenFolder(currentSong); break; case CSongListNode.ENodeType.BACKBOX: { - if (TJAPlayer3.Songs管理.list曲ルート.Contains(currentSong.rParentNode) && currentSong.rParentNode.strジャンル == "太鼓タワー") { + if (OpenTaiko.Songs管理.list曲ルート.Contains(currentSong.rParentNode) && currentSong.rParentNode.strジャンル == "太鼓タワー") { returnTitle(); } else { tCloseFolder(currentSong); @@ -175,13 +175,13 @@ namespace TJAPlayer3 { } public void tSelectSong() { - TJAPlayer3.ConfigIni.bTokkunMode = false; - TJAPlayer3.stageSongSelect.rChoosenSong = listSongs[nCurrentSongIndex]; - TJAPlayer3.stageSongSelect.r確定されたスコア = listSongs[nCurrentSongIndex].arスコア[(int)Difficulty.Tower]; - TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Tower; - TJAPlayer3.stageSongSelect.str確定された曲のジャンル = listSongs[nCurrentSongIndex].strジャンル; - if ((TJAPlayer3.stageSongSelect.rChoosenSong != null) && (TJAPlayer3.stageSongSelect.r確定されたスコア != null)) { - CFloorManagement.reinitialize(TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nLife); + OpenTaiko.ConfigIni.bTokkunMode = false; + OpenTaiko.stageSongSelect.rChoosenSong = listSongs[nCurrentSongIndex]; + OpenTaiko.stageSongSelect.r確定されたスコア = listSongs[nCurrentSongIndex].arスコア[(int)Difficulty.Tower]; + OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Tower; + OpenTaiko.stageSongSelect.str確定された曲のジャンル = listSongs[nCurrentSongIndex].strジャンル; + if ((OpenTaiko.stageSongSelect.rChoosenSong != null) && (OpenTaiko.stageSongSelect.r確定されたスコア != null)) { + CFloorManagement.reinitialize(OpenTaiko.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nLife); this.eフェードアウト完了時の戻り値 = EReturnValue.SongChoosen; this.actFOtoNowLoading.tフェードアウト開始(); // #27787 2012.3.10 yyagi 曲決定時の画面フェードアウトの省略 base.ePhaseID = CStage.EPhase.SongSelect_FadeOutToNowLoading; @@ -195,7 +195,7 @@ namespace TJAPlayer3 { CSongListNode song = currentSong; List songs = new List(); - TJAPlayer3.stageSongSelect.t指定された曲の子リストの曲を列挙する_孫リスト含む(song.rParentNode, ref songs, ref mandatoryDiffs, true, Difficulty.Tower); + OpenTaiko.stageSongSelect.t指定された曲の子リストの曲を列挙する_孫リスト含む(song.rParentNode, ref songs, ref mandatoryDiffs, true, Difficulty.Tower); song.listランダム用ノードリスト = songs; int selectableSongCount = song.listランダム用ノードリスト.Count; @@ -204,21 +204,21 @@ namespace TJAPlayer3 { return false; } - int randomSongIndex = TJAPlayer3.Random.Next(selectableSongCount); + int randomSongIndex = OpenTaiko.Random.Next(selectableSongCount); - if (TJAPlayer3.ConfigIni.bLogDTX詳細ログ出力) { + if (OpenTaiko.ConfigIni.bLogDTX詳細ログ出力) { StringBuilder builder = new StringBuilder(0x400); builder.Append(string.Format("Total number of songs to randomly choose from {0}. Randomly selected index {0}.", selectableSongCount, randomSongIndex)); Trace.TraceInformation(builder.ToString()); } // Third assignment - TJAPlayer3.stageSongSelect.rChoosenSong = song.listランダム用ノードリスト[randomSongIndex]; - TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Tower; + OpenTaiko.stageSongSelect.rChoosenSong = song.listランダム用ノードリスト[randomSongIndex]; + OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] = (int)Difficulty.Tower; - CFloorManagement.reinitialize(TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nLife); - TJAPlayer3.stageSongSelect.r確定されたスコア = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[TJAPlayer3.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(TJAPlayer3.stageSongSelect.rChoosenSong)]; - TJAPlayer3.stageSongSelect.str確定された曲のジャンル = TJAPlayer3.stageSongSelect.rChoosenSong.strジャンル; + CFloorManagement.reinitialize(OpenTaiko.stageSongSelect.rChoosenSong.arスコア[(int)Difficulty.Tower].譜面情報.nLife); + OpenTaiko.stageSongSelect.r確定されたスコア = OpenTaiko.stageSongSelect.rChoosenSong.arスコア[OpenTaiko.stageSongSelect.actSongList.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(OpenTaiko.stageSongSelect.rChoosenSong)]; + OpenTaiko.stageSongSelect.str確定された曲のジャンル = OpenTaiko.stageSongSelect.rChoosenSong.strジャンル; //TJAPlayer3.Skin.sound曲決定音.t再生する(); @@ -234,21 +234,21 @@ namespace TJAPlayer3 { private void tDrawTower(int x, int y, BarInfo barInfo) { switch (barInfo.eノード種別) { case CSongListNode.ENodeType.SCORE: - TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); + OpenTaiko.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); break; case CSongListNode.ENodeType.RANDOM: - TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); + OpenTaiko.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); break; case CSongListNode.ENodeType.BOX: - TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); + OpenTaiko.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); break; case CSongListNode.ENodeType.BACKBOX: - TJAPlayer3.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); + OpenTaiko.Tx.TowerSelect_Tower.t2D中心基準描画(x, y); break; } - TitleTextureKey.ResolveTitleTexture(barInfo.ttkTitle).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.TowerSelect_Title_Offset[0], y + TJAPlayer3.Skin.TowerSelect_Title_Offset[1]); - TitleTextureKey.ResolveTitleTexture(barInfo.ttkSubTitle).t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.TowerSelect_SubTitle_Offset[0], y + TJAPlayer3.Skin.TowerSelect_SubTitle_Offset[1]); + TitleTextureKey.ResolveTitleTexture(barInfo.ttkTitle).t2D拡大率考慮中央基準描画(x + OpenTaiko.Skin.TowerSelect_Title_Offset[0], y + OpenTaiko.Skin.TowerSelect_Title_Offset[1]); + TitleTextureKey.ResolveTitleTexture(barInfo.ttkSubTitle).t2D拡大率考慮中央基準描画(x + OpenTaiko.Skin.TowerSelect_SubTitle_Offset[0], y + OpenTaiko.Skin.TowerSelect_SubTitle_Offset[1]); } private void tUpdateBarInfos() { @@ -278,8 +278,8 @@ namespace TJAPlayer3 { bar.strSubTitle = song.ldSubtitle.GetString(""); bar.eノード種別 = song.eノード種別; - bar.ttkTitle = new TitleTextureKey(bar.strTitle, pfTitleFont, Color.Black, Color.Transparent, TJAPlayer3.Skin.TowerSelect_Title_MaxWidth); - bar.ttkSubTitle = new TitleTextureKey(bar.strSubTitle, pfTitleFont, Color.Black, Color.Transparent, TJAPlayer3.Skin.TowerSelect_SubTitle_MaxWidth); + bar.ttkTitle = new TitleTextureKey(bar.strTitle, pfTitleFont, Color.Black, Color.Transparent, OpenTaiko.Skin.TowerSelect_Title_MaxWidth); + bar.ttkSubTitle = new TitleTextureKey(bar.strSubTitle, pfTitleFont, Color.Black, Color.Transparent, OpenTaiko.Skin.TowerSelect_SubTitle_MaxWidth); } } diff --git a/OpenTaiko/src/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs b/OpenTaiko/src/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs index 44c1e37d..4957019c 100644 --- a/OpenTaiko/src/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs +++ b/OpenTaiko/src/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs @@ -1,15 +1,15 @@ using System.Drawing; using FDK; -using static TJAPlayer3.CActSelect曲リスト; +using static OpenTaiko.CActSelect曲リスト; -namespace TJAPlayer3 { +namespace OpenTaiko { class CEncyclopediaControler { public CEncyclopediaControler() { _callStack = new Stack(); _idxStack = new Stack(); - _current = TJAPlayer3.Databases.DBEncyclopediaMenus.data; + _current = OpenTaiko.Databases.DBEncyclopediaMenus.data; _lang = CLangManager.fetchLang(); @@ -22,7 +22,7 @@ namespace TJAPlayer3 { private void tReloadFonts() { _pfEncyclopediaMenu?.Dispose(); - _pfEncyclopediaMenu = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.OpenEncyclopedia_Font_EncyclopediaMenu_Size); + _pfEncyclopediaMenu = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.OpenEncyclopedia_Font_EncyclopediaMenu_Size); } #endregion @@ -40,7 +40,7 @@ namespace TJAPlayer3 { private string _GetSectionContents(int key, bool _fetchingMenus) { try { - string _path = _GetPathTextFile(@$"{TJAPlayer3.strEXEのあるフォルダ}Encyclopedia{Path.DirectorySeparatorChar}" + (_fetchingMenus ? @$"Menus{Path.DirectorySeparatorChar}" : @$"Pages{Path.DirectorySeparatorChar}") + key.ToString()); + string _path = _GetPathTextFile(@$"{OpenTaiko.strEXEのあるフォルダ}Encyclopedia{Path.DirectorySeparatorChar}" + (_fetchingMenus ? @$"Menus{Path.DirectorySeparatorChar}" : @$"Pages{Path.DirectorySeparatorChar}") + key.ToString()); return File.ReadAllText(_path); } catch { @@ -49,7 +49,7 @@ namespace TJAPlayer3 { } private string _GetImagePath(int key) { - return @$"{TJAPlayer3.strEXEのあるフォルダ}Encyclopedia{Path.DirectorySeparatorChar}Images{Path.DirectorySeparatorChar}" + key.ToString() + @".png"; + return @$"{OpenTaiko.strEXEのあるフォルダ}Encyclopedia{Path.DirectorySeparatorChar}Images{Path.DirectorySeparatorChar}" + key.ToString() + @".png"; } #endregion @@ -101,7 +101,7 @@ namespace TJAPlayer3 { Pages[i].Item1 = _page; Pages[i].Item2 = TitleTextureKey.ResolveTitleTexture( new TitleTextureKey(_GetSectionContents(_page, false), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000)); - Pages[i].Item3 = TJAPlayer3.tテクスチャの生成(_GetImagePath(_page)); + Pages[i].Item3 = OpenTaiko.tテクスチャの生成(_GetImagePath(_page)); } } diff --git a/OpenTaiko/src/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs b/OpenTaiko/src/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs index 86f03d64..d7ddca61 100644 --- a/OpenTaiko/src/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs +++ b/OpenTaiko/src/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs @@ -2,7 +2,7 @@ using FDK; // Minimalist menu class to use for custom menus -namespace TJAPlayer3 { +namespace OpenTaiko { class COpenEncyclopedia : CStage { public COpenEncyclopedia() { base.eStageID = EStage.TEMPLATE; @@ -24,7 +24,7 @@ namespace TJAPlayer3 { base.ePhaseID = CStage.EPhase.Common_NORMAL; this.eフェードアウト完了時の戻り値 = EReturnValue.Continuation; - TJAPlayer3.Skin.soundEncyclopediaBGM?.tPlay(); + OpenTaiko.Skin.soundEncyclopediaBGM?.tPlay(); _controler = new CEncyclopediaControler(); @@ -37,7 +37,7 @@ namespace TJAPlayer3 { public override void DeActivate() { // On de-activation - TJAPlayer3.tDisposeSafely(ref Background); + OpenTaiko.tDisposeSafely(ref Background); base.DeActivate(); } @@ -70,18 +70,18 @@ namespace TJAPlayer3 { //OpenEncyclopedia_Background?.t2D描画(0, 0); if (_arePagesOpened) { - TJAPlayer3.Tx.OpenEncyclopedia_Context?.t2D描画(0, 0); + OpenTaiko.Tx.OpenEncyclopedia_Context?.t2D描画(0, 0); if (_controler.Pages.Length > 0) { var _page = _controler.Pages[_controler.PageIndex]; - _page.Item2?.t2D中心基準描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_Item2[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_Item2[1]); + _page.Item2?.t2D中心基準描画(OpenTaiko.Skin.OpenEncyclopedia_Context_Item2[0], OpenTaiko.Skin.OpenEncyclopedia_Context_Item2[1]); if (_page.Item3 != null) { - _page.Item3.vcScaleRatio.X = TJAPlayer3.Skin.Resolution[0] / (2f * _page.Item3.szTextureSize.Width); - _page.Item3.vcScaleRatio.Y = TJAPlayer3.Skin.Resolution[1] / (2f * _page.Item3.szTextureSize.Height); - _page.Item3.t2D描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_Item3[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_Item3[1]); + _page.Item3.vcScaleRatio.X = OpenTaiko.Skin.Resolution[0] / (2f * _page.Item3.szTextureSize.Width); + _page.Item3.vcScaleRatio.Y = OpenTaiko.Skin.Resolution[1] / (2f * _page.Item3.szTextureSize.Height); + _page.Item3.t2D描画(OpenTaiko.Skin.OpenEncyclopedia_Context_Item3[0], OpenTaiko.Skin.OpenEncyclopedia_Context_Item3[1]); } - _controler.PageText?.t2D下中央基準描画(TJAPlayer3.Skin.OpenEncyclopedia_Context_PageText[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_PageText[1]); + _controler.PageText?.t2D下中央基準描画(OpenTaiko.Skin.OpenEncyclopedia_Context_PageText[0], OpenTaiko.Skin.OpenEncyclopedia_Context_PageText[1]); } } @@ -90,52 +90,52 @@ namespace TJAPlayer3 { var _menu = _controler.Submenus[_pos]; if (i != 0) { - TJAPlayer3.Tx.OpenEncyclopedia_Return_Box?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); - TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.OpenEncyclopedia_Return_Box?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); + OpenTaiko.Tx.OpenEncyclopedia_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); _menu.Item2?.tUpdateColor4(CConversion.ColorToColor4(Color.DarkGray)); } else { - TJAPlayer3.Tx.OpenEncyclopedia_Return_Box?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); - TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.OpenEncyclopedia_Return_Box?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.OpenEncyclopedia_Side_Menu?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); _menu.Item2?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); } - int x = TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu[0] + TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu_Move[0] * i; - int y = TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu[1] + TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu_Move[1] * i; + int x = OpenTaiko.Skin.OpenEncyclopedia_Side_Menu[0] + OpenTaiko.Skin.OpenEncyclopedia_Side_Menu_Move[0] * i; + int y = OpenTaiko.Skin.OpenEncyclopedia_Side_Menu[1] + OpenTaiko.Skin.OpenEncyclopedia_Side_Menu_Move[1] * i; if (_pos == 0) - TJAPlayer3.Tx.OpenEncyclopedia_Return_Box?.t2D中心基準描画(x, y); + OpenTaiko.Tx.OpenEncyclopedia_Return_Box?.t2D中心基準描画(x, y); else - TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.t2D中心基準描画(x, y); + OpenTaiko.Tx.OpenEncyclopedia_Side_Menu?.t2D中心基準描画(x, y); _menu.Item2?.t2D中心基準描画( - x + TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu_Text_Offset[0], - y + TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu_Text_Offset[1]); + x + OpenTaiko.Skin.OpenEncyclopedia_Side_Menu_Text_Offset[0], + y + OpenTaiko.Skin.OpenEncyclopedia_Side_Menu_Text_Offset[1]); } #endregion #region [Inputs] - if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { + if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange)) { _controler.tHandleRight(); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange)) { _controler.tHandleLeft(); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Cancel)) { _backToMain = _controler.tHandleBack(); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); - } else if (TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || - TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { + OpenTaiko.Skin.soundCancelSFX.tPlay(); + } else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) || + OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.Decide)) { var (_b1, _b2) = _controler.tHandleEnter(); _backToMain = _b2; if (_b1) - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); else - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); } #endregion @@ -143,7 +143,7 @@ namespace TJAPlayer3 { #region [Postprocessing] if (_backToMain) { - TJAPlayer3.Skin.soundEncyclopediaBGM?.tStop(); + OpenTaiko.Skin.soundEncyclopediaBGM?.tStop(); this.eフェードアウト完了時の戻り値 = EReturnValue.ReturnToTitle; this.actFOtoTitle.tフェードアウト開始(); base.ePhaseID = CStage.EPhase.Common_FADEOUT; diff --git a/OpenTaiko/src/Stages/CActDFPFont.cs b/OpenTaiko/src/Stages/CActDFPFont.cs index d32ea73b..070f345a 100644 --- a/OpenTaiko/src/Stages/CActDFPFont.cs +++ b/OpenTaiko/src/Stages/CActDFPFont.cs @@ -3,7 +3,7 @@ using FDK; using Silk.NET.Maths; using Rectangle = System.Drawing.Rectangle; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActDFPFont : CActivity { // コンストラクタ @@ -39,7 +39,7 @@ namespace TJAPlayer3 { } public void t文字列描画(int x, int y, string str, bool b強調, float fScale) { if (!base.IsDeActivated && !string.IsNullOrEmpty(str)) { - CTexture texture = b強調 ? TJAPlayer3.Tx.Config_Font_Bold : TJAPlayer3.Tx.Config_Font; + CTexture texture = b強調 ? OpenTaiko.Tx.Config_Font_Bold : OpenTaiko.Tx.Config_Font; if (texture != null) { texture.vcScaleRatio = new Vector3D(fScale, fScale, 1f); foreach (char ch in str) { @@ -536,8 +536,8 @@ namespace TJAPlayer3 { st文字領域Array[0x5e].ch = '`'; st文字領域Array[0x5e].rc = new Rectangle(69, 226, 14, 29); - float scaleX = TJAPlayer3.Tx.Config_Font.szTextureSize.Width / 256.0f; - float scaleY = TJAPlayer3.Tx.Config_Font.szTextureSize.Height / 256.0f; + float scaleX = OpenTaiko.Tx.Config_Font.szTextureSize.Width / 256.0f; + float scaleY = OpenTaiko.Tx.Config_Font.szTextureSize.Height / 256.0f; for (int i = 0; i < st文字領域Array.Length; i++) { st文字領域Array[i].rc = new Rectangle((int)(st文字領域Array[i].rc.X * scaleX), (int)(st文字領域Array[i].rc.Y * scaleY), diff --git a/OpenTaiko/src/Stages/CActFIFOBlack.cs b/OpenTaiko/src/Stages/CActFIFOBlack.cs index b88cf92e..46f89b91 100644 --- a/OpenTaiko/src/Stages/CActFIFOBlack.cs +++ b/OpenTaiko/src/Stages/CActFIFOBlack.cs @@ -1,16 +1,16 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActFIFOBlack : CActivity { // メソッド public void tフェードアウト開始(int start = 0, int end = 100, int interval = 5) { this.mode = EFIFOモード.フェードアウト; - this.counter = new CCounter(start, end, interval, TJAPlayer3.Timer); + this.counter = new CCounter(start, end, interval, OpenTaiko.Timer); } public void tフェードイン開始(int start = 0, int end = 100, int interval = 5) { this.mode = EFIFOモード.フェードイン; - this.counter = new CCounter(start, end, interval, TJAPlayer3.Timer); + this.counter = new CCounter(start, end, interval, OpenTaiko.Timer); } @@ -32,13 +32,13 @@ namespace TJAPlayer3 { } this.counter.Tick(); // Size clientSize = CDTXMania.app.Window.ClientSize; // #23510 2010.10.31 yyagi: delete as of no one use this any longer. - if (TJAPlayer3.Tx.Tile_Black != null) { - TJAPlayer3.Tx.Tile_Black.Opacity = (this.mode == EFIFOモード.フェードイン) ? (((100 - this.counter.CurrentValue) * 0xff) / 100) : ((this.counter.CurrentValue * 0xff) / 100); - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + if (OpenTaiko.Tx.Tile_Black != null) { + OpenTaiko.Tx.Tile_Black.Opacity = (this.mode == EFIFOモード.フェードイン) ? (((100 - this.counter.CurrentValue) * 0xff) / 100) : ((this.counter.CurrentValue * 0xff) / 100); + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / OpenTaiko.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / OpenTaiko.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); } } } diff --git a/OpenTaiko/src/Stages/CActFIFOResult.cs b/OpenTaiko/src/Stages/CActFIFOResult.cs index af9860e1..33ee5130 100644 --- a/OpenTaiko/src/Stages/CActFIFOResult.cs +++ b/OpenTaiko/src/Stages/CActFIFOResult.cs @@ -1,16 +1,16 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActFIFOResult : CActivity { // メソッド public void tフェードアウト開始() { this.mode = EFIFOモード.フェードアウト; - this.counter = new CCounter(0, 100, 30, TJAPlayer3.Timer); + this.counter = new CCounter(0, 100, 30, OpenTaiko.Timer); } public void tフェードイン開始() { this.mode = EFIFOモード.フェードイン; - this.counter = new CCounter(0, 300, 2, TJAPlayer3.Timer); + this.counter = new CCounter(0, 300, 2, OpenTaiko.Timer); } public void tフェードイン完了() { this.counter.CurrentValue = (int)counter.BeginValue; @@ -35,22 +35,22 @@ namespace TJAPlayer3 { } this.counter.Tick(); // Size clientSize = CDTXMania.app.Window.ClientSize; // #23510 2010.10.31 yyagi: delete as of no one use this any longer. - if (TJAPlayer3.Tx.Tile_Black != null) { + if (OpenTaiko.Tx.Tile_Black != null) { if (this.mode == EFIFOモード.フェードイン) { if (counter.CurrentValue >= 200) { - TJAPlayer3.Tx.Tile_Black.Opacity = (((100 - (this.counter.CurrentValue - 200)) * 0xff) / 100); + OpenTaiko.Tx.Tile_Black.Opacity = (((100 - (this.counter.CurrentValue - 200)) * 0xff) / 100); } else { - TJAPlayer3.Tx.Tile_Black.Opacity = 255; + OpenTaiko.Tx.Tile_Black.Opacity = 255; } } else { - TJAPlayer3.Tx.Tile_Black.Opacity = (((this.counter.CurrentValue) * 0xff) / 100); + OpenTaiko.Tx.Tile_Black.Opacity = (((this.counter.CurrentValue) * 0xff) / 100); } - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / OpenTaiko.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / OpenTaiko.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); } } } diff --git a/OpenTaiko/src/Stages/CActFIFOStart.cs b/OpenTaiko/src/Stages/CActFIFOStart.cs index 99a6e004..c23d5b2d 100644 --- a/OpenTaiko/src/Stages/CActFIFOStart.cs +++ b/OpenTaiko/src/Stages/CActFIFOStart.cs @@ -1,34 +1,34 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActFIFOStart : CActivity { // メソッド public void tフェードアウト開始() { this.mode = EFIFOモード.フェードアウト; - TJAPlayer3.Skin.soundDanSelectBGM.tStop(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) - this.counter = new CCounter(0, 1255, 1, TJAPlayer3.Timer); - else if (TJAPlayer3.ConfigIni.bAIBattleMode) { - this.counter = new CCounter(0, 5500, 1, TJAPlayer3.Timer); + OpenTaiko.Skin.soundDanSelectBGM.tStop(); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) + this.counter = new CCounter(0, 1255, 1, OpenTaiko.Timer); + else if (OpenTaiko.ConfigIni.bAIBattleMode) { + this.counter = new CCounter(0, 5500, 1, OpenTaiko.Timer); } else { - this.counter = new CCounter(0, 3580, 1, TJAPlayer3.Timer); + this.counter = new CCounter(0, 3580, 1, OpenTaiko.Timer); } } public void tフェードイン開始() { this.mode = EFIFOモード.フェードイン; - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { - this.counter = new CCounter(0, 255, 1, TJAPlayer3.Timer); + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] == (int)Difficulty.Dan) { + this.counter = new CCounter(0, 255, 1, OpenTaiko.Timer); - TJAPlayer3.stage演奏ドラム画面.actDan.Start(TJAPlayer3.stage演奏ドラム画面.ListDan_Number); - TJAPlayer3.stage演奏ドラム画面.ListDan_Number++; - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { - this.counter = new CCounter(0, 3580, 1, TJAPlayer3.Timer); + OpenTaiko.stage演奏ドラム画面.actDan.Start(OpenTaiko.stage演奏ドラム画面.ListDan_Number); + OpenTaiko.stage演奏ドラム画面.ListDan_Number++; + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { + this.counter = new CCounter(0, 3580, 1, OpenTaiko.Timer); } else { - this.counter = new CCounter(0, 3580, 1, TJAPlayer3.Timer); + this.counter = new CCounter(0, 3580, 1, OpenTaiko.Timer); } } public void tフェードイン完了() // #25406 2011.6.9 yyagi @@ -53,96 +53,96 @@ namespace TJAPlayer3 { } this.counter.Tick(); - if (TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0] >= (int)Difficulty.Tower) { - if (TJAPlayer3.Tx.Tile_Black != null) { - TJAPlayer3.Tx.Tile_Black.Opacity = this.mode == EFIFOモード.フェードアウト ? -1000 + counter.CurrentValue : 255 - counter.CurrentValue; - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + if (OpenTaiko.stageSongSelect.nChoosenSongDifficulty[0] >= (int)Difficulty.Tower) { + if (OpenTaiko.Tx.Tile_Black != null) { + OpenTaiko.Tx.Tile_Black.Opacity = this.mode == EFIFOモード.フェードアウト ? -1000 + counter.CurrentValue : 255 - counter.CurrentValue; + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / OpenTaiko.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / OpenTaiko.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); } } } - } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { + } else if (OpenTaiko.ConfigIni.bAIBattleMode) { if (this.mode == EFIFOモード.フェードアウト) { var preTime = (this.counter.CurrentValue >= 2000 ? this.counter.CurrentValue - 2000 : 0) * 2; - TJAPlayer3.Tx.SongLoading_Fade_AI.Opacity = preTime; - TJAPlayer3.Tx.SongLoading_Fade_AI.t2D描画(0, 0); + OpenTaiko.Tx.SongLoading_Fade_AI.Opacity = preTime; + OpenTaiko.Tx.SongLoading_Fade_AI.t2D描画(0, 0); if (preTime > 500) { - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_Base.vcScaleRatio.X = Math.Min(((preTime - 500) / 255.0f), 1.0f); - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_Base.t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Resolution[0] / 2, TJAPlayer3.Skin.Resolution[1] / 2); + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_Base.vcScaleRatio.X = Math.Min(((preTime - 500) / 255.0f), 1.0f); + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_Base.t2D拡大率考慮中央基準描画(OpenTaiko.Skin.Resolution[0] / 2, OpenTaiko.Skin.Resolution[1] / 2); } if (preTime > 1000) { - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_Ring.Opacity = preTime - 1000; - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_Ring.fZ軸中心回転 = preTime / 6000.0f; - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_Ring.t2D描画(TJAPlayer3.Skin.SongLoading_Fade_AI_Anime_Ring[0], TJAPlayer3.Skin.SongLoading_Fade_AI_Anime_Ring[1]); + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_Ring.Opacity = preTime - 1000; + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_Ring.fZ軸中心回転 = preTime / 6000.0f; + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_Ring.t2D描画(OpenTaiko.Skin.SongLoading_Fade_AI_Anime_Ring[0], OpenTaiko.Skin.SongLoading_Fade_AI_Anime_Ring[1]); if (preTime - 1000 < 1500) { - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_NowLoading.Opacity = preTime - 1000; - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_NowLoading.t2D描画(0, 0); + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_NowLoading.Opacity = preTime - 1000; + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_NowLoading.t2D描画(0, 0); - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_LoadBar_Base.t2D描画(TJAPlayer3.Skin.SongLoading_Fade_AI_Anime_LoadBar[0], TJAPlayer3.Skin.SongLoading_Fade_AI_Anime_LoadBar[1]); + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_LoadBar_Base.t2D描画(OpenTaiko.Skin.SongLoading_Fade_AI_Anime_LoadBar[0], OpenTaiko.Skin.SongLoading_Fade_AI_Anime_LoadBar[1]); float value = (preTime - 1000) / 1500.0f; value = 1.0f - (float)Math.Cos(value * Math.PI / 2.0); value = 1.0f - (float)Math.Cos(value * Math.PI / 2.0); value = 1.0f - (float)Math.Cos(value * Math.PI / 2.0); - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_LoadBar.t2D描画(TJAPlayer3.Skin.SongLoading_Fade_AI_Anime_LoadBar[0], TJAPlayer3.Skin.SongLoading_Fade_AI_Anime_LoadBar[1], - new RectangleF(0, 0, TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_LoadBar.szTextureSize.Width * value, - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_LoadBar.szTextureSize.Height)); + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_LoadBar.t2D描画(OpenTaiko.Skin.SongLoading_Fade_AI_Anime_LoadBar[0], OpenTaiko.Skin.SongLoading_Fade_AI_Anime_LoadBar[1], + new RectangleF(0, 0, OpenTaiko.Tx.SongLoading_Fade_AI_Anime_LoadBar.szTextureSize.Width * value, + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_LoadBar.szTextureSize.Height)); } else { - TJAPlayer3.Tx.SongLoading_Fade_AI_Anime_Start.t2D描画(0, 0); + OpenTaiko.Tx.SongLoading_Fade_AI_Anime_Start.t2D描画(0, 0); } } var time = this.counter.CurrentValue >= 5000 ? this.counter.CurrentValue - 5000 : 0; - TJAPlayer3.Tx.SongLoading_Bg_AI.Opacity = time; - TJAPlayer3.Tx.SongLoading_Bg_AI.t2D描画(0, 0); + OpenTaiko.Tx.SongLoading_Bg_AI.Opacity = time; + OpenTaiko.Tx.SongLoading_Bg_AI.t2D描画(0, 0); - TJAPlayer3.Tx.SongLoading_Bg_AI_Wait.Opacity = time - 255; - TJAPlayer3.Tx.SongLoading_Bg_AI_Wait.t2D描画(0, 0); + OpenTaiko.Tx.SongLoading_Bg_AI_Wait.Opacity = time - 255; + OpenTaiko.Tx.SongLoading_Bg_AI_Wait.t2D描画(0, 0); - TJAPlayer3.Tx.SongLoading_Plate_AI.Opacity = time - 255; - if (TJAPlayer3.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Left) { - TJAPlayer3.Tx.SongLoading_Plate_AI.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X_AI, TJAPlayer3.Skin.SongLoading_Plate_Y_AI - (TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); - } else if (TJAPlayer3.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Right) { - TJAPlayer3.Tx.SongLoading_Plate_AI.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X_AI - TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Width, TJAPlayer3.Skin.SongLoading_Plate_Y_AI - (TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); + OpenTaiko.Tx.SongLoading_Plate_AI.Opacity = time - 255; + if (OpenTaiko.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Left) { + OpenTaiko.Tx.SongLoading_Plate_AI.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X_AI, OpenTaiko.Skin.SongLoading_Plate_Y_AI - (OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); + } else if (OpenTaiko.Skin.SongLoading_Plate_ReferencePoint == CSkin.ReferencePoint.Right) { + OpenTaiko.Tx.SongLoading_Plate_AI.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X_AI - OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Width, OpenTaiko.Skin.SongLoading_Plate_Y_AI - (OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); } else { - TJAPlayer3.Tx.SongLoading_Plate_AI.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X_AI - (TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Width / 2), TJAPlayer3.Skin.SongLoading_Plate_Y_AI - (TJAPlayer3.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); + OpenTaiko.Tx.SongLoading_Plate_AI.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X_AI - (OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Width / 2), OpenTaiko.Skin.SongLoading_Plate_Y_AI - (OpenTaiko.Tx.SongLoading_Plate_AI.sz画像サイズ.Height / 2)); } } else { - TJAPlayer3.Tx.SongLoading_Bg_AI.Opacity = 255 - counter.CurrentValue; - TJAPlayer3.Tx.SongLoading_Bg_AI.t2D描画(0, 0); + OpenTaiko.Tx.SongLoading_Bg_AI.Opacity = 255 - counter.CurrentValue; + OpenTaiko.Tx.SongLoading_Bg_AI.t2D描画(0, 0); } } else { if (this.mode == EFIFOモード.フェードアウト) { - if (TJAPlayer3.Tx.SongLoading_Fade != null) { + if (OpenTaiko.Tx.SongLoading_Fade != null) { // 曲開始幕アニメ。 // 地味に横の拡大率が変動しているのが一番厄介... var time = this.counter.CurrentValue >= 2580 ? this.counter.CurrentValue - 2580 : 0; var FadeValue = (time - 670f) / 330.0f; if (FadeValue >= 1.0) FadeValue = 1.0f; else if (FadeValue <= 0.0) FadeValue = 0.0f; - DrawBack(time < 500.0 ? TJAPlayer3.Tx.SongLoading_Fade : TJAPlayer3.Tx.SongLoading_Bg, time, 0, 500.0, false); + DrawBack(time < 500.0 ? OpenTaiko.Tx.SongLoading_Fade : OpenTaiko.Tx.SongLoading_Bg, time, 0, 500.0, false); DrawStar(FadeValue * 255f); DrawPlate(FadeValue * 255f, FadeValue); DrawChara(time, (time - 730f) * (255f / 270f)); } } else { - if (TJAPlayer3.Tx.SongLoading_Fade != null) { + if (OpenTaiko.Tx.SongLoading_Fade != null) { // 曲開始幕アニメ。 // 地味に横の拡大率が変動しているのが一番厄介... var time = this.counter.CurrentValue; var FadeValue = time / 140f; if (FadeValue >= 1.0) FadeValue = 1.0f; else if (FadeValue <= 0.0) FadeValue = 0.0f; - DrawBack(time < 300.0 ? TJAPlayer3.Tx.SongLoading_Bg : TJAPlayer3.Tx.SongLoading_Fade, time, 300.0, 500.0, true); + DrawBack(time < 300.0 ? OpenTaiko.Tx.SongLoading_Bg : OpenTaiko.Tx.SongLoading_Fade, time, 300.0, 500.0, true); DrawStar(255f - (FadeValue * 255f)); DrawPlate(255f - (FadeValue * 255f), 1f + (FadeValue * 0.5f), 1f - FadeValue); DrawChara(time, (time <= 80.0 ? 255 : 255f - (float)((Math.Pow((time - 80f), 1.5f) / Math.Pow(220f, 1.5f)) * 255f)), 250f, (time <= 80.0 ? ((time / 80f) * 30f) : 30f - (float)((Math.Pow((time - 80f), 1.5f) / Math.Pow(220f, 1.5f)) * 320f))); @@ -182,10 +182,10 @@ namespace TJAPlayer3 { /// /// private void DrawStar(float opacity) { - if (TJAPlayer3.Tx.SongLoading_BgWait is null) return; + if (OpenTaiko.Tx.SongLoading_BgWait is null) return; - TJAPlayer3.Tx.SongLoading_BgWait.Opacity = (int)opacity; - TJAPlayer3.Tx.SongLoading_BgWait.t2D描画(0, 0); + OpenTaiko.Tx.SongLoading_BgWait.Opacity = (int)opacity; + OpenTaiko.Tx.SongLoading_BgWait.t2D描画(0, 0); } /// @@ -194,31 +194,31 @@ namespace TJAPlayer3 { /// /// private void DrawPlate(float opacity, float scaleX, float scaleY = 1f) { - if (TJAPlayer3.Tx.SongLoading_Plate is null) return; - var SizeX_Harf = TJAPlayer3.Tx.SongLoading_Plate.szTextureSize.Width / 2.0f; - var SizeY_Harf = TJAPlayer3.Tx.SongLoading_Plate.szTextureSize.Height / 2.0f; + if (OpenTaiko.Tx.SongLoading_Plate is null) return; + var SizeX_Harf = OpenTaiko.Tx.SongLoading_Plate.szTextureSize.Width / 2.0f; + var SizeY_Harf = OpenTaiko.Tx.SongLoading_Plate.szTextureSize.Height / 2.0f; - TJAPlayer3.Tx.SongLoading_Plate.Opacity = (int)opacity; - TJAPlayer3.Tx.SongLoading_Plate.vcScaleRatio.X = scaleX; - TJAPlayer3.Tx.SongLoading_Plate.vcScaleRatio.Y = scaleY; - TJAPlayer3.Tx.SongLoading_Plate.t2D描画(TJAPlayer3.Skin.SongLoading_Plate_X + SizeX_Harf - (SizeX_Harf * scaleX) - SizeX_Harf, TJAPlayer3.Skin.SongLoading_Plate_Y - SizeY_Harf + ((1f - scaleY) * SizeY_Harf)); + OpenTaiko.Tx.SongLoading_Plate.Opacity = (int)opacity; + OpenTaiko.Tx.SongLoading_Plate.vcScaleRatio.X = scaleX; + OpenTaiko.Tx.SongLoading_Plate.vcScaleRatio.Y = scaleY; + OpenTaiko.Tx.SongLoading_Plate.t2D描画(OpenTaiko.Skin.SongLoading_Plate_X + SizeX_Harf - (SizeX_Harf * scaleX) - SizeX_Harf, OpenTaiko.Skin.SongLoading_Plate_Y - SizeY_Harf + ((1f - scaleY) * SizeY_Harf)); } private void DrawChara(double time, float opacity, float X = -1, float Y = -1) { - if (TJAPlayer3.Tx.SongLoading_Plate is null || (X == -1 && Y == -1 ? time <= 680 : false)) return; - var SizeXHarf = TJAPlayer3.Tx.SongLoading_Chara.szTextureSize.Width / 2f; - var SizeY = TJAPlayer3.Tx.SongLoading_Chara.szTextureSize.Height; + if (OpenTaiko.Tx.SongLoading_Plate is null || (X == -1 && Y == -1 ? time <= 680 : false)) return; + var SizeXHarf = OpenTaiko.Tx.SongLoading_Chara.szTextureSize.Width / 2f; + var SizeY = OpenTaiko.Tx.SongLoading_Chara.szTextureSize.Height; if (X == -1 && Y == -1) { - Y = (float)(Math.Sin((time - 680f) * (Math.PI / 320.0)) * TJAPlayer3.Skin.SongLoading_Chara_Move[1]); - X = (float)((time - 680f) / 320.0) * TJAPlayer3.Skin.SongLoading_Chara_Move[0]; + Y = (float)(Math.Sin((time - 680f) * (Math.PI / 320.0)) * OpenTaiko.Skin.SongLoading_Chara_Move[1]); + X = (float)((time - 680f) / 320.0) * OpenTaiko.Skin.SongLoading_Chara_Move[0]; } - TJAPlayer3.Tx.SongLoading_Chara.Opacity = (int)opacity; + OpenTaiko.Tx.SongLoading_Chara.Opacity = (int)opacity; //左キャラ - TJAPlayer3.Tx.SongLoading_Chara.t2D描画(-TJAPlayer3.Skin.SongLoading_Chara_Move[0] + X, Y, new RectangleF(0, 0, SizeXHarf, SizeY)); + OpenTaiko.Tx.SongLoading_Chara.t2D描画(-OpenTaiko.Skin.SongLoading_Chara_Move[0] + X, Y, new RectangleF(0, 0, SizeXHarf, SizeY)); //左キャラ - TJAPlayer3.Tx.SongLoading_Chara.t2D描画(SizeXHarf + TJAPlayer3.Skin.SongLoading_Chara_Move[0] - X, Y, new RectangleF(SizeXHarf, 0, SizeXHarf, SizeY)); + OpenTaiko.Tx.SongLoading_Chara.t2D描画(SizeXHarf + OpenTaiko.Skin.SongLoading_Chara_Move[0] - X, Y, new RectangleF(SizeXHarf, 0, SizeXHarf, SizeY)); } // その他 diff --git a/OpenTaiko/src/Stages/CActFIFOWhite.cs b/OpenTaiko/src/Stages/CActFIFOWhite.cs index 859409c7..726b5b74 100644 --- a/OpenTaiko/src/Stages/CActFIFOWhite.cs +++ b/OpenTaiko/src/Stages/CActFIFOWhite.cs @@ -1,16 +1,16 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActFIFOWhite : CActivity { // メソッド public void tフェードアウト開始() { this.mode = EFIFOモード.フェードアウト; - this.counter = new CCounter(0, 100, 3, TJAPlayer3.Timer); + this.counter = new CCounter(0, 100, 3, OpenTaiko.Timer); } public void tフェードイン開始() { this.mode = EFIFOモード.フェードイン; - this.counter = new CCounter(0, 100, 3, TJAPlayer3.Timer); + this.counter = new CCounter(0, 100, 3, OpenTaiko.Timer); } public void tフェードイン完了() // #25406 2011.6.9 yyagi { @@ -40,13 +40,13 @@ namespace TJAPlayer3 { this.counter.Tick(); // Size clientSize = CDTXMania.app.Window.ClientSize; // #23510 2010.10.31 yyagi: delete as of no one use this any longer. - if (TJAPlayer3.Tx.Tile_Black != null) { - TJAPlayer3.Tx.Tile_Black.Opacity = (this.mode == EFIFOモード.フェードイン) ? (((100 - this.counter.CurrentValue) * 0xff) / 100) : ((this.counter.CurrentValue * 0xff) / 100); - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + if (OpenTaiko.Tx.Tile_Black != null) { + OpenTaiko.Tx.Tile_Black.Opacity = (this.mode == EFIFOモード.フェードイン) ? (((100 - this.counter.CurrentValue) * 0xff) / 100) : ((this.counter.CurrentValue * 0xff) / 100); + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / OpenTaiko.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / OpenTaiko.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); } } } diff --git a/OpenTaiko/src/Stages/CActLVLNFont.cs b/OpenTaiko/src/Stages/CActLVLNFont.cs index 2f3399bd..8ccfea75 100644 --- a/OpenTaiko/src/Stages/CActLVLNFont.cs +++ b/OpenTaiko/src/Stages/CActLVLNFont.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { public class CActLVLNFont : CActivity { // コンストラクタ @@ -59,7 +59,7 @@ namespace TJAPlayer3 { // CActivity 実装 public override void CreateManagedResource() { - this.tx数値 = TJAPlayer3.tテクスチャの生成(CSkin.Path(@"Graphics\ScreenSelect level numbers.png")); + this.tx数値 = OpenTaiko.tテクスチャの生成(CSkin.Path(@"Graphics\ScreenSelect level numbers.png")); base.CreateManagedResource(); } public override void ReleaseManagedResource() { diff --git a/OpenTaiko/src/Stages/CActNewHeya.cs b/OpenTaiko/src/Stages/CActNewHeya.cs index 7436d130..05826e47 100644 --- a/OpenTaiko/src/Stages/CActNewHeya.cs +++ b/OpenTaiko/src/Stages/CActNewHeya.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { class CActNewHeya : CActivity { public bool IsOpend { get; private set; } private CCachedFontRenderer MenuFont; @@ -49,7 +49,7 @@ namespace TJAPlayer3 { switch (selectableInfo) { case SelectableInfo.PlayerSelect: CurrentIndex = 1; - CurrentMaxIndex = TJAPlayer3.ConfigIni.nPlayerCount + 1; + CurrentMaxIndex = OpenTaiko.ConfigIni.nPlayerCount + 1; break; case SelectableInfo.ModeSelect: CurrentIndex = 1; @@ -59,15 +59,15 @@ namespace TJAPlayer3 { CurrentMode = (ModeType)(CurrentIndex - 1); switch (CurrentMode) { case ModeType.Chara: - CurrentMaxIndex = TJAPlayer3.Skin.Characters_Ptn; + CurrentMaxIndex = OpenTaiko.Skin.Characters_Ptn; break; case ModeType.PuchiChara: - CurrentMaxIndex = TJAPlayer3.Skin.Puchichara_Ptn; + CurrentMaxIndex = OpenTaiko.Skin.Puchichara_Ptn; break; case ModeType.DanTitle: { int amount = 1; - if (TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanTitles != null) - amount += TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanTitles.Count; + if (OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanTitles != null) + amount += OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanTitles.Count; this.ttkDanTitles = new TitleTextureKey[amount]; @@ -75,8 +75,8 @@ namespace TJAPlayer3 { this.ttkDanTitles[0] = new TitleTextureKey("新人", this.MenuFont, Color.White, Color.Black, 1000); int idx = 1; - if (TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanTitles != null) { - foreach (var item in TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanTitles) { + if (OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanTitles != null) { + foreach (var item in OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanTitles) { if (item.Value.isGold == true) this.ttkDanTitles[idx] = new TitleTextureKey(item.Key, this.MenuFont, Color.Gold, Color.Black, 1000); else @@ -90,8 +90,8 @@ namespace TJAPlayer3 { break; case ModeType.SubTitle: { int amount = 1; - if (TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles != null) - amount += TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles.Count; + if (OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles != null) + amount += OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles.Count; this.ttkTitles = new TitleTextureKey[amount]; this.titlesKeys = new string[amount]; @@ -101,8 +101,8 @@ namespace TJAPlayer3 { this.titlesKeys[0] = "初心者"; int idx = 1; - if (TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles != null) { - foreach (var item in TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles) { + if (OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles != null) { + foreach (var item in OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles) { this.ttkTitles[idx] = new TitleTextureKey(item.Value.cld.GetString(item.Key), this.MenuFont, Color.Black, Color.Transparent, 1000); this.titlesKeys[idx] = item.Key; idx++; @@ -140,7 +140,7 @@ namespace TJAPlayer3 { } public void Open() { - InFade = new CCounter(0, 255, 1.0, TJAPlayer3.Timer); + InFade = new CCounter(0, 255, 1.0, OpenTaiko.Timer); IsOpend = true; CurrentMode = ModeType.None; @@ -161,23 +161,23 @@ namespace TJAPlayer3 { MenuTitleKeys[3] = new TitleTextureKey(CLangManager.LangInstance.GetString("HEYA_DAN"), MenuFont, Color.White, Color.Black, 9999); MenuTitleKeys[4] = new TitleTextureKey(CLangManager.LangInstance.GetString("HEYA_NAMEPLATE"), MenuFont, Color.White, Color.Black, 9999); - ttkPuchiCharaNames = new TitleTextureKey[TJAPlayer3.Skin.Puchichara_Ptn]; - ttkPuchiCharaAuthors = new TitleTextureKey[TJAPlayer3.Skin.Puchichara_Ptn]; + ttkPuchiCharaNames = new TitleTextureKey[OpenTaiko.Skin.Puchichara_Ptn]; + ttkPuchiCharaAuthors = new TitleTextureKey[OpenTaiko.Skin.Puchichara_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Puchichara_Ptn; i++) { - var textColor = HRarity.tRarityToColor(TJAPlayer3.Tx.Puchichara[i].metadata.Rarity); - ttkPuchiCharaNames[i] = new TitleTextureKey(TJAPlayer3.Tx.Puchichara[i].metadata.tGetName(), this.MenuFont, textColor, Color.Black, 1000); - ttkPuchiCharaAuthors[i] = new TitleTextureKey(TJAPlayer3.Tx.Puchichara[i].metadata.tGetAuthor(), this.MenuFont, Color.White, Color.Black, 1000); + for (int i = 0; i < OpenTaiko.Skin.Puchichara_Ptn; i++) { + var textColor = HRarity.tRarityToColor(OpenTaiko.Tx.Puchichara[i].metadata.Rarity); + ttkPuchiCharaNames[i] = new TitleTextureKey(OpenTaiko.Tx.Puchichara[i].metadata.tGetName(), this.MenuFont, textColor, Color.Black, 1000); + ttkPuchiCharaAuthors[i] = new TitleTextureKey(OpenTaiko.Tx.Puchichara[i].metadata.tGetAuthor(), this.MenuFont, Color.White, Color.Black, 1000); } - ttkCharacterAuthors = new TitleTextureKey[TJAPlayer3.Skin.Characters_Ptn]; - ttkCharacterNames = new TitleTextureKey[TJAPlayer3.Skin.Characters_Ptn]; + ttkCharacterAuthors = new TitleTextureKey[OpenTaiko.Skin.Characters_Ptn]; + ttkCharacterNames = new TitleTextureKey[OpenTaiko.Skin.Characters_Ptn]; - for (int i = 0; i < TJAPlayer3.Skin.Characters_Ptn; i++) { - var textColor = HRarity.tRarityToColor(TJAPlayer3.Tx.Characters[i].metadata.Rarity); - ttkCharacterNames[i] = new TitleTextureKey(TJAPlayer3.Tx.Characters[i].metadata.tGetName(), this.MenuFont, textColor, Color.Black, 1000); - ttkCharacterAuthors[i] = new TitleTextureKey(TJAPlayer3.Tx.Characters[i].metadata.tGetAuthor(), this.MenuFont, Color.White, Color.Black, 1000); + for (int i = 0; i < OpenTaiko.Skin.Characters_Ptn; i++) { + var textColor = HRarity.tRarityToColor(OpenTaiko.Tx.Characters[i].metadata.Rarity); + ttkCharacterNames[i] = new TitleTextureKey(OpenTaiko.Tx.Characters[i].metadata.tGetName(), this.MenuFont, textColor, Color.Black, 1000); + ttkCharacterAuthors[i] = new TitleTextureKey(OpenTaiko.Tx.Characters[i].metadata.tGetAuthor(), this.MenuFont, Color.White, Color.Black, 1000); } @@ -190,7 +190,7 @@ namespace TJAPlayer3 { } public override void CreateManagedResource() { - this.MenuFont = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Heya_Font_Scale); + this.MenuFont = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Heya_Font_Scale); base.CreateManagedResource(); } @@ -201,18 +201,18 @@ namespace TJAPlayer3 { } public override int Draw() { - if ((TJAPlayer3.Pad.bPressedDGB(EPad.Decide)) || ((TJAPlayer3.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)))) { + if ((OpenTaiko.Pad.bPressedDGB(EPad.Decide)) || ((OpenTaiko.ConfigIni.bEnterがキー割り当てのどこにも使用されていない && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)))) { switch (CurrentState) { case SelectableInfo.PlayerSelect: { switch (CurrentIndex) { case 0: Close(); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); break; default: { - CurrentPlayer = TJAPlayer3.GetActualPlayer(CurrentIndex - 1); + CurrentPlayer = OpenTaiko.GetActualPlayer(CurrentIndex - 1); SetState(SelectableInfo.ModeSelect); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } break; } @@ -222,11 +222,11 @@ namespace TJAPlayer3 { switch (CurrentIndex) { case 0: SetState(SelectableInfo.PlayerSelect); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); + OpenTaiko.Skin.soundCancelSFX.tPlay(); break; default: { SetState(SelectableInfo.Select); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } break; } @@ -241,20 +241,20 @@ namespace TJAPlayer3 { //PuchiChara.tGetPuchiCharaIndexByName(p); //TJAPlayer3.NamePlateConfig.data.PuchiChara[iPlayer] = TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent];// iPuchiCharaCurrent; //TJAPlayer3.NamePlateConfig.tApplyHeyaChanges(); - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.PuchiChara = TJAPlayer3.Skin.Puchicharas_Name[CurrentIndex];// iPuchiCharaCurrent; - TJAPlayer3.SaveFileInstances[CurrentPlayer].tApplyHeyaChanges(); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.Tx.Puchichara[CurrentIndex].welcome.tPlay(); + OpenTaiko.SaveFileInstances[CurrentPlayer].data.PuchiChara = OpenTaiko.Skin.Puchicharas_Name[CurrentIndex];// iPuchiCharaCurrent; + OpenTaiko.SaveFileInstances[CurrentPlayer].tApplyHeyaChanges(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Tx.Puchichara[CurrentIndex].welcome.tPlay(); SetState(SelectableInfo.PlayerSelect); } else if (ess == ESelectStatus.SUCCESS) { //TJAPlayer3.NamePlateConfig.data.UnlockedPuchicharas[iPlayer].Add(TJAPlayer3.Skin.Puchicharas_Name[iPuchiCharaCurrent]); //TJAPlayer3.NamePlateConfig.tSpendCoins(TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].unlock.Values[0], iPlayer); - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Add(TJAPlayer3.Skin.Puchicharas_Name[CurrentIndex]); - TJAPlayer3.SaveFileInstances[CurrentPlayer].tSpendCoins(TJAPlayer3.Tx.Puchichara[CurrentIndex].unlock.Values[0]); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Add(OpenTaiko.Skin.Puchicharas_Name[CurrentIndex]); + OpenTaiko.SaveFileInstances[CurrentPlayer].tSpendCoins(OpenTaiko.Tx.Puchichara[CurrentIndex].unlock.Values[0]); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } else { - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } } break; @@ -265,28 +265,28 @@ namespace TJAPlayer3 { //TJAPlayer3.Tx.Loading?.t2D描画(18, 7); // Reload character, a bit time expensive but with a O(N) memory complexity instead of O(N * M) - TJAPlayer3.Tx.ReloadCharacter(TJAPlayer3.SaveFileInstances[CurrentPlayer].data.Character, CurrentIndex, CurrentPlayer); - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.Character = CurrentIndex; + OpenTaiko.Tx.ReloadCharacter(OpenTaiko.SaveFileInstances[CurrentPlayer].data.Character, CurrentIndex, CurrentPlayer); + OpenTaiko.SaveFileInstances[CurrentPlayer].data.Character = CurrentIndex; // Update the character - TJAPlayer3.SaveFileInstances[CurrentPlayer].tUpdateCharacterName(TJAPlayer3.Skin.Characters_DirName[CurrentIndex]); + OpenTaiko.SaveFileInstances[CurrentPlayer].tUpdateCharacterName(OpenTaiko.Skin.Characters_DirName[CurrentIndex]); // Welcome voice using Sanka - TJAPlayer3.Skin.soundDecideSFX.tPlay(); - TJAPlayer3.Skin.voiceTitleSanka[CurrentPlayer]?.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.voiceTitleSanka[CurrentPlayer]?.tPlay(); CMenuCharacter.tMenuResetTimer(CMenuCharacter.ECharacterAnimation.NORMAL); - TJAPlayer3.SaveFileInstances[CurrentPlayer].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[CurrentPlayer].tApplyHeyaChanges(); SetState(SelectableInfo.PlayerSelect); CurrentMode = ModeType.None; } else if (ess == ESelectStatus.SUCCESS) { - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedCharacters.Add(TJAPlayer3.Skin.Characters_DirName[CurrentIndex]); - TJAPlayer3.SaveFileInstances[CurrentPlayer].tSpendCoins(TJAPlayer3.Tx.Characters[CurrentIndex].unlock.Values[0]); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.SaveFileInstances[CurrentPlayer].data.UnlockedCharacters.Add(OpenTaiko.Skin.Characters_DirName[CurrentIndex]); + OpenTaiko.SaveFileInstances[CurrentPlayer].tSpendCoins(OpenTaiko.Tx.Characters[CurrentIndex].unlock.Values[0]); + OpenTaiko.Skin.soundDecideSFX.tPlay(); } else { - TJAPlayer3.Skin.soundError.tPlay(); + OpenTaiko.Skin.soundError.tPlay(); } } break; @@ -295,38 +295,38 @@ namespace TJAPlayer3 { int cs = 0; if (CurrentIndex > 0) { - iG = TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanTitles[this.ttkDanTitles[CurrentIndex].str文字].isGold; - cs = TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanTitles[this.ttkDanTitles[CurrentIndex].str文字].clearStatus; + iG = OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanTitles[this.ttkDanTitles[CurrentIndex].str].isGold; + cs = OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanTitles[this.ttkDanTitles[CurrentIndex].str].clearStatus; } - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.Dan = this.ttkDanTitles[CurrentIndex].str文字; - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanGold = iG; - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanType = cs; + OpenTaiko.SaveFileInstances[CurrentPlayer].data.Dan = this.ttkDanTitles[CurrentIndex].str; + OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanGold = iG; + OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanType = cs; - TJAPlayer3.NamePlate.tNamePlateRefreshTitles(CurrentPlayer); + OpenTaiko.NamePlate.tNamePlateRefreshTitles(CurrentPlayer); - TJAPlayer3.SaveFileInstances[CurrentPlayer].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[CurrentPlayer].tApplyHeyaChanges(); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); SetState(SelectableInfo.PlayerSelect); } break; case ModeType.SubTitle: { - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.Title = this.ttkTitles[CurrentIndex].str文字; + OpenTaiko.SaveFileInstances[CurrentPlayer].data.Title = this.ttkTitles[CurrentIndex].str; - if (TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles != null - && TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles.ContainsKey(this.titlesKeys[CurrentIndex])) - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.TitleType = TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles[this.titlesKeys[CurrentIndex]].iType; + if (OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles != null + && OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles.ContainsKey(this.titlesKeys[CurrentIndex])) + OpenTaiko.SaveFileInstances[CurrentPlayer].data.TitleType = OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles[this.titlesKeys[CurrentIndex]].iType; else if (CurrentIndex == 0) - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.TitleType = 0; + OpenTaiko.SaveFileInstances[CurrentPlayer].data.TitleType = 0; else - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.TitleType = -1; + OpenTaiko.SaveFileInstances[CurrentPlayer].data.TitleType = -1; - TJAPlayer3.NamePlate.tNamePlateRefreshTitles(CurrentPlayer); + OpenTaiko.NamePlate.tNamePlateRefreshTitles(CurrentPlayer); - TJAPlayer3.SaveFileInstances[CurrentPlayer].tApplyHeyaChanges(); + OpenTaiko.SaveFileInstances[CurrentPlayer].tApplyHeyaChanges(); - TJAPlayer3.Skin.soundDecideSFX.tPlay(); + OpenTaiko.Skin.soundDecideSFX.tPlay(); SetState(SelectableInfo.PlayerSelect); } break; @@ -334,28 +334,28 @@ namespace TJAPlayer3 { } break; } - } else if ((TJAPlayer3.Pad.bPressedDGB(EPad.Cancel) || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape))) { + } else if ((OpenTaiko.Pad.bPressedDGB(EPad.Cancel) || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape))) { Close(); - TJAPlayer3.Skin.soundCancelSFX.tPlay(); - } else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) - || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { + OpenTaiko.Skin.soundCancelSFX.tPlay(); + } else if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.LeftChange) + || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.LeftArrow)) { ChangeIndex(-1); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); - } else if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) - || TJAPlayer3.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { + OpenTaiko.Skin.soundChangeSFX.tPlay(); + } else if (OpenTaiko.Pad.bPressed(EInstrumentPad.DRUMS, EPad.RightChange) + || OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.RightArrow)) { ChangeIndex(1); - TJAPlayer3.Skin.soundChangeSFX.tPlay(); + OpenTaiko.Skin.soundChangeSFX.tPlay(); } InFade.Tick(); - if (TJAPlayer3.Tx.Tile_Black != null) { - TJAPlayer3.Tx.Tile_Black.Opacity = InFade.CurrentValue / 2; - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + if (OpenTaiko.Tx.Tile_Black != null) { + OpenTaiko.Tx.Tile_Black.Opacity = InFade.CurrentValue / 2; + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / OpenTaiko.Tx.Tile_Black.szTextureSize.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / OpenTaiko.Tx.Tile_Black.szTextureSize.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画(i * TJAPlayer3.Tx.Tile_Black.szTextureSize.Width, j * TJAPlayer3.Tx.Tile_Black.szTextureSize.Height); + OpenTaiko.Tx.Tile_Black.t2D描画(i * OpenTaiko.Tx.Tile_Black.szTextureSize.Width, j * OpenTaiko.Tx.Tile_Black.szTextureSize.Height); } } } @@ -364,128 +364,128 @@ namespace TJAPlayer3 { switch (CurrentState) { case SelectableInfo.PlayerSelect: if (CurrentIndex == 0) { - TJAPlayer3.Tx.NewHeya_Close_Select.t2D描画(TJAPlayer3.Skin.SongSelect_NewHeya_Close_Select[0], TJAPlayer3.Skin.SongSelect_NewHeya_Close_Select[1]); + OpenTaiko.Tx.NewHeya_Close_Select.t2D描画(OpenTaiko.Skin.SongSelect_NewHeya_Close_Select[0], OpenTaiko.Skin.SongSelect_NewHeya_Close_Select[1]); } else { - TJAPlayer3.Tx.NewHeya_PlayerPlate_Select.t2D描画(TJAPlayer3.Skin.SongSelect_NewHeya_PlayerPlate_X[CurrentIndex - 1], TJAPlayer3.Skin.SongSelect_NewHeya_PlayerPlate_Y[CurrentIndex - 1]); + OpenTaiko.Tx.NewHeya_PlayerPlate_Select.t2D描画(OpenTaiko.Skin.SongSelect_NewHeya_PlayerPlate_X[CurrentIndex - 1], OpenTaiko.Skin.SongSelect_NewHeya_PlayerPlate_Y[CurrentIndex - 1]); } break; case SelectableInfo.ModeSelect: { - TJAPlayer3.Tx.NewHeya_ModeBar_Select.t2D描画(TJAPlayer3.Skin.SongSelect_NewHeya_ModeBar_X[CurrentIndex], TJAPlayer3.Skin.SongSelect_NewHeya_ModeBar_Y[CurrentIndex]); + OpenTaiko.Tx.NewHeya_ModeBar_Select.t2D描画(OpenTaiko.Skin.SongSelect_NewHeya_ModeBar_X[CurrentIndex], OpenTaiko.Skin.SongSelect_NewHeya_ModeBar_Y[CurrentIndex]); } break; case SelectableInfo.Select: { switch (CurrentMode) { case ModeType.Chara: - for (int i = 1; i < TJAPlayer3.Skin.SongSelect_NewHeya_Box_Count - 1; i++) { - int x = TJAPlayer3.Skin.SongSelect_NewHeya_Box_X[i]; - int y = TJAPlayer3.Skin.SongSelect_NewHeya_Box_Y[i]; - int index = i - (TJAPlayer3.Skin.SongSelect_NewHeya_Box_Count / 2) + CurrentIndex; + for (int i = 1; i < OpenTaiko.Skin.SongSelect_NewHeya_Box_Count - 1; i++) { + int x = OpenTaiko.Skin.SongSelect_NewHeya_Box_X[i]; + int y = OpenTaiko.Skin.SongSelect_NewHeya_Box_Y[i]; + int index = i - (OpenTaiko.Skin.SongSelect_NewHeya_Box_Count / 2) + CurrentIndex; while (index < 0) { index += CurrentMaxIndex; } while (index >= CurrentMaxIndex) { index -= CurrentMaxIndex; } - TJAPlayer3.Tx.NewHeya_Box.t2D描画(x, y); + OpenTaiko.Tx.NewHeya_Box.t2D描画(x, y); float charaRatioX = 1.0f; float charaRatioY = 1.0f; - if (TJAPlayer3.Skin.Characters_Resolution[index] != null) { - charaRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[index][0]; - charaRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[index][1]; + if (OpenTaiko.Skin.Characters_Resolution[index] != null) { + charaRatioX = OpenTaiko.Skin.Resolution[0] / (float)OpenTaiko.Skin.Characters_Resolution[index][0]; + charaRatioY = OpenTaiko.Skin.Resolution[1] / (float)OpenTaiko.Skin.Characters_Resolution[index][1]; } - if (TJAPlayer3.Tx.Characters_Heya_Preview[index] != null) { - TJAPlayer3.Tx.Characters_Heya_Preview[index].vcScaleRatio.X = charaRatioX; - TJAPlayer3.Tx.Characters_Heya_Preview[index].vcScaleRatio.Y = charaRatioY; + if (OpenTaiko.Tx.Characters_Heya_Preview[index] != null) { + OpenTaiko.Tx.Characters_Heya_Preview[index].vcScaleRatio.X = charaRatioX; + OpenTaiko.Tx.Characters_Heya_Preview[index].vcScaleRatio.Y = charaRatioY; } - TJAPlayer3.Tx.Characters_Heya_Preview[index]?.t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Chara_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Chara_Offset[1]); - TJAPlayer3.Tx.Characters_Heya_Preview[index]?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Characters_Heya_Preview[index]?.t2D拡大率考慮中央基準描画(x + OpenTaiko.Skin.SongSelect_NewHeya_Box_Chara_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_Box_Chara_Offset[1]); + OpenTaiko.Tx.Characters_Heya_Preview[index]?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); if (ttkCharacterNames[index] != null) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(ttkCharacterNames[index]); - tmpTex.t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Name_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Name_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.SongSelect_NewHeya_Box_Name_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_Box_Name_Offset[1]); } if (ttkCharacterAuthors[index] != null) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(ttkCharacterAuthors[index]); - tmpTex.t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Author_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Author_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.SongSelect_NewHeya_Box_Author_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_Box_Author_Offset[1]); } - if (TJAPlayer3.Tx.Characters[index].unlock != null - && !TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedCharacters.Contains(TJAPlayer3.Skin.Characters_DirName[index])) { - TJAPlayer3.Tx.NewHeya_Lock?.t2D描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Lock_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Lock_Offset[1]); + if (OpenTaiko.Tx.Characters[index].unlock != null + && !OpenTaiko.SaveFileInstances[CurrentPlayer].data.UnlockedCharacters.Contains(OpenTaiko.Skin.Characters_DirName[index])) { + OpenTaiko.Tx.NewHeya_Lock?.t2D描画(x + OpenTaiko.Skin.SongSelect_NewHeya_Lock_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_Lock_Offset[1]); if (this.ttkInfoSection != null) TitleTextureKey.ResolveTitleTexture(this.ttkInfoSection) - .t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[1]); + .t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.SongSelect_NewHeya_InfoSection_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_InfoSection_Offset[1]); } } break; case ModeType.PuchiChara: - for (int i = 1; i < TJAPlayer3.Skin.SongSelect_NewHeya_Box_Count - 1; i++) { - int x = TJAPlayer3.Skin.SongSelect_NewHeya_Box_X[i]; - int y = TJAPlayer3.Skin.SongSelect_NewHeya_Box_Y[i]; - int index = i - (TJAPlayer3.Skin.SongSelect_NewHeya_Box_Count / 2) + CurrentIndex; + for (int i = 1; i < OpenTaiko.Skin.SongSelect_NewHeya_Box_Count - 1; i++) { + int x = OpenTaiko.Skin.SongSelect_NewHeya_Box_X[i]; + int y = OpenTaiko.Skin.SongSelect_NewHeya_Box_Y[i]; + int index = i - (OpenTaiko.Skin.SongSelect_NewHeya_Box_Count / 2) + CurrentIndex; while (index < 0) { index += CurrentMaxIndex; } while (index >= CurrentMaxIndex) { index -= CurrentMaxIndex; } - TJAPlayer3.Tx.NewHeya_Box.t2D描画(x, y); + OpenTaiko.Tx.NewHeya_Box.t2D描画(x, y); int puriColumn = index % 5; int puriRow = index / 5; - if (TJAPlayer3.Tx.Puchichara[index].tx != null) { - float puchiScale = TJAPlayer3.Skin.Resolution[1] / 1080.0f; + if (OpenTaiko.Tx.Puchichara[index].tx != null) { + float puchiScale = OpenTaiko.Skin.Resolution[1] / 1080.0f; - TJAPlayer3.Tx.Puchichara[index].tx.vcScaleRatio.X = puchiScale; - TJAPlayer3.Tx.Puchichara[index].tx.vcScaleRatio.Y = puchiScale; + OpenTaiko.Tx.Puchichara[index].tx.vcScaleRatio.X = puchiScale; + OpenTaiko.Tx.Puchichara[index].tx.vcScaleRatio.Y = puchiScale; } - TJAPlayer3.Tx.Puchichara[index].tx?.t2D拡大率考慮中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Chara_Offset[0], - y + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Chara_Offset[1] + (int)(TJAPlayer3.stageSongSelect.PuchiChara.sineY), - new Rectangle((TJAPlayer3.stageSongSelect.PuchiChara.Counter.CurrentValue + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0], - puriRow * TJAPlayer3.Skin.Game_PuchiChara[1], - TJAPlayer3.Skin.Game_PuchiChara[0], - TJAPlayer3.Skin.Game_PuchiChara[1])); + OpenTaiko.Tx.Puchichara[index].tx?.t2D拡大率考慮中央基準描画(x + OpenTaiko.Skin.SongSelect_NewHeya_Box_Chara_Offset[0], + y + OpenTaiko.Skin.SongSelect_NewHeya_Box_Chara_Offset[1] + (int)(OpenTaiko.stageSongSelect.PuchiChara.sineY), + new Rectangle((OpenTaiko.stageSongSelect.PuchiChara.Counter.CurrentValue + 2 * puriColumn) * OpenTaiko.Skin.Game_PuchiChara[0], + puriRow * OpenTaiko.Skin.Game_PuchiChara[1], + OpenTaiko.Skin.Game_PuchiChara[0], + OpenTaiko.Skin.Game_PuchiChara[1])); - TJAPlayer3.Tx.Puchichara[index].tx?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); + OpenTaiko.Tx.Puchichara[index].tx?.tUpdateColor4(CConversion.ColorToColor4(Color.White)); if (ttkCharacterNames[index] != null) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(ttkPuchiCharaNames[index]); - tmpTex.t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Name_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Name_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.SongSelect_NewHeya_Box_Name_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_Box_Name_Offset[1]); } if (ttkCharacterAuthors[index] != null) { CTexture tmpTex = TitleTextureKey.ResolveTitleTexture(ttkPuchiCharaAuthors[index]); - tmpTex.t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Author_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Box_Author_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.SongSelect_NewHeya_Box_Author_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_Box_Author_Offset[1]); } - if (TJAPlayer3.Tx.Puchichara[index].unlock != null - && !TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Contains(TJAPlayer3.Skin.Puchicharas_Name[index])) { - TJAPlayer3.Tx.NewHeya_Lock?.t2D描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Lock_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Lock_Offset[1]); + if (OpenTaiko.Tx.Puchichara[index].unlock != null + && !OpenTaiko.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Contains(OpenTaiko.Skin.Puchicharas_Name[index])) { + OpenTaiko.Tx.NewHeya_Lock?.t2D描画(x + OpenTaiko.Skin.SongSelect_NewHeya_Lock_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_Lock_Offset[1]); if (this.ttkInfoSection != null) TitleTextureKey.ResolveTitleTexture(this.ttkInfoSection) - .t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[1]); + .t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.SongSelect_NewHeya_InfoSection_Offset[0], y + OpenTaiko.Skin.SongSelect_NewHeya_InfoSection_Offset[1]); } } break; case ModeType.SubTitle: - for (int i = 1; i < TJAPlayer3.Skin.SongSelect_NewHeya_Box_Count - 1; i++) { - int x = TJAPlayer3.Skin.SongSelect_NewHeya_Box_X[i]; - int y = TJAPlayer3.Skin.SongSelect_NewHeya_Box_Y[i]; - int index = i - (TJAPlayer3.Skin.SongSelect_NewHeya_Box_Count / 2) + CurrentIndex; + for (int i = 1; i < OpenTaiko.Skin.SongSelect_NewHeya_Box_Count - 1; i++) { + int x = OpenTaiko.Skin.SongSelect_NewHeya_Box_X[i]; + int y = OpenTaiko.Skin.SongSelect_NewHeya_Box_Y[i]; + int index = i - (OpenTaiko.Skin.SongSelect_NewHeya_Box_Count / 2) + CurrentIndex; while (index < 0) { index += CurrentMaxIndex; } @@ -500,30 +500,30 @@ namespace TJAPlayer3 { tmpTex.color4 = CConversion.ColorToColor4(Color.White); } - TJAPlayer3.Tx.NewHeya_Box.t2D描画(x, y); + OpenTaiko.Tx.NewHeya_Box.t2D描画(x, y); - x += TJAPlayer3.Skin.SongSelect_NewHeya_Box_Chara_Offset[0]; - y += TJAPlayer3.Skin.SongSelect_NewHeya_Box_Chara_Offset[1]; + x += OpenTaiko.Skin.SongSelect_NewHeya_Box_Chara_Offset[0]; + y += OpenTaiko.Skin.SongSelect_NewHeya_Box_Chara_Offset[1]; int iType = -1; - if (TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles != null && - TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles.ContainsKey(this.titlesKeys[index])) - iType = TJAPlayer3.SaveFileInstances[CurrentPlayer].data.NamePlateTitles[this.titlesKeys[index]].iType; + if (OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles != null && + OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles.ContainsKey(this.titlesKeys[index])) + iType = OpenTaiko.SaveFileInstances[CurrentPlayer].data.NamePlateTitles[this.titlesKeys[index]].iType; else if (index == 0) iType = 0; - tmpTex.t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[0], y + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[1]); + tmpTex.t2D拡大率考慮上中央基準描画(x + OpenTaiko.Skin.Heya_Side_Menu_Font_Offset[0], y + OpenTaiko.Skin.Heya_Side_Menu_Font_Offset[1]); } break; case ModeType.DanTitle: - for (int i = 1; i < TJAPlayer3.Skin.SongSelect_NewHeya_Box_Count - 1; i++) { - int x = TJAPlayer3.Skin.SongSelect_NewHeya_Box_X[i]; - int y = TJAPlayer3.Skin.SongSelect_NewHeya_Box_Y[i]; - int index = i - (TJAPlayer3.Skin.SongSelect_NewHeya_Box_Count / 2) + CurrentIndex; + for (int i = 1; i < OpenTaiko.Skin.SongSelect_NewHeya_Box_Count - 1; i++) { + int x = OpenTaiko.Skin.SongSelect_NewHeya_Box_X[i]; + int y = OpenTaiko.Skin.SongSelect_NewHeya_Box_Y[i]; + int index = i - (OpenTaiko.Skin.SongSelect_NewHeya_Box_Count / 2) + CurrentIndex; while (index < 0) { index += CurrentMaxIndex; } @@ -534,20 +534,20 @@ namespace TJAPlayer3 { if (i != 0) { tmpTex.color4 = CConversion.ColorToColor4(Color.DarkGray); - TJAPlayer3.Tx.NamePlateBase.color4 = CConversion.ColorToColor4(Color.DarkGray); + OpenTaiko.Tx.NamePlateBase.color4 = CConversion.ColorToColor4(Color.DarkGray); } else { tmpTex.color4 = CConversion.ColorToColor4(Color.White); - TJAPlayer3.Tx.NamePlateBase.color4 = CConversion.ColorToColor4(Color.White); + OpenTaiko.Tx.NamePlateBase.color4 = CConversion.ColorToColor4(Color.White); } - TJAPlayer3.Tx.NewHeya_Box.t2D描画(x, y); + OpenTaiko.Tx.NewHeya_Box.t2D描画(x, y); - x += TJAPlayer3.Skin.SongSelect_NewHeya_Box_Chara_Offset[0]; - y += TJAPlayer3.Skin.SongSelect_NewHeya_Box_Chara_Offset[1]; + x += OpenTaiko.Skin.SongSelect_NewHeya_Box_Chara_Offset[0]; + y += OpenTaiko.Skin.SongSelect_NewHeya_Box_Chara_Offset[1]; int danGrade = 0; if (index > 0) { - danGrade = TJAPlayer3.SaveFileInstances[CurrentPlayer].data.DanTitles[this.ttkDanTitles[index].str文字].clearStatus; + danGrade = OpenTaiko.SaveFileInstances[CurrentPlayer].data.DanTitles[this.ttkDanTitles[index].str].clearStatus; } /* @@ -566,16 +566,16 @@ namespace TJAPlayer3 { break; } - TJAPlayer3.Tx.NewHeya_Close.t2D描画(0, 0); + OpenTaiko.Tx.NewHeya_Close.t2D描画(0, 0); - for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) { - TJAPlayer3.Tx.NewHeya_PlayerPlate[TJAPlayer3.GetActualPlayer(i)].t2D描画(TJAPlayer3.Skin.SongSelect_NewHeya_PlayerPlate_X[i], TJAPlayer3.Skin.SongSelect_NewHeya_PlayerPlate_Y[i]); + for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { + OpenTaiko.Tx.NewHeya_PlayerPlate[OpenTaiko.GetActualPlayer(i)].t2D描画(OpenTaiko.Skin.SongSelect_NewHeya_PlayerPlate_X[i], OpenTaiko.Skin.SongSelect_NewHeya_PlayerPlate_Y[i]); } for (int i = 0; i < 5; i++) { - TJAPlayer3.Tx.NewHeya_ModeBar.t2D描画(TJAPlayer3.Skin.SongSelect_NewHeya_ModeBar_X[i], TJAPlayer3.Skin.SongSelect_NewHeya_ModeBar_Y[i]); - int title_x = TJAPlayer3.Skin.SongSelect_NewHeya_ModeBar_X[i] + TJAPlayer3.Skin.SongSelect_NewHeya_ModeBar_Font_Offset[0]; - int title_y = TJAPlayer3.Skin.SongSelect_NewHeya_ModeBar_Y[i] + TJAPlayer3.Skin.SongSelect_NewHeya_ModeBar_Font_Offset[1]; + OpenTaiko.Tx.NewHeya_ModeBar.t2D描画(OpenTaiko.Skin.SongSelect_NewHeya_ModeBar_X[i], OpenTaiko.Skin.SongSelect_NewHeya_ModeBar_Y[i]); + int title_x = OpenTaiko.Skin.SongSelect_NewHeya_ModeBar_X[i] + OpenTaiko.Skin.SongSelect_NewHeya_ModeBar_Font_Offset[0]; + int title_y = OpenTaiko.Skin.SongSelect_NewHeya_ModeBar_Y[i] + OpenTaiko.Skin.SongSelect_NewHeya_ModeBar_Font_Offset[1]; TitleTextureKey.ResolveTitleTexture(MenuTitleKeys[i], false).t2D拡大率考慮中央基準描画(title_x, title_y); } @@ -596,9 +596,9 @@ namespace TJAPlayer3 { private ESelectStatus tSelectPuchi() { // Add "If unlocked" to select directly - if (TJAPlayer3.Tx.Puchichara[CurrentIndex].unlock != null - && !TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Contains(TJAPlayer3.Skin.Puchicharas_Name[CurrentIndex])) { - (bool, string?) response = TJAPlayer3.Tx.Puchichara[CurrentIndex].unlock.tConditionMetWrapper(TJAPlayer3.SaveFile); + if (OpenTaiko.Tx.Puchichara[CurrentIndex].unlock != null + && !OpenTaiko.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Contains(OpenTaiko.Skin.Puchicharas_Name[CurrentIndex])) { + (bool, string?) response = OpenTaiko.Tx.Puchichara[CurrentIndex].unlock.tConditionMetWrapper(OpenTaiko.SaveFile); //tConditionMet( //new int[] { TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data.Medals }); @@ -606,7 +606,7 @@ namespace TJAPlayer3 { // Send coins here for the unlock, considering that only coin-paid puchicharas can be unlocked directly from the Heya menu - this.ttkInfoSection = new TitleTextureKey(response.Item2 ?? this.ttkInfoSection.str文字, this.MenuFont, responseColor, Color.Black, 1000); + this.ttkInfoSection = new TitleTextureKey(response.Item2 ?? this.ttkInfoSection.str, this.MenuFont, responseColor, Color.Black, 1000); return (response.Item1) ? ESelectStatus.SUCCESS : ESelectStatus.FAILED; } @@ -618,9 +618,9 @@ namespace TJAPlayer3 { private void tUpdateUnlockableTextPuchi() { #region [Check unlockable] - if (TJAPlayer3.Tx.Puchichara[CurrentIndex].unlock != null - && !TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Contains(TJAPlayer3.Skin.Puchicharas_Name[CurrentIndex])) { - this.ttkInfoSection = new TitleTextureKey(TJAPlayer3.Tx.Puchichara[CurrentIndex].unlock.tConditionMessage() + if (OpenTaiko.Tx.Puchichara[CurrentIndex].unlock != null + && !OpenTaiko.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Contains(OpenTaiko.Skin.Puchicharas_Name[CurrentIndex])) { + this.ttkInfoSection = new TitleTextureKey(OpenTaiko.Tx.Puchichara[CurrentIndex].unlock.tConditionMessage() , this.MenuFont, Color.White, Color.Black, 1000); } else this.ttkInfoSection = null; @@ -630,9 +630,9 @@ namespace TJAPlayer3 { private void tUpdateUnlockableTextChara() { #region [Check unlockable] - if (TJAPlayer3.Tx.Characters[CurrentIndex].unlock != null - && !TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedCharacters.Contains(TJAPlayer3.Skin.Characters_DirName[CurrentIndex])) { - this.ttkInfoSection = new TitleTextureKey(TJAPlayer3.Tx.Characters[CurrentIndex].unlock.tConditionMessage() + if (OpenTaiko.Tx.Characters[CurrentIndex].unlock != null + && !OpenTaiko.SaveFileInstances[CurrentPlayer].data.UnlockedCharacters.Contains(OpenTaiko.Skin.Characters_DirName[CurrentIndex])) { + this.ttkInfoSection = new TitleTextureKey(OpenTaiko.Tx.Characters[CurrentIndex].unlock.tConditionMessage() , this.MenuFont, Color.White, Color.Black, 1000); } else this.ttkInfoSection = null; @@ -643,9 +643,9 @@ namespace TJAPlayer3 { private ESelectStatus tSelectChara() { // Add "If unlocked" to select directly - if (TJAPlayer3.Tx.Characters[CurrentIndex].unlock != null - && !TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedCharacters.Contains(TJAPlayer3.Skin.Characters_DirName[CurrentIndex])) { - (bool, string?) response = TJAPlayer3.Tx.Characters[CurrentIndex].unlock.tConditionMetWrapper(TJAPlayer3.SaveFile); + if (OpenTaiko.Tx.Characters[CurrentIndex].unlock != null + && !OpenTaiko.SaveFileInstances[CurrentPlayer].data.UnlockedCharacters.Contains(OpenTaiko.Skin.Characters_DirName[CurrentIndex])) { + (bool, string?) response = OpenTaiko.Tx.Characters[CurrentIndex].unlock.tConditionMetWrapper(OpenTaiko.SaveFile); //TJAPlayer3.Tx.Characters[iCharacterCurrent].unlock.tConditionMet( //new int[] { TJAPlayer3.SaveFileInstances[TJAPlayer3.SaveFile].data.Medals }); @@ -653,7 +653,7 @@ namespace TJAPlayer3 { // Send coins here for the unlock, considering that only coin-paid puchicharas can be unlocked directly from the Heya menu - this.ttkInfoSection = new TitleTextureKey(response.Item2 ?? this.ttkInfoSection.str文字, this.MenuFont, responseColor, Color.Black, 1000); + this.ttkInfoSection = new TitleTextureKey(response.Item2 ?? this.ttkInfoSection.str, this.MenuFont, responseColor, Color.Black, 1000); return (response.Item1) ? ESelectStatus.SUCCESS : ESelectStatus.FAILED; } diff --git a/OpenTaiko/src/Stages/CActオプションパネル.cs b/OpenTaiko/src/Stages/CActオプションパネル.cs index c6f891dc..2df0e4c1 100644 --- a/OpenTaiko/src/Stages/CActオプションパネル.cs +++ b/OpenTaiko/src/Stages/CActオプションパネル.cs @@ -1,7 +1,7 @@ using System.Drawing; using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { internal class CActオプションパネル : CActivity { // CActivity 実装 @@ -11,16 +11,16 @@ namespace TJAPlayer3 { } } public override void CreateManagedResource() { - this.txオプションパネル = TJAPlayer3.tテクスチャの生成(CSkin.Path(@"Graphics\Screen option panels.png"), false); + this.txオプションパネル = OpenTaiko.tテクスチャの生成(CSkin.Path(@"Graphics\Screen option panels.png"), false); base.CreateManagedResource(); } public override void ReleaseManagedResource() { - TJAPlayer3.tテクスチャの解放(ref this.txオプションパネル); + OpenTaiko.tテクスチャの解放(ref this.txオプションパネル); base.ReleaseManagedResource(); } public override int Draw() { if (!base.IsDeActivated) { - CConfigIni configIni = TJAPlayer3.ConfigIni; + CConfigIni configIni = OpenTaiko.ConfigIni; /* if( this.txオプションパネル != null ) { diff --git a/OpenTaiko/src/Stages/CDTXVmode.cs b/OpenTaiko/src/Stages/CDTXVmode.cs index 13ea649b..b32b9303 100644 --- a/OpenTaiko/src/Stages/CDTXVmode.cs +++ b/OpenTaiko/src/Stages/CDTXVmode.cs @@ -2,7 +2,7 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { public class CDTXVmode { public enum ECommand { Stop, @@ -317,7 +317,7 @@ namespace TJAPlayer3 { /// public void tUpdateConfigIni() { CConfigIni cc = new CConfigIni(); - string path = TJAPlayer3.strEXEのあるフォルダ + "Config.ini"; + string path = OpenTaiko.strEXEのあるフォルダ + "Config.ini"; if (File.Exists(path)) { FileInfo fi = new FileInfo(path); if (fi.Length > 0) // Config.iniが0byteだったなら、読み込まない @@ -334,9 +334,9 @@ namespace TJAPlayer3 { } //cc.nViewerScrollSpeed[0] = TJAPlayer3.ConfigIni.nScrollSpeed[TJAPlayer3.SaveFile]; - cc.bViewerShowDebugStatus = TJAPlayer3.ConfigIni.bDisplayDebugInfo; - cc.bViewerVSyncWait = TJAPlayer3.ConfigIni.bEnableVSync; - cc.bViewerTimeStretch = TJAPlayer3.ConfigIni.bTimeStretch; + cc.bViewerShowDebugStatus = OpenTaiko.ConfigIni.bDisplayDebugInfo; + cc.bViewerVSyncWait = OpenTaiko.ConfigIni.bEnableVSync; + cc.bViewerTimeStretch = OpenTaiko.ConfigIni.bTimeStretch; cc.bViewerDrums有効 = true; cc.t書き出し(path); diff --git a/OpenTaiko/src/Stages/CNamePlate.cs b/OpenTaiko/src/Stages/CNamePlate.cs index e7e14fc5..db2b8c20 100644 --- a/OpenTaiko/src/Stages/CNamePlate.cs +++ b/OpenTaiko/src/Stages/CNamePlate.cs @@ -1,4 +1,4 @@ -namespace TJAPlayer3 { +namespace OpenTaiko { class CNamePlate { public CLuaNamePlateScript lcNamePlate { get; private set; } public void RefleshSkin() { @@ -12,17 +12,17 @@ public CNamePlate() { for (int player = 0; player < 5; player++) { - if (TJAPlayer3.SaveFileInstances[player].data.DanType < 0) TJAPlayer3.SaveFileInstances[player].data.DanType = 0; - else if (TJAPlayer3.SaveFileInstances[player].data.DanType > 2) TJAPlayer3.SaveFileInstances[player].data.DanType = 2; + if (OpenTaiko.SaveFileInstances[player].data.DanType < 0) OpenTaiko.SaveFileInstances[player].data.DanType = 0; + else if (OpenTaiko.SaveFileInstances[player].data.DanType > 2) OpenTaiko.SaveFileInstances[player].data.DanType = 2; - if (TJAPlayer3.SaveFileInstances[player].data.TitleType < 0) TJAPlayer3.SaveFileInstances[player].data.TitleType = 0; + if (OpenTaiko.SaveFileInstances[player].data.TitleType < 0) OpenTaiko.SaveFileInstances[player].data.TitleType = 0; } RefleshSkin(); } public void tNamePlateRefreshTitles(int player) { - int actualPlayer = TJAPlayer3.GetActualPlayer(player); + int actualPlayer = OpenTaiko.GetActualPlayer(player); string[] stages = { "初", "二", "三", "四", "五", "六", "七", "八", "九", "極" }; @@ -30,39 +30,39 @@ string title; string dan; - bool isAI = TJAPlayer3.ConfigIni.bAIBattleMode && player == 1; + bool isAI = OpenTaiko.ConfigIni.bAIBattleMode && player == 1; if (isAI) { name = CLangManager.LangInstance.GetString("AI_NAME"); title = CLangManager.LangInstance.GetString("AI_TITLE"); - dan = stages[Math.Max(0, TJAPlayer3.ConfigIni.nAILevel - 1)] + "面"; + dan = stages[Math.Max(0, OpenTaiko.ConfigIni.nAILevel - 1)] + "面"; } else { - name = TJAPlayer3.SaveFileInstances[actualPlayer].data.Name; - title = TJAPlayer3.SaveFileInstances[actualPlayer].data.Title; - dan = TJAPlayer3.SaveFileInstances[actualPlayer].data.Dan; + name = OpenTaiko.SaveFileInstances[actualPlayer].data.Name; + title = OpenTaiko.SaveFileInstances[actualPlayer].data.Title; + dan = OpenTaiko.SaveFileInstances[actualPlayer].data.Dan; } bIsPrevAI[player] = isAI; - if (TJAPlayer3.SaveFileInstances[player].data.DanGold) - lcNamePlate.SetInfos(player, name, title, $"{dan}", TJAPlayer3.SaveFileInstances[actualPlayer].data); + if (OpenTaiko.SaveFileInstances[player].data.DanGold) + lcNamePlate.SetInfos(player, name, title, $"{dan}", OpenTaiko.SaveFileInstances[actualPlayer].data); else - lcNamePlate.SetInfos(player, name, title, dan, TJAPlayer3.SaveFileInstances[actualPlayer].data); + lcNamePlate.SetInfos(player, name, title, dan, OpenTaiko.SaveFileInstances[actualPlayer].data); } public void tNamePlateDraw(int x, int y, int player, bool bTitle = false, int Opacity = 255) { - float resolutionScaleX = TJAPlayer3.Skin.Resolution[0] / 1280.0f; - float resolutionScaleY = TJAPlayer3.Skin.Resolution[1] / 720.0f; + float resolutionScaleX = OpenTaiko.Skin.Resolution[0] / 1280.0f; + float resolutionScaleY = OpenTaiko.Skin.Resolution[1] / 720.0f; int basePlayer = player; - player = TJAPlayer3.GetActualPlayer(player); + player = OpenTaiko.GetActualPlayer(player); - bool isAI = TJAPlayer3.ConfigIni.bAIBattleMode && basePlayer == 1; + bool isAI = OpenTaiko.ConfigIni.bAIBattleMode && basePlayer == 1; if (bIsPrevAI[basePlayer] != isAI) { tNamePlateRefreshTitles(player); } bIsPrevAI[basePlayer] = isAI; - lcNamePlate.Draw(x, y, Opacity, basePlayer, TJAPlayer3.P1IsBlue() ? 1 : 0); + lcNamePlate.Draw(x, y, Opacity, basePlayer, OpenTaiko.P1IsBlue() ? 1 : 0); } private bool[] bIsPrevAI = new bool[5]; diff --git a/OpenTaiko/src/Stages/CStage.cs b/OpenTaiko/src/Stages/CStage.cs index 3aa66a05..4723081e 100644 --- a/OpenTaiko/src/Stages/CStage.cs +++ b/OpenTaiko/src/Stages/CStage.cs @@ -1,6 +1,6 @@ using FDK; -namespace TJAPlayer3 { +namespace OpenTaiko { public class CStage : CActivity { internal EStage eStageID; public enum EStage { diff --git a/OpenTaiko/src/Stages/XX.Templates/CStageTemplate.cs b/OpenTaiko/src/Stages/XX.Templates/CStageTemplate.cs index 6614a6ac..51e9b7a1 100644 --- a/OpenTaiko/src/Stages/XX.Templates/CStageTemplate.cs +++ b/OpenTaiko/src/Stages/XX.Templates/CStageTemplate.cs @@ -1,5 +1,5 @@ // Minimalist menu class to use for custom menus -namespace TJAPlayer3 { +namespace OpenTaiko { class CStageTemplate : CStage { public CStageTemplate() { base.eStageID = EStage.TEMPLATE;