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

release pets feature

Browse source
This commit is contained in:
deilann 2014-09-29 13:35:38 -07:00
parent b19649ce37
commit 8427c53d90
5 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
public/js/controllers/settingsCtrl.js
View file

@ -142,5 +142,14 @@ habitrpg.controller('SettingsCtrl',
window.location.href = '/api/v2/coupons?limit='+codes.count+'&_id='+User.user._id+'&apiToken='+User.user.apiToken;
})
}
$scope.release = function() {
User.user.ops.release({});
$rootScope.$state.go('tasks');
}
$scope.release2 = function() {
User.user.ops.release2({});
$rootScope.$state.go('tasks');
}
}
]);

5
src/models/user.js
View file

@ -34,6 +34,7 @@ var UserSchema = new Schema({
helpedHabit: Boolean,
ultimateGear: Boolean,
beastMaster: Boolean,
beastMasterCount: Number,
veteran: Boolean,
snowball: Number,
streak: Number,
@ -400,7 +401,9 @@ UserSchema.pre('save', function(next) {
if(_.isFunction(v)) return m;
return m+(v?1:0)},0), this.items.pets);
this.achievements.beastMaster = petCount >= 90;
if (petCount >= 90 || this.achievements.beastMasterCount > 0) {
this.achievements.beastMaster = true
}
//our own version incrementer
this._v++;

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

@ -152,6 +152,11 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
p(ng-show='user.stats.lvl < 100')
| 8
span.Pet_Currency_Gem1x.inline-gems
div(ng-show='petCount >= 90')
button.customize-option(popover=env.t('petKeyPop'), popover-title=env.t('petKeyName'), popover-trigger='mouseenter', popover-placement='left', ng-click='openModal("pet-key")', class='pet_key')
p
| 4
span.Pet_Currency_Gem1x.inline-gems
div(ng-if='user.purchased.plan.planId')
button.customize-option(ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})')
span.Pet_Currency_Gem.inline-gems

27
views/shared/modals/drops.jade
View file

@ -12,4 +12,29 @@ script(type='text/ng-template', id='modals/dropsEnabled.html')
.item-drop-icon(class='Pet_Currency_Gem')
span!=env.t('useGems')
.modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('close')
button.btn.btn-default(ng-click='$close()')=env.t('close')
script(type='text/ng-template', id='modals/pet-key.html')
.modal-header
h4=env.t('petKeyBegin')
.modal-body
include ../gems
figure
.npc_alex
p=env.t('petKeyInfo')
br
p=env.t('petKeyInfo2')
br
p=env.t('petKeyInfo3')
.modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('petKeyNeverMind')
span(ng-if='user.balance < 1')
a.btn.btn-success(ng-click='openModal("buyGems")')=env.t('buyMoreGems')
span.gem-cost=env.t('notEnoughGems')
span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl')
a.btn.btn-danger(ng-click='$close(); release()')=env.t('petKeyPets')
span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl')
a.btn.btn-danger(ng-click='$close(); release2()')=env.t('petKeyMounts')
span.gem-cost
| 4&nbsp;
=env.t('gemsEach')

2
views/shared/profiles/achievements.jade
View file

@ -83,6 +83,8 @@ div(ng-if='profile.achievements.beastMaster || user._id == profile._id')
div(ng-class='{muted: !profile.achievements.beastMaster}')
h5=env.t('beastMastName')
small=env.t('beastMastText')
small(ng-if='profile.achievements.beastMasterCount')
=env.t('beastMastText2', {count: "{{profile.achievements.beastMasterCount}}"})
hr
div(ng-if='profile.achievements.rebirths')