From 96e6e0de9e362d2778ef43633968889aa8330783 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Mon, 30 May 2016 17:33:15 -0700
Subject: [PATCH] Fix #2889: show incremental gem and xp award for replayable
levels, not total
---
app/views/play/level/modal/HeroVictoryModal.coffee | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee
index 594953f7c..b01808aa3 100644
--- a/app/views/play/level/modal/HeroVictoryModal.coffee
+++ b/app/views/play/level/modal/HeroVictoryModal.coffee
@@ -292,7 +292,7 @@ module.exports = class HeroVictoryModal extends ModalView
duration = 1000
ratio = @getEaseRatio (new Date() - @sequentialAnimationStart), duration
if panel.unit is 'xp'
- newXP = Math.floor(panel.previousNumber + ratio * (panel.number - panel.previousNumber))
+ newXP = Math.floor(ratio * (panel.number - panel.previousNumber))
totalXP = @totalXPAnimated + newXP
if totalXP isnt @lastTotalXP
panel.textEl.text('+' + newXP)
@@ -304,7 +304,7 @@ module.exports = class HeroVictoryModal extends ModalView
@XPEl.addClass 'five-digits' if totalXP >= 10000 and @lastTotalXP < 10000
@lastTotalXP = totalXP
else if panel.unit is 'gem'
- newGems = Math.floor(panel.previousNumber + ratio * (panel.number - panel.previousNumber))
+ newGems = Math.floor(ratio * (panel.number - panel.previousNumber))
totalGems = @totalGemsAnimated + newGems
if totalGems isnt @lastTotalGems
panel.textEl.text('+' + newGems)
@@ -326,9 +326,9 @@ module.exports = class HeroVictoryModal extends ModalView
panel.rootEl.removeClass('animating').find('.reward-image-container img').removeClass('pulse')
@sequentialAnimationStart = new Date()
if panel.unit is 'xp'
- @totalXPAnimated += panel.number
+ @totalXPAnimated += panel.number - panel.previousNumber
else if panel.unit is 'gem'
- @totalGemsAnimated += panel.number
+ @totalGemsAnimated += panel.number - panel.previousNumber
@sequentialAnimatedPanels.shift()
return
panel.rootEl.addClass('animating').find('.reward-image-container').removeClass('pending-reward-image').find('img').addClass('pulse')