Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[0454/AP-rank] ランクAPの実装 #1123

Merged
merged 1 commit into from Sep 25, 2021
Merged

[0454/AP-rank] ランクAPの実装 #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions js/danoni_main.js
View file
Open in desktop
Expand Up @@ -2965,6 +2965,7 @@ function headerConvert(_dosObj) {
obj.defaultColorgrd[0] = setVal(obj.defaultColorgrd[0], false, C_TYP_BOOLEAN);
obj.defaultColorgrd[1] = setVal(obj.defaultColorgrd[1], intermediateColor, C_TYP_STRING);
}
g_rankObj.rankColorAllPerfect = intermediateColor;

// カラーコードのゼロパディング有無設定
obj.colorCdPaddingUse = setVal(_dosObj.colorCdPaddingUse, false, C_TYP_BOOLEAN);
Expand Down Expand Up @@ -9457,9 +9458,9 @@ function resultInit() {
if (g_resultObj.spState === ``) {
g_resultObj.spState = `cleared`;
}
if (g_resultObj.matari + g_resultObj.shobon + g_resultObj.uwan + g_resultObj.sfsf + g_resultObj.iknai === 0) {
rankMark = g_rankObj.rankMarkPF;
rankColor = g_rankObj.rankColorPF;
if (g_resultObj.spState === `perfect` || g_resultObj.spState === `allPerfect`) {
rankMark = g_rankObj[`rankMark${toCapitalize(g_resultObj.spState)}`];
rankColor = g_rankObj[`rankColor${toCapitalize(g_resultObj.spState)}`];
} else {
const rPos = g_rankObj.rankRate.findIndex(rate => resultScore * 100 / g_maxScore >= rate);
rankMark = g_rankObj.rankMarks[rPos];
Expand Down
6 changes: 4 additions & 2 deletions js/lib/danoni_constants.js
View file
Open in desktop
Expand Up @@ -332,8 +332,10 @@ const g_rankObj = {
rankRate: [97, 90, 85, 80, 75, 70, 50, 0],
rankColor: [`#00ccff`, `#6600ff`, `#ff9900`, `#ff0000`, `#00ff00`, `#ff00ff`, `#cc00ff`, `#cc9933`],

rankMarkPF: `PF`,
rankColorPF: `#cccc00`,
rankMarkAllPerfect: `AP`,
rankColorAllPerfect: ``,
rankMarkPerfect: `PF`,
rankColorPerfect: `#cccc00`,
rankMarkC: `C`,
rankColorC: `#cc9933`,
rankMarkF: `F`,
Expand Down