Skip to content

Commit

Permalink
Merge pull request #2000 from nekodex/cram-more-stuff-into-scoreboard
Browse files Browse the repository at this point in the history
Add misses and max combo to scoreboards 🌈
  • Loading branch information
nanaya committed Dec 15, 2017
2 parents 7d9d026 + 77f376e commit b6b101a
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 0 deletions.
13 changes: 13 additions & 0 deletions resources/assets/coffee/react/beatmapset-page/score-big.coffee
Expand Up @@ -59,12 +59,25 @@ BeatmapsetPage.ScoreBig = (props) ->
div className: "#{bn}__stat-value #{bn}__stat-value--score",
"#{_.round props.score.accuracy * 100, 2}%"

div className: "#{bn}__stat hidden-xs",
div className: "#{bn}__stat-header",
osu.trans 'beatmapsets.show.scoreboard.stats.combo'
div className: "#{bn}__stat-value #{bn}__stat-value--score",
"#{props.score.max_combo.toLocaleString()}x"

div className: "#{bn}__stat",
div className: "#{bn}__stat-header",
hits.header
div className: "#{bn}__stat-value #{bn}__stat-value--score",
hits.values

div className: "#{bn}__stat hidden-xs",
div className: "#{bn}__stat-header",
osu.trans 'beatmapsets.show.scoreboard.stats.misses'
div className: "#{bn}__stat-value #{bn}__stat-value--score",
props.score.statistics.count_miss


div className: "#{bn}__section #{bn}__section--bottom",
div className: "#{bn}__achieved",
osu.trans 'beatmapsets.show.scoreboard.achieved', when: moment(props.score.created_at).fromNow()
12 changes: 12 additions & 0 deletions resources/assets/coffee/react/beatmapset-page/score-top.coffee
Expand Up @@ -69,12 +69,24 @@ BeatmapsetPage.ScoreTop = (props) ->
div className: "#{bn}__stat-value #{bn}__stat-value--score",
"#{_.round props.score.accuracy * 100, 2}%"

div className: "#{bn}__stat hidden-xs",
div className: "#{bn}__stat-header",
osu.trans 'beatmapsets.show.scoreboard.stats.combo'
div className: "#{bn}__stat-value #{bn}__stat-value--score",
"#{props.score.max_combo.toLocaleString()}x"

div className: "#{bn}__stat",
div className: "#{bn}__stat-header",
hits.header
div className: "#{bn}__stat-value #{bn}__stat-value--score",
hits.values

div className: "#{bn}__stat hidden-xs",
div className: "#{bn}__stat-header",
osu.trans 'beatmapsets.show.scoreboard.stats.misses'
div className: "#{bn}__stat-value #{bn}__stat-value--score",
props.score.statistics.count_miss

if props.score.mods.length != 0
div className: "#{bn}__mods",
el Mods, mods: props.score.mods
8 changes: 8 additions & 0 deletions resources/assets/coffee/react/beatmapset-page/score.coffee
Expand Up @@ -51,5 +51,13 @@ BeatmapsetPage.Score = (props) ->
div className: 'beatmapset-score__stat beatmapset-score__stat--accuracy hidden-xs',
"#{_.round props.score.accuracy * 100, 2}%"

div className: 'beatmapset-score__stat beatmapset-score__stat--combo hidden-xs',
"#{props.score.max_combo.toLocaleString()}x"

div className: 'beatmapset-score__stat beatmapset-score__stat--hits hidden-xs',
hits.values

div className: 'beatmapset-score__stat beatmapset-score__stat--miss hidden-xs',
if props.score.statistics.count_miss > 0
osu.trans 'beatmapsets.show.scoreboard.miss_count',
count: props.score.statistics.count_miss
8 changes: 8 additions & 0 deletions resources/assets/less/bem/beatmapset-score.less
Expand Up @@ -78,8 +78,16 @@
width: 90px;
}

&--combo {
width: 60px;
}

&--hits {
width: 160px;
}

&--miss {
width: 80px;
}
}
}
3 changes: 3 additions & 0 deletions resources/lang/en/beatmapsets.php
Expand Up @@ -81,6 +81,7 @@
'country' => 'Country Ranking',
'friend' => 'Friend Ranking',
'global' => 'Global Ranking',
'miss_count' => ':count miss',
'supporter-link' => 'Click <a href=":link">here</a> to see all the fancy features that you get!',
'supporter-only' => 'You need to be a supporter to access the friend and country rankings!',
'title' => 'Scoreboard',
Expand All @@ -104,6 +105,8 @@
],
'stats' => [
'accuracy' => 'Accuracy',
'combo' => 'Combo',
'misses' => 'Miss',
'score' => 'Score',
],
],
Expand Down

0 comments on commit b6b101a

Please sign in to comment.