diff --git a/OpenTaiko/src/Common/CConfigIni.cs b/OpenTaiko/src/Common/CConfigIni.cs index fb6caa4b..8967a672 100644 --- a/OpenTaiko/src/Common/CConfigIni.cs +++ b/OpenTaiko/src/Common/CConfigIni.cs @@ -1505,7 +1505,8 @@ namespace TJAPlayer3 public bool bAuto先生の連打; public int nRollsPerSec; - public int nAILevel; + public int nDefaultAILevel = 4; + public int nAILevel = 4; public bool bAIBattleMode = false; public CAIPerformances[] apAIPerformances = @@ -1595,6 +1596,11 @@ namespace TJAPlayer3 public bool bIsEnabledSystemMenu; // #28200 2012.5.1 yyagi System Menuの使用可否切替 public string strSystemSkinSubfolderFullName; // #28195 2012.5.2 yyagi Skin切替用 System/以下のサブフォルダ名 + public void tInitializeAILevel() + { + this.nAILevel = this.nDefaultAILevel; + } + public bool bEnterがキー割り当てのどこにも使用されていない { get @@ -2497,7 +2503,7 @@ namespace TJAPlayer3 sw.WriteLine("Taiko5P={0}", this.bAutoPlay[4] ? 1 : 0); sw.WriteLine("TaikoAutoRoll={0}", this.bAuto先生の連打 ? 1 : 0); sw.WriteLine("RollsPerSec={0}", this.nRollsPerSec); - sw.WriteLine("AILevel={0}", this.nAILevel); + sw.WriteLine("DefaultAILevel={0}", this.nDefaultAILevel); //sw.WriteLine("AIBattleMode={0}", bAIBattleMode ? 1 : 0); sw.WriteLine(); sw.WriteLine(";-------------------"); @@ -3407,9 +3413,10 @@ namespace TJAPlayer3 { this.nRollsPerSec = int.Parse(str4); } - else if (str3.Equals("AILevel")) + else if (str3.Equals("DefaultAILevel")) { - this.nAILevel = int.Parse(str4); + this.nDefaultAILevel = int.Parse(str4); + this.nAILevel = this.nDefaultAILevel; } /* if (str3.Equals("AIBattleMode")) diff --git a/OpenTaiko/src/Common/TJAPlayer3.cs b/OpenTaiko/src/Common/TJAPlayer3.cs index a85cd27f..53ab90da 100644 --- a/OpenTaiko/src/Common/TJAPlayer3.cs +++ b/OpenTaiko/src/Common/TJAPlayer3.cs @@ -1243,6 +1243,7 @@ namespace TJAPlayer3 ConfigIni.nPreviousPlayerCount = ConfigIni.nPlayerCount; ConfigIni.nPlayerCount = 2; ConfigIni.bAIBattleMode = true; + ConfigIni.tInitializeAILevel(); //----------------------------- #endregion break; diff --git a/OpenTaiko/src/Databases/DBCharacter.cs b/OpenTaiko/src/Databases/DBCharacter.cs index f9ae2a40..c8812c30 100644 --- a/OpenTaiko/src/Databases/DBCharacter.cs +++ b/OpenTaiko/src/Databases/DBCharacter.cs @@ -19,8 +19,8 @@ namespace TJAPlayer3 { float mult = 1f; - if (Gauge == "Hard") mult *= 1.5f; - if (Gauge == "Extreme") mult *= 1.8f; + if (Gauge == "Hard" && !TJAPlayer3.ConfigIni.bForceNormalGauge) mult *= 1.5f; + if (Gauge == "Extreme" && !TJAPlayer3.ConfigIni.bForceNormalGauge) mult *= 1.8f; return mult; } diff --git a/OpenTaiko/src/Stages/04.Config/CActConfigList.cs b/OpenTaiko/src/Stages/04.Config/CActConfigList.cs index 14fb2d19..31c17713 100644 --- a/OpenTaiko/src/Stages/04.Config/CActConfigList.cs +++ b/OpenTaiko/src/Stages/04.Config/CActConfigList.cs @@ -338,7 +338,7 @@ namespace TJAPlayer3 CLangManager.LangInstance.GetString(61)); this.list項目リスト.Add(this.iRollsPerSec); - this.iAILevel = new CItemInteger(CLangManager.LangInstance.GetString(12), 1, 10, TJAPlayer3.ConfigIni.nAILevel, + this.iAILevel = new CItemInteger(CLangManager.LangInstance.GetString(12), 1, 10, TJAPlayer3.ConfigIni.nDefaultAILevel, CLangManager.LangInstance.GetString(13)); this.list項目リスト.Add(this.iAILevel); @@ -2003,7 +2003,7 @@ namespace TJAPlayer3 //TJAPlayer3.ConfigIni.bAuto先生の連打 = this.iTaikoAutoRoll.bON; TJAPlayer3.ConfigIni.nRollsPerSec = this.iRollsPerSec.n現在の値; - TJAPlayer3.ConfigIni.nAILevel = this.iAILevel.n現在の値; + TJAPlayer3.ConfigIni.nDefaultAILevel = this.iAILevel.n現在の値; for (int i = 0; i < 2; i++) TJAPlayer3.NamePlate.tNamePlateRefreshTitles(i); diff --git a/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs b/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs index 21d0e4e5..7fd5937c 100644 --- a/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs +++ b/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs @@ -414,7 +414,8 @@ namespace TJAPlayer3 } else if (TJAPlayer3.ConfigIni.bAIBattleMode) { - TJAPlayer3.Tx.SongLoading_Bg_AI_Wait.t2D描画(0, 0); + TJAPlayer3.ConfigIni.tInitializeAILevel(); + TJAPlayer3.Tx.SongLoading_Bg_AI_Wait.t2D描画(0, 0); drawPlate_AI(); } else