From 20f2d75bbf19bdb6ca3c6a519308a21ed6fe0e7c Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 23 Oct 2013 17:57:02 +0200 Subject: [PATCH] add streak achievement notification --- public/js/controllers/notificationCtrl.js | 5 +++++ public/js/controllers/rootCtrl.js | 1 + views/shared/modals/achievements.jade | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/public/js/controllers/notificationCtrl.js b/public/js/controllers/notificationCtrl.js index bb2cb890e2..3f920be5df 100644 --- a/public/js/controllers/notificationCtrl.js +++ b/public/js/controllers/notificationCtrl.js @@ -32,6 +32,11 @@ habitrpg.controller('NotificationCtrl', $rootScope.modals.drop = true; }); + $rootScope.$watch('user.achievements.streak', function(after, before){ + if(after == before || after < before) return; + $rootScope.modals.achievements.streak = true; + }); + // FIXME: this isn't working for some reason /*_.each(['weapon', 'head', 'chest', 'shield'], function(watched){ $rootScope.$watch('user.items.' + watched, function(before, after){ diff --git a/public/js/controllers/rootCtrl.js b/public/js/controllers/rootCtrl.js index c433d2729b..0726686180 100644 --- a/public/js/controllers/rootCtrl.js +++ b/public/js/controllers/rootCtrl.js @@ -6,6 +6,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$http', function($scope, $rootScope, $location, User, $http) { $rootScope.modals = {}; + $rootScope.modals.achievements = {}; $rootScope.User = User; $rootScope.user = User.user; $rootScope.settings = User.settings; diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade index a913128af7..a68e1e794c 100644 --- a/views/shared/modals/achievements.jade +++ b/views/shared/modals/achievements.jade @@ -7,7 +7,7 @@ div(modal='modals.achievements.streak') .achievement.achievement-thermometer | You have stacked your "Streaker" Achievement! Every 21 days of streak, you gain 1 achievement point here. .modal-footer - button.btn.btn-default.cancel(ng-click='modals.modals.streakAchievement = false') Cancel + button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false') Cancel // Max Gear div(modal='modals.achievements.maxGear') @@ -17,7 +17,7 @@ div(modal='modals.achievements.maxGear') .achievement.achievement-armor | You have earned the "Ultimate Gear" Achievement for upgrading to the maximum gear set! .modal-footer - button.btn.btn-default.cancel(ng-click='modals.modals.streakAchievement = false') Cancel + button.btn.btn-default.cancel(ng-click='modals.achievements.maxGear = false') Cancel // Beast Master div(modal='modals.achievements.beastmaster') @@ -28,6 +28,6 @@ div(modal='modals.achievements.beastmaster') .achievement.achievement-rat | You have earned the "Beast Master" Achievement for collecting all the pets! .modal-footer - button.btn.btn-default.cancel(ng-click='modals.modals.beastMaster = false') Cancel + button.btn.btn-default.cancel(ng-click='modals.achievements.beastmaster = false') Cancel