sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 15:31:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partial fix to #1938 (New name and location for Re-Roll)

Browse source
This commit is contained in:
Sabe Jones 2013-12-01 11:58:03 -06:00
parent 30a5b349f8
commit af80548a34
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en/app.json
View file

@ -302,7 +302,7 @@
"_commentitemsother" : "OTHER ITEMS",
"healthPotionName" : "Health Potion",
"healthPotionNotes" : "Recover 15 HP Instantly",
"rerollName" : "Re-Roll",
"rerollName" : "Fortify",
"rerollNotes" : "Resets your task values back to yellow. Useful when everything's red and it's hard to stay alive.",
"rerollModelHeader" : "Reset Your Tasks",
"rerollModelText1" : "Highly discouraged because red tasks provide good incentive to improve",

12
views/options/inventory/inventory.jade
View file

@ -44,7 +44,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html')
a(target='_blank', href='http://www.kickstarter.com/profile/523661924') Alexander the Merchant
.popover-content
p
| Welcome to the Market. Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here! If you have unwanted drops, sell them to me.
| Welcome to the Market! Buy hard-to-find eggs and potions! Sell your extras! Commission useful services! Come see what we have to offer.
p
button.btn.btn-primary(ng-show='selectedEgg', ng-click='sellInventory()')
| Sell {{selectedEgg.name}} for {{selectedEgg.value}} Gold
@ -77,6 +77,10 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html')
p
| {{food.value}}
span.Pet_Currency_Gem1x.inline-gems
li.customize-menu
menu.pets-menu(label='Services')
div
button.btn(popover='Return all tasks to neutral value (yellow color).', popover-title=env.t('rerollName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true') Fortify
div
| 4
span.Pet_Currency_Gem1x.inline-gems

8
views/shared/modals/reroll.jade
View file

@ -1,12 +1,12 @@
// Re-Roll modal
div(modal='modals.reroll')
.modal-header
h3 Reset Your Tasks
h3 Fortify: Back to Yellow
.modal-body
include ../gems
p.
Purchasing a Re-Roll will reset all your tasks to a neutral (yellow) state, as if you'd just added them. Consider
this an option of last resort, red tasks provide good incentive to improve. But if all that red fills you with
Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them. Consider
this an option of last resort! Red tasks provide good incentive to improve. But if all that red fills you with
despair, and the beginning of each new day proves lethal, spend the Gems and catch a reprieve!
.modal-footer
@ -14,6 +14,6 @@ div(modal='modals.reroll')
a.btn.btn-success.btn-large(ng-click="modals.buyGems = true") Buy More Gems
span.gem-cost Not enough Gems
span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl')
a.btn.btn-danger.btn-large(ng-click='reroll()') Re-Roll
a.btn.btn-danger.btn-large(ng-click='reroll()') Fortify
span.gem-cost 4 Gems