From 3de86e5b2580e6824c8ae9a0c5d52715d525eb8b Mon Sep 17 00:00:00 2001 From: 0aubsq <0aubsq@gmail.com> Date: Sun, 22 May 2022 01:45:53 +0200 Subject: [PATCH] Separate Doron/Stealth for each player --- TJAPlayer3/Common/CConfigIni.cs | 180 +++++++++++------- TJAPlayer3/Songs/CDTX.cs | 22 ++- .../Stages/05.SongSelect/CActPlayOption.cs | 20 +- .../05.SongSelect/CActSelectQuickConfig.cs | 8 +- .../Stages/06.SongLoading/CStage曲読み込み.cs | 33 +--- TJAPlayer3/Stages/07.Game/CAct演奏AVI.cs | 8 +- .../07.Game/Taiko/CStage演奏ドラム画面.cs | 20 +- TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs | 4 +- .../Stages/07.Game/Taiko/NotesManager.cs | 4 +- TJAPlayer3/Stages/CActオプションパネル.cs | 25 +-- 10 files changed, 164 insertions(+), 160 deletions(-) diff --git a/TJAPlayer3/Common/CConfigIni.cs b/TJAPlayer3/Common/CConfigIni.cs index 4febfbf2..6582d040 100644 --- a/TJAPlayer3/Common/CConfigIni.cs +++ b/TJAPlayer3/Common/CConfigIni.cs @@ -872,7 +872,7 @@ namespace TJAPlayer3 public bool bスクロールモードを上書き = false; public bool bHispeedRandom; - public Eステルスモード eSTEALTH; + public Eステルスモード[] eSTEALTH; public bool bNoInfo; public int nDefaultSongSort; @@ -1460,7 +1460,6 @@ namespace TJAPlayer3 this.bSudden[ i ] = false; this.bHidden[ i ] = false; this.bReverse[ i ] = false; - this.eRandom[ i ] = Eランダムモード.OFF; this.bLight[ i ] = false; this.bLeft[ i ] = false; this.判定文字表示位置[ i ] = E判定文字表示位置.レーン上; @@ -1474,6 +1473,7 @@ namespace TJAPlayer3 for (int i = 0; i < 4; i++) { + this.eRandom[i] = Eランダムモード.OFF; this.nScrollSpeed[i] = 9; this.nTimingZones[i] = 2; } @@ -1557,7 +1557,11 @@ namespace TJAPlayer3 ShowMob = true; ShowPuchiChara = true; - this.eSTEALTH = Eステルスモード.OFF; + this.eSTEALTH = new Eステルスモード[4]; + + for (int i = 0; i < 4; i++) + this.eSTEALTH[i] = Eステルスモード.OFF; + this.bNoInfo = false; //this.bNoMP3Streaming = false; @@ -2098,11 +2102,17 @@ namespace TJAPlayer3 sw.WriteLine( "0:Path, 1:GenreName(AC8～AC14), 2GenreName(AC15～)" ); sw.WriteLine( "DefaultSongSort={0}", this.nDefaultSongSort ); sw.WriteLine(); - sw.WriteLine( "; RANDOMモード(0:OFF, 1:Random, 2:Mirorr 3:SuperRandom, 4:HyperRandom)" ); - sw.WriteLine( "TaikoRandom={0}", (int) this.eRandom.Taiko ); + sw.WriteLine( "; RANDOMモード(0:OFF, 1:Random (Kimagure), 2:Mirror (Abekobe) 3:SuperRandom (Detarame), 4:HyperRandom (Abekobe + Kimagure))" ); + sw.WriteLine( "TaikoRandom1P={0}", (int) this.eRandom[0] ); + sw.WriteLine("TaikoRandom2P={0}", (int)this.eRandom[1]); + sw.WriteLine("TaikoRandom3P={0}", (int)this.eRandom[2]); + sw.WriteLine("TaikoRandom4P={0}", (int)this.eRandom[3]); sw.WriteLine(); sw.WriteLine( "; STEALTHモード(0:OFF, 1:ドロン, 2:ステルス)" ); - sw.WriteLine( "TaikoStealth={0}", (int) this.eSTEALTH ); + sw.WriteLine( "TaikoStealth1P={0}", (int) this.eSTEALTH[0] ); + sw.WriteLine("TaikoStealth2P={0}", (int)this.eSTEALTH[1]); + sw.WriteLine("TaikoStealth3P={0}", (int)this.eSTEALTH[2]); + sw.WriteLine("TaikoStealth4P={0}", (int)this.eSTEALTH[3]); sw.WriteLine(); sw.WriteLine( "; ゲーム(0:OFF, 1:完走!叩ききりまショー!, 2:完走!叩ききりまショー!(激辛) )" ); sw.WriteLine( "GameMode={0}", (int) this.eGameMode ); @@ -2799,76 +2809,76 @@ namespace TJAPlayer3 #region [ [PlayOption] ] //----------------------------- case Eセクション種別.PlayOption: - { - if (str3.Equals("ShowChara")) - { - ShowChara = C変換.bONorOFF(str4[0]); - } - else if( str3.Equals("ShowDancer")) - { - ShowDancer = C変換.bONorOFF(str4[0]); - } - else if (str3.Equals("ShowRunner")) - { - ShowRunner = C変換.bONorOFF(str4[0]); - } - else if (str3.Equals("ShowMob")) - { - ShowMob = C変換.bONorOFF(str4[0]); - } - else if (str3.Equals("ShowFooter")) - { - ShowFooter = C変換.bONorOFF(str4[0]); - } - else if (str3.Equals("ShowPuchiChara")) - { - ShowPuchiChara = C変換.bONorOFF(str4[0]); - } - else if( str3.Equals( "Dark" ) ) + { + if (str3.Equals("ShowChara")) + { + ShowChara = C変換.bONorOFF(str4[0]); + } + else if (str3.Equals("ShowDancer")) + { + ShowDancer = C変換.bONorOFF(str4[0]); + } + else if (str3.Equals("ShowRunner")) + { + ShowRunner = C変換.bONorOFF(str4[0]); + } + else if (str3.Equals("ShowMob")) + { + ShowMob = C変換.bONorOFF(str4[0]); + } + else if (str3.Equals("ShowFooter")) + { + ShowFooter = C変換.bONorOFF(str4[0]); + } + else if (str3.Equals("ShowPuchiChara")) + { + ShowPuchiChara = C変換.bONorOFF(str4[0]); + } + else if (str3.Equals("Dark")) { - this.eDark = (Eダークモード) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, (int) this.eDark ); + this.eDark = (Eダークモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, (int)this.eDark); + } + else if (str3.Equals("ScrollMode")) + { + this.eScrollMode = (EScrollMode)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, 0); } - else if( str3.Equals( "ScrollMode" ) ) - { - this.eScrollMode = ( EScrollMode )C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, 0 ); - } else if (str3.Equals("EnableCountDownTimer")) { this.bEnableCountdownTimer = C変換.bONorOFF(str4[0]); - } + } #region [ Sudden ] - else if( str3.Equals( "DrumsSudden" ) ) + else if (str3.Equals("DrumsSudden")) { - this.bSudden.Drums = C変換.bONorOFF( str4[ 0 ] ); - } + this.bSudden.Drums = C変換.bONorOFF(str4[0]); + } #endregion #region [ Hidden ] - else if( str3.Equals( "DrumsHidden" ) ) + else if (str3.Equals("DrumsHidden")) { - this.bHidden.Drums = C変換.bONorOFF( str4[ 0 ] ); - } + this.bHidden.Drums = C変換.bONorOFF(str4[0]); + } #endregion #region [ Invisible ] - else if ( str3.Equals( "DrumsInvisible" ) ) + else if (str3.Equals("DrumsInvisible")) { - this.eInvisible.Drums = (EInvisible) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, (int) this.eInvisible.Drums ); - } - //else if ( str3.Equals( "InvisibleDisplayTimeMs" ) ) - //{ - // this.nDisplayTimesMs = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 9999999, (int) this.nDisplayTimesMs ); - //} - //else if ( str3.Equals( "InvisibleFadeoutTimeMs" ) ) - //{ - // this.nFadeoutTimeMs = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 9999999, (int) this.nFadeoutTimeMs ); - //} + this.eInvisible.Drums = (EInvisible)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, (int)this.eInvisible.Drums); + } + //else if ( str3.Equals( "InvisibleDisplayTimeMs" ) ) + //{ + // this.nDisplayTimesMs = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 9999999, (int) this.nDisplayTimesMs ); + //} + //else if ( str3.Equals( "InvisibleFadeoutTimeMs" ) ) + //{ + // this.nFadeoutTimeMs = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 9999999, (int) this.nFadeoutTimeMs ); + //} #endregion - else if ( str3.Equals( "DrumsReverse" ) ) + else if (str3.Equals("DrumsReverse")) { - this.bReverse.Drums = C変換.bONorOFF( str4[ 0 ] ); + this.bReverse.Drums = C変換.bONorOFF(str4[0]); } - else if( str3.Equals( "DrumsPosition" ) ) + else if (str3.Equals("DrumsPosition")) { - this.判定文字表示位置.Drums = (E判定文字表示位置) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, (int) this.判定文字表示位置.Drums ); + this.判定文字表示位置.Drums = (E判定文字表示位置)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, (int)this.判定文字表示位置.Drums); } #region [Mods] @@ -2877,7 +2887,7 @@ namespace TJAPlayer3 else if (str3.Equals("DrumsScrollSpeed") || str3.Equals("DrumsScrollSpeed1P")) { - this.nScrollSpeed[0] = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 0x7cf, this.nScrollSpeed[0] ); + this.nScrollSpeed[0] = C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 0x7cf, this.nScrollSpeed[0]); } else if (str3.Equals("DrumsScrollSpeed2P")) { @@ -2979,6 +2989,48 @@ namespace TJAPlayer3 #endregion + #region [Stealh] + + else if (str3.Equals("TaikoStealth1P") || str3.Equals("TaikoStealth")) + { + this.eSTEALTH[0] = (Eステルスモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 3, (int)this.eSTEALTH[0]); + } + else if (str3.Equals("TaikoStealth2P")) + { + this.eSTEALTH[1] = (Eステルスモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 3, (int)this.eSTEALTH[1]); + } + else if (str3.Equals("TaikoStealth3P")) + { + this.eSTEALTH[2] = (Eステルスモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 3, (int)this.eSTEALTH[2]); + } + else if (str3.Equals("TaikoStealth4P")) + { + this.eSTEALTH[3] = (Eステルスモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 3, (int)this.eSTEALTH[3]); + } + + #endregion + + #region [Random/Mirror] + + else if (str3.Equals("TaikoRandom1P") || str3.Equals("TaikoRandom")) + { + this.eRandom[0] = (Eランダムモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 4, (int)this.eRandom[0]); + } + else if (str3.Equals("TaikoRandom2P")) + { + this.eRandom[1] = (Eランダムモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 4, (int)this.eRandom[1]); + } + else if (str3.Equals("TaikoRandom3P")) + { + this.eRandom[2] = (Eランダムモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 4, (int)this.eRandom[2]); + } + else if (str3.Equals("TaikoRandom4P")) + { + this.eRandom[3] = (Eランダムモード)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 4, (int)this.eRandom[3]); + } + + #endregion + #endregion @@ -3048,14 +3100,6 @@ namespace TJAPlayer3 { this.nDefaultSongSort = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, this.nDefaultSongSort ); } - else if( str3.Equals( "TaikoRandom" ) ) - { - this.eRandom.Taiko = (Eランダムモード) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 4, (int) this.eRandom.Taiko ); - } - else if( str3.Equals( "TaikoStealth" ) ) - { - this.eSTEALTH = (Eステルスモード) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 3, (int) this.eSTEALTH ); - } else if( str3.Equals( "GameMode" ) ) { this.eGameMode = (EGame) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, (int) this.eGameMode ); diff --git a/TJAPlayer3/Songs/CDTX.cs b/TJAPlayer3/Songs/CDTX.cs index 62e02fc2..702e0802 100644 --- a/TJAPlayer3/Songs/CDTX.cs +++ b/TJAPlayer3/Songs/CDTX.cs @@ -1698,15 +1698,16 @@ namespace TJAPlayer3 string str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; return new string(new char[] { str[n / 36], str[n % 36] }); } - public void tギターとベースのランダム化(E楽器パート part, Eランダムモード eRandom) - { - } - public void t太鼓チップのランダム化(Eランダムモード eRandom) + + + public void tRandomizeTaikoChips(int player = 0) { //2016.02.11 kairera0467 - //なんだよこのクソ実装は(怒) + Random rnd = new System.Random(); + var eRandom = TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.GetActualPlayer(player)]; + switch (eRandom) { case Eランダムモード.MIRROR: @@ -1734,9 +1735,9 @@ namespace TJAPlayer3 case Eランダムモード.RANDOM: foreach (var chip in this.listChip) { - int n = rnd.Next(50); + int n = rnd.Next(100); - if (n >= 5 && n <= 10) + if (n >= 0 && n <= 20) { switch (chip.nチャンネル番号) { @@ -1761,9 +1762,9 @@ namespace TJAPlayer3 case Eランダムモード.SUPERRANDOM: foreach (var chip in this.listChip) { - int n = rnd.Next(80); + int n = rnd.Next(100); - if (n >= 3 && n <= 43) + if (n >= 0 && n <= 50) { switch (chip.nチャンネル番号) { @@ -1790,7 +1791,7 @@ namespace TJAPlayer3 { int n = rnd.Next(100); - if (n >= 20 && n <= 80) + if (n >= 0 && n <= 80) { switch (chip.nチャンネル番号) { @@ -1816,6 +1817,7 @@ namespace TJAPlayer3 default: break; } + if (eRandom != Eランダムモード.OFF) { #region[ list作成 ] diff --git a/TJAPlayer3/Stages/05.SongSelect/CActPlayOption.cs b/TJAPlayer3/Stages/05.SongSelect/CActPlayOption.cs index ef3ddec1..d1270eea 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActPlayOption.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActPlayOption.cs @@ -420,13 +420,13 @@ namespace TJAPlayer3 #region [ Doron ] - nStealth = (int)TJAPlayer3.ConfigIni.eSTEALTH; + nStealth = (int)TJAPlayer3.ConfigIni.eSTEALTH[actual]; #endregion #region [ Random ] - var rand_ = TJAPlayer3.ConfigIni.eRandom.Taiko; + var rand_ = TJAPlayer3.ConfigIni.eRandom[actual]; if (rand_ == Eランダムモード.HYPERRANDOM) { @@ -547,7 +547,7 @@ namespace TJAPlayer3 #region [ Doron ] - TJAPlayer3.ConfigIni.eSTEALTH = (Eステルスモード)nStealth; + TJAPlayer3.ConfigIni.eSTEALTH[actual] = (Eステルスモード)nStealth; #endregion @@ -555,27 +555,27 @@ namespace TJAPlayer3 if (nRandom == 2 && nAbekobe == 1) { - TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.HYPERRANDOM; + TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.HYPERRANDOM; } else if (nRandom == 2 && nAbekobe == 0) { - TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.SUPERRANDOM; + TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.SUPERRANDOM; } else if (nRandom == 1 && nAbekobe == 1) { - TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.RANDOM; + TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.RANDOM; } else if (nRandom == 1 && nAbekobe == 0) { - TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.RANDOM; + TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.RANDOM; } else if (nRandom == 0 && nAbekobe == 1) { - TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.MIRROR; + TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.MIRROR; } else if (nRandom == 0 && nAbekobe == 0) { - TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.OFF; + TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.OFF; } #endregion @@ -686,7 +686,7 @@ namespace TJAPlayer3 public float tGetDoronFactor(EBalancingType ebt = EBalancingType.SCORE, bool isMenu = false, int actual = 0) { - var _compare = (isMenu) ? nStealth : (int)TJAPlayer3.ConfigIni.eSTEALTH; + var _compare = (isMenu) ? nStealth : (int)TJAPlayer3.ConfigIni.eSTEALTH[actual]; if (ebt == EBalancingType.SCORE || _compare == 0) return 1f; diff --git a/TJAPlayer3/Stages/05.SongSelect/CActSelectQuickConfig.cs b/TJAPlayer3/Stages/05.SongSelect/CActSelectQuickConfig.cs index d3ef5562..457d7e45 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActSelectQuickConfig.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActSelectQuickConfig.cs @@ -74,11 +74,11 @@ namespace TJAPlayer3 "Note: It also changes the songs' pitch." ) ); #endregion #region [ 個別 Sud/Hid ] - l.Add( new CItemList( "ランダム", CItemBase.Eパネル種別.通常, (int) TJAPlayer3.ConfigIni.eRandom.Taiko, + l.Add( new CItemList( "ランダム", CItemBase.Eパネル種別.通常, (int) TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.SaveFile], "いわゆるランダム。\n RANDOM: ちょっと変わる\n MIRROR: あべこべ \n SUPER: そこそこヤバい\n HYPER: 結構ヤバい\nなお、実装は適当な模様", "Guitar chips come randomly.\n\n Part: swapping lanes randomly for each\n measures.\n Super: swapping chip randomly\n Hyper: swapping randomly\n (number of lanes also changes)", new string[] { "OFF", "RANDOM", "あべこべ", "SUPER", "HYPER" } ) ); - l.Add( new CItemList( "ドロン", CItemBase.Eパネル種別.通常, (int) TJAPlayer3.ConfigIni.eSTEALTH, + l.Add( new CItemList( "ドロン", CItemBase.Eパネル種別.通常, (int) TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.SaveFile], "", new string[] { "OFF", "ドロン", "ステルス" } ) ); l.Add( new CItemList( "ゲーム", CItemBase.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eGameMode, @@ -131,10 +131,10 @@ namespace TJAPlayer3 TJAPlayer3.ConfigIni.n演奏速度 = (int) GetObj現在値( (int) EOrder.PlaySpeed ); break; case (int) EOrder.Random: - TJAPlayer3.ConfigIni.eRandom.Taiko = (Eランダムモード)GetIndex( (int)EOrder.Random ); + TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.SaveFile] = (Eランダムモード)GetIndex( (int)EOrder.Random ); break; case (int) EOrder.Stealth: - TJAPlayer3.ConfigIni.eSTEALTH = (Eステルスモード)GetIndex( (int)EOrder.Stealth ); + TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.SaveFile] = (Eステルスモード)GetIndex( (int)EOrder.Stealth ); break; case (int) EOrder.GameMode: EGame game = EGame.OFF; diff --git a/TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs b/TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs index a44c999e..ecf2bb7f 100644 --- a/TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs +++ b/TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs @@ -248,7 +248,7 @@ namespace TJAPlayer3 #endregion this.ct待機.t進行(); - #region [ ESC押下時は選曲画面に戻る ] + #region [ Cancel loading with esc ] if ( tキー入力() ) { if ( this.sd読み込み音 != null ) @@ -367,7 +367,7 @@ namespace TJAPlayer3 } else { - #region [ 段位時の曲読み込み画面　] + #region [ Dan Loading screen　] TJAPlayer3.Tx.SongLoading_Bg_Dan.t2D描画(TJAPlayer3.app.Device, 0, 0 - (ct待機.n現在の値 <= 600 ? ct待機.n現在の値 / 10f : 60)); @@ -488,25 +488,6 @@ namespace TJAPlayer3 } } - //2017.01.28 DD Config.iniに反映しないように変更 - /* - switch( CDTXMania.DTX.nScoreModeTmp ) - { - case 0: - CDTXMania.ConfigIni.nScoreMode = 0; - break; - case 1: - CDTXMania.ConfigIni.nScoreMode = 1; - break; - case 2: - CDTXMania.ConfigIni.nScoreMode = 2; - break; - case -1: - CDTXMania.ConfigIni.nScoreMode = 1; - break; - } - */ - base.eフェーズID = CStage.Eフェーズ.NOWLOADING_WAV読み込み待機; timeBeginLoadWAV = DateTime.Now; return (int) E曲読込画面の戻り値.継続; @@ -550,7 +531,12 @@ namespace TJAPlayer3 { TJAPlayer3.DTX.PlanToAddMixerChannel(); } - TJAPlayer3.DTX.t太鼓チップのランダム化( TJAPlayer3.ConfigIni.eRandom.Taiko ); + + for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) + { + TJAPlayer3.DTX.tRandomizeTaikoChips(i); + } + TJAPlayer3.stage演奏ドラム画面.On活性化(); @@ -611,9 +597,6 @@ namespace TJAPlayer3 // if ( ( nCurrentTime - this.nBGM再生開始時刻 ) > ( this.nBGMの総再生時間ms - 1000 ) ) if ( ( nCurrentTime - this.nBGM再生開始時刻 ) >= ( this.nBGMの総再生時間ms ) ) // #27787 2012.3.10 yyagi 1000ms == フェードイン分の時間 { - if ( !TJAPlayer3.DTXVmode.Enabled ) - { - } base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト; } return (int) E曲読込画面の戻り値.継続; diff --git a/TJAPlayer3/Stages/07.Game/CAct演奏AVI.cs b/TJAPlayer3/Stages/07.Game/CAct演奏AVI.cs index 79eaacb0..e696b07f 100644 --- a/TJAPlayer3/Stages/07.Game/CAct演奏AVI.cs +++ b/TJAPlayer3/Stages/07.Game/CAct演奏AVI.cs @@ -206,7 +206,7 @@ namespace TJAPlayer3 { return 0; } - int time = (int) ( ( CSound管理.rc演奏用タイマ.n現在時刻 - this.n移動開始時刻ms ) * ( ( (double) TJAPlayer3.ConfigIni.n演奏速度 ) / 20.0 ) ); + int time = (int) (( CSound管理.rc演奏用タイマ.n現在時刻 - this.n移動開始時刻ms) * ((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0); int frameNoFromTime = 0; #region[ frameNoFromTime ] @@ -215,7 +215,7 @@ namespace TJAPlayer3 if ( this.fAVIアスペクト比 > 1.77f ) { this.dsBGV.dshow.MediaSeeking.GetPositions(out this.lDshowPosition, out this.lStopPosition); - frameNoFromTime = (int)lDshowPosition; + frameNoFromTime = (int)(lDshowPosition); } else { @@ -223,8 +223,8 @@ namespace TJAPlayer3 } } #endregion - - if ( ( this.n総移動時間ms != 0 ) && ( this.n総移動時間ms < time ) ) + + if ( ( this.n総移動時間ms != 0 ) && ( this.n総移動時間ms < time ) ) { this.n総移動時間ms = 0; this.n移動開始時刻ms = -1; diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs b/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs index 627f90b9..8c4c8aac 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs @@ -195,6 +195,7 @@ namespace TJAPlayer3 this.n待機中の大音符の座標 = 0; this.actGame.t叩ききりまショー_初期化(); base.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stage選曲.n確定された曲の難易度[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stage選曲.n確定された曲の難易度[0]]); + #region [ branch ] for (int i = 0; i < 2; i++) { @@ -282,19 +283,12 @@ namespace TJAPlayer3 this.ct手つなぎ = new CCounter( 0, 60, 20, TJAPlayer3.Timer ); this.ShownLyric2 = 0; - //try - //{ - // this.stream = new StreamWriter("noteTest.txt", false); - //} - //catch (Exception ex) - //{ - // this.stream.Close(); - // this.stream = new StreamWriter("noteTest.txt", false); - //} + // Discord Presence の更新 var endTimeStamp = TJAPlayer3.DTX.listChip.Count == 0 ? 0 - : Discord.GetUnixTime() + (long)TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms / 1000; + : Discord.GetUnixTime() + (long)((TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms / 1000) / (TJAPlayer3.ConfigIni.n演奏速度 / 20f)); + var difficultyName = TJAPlayer3.DifficultyNumberToEnum(TJAPlayer3.stage選曲.n確定された曲の難易度[0]).ToString(); Discord.UpdatePresence(TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stage選曲.r確定された曲.strタイトル @@ -1723,7 +1717,7 @@ namespace TJAPlayer3 #endregion #region[ HIDSUD & STEALTH ] - if( TJAPlayer3.ConfigIni.eSTEALTH == Eステルスモード.STEALTH ) + if( TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == Eステルスモード.STEALTH ) { pChip.bShow = false; } @@ -1853,7 +1847,7 @@ namespace TJAPlayer3 case 0x1A: case 0x1B: { - if (TJAPlayer3.ConfigIni.eSTEALTH == Eステルスモード.OFF && pChip.bShow) + if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == Eステルスモード.OFF && pChip.bShow) { if (nPlayer == 0) { @@ -1986,7 +1980,7 @@ namespace TJAPlayer3 #region[ HIDSUD & STEALTH ] - if (TJAPlayer3.ConfigIni.eSTEALTH == Eステルスモード.STEALTH) + if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == Eステルスモード.STEALTH) { pChip.bShow = false; } diff --git a/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs b/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs index 03bfb980..f46350e1 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs @@ -79,7 +79,7 @@ namespace TJAPlayer3 static private void tDisplayDoronIcon(int x, int y, int player) { - var conf_ = TJAPlayer3.ConfigIni.eSTEALTH; + var conf_ = TJAPlayer3.ConfigIni.eSTEALTH[player]; if (conf_ == Eステルスモード.DORON) TJAPlayer3.Tx.Mod_Doron?.t2D描画(TJAPlayer3.app.Device, x, y); @@ -103,7 +103,7 @@ namespace TJAPlayer3 static private void tDisplayRandomIcon(int x, int y, int player) { - var rand_ = TJAPlayer3.ConfigIni.eRandom.Taiko; + var rand_ = TJAPlayer3.ConfigIni.eRandom[player]; if (rand_ == Eランダムモード.MIRROR) TJAPlayer3.Tx.Mod_Mirror?.t2D描画(TJAPlayer3.app.Device, x, y); diff --git a/TJAPlayer3/Stages/07.Game/Taiko/NotesManager.cs b/TJAPlayer3/Stages/07.Game/Taiko/NotesManager.cs index bdb4eb96..de3f28ab 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/NotesManager.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/NotesManager.cs @@ -250,7 +250,7 @@ namespace TJAPlayer3 // Regular display public static void DisplayNote(int player, int x, int y, CDTX.CChip chip, int frame, int length = 130) { - if (TJAPlayer3.ConfigIni.eSTEALTH != Eステルスモード.OFF || !chip.bShow) + if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(player)] != Eステルスモード.OFF || !chip.bShow) return; EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; @@ -281,7 +281,7 @@ namespace TJAPlayer3 { EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; - if (TJAPlayer3.ConfigIni.eSTEALTH != Eステルスモード.OFF || !chip.bShow || TJAPlayer3.Tx.Notes[(int)_gt] == null) + if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(player)] != Eステルスモード.OFF || !chip.bShow || TJAPlayer3.Tx.Notes[(int)_gt] == null) return; int _offset = IsBigRoll(chip) ? 390 : 0; diff --git a/TJAPlayer3/Stages/CActオプションパネル.cs b/TJAPlayer3/Stages/CActオプションパネル.cs index 00494735..2b1e2bd1 100644 --- a/TJAPlayer3/Stages/CActオプションパネル.cs +++ b/TJAPlayer3/Stages/CActオプションパネル.cs @@ -33,30 +33,10 @@ namespace TJAPlayer3 { Device device = TJAPlayer3.app.Device; CConfigIni configIni = TJAPlayer3.ConfigIni; + /* if( this.txオプションパネル != null ) { - /* - #region [ ScrollSpeed ] - int drums = configIni.nScrollSpeed[TJAPlayer3.SaveFile]; - if( drums > 15 ) - { - drums = 15; - } - this.txオプションパネル.t2D描画( device, 0x171, 12, this.rc譜面スピード[ drums ] ); - int guitar = configIni.nScrollSpeed[TJAPlayer3.SaveFile]; - if( guitar > 15 ) - { - guitar = 15; - } - this.txオプションパネル.t2D描画( device, 0x171, 0x18, this.rc譜面スピード[ guitar ] ); - int bass = configIni.nScrollSpeed[TJAPlayer3.SaveFile]; - if( bass > 15 ) - { - bass = 15; - } - this.txオプションパネル.t2D描画( device, 0x171, 0x24, this.rc譜面スピード[ bass ] ); - #endregion - */ + #region [ Sud/Hid/Invisible ] this.txオプションパネル.t2D描画( device, 0x189, 12, this.rcHS[ ( configIni.bHidden.Drums ? 1 : 0 ) + ( configIni.bSudden.Drums ? 2 : 0 ) + @@ -103,6 +83,7 @@ namespace TJAPlayer3 this.txオプションパネル.t2D描画( device, 0x219, 0x24, this.rcLeft[ configIni.bLeft.Bass ? 1 : 0 ] ); #endregion } + */ } return 0; }