krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap.

Browse Source
This commit is contained in:
Oliver Eyton-Williams
2015-11-16 15:11:11 +01:00
parent d1c1940bde
commit e811693752
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/public/js/controllers/settingsCtrl.js
View File

@@ -206,10 +206,10 @@ habitrpg.controller('SettingsCtrl',
var baseCap = 25; var baseCap = 25;
var gemCapExtra = User.user.purchased.plan.consecutive.gemCapExtra; var gemCapExtra = User.user.purchased.plan.consecutive.gemCapExtra;
// @TODO: What are these magic numbers? 3? 5? // @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 flooredBlocks = Math.floor(blocks);
var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks; var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks * 5;
var maxDropCap = 50; var maxDropCap = 50;
return [userTotalDropCap, maxDropCap]; return [userTotalDropCap, maxDropCap];

4
website/views/options/settings.jade
View File

@@ -269,7 +269,7 @@ mixin subPerks()
tr tr
td 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.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 tr
td td
span.hint(popover=env.t('retainHistoryText'),popover-trigger='mouseenter',popover-placement='right')=env.t('retainHistory') span.hint(popover=env.t('retainHistoryText'),popover-trigger='mouseenter',popover-placement='right')=env.t('retainHistory')
@@ -280,7 +280,7 @@ mixin subPerks()
td td
span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')}  span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')} 
div(ng-show='_subscription.key!="basic_earned"') 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') .small.muted=env.t('mysticHourglassText')
tr tr
td td