Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-30 18:24:32 +01:00
Code Releases Activity

Clean some stinky code

Browse Source
This commit is contained in:
0auBSQ 2024-06-19 04:10:12 +09:00
parent aaf68edbf8
commit abaa830ac1
31 changed files with 291 additions and 1138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
OpenTaiko/src/Common/CConfigIni.cs
View File

@ -1501,7 +1501,7 @@ namespace TJAPlayer3
} }
} }
public bool[] b太鼓パートAutoPlay = new bool[5]; public bool[] bAutoPlay = new bool[5];
public bool bAuto先生の連打; public bool bAuto先生の連打;
public int nRollsPerSec; public int nRollsPerSec;
@ -1577,7 +1577,7 @@ namespace TJAPlayer3
new int[1] { 0 }, new int[1] { 0 },
new int[2] { -100, 100 }, new int[2] { -100, 100 },
new int[3] { -100, 0, 100 }, new int[3] { -100, 0, 100 },
new int[4] { -75, -25, 25, 75 }, new int[4] { -100, -33, 33, 100 },
new int[5] { -100, -50, 0, 50, 100 }, new int[5] { -100, -50, 0, 50, 100 },
}; };
public string[] sSaveFile = new string[5] { "1P", "2P", "3P", "4P", "5P" }; public string[] sSaveFile = new string[5] { "1P", "2P", "3P", "4P", "5P" };
@ -1662,7 +1662,6 @@ namespace TJAPlayer3
public int nGraphicsDeviceType; public int nGraphicsDeviceType;
public int nRisky; // #23559 2011.6.20 yyagi Riskyでの残ミス数。0で閉店 public int nRisky; // #23559 2011.6.20 yyagi Riskyでの残ミス数。0で閉店
public bool bIsAllowedDoubleClickFullscreen; // #26752 2011.11.27 yyagi ダブルクリックしてもフルスクリーンに移行しない public bool bIsAllowedDoubleClickFullscreen; // #26752 2011.11.27 yyagi ダブルクリックしてもフルスクリーンに移行しない
public STAUTOPLAY bAutoPlay;
public int nSoundDeviceType; // #24820 2012.12.23 yyagi 出力サウンドデバイス(0=ACM(にしたいが設計がきつそうならDirectShow), 1=ASIO, 2=WASAPI) public int nSoundDeviceType; // #24820 2012.12.23 yyagi 出力サウンドデバイス(0=ACM(にしたいが設計がきつそうならDirectShow), 1=ASIO, 2=WASAPI)
public int nBassBufferSizeMs; // #24820 2013.1.15 yyagi WASAPIのバッファサイズ public int nBassBufferSizeMs; // #24820 2013.1.15 yyagi WASAPIのバッファサイズ
public int nWASAPIBufferSizeMs; // #24820 2013.1.15 yyagi WASAPIのバッファサイズ public int nWASAPIBufferSizeMs; // #24820 2013.1.15 yyagi WASAPIのバッファサイズ
@ -1696,155 +1695,7 @@ namespace TJAPlayer3
/// DiscordのRitch Presenceに再生中の.tjaファイルの情報を送信するかどうか。 /// DiscordのRitch Presenceに再生中の.tjaファイルの情報を送信するかどうか。
/// </summary> /// </summary>
public bool SendDiscordPlayingInformation; public bool SendDiscordPlayingInformation;
#if false
[StructLayout( LayoutKind.Sequential )]
public struct STAUTOPLAY // C定数のEレーンとindexを一致させること
{
public bool LC; // 0
public bool HH; // 1
public bool SD; // 2
public bool BD; // 3
public bool HT; // 4
public bool LT; // 5
public bool FT; // 6
public bool CY; // 7
public bool RD; // 8
public bool Guitar; // 9 (not used)
public bool Bass; // 10 (not used)
public bool GtR; // 11
public bool GtG; // 12
public bool GtB; // 13
public bool GtPick; // 14
public bool GtW; // 15
public bool BsR; // 16
public bool BsG; // 17
public bool BsB; // 18
public bool BsPick; // 19
public bool BsW; // 20
public bool this[ int index ]
{
get
{
switch ( index )
{
case (int) Eレーン.LC:
return this.LC;
case (int) Eレーン.HH:
return this.HH;
case (int) Eレーン.SD:
return this.SD;
case (int) Eレーン.BD:
return this.BD;
case (int) Eレーン.HT:
return this.HT;
case (int) Eレーン.LT:
return this.LT;
case (int) Eレーン.FT:
return this.FT;
case (int) Eレーン.CY:
return this.CY;
case (int) Eレーン.RD:
return this.RD;
case (int) Eレーン.Guitar:
return this.Guitar;
case (int) Eレーン.Bass:
return this.Bass;
case (int) Eレーン.GtR:
return this.GtR;
case (int) Eレーン.GtG:
return this.GtG;
case (int) Eレーン.GtB:
return this.GtB;
case (int) Eレーン.GtPick:
return this.GtPick;
case (int) Eレーン.GtW:
return this.GtW;
case (int) Eレーン.BsR:
return this.BsR;
case (int) Eレーン.BsG:
return this.BsG;
case (int) Eレーン.BsB:
return this.BsB;
case (int) Eレーン.BsPick:
return this.BsPick;
case (int) Eレーン.BsW:
return this.BsW;
}
throw new IndexOutOfRangeException();
}
set
{
switch ( index )
{
case (int) Eレーン.LC:
this.LC = value;
return;
case (int) Eレーン.HH:
this.HH = value;
return;
case (int) Eレーン.SD:
this.SD = value;
return;
case (int) Eレーン.BD:
this.BD = value;
return;
case (int) Eレーン.HT:
this.HT = value;
return;
case (int) Eレーン.LT:
this.LT = value;
return;
case (int) Eレーン.FT:
this.FT = value;
return;
case (int) Eレーン.CY:
this.CY = value;
return;
case (int) Eレーン.RD:
this.RD = value;
return;
case (int) Eレーン.Guitar:
this.Guitar = value;
return;
case (int) Eレーン.Bass:
this.Bass = value;
return;
case (int) Eレーン.GtR:
this.GtR = value;
return;
case (int) Eレーン.GtG:
this.GtG = value;
return;
case (int) Eレーン.GtB:
this.GtB = value;
return;
case (int) Eレーン.GtPick:
this.GtPick = value;
return;
case (int) Eレーン.GtW:
this.GtW = value;
return;
case (int) Eレーン.BsR:
this.BsR = value;
return;
case (int) Eレーン.BsG:
this.BsG = value;
return;
case (int) Eレーン.BsB:
this.BsB = value;
return;
case (int) Eレーン.BsPick:
this.BsPick = value;
return;
case (int) Eレーン.BsW:
this.BsW = value;
return;
}
throw new IndexOutOfRangeException();
}
}
}
#endif
#region [ STRANGE ] #region [ STRANGE ]
public STRANGE nヒット範囲ms; public STRANGE nヒット範囲ms;
[StructLayout( LayoutKind.Sequential )] [StructLayout( LayoutKind.Sequential )]
@ -2053,24 +1904,6 @@ namespace TJAPlayer3
public CConfigIni() public CConfigIni()
{ {
#if false // #23625 2011.1.11 Config.iniからダメージ/回復値の定数変更を行う場合はここを有効にする 087リリースに合わせ機能無効化
//----------------------------------------
this.fGaugeFactor[0,0] = 0.004f;
this.fGaugeFactor[0,1] = 0.006f;
this.fGaugeFactor[1,0] = 0.002f;
this.fGaugeFactor[1,1] = 0.003f;
this.fGaugeFactor[2,0] = 0.000f;
this.fGaugeFactor[2,1] = 0.000f;
this.fGaugeFactor[3,0] = -0.020f;
this.fGaugeFactor[3,1] = -0.030f;
this.fGaugeFactor[4,0] = -0.050f;
this.fGaugeFactor[4,1] = -0.050f;
this.fDamageLevelFactor[0] = 0.5f;
this.fDamageLevelFactor[1] = 1.0f;
this.fDamageLevelFactor[2] = 1.5f;
//----------------------------------------
#endif
this.strSongsPath = "Songs" + Path.DirectorySeparatorChar; this.strSongsPath = "Songs" + Path.DirectorySeparatorChar;
this.bFullScreen = false; this.bFullScreen = false;
this.bEnableVSync = true; this.bEnableVSync = true;
@ -2160,11 +1993,10 @@ namespace TJAPlayer3
this.nSongSpeed = 20; this.nSongSpeed = 20;
this.b演奏速度が一倍速であるとき以外音声を再生しない = false; this.b演奏速度が一倍速であるとき以外音声を再生しない = false;
#region [ AutoPlay ] #region [ AutoPlay ]
this.bAutoPlay = new STAUTOPLAY();
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
this.b太鼓パートAutoPlay[i] = false; this.bAutoPlay[i] = false;
} }
this.bAuto先生の連打 = true; this.bAuto先生の連打 = true;
#endregion #endregion
@ -2320,18 +2152,6 @@ namespace TJAPlayer3
sw.WriteLine( "[System]" ); sw.WriteLine( "[System]" );
sw.WriteLine(); sw.WriteLine();
#if false // #23625 2011.1.11 Config.iniからダメージ/回復値の定数変更を行う場合はここを有効にする 087リリースに合わせ機能無効化
//------------------------------
sw.WriteLine("; ライフゲージのパラメータ調整(調整完了後削除予定)");
sw.WriteLine("; GaugeFactorD: ドラムのPerfect, Great,... の回復量(ライフMAXを1.0としたときの値を指定)");
sw.WriteLine("; GaugeFactorG: Gt/BsのPerfect, Great,... の回復量(ライフMAXを1.0としたときの値を指定)");
sw.WriteLine("; DamageFactorD: DamageLevelがSmall, Normal, Largeの時に対するダメージ係数");
sw.WriteLine("GaugeFactorD={0}, {1}, {2}, {3}, {4}", this.fGaugeFactor[0, 0], this.fGaugeFactor[1, 0], this.fGaugeFactor[2, 0], this.fGaugeFactor[3, 0], this.fGaugeFactor[4, 0]);
sw.WriteLine("GaugeFactorG={0}, {1}, {2}, {3}, {4}", this.fGaugeFactor[0, 1], this.fGaugeFactor[1, 1], this.fGaugeFactor[2, 1], this.fGaugeFactor[3, 1], this.fGaugeFactor[4, 1]);
sw.WriteLine("DamageFactor={0}, {1}, {2}", this.fDamageLevelFactor[0], this.fDamageLevelFactor[1], fDamageLevelFactor[2]);
sw.WriteLine();
//------------------------------
#endif
#region [ Version ] #region [ Version ]
sw.WriteLine( "; リリースバージョン" ); sw.WriteLine( "; リリースバージョン" );
sw.WriteLine( "; Release Version." ); sw.WriteLine( "; Release Version." );
@ -2670,11 +2490,11 @@ namespace TJAPlayer3
sw.WriteLine("[AutoPlay]"); sw.WriteLine("[AutoPlay]");
sw.WriteLine(); sw.WriteLine();
sw.WriteLine("; 自動演奏(0:OFF, 1:ON)"); sw.WriteLine("; 自動演奏(0:OFF, 1:ON)");
sw.WriteLine("Taiko={0}", this.b太鼓パートAutoPlay[0] ? 1 : 0); sw.WriteLine("Taiko={0}", this.bAutoPlay[0] ? 1 : 0);
sw.WriteLine("Taiko2P={0}", this.b太鼓パートAutoPlay[1] ? 1 : 0); sw.WriteLine("Taiko2P={0}", this.bAutoPlay[1] ? 1 : 0);
sw.WriteLine("Taiko3P={0}", this.b太鼓パートAutoPlay[2] ? 1 : 0); sw.WriteLine("Taiko3P={0}", this.bAutoPlay[2] ? 1 : 0);
sw.WriteLine("Taiko4P={0}", this.b太鼓パートAutoPlay[3] ? 1 : 0); sw.WriteLine("Taiko4P={0}", this.bAutoPlay[3] ? 1 : 0);
sw.WriteLine("Taiko5P={0}", this.b太鼓パートAutoPlay[4] ? 1 : 0); sw.WriteLine("Taiko5P={0}", this.bAutoPlay[4] ? 1 : 0);
sw.WriteLine("TaikoAutoRoll={0}", this.bAuto先生の連打 ? 1 : 0); sw.WriteLine("TaikoAutoRoll={0}", this.bAuto先生の連打 ? 1 : 0);
sw.WriteLine("RollsPerSec={0}", this.nRollsPerSec); sw.WriteLine("RollsPerSec={0}", this.nRollsPerSec);
sw.WriteLine("AILevel={0}", this.nAILevel); sw.WriteLine("AILevel={0}", this.nAILevel);
@ -3561,23 +3381,23 @@ namespace TJAPlayer3
case Eセクション種別.AutoPlay: case Eセクション種別.AutoPlay:
if (str3.Equals("Taiko")) if (str3.Equals("Taiko"))
{ {
this.b太鼓パートAutoPlay[0] = CConversion.bONorOFF(str4[0]); this.bAutoPlay[0] = CConversion.bONorOFF(str4[0]);
} }
else if (str3.Equals("Taiko2P")) else if (str3.Equals("Taiko2P"))
{ {
this.b太鼓パートAutoPlay[1] = CConversion.bONorOFF(str4[0]); this.bAutoPlay[1] = CConversion.bONorOFF(str4[0]);
} }
else if (str3.Equals("Taiko3P")) else if (str3.Equals("Taiko3P"))
{ {
this.b太鼓パートAutoPlay[2] = CConversion.bONorOFF(str4[0]); this.bAutoPlay[2] = CConversion.bONorOFF(str4[0]);
} }
else if (str3.Equals("Taiko4P")) else if (str3.Equals("Taiko4P"))
{ {
this.b太鼓パートAutoPlay[3] = CConversion.bONorOFF(str4[0]); this.bAutoPlay[3] = CConversion.bONorOFF(str4[0]);
} }
else if (str3.Equals("Taiko5P")) else if (str3.Equals("Taiko5P"))
{ {
this.b太鼓パートAutoPlay[4] = CConversion.bONorOFF(str4[0]); this.bAutoPlay[4] = CConversion.bONorOFF(str4[0]);
} }
else if (str3.Equals("TaikoAutoRoll")) else if (str3.Equals("TaikoAutoRoll"))
{ {

259
OpenTaiko/src/Common/C文字コンソール.cs → OpenTaiko/src/Common/CTextConsole.cs
View File

@ -1,133 +1,126 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Drawing; using System.Drawing;
using FDK; using FDK;
namespace TJAPlayer3 namespace TJAPlayer3
{ {
internal class C文字コンソール : CActivity internal class CTextConsole : CActivity
{ {
// 定数 // 定数
public enum Eフォント種別 public enum EFontType
{ {
白, White,
赤, Cyan,
灰, Gray,
白細, WhiteSlim,
赤細, CyanSlim,
灰細 GraySlim
} }
public enum E配置
{ // メソッド
左詰,
中央, public void tPrint( int x, int y, EFontType font, string strAlphanumericString )
右詰 {
} if( !base.IsDeActivated && !string.IsNullOrEmpty( strAlphanumericString ) )
{
int BOL = x;
// メソッド for( int i = 0; i < strAlphanumericString.Length; i++ )
{
public void tPrint( int x, int y, Eフォント種別 font, string str英数字文字列 ) char ch = strAlphanumericString[ i ];
{ if( ch == '\n' )
if( !base.IsDeActivated && !string.IsNullOrEmpty( str英数字文字列 ) ) {
{ x = BOL;
int BOL = x; y += nFontHeight;
for( int i = 0; i < str英数字文字列.Length; i++ ) }
{ else
char ch = str英数字文字列[ i ]; {
if( ch == '\n' ) int index = str表記可能文字.IndexOf( ch );
{ if( index < 0 )
x = BOL; {
y += nFontHeight; x += nFontWidth;
} }
else else
{ {
int index = str表記可能文字.IndexOf( ch ); if( this.txフォント8x16[ (int) ( (int) font / (int) EFontType.WhiteSlim ) ] != null )
if( index < 0 ) {
{ this.txフォント8x16[ (int) ( (int) font / (int) EFontType.WhiteSlim ) ].t2D描画( x, y, this.rc文字の矩形領域[ (int) ( (int) font % (int) EFontType.WhiteSlim ), index ] );
x += nFontWidth; }
} x += nFontWidth;
else }
{ }
if( this.txフォント8x16[ (int) ( (int) font / (int) Eフォント種別.白細 ) ] != null ) }
{ }
this.txフォント8x16[ (int) ( (int) font / (int) Eフォント種別.白細 ) ].t2D描画( x, y, this.rc文字の矩形領域[ (int) ( (int) font % (int) Eフォント種別.白細 ), index ] ); }
}
x += nFontWidth;
} // CActivity 実装
}
} public override void Activate()
} {
} base.Activate();
}
public override void DeActivate()
// CActivity 実装 {
if( this.rc文字の矩形領域 != null )
public override void Activate() this.rc文字の矩形領域 = null;
{
base.Activate(); base.DeActivate();
} }
public override void DeActivate() public override void CreateManagedResource()
{ {
if( this.rc文字の矩形領域 != null ) if( !base.IsDeActivated )
this.rc文字の矩形領域 = null; {
this.txフォント8x16[ 0 ] = TJAPlayer3.Tx.TxC(@"Console_Font.png");
base.DeActivate(); this.txフォント8x16[ 1 ] = TJAPlayer3.Tx.TxC(@"Console_Font_Small.png");
}
public override void CreateManagedResource() nFontWidth = this.txフォント8x16[0].szTextureSize.Width / 32;
{ nFontHeight = this.txフォント8x16[0].szTextureSize.Height / 16;
if( !base.IsDeActivated )
{ this.rc文字の矩形領域 = new Rectangle[3, str表記可能文字.Length];
this.txフォント8x16[ 0 ] = TJAPlayer3.Tx.TxC(@"Console_Font.png"); for (int i = 0; i < 3; i++)
this.txフォント8x16[ 1 ] = TJAPlayer3.Tx.TxC(@"Console_Font_Small.png"); {
for (int j = 0; j < str表記可能文字.Length; j++)
nFontWidth = this.txフォント8x16[0].szTextureSize.Width / 32; {
nFontHeight = this.txフォント8x16[0].szTextureSize.Height / 16; int regionX = nFontWidth * 16, regionY = nFontHeight * 8;
this.rc文字の矩形領域[i, j].X = ((i / 2) * regionX) + ((j % 16) * nFontWidth);
this.rc文字の矩形領域 = new Rectangle[3, str表記可能文字.Length]; this.rc文字の矩形領域[i, j].Y = ((i % 2) * regionY) + ((j / 16) * nFontHeight);
for (int i = 0; i < 3; i++) this.rc文字の矩形領域[i, j].Width = nFontWidth;
{ this.rc文字の矩形領域[i, j].Height = nFontHeight;
for (int j = 0; j < str表記可能文字.Length; j++) }
{ }
int regionX = nFontWidth * 16, regionY = nFontHeight * 8;
this.rc文字の矩形領域[i, j].X = ((i / 2) * regionX) + ((j % 16) * nFontWidth); base.CreateManagedResource();
this.rc文字の矩形領域[i, j].Y = ((i % 2) * regionY) + ((j / 16) * nFontHeight); }
this.rc文字の矩形領域[i, j].Width = nFontWidth; }
this.rc文字の矩形領域[i, j].Height = nFontHeight; public override void ReleaseManagedResource()
} {
} if( !base.IsDeActivated )
{
base.CreateManagedResource(); for( int i = 0; i < 2; i++ )
} {
} if( this.txフォント8x16[ i ] != null )
public override void ReleaseManagedResource() {
{ this.txフォント8x16[ i ].Dispose();
if( !base.IsDeActivated ) this.txフォント8x16[ i ] = null;
{ }
for( int i = 0; i < 2; i++ ) }
{ base.ReleaseManagedResource();
if( this.txフォント8x16[ i ] != null ) }
{ }
this.txフォント8x16[ i ].Dispose();
this.txフォント8x16[ i ] = null;
} // その他
}
base.ReleaseManagedResource(); #region [ private ]
} //-----------------
} private Rectangle[,] rc文字の矩形領域;
private const string str表記可能文字 = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ";
public int nFontWidth = 8, nFontHeight = 16;
// その他 private CTexture[] txフォント8x16 = new CTexture[ 2 ];
//-----------------
#region [ private ] #endregion
//----------------- }
private Rectangle[,] rc文字の矩形領域; }
private const string str表記可能文字 = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ";
public int nFontWidth = 8, nFontHeight = 16;
private CTexture[] txフォント8x16 = new CTexture[ 2 ];
//-----------------
#endregion
}
}

436
OpenTaiko/src/Common/C定数.cs
View File

@ -27,18 +27,7 @@ namespace TJAPlayer3
BMSCROLL, BMSCROLL,
HBSCROLL HBSCROLL
} }
public enum Eジャンル
{
None = 0,
JPOP = 1,
ゲーム = 2,
ナムコ = 3,
クラシック = 4,
バラエティ = 5,
どうよう = 6,
ボーカロイド = 7,
アニメ = 8
}
public enum EGame public enum EGame
{ {
OFF = 0, OFF = 0,
@ -51,18 +40,6 @@ namespace TJAPlayer3
n曲目に表示 = 1, n曲目に表示 = 1,
mtaikoに画像で表示 = 2, mtaikoに画像で表示 = 2,
} }
public enum Eダークモード
{
OFF,
HALF,
FULL
}
public enum EWindowMovieMode
{
OFF = 0,
左下 = 1,
中央下 = 2
}
public enum EPad // 演奏用のenum。ここを修正するときは、次に出てくる EKeyConfigPad と EパッドFlag もセットで修正すること。 public enum EPad // 演奏用のenum。ここを修正するときは、次に出てくる EKeyConfigPad と EパッドFlag もセットで修正すること。
{ {
@ -217,7 +194,7 @@ namespace TJAPlayer3
UNKNOWN = EPad.UNKNOWN UNKNOWN = EPad.UNKNOWN
} }
[Flags] [Flags]
public enum EパッドFlag // #24063 2011.1.16 yyagi コマンド入力用 パッド入力のフラグ化 public enum EPadFlag // #24063 2011.1.16 yyagi コマンド入力用 パッド入力のフラグ化
{ {
None = 0, None = 0,
HH = 1, HH = 1,
@ -255,7 +232,7 @@ namespace TJAPlayer3
RANDOM, RANDOM,
MIRROR, MIRROR,
SUPERRANDOM, SUPERRANDOM,
HYPERRANDOM MIRRORRANDOM
} }
public enum EFunMods public enum EFunMods
@ -290,11 +267,6 @@ namespace TJAPlayer3
UNKNOWN = EInstrumentPad.UNKNOWN UNKNOWN = EInstrumentPad.UNKNOWN
} }
public enum E打ち分け時の再生の優先順位
{
ChipがPadより優先,
PadがChipより優先
}
internal enum EInputDevice internal enum EInputDevice
{ {
Keyboard = 0, Keyboard = 0,
@ -323,69 +295,13 @@ namespace TJAPlayer3
判定ライン上, 判定ライン上,
コンボ下 コンボ下
} }
internal enum E判定位置
{
標準 = 0,
Lower,
MAX
}
internal enum E判定表示優先度
{
Chipより下,
Chipより上
}
internal enum EAVI種別
{
Unknown,
AVI,
AVIPAN
}
internal enum EFIFOモード internal enum EFIFOモード
{ {
フェードイン, フェードイン,
フェードアウト フェードアウト
} }
internal enum Eレーン
{
LC = 0,
HH,
SD,
BD,
HT,
LT,
FT,
CY,
LP,
RD, // 将来の独立レーン化/独立AUTO設定を見越して追加
LBD = 10,
Guitar, // AUTOレーン判定を容易にするため、便宜上定義しておく(未使用)
Bass, // (未使用)
GtR,
GtG,
GtB,
GtPick,
GtW,
BsR,
BsG,
BsB,
BsPick,
BsW,
MAX, // 要素数取得のための定義 ("BGM"は使わない前提で)
BGM
}
internal enum Eレーン数
{
物理 = 8, // LC, HH, SD, BD, HT, LT, FT, CY
論理 = 10, // LC, HO, HC, SD, BD, HT, LT, FT, RC, RD
DTXG物理 = 10, // LC, HH, LP, SD, BD, HT, LT, FT, CY, RD
DTXG論理 = 12 // LC, HO, HC, LP, LB, SD, BD, HT, LT, FT, CY, RD
}
internal enum Eログ出力
{
OFF,
ON通常,
ON詳細あり
}
internal enum E演奏画面の戻り値 internal enum E演奏画面の戻り値
{ {
継続, 継続,
@ -502,344 +418,6 @@ namespace TJAPlayer3
} }
} }
/// <summary>
/// レーンの値を扱う汎用の構造体。列挙型"Eドラムレーン"に準拠。
/// </summary>
/// <typeparam name="T">値の型。</typeparam>
[StructLayout( LayoutKind.Sequential )]
public struct STLANEVALUE<T>
{
public T LC;
public T HH;
public T SD;
public T LP;
public T LBD;
public T BD;
public T HT;
public T LT;
public T FT;
public T CY;
public T RD;
public T Guitar;
public T Bass;
public T GtR;
public T GtG;
public T GtB;
public T GtPick;
public T GtW;
public T BsR;
public T BsG;
public T BsB;
public T BsPick;
public T BsW;
public T BGM;
public T this[ int index ]
{
get
{
switch ( index )
{
case (int) Eレーン.LC:
return this.LC;
case (int) Eレーン.HH:
return this.HH;
case (int) Eレーン.SD:
return this.SD;
case (int) Eレーン.LP:
return this.LP;
case (int) Eレーン.LBD:
return this.LBD;
case (int) Eレーン.BD:
return this.BD;
case (int) Eレーン.HT:
return this.HT;
case (int) Eレーン.LT:
return this.LT;
case (int) Eレーン.FT:
return this.FT;
case (int) Eレーン.CY:
return this.CY;
case (int) Eレーン.RD:
return this.RD;
case (int) Eレーン.Guitar:
return this.Guitar;
case (int) Eレーン.Bass:
return this.Bass;
case (int) Eレーン.GtR:
return this.GtR;
case (int) Eレーン.GtG:
return this.GtG;
case (int) Eレーン.GtB:
return this.GtB;
case (int) Eレーン.GtPick:
return this.GtPick;
case (int) Eレーン.GtW:
return this.GtW;
case (int) Eレーン.BsR:
return this.BsR;
case (int) Eレーン.BsG:
return this.BsG;
case (int) Eレーン.BsB:
return this.BsB;
case (int) Eレーン.BsPick:
return this.BsPick;
case (int) Eレーン.BsW:
return this.BsW;
}
throw new IndexOutOfRangeException();
}
set
{
switch ( index )
{
case (int) Eレーン.LC:
this.LC = value;
return;
case (int) Eレーン.HH:
this.HH = value;
return;
case (int) Eレーン.SD:
this.SD = value;
return;
case (int) Eレーン.LP:
this.LP = value;
return;
case (int) Eレーン.LBD:
this.LBD = value;
return;
case (int) Eレーン.BD:
this.BD = value;
return;
case (int) Eレーン.HT:
this.HT = value;
return;
case (int) Eレーン.LT:
this.LT = value;
return;
case (int) Eレーン.FT:
this.FT = value;
return;
case (int) Eレーン.CY:
this.CY = value;
return;
case (int) Eレーン.RD:
this.RD = value;
return;
case (int) Eレーン.Guitar:
this.Guitar = value;
return;
case (int) Eレーン.Bass:
this.Bass = value;
return;
case (int) Eレーン.GtR:
this.GtR = value;
return;
case (int) Eレーン.GtG:
this.GtG = value;
return;
case (int) Eレーン.GtB:
this.GtB = value;
return;
case (int) Eレーン.GtPick:
this.GtPick = value;
return;
case (int) Eレーン.GtW:
this.GtW = value;
return;
case (int) Eレーン.BsR:
this.BsR = value;
return;
case (int) Eレーン.BsG:
this.BsG = value;
return;
case (int) Eレーン.BsB:
this.BsB = value;
return;
case (int) Eレーン.BsPick:
this.BsPick = value;
return;
case (int) Eレーン.BsW:
this.BsW = value;
return;
}
throw new IndexOutOfRangeException();
}
}
}
[Serializable]
[StructLayout( LayoutKind.Sequential )]
public struct STAUTOPLAY // Eレーンとindexを一致させること
{
public bool LC; // 0
public bool HH; // 1
public bool SD; // 2
public bool BD; // 3
public bool HT; // 4
public bool LT; // 5
public bool FT; // 6
public bool CY; // 7
public bool LP;
public bool RD; // 8
public bool LBD;
public bool Guitar; // 9 (not used)
public bool Bass; // 10 (not used)
public bool GtR; // 11
public bool GtG; // 12
public bool GtB; // 13
public bool GtPick; // 14
public bool GtW; // 15
public bool BsR; // 16
public bool BsG; // 17
public bool BsB; // 18
public bool BsPick; // 19
public bool BsW; // 20
public bool this[ int index ]
{
get
{
switch ( index )
{
case (int) Eレーン.LC:
return this.LC;
case (int) Eレーン.HH:
return this.HH;
case (int) Eレーン.SD:
return this.SD;
case (int) Eレーン.BD:
return this.BD;
case (int) Eレーン.HT:
return this.HT;
case (int) Eレーン.LT:
return this.LT;
case (int) Eレーン.FT:
return this.FT;
case (int) Eレーン.CY:
return this.CY;
case (int) Eレーン.LP:
return this.LP;
case (int) Eレーン.RD:
return this.RD;
case (int) Eレーン.LBD:
return this.LBD;
case (int) Eレーン.Guitar:
if ( !this.GtR ) return false;
if ( !this.GtG ) return false;
if ( !this.GtB ) return false;
if ( !this.GtPick ) return false;
if ( !this.GtW ) return false;
return true;
case (int) Eレーン.Bass:
if ( !this.BsR ) return false;
if ( !this.BsG ) return false;
if ( !this.BsB) return false;
if ( !this.BsPick ) return false;
if ( !this.BsW ) return false;
return true;
case (int) Eレーン.GtR:
return this.GtR;
case (int) Eレーン.GtG:
return this.GtG;
case (int) Eレーン.GtB:
return this.GtB;
case (int) Eレーン.GtPick:
return this.GtPick;
case (int) Eレーン.GtW:
return this.GtW;
case (int) Eレーン.BsR:
return this.BsR;
case (int) Eレーン.BsG:
return this.BsG;
case (int) Eレーン.BsB:
return this.BsB;
case (int) Eレーン.BsPick:
return this.BsPick;
case (int) Eレーン.BsW:
return this.BsW;
}
throw new IndexOutOfRangeException();
}
set
{
switch ( index )
{
case (int) Eレーン.LC:
this.LC = value;
return;
case (int) Eレーン.HH:
this.HH = value;
return;
case (int) Eレーン.SD:
this.SD = value;
return;
case (int) Eレーン.BD:
this.BD = value;
return;
case (int) Eレーン.HT:
this.HT = value;
return;
case (int) Eレーン.LT:
this.LT = value;
return;
case (int) Eレーン.FT:
this.FT = value;
return;
case (int) Eレーン.CY:
this.CY = value;
return;
case (int) Eレーン.LP:
this.LP = value;
return;
case (int) Eレーン.RD:
this.RD = value;
return;
case (int) Eレーン.LBD:
this.LBD = value;
return;
case (int) Eレーン.Guitar:
this.GtR = this.GtG = this.GtB = this.GtPick = this.GtW = value;
return;
case (int) Eレーン.Bass:
this.BsR = this.BsG = this.BsB = this.BsPick = this.BsW = value;
return;
case (int) Eレーン.GtR:
this.GtR = value;
return;
case (int) Eレーン.GtG:
this.GtG = value;
return;
case (int) Eレーン.GtB:
this.GtB = value;
return;
case (int) Eレーン.GtPick:
this.GtPick = value;
return;
case (int) Eレーン.GtW:
this.GtW = value;
return;
case (int) Eレーン.BsR:
this.BsR = value;
return;
case (int) Eレーン.BsG:
this.BsG = value;
return;
case (int) Eレーン.BsB:
this.BsB = value;
return;
case (int) Eレーン.BsPick:
this.BsPick = value;
return;
case (int) Eレーン.BsW:
this.BsW = value;
return;
}
throw new IndexOutOfRangeException();
}
}
}
public enum EReturnValue : int public enum EReturnValue : int
{ {
Continuation, Continuation,
@ -869,7 +447,5 @@ namespace TJAPlayer3
} }
#endregion #endregion
internal class C定数
{
}
} }

