Merge pull request ppy#10865 from nanaya/score-f

Support displaying F rank and make it default for fail scores

app/Models/Solo/Score.php

@@ -64,7 +64,7 @@ public static function createFromJsonOrExplode(array $params)
         // older lazer builds potentially submit incorrect details here (and we still want to
         // accept their scores.
         if (!$score->data->passed) {
-            $score->data->rank = 'D';
+            $score->data->rank = 'F';
         }
 
         $score->saveOrExplode();

resources/css/bem/score-rank.less

@@ -19,14 +19,15 @@
     background-image: url("~@images/badges/score-ranks-v2019/GradeSmall-@{filename}.svg?3");
   }
 
-  .all(XH, "SS-Silver");
-  .all(X, "SS");
-  .all(SH, "S-Silver");
-  .all(S, "S");
-  .all(A, "A");
-  .all(B, "B");
-  .all(C, "C");
-  .all(D, "D");
+  .all(~"XH", "SS-Silver");
+  .all(~"X", "SS");
+  .all(~"SH", "S-Silver");
+  .all(~"S", "S");
+  .all(~"A", "A");
+  .all(~"B", "B");
+  .all(~"C", "C");
+  .all(~"D", "D");
+  .all(~"F", "F");
 
   &--full {
     .full-size();

resources/js/interfaces/rank.ts

@@ -1,6 +1,6 @@
 // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-type Rank = 'A' | 'B' | 'C' | 'D' | 'S' | 'SH' | 'X' | 'XH';
+type Rank = 'A' | 'B' | 'C' | 'D' | 'F' | 'S' | 'SH' | 'X' | 'XH';
 
 export default Rank;

resources/js/scores-show/dial.tsx

@@ -17,6 +17,7 @@ const displayRank: Record<Rank, string> = {
   B: 'B',
   C: 'C',
   D: 'D',
+  F: 'F',
   S: 'S',
   SH: 'S',
   X: 'SS',

resources/js/scores-show/tower.tsx

@@ -14,6 +14,7 @@ const rankIntMap: Record<Rank, number> = {
   B: 2,
   C: 1,
   D: 0,
+  F: -1,
   S: 4,
   SH: 4,
   X: 5,

tests/Models/Solo/ScoreTest.php

@@ -59,7 +59,7 @@ public function testLegacyPassScoreRetainsRank()
         $this->assertSame($legacy->rank, 'S');
     }
 
-    public function testLegacyFailScoreIsRankD()
+    public function testLegacyFailScoreIsRankF()
     {
         $score = Score::createFromJsonOrExplode([
             'accuracy' => 1,
@@ -76,12 +76,12 @@ public function testLegacyFailScoreIsRankD()
         ]);
 
         $this->assertFalse($score->data->passed);
-        $this->assertSame($score->data->rank, 'D');
+        $this->assertSame($score->data->rank, 'F');
 
         $legacy = $score->createLegacyEntryOrExplode();
 
         $this->assertFalse($legacy->perfect);
-        $this->assertSame($legacy->rank, 'D');
+        $this->assertSame($legacy->rank, 'F');
     }
 
     public function testLegacyScoreHitCounts()