Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-02-17 19:09:25 +01:00
Code Releases Activity

Add the 'Bombs hit' and 'ADLIB count' exams for Dan charts

Browse Source
This commit is contained in:
0aubsq 2022-05-21 17:19:08 +02:00
parent d30f025f2d
commit 945fb128bd
9 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TJAPlayer3/I18N/CLang_en.cs
View File

@ -301,14 +301,16 @@ namespace TJAPlayer3
[1003] = "Score",
[1010] = "Soul gauge",
[1011] = "Perfect count",
[1012] = "Good count",
[1011] = "Good count",
[1012] = "Ok count",
[1013] = "Bad count",
[1014] = "Score",
[1015] = "Rolls count",
[1016] = "Hit count",
[1017] = "Combo",
[1018] = "Accuracy",
[1019] = "ADLIB count",
[1020] = "Bombs hit",
[1030] = "Return",
[1031] = "Petit-Chara",

6
TJAPlayer3/I18N/CLang_fr.cs
View File

@ -292,14 +292,16 @@ namespace TJAPlayer3
[1003] = "Score",
[1010] = "Jauge d'âme",
[1011] = "Nombre de Parfait",
[1012] = "Nombre de Bon",
[1011] = "Nombre de Bon",
[1012] = "Nombre de Ok",
[1013] = "Nombre de Mauvais",
[1014] = "Score",
[1015] = "Frappes successives",
[1016] = "Nombre de frappes",
[1017] = "Combo",
[1018] = "Précision",
[1019] = "Nombre d'ADLIB",
[1020] = "Bombes activées",
[1030] = "Retour",
[1031] = "Petit Personnage",

4
TJAPlayer3/I18N/CLang_jp.cs
View File

@ -363,8 +363,10 @@ namespace TJAPlayer3
[1016] = "叩けた数",
[1017] = "コンボ数",
[1018] = "精度",
[1019] = "ADLIBの数",
[1020] = "叩けた爆弾",
[1030] = "戻る",
[1030] = "戻る",
[1031] = "プチキャラ",
[1032] = "キャラクター",
[1033] = "段位称号",

6
TJAPlayer3/Songs/CDTX.cs
View File

@ -4755,6 +4755,12 @@ namespace TJAPlayer3
case "a":
examType = Exam.Type.Accuracy;
break;
case "ja":
examType = Exam.Type.JudgeADLIB;
break;
case "jm":
examType = Exam.Type.JudgeMine;
break;
default:
examType = Exam.Type.Gauge;
break;

35
TJAPlayer3/Songs/Dan-C.cs
View File

@ -53,31 +53,17 @@ namespace TJAPlayer3
switch (GetExamType())
{
case Exam.Type.Gauge:
SetCleared();
break;
case Exam.Type.JudgePerfect:
SetCleared();
break;
case Exam.Type.JudgeGood:
SetCleared();
break;
case Exam.Type.JudgeBad:
SetCleared();
break;
case Exam.Type.Score:
SetCleared();
break;
case Exam.Type.Roll:
SetCleared();
break;
case Exam.Type.Hit:
SetCleared();
break;
case Exam.Type.Combo:
SetCleared();
break;
case Exam.Type.Accuracy:
SetCleared();
case Exam.Type.Accuracy:
case Exam.Type.JudgeADLIB:
case Exam.Type.JudgeMine:
SetCleared();
break;
default:
break;
@ -239,7 +225,9 @@ namespace TJAPlayer3
case Exam.Type.Gauge:
case Exam.Type.JudgePerfect:
case Exam.Type.JudgeGood:
case Exam.Type.JudgeBad:
case Exam.Type.JudgeBad:
case Exam.Type.JudgeADLIB:
case Exam.Type.JudgeMine:
case Exam.Type.Score:
case Exam.Type.Roll:
case Exam.Type.Hit:
@ -258,7 +246,9 @@ namespace TJAPlayer3
case Exam.Type.Gauge:
case Exam.Type.JudgePerfect:
case Exam.Type.JudgeGood:
case Exam.Type.JudgeBad:
case Exam.Type.JudgeBad:
case Exam.Type.JudgeADLIB:
case Exam.Type.JudgeMine:
case Exam.Type.Score:
case Exam.Type.Roll:
case Exam.Type.Hit:
@ -361,7 +351,10 @@ namespace TJAPlayer3
Roll,
Hit,
Combo,
Accuracy
Accuracy,
JudgeADLIB,
JudgeMine,
Total,
}
/// <summary>

