Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-01-31 03:53:44 +01:00
Code Releases Activity

Separate Doron/Stealth for each player

Browse Source
This commit is contained in:
0aubsq 2022-05-22 01:45:53 +02:00
parent a8e5ea6ce4
commit 3de86e5b25
10 changed files with 164 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
TJAPlayer3/Common/CConfigIni.cs
View File

@ -872,7 +872,7 @@ namespace TJAPlayer3
public bool bスクロールモードを上書き = false; public bool bスクロールモードを上書き = false;
public bool bHispeedRandom; public bool bHispeedRandom;
public Eステルスモード eSTEALTH; public Eステルスモード[] eSTEALTH;
public bool bNoInfo; public bool bNoInfo;
public int nDefaultSongSort; public int nDefaultSongSort;
@ -1460,7 +1460,6 @@ namespace TJAPlayer3
this.bSudden[ i ] = false; this.bSudden[ i ] = false;
this.bHidden[ i ] = false; this.bHidden[ i ] = false;
this.bReverse[ i ] = false; this.bReverse[ i ] = false;
this.eRandom[ i ] = Eランダムモード.OFF;
this.bLight[ i ] = false; this.bLight[ i ] = false;
this.bLeft[ i ] = false; this.bLeft[ i ] = false;
this.判定文字表示位置[ i ] = E判定文字表示位置.レーン上; this.判定文字表示位置[ i ] = E判定文字表示位置.レーン上;
@ -1474,6 +1473,7 @@ namespace TJAPlayer3
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
this.eRandom[i] = Eランダムモード.OFF;
this.nScrollSpeed[i] = 9; this.nScrollSpeed[i] = 9;
this.nTimingZones[i] = 2; this.nTimingZones[i] = 2;
} }
@ -1557,7 +1557,11 @@ namespace TJAPlayer3
ShowMob = true; ShowMob = true;
ShowPuchiChara = 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.bNoInfo = false;
//this.bNoMP3Streaming = false; //this.bNoMP3Streaming = false;
@ -2098,11 +2102,17 @@ namespace TJAPlayer3
sw.WriteLine( "0:Path, 1:GenreName(AC8～AC14), 2GenreName(AC15～)" ); sw.WriteLine( "0:Path, 1:GenreName(AC8～AC14), 2GenreName(AC15～)" );
sw.WriteLine( "DefaultSongSort={0}", this.nDefaultSongSort ); sw.WriteLine( "DefaultSongSort={0}", this.nDefaultSongSort );
sw.WriteLine(); sw.WriteLine();
sw.WriteLine( "; RANDOMモード(0:OFF, 1:Random, 2:Mirorr 3:SuperRandom, 4:HyperRandom)" ); sw.WriteLine( "; RANDOMモード(0:OFF, 1:Random (Kimagure), 2:Mirror (Abekobe) 3:SuperRandom (Detarame), 4:HyperRandom (Abekobe + Kimagure))" );
sw.WriteLine( "TaikoRandom={0}", (int) this.eRandom.Taiko ); 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();
sw.WriteLine( "; STEALTHモード(0:OFF, 1:ドロン, 2:ステルス)" ); 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();
sw.WriteLine( "; ゲーム(0:OFF, 1:完走!叩ききりまショー!, 2:完走!叩ききりまショー!(激辛) )" ); sw.WriteLine( "; ゲーム(0:OFF, 1:完走!叩ききりまショー!, 2:完走!叩ききりまショー!(激辛) )" );
sw.WriteLine( "GameMode={0}", (int) this.eGameMode ); sw.WriteLine( "GameMode={0}", (int) this.eGameMode );
@ -2804,7 +2814,7 @@ namespace TJAPlayer3
{ {
ShowChara = C変換.bONorOFF(str4[0]); ShowChara = C変換.bONorOFF(str4[0]);
} }
else if( str3.Equals("ShowDancer")) else if (str3.Equals("ShowDancer"))
{ {
ShowDancer = C変換.bONorOFF(str4[0]); ShowDancer = C変換.bONorOFF(str4[0]);
} }
@ -2824,34 +2834,34 @@ namespace TJAPlayer3
{ {
ShowPuchiChara = C変換.bONorOFF(str4[0]); ShowPuchiChara = C変換.bONorOFF(str4[0]);
} }
else if( str3.Equals( "Dark" ) ) 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" ) ) else if (str3.Equals("ScrollMode"))
{ {
this.eScrollMode = ( EScrollMode )C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, 0 ); this.eScrollMode = (EScrollMode)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, 0);
} }
else if (str3.Equals("EnableCountDownTimer")) else if (str3.Equals("EnableCountDownTimer"))
{ {
this.bEnableCountdownTimer = C変換.bONorOFF(str4[0]); this.bEnableCountdownTimer = C変換.bONorOFF(str4[0]);
} }
#region [ Sudden ] #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 #endregion
#region [ Hidden ] #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 #endregion
#region [ Invisible ] #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 ); this.eInvisible.Drums = (EInvisible)C変換.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, (int)this.eInvisible.Drums);
} }
//else if ( str3.Equals( "InvisibleDisplayTimeMs" ) ) //else if ( str3.Equals( "InvisibleDisplayTimeMs" ) )
//{ //{
@ -2862,13 +2872,13 @@ namespace TJAPlayer3
// this.nFadeoutTimeMs = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 9999999, (int) this.nFadeoutTimeMs ); // this.nFadeoutTimeMs = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 9999999, (int) this.nFadeoutTimeMs );
//} //}
#endregion #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] #region [Mods]
@ -2877,7 +2887,7 @@ namespace TJAPlayer3
else if (str3.Equals("DrumsScrollSpeed") || str3.Equals("DrumsScrollSpeed1P")) 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")) else if (str3.Equals("DrumsScrollSpeed2P"))
{ {
@ -2979,6 +2989,48 @@ namespace TJAPlayer3
#endregion #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 #endregion
@ -3047,14 +3099,6 @@ namespace TJAPlayer3
else if ( str3.Equals( "DefaultSongSort" ) ) else if ( str3.Equals( "DefaultSongSort" ) )
{ {
this.nDefaultSongSort = C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 2, this.nDefaultSongSort ); 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" ) ) else if( str3.Equals( "GameMode" ) )
{ {

22
TJAPlayer3/Songs/CDTX.cs
View File

@ -1698,15 +1698,16 @@ namespace TJAPlayer3
string str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; string str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
return new string(new char[] { str[n / 36], str[n % 36] }); return new string(new char[] { str[n / 36], str[n % 36] });
} }
public void tギターとベースのランダム化(E楽器パート part, Eランダムモード eRandom)
{
} public void tRandomizeTaikoChips(int player = 0)
public void t太鼓チップのランダム化(Eランダムモード eRandom)
{ {
//2016.02.11 kairera0467 //2016.02.11 kairera0467
//なんだよこのクソ実装は(怒)
Random rnd = new System.Random(); Random rnd = new System.Random();
var eRandom = TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.GetActualPlayer(player)];
switch (eRandom) switch (eRandom)
{ {
case Eランダムモード.MIRROR: case Eランダムモード.MIRROR:
@ -1734,9 +1735,9 @@ namespace TJAPlayer3
case Eランダムモード.RANDOM: case Eランダムモード.RANDOM:
foreach (var chip in this.listChip) 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チャンネル番号) switch (chip.nチャンネル番号)
{ {
@ -1761,9 +1762,9 @@ namespace TJAPlayer3
case Eランダムモード.SUPERRANDOM: case Eランダムモード.SUPERRANDOM:
foreach (var chip in this.listChip) 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チャンネル番号) switch (chip.nチャンネル番号)
{ {
@ -1790,7 +1791,7 @@ namespace TJAPlayer3
{ {
int n = rnd.Next(100); int n = rnd.Next(100);
if (n >= 20 && n <= 80) if (n >= 0 && n <= 80)
{ {
switch (chip.nチャンネル番号) switch (chip.nチャンネル番号)
{ {
@ -1816,6 +1817,7 @@ namespace TJAPlayer3
default: default:
break; break;
} }
if (eRandom != Eランダムモード.OFF) if (eRandom != Eランダムモード.OFF)
{ {
#region[ list作成 ] #region[ list作成 ]

20
TJAPlayer3/Stages/05.SongSelect/CActPlayOption.cs
View File

@ -420,13 +420,13 @@ namespace TJAPlayer3
#region [ Doron ] #region [ Doron ]
nStealth = (int)TJAPlayer3.ConfigIni.eSTEALTH; nStealth = (int)TJAPlayer3.ConfigIni.eSTEALTH[actual];
#endregion #endregion
#region [ Random ] #region [ Random ]
var rand_ = TJAPlayer3.ConfigIni.eRandom.Taiko; var rand_ = TJAPlayer3.ConfigIni.eRandom[actual];
if (rand_ == Eランダムモード.HYPERRANDOM) if (rand_ == Eランダムモード.HYPERRANDOM)
{ {
@ -547,7 +547,7 @@ namespace TJAPlayer3
#region [ Doron ] #region [ Doron ]
TJAPlayer3.ConfigIni.eSTEALTH = (Eステルスモード)nStealth; TJAPlayer3.ConfigIni.eSTEALTH[actual] = (Eステルスモード)nStealth;
#endregion #endregion
@ -555,27 +555,27 @@ namespace TJAPlayer3
if (nRandom == 2 && nAbekobe == 1) if (nRandom == 2 && nAbekobe == 1)
{ {
TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.HYPERRANDOM; TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.HYPERRANDOM;
} }
else if (nRandom == 2 && nAbekobe == 0) else if (nRandom == 2 && nAbekobe == 0)
{ {
TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.SUPERRANDOM; TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.SUPERRANDOM;
} }
else if (nRandom == 1 && nAbekobe == 1) else if (nRandom == 1 && nAbekobe == 1)
{ {
TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.RANDOM; TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.RANDOM;
} }
else if (nRandom == 1 && nAbekobe == 0) else if (nRandom == 1 && nAbekobe == 0)
{ {
TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.RANDOM; TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.RANDOM;
} }
else if (nRandom == 0 && nAbekobe == 1) else if (nRandom == 0 && nAbekobe == 1)
{ {
TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.MIRROR; TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.MIRROR;
} }
else if (nRandom == 0 && nAbekobe == 0) else if (nRandom == 0 && nAbekobe == 0)
{ {
TJAPlayer3.ConfigIni.eRandom.Taiko = Eランダムモード.OFF; TJAPlayer3.ConfigIni.eRandom[actual] = Eランダムモード.OFF;
} }
#endregion #endregion
@ -686,7 +686,7 @@ namespace TJAPlayer3
public float tGetDoronFactor(EBalancingType ebt = EBalancingType.SCORE, bool isMenu = false, int actual = 0) 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) if (ebt == EBalancingType.SCORE || _compare == 0)
return 1f; return 1f;

8
TJAPlayer3/Stages/05.SongSelect/CActSelectQuickConfig.cs
View File

@ -74,11 +74,11 @@ namespace TJAPlayer3
"Note: It also changes the songs' pitch." ) ); "Note: It also changes the songs' pitch." ) );
#endregion #endregion
#region [ 個別 Sud/Hid ] #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なお、実装は適当な模様", "いわゆるランダム。\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)", "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" } ) ); 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", "ドロン", "ステルス" } ) ); new string[] { "OFF", "ドロン", "ステルス" } ) );
l.Add( new CItemList( "ゲーム", CItemBase.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eGameMode, l.Add( new CItemList( "ゲーム", CItemBase.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eGameMode,
@ -131,10 +131,10 @@ namespace TJAPlayer3
TJAPlayer3.ConfigIni.n演奏速度 = (int) GetObj現在値( (int) EOrder.PlaySpeed ); TJAPlayer3.ConfigIni.n演奏速度 = (int) GetObj現在値( (int) EOrder.PlaySpeed );
break; break;
case (int) EOrder.Random: case (int) EOrder.Random:
TJAPlayer3.ConfigIni.eRandom.Taiko = (Eランダムモード)GetIndex( (int)EOrder.Random ); TJAPlayer3.ConfigIni.eRandom[TJAPlayer3.SaveFile] = (Eランダムモード)GetIndex( (int)EOrder.Random );
break; break;
case (int) EOrder.Stealth: case (int) EOrder.Stealth:
TJAPlayer3.ConfigIni.eSTEALTH = (Eステルスモード)GetIndex( (int)EOrder.Stealth ); TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.SaveFile] = (Eステルスモード)GetIndex( (int)EOrder.Stealth );
break; break;
case (int) EOrder.GameMode: case (int) EOrder.GameMode:
EGame game = EGame.OFF; EGame game = EGame.OFF;

33
TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs
View File

@ -248,7 +248,7 @@ namespace TJAPlayer3
#endregion #endregion
this.ct待機.t進行(); this.ct待機.t進行();
#region [ ESC押下時は選曲画面に戻る ] #region [ Cancel loading with esc ]
if ( tキー入力() ) if ( tキー入力() )
{ {
if ( this.sd読み込み音 != null ) if ( this.sd読み込み音 != null )
@ -367,7 +367,7 @@ namespace TJAPlayer3
} }
else else
{ {
#region [ 段位時の曲読み込み画面　] #region [ Dan Loading screen　]
TJAPlayer3.Tx.SongLoading_Bg_Dan.t2D描画(TJAPlayer3.app.Device, 0, 0 - (ct待機.n現在の値 <= 600 ? ct待機.n現在の値 / 10f : 60)); 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読み込み待機; base.eフェーズID = CStage.Eフェーズ.NOWLOADING_WAV読み込み待機;
timeBeginLoadWAV = DateTime.Now; timeBeginLoadWAV = DateTime.Now;
return (int) E曲読込画面の戻り値.継続; return (int) E曲読込画面の戻り値.継続;
@ -550,7 +531,12 @@ namespace TJAPlayer3
{ {
TJAPlayer3.DTX.PlanToAddMixerChannel(); 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活性化(); TJAPlayer3.stage演奏ドラム画面.On活性化();
@ -611,9 +597,6 @@ namespace TJAPlayer3
// if ( ( nCurrentTime - this.nBGM再生開始時刻 ) > ( this.nBGMの総再生時間ms - 1000 ) ) // if ( ( nCurrentTime - this.nBGM再生開始時刻 ) > ( this.nBGMの総再生時間ms - 1000 ) )
if ( ( nCurrentTime - this.nBGM再生開始時刻 ) >= ( this.nBGMの総再生時間ms ) ) // #27787 2012.3.10 yyagi 1000ms == フェードイン分の時間 if ( ( nCurrentTime - this.nBGM再生開始時刻 ) >= ( this.nBGMの総再生時間ms ) ) // #27787 2012.3.10 yyagi 1000ms == フェードイン分の時間
{ {
if ( !TJAPlayer3.DTXVmode.Enabled )
{
}
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト; base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
} }
return (int) E曲読込画面の戻り値.継続; return (int) E曲読込画面の戻り値.継続;

4
TJAPlayer3/Stages/07.Game/CAct演奏AVI.cs
View File

@ -206,7 +206,7 @@ namespace TJAPlayer3
{ {
return 0; 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; int frameNoFromTime = 0;
#region[ frameNoFromTime ] #region[ frameNoFromTime ]
@ -215,7 +215,7 @@ namespace TJAPlayer3
if ( this.fAVIアスペクト比 > 1.77f ) if ( this.fAVIアスペクト比 > 1.77f )
{ {
this.dsBGV.dshow.MediaSeeking.GetPositions(out this.lDshowPosition, out this.lStopPosition); this.dsBGV.dshow.MediaSeeking.GetPositions(out this.lDshowPosition, out this.lStopPosition);
frameNoFromTime = (int)lDshowPosition; frameNoFromTime = (int)(lDshowPosition);
} }
else else
{ {

20
TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs
View File

@ -195,6 +195,7 @@ namespace TJAPlayer3
this.n待機中の大音符の座標 = 0; this.n待機中の大音符の座標 = 0;
this.actGame.t叩ききりまショー_初期化(); this.actGame.t叩ききりまショー_初期化();
base.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stage選曲.n確定された曲の難易度[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stage選曲.n確定された曲の難易度[0]]); base.ReSetScore(TJAPlayer3.DTX.nScoreInit[0, TJAPlayer3.stage選曲.n確定された曲の難易度[0]], TJAPlayer3.DTX.nScoreDiff[TJAPlayer3.stage選曲.n確定された曲の難易度[0]]);
#region [ branch ] #region [ branch ]
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
@ -282,19 +283,12 @@ namespace TJAPlayer3
this.ct手つなぎ = new CCounter( 0, 60, 20, TJAPlayer3.Timer ); this.ct手つなぎ = new CCounter( 0, 60, 20, TJAPlayer3.Timer );
this.ShownLyric2 = 0; 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 の更新 // Discord Presence の更新
var endTimeStamp = TJAPlayer3.DTX.listChip.Count == 0 var endTimeStamp = TJAPlayer3.DTX.listChip.Count == 0
? 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(); var difficultyName = TJAPlayer3.DifficultyNumberToEnum(TJAPlayer3.stage選曲.n確定された曲の難易度[0]).ToString();
Discord.UpdatePresence(TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stage選曲.r確定された曲.strタイトル Discord.UpdatePresence(TJAPlayer3.ConfigIni.SendDiscordPlayingInformation ? TJAPlayer3.stage選曲.r確定された曲.strタイトル
@ -1723,7 +1717,7 @@ namespace TJAPlayer3
#endregion #endregion
#region[ HIDSUD & STEALTH ] #region[ HIDSUD & STEALTH ]
if( TJAPlayer3.ConfigIni.eSTEALTH == Eステルスモード.STEALTH ) if( TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == Eステルスモード.STEALTH )
{ {
pChip.bShow = false; pChip.bShow = false;
} }
@ -1853,7 +1847,7 @@ namespace TJAPlayer3
case 0x1A: case 0x1A:
case 0x1B: case 0x1B:
{ {
if (TJAPlayer3.ConfigIni.eSTEALTH == Eステルスモード.OFF && pChip.bShow) if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == Eステルスモード.OFF && pChip.bShow)
{ {
if (nPlayer == 0) if (nPlayer == 0)
{ {
@ -1986,7 +1980,7 @@ namespace TJAPlayer3
#region[ HIDSUD & STEALTH ] #region[ HIDSUD & STEALTH ]
if (TJAPlayer3.ConfigIni.eSTEALTH == Eステルスモード.STEALTH) if (TJAPlayer3.ConfigIni.eSTEALTH[TJAPlayer3.GetActualPlayer(nPlayer)] == Eステルスモード.STEALTH)
{ {
pChip.bShow = false; pChip.bShow = false;
} }

4
TJAPlayer3/Stages/07.Game/Taiko/ModIcons.cs
View File

@ -79,7 +79,7 @@ namespace TJAPlayer3
static private void tDisplayDoronIcon(int x, int y, int player) 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) if (conf_ == Eステルスモード.DORON)
TJAPlayer3.Tx.Mod_Doron?.t2D描画(TJAPlayer3.app.Device, x, y); 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) 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) if (rand_ == Eランダムモード.MIRROR)
TJAPlayer3.Tx.Mod_Mirror?.t2D描画(TJAPlayer3.app.Device, x, y); TJAPlayer3.Tx.Mod_Mirror?.t2D描画(TJAPlayer3.app.Device, x, y);

4
TJAPlayer3/Stages/07.Game/Taiko/NotesManager.cs
View File

@ -250,7 +250,7 @@ namespace TJAPlayer3
// Regular display // Regular display
public static void DisplayNote(int player, int x, int y, CDTX.CChip chip, int frame, int length = 130) 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; return;
EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)];
@ -281,7 +281,7 @@ namespace TJAPlayer3
{ {
EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; 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; return;
int _offset = IsBigRoll(chip) ? 390 : 0; int _offset = IsBigRoll(chip) ? 390 : 0;

25
TJAPlayer3/Stages/CActオプションパネル.cs
View File

@ -33,30 +33,10 @@ namespace TJAPlayer3
{ {
Device device = TJAPlayer3.app.Device; Device device = TJAPlayer3.app.Device;
CConfigIni configIni = TJAPlayer3.ConfigIni; CConfigIni configIni = TJAPlayer3.ConfigIni;
/*
if( this.txオプションパネル != null ) 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 ] #region [ Sud/Hid/Invisible ]
this.txオプションパネル.t2D描画( device, 0x189, 12, this.rcHS[ ( configIni.bHidden.Drums ? 1 : 0 ) + ( configIni.bSudden.Drums ? 2 : 0 ) + 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 ] ); this.txオプションパネル.t2D描画( device, 0x219, 0x24, this.rcLeft[ configIni.bLeft.Bass ? 1 : 0 ] );
#endregion #endregion
} }
*/
} }
return 0; return 0;
} }