34
OpenTaiko/src/Common/TJAPlayer3.cs
View File

@ -68,7 +68,7 @@ namespace TJAPlayer3
get; get;
private set; private set;
} }
public static C文字コンソール act文字コンソール public static CTextConsole actTextConsole
{ {
get; get;
private set; private set;
@ -2747,13 +2747,13 @@ for (int i = 0; i < 3; i++) {
Trace.Indent(); Trace.Indent();
try try
{ {
act文字コンソール = new C文字コンソール(); actTextConsole = new CTextConsole();
Trace.TraceInformation( "文字コンソールを生成しました。" ); Trace.TraceInformation( "文字コンソールを生成しました。" );
act文字コンソール.Activate(); actTextConsole.Activate();
//if (!ConfigIni.PreAssetsLoading) //if (!ConfigIni.PreAssetsLoading)
{ {
act文字コンソール.CreateManagedResource(); actTextConsole.CreateManagedResource();
act文字コンソール.CreateUnmanagedResource(); actTextConsole.CreateUnmanagedResource();
} }
Trace.TraceInformation( "文字コンソールを活性化しました。" ); Trace.TraceInformation( "文字コンソールを活性化しました。" );
Trace.TraceInformation( "文字コンソールの初期化を完了しました。" ); Trace.TraceInformation( "文字コンソールの初期化を完了しました。" );
@ -2990,7 +2990,7 @@ for (int i = 0; i < 3; i++) {
SaveFile = 0; SaveFile = 0;
this.listトップレベルActivities = new List<CActivity>(); this.listトップレベルActivities = new List<CActivity>();
this.listトップレベルActivities.Add( actEnumSongs ); this.listトップレベルActivities.Add( actEnumSongs );
this.listトップレベルActivities.Add( act文字コンソール ); this.listトップレベルActivities.Add( actTextConsole );
this.listトップレベルActivities.Add( stage起動 ); this.listトップレベルActivities.Add( stage起動 );
this.listトップレベルActivities.Add( stageタイトル ); this.listトップレベルActivities.Add( stageタイトル );
// this.listトップレベルActivities.Add( stageオプション ); // this.listトップレベルActivities.Add( stageオプション );
@ -3328,19 +3328,19 @@ for (int i = 0; i < 3; i++) {
#endregion #endregion
#region [ 文字コンソールの終了処理 ] #region [ 文字コンソールの終了処理 ]
//--------------------- //---------------------
if (act文字コンソール != null) if (actTextConsole != null)
{ {
Trace.TraceInformation( "文字コンソールの終了処理を行います。" ); Trace.TraceInformation( "文字コンソールの終了処理を行います。" );
Trace.Indent(); Trace.Indent();
try try
{ {
act文字コンソール.DeActivate(); actTextConsole.DeActivate();
//if (!ConfigIni.PreAssetsLoading) //if (!ConfigIni.PreAssetsLoading)
{ {
act文字コンソール.ReleaseManagedResource(); actTextConsole.ReleaseManagedResource();
act文字コンソール.ReleaseUnmanagedResource(); actTextConsole.ReleaseUnmanagedResource();
} }
act文字コンソール = null; actTextConsole = null;
Trace.TraceInformation( "文字コンソールの終了処理を完了しました。" ); Trace.TraceInformation( "文字コンソールの終了処理を完了しました。" );
} }
catch( Exception exception6 ) catch( Exception exception6 )
@ -3510,9 +3510,9 @@ for (int i = 0; i < 3; i++) {
{ {
Trace.TraceInformation("スキン変更:" + TJAPlayer3.Skin.GetCurrentSkinSubfolderFullName(false)); Trace.TraceInformation("スキン変更:" + TJAPlayer3.Skin.GetCurrentSkinSubfolderFullName(false));
TJAPlayer3.act文字コンソール.DeActivate(); TJAPlayer3.actTextConsole.DeActivate();
act文字コンソール.ReleaseManagedResource(); actTextConsole.ReleaseManagedResource();
act文字コンソール.ReleaseUnmanagedResource(); actTextConsole.ReleaseUnmanagedResource();
TJAPlayer3.Skin.Dispose(); TJAPlayer3.Skin.Dispose();
TJAPlayer3.Skin = null; TJAPlayer3.Skin = null;
@ -3524,9 +3524,9 @@ for (int i = 0; i < 3; i++) {
TJAPlayer3.Tx.LoadTexture(); TJAPlayer3.Tx.LoadTexture();
TJAPlayer3.act文字コンソール.Activate(); TJAPlayer3.actTextConsole.Activate();
act文字コンソール.CreateManagedResource(); actTextConsole.CreateManagedResource();
act文字コンソール.CreateUnmanagedResource(); actTextConsole.CreateUnmanagedResource();
TJAPlayer3.NamePlate.RefleshSkin(); TJAPlayer3.NamePlate.RefleshSkin();
CActSelectPopupMenu.RefleshSkin(); CActSelectPopupMenu.RefleshSkin();
CActSelect段位リスト.RefleshSkin(); CActSelect段位リスト.RefleshSkin();

2
OpenTaiko/src/Components/CSongReplay.cs
View File

@ -335,7 +335,7 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.eRandom[actualPlayer] == ERandomMode.MIRROR) ModFlags |= (int)EModFlag.Mirror; 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.RANDOM) ModFlags |= (int)EModFlag.Random;
if (TJAPlayer3.ConfigIni.eRandom[actualPlayer] == ERandomMode.SUPERRANDOM) ModFlags |= (int)EModFlag.SuperRandom; if (TJAPlayer3.ConfigIni.eRandom[actualPlayer] == ERandomMode.SUPERRANDOM) ModFlags |= (int)EModFlag.SuperRandom;
if (TJAPlayer3.ConfigIni.eRandom[actualPlayer] == ERandomMode.HYPERRANDOM) ModFlags |= ((int)EModFlag.Random | (int)EModFlag.Mirror); 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.DORON) ModFlags |= (int)EModFlag.Invisible;
if (TJAPlayer3.ConfigIni.eSTEALTH[actualPlayer] == EStealthMode.STEALTH) ModFlags |= (int)EModFlag.PerfectMemory; 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.AVALANCHE) ModFlags |= (int)EModFlag.Avalanche;

2
OpenTaiko/src/Components/CVisualLogManager.cs
View File

@ -34,7 +34,7 @@ namespace TJAPlayer3
int x = 0; int x = 0;
int y = 0 + (40 * screenPosition); int y = 0 + (40 * screenPosition);
TJAPlayer3.act文字コンソール.tPrint(x, y, C文字コンソール.Eフォント種別.赤, msg); TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.Cyan, msg);
} }
public bool IsExpired() public bool IsExpired()

6
OpenTaiko/src/Songs/CDTX.cs
View File

@ -196,7 +196,6 @@ namespace TJAPlayer3
public int nスクロール方向; public int nスクロール方向;
public int n描画優先度; //(特殊)現状連打との判断目的で使用 public int n描画優先度; //(特殊)現状連打との判断目的で使用
public ENoteState eNoteState; public ENoteState eNoteState;
public EAVI種別 eAVI種別;
public EInstrumentPad e楽器パート = EInstrumentPad.UNKNOWN; public EInstrumentPad e楽器パート = EInstrumentPad.UNKNOWN;
public int nチャンネル番号; public int nチャンネル番号;
public int VideoStartTimeMs; public int VideoStartTimeMs;
@ -1098,7 +1097,6 @@ namespace TJAPlayer3
public string[] NOTESDESIGNER = new string[(int)Difficulty.Total] { "", "", "", "", "", "", "" }; public string[] NOTESDESIGNER = new string[(int)Difficulty.Total] { "", "", "", "", "", "", "" };
public bool EXPLICIT; public bool EXPLICIT;
public string SELECTBG; public string SELECTBG;
public Eジャンル eジャンル;
public bool HIDDENLEVEL; public bool HIDDENLEVEL;
public STDGBVALUE<int> LEVEL; public STDGBVALUE<int> LEVEL;
public bool bLyrics; public bool bLyrics;
@ -1306,7 +1304,6 @@ namespace TJAPlayer3
this.SELECTBG = ""; this.SELECTBG = "";
this.bLyrics = false; this.bLyrics = false;
this.usingLyricsFile = false; this.usingLyricsFile = false;
this.eジャンル = Eジャンル.None;
this.PREVIEW = ""; this.PREVIEW = "";
this.PREIMAGE = ""; this.PREIMAGE = "";
this.BACKGROUND = ""; this.BACKGROUND = "";
@ -1801,7 +1798,7 @@ namespace TJAPlayer3
} }
} }
break; break;
case ERandomMode.HYPERRANDOM: case ERandomMode.MIRRORRANDOM:
foreach (var chip in this.listChip) foreach (var chip in this.listChip)
{ {
int n = rnd.Next(100); int n = rnd.Next(100);
@ -3526,7 +3523,6 @@ namespace TJAPlayer3
chip1.dbSCROLL = this.dbNowScroll; chip1.dbSCROLL = this.dbNowScroll;
chip1.n整数値 = 0x01; chip1.n整数値 = 0x01;
chip1.n整数値_内部番号 = 1; chip1.n整数値_内部番号 = 1;
chip1.eAVI種別 = EAVI種別.AVI;
// チップを配置。 // チップを配置。

1
OpenTaiko/src/Songs/CSongListNode.cs
View File

@ -94,7 +94,6 @@ namespace TJAPlayer3
public Color cDanTickColor = Color.White; public Color cDanTickColor = Color.White;
public string[] strBoxText = new string[3]; public string[] strBoxText = new string[3];
public Eジャンル eジャンル = Eジャンル.None;
public string strSelectBGPath; public string strSelectBGPath;

4
OpenTaiko/src/Stages/01.StartUp/CStage起動.cs
View File

@ -215,10 +215,10 @@ namespace TJAPlayer3
int y = 20; int y = 20;
for(int i = 0; i < this.list進行文字列.Count; i++) for(int i = 0; i < this.list進行文字列.Count; i++)
{ {
TJAPlayer3.act文字コンソール.tPrint((int)(x * TJAPlayer3.Skin.Resolution[0] / 1280.0), (int)(y * TJAPlayer3.Skin.Resolution[1] / 720.0), C文字コンソール.Eフォント種別.白, this.list進行文字列[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]);
y += 24; y += 24;
} }
TJAPlayer3.act文字コンソール.tPrint(x, y, C文字コンソール.Eフォント種別.白, this.str現在進行中); TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, this.str現在進行中);
//----------------- //-----------------
#endregion #endregion
} }

8
OpenTaiko/src/Stages/02.Title/CStageタイトル.cs
View File

@ -930,11 +930,11 @@ namespace TJAPlayer3
//string strVersion = "KTT:J:A:I:2017072200"; //string strVersion = "KTT:J:A:I:2017072200";
string strCreator = "https://github.com/0AuBSQ/OpenTaiko"; string strCreator = "https://github.com/0AuBSQ/OpenTaiko";
AssemblyName asmApp = Assembly.GetExecutingAssembly().GetName(); AssemblyName asmApp = Assembly.GetExecutingAssembly().GetName();
TJAPlayer3.act文字コンソール.tPrint(4, 44, C文字コンソール.Eフォント種別.白, "DEBUG BUILD"); TJAPlayer3.actTextConsole.tPrint(4, 44, CTextConsole.EFontType.White, "DEBUG BUILD");
TJAPlayer3.act文字コンソール.tPrint(4, 4, C文字コンソール.Eフォント種別.白, asmApp.Name + " Ver." + TJAPlayer3.VERSION + " (" + strCreator + ")"); TJAPlayer3.actTextConsole.tPrint(4, 4, CTextConsole.EFontType.White, asmApp.Name + " Ver." + TJAPlayer3.VERSION + " (" + strCreator + ")");
TJAPlayer3.act文字コンソール.tPrint(4, 24, C文字コンソール.Eフォント種別.白, "Skin:" + TJAPlayer3.Skin.Skin_Name + " Ver." + TJAPlayer3.Skin.Skin_Version + " (" + TJAPlayer3.Skin.Skin_Creator + ")"); TJAPlayer3.actTextConsole.tPrint(4, 24, CTextConsole.EFontType.White, "Skin:" + TJAPlayer3.Skin.Skin_Name + " Ver." + TJAPlayer3.Skin.Skin_Version + " (" + TJAPlayer3.Skin.Skin_Creator + ")");
//CDTXMania.act文字コンソール.tPrint(4, 24, C文字コンソール.Eフォント種別.白, strSubTitle); //CDTXMania.act文字コンソール.tPrint(4, 24, C文字コンソール.Eフォント種別.白, strSubTitle);
TJAPlayer3.act文字コンソール.tPrint(4, (TJAPlayer3.Skin.Resolution[1] - 24), C文字コンソール.Eフォント種別.白, "TJAPlayer3 forked TJAPlayer2 forPC(kairera0467)"); TJAPlayer3.actTextConsole.tPrint(4, (TJAPlayer3.Skin.Resolution[1] - 24), CTextConsole.EFontType.White, "TJAPlayer3 forked TJAPlayer2 forPC(kairera0467)");
#endif #endif
#endregion #endregion

6
OpenTaiko/src/Stages/04.Config/CActCalibrationMode.cs
View File

@ -160,14 +160,14 @@ namespace TJAPlayer3
offsettext?.t2D描画(TJAPlayer3.Skin.Config_Calibration_OffsetText[0] - offsettext.szTextureSize.Width, TJAPlayer3.Skin.Config_Calibration_OffsetText[1]); offsettext?.t2D描画(TJAPlayer3.Skin.Config_Calibration_OffsetText[0] - offsettext.szTextureSize.Width, TJAPlayer3.Skin.Config_Calibration_OffsetText[1]);
TJAPlayer3.act文字コンソール.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1], C文字コンソール.Eフォント種別.赤, TJAPlayer3.actTextConsole.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1], CTextConsole.EFontType.Cyan,
"MEDIAN OFFSET : " + GetMedianOffset() + "ms\n"); "MEDIAN OFFSET : " + GetMedianOffset() + "ms\n");
TJAPlayer3.act文字コンソール.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1] + TJAPlayer3.act文字コンソール.nFontHeight, C文字コンソール.Eフォント種別.白, TJAPlayer3.actTextConsole.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1] + TJAPlayer3.actTextConsole.nFontHeight, CTextConsole.EFontType.White,
"MIN OFFSET : " + GetLowestOffset() + "ms\n" + "MIN OFFSET : " + GetLowestOffset() + "ms\n" +
"MAX OFFSET : " + GetHighestOffset() + "ms\n" + "MAX OFFSET : " + GetHighestOffset() + "ms\n" +
"LAST OFFSET : " + LastOffset + "ms\n" + "LAST OFFSET : " + LastOffset + "ms\n" +
"OFFSET COUNT : " + (Offsets != null ? Offsets.Count : 0)); "OFFSET COUNT : " + (Offsets != null ? Offsets.Count : 0));
TJAPlayer3.act文字コンソール.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1] + (TJAPlayer3.act文字コンソール.nFontHeight * 5), C文字コンソール.Eフォント種別.白, TJAPlayer3.actTextConsole.tPrint(TJAPlayer3.Skin.Config_Calibration_InfoText[0], TJAPlayer3.Skin.Config_Calibration_InfoText[1] + (TJAPlayer3.actTextConsole.nFontHeight * 5), CTextConsole.EFontType.White,
"CURRENT OFFSET: " + CurrentOffset() + "ms"); "CURRENT OFFSET: " + CurrentOffset() + "ms");
#endregion #endregion

