diff --git a/public/js/controllers/footerCtrl.js b/public/js/controllers/footerCtrl.js index 0b7be139de..401c40b9fc 100644 --- a/public/js/controllers/footerCtrl.js +++ b/public/js/controllers/footerCtrl.js @@ -45,6 +45,7 @@ habitrpg.controller("FooterCtrl", ['$scope', '$rootScope', 'User', '$http', 'Not * Debug functions. Note that the server route for gems is only available if process.env.DEBUG=true */ $scope.addMissedDay = function(){ + if (!confirm("Are you sure you want to reset the day?")) return; var dayBefore = moment(User.user.lastCron).subtract('days', 1).toDate(); User.set('lastCron', dayBefore); Notification.text('-1 day, remember to refresh'); diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 3aaf2f63da..37be78f7b2 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -2,7 +2,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') .row-fluid(ng-controller='InventoryCtrl') .span6.border-right h2 Inventory - p.well Hatch pets by first clicking the hatching potion you want to use. This will highlight all eligible eggs in green. Just click one of those eggs, and, presto, your new pet is born. You can also sell unwanted drops to Alexander the Merchant. + p.well Click an egg to see usable potions highlighted in green and then click one of the highlighted potions to hatch your pet. If no potions are highlighted, click that egg again to deselect it, and instead click a potion first to have the usable eggs highlighted. You can also sell unwanted drops to Alexander the Merchant. menu.inventory-list(type='list') li.customize-menu menu.pets-menu(label='Eggs ({{userEggs.length}})') diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 2075a8965f..c5a60f805f 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -87,14 +87,14 @@ When your seventh submission is deployed, you will receive 2 Gems and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! tr td - a.label.label-contributor-8(ng-click='toggleUserTier($event)') Heroic + a.label.label-contributor-8(ng-click='toggleUserTier($event)') Heroic (8) div(style='display:none;') p This is HabitRPG staff or Staff-level Contributors tr td a.label.label-npc(ng-click='toggleUserTier($event)') NPC div(style='display:none;') - p Was a backer at the highest Kickstarter tier. + p Was a backer at the highest Kickstarter tier. include ./challenge-box