From 4e668a7de4eccf78efef3c330f5b805c9c2e2c08 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 7 Nov 2013 23:16:50 -0800 Subject: [PATCH 1/4] contrib: heroic at (8) --- views/options/social/tavern.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 4b35551afcdfed195a6fe1a6e6516905d07a9778 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 8 Nov 2013 09:18:03 -0800 Subject: [PATCH 2/4] confirm "trigger new day" --- public/js/controllers/footerCtrl.js | 1 + 1 file changed, 1 insertion(+) 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'); From 30e4dbcb9845456f47ab3528b1cbec1111958620 Mon Sep 17 00:00:00 2001 From: Shane Lister Date: Fri, 8 Nov 2013 10:43:22 -0800 Subject: [PATCH 3/4] Update Hatching Instructions On behalf of @bobbyroberts99 --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 3aaf2f63da..b4bd1c8a06 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. 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}})') From 64ed414ae6f51220f14d5cd5b5a0364c0320b930 Mon Sep 17 00:00:00 2001 From: Shane Lister Date: Fri, 8 Nov 2013 10:53:28 -0800 Subject: [PATCH 4/4] Update inventory.jade --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index b4bd1c8a06..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 Click an egg to see usable potions highlighted in green. 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. + 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}})')