From 41cc6ff3bc1a1ee97081d75f2ba88ea1e79f810e Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 17 Dec 2013 19:22:21 -0700 Subject: [PATCH] fix #2032 - add button to show classes tour, mention 10pt/day mp regen --- public/js/controllers/settingsCtrl.js | 6 +++++- public/js/services/guideServices.js | 2 +- views/options/settings.jade | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js index 9cdb7db03b..0efd6504c1 100644 --- a/public/js/controllers/settingsCtrl.js +++ b/public/js/controllers/settingsCtrl.js @@ -22,8 +22,12 @@ habitrpg.controller('SettingsCtrl', $scope.showTour = function(){ User.set({'flags.showTour':true}); - Guide.initTour(); $location.path('/tasks'); + $timeout(Guide.initTour); + } + + $scope.showClassesTour = function(){ + Guide.classesTour(); } $scope.showBailey = function(){ diff --git a/public/js/services/guideServices.js b/public/js/services/guideServices.js index beb802625e..3ef4b5549c 100644 --- a/public/js/services/guideServices.js +++ b/public/js/services/guideServices.js @@ -174,7 +174,7 @@ angular.module('guideServices', []). }, { element: ".meter.mana", title: "Spells", - content: "You can now unlock class-specific spells. You'll see your first at level 6." + content: "You can now unlock class-specific spells. You'll see your first at level 6. Your mana replenishes 10 points per day." }, { orphan: true, title: "Read More", diff --git a/views/options/settings.jade b/views/options/settings.jade index 0f3eae0e74..b74cf26481 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -43,8 +43,10 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') button.btn(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover='Bring Bailey the Town Crier out of hiding so you can review past news.') Show Bailey br button.btn(ng-click='modals.restore = true', popover-trigger='mouseenter', popover-placement='right', popover='Manually change values like Health, Level, and Gold.') Fix Character Values - br - button.btn(ng-click='user.ops.changeClass({})', ng-if='user.preferences.disableClasses==true' popover-trigger='mouseenter', popover-placement='right', popover="You opted out of the class system initially. Would you like now to opt-in?") Enable Class System + div(ng-if='user.preferences.disableClasses==true') + button.btn(ng-click='user.ops.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover="You opted out of the class system initially. Would you like now to opt-in?") Enable Class System + div(ng-if='!user.preferences.disableClasses') + button.btn(ng-click='showClassesTour()', popover-trigger='mouseenter', popover-placement='right', popover="Show the tour for using the class system.") Show Classes Tour div(ng-show='user.auth.local') hr