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

correctly award ultimategear achievement

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-10-27 12:11:59 +01:00
parent 39e37e1404
commit a5af52a275
3 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/controllers/notificationCtrl.js
View File

@@ -37,7 +37,11 @@ habitrpg.controller('NotificationCtrl',
$rootScope.modals.achievements.streak = true; $rootScope.modals.achievements.streak = true;
}); });
// FIXME: this isn't working for some reason $rootScope.$watch('user.achievements.ultimateGear', function(after, before) {
if (after === before || after !== true) return;
$rootScope.modals.achievements.ultimateGear = true;
});
/*_.each(['weapon', 'head', 'chest', 'shield'], function(watched){ /*_.each(['weapon', 'head', 'chest', 'shield'], function(watched){
$rootScope.$watch('user.items.' + watched, function(before, after){ $rootScope.$watch('user.items.' + watched, function(before, after){
if (after == before) return; if (after == before) return;

22
public/js/services/guideServices.js
View File

@@ -126,28 +126,6 @@ angular.module('guideServices', []).
} }
}); });
$rootScope.$watch('user.items', function(after, before) {
if (User.user.achievements && User.user.achievements.ultimateGear) return;
var items = User.user.items;
if (+items.weapon >= 6 && +items.armor >= 5 && +items.head >= 5 && +items.shield >= 5) {
User.set('achievements.ultimateGear', true); // FIXME
$('#max-gear-achievement-modal').modal('show'); // FIXME
}
});
// FIXME how to handle tasks.*.streak?
// FIXME move to tasksCtrl
/*$rootScope.$watch('user.tasks.*.streak', function(id, after, before) {
if (after > 0) {
if ((after % 21) === 0) {
user.incr('achievements.streak', 1)
return $('#streak-achievement-modal').modal('show');
} else if ((before - after === 1) && (before % 21 === 0)) {
return user.incr('achievements.streak', -1);
}
}
});*/
return { return {
initTour:initTour initTour:initTour
}; };

4
views/shared/modals/achievements.jade
View File

@@ -10,14 +10,14 @@ div(modal='modals.achievements.streak')
button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false') Ok button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false') Ok
// Max Gear // Max Gear
div(modal='modals.achievements.maxGear') div(modal='modals.achievements.ultimateGear')
.modal-header .modal-header
h3 Achievement! h3 Achievement!
.modal-body .modal-body
.achievement.achievement-armor .achievement.achievement-armor
| You have earned the "Ultimate Gear" Achievement for upgrading to the maximum gear set! | You have earned the "Ultimate Gear" Achievement for upgrading to the maximum gear set!
.modal-footer .modal-footer
button.btn.btn-default.cancel(ng-click='modals.achievements.maxGear = false') Ok button.btn.btn-default.cancel(ng-click='modals.achievements.ultimateGear = false') Ok
// Beast Master // Beast Master
div(modal='modals.achievements.beastmaster') div(modal='modals.achievements.beastmaster')