10
OpenTaiko/src/Stages/05.SongSelect/CActPlayOption.cs
View File

@ -490,7 +490,7 @@ namespace TJAPlayer3
var rand_ = TJAPlayer3.ConfigIni.eRandom[actual]; var rand_ = TJAPlayer3.ConfigIni.eRandom[actual];
if (rand_ == ERandomMode.HYPERRANDOM) if (rand_ == ERandomMode.MIRRORRANDOM)
{ {
nRandom = 2; nRandom = 2;
nAbekobe = 1; nAbekobe = 1;
@ -553,7 +553,7 @@ namespace TJAPlayer3
#region [ AutoMode ] #region [ AutoMode ]
bool _auto = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[player]; bool _auto = TJAPlayer3.ConfigIni.bAutoPlay[player];
if (_auto == true) if (_auto == true)
nAutoMode = 1; nAutoMode = 1;
@ -621,7 +621,7 @@ namespace TJAPlayer3
if (nRandom == 2 && nAbekobe == 1) if (nRandom == 2 && nAbekobe == 1)
{ {
TJAPlayer3.ConfigIni.eRandom[actual] = ERandomMode.HYPERRANDOM; TJAPlayer3.ConfigIni.eRandom[actual] = ERandomMode.MIRRORRANDOM;
} }
else if (nRandom == 2 && nAbekobe == 0) else if (nRandom == 2 && nAbekobe == 0)
{ {
@ -687,11 +687,11 @@ namespace TJAPlayer3
if (nAutoMode == 1) if (nAutoMode == 1)
{ {
TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[player] = true; TJAPlayer3.ConfigIni.bAutoPlay[player] = true;
} }
else else
{ {
TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[player] = false; TJAPlayer3.ConfigIni.bAutoPlay[player] = false;
} }
#endregion #endregion

2
OpenTaiko/src/Stages/05.SongSelect/CActSelectPreimageパネル.cs
View File

@ -248,7 +248,7 @@ namespace TJAPlayer3
str = "Unknown"; str = "Unknown";
break; break;
} }
TJAPlayer3.act文字コンソール.tPrint( this.n本体X + 0x12, this.n本体Y - 1, C文字コンソール.Eフォント種別.赤細, str ); TJAPlayer3.actTextConsole.tPrint( this.n本体X + 0x12, this.n本体Y - 1, CTextConsole.EFontType.CyanSlim, str );
} }
} }
private void t描画処理_センサ光() private void t描画処理_センサ光()

