Merge pull request #2911 from nanaya/touchdevice_mod

Touchdevice mod display
ppy · Apr 5, 2018 · 448fbb4 · 448fbb4
2 parents 33c3835 + f23a590
commit 448fbb4
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 29 deletions.
diff --git a/app/Libraries/ModsHelper.php b/app/Libraries/ModsHelper.php
@@ -37,6 +37,7 @@ class ModsHelper
         [13, 'AP'],
         [14, 'PF', [5]],
         [5, 'SD'],
+        [2, 'TD'],
 
         // mania keys (converts)
         [15, '4K'],

diff --git a/public/images/badges/mods/mod_touchdevice.png b/public/images/badges/mods/mod_touchdevice.png
diff --git a/public/images/badges/mods/mod_touchdevice@2x.png b/public/images/badges/mods/mod_touchdevice@2x.png
diff --git a/resources/assets/coffee/react/beatmapset-page/scoreboard.coffee b/resources/assets/coffee/react/beatmapset-page/scoreboard.coffee
@@ -21,6 +21,7 @@ el = React.createElement
 
 class BeatmapsetPage.Scoreboard extends React.PureComponent
   DEFAULT_MODS = ['NM', 'EZ', 'NF', 'HT', 'HR', 'SD', 'PF', 'DT', 'NC', 'HD', 'FL', 'SO']
+  OSU_MODS = DEFAULT_MODS.concat('TD')
   MANIA_KEY_MODS = ['4K', '5K', '6K', '7K', '8K', '9K']
   MANIA_MODS = ['NM', 'EZ', 'NF', 'HT', 'HR', 'SD', 'PF', 'DT', 'NC', 'FI', 'HD', 'FL']
 
@@ -66,6 +67,8 @@ class BeatmapsetPage.Scoreboard extends React.PureComponent
       else
         MANIA_MODS
 
+    else if @props.beatmap.mode == 'osu'
+      OSU_MODS
     else
       DEFAULT_MODS
 

diff --git a/resources/assets/less/bem/mod.less b/resources/assets/less/bem/mod.less
@@ -30,25 +30,26 @@
     }
   }
 
-  .all(NM, 'no-mod');
-  .all(NF, 'no-fail');
-  .all(EZ, 'easy');
-  .all(HD, 'hidden');
-  .all(HR, 'hard-rock');
-  .all(SD, 'sudden-death');
-  .all(DT, 'double-time');
-  .all(Relax, 'relax');
-  .all(HT, 'half');
-  .all(NC, 'nightcore');
-  .all(FL, 'flashlight');
-  .all(SO, 'spun-out');
-  .all(AP, 'autopilot');
-  .all(PF, 'perfect');
   .all(4K, '4K');
   .all(5K, '5K');
   .all(6K, '6K');
   .all(7K, '7K');
   .all(8K, '8K');
-  .all(FI, 'fader');
   .all(9K, '9K');
+  .all(AP, 'autopilot');
+  .all(DT, 'double-time');
+  .all(EZ, 'easy');
+  .all(FI, 'fader');
+  .all(FL, 'flashlight');
+  .all(HD, 'hidden');
+  .all(HR, 'hard-rock');
+  .all(HT, 'half');
+  .all(NC, 'nightcore');
+  .all(NF, 'no-fail');
+  .all(NM, 'no-mod');
+  .all(PF, 'perfect');
+  .all(Relax, 'relax');
+  .all(SD, 'sudden-death');
+  .all(SO, 'spun-out');
+  .all(TD, 'touchdevice');
 }
diff --git a/resources/lang/en/beatmaps.php b/resources/lang/en/beatmaps.php
@@ -211,27 +211,28 @@
         'electronic' => 'Electronic',
     ],
     'mods' => [
-        'NF' => 'No Fail',
-        'EZ' => 'Easy Mode',
-        'HD' => 'Hidden',
-        'HR' => 'Hard Rock',
-        'SD' => 'Sudden Death',
-        'DT' => 'Double Time',
-        'Relax' => 'Relax',
-        'HT' => 'Half Time',
-        'NC' => 'Nightcore',
-        'FL' => 'Flashlight',
-        'SO' => 'Spun Out',
-        'AP' => 'Auto Pilot',
-        'PF' => 'Perfect',
         '4K' => '4K',
         '5K' => '5K',
         '6K' => '6K',
         '7K' => '7K',
         '8K' => '8K',
-        'FI' => 'Fade In',
         '9K' => '9K',
+        'AP' => 'Auto Pilot',
+        'DT' => 'Double Time',
+        'EZ' => 'Easy Mode',
+        'FI' => 'Fade In',
+        'FL' => 'Flashlight',
+        'HD' => 'Hidden',
+        'HR' => 'Hard Rock',
+        'HT' => 'Half Time',
+        'NC' => 'Nightcore',
+        'NF' => 'No Fail',
         'NM' => 'No mods',
+        'PF' => 'Perfect',
+        'Relax' => 'Relax',
+        'SD' => 'Sudden Death',
+        'SO' => 'Spun Out',
+        'TD' => 'Touch Device',
     ],
     'language' => [
         'any' => 'Any',