diff --git a/TJAPlayer3/Common/CConfigIni.cs b/TJAPlayer3/Common/CConfigIni.cs index c22f03fe..4febfbf2 100644 --- a/TJAPlayer3/Common/CConfigIni.cs +++ b/TJAPlayer3/Common/CConfigIni.cs @@ -646,20 +646,21 @@ namespace TJAPlayer3 } // プロパティ - public class CAIPerformances { public int nGoodOdds; public int nPerfectOdds; public int nBadOdds; public int nRollSpeed; + public int nMineHitOdds; - public CAIPerformances(int po, int go, int bo, int rp) + public CAIPerformances(int po, int go, int bo, int rp, int mho = 0) { nGoodOdds = go; nPerfectOdds = po; nBadOdds = bo; nRollSpeed = rp; + nMineHitOdds = mho; } } @@ -821,16 +822,16 @@ namespace TJAPlayer3 public CAIPerformances[] apAIPerformances = { - new CAIPerformances(500, 400, 100, 7), - new CAIPerformances(650, 310, 40, 8), - new CAIPerformances(750, 225, 25, 9), - new CAIPerformances(800, 180, 20, 10), - new CAIPerformances(850, 135, 15, 12), - new CAIPerformances(900, 90, 10, 14), - new CAIPerformances(910, 85, 5, 16), - new CAIPerformances(950, 49, 1, 22), - new CAIPerformances(975, 25, 0, 26), - new CAIPerformances(1000, 0, 0, 30) + new CAIPerformances(500, 400, 100, 7, 200), + new CAIPerformances(650, 310, 40, 8, 150), + new CAIPerformances(750, 225, 25, 9, 100), + new CAIPerformances(800, 180, 20, 10, 70), + new CAIPerformances(850, 135, 15, 12, 50), + new CAIPerformances(900, 90, 10, 14, 30), + new CAIPerformances(910, 85, 5, 16, 20), + new CAIPerformances(950, 49, 1, 22, 10), + new CAIPerformances(975, 25, 0, 26, 5), + new CAIPerformances(1000, 0, 0, 30, 0) }; public CTimingZones[] tzLevels = diff --git a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs index 2a76201b..d807ac99 100644 --- a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs +++ b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs @@ -546,6 +546,8 @@ namespace TJAPlayer3 public int nGood; public int nMiss; public int nScore; + public int nADLIB; + public int nMine; } public CAct演奏AVI actAVI; @@ -1438,7 +1440,8 @@ namespace TJAPlayer3 eJudgeResult = E判定.Perfect; // Prevent ADLIB notes breaking DFC runs TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.Start(0x11, eJudgeResult, true, nPlayer); TJAPlayer3.stage演奏ドラム画面.actChipFireD.Start(0x11, eJudgeResult, nPlayer); - + this.CChartScore[nPlayer].nADLIB++; + this.CBranchScore[nPlayer].nADLIB++; } break; } @@ -1453,6 +1456,8 @@ namespace TJAPlayer3 TJAPlayer3.stage演奏ドラム画面.actChipFireD.Start(0x11, E判定.Mine, nPlayer); TJAPlayer3.Skin.soundBomb?.t再生する(); actGauge.MineDamage(nPlayer); + this.CChartScore[nPlayer].nMine++; + this.CBranchScore[nPlayer].nMine++; } break; } @@ -1546,13 +1551,16 @@ namespace TJAPlayer3 { case E判定.Perfect: { + if (NotesManager.IsADLIB(pChip)) + break; + this.CBranchScore[nPlayer].nGreat++; this.CChartScore[nPlayer].nGreat++; if ( nPlayer == 0 ) this.nヒット数_Auto含まない.Drums.Perfect++; this.actCombo.n現在のコンボ数[nPlayer]++; - if(TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) + if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) this.n良[actDan.NowShowingNumber]++; if (this.actCombo.ctコンボ加算[nPlayer].b終了値に達してない) @@ -1597,6 +1605,7 @@ namespace TJAPlayer3 if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) this.n不可[actDan.NowShowingNumber]++; + else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) CFloorManagement.damage(); @@ -1621,6 +1630,9 @@ namespace TJAPlayer3 { if(!NotesManager.IsGenericRoll(pChip)) { + if (NotesManager.IsADLIB(pChip)) + break; + if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) this.n良[actDan.NowShowingNumber]++; @@ -1670,8 +1682,11 @@ namespace TJAPlayer3 default: { - if(!NotesManager.IsGenericRoll(pChip) && !NotesManager.IsADLIB(pChip)) + if(!NotesManager.IsGenericRoll(pChip)) { + if (!NotesManager.IsMissableNote(pChip) && !bBombHit) + break; + if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan) this.n不可[actDan.NowShowingNumber]++; else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower) diff --git a/TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs b/TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs index 3a877a21..b6483794 100644 --- a/TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs +++ b/TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs @@ -411,7 +411,7 @@ namespace TJAPlayer3 { TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGreat.ToString(), TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nGood.ToString(), - TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMiss.ToString(), + (TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMiss - TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nMine).ToString(), //TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nRoll.ToString(), TJAPlayer3.stage演奏ドラム画面.GetRoll(i).ToString(), TJAPlayer3.stage演奏ドラム画面.actCombo.n現在のコンボ数.最高値[i].ToString() diff --git a/TJAPlayer3/Stages/08.Result/CStage結果.cs b/TJAPlayer3/Stages/08.Result/CStage結果.cs index 7070e5dd..121328aa 100644 --- a/TJAPlayer3/Stages/08.Result/CStage結果.cs +++ b/TJAPlayer3/Stages/08.Result/CStage結果.cs @@ -653,6 +653,12 @@ namespace TJAPlayer3 } } + // ADLIB bonuses : 1 coin per ADLIB + for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) + { + this.nEarnedMedalsCount[i] += TJAPlayer3.stage演奏ドラム画面.CChartScore[i].nADLIB; + } + if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay) this.nEarnedMedalsCount[0] = 0; if (TJAPlayer3.ConfigIni.b太鼓パートAutoPlay2P || TJAPlayer3.ConfigIni.nAILevel > 0)