19
OpenTaiko/src/Stages/05.SongSelect/CActSelectQuickConfig.cs
View File

@ -174,30 +174,13 @@ namespace TJAPlayer3
// (Autoのパラメータ切り替え時は実際に値設定していないため、キャンセルまたはRetern, More...時に値設定する必要有り) // (Autoのパラメータ切り替え時は実際に値設定していないため、キャンセルまたはRetern, More...時に値設定する必要有り)
} }
/// <summary>
/// 1つの値を、全targetに適用する。RiskyやDarkなど、全tatgetで共通の設定となるもので使う。
/// </summary>
/// <param name="order">設定項目リストの順番</param>
/// <param name="index">設定値(index)</param>
private void SetValueToAllTarget( int order, int index )
{
for ( int i = 0; i < 3; i++ )
{
lci[ nCurrentConfigSet ][ i ][ order ].SetIndex( index );
}
}
/// <summary> /// <summary>
/// ConfigIni.bAutoPlayに簡易CONFIGの状態を反映する /// ConfigIni.bAutoPlayに簡易CONFIGの状態を反映する
/// </summary> /// </summary>
private void SetAutoParameters() private void SetAutoParameters()
{ {
for ( int target = 0; target < 3; target++ )
{
int[] pa = { (int) Eレーン.LC, (int) Eレーン.GtR, (int) Eレーン.BsR };
int start = pa[ target ];
}
} }
// CActivity 実装 // CActivity 実装

22
OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs
View File

