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

fix(magic-potions): Hatching tweaks

Browse source 
* Additional notes on popover noting magic potions can't be used on quest pet eggs
* Less techy error message when attempting to hatch quest pet egg with magic potion
* Don't highlight quest pet eggs as targets for magic hatching potion
This commit is contained in:
Sabe Jones 2015-09-23 16:40:45 -04:00
parent c953a25fe4
commit 1aa5757847
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/locales/en/content.json
View file

@ -117,6 +117,7 @@
"hatchingPotionSpooky": "Spooky",
"hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
"premiumPotionAddlNotes": "Not usable on quest pet eggs.",
"foodMeat": "Meat",
"foodMilk": "Milk",

2
common/locales/en/messages.json
View file

@ -15,7 +15,7 @@
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> un-equipped.",
"messageMissingEggPotion": "You're missing either that egg or that potion",
"messageInvalidEggPotionCombo": "Invalid egg+potion combination. Try hatching a different egg!",
"messageInvalidEggPotionCombo": "You can't hatch that egg with this potion. Try a different egg!",
"messageAlreadyPet": "You already have that pet. Try hatching a different combination!",
"messageHatched": "Your egg hatched! Visit your stable to equip your pet.",
"messageNotEnoughGold": "Not Enough Gold",

2
common/script/content/index.coffee
View file

@ -1168,7 +1168,7 @@ api.hatchingPotions =
CottonCandyPink: value: 4, text: t('hatchingPotionCottonCandyPink')
CottonCandyBlue: value: 4, text: t('hatchingPotionCottonCandyBlue')
Golden: value: 5, text: t('hatchingPotionGolden')
Spooky: value: 3, text: t('hatchingPotionSpooky'), premium: true, limited: true
Spooky: value: 3, text: t('hatchingPotionSpooky'), addlNotes: t('premiumPotionAddlNotes'), premium: true, limited: true
_.each api.hatchingPotions, (pot,key) ->
_.defaults pot, {key, value: 2, notes: t('hatchingPotionNotes', {potText: pot.text}), premium: false, limited: false, canBuy: true}

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

@ -10,7 +10,7 @@
p.muted(ng-show='eggCount < 1')=env.t('noEggs')
div(ng-repeat='(egg,points) in ownedItems(user.items.eggs)')
button.customize-option(class='Pet_Egg_{{::egg}}',
ng-class='{selectableInventory: selectedPotion && !(user.items.pets[egg+"-"+selectedPotion.key]>0)}',
ng-class='{selectableInventory: selectedPotion && !(user.items.pets[egg+"-"+selectedPotion.key]>0) && (Content.dropEggs[egg] || !selectedPotion.premium)}',
popover='{{::Content.eggs[egg].notes()}}', popover-append-to-body='true',
popover-title!=env.t("egg", {eggType: "{{::Content.eggs[egg].text()}}"}),
popover-trigger='mouseenter', popover-placement='right',
@ -22,8 +22,8 @@
p.muted(ng-show='potCount < 1')=env.t('noHatchingPotions')
div(ng-repeat='(pot,points) in ownedItems(user.items.hatchingPotions)')
button.customize-option(class='Pet_HatchingPotion_{{::pot}}',
ng-class='{selectableInventory: selectedEgg && !(user.items.pets[selectedEgg.key+"-"+pot]>0)}',
popover='{{::Content.hatchingPotions[pot].notes()}}',
ng-class='{selectableInventory: selectedEgg && !(user.items.pets[selectedEgg.key+"-"+pot]>0) && (Content.dropEggs[selectedEgg.key] || !Content.hatchingPotions[pot].premium)}',
popover='{{::Content.hatchingPotions[pot].notes()}} {{::Content.hatchingPotions[pot].addlNotes()}}',
popover-title!=env.t("potion", {potionType: "{{::Content.hatchingPotions[pot].text()}}"}),
popover-trigger='mouseenter', popover-placement='right',
popover-append-to-body='true',
@ -148,7 +148,7 @@
menu.pets-menu(label=env.t('magicHatchingPotions'))
div(ng-repeat='pot in Content.hatchingPotions', ng-if='pot.premium && pot.canBuy')
button.customize-option(class='Pet_HatchingPotion_{{::pot.key}}',
popover='{{::pot.notes()}}', popover-append-to-body='true',
popover='{{::pot.notes()}} {{::pot.addlNotes()}}', popover-append-to-body='true',
popover-title!=env.t("potion", {potionType: "{{::pot.text()}}"}),
popover-trigger='mouseenter', popover-placement='top',
ng-click='purchase("hatchingPotions", pot)')