sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-20 10:44:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Thrashmandicoot-merchant-button-fix' into develop

Browse source
This commit is contained in:
Blade Barringer 2015-10-30 22:50:26 -05:00
commit 4a9b0f1d12
4 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/locales/en/npc.json
View file

@ -11,9 +11,10 @@
"danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
"alexander": "Alexander the Merchant",
"welcomeMarket": "Welcome to the Market! Buy hard-to-find eggs and potions! Sell your extras! Commission useful services! Come see what we have to offer.",
"sellForGold": "Sell <%= item %> for <%= gold %> Gold",
"sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
"sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
"displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
"displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
"displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
"sellForGold": "Sell it for <%= gold %> Gold",
"buyGems": "Buy Gems",
"justin": "Justin",
"ian": "Ian",

3
website/public/css/items.styl
View file

@ -14,7 +14,6 @@
top: -5px
.btn-buy
width: 4.5em
min-height: 3em
height: 100%
padding: 0.75em 0 0 0.5em
@ -29,7 +28,7 @@
.btn-buy input:focus
opacity:0
input:focus + a.btn-buy
background-color: $bad
text-decoration: none

2
website/public/css/npcs.styl
View file

@ -34,4 +34,4 @@
display block
position:relative
.popover-navigation {clear:both;}
.popover-navigation {clear:both;}

20
website/views/options/inventory/drops.jade
View file

@ -93,10 +93,22 @@
a(target='_blank', href='http://www.kickstarter.com/profile/523661924')=env.t('alexander')
.popover-content
p=env.t('welcomeMarket')
p
button.btn.btn-primary(ng-show='selectedEgg', ng-click='sellInventory()')=env.t('sellEggForGold', {itemType: "{{selectedEgg.text()}}", gold: "{{selectedEgg.value}}"})
button.btn.btn-primary(ng-show='selectedPotion', ng-click='sellInventory()')=env.t('sellPotionForGold', {itemType: "{{selectedPotion.text()}}", gold: "{{selectedPotion.value}}"})
button.btn.btn-primary(ng-show='selectedFood', ng-click='sellInventory()')=env.t('sellForGold', {item: "{{selectedFood.text()}}", gold: "{{selectedFood.value}}"})
hr(ng-show='selectedEgg || selectedPotion || selectedFood')
div(ng-show='selectedEgg || selectedPotion || selectedFood')
.pull-left.customize-option(class='Pet_Egg_{{selectedEgg.key}}' ng-show='selectedEgg')
p(ng-show='selectedEgg')
!=env.t('displayEggForGold', {itemType: "{{selectedEgg.text()}}"})
.pull-left.customize-option(class='Pet_HatchingPotion_{{selectedPotion.key}}' ng-show='selectedPotion')
p(ng-show='selectedPotion')
!=env.t('displayPotionForGold', {itemType: "{{selectedPotion.text()}}"})
.pull-left.customize-option(class='Pet_Food_{{selectedFood.key}}' ng-show='selectedFood')
p(ng-show='selectedFood')
!=env.t('displayItemForGold', {itemType: "{{selectedFood.text()}}"})
div.clearfix
button.btn.btn-primary.btn-block(ng-show='selectedEgg', ng-click='sellInventory()')=env.t('sellForGold', {itemType: "{{selectedEgg.text()}}", gold: "{{selectedEgg.value}}"})
button.btn.btn-primary.btn-block(ng-show='selectedPotion', ng-click='sellInventory()')=env.t('sellForGold', {itemType: "{{selectedPotion.text()}}", gold: "{{selectedPotion.value}}"})
button.btn.btn-primary.btn-block(ng-show='selectedFood', ng-click='sellInventory()')=env.t('sellForGold', {item: "{{selectedFood.text()}}", gold: "{{selectedFood.value}}"})
menu.inventory-list(type='list')
li.customize-menu
menu.pets-menu(label=env.t('eggs'))