@ -579,13 +579,13 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.bTokkunMode) if (TJAPlayer3.ConfigIni.bTokkunMode)
TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, "GAME: TRAINING MODE"); TJAPlayer3.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, "GAME: TRAINING MODE");
if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー) if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー)
TJAPlayer3.act文字コンソール.tPrint(0, 16, C文字コンソール.Eフォント種別.白, "GAME: SURVIVAL"); TJAPlayer3.actTextConsole.tPrint(0, 16, CTextConsole.EFontType.White, "GAME: SURVIVAL");
if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー激辛) if (TJAPlayer3.ConfigIni.eGameMode == EGame.完走叩ききりまショー激辛)
TJAPlayer3.act文字コンソール.tPrint(0, 16, C文字コンソール.Eフォント種別.白, "GAME: SURVIVAL HARD"); TJAPlayer3.actTextConsole.tPrint(0, 16, CTextConsole.EFontType.White, "GAME: SURVIVAL HARD");
if (TJAPlayer3.ConfigIni.bSuperHard) if (TJAPlayer3.ConfigIni.bSuperHard)
TJAPlayer3.act文字コンソール.tPrint(0, 32, C文字コンソール.Eフォント種別.赤, "SUPER HARD MODE : ON"); TJAPlayer3.actTextConsole.tPrint(0, 32, CTextConsole.EFontType.Cyan, "SUPER HARD MODE : ON");
#endregion #endregion
@ -913,7 +913,7 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.ToggleAutoP1)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.ToggleAutoP1))
{ {
TJAPlayer3.Skin.soundChangeSFX.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0]); CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.bAutoPlay[0]);
} }
#endregion #endregion
#region [ F4 2PオートON/OFF ] #region [ F4 2PオートON/OFF ]
@ -922,7 +922,7 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.nPlayerCount > 1) if (TJAPlayer3.ConfigIni.nPlayerCount > 1)
{ {
TJAPlayer3.Skin.soundChangeSFX.tPlay(); TJAPlayer3.Skin.soundChangeSFX.tPlay();
CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1]); CUtility.ToggleBoolian(ref TJAPlayer3.ConfigIni.bAutoPlay[1]);
} }
} }
#endregion #endregion
@ -1209,8 +1209,8 @@ namespace TJAPlayer3
#region [ HHx2: 難易度変更 ] #region [ HHx2: 難易度変更 ]
if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.HH) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.HHO)) if (TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.HH) || TJAPlayer3.Pad.bPressed(EInstrumentPad.DRUMS, EPad.HHO))
{ // [HH]x2 難易度変更 { // [HH]x2 難易度変更
CommandHistory.Add(EInstrumentPad.DRUMS, EパッドFlag.HH); CommandHistory.Add(EInstrumentPad.DRUMS, EPadFlag.HH);
EパッドFlag[] comChangeDifficulty = new EパッドFlag[] { EパッドFlag.HH, EパッドFlag.HH }; EPadFlag[] comChangeDifficulty = new EPadFlag[] { EPadFlag.HH, EPadFlag.HH };
if (CommandHistory.CheckCommand(comChangeDifficulty, EInstrumentPad.DRUMS)) if (CommandHistory.CheckCommand(comChangeDifficulty, EInstrumentPad.DRUMS))
{ {
Debug.WriteLine("ドラムス難易度変更"); Debug.WriteLine("ドラムス難易度変更");
@ -1449,7 +1449,7 @@ namespace TJAPlayer3
private struct STCommandTime // #24063 2011.1.16 yyagi コマンド入力時刻の記録用 private struct STCommandTime // #24063 2011.1.16 yyagi コマンド入力時刻の記録用
{ {
public EInstrumentPad eInst; // 使用楽器 public EInstrumentPad eInst; // 使用楽器
public EパッドFlag ePad; // 押されたコマンド(同時押しはOR演算で列挙する) public EPadFlag ePad; // 押されたコマンド(同時押しはOR演算で列挙する)
public long time; // コマンド入力時刻 public long time; // コマンド入力時刻
} }
@ -1560,7 +1560,7 @@ namespace TJAPlayer3
/// </summary> /// </summary>
/// <param name="_eInst">楽器の種類</param> /// <param name="_eInst">楽器の種類</param>
/// <param name="_ePad">入力コマンド(同時押しはOR演算で列挙すること)</param> /// <param name="_ePad">入力コマンド(同時押しはOR演算で列挙すること)</param>
public void Add(EInstrumentPad _eInst, EパッドFlag _ePad) public void Add(EInstrumentPad _eInst, EPadFlag _ePad)
{ {
STCommandTime _stct = new STCommandTime STCommandTime _stct = new STCommandTime
{ {
@ -1587,7 +1587,7 @@ namespace TJAPlayer3
/// <param name="_ePad">入力が成功したか調べたいコマンド</param> /// <param name="_ePad">入力が成功したか調べたいコマンド</param>
/// <param name="_eInst">対象楽器</param> /// <param name="_eInst">対象楽器</param>
/// <returns>コマンド入力成功時true</returns> /// <returns>コマンド入力成功時true</returns>
public bool CheckCommand(EパッドFlag[] _ePad, EInstrumentPad _eInst) public bool CheckCommand(EPadFlag[] _ePad, EInstrumentPad _eInst)
{ {
int targetCount = _ePad.Length; int targetCount = _ePad.Length;
int stciCount = stct.Count; int stciCount = stct.Count;

2
OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs
View File

@ -92,7 +92,7 @@ namespace TJAPlayer3
// player and the special song title and subtitle // player and the special song title and subtitle
// of the .tja used to perform input calibration // of the .tja used to perform input calibration
TJAPlayer3.IsPerformingCalibration = TJAPlayer3.IsPerformingCalibration =
!TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] && !TJAPlayer3.ConfigIni.bAutoPlay[0] &&
TJAPlayer3.ConfigIni.nPlayerCount == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1 &&
str曲タイトル == "Input Calibration" && str曲タイトル == "Input Calibration" &&
strサブタイトル == "TJAPlayer3 Developers"; strサブタイトル == "TJAPlayer3 Developers";

54
OpenTaiko/src/Stages/07.Game/CAct演奏ゲージ共通.cs
View File

@ -401,8 +401,6 @@ namespace TJAPlayer3
float fDamage; float fDamage;
int nコース = (int)TJAPlayer3.stage演奏ドラム画面.n現在のコース[nPlayer]; int nコース = (int)TJAPlayer3.stage演奏ドラム画面.n現在のコース[nPlayer];
#if true // DAMAGELEVELTUNING
switch (e今回の判定) switch (e今回の判定)
{ {
case ENoteJudge.Perfect: case ENoteJudge.Perfect:
@ -468,64 +466,18 @@ namespace TJAPlayer3
default: default:
{ {
if (nPlayer == 0 ? TJAPlayer3.ConfigIni.bAutoPlay[0] : TJAPlayer3.ConfigIni.bAutoPlay[1]) if (this.DTX[nPlayer].bチップがある.Branch)
{ {
if (this.DTX[nPlayer].bチップがある.Branch) fDamage = this.dbゲージ増加量_Branch[nコース, 0][nPlayer];
{
fDamage = this.dbゲージ増加量_Branch[nコース, 0][nPlayer];
}
else
fDamage = this.dbゲージ増加量[0][nPlayer];
} }
else else
fDamage = 0; fDamage = this.dbゲージ増加量[0][nPlayer];
break; break;
} }
} }
#else // before applying #23625 modifications
switch (e今回の判定)
{
case E判定.Perfect:
fDamage = ( part == E楽器パート.DRUMS ) ? 0.01 : 0.015;
break;
case E判定.Great:
fDamage = ( part == E楽器パート.DRUMS ) ? 0.006 : 0.009;
break;
case E判定.Good:
fDamage = ( part == E楽器パート.DRUMS ) ? 0.002 : 0.003;
break;
case E判定.Poor:
fDamage = ( part == E楽器パート.DRUMS ) ? 0.0 : 0.0;
break;
case E判定.Miss:
fDamage = ( part == E楽器パート.DRUMS ) ? -0.035 : -0.035;
switch( CDTXMania.ConfigIni.eダメージレベル )
{
case Eダメージレベル.少ない:
fDamage *= 0.6;
break;
case Eダメージレベル.普通:
fDamage *= 1.0;
break;
case Eダメージレベル.大きい:
fDamage *= 1.6;
break;
}
break;
default:
fDamage = 0.0;
break;
}
#endif
this.db現在のゲージ値[nPlayer] = Math.Round(this.db現在のゲージ値[nPlayer] + fDamage, 5, MidpointRounding.ToEven); this.db現在のゲージ値[nPlayer] = Math.Round(this.db現在のゲージ値[nPlayer] + fDamage, 5, MidpointRounding.ToEven);

83
OpenTaiko/src/Stages/07.Game/CAct演奏スコア共通.cs
View File

@ -11,9 +11,9 @@ namespace TJAPlayer3
{ {
// プロパティ // プロパティ
protected STDGBVALUE<long>[] nスコアの増分; protected long[] nScoreIncrease;
protected STDGBVALUE<double>[] n現在の本当のスコア; protected double[] nCurrentRealScore;
protected STDGBVALUE<long>[] n現在表示中のスコア; protected long[] nCurrentlyDisplayedScore;
//protected CTexture txScore; //protected CTexture txScore;
// protected CTexture txScore_1P; // protected CTexture txScore_1P;
@ -23,7 +23,7 @@ namespace TJAPlayer3
public CCounter[] ctボーナス加算タイマ; public CCounter[] ctボーナス加算タイマ;
protected STスコア[] stScore; protected STスコア[] stScore;
protected int n現在表示中のAddScore; protected int nNowDisplayedAddScore;
[StructLayout( LayoutKind.Sequential )] [StructLayout( LayoutKind.Sequential )]
protected struct STスコア protected struct STスコア
@ -48,7 +48,7 @@ namespace TJAPlayer3
public long GetScore(int player) public long GetScore(int player)
{ {
return n現在表示中のスコア[player].Taiko; return nCurrentlyDisplayedScore[player];
} }
// コンストラクタ // コンストラクタ
@ -173,43 +173,22 @@ namespace TJAPlayer3
1f 1f
}; };
public double Get( EInstrumentPad part, int player ) public double Get(int player)
{ {
return this.n現在の本当のスコア[ player ][ (int) part ]; return this.nCurrentRealScore[ player ];
} }
public void Set( EInstrumentPad part, double nScore, int player ) public void Set(double nScore, int player)
{ {
//現状、TAIKOパートでの演奏記録を結果ステージに持っていけないので、ドラムパートにも加算することでお茶を濁している。 if( this.nCurrentRealScore[ player ] != nScore )
if( part == EInstrumentPad.TAIKO )
part = EInstrumentPad.DRUMS;
int nPart = (int) part;
if( this.n現在の本当のスコア[ player ][ nPart ] != nScore )
{ {
this.n現在の本当のスコア[ player ][ nPart ] = nScore; this.nCurrentRealScore[ player ] = nScore;
this.nスコアの増分[ player ][ nPart ] = (long) ( ( (double) ( this.n現在の本当のスコア[ player ][ nPart ] - this.n現在表示中のスコア[ player ][ nPart ] ) ) / 20.0 ); this.nScoreIncrease[ player ] = (long) ( ( (double) ( this.nCurrentRealScore[ player ] - this.nCurrentlyDisplayedScore[ player ] ) ) / 20.0 );
this.nスコアの増分[ player ].Guitar = (long) ( ( (double) ( this.n現在の本当のスコア[ player ][ nPart ] - this.n現在表示中のスコア[ player ][ nPart ] ) ) ); if( this.nScoreIncrease[ player ] < 1L )
if( this.nスコアの増分[ player ][ nPart ] < 1L )
{ {
this.nスコアの増分[ player ][ nPart ] = 1L; this.nScoreIncrease[ player ] = 1L;
} }
} }
if( part == EInstrumentPad.DRUMS )
part = EInstrumentPad.TAIKO;
nPart = (int) part;
if( this.n現在の本当のスコア[ player ][ nPart ] != nScore )
{
this.n現在の本当のスコア[ player ][ nPart ] = nScore;
this.nスコアの増分[ player ][ nPart ] = (long) ( ( (double) ( this.n現在の本当のスコア[ player ][ nPart ] - this.n現在表示中のスコア[ player ][ nPart ] ) ) / 20.0 );
this.nスコアの増分[ player ].Guitar = (long) ( ( (double) ( this.n現在の本当のスコア[ player ][ nPart ] - this.n現在表示中のスコア[ player ][ nPart ] ) ) );
if( this.nスコアの増分[ player ][ nPart ] < 1L )
{
this.nスコアの増分[ player ][ nPart ] = 1L;
}
}
} }
/// <summary> /// <summary>
/// 点数を加える(各種AUTO補正つき) /// 点数を加える(各種AUTO補正つき)
@ -217,7 +196,7 @@ namespace TJAPlayer3
/// <param name="part"></param> /// <param name="part"></param>
/// <param name="bAutoPlay"></param> /// <param name="bAutoPlay"></param>
/// <param name="delta"></param> /// <param name="delta"></param>
public void Add( EInstrumentPad part, STAUTOPLAY bAutoPlay, long delta, int player ) public void Add(long delta, int player )
{ {
if (TJAPlayer3.ConfigIni.bAIBattleMode && player == 1) return; if (TJAPlayer3.ConfigIni.bAIBattleMode && player == 1) return;
@ -225,14 +204,6 @@ namespace TJAPlayer3
delta = (long)(delta * TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, player)); delta = (long)(delta * TJAPlayer3.stageSongSelect.actPlayOption.tGetModMultiplier(CActPlayOption.EBalancingType.SCORE, false, player));
switch ( part )
{
#region [ Unknown ]
case EInstrumentPad.UNKNOWN:
throw new ArgumentException();
#endregion
}
this.ctTimer = new CCounter( 0, 400, 1, TJAPlayer3.Timer ); this.ctTimer = new CCounter( 0, 400, 1, TJAPlayer3.Timer );
for( int sc = 0; sc < 1; sc++ ) for( int sc = 0; sc < 1; sc++ )
@ -248,13 +219,13 @@ namespace TJAPlayer3
this.stScore[ i ].bBonusScore = false; this.stScore[ i ].bBonusScore = false;
this.stScore[ i ].bAddEnd = false; this.stScore[ i ].bAddEnd = false;
this.stScore[ i ].nPlayer = player; this.stScore[ i ].nPlayer = player;
this.n現在表示中のAddScore++; this.nNowDisplayedAddScore++;
break; break;
} }
} }
} }
this.Set( part, this.Get( part, player ) + delta * rev, player ); this.Set(this.Get( player ) + delta * rev, player);
} }
public void BonusAdd( int player ) public void BonusAdd( int player )
@ -274,31 +245,23 @@ namespace TJAPlayer3
this.stScore[ i ].bBonusScore = true; this.stScore[ i ].bBonusScore = true;
this.stScore[ i ].bAddEnd = false; this.stScore[ i ].bAddEnd = false;
this.stScore[ i ].nPlayer = player; this.stScore[ i ].nPlayer = player;
this.n現在表示中のAddScore++; this.nNowDisplayedAddScore++;
break; break;
} }
} }
} }
this.Set( EInstrumentPad.TAIKO, this.Get( EInstrumentPad.TAIKO, player ) + 10000, player ); this.Set(this.Get( player ) + 10000, player );
} }
// CActivity 実装 // CActivity 実装
public override void Activate() public override void Activate()
{ {
this.n現在表示中のスコア = new STDGBVALUE<long>[ 5 ]; this.nCurrentlyDisplayedScore = new long[5] { 0L, 0L, 0L, 0L, 0L };
this.n現在の本当のスコア = new STDGBVALUE<double>[ 5 ]; this.nCurrentRealScore = new double[ 5 ] { 0L, 0L, 0L, 0L, 0L };
this.nスコアの増分 = new STDGBVALUE<long>[ 5 ]; this.nScoreIncrease = new long[ 5 ] { 0L, 0L, 0L, 0L, 0L };
for( int i = 0; i < 5; i++ )
{
for (int j = 0; j < 4; j++)
{
this.n現在表示中のスコア[i][j] = 0L;
this.n現在の本当のスコア[i][j] = 0L;
this.nスコアの増分[i][j] = 0L;
}
}
for( int sc = 0; sc < 256; sc++ ) for( int sc = 0; sc < 256; sc++ )
{ {
this.stScore[ sc ].b使用中 = false; this.stScore[ sc ].b使用中 = false;
@ -308,7 +271,7 @@ namespace TJAPlayer3
this.stScore[ sc ].bAddEnd = false; this.stScore[ sc ].bAddEnd = false;
} }
this.n現在表示中のAddScore = 0; this.nNowDisplayedAddScore = 0;
this.ctTimer = new CCounter(); this.ctTimer = new CCounter();

42
OpenTaiko/src/Stages/07.Game/CAct演奏レーンフラッシュGB共通.cs
View File

@ -1,42 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using FDK;
namespace TJAPlayer3
{
internal class CAct演奏レーンフラッシュGB共通 : CActivity
{
// プロパティ
// コンストラクタ
public CAct演奏レーンフラッシュGB共通()
{
base.IsDeActivated = true;
}
// メソッド
// CActivity 実装
public override void Activate()
{
base.Activate();
}
public override void DeActivate()
{
base.DeActivate();
}
public override void CreateManagedResource()
{
base.CreateManagedResource();
}
public override void ReleaseManagedResource()
{
base.ReleaseManagedResource();
}
}
}

26
OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs
View File

@ -57,33 +57,33 @@ namespace TJAPlayer3
if ( !base.IsDeActivated ) if ( !base.IsDeActivated )
{ {
y += 0x153; y += 0x153;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "Song/G. Offset:{0:####0}/{1:####0} ms", TJAPlayer3.DTX.nBGMAdjust, TJAPlayer3.ConfigIni.nGlobalOffsetMs ) ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, string.Format( "Song/G. Offset:{0:####0}/{1:####0} ms", TJAPlayer3.DTX.nBGMAdjust, TJAPlayer3.ConfigIni.nGlobalOffsetMs ) );
y -= 0x10; y -= 0x10;
int num = ( TJAPlayer3.DTX.listChip.Count > 0 ) ? TJAPlayer3.DTX.listChip[ TJAPlayer3.DTX.listChip.Count - 1 ].n発声時刻ms : 0; 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"); string str = "Time: " + ((((double)(SoundManager.PlayTimer.NowTime * TJAPlayer3.ConfigIni.SongPlaybackSpeed)) / 1000.0)).ToString("####0.00") + " / " + ((((double)num) / 1000.0)).ToString("####0.00");
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, str ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, str );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "Part: {0:####0}/{1:####0}", NowMeasure[0], NowMeasure[1] ) ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, string.Format( "Part: {0:####0}/{1:####0}", NowMeasure[0], NowMeasure[1] ) );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "BPM: {0:####0.0000}", this.dbBPM[0] ) ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, string.Format( "BPM: {0:####0.0000}", this.dbBPM[0] ) );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "Frame: {0:####0} fps", TJAPlayer3.FPS.NowFPS ) ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, string.Format( "Frame: {0:####0} fps", TJAPlayer3.FPS.NowFPS ) );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, NotesTextN); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, NotesTextN);
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, NotesTextE ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, NotesTextE );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, NotesTextM ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, NotesTextM );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, NotesTextC ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, NotesTextC );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "SCROLL: {0:####0.00}", this.dbSCROLL ) ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, string.Format( "SCROLL: {0:####0.00}", this.dbSCROLL ) );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, ScoreModeText ); TJAPlayer3.actTextConsole.tPrint( x, y, CTextConsole.EFontType.White, ScoreModeText );
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint(x, y, C文字コンソール.Eフォント種別.白, ListChipText); TJAPlayer3.actTextConsole.tPrint(x, y, CTextConsole.EFontType.White, ListChipText);
y -= 0x10; y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint(x, y, C文字コンソール.Eフォント種別.白, ListChipMText); TJAPlayer3.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() ) ); //CDTXMania.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, string.Format( "Sound CPU : {0:####0.00}%", CDTXMania.Sound管理.GetCPUusage() ) );
//y -= 0x10; //y -= 0x10;

