From 72c8f71dda70d383a14f587f57dfeafb4fdaf82e Mon Sep 17 00:00:00 2001 From: TFD500 Date: Wed, 17 Jul 2024 07:39:01 -0400 Subject: [PATCH] Reject TJAP3, embrace OpenTaiko. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Keeping it slow with this one. I've got a ton of translation stuff that I need to do and then that's it. I cannot help any further due to my poor coding skillz :sob: - Replaced TJAPlayer3-f references in some error messages with OpenTaiko in Program.cs, along with some slight log modifications. - Replaced Input Calibration chart metadata with OpenTaiko Developers instead of TJAPlayer3 Developers in CStage曲読み込み.cs. - Fixed a tiny bug that I had while changing TJAPlayer3.cs. Oops. BONUS CHANGE: - If you check CActSelect曲リスト.cs, I have changed it to say "loading" instead of enumerating. It's more clear for the user and it saves a bit of coding space. --- OpenTaiko/Readme.txt | 0 OpenTaiko/src/Common/Program.cs | 9 +++++---- OpenTaiko/src/Common/TJAPlayer3.cs | 2 +- OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs | 4 ++-- OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 OpenTaiko/Readme.txt diff --git a/OpenTaiko/Readme.txt b/OpenTaiko/Readme.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/OpenTaiko/src/Common/Program.cs b/OpenTaiko/src/Common/Program.cs index 391671b8..e955f0c7 100644 --- a/OpenTaiko/src/Common/Program.cs +++ b/OpenTaiko/src/Common/Program.cs @@ -91,8 +91,9 @@ namespace TJAPlayer3 osplatform = "osx"; else if (OperatingSystem.IsLinux()) osplatform = "linux"; + // this is gonna be redundant code i hope? :3 -tfd else - throw new PlatformNotSupportedException("TJAPlayer3-f does not support this OS."); + throw new PlatformNotSupportedException("OpenTaiko does not support this OS."); string platform = ""; @@ -111,7 +112,7 @@ namespace TJAPlayer3 platform = "arm64"; break; default: - throw new PlatformNotSupportedException($"TJAPlayer3 does not support this Architecture. ({RuntimeInformation.ProcessArchitecture})"); + throw new PlatformNotSupportedException($"OpenTaiko does not support this architecture. ({RuntimeInformation.ProcessArchitecture})"); } FFmpeg.AutoGen.ffmpeg.RootPath = AppContext.BaseDirectory + @"FFmpeg/" + osplatform + "-" + platform + "/"; @@ -127,7 +128,7 @@ namespace TJAPlayer3 mania.Run(); Trace.WriteLine( "" ); - Trace.WriteLine( "遊んでくれてありがとう！" ); + Trace.WriteLine( "Thank you for playing!" ); } #if !DEBUG catch( Exception e ) @@ -135,7 +136,7 @@ namespace TJAPlayer3 Trace.WriteLine( "" ); Trace.Write( e.ToString() ); Trace.WriteLine( "" ); - Trace.WriteLine( "エラーだゴメン！（涙" ); + Trace.WriteLine( "An error has occured." ); AssemblyName asmApp = Assembly.GetExecutingAssembly().GetName(); //MessageBox.Show( "エラーが発生しました。\n" + // e.ToString(), asmApp.Name + " Ver." + asmApp.Version.ToString().Substring(0, asmApp.Version.ToString().Length - 2) + " Error", MessageBoxButtons.OK, MessageBoxIcon.Error ); // #23670 2011.2.28 yyagi to show error dialog diff --git a/OpenTaiko/src/Common/TJAPlayer3.cs b/OpenTaiko/src/Common/TJAPlayer3.cs index e299b54f..b9cc82c5 100644 --- a/OpenTaiko/src/Common/TJAPlayer3.cs +++ b/OpenTaiko/src/Common/TJAPlayer3.cs @@ -2949,7 +2949,7 @@ for (int i = 0; i < 3; i++) { #endregion #region [ Songs管理 の初期化 ] //--------------------- - Trace.TraceInformation( "Initializing song list... ); + Trace.TraceInformation( "Initializing song list..." ); Trace.Indent(); try { diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs index cc84649b..77749306 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs @@ -1082,14 +1082,14 @@ namespace TJAPlayer3 #region [ "曲データを検索しています"画像 ] try { - this.txEnumeratingSongs = new CTexture(ft曲リスト用フォント.DrawText("Now enumerating songs.\nPlease wait...", Color.White)); + this.txEnumeratingSongs = new CTexture(ft曲リスト用フォント.DrawText("Now loading songs.\nPlease wait...", Color.White)); this.txEnumeratingSongs.vcScaleRatio = new Vector3D( 0.5f, 0.5f, 1f ); // 半分のサイズで表示する。 /* using ( Bitmap image = new Bitmap( 640, 96 ) ) using ( Graphics graphics = Graphics.FromImage( image ) ) { - string[] s1 = { "曲データを検索しています。", "Now enumerating songs." }; + string[] s1 = { "曲データを検索しています。", "Now loading songs." }; string[] s2 = { "そのまましばらくお待ち下さい。", "Please wait..." }; graphics.DrawString( s1[c], this.ft曲リスト用フォント, Brushes.DarkGray, (float) 2f, (float) 2f ); graphics.DrawString( s1[c], this.ft曲リスト用フォント, Brushes.White, (float) 0f, (float) 0f ); diff --git a/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs b/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs index cb2451e7..be068e75 100644 --- a/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs +++ b/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs @@ -95,7 +95,7 @@ namespace TJAPlayer3 !TJAPlayer3.ConfigIni.bAutoPlay[0] && TJAPlayer3.ConfigIni.nPlayerCount == 1 && str曲タイトル == "Input Calibration" && - strサブタイトル == "TJAPlayer3 Developers"; + strサブタイトル == "OpenTaiko Developers"; this.strSTAGEFILE = CSkin.Path(@$"Graphics{Path.DirectorySeparatorChar}4_SongLoading{Path.DirectorySeparatorChar}Background.png");