2
TJAPlayer3/Stages/05.DaniSelect/CActSelect段位リスト.cs
View File

@ -62,7 +62,7 @@ namespace TJAPlayer3
else
this.pfExamFont = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 13);
this.ttkExams = new TitleTextureKey[(int)Exam.Type.Accuracy + 1];
this.ttkExams = new TitleTextureKey[(int)Exam.Type.Total];
for (int i = 0; i < this.ttkExams.Length; i++)
{
this.ttkExams[i] = new TitleTextureKey(CLangManager.LangInstance.GetString(1010 + i), this.pfExamFont, Color.White, Color.SaddleBrown, 1000);

9
TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -365,6 +365,8 @@ namespace TJAPlayer3
n可 = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count];
n不可 = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count];
n連打 = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count];
nADLIB = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count];
nMine = new int[TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count];
}
@ -610,6 +612,9 @@ namespace TJAPlayer3
public int[] n可;
public int[] n不可;
public int[] n連打;
public int[] nADLIB;
public int[] nMine;
public int n現在のトップChip = -1;
protected int[] n最後に再生したBGMの実WAV番号 = new int[ 50 ];
protected int n最後に再生したHHのチャンネル番号;
@ -1442,6 +1447,8 @@ namespace TJAPlayer3
TJAPlayer3.stage演奏ドラム画面.actChipFireD.Start(0x11, eJudgeResult, nPlayer);
this.CChartScore[nPlayer].nADLIB++;
this.CBranchScore[nPlayer].nADLIB++;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan)
this.nADLIB[actDan.NowShowingNumber]++;
}
break;
}
@ -1458,6 +1465,8 @@ namespace TJAPlayer3
actGauge.MineDamage(nPlayer);
this.CChartScore[nPlayer].nMine++;
this.CBranchScore[nPlayer].nMine++;
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan)
this.nMine[actDan.NowShowingNumber]++;
}
break;
}

14
TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs
View File

@ -129,7 +129,7 @@ namespace TJAPlayer3
else
this.pfExamFont = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 14);
this.ttkExams = new TitleTextureKey[(int)Exam.Type.Accuracy + 1];
this.ttkExams = new TitleTextureKey[(int)Exam.Type.Total];
for (int i = 0; i < this.ttkExams.Length; i++)
{
this.ttkExams[i] = new TitleTextureKey(CLangManager.LangInstance.GetString(1010 + i), this.pfExamFont, Color.White, Color.SaddleBrown, 1000);
@ -170,6 +170,12 @@ namespace TJAPlayer3
int individualOks = TJAPlayer3.stage演奏ドラム画面.n可[NowShowingNumber];
int individualBads = TJAPlayer3.stage演奏ドラム画面.n不可[NowShowingNumber];
int totalADLIBs = TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nADLIB;
int totalMines = TJAPlayer3.stage演奏ドラム画面.CChartScore[0].nMine;
int individualADLIBs = TJAPlayer3.stage演奏ドラム画面.nADLIB[NowShowingNumber];
int individualMines = TJAPlayer3.stage演奏ドラム画面.nMine[NowShowingNumber];
double accuracy = (totalGoods * 100 + totalOks * 50) / (double)(totalGoods + totalOks + totalBads);
double individualAccuracy = (individualGoods * 100 + individualOks * 50) / (double)(individualGoods + individualOks + individualBads);
@ -187,6 +193,12 @@ namespace TJAPlayer3
case Exam.Type.JudgeBad:
isChangedAmount = Challenge[i].Update(ExamChange[i] ? individualBads : totalBads);
break;
case Exam.Type.JudgeADLIB:
isChangedAmount = Challenge[i].Update(ExamChange[i] ? individualADLIBs : totalADLIBs);
break;
case Exam.Type.JudgeMine:
isChangedAmount = Challenge[i].Update(ExamChange[i] ? individualMines : totalMines);
break;
case Exam.Type.Score:
isChangedAmount = Challenge[i].Update((int)TJAPlayer3.stage演奏ドラム画面.actScore.GetScore(0));
break;

2
Test/Documentation/I18N/DictionnaryIndexes.md
View File

@ -277,6 +277,8 @@
1016 : Notes hit count
1017 : Combo
1018 : Accuracy
1019 : ADLIB count
1020 : Bombs hit
# Heya buttons (0103X)