diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee index 3b1d3673d..183f08cb8 100644 --- a/app/lib/surface/CocoSprite.coffee +++ b/app/lib/surface/CocoSprite.coffee @@ -598,7 +598,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass gold = Math.floor @thang.gold return if gold is @lastGold @lastGold = gold - Backbone.Mediator.publish 'surface:gold-changed', {team: @thang.team, gold: gold} + Backbone.Mediator.publish 'surface:gold-changed', {team: @thang.team, gold: gold, goldEarned: Math.floor(@thang.goldEarned)} playSounds: (withDelay=true, volume=1.0) -> for event in @thang.currentEvents ? [] diff --git a/app/styles/play/level/gold.sass b/app/styles/play/level/gold.sass index 8248d8db5..b10153cdd 100644 --- a/app/styles/play/level/gold.sass +++ b/app/styles/play/level/gold.sass @@ -42,4 +42,4 @@ .gold-amount display: inline-block - width: 20px + min-width: 20px diff --git a/app/views/play/level/gold_view.coffee b/app/views/play/level/gold_view.coffee index 8cc7dfa62..66e69cc4a 100644 --- a/app/views/play/level/gold_view.coffee +++ b/app/views/play/level/gold_view.coffee @@ -16,7 +16,10 @@ module.exports = class GoldView extends View teamEl = $("<div class='team-gold team-#{e.team}' title='Gold: #{e.team}'><img src='/images/level/prop_gold.png'> <div class='gold-amount team-#{e.team}'></div></div>") @$el.append(teamEl) goldEl = teamEl.find('.gold-amount.team-' + e.team) - goldEl.text(e.gold) + text = '' + e.gold + if e.goldEarned and e.goldEarned > e.gold + text += " (#{e.goldEarned})" + goldEl.text text onSetLetterbox: (e) -> @$el.toggle not e.on