From 3af02dce6202310878aefdbe42559deb8673a6e9 Mon Sep 17 00:00:00 2001 From: 0aubsq <0aubsq@gmail.com> Date: Fri, 25 Mar 2022 06:27:01 +0100 Subject: [PATCH] Default displayed score summary is now defined by the Default difficulty option --- TJAPlayer3/Common/CConfigIni.cs | 2 +- TJAPlayer3/I18N/CLang_en.cs | 7 +++++++ TJAPlayer3/I18N/CLang_fr.cs | 7 +++++++ TJAPlayer3/I18N/CLang_jp.cs | 7 +++++++ TJAPlayer3/Stages/04.Config/CActConfigList.cs | 8 +++++++- TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs | 10 +++++++++- TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs | 6 +++++- Test/Documentation/I18N/DictionnaryIndexes.md | 9 +++++++++ 8 files changed, 52 insertions(+), 4 deletions(-) diff --git a/TJAPlayer3/Common/CConfigIni.cs b/TJAPlayer3/Common/CConfigIni.cs index 9545e198..a53e8cb6 100644 --- a/TJAPlayer3/Common/CConfigIni.cs +++ b/TJAPlayer3/Common/CConfigIni.cs @@ -1486,7 +1486,7 @@ namespace TJAPlayer3 this.bBranchGuide = false; this.nScoreMode = 2; - this.nDefaultCourse = 3; + this.nDefaultCourse = (int)Difficulty.Edit + 1; this.nBranchAnime = 1; this.b大音符判定 = false; diff --git a/TJAPlayer3/I18N/CLang_en.cs b/TJAPlayer3/I18N/CLang_en.cs index 115fe768..eee41e02 100644 --- a/TJAPlayer3/I18N/CLang_en.cs +++ b/TJAPlayer3/I18N/CLang_en.cs @@ -276,6 +276,13 @@ namespace TJAPlayer3 [1033] = "Dan Title", [1034] = "Nameplate Title", + [1040] = "Easy", + [1041] = "Normal", + [1042] = "Hard", + [1043] = "Extreme", + [1044] = "Extra", + [1045] = "Extreme / Extra", + [90000] = "[ERROR] Invalid condition", [90001] = "Item only avaliable at the Shop.", [90002] = "Coin price : ", diff --git a/TJAPlayer3/I18N/CLang_fr.cs b/TJAPlayer3/I18N/CLang_fr.cs index fb49112e..43e0adcb 100644 --- a/TJAPlayer3/I18N/CLang_fr.cs +++ b/TJAPlayer3/I18N/CLang_fr.cs @@ -267,6 +267,13 @@ namespace TJAPlayer3 [1033] = "Titre Dan", [1034] = "Titre", + [1040] = "Facile", + [1041] = "Normal", + [1042] = "Difficile", + [1043] = "Extrême", + [1044] = "Extra", + [1045] = "Extrême / Extra", + [90000] = "[ERREUR] Condition invalide", [90001] = "L'article n'est disponible que dans le Magasin.", [90002] = "Prix en jetons : ", diff --git a/TJAPlayer3/I18N/CLang_jp.cs b/TJAPlayer3/I18N/CLang_jp.cs index 72ffbf58..d311c4ba 100644 --- a/TJAPlayer3/I18N/CLang_jp.cs +++ b/TJAPlayer3/I18N/CLang_jp.cs @@ -331,6 +331,13 @@ namespace TJAPlayer3 [1033] = "段位称号", [1034] = "名札称号", + [1040] = "かんたん", + [1041] = "ふつう", + [1042] = "むずかしい", + [1043] = "おに（表）", + [1044] = "おに（裏）", + [1045] = "おに（裏表）", + [90000] = "[エラー] 無効な条件", [90001] = "上記の商品はコイン商店に限りです、部屋に購入ができません。", [90002] = "コインの値段 : ", diff --git a/TJAPlayer3/Stages/04.Config/CActConfigList.cs b/TJAPlayer3/Stages/04.Config/CActConfigList.cs index 9d5d4529..88a6fafd 100644 --- a/TJAPlayer3/Stages/04.Config/CActConfigList.cs +++ b/TJAPlayer3/Stages/04.Config/CActConfigList.cs @@ -367,7 +367,13 @@ namespace TJAPlayer3 this.iTaikoDefaultCourse = new CItemList(CLangManager.LangInstance.GetString(80), CItemBase.Eパネル種別.通常, TJAPlayer3.ConfigIni.nDefaultCourse, CLangManager.LangInstance.GetString(81), - new string[] { "Easy", "Normal", "Hard", "Oni", "Edit" }); + new string[] { + CLangManager.LangInstance.GetString(1040), + CLangManager.LangInstance.GetString(1041), + CLangManager.LangInstance.GetString(1042), + CLangManager.LangInstance.GetString(1043), + CLangManager.LangInstance.GetString(1044), + CLangManager.LangInstance.GetString(1045) }); this.list項目リスト.Add(this.iTaikoDefaultCourse); this.iTaikoScoreMode = new CItemList(CLangManager.LangInstance.GetString(82), CItemBase.Eパネル種別.通常, TJAPlayer3.ConfigIni.nScoreMode, diff --git a/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs b/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs index 070bfdd3..f6e397b8 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs @@ -136,7 +136,7 @@ namespace TJAPlayer3 #endregion this.r現在選択中の曲 = null; - this.n現在のアンカ難易度レベル = TJAPlayer3.ConfigIni.nDefaultCourse; + this.n現在のアンカ難易度レベル = Math.Min((int)Difficulty.Edit, TJAPlayer3.ConfigIni.nDefaultCourse); base.b活性化してない = true; this.bIsEnumeratingSongs = false; } @@ -287,6 +287,14 @@ namespace TJAPlayer3 } return ret; } + + public void tReturnToRootBox() + { + while (this.r現在選択中の曲.r親ノード != null) + tBOXを出る(); + } + + public bool tBOXを出る() { //Trace.TraceInformation( "box exit" ); diff --git a/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs b/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs index e27830a6..5891955c 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs @@ -912,7 +912,11 @@ namespace TJAPlayer3 #region [Pad displayables] - int[] currentPads = new int[2] { (int)Difficulty.Edit + 1, (int)Difficulty.Edit + 1 }; + int defaultTable = Math.Max(0, Math.Min((int)Difficulty.Edit + 1, TJAPlayer3.ConfigIni.nDefaultCourse)); + + int[] currentPads = new int[2] { + defaultTable, + defaultTable }; int tablesGap = 1034; diff --git a/Test/Documentation/I18N/DictionnaryIndexes.md b/Test/Documentation/I18N/DictionnaryIndexes.md index 55e0c583..97bbe545 100644 --- a/Test/Documentation/I18N/DictionnaryIndexes.md +++ b/Test/Documentation/I18N/DictionnaryIndexes.md @@ -231,6 +231,15 @@ 1033 : Dan title 1034 : Plate title +# Difficulties (0104X) + +1040 : Easy +1041 : Normal +1042 : Hard +1043 : Extreme (Oni) +1044 : Extra (Ura) +1045 : Extreme / Extra + # Feature specific errors (9XXXX) 90000 : "Invalid condition" error message