From e8116937525185ddfa4d3a013b5a6e48184d15a6 Mon Sep 17 00:00:00 2001 From: Oliver Eyton-Williams Date: Mon, 16 Nov 2015 15:11:11 +0100 Subject: [PATCH 1/2] Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap. --- website/public/js/controllers/settingsCtrl.js | 4 ++-- website/views/options/settings.jade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/public/js/controllers/settingsCtrl.js b/website/public/js/controllers/settingsCtrl.js index ed9ac730f1..97df03b8fb 100644 --- a/website/public/js/controllers/settingsCtrl.js +++ b/website/public/js/controllers/settingsCtrl.js @@ -206,10 +206,10 @@ habitrpg.controller('SettingsCtrl', var baseCap = 25; var gemCapExtra = User.user.purchased.plan.consecutive.gemCapExtra; // @TODO: What are these magic numbers? 3? 5? - var blocks = Content.subscriptionBlocks[subscription.key].months / 3 * 5; + var blocks = Content.subscriptionBlocks[subscription.key].months / 3; var flooredBlocks = Math.floor(blocks); - var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks; + var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks * 5; var maxDropCap = 50; return [userTotalDropCap, maxDropCap]; diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index 9a0808b2eb..43e1c17608 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -269,7 +269,7 @@ mixin subPerks() tr td span.hint(popover=env.t('buyGemsGoldText', {gemCost: "{{Shared.planGemLimits.convRate}}", gemLimit: "{{Shared.planGemLimits.convCap}}"}),popover-trigger='mouseenter',popover-placement='right') #{env.t('buyGemsGold')}  - span.badge.badge-success(ng-show='_subscription.key!="basic_earned"')=env.t('buyGemsGoldCap', {amount: '{{:: gemGoldCap(_subscription) | min }}'}) + span.badge.badge-success(ng-show='_subscription.key!="basic_earned"')=env.t('buyGemsGoldCap', {amount: '{{gemGoldCap(_subscription) | min }}'}) tr td span.hint(popover=env.t('retainHistoryText'),popover-trigger='mouseenter',popover-placement='right')=env.t('retainHistory') @@ -280,7 +280,7 @@ mixin subPerks() td span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')}  div(ng-show='_subscription.key!="basic_earned"') - .badge.badge-success=env.t('mysticHourglass', {amount: '+{{:: numberOfMysticHourglasses(_subscription)}}'}) + .badge.badge-success=env.t('mysticHourglass', {amount: '+{{numberOfMysticHourglasses(_subscription)}}'}) .small.muted=env.t('mysticHourglassText') tr td From 53417adda11114d93ffc30a9c2c7ace839cb8a7d Mon Sep 17 00:00:00 2001 From: Oliver Eyton-Williams Date: Tue, 17 Nov 2015 14:07:35 +0100 Subject: [PATCH 2/2] Replaced magic numbers with variables --- website/public/js/controllers/settingsCtrl.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/website/public/js/controllers/settingsCtrl.js b/website/public/js/controllers/settingsCtrl.js index 97df03b8fb..e785c7c02e 100644 --- a/website/public/js/controllers/settingsCtrl.js +++ b/website/public/js/controllers/settingsCtrl.js @@ -204,12 +204,13 @@ habitrpg.controller('SettingsCtrl', $scope.gemGoldCap = function(subscription) { var baseCap = 25; + var gemCapIncrement = 5; + var capIncrementThreshold = 3; var gemCapExtra = User.user.purchased.plan.consecutive.gemCapExtra; - // @TODO: What are these magic numbers? 3? 5? - var blocks = Content.subscriptionBlocks[subscription.key].months / 3; + var blocks = Content.subscriptionBlocks[subscription.key].months / capIncrementThreshold; var flooredBlocks = Math.floor(blocks); - var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks * 5; + var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks * gemCapIncrement; var maxDropCap = 50; return [userTotalDropCap, maxDropCap];