sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3449 from deilann/removingthelevelcap

Browse source 
Removing level cap, free rebirth at 100
This commit is contained in:
Tyler Renelle 2014-05-11 16:30:41 -06:00
commit de47de0673
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/models/user.js
View file

@ -108,6 +108,7 @@ var UserSchema = new Schema({
classSelected: {type: Boolean, 'default': false}, classSelected: {type: Boolean, 'default': false},
mathUpdates: Boolean, mathUpdates: Boolean,
rebirthEnabled: {type: Boolean, 'default': false}, rebirthEnabled: {type: Boolean, 'default': false},
freeRebirth: {type: Boolean, 'default': false},
levelDrops: {type:Schema.Types.Mixed, 'default':{}} levelDrops: {type:Schema.Types.Mixed, 'default':{}}
}, },
history: { history: {

2
views/options/inventory/inventory.jade
View file

@ -157,7 +157,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
span.Pet_Currency_Gem1x.inline-gems span.Pet_Currency_Gem1x.inline-gems
div(ng-show='user.flags.rebirthEnabled') div(ng-show='user.flags.rebirthEnabled')
button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='left', ng-click='openModal("rebirth")', class='rebirth_orb') button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='left', ng-click='openModal("rebirth")', class='rebirth_orb')
p p(ng-show='user.stats.lvl < 100')
| 8 | 8
span.Pet_Currency_Gem1x.inline-gems span.Pet_Currency_Gem1x.inline-gems
div(ng-if='user.purchased.plan.planId') div(ng-if='user.purchased.plan.planId')

15
views/shared/modals/rebirth.jade
View file

@ -41,11 +41,22 @@ script(type='text/ng-template', id='modals/rebirth.html')
=env.t('rebirthEarnAchievement') =env.t('rebirthEarnAchievement')
.modal-footer .modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('neverMind') button.btn.btn-default(ng-click='$close()')=env.t('neverMind')
span(ng-if='user.balance < 2') span(ng-if='user.balance < 2 && user.stats.lvl < 100')
a.btn.btn-success(ng-click='openModal("buyGems",{track:"Gems > Rebirth"})')=env.t('buyMoreGems') a.btn.btn-success(ng-click='openModal("buyGems",{track:"Gems > Rebirth"})')=env.t('buyMoreGems')
span.gem-cost=env.t('notEnoughGems') span.gem-cost=env.t('notEnoughGems')
span(ng-if='user.balance >= 2', ng-controller='SettingsCtrl') span(ng-if='user.balance >= 2 || user.stats.lvl >= 100', ng-controller='SettingsCtrl')
a.btn.btn-danger(ng-click='$close(); rebirth()')=env.t('beReborn') a.btn.btn-danger(ng-click='$close(); rebirth()')=env.t('beReborn')
span.gem-cost span.gem-cost
| 8&nbsp; | 8&nbsp;
=env.t('gems') =env.t('gems')
script(type='text/ng-template', id='modals/freeRebirth.html')
.modal-header
h4=env.t('welcome100')
figure
.rebirth_orb
p=env.t('intro100')
p=env.t('followup100')
p=env.t('rebirth100Info')
.modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('rebirthWait')
a.btn.btn-danger(ng-click='$close(); rebirth()')=env.t('rebirthNow')