Merge pull request #1123 from cwtickle/feature/0454-AP-rank

[0454/AP-rank] ランクAPの実装
cwtickle · Sep 25, 2021 · bf4d6b4 · bf4d6b4
2 parents b8371cb + a3a8e00
commit bf4d6b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/js/danoni_main.js b/js/danoni_main.js
@@ -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);
@@ -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];

diff --git a/js/lib/danoni_constants.js b/js/lib/danoni_constants.js
@@ -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`,