diff --git a/public/js/controllers/notificationCtrl.js b/public/js/controllers/notificationCtrl.js index 03d418ffd0..f0e2da347c 100644 --- a/public/js/controllers/notificationCtrl.js +++ b/public/js/controllers/notificationCtrl.js @@ -61,6 +61,11 @@ habitrpg.controller('NotificationCtrl', $rootScope.modals.achievements.beastMaster = true; }, true); + $rootScope.$watch('user.achievements.rebirths', function(after, before){ + if(after === before) return; + $rootScope.modals.achievements.rebirth = true; + }); + /*_.each(['weapon', 'head', 'chest', 'shield'], function(watched){ $rootScope.$watch('user.items.' + watched, function(before, after){ if (after == before) return; diff --git a/src/models/user.js b/src/models/user.js index d47530cfec..a43f0292cc 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -46,7 +46,8 @@ var UserSchema = new Schema({ snowball: Number, streak: Number, challenges: Array, - rebirth: Array + rebirths: Number, + rebirthLevel: Number }, auth: { facebook: Schema.Types.Mixed, diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index fd9ed71529..eb90fa239a 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -46,3 +46,4 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember( .avatar-level(ng-class='userLevelStyle(profile,"label")') i.icon-circle-arrow-up.icon-white(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip='Buffed', style='margin-right:5px;') | Lvl {{profile.stats.lvl}} + i.icon-plus-sign.icon-white(ng-show='profile.achievements.rebirths', tooltip='Reborn, max level {{profile.achievements.rebirthLevel}}', style='margin-left:5px') diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade index a30a15d2bd..ef14be21bf 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.achievements.streak = false') Ok + button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false') OK // Max Gear div(modal='modals.achievements.ultimateGear') @@ -17,7 +17,7 @@ div(modal='modals.achievements.ultimateGear') .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.achievements.ultimateGear = false') Ok + button.btn.btn-default.cancel(ng-click='modals.achievements.ultimateGear = false') OK // Beast Master div(modal='modals.achievements.beastMaster') @@ -28,7 +28,7 @@ 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.achievements.beastMaster = false') Ok + button.btn.btn-default.cancel(ng-click='modals.achievements.beastMaster = false') OK // Contributor div(modal='user.flags.contributor') @@ -40,7 +40,15 @@ div(modal='user.flags.contributor') {{user.profile.name}}, you awesome person! You're now a level {{user.contributor.level}} contributor for helping HabitRPG. See what prizes you've earned for your contribution! .modal-footer - button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false})') Ok - + button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false})') OK +//Rebirth +div(modal='modals.achievements.rebirth') + .modal-header + h3 Achievement! + .modal-body + .achievement.achievement-sun + | You've begun a new adventure! This is Rebirth {{user.achievements.rebirths}} for you, and the highest Level you've attained is {{user.achievements.rebirthLevel}}. To stack this Achievement, begin your next new adventure when you've reached an even higher Level! + .modal-footer + button.btn.btn-default.cancel(ng-click='modals.achievements.rebirth = false') OK diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index fefd37bf82..f95a284d61 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -3,7 +3,6 @@ //
// // - // // // // @@ -57,6 +56,14 @@ small Has found all 90 pets (insanely difficult, give this user props!) hr + div(ng-if='profile.achievements.rebirths') + .achievement.achievement-sun + h5(ng-if='profile.achievements.rebirths == 1') Began a New Adventure + h5(ng-if='profile.achievements.rebirths > 1') Began {{profile.achievements.rebirths}} New Adventures + small. + Used an Orb of Rebirth to start over after attaining Level {{profile.achievements.rebirthLevel}}. + hr + div(ng-if='profile.achievements.helpedHabit') .achievement.achievement-tree h5 Helped Habit Grow