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

Merge pull request #6247 from ojeytonwilliams/subcriber-benefits-comparisons

Browse Source 
Potential fix for #6085 - fix subscriber benefits comparisons; round down 3 month blocks for perks - fixes #6085
This commit is contained in:
Alys
2015-11-19 07:09:14 +10:00
parent eded44fea5 53417adda1
commit cb1f745d39
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,12 +204,13 @@ habitrpg.controller('SettingsCtrl',
$scope.gemGoldCap = function(subscription) { $scope.gemGoldCap = function(subscription) {
var baseCap = 25; var baseCap = 25;
var gemCapIncrement = 5;
var capIncrementThreshold = 3;
var gemCapExtra = User.user.purchased.plan.consecutive.gemCapExtra; var gemCapExtra = User.user.purchased.plan.consecutive.gemCapExtra;
// @TODO: What are these magic numbers? 3? 5? var blocks = Content.subscriptionBlocks[subscription.key].months / capIncrementThreshold;
var blocks = Content.subscriptionBlocks[subscription.key].months / 3 * 5;
var flooredBlocks = Math.floor(blocks); var flooredBlocks = Math.floor(blocks);
var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks; var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks * gemCapIncrement;
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