99
OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -26,9 +26,9 @@ namespace TJAPlayer3
Drums = new CScoreIni.C演奏記録(); Drums = new CScoreIni.C演奏記録();
{ {
Drums.nGoodCount = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Perfect : this.nヒット数_Auto含まない.Drums.Perfect; Drums.nGoodCount = TJAPlayer3.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Perfect : this.nヒット数_Auto含まない.Drums.Perfect;
Drums.nOkCount = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Great : this.nヒット数_Auto含まない.Drums.Great; Drums.nOkCount = TJAPlayer3.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Great : this.nヒット数_Auto含まない.Drums.Great;
Drums.nBadCount = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Miss : this.nヒット数_Auto含まない.Drums.Miss; Drums.nBadCount = TJAPlayer3.ConfigIni.bAutoPlay[0] ? this.nヒット数_Auto含む.Drums.Miss : this.nヒット数_Auto含まない.Drums.Miss;
var danC = TJAPlayer3.stage演奏ドラム画面.actDan.GetExam(); var danC = TJAPlayer3.stage演奏ドラム画面.actDan.GetExam();
for (int i = 0; i < danC.Length; i++) for (int i = 0; i < danC.Length; i++)
@ -328,8 +328,6 @@ namespace TJAPlayer3
this.n現在のトップChip = ( listChip[0].Count > 0 ) ? 0 : -1; this.n現在のトップChip = ( listChip[0].Count > 0 ) ? 0 : -1;
this.L最後に再生したHHの実WAV番号 = new List<int>( 16 ); this.L最後に再生したHHの実WAV番号 = new List<int>( 16 );
this.n最後に再生したHHのチャンネル番号 = 0; this.n最後に再生したHHのチャンネル番号 = 0;
this.n最後に再生した実WAV番号.Guitar = -1;
this.n最後に再生した実WAV番号.Bass = -1;
for ( int i = 0; i < 50; i++ ) for ( int i = 0; i < 50; i++ )
{ {
this.n最後に再生したBGMの実WAV番号[ i ] = -1; this.n最後に再生したBGMの実WAV番号[ i ] = -1;
@ -416,12 +414,6 @@ namespace TJAPlayer3
this.tBranchReset(0); this.tBranchReset(0);
this.bIsAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay; // #24239 2011.1.23 yyagi
//this.bIsAutoPlay.Guitar = CDTXMania.ConfigIni.bギターが全部オートプレイである;
//this.bIsAutoPlay.Bass = CDTXMania.ConfigIni.bベースが全部オートプレイである;
// this.nRisky = CDTXMania.ConfigIni.nRisky; // #23559 2011.7.28 yyagi
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{ {
actGauge.Init(TJAPlayer3.ConfigIni.nRisky, i); // #23559 2011.7.28 yyagi actGauge.Init(TJAPlayer3.ConfigIni.nRisky, i); // #23559 2011.7.28 yyagi
@ -792,7 +784,6 @@ namespace TJAPlayer3
public CAct演奏DrumsDancer actDancer; public CAct演奏DrumsDancer actDancer;
protected CAct演奏Drums判定文字列 actJudgeString; protected CAct演奏Drums判定文字列 actJudgeString;
public TaikoLaneFlash actTaikoLaneFlash; public TaikoLaneFlash actTaikoLaneFlash;
protected CAct演奏レーンフラッシュGB共通 actLaneFlushGB;
public CAct演奏パネル文字列 actPanel; public CAct演奏パネル文字列 actPanel;
public CAct演奏演奏情報 actPlayInfo; public CAct演奏演奏情報 actPlayInfo;
public CAct演奏スコア共通 actScore; public CAct演奏スコア共通 actScore;
@ -849,10 +840,6 @@ namespace TJAPlayer3
protected int[] n最後に再生したBGMの実WAV番号 = new int[ 50 ]; protected int[] n最後に再生したBGMの実WAV番号 = new int[ 50 ];
protected int n最後に再生したHHのチャンネル番号; protected int n最後に再生したHHのチャンネル番号;
protected List<int> L最後に再生したHHの実WAV番号; // #23921 2011.1.4 yyagi: change "int" to "List<int>", for recording multiple wav No. protected List<int> L最後に再生したHHの実WAV番号; // #23921 2011.1.4 yyagi: change "int" to "List<int>", for recording multiple wav No.
protected STLANEVALUE<int> n最後に再生した実WAV番号; // #26388 2011.11.8 yyagi: change "n最後に再生した実WAV番号.GUITAR" and "n最後に再生した実WAV番号.BASS"
// into "n最後に再生した実WAV番号";
// protected int n最後に再生した実WAV番号.GUITAR;
// protected int n最後に再生した実WAV番号.BASS;
protected volatile Queue<stmixer> queueMixerSound; // #24820 2013.1.21 yyagi まずは単純にAdd/Removeを1個のキューでまとめて管理するやり方で設計する protected volatile Queue<stmixer> queueMixerSound; // #24820 2013.1.21 yyagi まずは単純にAdd/Removeを1個のキューでまとめて管理するやり方で設計する
protected DateTime dtLastQueueOperation; // protected DateTime dtLastQueueOperation; //
@ -868,14 +855,12 @@ namespace TJAPlayer3
protected CTexture tx背景; protected CTexture tx背景;
protected STAUTOPLAY bIsAutoPlay; // #24239 2011.1.23 yyagi
// protected int nRisky_InitialVar, nRiskyTime; // #23559 2011.7.28 yyagi → CAct演奏ゲージ共通クラスに隠蔽 // protected int nRisky_InitialVar, nRiskyTime; // #23559 2011.7.28 yyagi → CAct演奏ゲージ共通クラスに隠蔽
protected int nPolyphonicSounds; protected int nPolyphonicSounds;
protected List<CDTX.CChip>[] listChip = new List<CDTX.CChip>[5]; protected List<CDTX.CChip>[] listChip = new List<CDTX.CChip>[5];
protected Dictionary<int, CDTX.CWAV> listWAV; protected Dictionary<int, CDTX.CWAV> listWAV;
protected CInvisibleChip cInvisibleChip; protected CInvisibleChip cInvisibleChip;
protected bool bUseOSTimer; protected bool bUseOSTimer;
protected E判定表示優先度 e判定表示優先度;
public CBRANCHSCORE[] CBranchScore = new CBRANCHSCORE[6]; public CBRANCHSCORE[] CBranchScore = new CBRANCHSCORE[6];
public CBRANCHSCORE[] CChartScore = new CBRANCHSCORE[5]; public CBRANCHSCORE[] CChartScore = new CBRANCHSCORE[5];
@ -1439,8 +1424,8 @@ namespace TJAPlayer3
nAddScore = 100L; nAddScore = 100L;
} }
if (!TJAPlayer3.ConfigIni.ShinuchiMode && pChip.bGOGOTIME) this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, (long)(nAddScore * 1.2f), nPlayer); if (!TJAPlayer3.ConfigIni.ShinuchiMode && pChip.bGOGOTIME) this.actScore.Add((long)(nAddScore * 1.2f), nPlayer);
else this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, nAddScore, nPlayer); else this.actScore.Add(nAddScore, nPlayer);
// Refresh scores after roll hits as well // Refresh scores after roll hits as well
@ -1619,7 +1604,7 @@ namespace TJAPlayer3
nAddScore = 100L; nAddScore = 100L;
} }
this.actScore.Add(EInstrumentPad.TAIKO, this.bIsAutoPlay, nAddScore, player); this.actScore.Add(nAddScore, player);
// Refresh scores after roll hits as well // Refresh scores after roll hits as well
int __score = (int)(this.actScore.GetScore(player) + nAddScore); int __score = (int)(this.actScore.GetScore(player) + nAddScore);
@ -1705,13 +1690,13 @@ namespace TJAPlayer3
{ {
//unsafeコードにつき、デバッグ中の変更厳禁! //unsafeコードにつき、デバッグ中の変更厳禁!
bool bAutoPlay = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer]; bool bAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay[nPlayer];
bool bBombHit = false; bool bBombHit = false;
switch (nPlayer) switch (nPlayer)
{ {
case 1: case 1:
bAutoPlay = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; bAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode;
break; break;
} }
@ -2441,7 +2426,7 @@ namespace TJAPlayer3
nAddScore = (long)nAddScore * 10; nAddScore = (long)nAddScore * 10;
} }
this.actScore.Add( EInstrumentPad.TAIKO, bIsAutoPlay, (long)nAddScore, nPlayer ); this.actScore.Add((long)nAddScore, nPlayer );
} }
else if( TJAPlayer3.DTX.nScoreModeTmp == 2 ) else if( TJAPlayer3.DTX.nScoreModeTmp == 2 )
{ {
@ -2497,8 +2482,7 @@ namespace TJAPlayer3
nAddScore = nAddScore * 2; nAddScore = nAddScore * 2;
} }
this.actScore.Add(EInstrumentPad.TAIKO, bIsAutoPlay, nAddScore, nPlayer); this.actScore.Add(nAddScore, nPlayer);
//this.actScore.Add( E楽器パート.DRUMS, bIsAutoPlay, nAddScore );
} }
else if (TJAPlayer3.DTX.nScoreModeTmp == 1) else if (TJAPlayer3.DTX.nScoreModeTmp == 1)
{ {
@ -2564,7 +2548,7 @@ namespace TJAPlayer3
nAddScore = nAddScore * 2; nAddScore = nAddScore * 2;
} }
this.actScore.Add(EInstrumentPad.TAIKO, bIsAutoPlay, nAddScore, nPlayer); this.actScore.Add(nAddScore, nPlayer);
} }
else else
{ {
@ -2601,8 +2585,7 @@ namespace TJAPlayer3
nAddScore = nAddScore * 2; nAddScore = nAddScore * 2;
} }
this.actScore.Add(EInstrumentPad.TAIKO, bIsAutoPlay, nAddScore, nPlayer); this.actScore.Add(nAddScore, nPlayer);
//this.actScore.Add( E楽器パート.DRUMS, bIsAutoPlay, nAddScore );
} }
//キーを押したときにスコア情報 + nAddScoreを置き換える様に //キーを押したときにスコア情報 + nAddScoreを置き換える様に
@ -3182,7 +3165,7 @@ namespace TJAPlayer3
// this.t演奏中止(); // this.t演奏中止();
} }
else if ( TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchNormal) && else if ( TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchNormal) &&
(TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0]) ) (TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.bAutoPlay[0]) )
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
@ -3209,7 +3192,7 @@ namespace TJAPlayer3
this.b強制的に分岐させた[0] = true; this.b強制的に分岐させた[0] = true;
} }
else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchExpert) && else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchExpert) &&
(TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. (TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.bAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen.
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
@ -3236,7 +3219,7 @@ namespace TJAPlayer3
this.b強制的に分岐させた[0] = true; this.b強制的に分岐させた[0] = true;
} }
else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchMaster) && else if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingBranchMaster) &&
(TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen. (TJAPlayer3.ConfigIni.bTokkunMode || TJAPlayer3.ConfigIni.bAutoPlay[0])) // #24243 2011.1.16 yyagi UI for InputAdjustTime in playing screen.
{ {
if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return; if (!TJAPlayer3.DTX.bHasBranch[TJAPlayer3.stageSongSelect.nChoosenSongDifficulty[0]]) return;
@ -3291,7 +3274,7 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.bTokkunMode && TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingToggleAuto) ) if (TJAPlayer3.ConfigIni.bTokkunMode && TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingToggleAuto) )
{ {
TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] = !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0]; TJAPlayer3.ConfigIni.bAutoPlay[0] = !TJAPlayer3.ConfigIni.bAutoPlay[0];
} }
} }
@ -3299,7 +3282,7 @@ namespace TJAPlayer3
if (keyboard.KeyPressed((int)SlimDXKeys.Key.F7)) if (keyboard.KeyPressed((int)SlimDXKeys.Key.F7))
{ {
TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1] = !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1]; TJAPlayer3.ConfigIni.bAutoPlay[1] = !TJAPlayer3.ConfigIni.bAutoPlay[1];
} }
#endif #endif
if ( !this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE && ( ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED ) ) && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut ) ) if ( !this.actPauseMenu.bIsActivePopupMenu && this.bPAUSE && ( ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED ) ) && ( base.ePhaseID != CStage.EPhase.Game_STAGE_FAILED_FadeOut ) )
@ -3462,11 +3445,11 @@ namespace TJAPlayer3
CConfigIni configIni = TJAPlayer3.ConfigIni; CConfigIni configIni = TJAPlayer3.ConfigIni;
CDTX dTX = TJAPlayer3.DTX; CDTX dTX = TJAPlayer3.DTX;
bool bAutoPlay = configIni.b太鼓パートAutoPlay[nPlayer]; bool bAutoPlay = configIni.bAutoPlay[nPlayer];
switch ( nPlayer ) //2017.08.11 kairera0467 switch ( nPlayer ) //2017.08.11 kairera0467
{ {
case 1: case 1:
bAutoPlay = configIni.b太鼓パートAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; bAutoPlay = configIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode;
dTX = TJAPlayer3.DTX_2P; dTX = TJAPlayer3.DTX_2P;
break; break;
case 2: case 2:
@ -4832,11 +4815,11 @@ namespace TJAPlayer3
CConfigIni configIni = TJAPlayer3.ConfigIni; CConfigIni configIni = TJAPlayer3.ConfigIni;
CDTX dTX = TJAPlayer3.DTX; CDTX dTX = TJAPlayer3.DTX;
bool bAutoPlay = configIni.b太鼓パートAutoPlay[nPlayer]; bool bAutoPlay = configIni.bAutoPlay[nPlayer];
switch ( nPlayer ) //2017.08.11 kairera0467 switch ( nPlayer ) //2017.08.11 kairera0467
{ {
case 1: case 1:
bAutoPlay = configIni.b太鼓パートAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; bAutoPlay = configIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode;
dTX = TJAPlayer3.DTX_2P; dTX = TJAPlayer3.DTX_2P;
break; break;
case 2: case 2:
@ -5526,47 +5509,7 @@ namespace TJAPlayer3
/// </summary> /// </summary>
protected void tDTXV用の設定() protected void tDTXV用の設定()
{ {
TJAPlayer3.ConfigIni.bAutoPlay.HH = true;
TJAPlayer3.ConfigIni.bAutoPlay.SD = true;
TJAPlayer3.ConfigIni.bAutoPlay.BD = true;
TJAPlayer3.ConfigIni.bAutoPlay.HT = true;
TJAPlayer3.ConfigIni.bAutoPlay.LT = true;
TJAPlayer3.ConfigIni.bAutoPlay.CY = true;
TJAPlayer3.ConfigIni.bAutoPlay.FT = true;
TJAPlayer3.ConfigIni.bAutoPlay.RD = true;
TJAPlayer3.ConfigIni.bAutoPlay.LC = true;
TJAPlayer3.ConfigIni.bAutoPlay.LP = true;
TJAPlayer3.ConfigIni.bAutoPlay.LBD = true;
TJAPlayer3.ConfigIni.bAutoPlay.GtR = true;
TJAPlayer3.ConfigIni.bAutoPlay.GtB = true;
TJAPlayer3.ConfigIni.bAutoPlay.GtB = true;
TJAPlayer3.ConfigIni.bAutoPlay.GtPick = true;
TJAPlayer3.ConfigIni.bAutoPlay.GtW = true;
TJAPlayer3.ConfigIni.bAutoPlay.BsR = true;
TJAPlayer3.ConfigIni.bAutoPlay.BsB = true;
TJAPlayer3.ConfigIni.bAutoPlay.BsB = true;
TJAPlayer3.ConfigIni.bAutoPlay.BsPick = true;
TJAPlayer3.ConfigIni.bAutoPlay.BsW = true;
this.bIsAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay;
TJAPlayer3.ConfigIni.bEnableAVI = true;
TJAPlayer3.ConfigIni.bEnableBGA = true;
for ( int i = 0; i < 3; i++ )
{
TJAPlayer3.ConfigIni.bReverse[ i ] = false;
TJAPlayer3.ConfigIni.eInvisible[ i ] = EInvisible.OFF;
TJAPlayer3.ConfigIni.eRandom[ i ] = ERandomMode.OFF;
TJAPlayer3.ConfigIni.n表示可能な最小コンボ数[ i ] = 65535;
TJAPlayer3.ConfigIni.判定文字表示位置[ i ] = E判定文字表示位置.表示OFF;
// CDTXMania.ConfigIni.n譜面スクロール速度[ i ] = CDTXMania.ConfigIni.nViewerScrollSpeed[ i ]; // これだけはOn活性化()で行うこと。
// そうしないと、演奏開始直後にスクロール速度が変化して見苦しい。
}
TJAPlayer3.ConfigIni.bDisplayDebugInfo = TJAPlayer3.ConfigIni.bViewerShowDebugStatus;
TJAPlayer3.ConfigIni.bTight = false;
TJAPlayer3.ConfigIni.bストイックモード = false;
TJAPlayer3.ConfigIni.nRisky = 0;
} }
protected abstract void t進行描画_チップ_ドラムス( CConfigIni configIni, ref CDTX dTX, ref CDTX.CChip pChip ); protected abstract void t進行描画_チップ_ドラムス( CConfigIni configIni, ref CDTX dTX, ref CDTX.CChip pChip );

4
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsMtaiko.cs
View File

@ -466,14 +466,14 @@ namespace TJAPlayer3
public void tMtaikoEvent( int nChannel, int nHand, int nPlayer ) public void tMtaikoEvent( int nChannel, int nHand, int nPlayer )
{ {
CConfigIni configIni = TJAPlayer3.ConfigIni; CConfigIni configIni = TJAPlayer3.ConfigIni;
bool bAutoPlay = configIni.b太鼓パートAutoPlay[nPlayer]; bool bAutoPlay = configIni.bAutoPlay[nPlayer];
int playerShift = 5 * nPlayer; int playerShift = 5 * nPlayer;
var _gt = configIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)]; var _gt = configIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)];
switch (nPlayer) switch (nPlayer)
{ {
case 1: case 1:
bAutoPlay = configIni.b太鼓パートAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; bAutoPlay = configIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode;
break; break;
} }

2
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsTrainingMode.cs
View File

@ -111,7 +111,7 @@ namespace TJAPlayer3
base.IsFirstDraw = false; base.IsFirstDraw = false;
} }
TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, "TRAINING MODE (BETA)"); TJAPlayer3.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, "TRAINING MODE (BETA)");
if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingPause)) if (TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.Drums.TrainingPause))
{ {

12
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsスコア.cs
View File

@ -102,7 +102,7 @@ namespace TJAPlayer3
{ {
if (i == 1 && TJAPlayer3.ConfigIni.bAIBattleMode) break; if (i == 1 && TJAPlayer3.ConfigIni.bAIBattleMode) break;
base.t小文字表示(x[i], y[i], string.Format("{0,7:######0}", this.n現在表示中のスコア[i].Taiko), 0, 256, i); base.t小文字表示(x[i], y[i], string.Format("{0,7:######0}", this.nCurrentlyDisplayedScore[i]), 0, 256, i);
} }
for( int i = 0; i < 256; i++ ) for( int i = 0; i < 256; i++ )
@ -115,7 +115,7 @@ namespace TJAPlayer3
if( this.stScore[ i ].ctTimer.IsEnded ) if( this.stScore[ i ].ctTimer.IsEnded )
{ {
if( this.stScore[ i ].b表示中 == true ) if( this.stScore[ i ].b表示中 == true )
this.n現在表示中のAddScore--; this.nNowDisplayedAddScore--;
this.stScore[ i ].ctTimer.Stop(); this.stScore[ i ].ctTimer.Stop();
this.stScore[ i ].b使用中 = false; this.stScore[ i ].b使用中 = false;
TJAPlayer3.stage演奏ドラム画面.actDan.Update(); TJAPlayer3.stage演奏ドラム画面.actDan.Update();
@ -123,7 +123,7 @@ namespace TJAPlayer3
if (!stScore[i].bAddEnd) if (!stScore[i].bAddEnd)
{ {
this.n現在表示中のスコア[this.stScore[i].nPlayer].Taiko += (long)this.stScore[i].nAddScore; this.nCurrentlyDisplayedScore[this.stScore[i].nPlayer] += (long)this.stScore[i].nAddScore;
stScore[i].bAddEnd = true; stScore[i].bAddEnd = true;
if (ct点数アニメタイマ[stScore[i].nPlayer].IsUnEnded) if (ct点数アニメタイマ[stScore[i].nPlayer].IsUnEnded)
{ {
@ -231,13 +231,13 @@ namespace TJAPlayer3
if (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1) if (TJAPlayer3.PlayerSide == 1 && TJAPlayer3.ConfigIni.nPlayerCount == 1)
pl = 1; pl = 1;
if ( this.n現在表示中のAddScore < 10 && this.stScore[ i ].bBonusScore == false && !TJAPlayer3.ConfigIni.SimpleMode) 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); 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.n現在表示中のAddScore < 10 && this.stScore[ i ].bBonusScore == true && !TJAPlayer3.ConfigIni.SimpleMode) if( this.nNowDisplayedAddScore < 10 && this.stScore[ i ].bBonusScore == true && !TJAPlayer3.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); 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 else
{ {
this.n現在表示中のAddScore--; this.nNowDisplayedAddScore--;
this.stScore[ i ].b表示中 = false; this.stScore[ i ].b表示中 = false;
} }
} }

29
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsレーンフラッシュGB.cs
View File

@ -1,29 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Drawing;
using FDK;
namespace TJAPlayer3
{
internal class CAct演奏DrumsレーンフラッシュGB : CAct演奏レーンフラッシュGB共通
{
// CActivity 実装（共通クラスからの差分のみ）
public override int Draw()
{
if( !base.IsDeActivated )
{
}
return 0;
}
// その他
#region [ private ]
//-----------------
//-----------------
#endregion
}
}

2
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drums背景.cs
View File

@ -361,7 +361,7 @@ namespace TJAPlayer3
{ {
int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor; int maxFloor = TJAPlayer3.stageSongSelect.rChoosenSong.arスコア[5].譜面情報.nTotalFloor;
TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, maxFloor.ToString()); TJAPlayer3.actTextConsole.tPrint(0, 0, CTextConsole.EFontType.White, maxFloor.ToString());
int nightTime = Math.Max(140, maxFloor / 2); int nightTime = Math.Max(140, maxFloor / 2);

23
OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs
View File

@ -34,7 +34,6 @@ namespace TJAPlayer3
base.ChildActivities.Add( this.actGraph = new CAct演奏Drumsグラフ() ); // #24074 2011.01.23 add ikanick base.ChildActivities.Add( this.actGraph = new CAct演奏Drumsグラフ() ); // #24074 2011.01.23 add ikanick
base.ChildActivities.Add( this.actJudgeString = new CAct演奏Drums判定文字列() ); base.ChildActivities.Add( this.actJudgeString = new CAct演奏Drums判定文字列() );
base.ChildActivities.Add( this.actTaikoLaneFlash = new TaikoLaneFlash() ); base.ChildActivities.Add( this.actTaikoLaneFlash = new TaikoLaneFlash() );
base.ChildActivities.Add( this.actLaneFlushGB = new CAct演奏DrumsレーンフラッシュGB() );
base.ChildActivities.Add( this.actScore = new CAct演奏Drumsスコア() ); base.ChildActivities.Add( this.actScore = new CAct演奏Drumsスコア() );
base.ChildActivities.Add( this.actStatusPanels = new CAct演奏Drumsステータスパネル() ); base.ChildActivities.Add( this.actStatusPanels = new CAct演奏Drumsステータスパネル() );
base.ChildActivities.Add( this.act譜面スクロール速度 = new CAct演奏スクロール速度() ); base.ChildActivities.Add( this.act譜面スクロール速度 = new CAct演奏スクロール速度() );
@ -292,7 +291,7 @@ namespace TJAPlayer3
TJAPlayer3.DiscordClient?.SetPresence(new RichPresence() TJAPlayer3.DiscordClient?.SetPresence(new RichPresence()
{ {
Details = details, Details = details,
State = "Playing" + (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] == true ? " (Auto)" : ""), 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)), Timestamps = new Timestamps(DateTime.UtcNow, DateTime.UtcNow.AddMilliseconds(TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms / TJAPlayer3.ConfigIni.SongPlaybackSpeed)),
Assets = new Assets() Assets = new Assets()
{ {
@ -1013,15 +1012,15 @@ namespace TJAPlayer3
if (TJAPlayer3.stage演奏ドラム画面.isDeniedPlaying[nUsePlayer]) break; if (TJAPlayer3.stage演奏ドラム画面.isDeniedPlaying[nUsePlayer]) break;
if (!TJAPlayer3.ConfigIni.bTokkunMode && TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] && isPad1P)//2020.05.18 Mr-Ojii オート時の入力キャンセル if (!TJAPlayer3.ConfigIni.bTokkunMode && TJAPlayer3.ConfigIni.bAutoPlay[0] && isPad1P)//2020.05.18 Mr-Ojii オート時の入力キャンセル
break; break;
else if ((TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[1] || TJAPlayer3.ConfigIni.bAIBattleMode) && isPad2P) else if ((TJAPlayer3.ConfigIni.bAutoPlay[1] || TJAPlayer3.ConfigIni.bAIBattleMode) && isPad2P)
break; break;
else if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[2] && isPad3P) else if (TJAPlayer3.ConfigIni.bAutoPlay[2] && isPad3P)
break; break;
else if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[3] && isPad4P) else if (TJAPlayer3.ConfigIni.bAutoPlay[3] && isPad4P)
break; break;
else if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[4] && isPad5P) else if (TJAPlayer3.ConfigIni.bAutoPlay[4] && isPad5P)
break; break;
//var padTo = nUsePlayer == 0 ? nPad - 12 : nPad - 12 - 4; //var padTo = nUsePlayer == 0 ? nPad - 12 : nPad - 12 - 4;
var padTo = nPad - 12; var padTo = nPad - 12;
@ -1838,11 +1837,11 @@ namespace TJAPlayer3
long nPlayTime = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed); long nPlayTime = (long)(SoundManager.PlayTimer.NowTimeMs * TJAPlayer3.ConfigIni.SongPlaybackSpeed);
if ((!pChip.bHit) && (pChip.n発声時刻ms <= nPlayTime)) if ((!pChip.bHit) && (pChip.n発声時刻ms <= nPlayTime))
{ {
bool bAutoPlay = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer]; bool bAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay[nPlayer];
switch (nPlayer) switch (nPlayer)
{ {
case 1: case 1:
bAutoPlay = TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode; bAutoPlay = TJAPlayer3.ConfigIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode;
break; break;
} }
@ -2458,8 +2457,8 @@ namespace TJAPlayer3
//時間内でかつ0x9Aじゃないならならヒット処理 //時間内でかつ0x9Aじゃないならならヒット処理
if (!NotesManager.IsRollEnd(pChip) && if (!NotesManager.IsRollEnd(pChip) &&
((nPlayer != 1 ? TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer] : ((nPlayer != 1 ? TJAPlayer3.ConfigIni.bAutoPlay[nPlayer] :
(TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode)) || (TJAPlayer3.ConfigIni.bAutoPlay[nPlayer] || TJAPlayer3.ConfigIni.bAIBattleMode)) ||
puchichara.effect.Autoroll > 0)) puchichara.effect.Autoroll > 0))
this.tチップのヒット処理(pChip.n発声時刻ms, pChip, EInstrumentPad.TAIKO, false, 0, nPlayer, puchichara.effect.Autoroll > 0); this.tチップのヒット処理(pChip.n発声時刻ms, pChip, EInstrumentPad.TAIKO, false, 0, nPlayer, puchichara.effect.Autoroll > 0);
} }
@ -2621,7 +2620,7 @@ namespace TJAPlayer3
{ {
var showJudgeInfo = false; var showJudgeInfo = false;
if (TJAPlayer3.ConfigIni.nPlayerCount == 1 ? (TJAPlayer3.ConfigIni.bJudgeCountDisplay && !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0]) : false) showJudgeInfo = true; if (TJAPlayer3.ConfigIni.nPlayerCount == 1 ? (TJAPlayer3.ConfigIni.bJudgeCountDisplay && !TJAPlayer3.ConfigIni.bAutoPlay[0]) : false) showJudgeInfo = true;
if (TJAPlayer3.ConfigIni.bTokkunMode) showJudgeInfo = true; if (TJAPlayer3.ConfigIni.bTokkunMode) showJudgeInfo = true;
if (showJudgeInfo) if (showJudgeInfo)

4
OpenTaiko/src/Stages/07.Game/Taiko/ModIcons.cs
View File

@ -74,7 +74,7 @@ namespace TJAPlayer3
{ {
bool _displayed = false; bool _displayed = false;
if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[player]) if (TJAPlayer3.ConfigIni.bAutoPlay[player])
_displayed = true; _displayed = true;
if (_displayed == true) if (_displayed == true)
@ -117,7 +117,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Mod_Random?.t2D描画(x, y); TJAPlayer3.Tx.Mod_Random?.t2D描画(x, y);
else if (rand_ == ERandomMode.SUPERRANDOM) else if (rand_ == ERandomMode.SUPERRANDOM)
TJAPlayer3.Tx.Mod_Super?.t2D描画(x, y); TJAPlayer3.Tx.Mod_Super?.t2D描画(x, y);
else if (rand_ == ERandomMode.HYPERRANDOM) else if (rand_ == ERandomMode.MIRRORRANDOM)
TJAPlayer3.Tx.Mod_Hyper?.t2D描画(x, y); TJAPlayer3.Tx.Mod_Hyper?.t2D描画(x, y);
else else
TJAPlayer3.Tx.Mod_None?.t2D描画(x, y); TJAPlayer3.Tx.Mod_None?.t2D描画(x, y);

4
OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs
View File

@ -21,11 +21,11 @@ namespace TJAPlayer3
} }
public void DrawText(double x, double y, string text) public void DrawText(double x, double y, string text)
{ {
TJAPlayer3.act文字コンソール.tPrint((int)x, (int)y, C文字コンソール.Eフォント種別.白, text); TJAPlayer3.actTextConsole.tPrint((int)x, (int)y, CTextConsole.EFontType.White, text);
} }
public void DrawNum(double x, double y, double text) public void DrawNum(double x, double y, double text)
{ {
TJAPlayer3.act文字コンソール.tPrint((int)x, (int)y, C文字コンソール.Eフォント種別.白, text.ToString()); TJAPlayer3.actTextConsole.tPrint((int)x, (int)y, CTextConsole.EFontType.White, text.ToString());
} }
public void AddGraph(string fileName) public void AddGraph(string fileName)
{ {

2
OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs
View File

@ -669,7 +669,7 @@ namespace TJAPlayer3
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 : 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 :
ctMainCounter.CurrentValue <= AnimeCount1 + 360 ? 1.0f - (float)Math.Sin((ctMainCounter.CurrentValue - AnimeCount1 - 270) * (Math.PI / 180)) * 0.1f : 1.0f; 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(EInstrumentPad.DRUMS, i), numScale);// TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nScore.ToString())); this.tスコア文字表示(score_x, score_y, (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(i), numScale);// TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nScore.ToString()));
if (!b音声再生[8]) if (!b音声再生[8])
{ {

22
OpenTaiko/src/Stages/08.Result/CStage結果.cs
View File

@ -63,8 +63,8 @@ namespace TJAPlayer3
public bool isAutoDisabled(int player) public bool isAutoDisabled(int player)
{ {
return ((player != 1 && !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[player]) return ((player != 1 && !TJAPlayer3.ConfigIni.bAutoPlay[player])
|| (player == 1 && !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[player] && !TJAPlayer3.ConfigIni.bAIBattleMode)); || (player == 1 && !TJAPlayer3.ConfigIni.bAutoPlay[player] && !TJAPlayer3.ConfigIni.bAIBattleMode));
} }
@ -191,7 +191,7 @@ namespace TJAPlayer3
} }
if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, p) < 500000) if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(p) < 500000)
{ {
this.nスコアランク[p] = 0; this.nスコアランク[p] = 0;
} }
@ -201,7 +201,7 @@ namespace TJAPlayer3
for (int i = 0; i < 7; i++) for (int i = 0; i < 7; i++)
{ {
if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, p) >= sr[i]) if ((int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(p) >= sr[i])
{ {
this.nスコアランク[p] = i + 1; this.nスコアランク[p] = i + 1;
} }
@ -292,7 +292,7 @@ namespace TJAPlayer3
// this.st演奏記録[0].nクリア[0] = Math.Max(ini[0].stセクション[0].nクリア[0], clearValue); // this.st演奏記録[0].nクリア[0] = Math.Max(ini[0].stセクション[0].nクリア[0], clearValue);
// Unlock dan grade // Unlock dan grade
if (clearValue > 0 && !TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0]) if (clearValue > 0 && !TJAPlayer3.ConfigIni.bAutoPlay[0])
{ {
/* /*
this.newGradeGranted = TJAPlayer3.NamePlateConfig.tUpdateDanTitle(TJAPlayer3.stage選曲.r確定された曲.strタイトル.Substring(0, 2), this.newGradeGranted = TJAPlayer3.NamePlateConfig.tUpdateDanTitle(TJAPlayer3.stage選曲.r確定された曲.strタイトル.Substring(0, 2),
@ -375,7 +375,7 @@ namespace TJAPlayer3
TJAPlayer3.DiscordClient?.SetPresence(new RichPresence() TJAPlayer3.DiscordClient?.SetPresence(new RichPresence()
{ {
Details = details, Details = details,
State = "Result" + (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[0] == true ? " (Auto)" : ""), State = "Result" + (TJAPlayer3.ConfigIni.bAutoPlay[0] == true ? " (Auto)" : ""),
Timestamps = new Timestamps(TJAPlayer3.StartupTime), Timestamps = new Timestamps(TJAPlayer3.StartupTime),
Assets = new Assets() Assets = new Assets()
{ {
@ -579,7 +579,7 @@ namespace TJAPlayer3
{ {
this.nEarnedMedalsCount[i] += Math.Min(10, TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nADLIB); this.nEarnedMedalsCount[i] += Math.Min(10, TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nADLIB);
if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[i]) if (TJAPlayer3.ConfigIni.bAutoPlay[i])
this.nEarnedMedalsCount[i] = 0; this.nEarnedMedalsCount[i] = 0;
if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1)
this.nEarnedMedalsCount[i] = 0; this.nEarnedMedalsCount[i] = 0;
@ -588,7 +588,7 @@ namespace TJAPlayer3
_sf.tEarnCoins(this.nEarnedMedalsCount[i]); _sf.tEarnCoins(this.nEarnedMedalsCount[i]);
if (!TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[i] if (!TJAPlayer3.ConfigIni.bAutoPlay[i]
&& !(TJAPlayer3.ConfigIni.bAIBattleMode && i == 1)) && !(TJAPlayer3.ConfigIni.bAIBattleMode && i == 1))
{ {
int _cs = -1; int _cs = -1;
@ -617,7 +617,7 @@ namespace TJAPlayer3
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{ {
if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay[i]) if (TJAPlayer3.ConfigIni.bAutoPlay[i])
continue; continue;
if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1)
continue; continue;
@ -1347,7 +1347,7 @@ namespace TJAPlayer3
int sc = GetTowerScoreRank() - 1; int sc = GetTowerScoreRank() - 1;
TJAPlayer3.act文字コンソール.tPrint(0, 40, C文字コンソール.Eフォント種別.白, sc.ToString()); TJAPlayer3.actTextConsole.tPrint(0, 40, CTextConsole.EFontType.White, sc.ToString());
if (sc >= 0 && TJAPlayer3.Tx.TowerResult_ScoreRankEffect != null) if (sc >= 0 && TJAPlayer3.Tx.TowerResult_ScoreRankEffect != null)
{ {
@ -1711,7 +1711,7 @@ namespace TJAPlayer3
totalHit, 1.0f); totalHit, 1.0f);
// Large digits // Large digits
this.actParameterPanel.tスコア文字表示(TJAPlayer3.Skin.DanResult_Score[0] + offset, TJAPlayer3.Skin.DanResult_Score[1], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(EInstrumentPad.DRUMS, 0), 1.0f); this.actParameterPanel.tスコア文字表示(TJAPlayer3.Skin.DanResult_Score[0] + offset, TJAPlayer3.Skin.DanResult_Score[1], (int)TJAPlayer3.stage演奏ドラム画面.actScore.Get(0), 1.0f);
#endregion #endregion