krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 13:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(magic-potions): Final tweaks

Browse Source
This commit is contained in:
Sabe Jones
2015-09-28 14:58:46 -04:00
parent 8dcfe3078f
commit feff6fadfa
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/locales/en/limited.json
View File

@@ -59,5 +59,6 @@
"monsterOfScienceSet": "Monster of Science (Warrior)", "monsterOfScienceSet": "Monster of Science (Warrior)",
"witchyWizardSet": "Witchy Wizard (Mage)", "witchyWizardSet": "Witchy Wizard (Mage)",
"mummyMedicSet": "Mummy Medic (Healer)", "mummyMedicSet": "Mummy Medic (Healer)",
"vampireSmiterSet": "Vampire Smiter (Rogue)" "vampireSmiterSet": "Vampire Smiter (Rogue)",
"fallEventAvailability": "Available until October 31"
} }

4
common/locales/en/pets.json
View File

@@ -24,14 +24,14 @@
"eggSingular": "egg", "eggSingular": "egg",
"noEggs": "You don't have any eggs.", "noEggs": "You don't have any eggs.",
"hatchingPotions": "Hatching Potions", "hatchingPotions": "Hatching Potions",
"magicHatchingPotions": "Magic Hatching Potions", "magicHatchingPotions": "<strong>Magic Hatching Potions</strong>",
"hatchingPotion": "hatching potion", "hatchingPotion": "hatching potion",
"noHatchingPotions": "You don't have any hatching potions.", "noHatchingPotions": "You don't have any hatching potions.",
"inventoryText": "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.", "inventoryText": "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.",
"foodText": "food", "foodText": "food",
"food": "Food and Saddles", "food": "Food and Saddles",
"noFood": "You don't have any food or saddles.", "noFood": "You don't have any food or saddles.",
"dropsExplanation": "Get these items faster with gems if you don't want to wait for them to drop when completing a task. <a href=\"http://habitica.wikia.com/wiki/Drops\">Learn more about the drop system.</a>", "dropsExplanation": "Get these items faster with Gems if you don't want to wait for them to drop when completing a task. <a href=\"http://habitica.wikia.com/wiki/Drops\">Learn more about the drop system.</a>",
"beastMasterProgress": "Beast Master Progress", "beastMasterProgress": "Beast Master Progress",
"stableBeastMasterProgress": "Beast Master Progress: <%= number %> Pets Found", "stableBeastMasterProgress": "Beast Master Progress: <%= number %> Pets Found",
"beastAchievement": "You have earned the \"Beast Master\" Achievement for collecting all the pets!", "beastAchievement": "You have earned the \"Beast Master\" Achievement for collecting all the pets!",

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

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

3
website/views/options/inventory/drops.jade
View File

@@ -125,7 +125,8 @@
span.Pet_Currency_Gem1x.inline-gems span.Pet_Currency_Gem1x.inline-gems
li.customize-menu li.customize-menu
menu.pets-menu(label=env.t('magicHatchingPotions')) menu.pets-menu!=env.t('magicHatchingPotions') + " - " + env.t('fallEventAvailability')
p.muted=env.t('premiumPotionAddlNotes')
div(ng-repeat='pot in Content.hatchingPotions', ng-if='pot.premium && pot.canBuy(user)') div(ng-repeat='pot in Content.hatchingPotions', ng-if='pot.premium && pot.canBuy(user)')
button.customize-option(class='Pet_HatchingPotion_{{::pot.key}}', button.customize-option(class='Pet_HatchingPotion_{{::pot.key}}',
popover='{{::pot.notes()}} {{::pot.addlNotes()}}', popover-append-to-body='true', popover='{{::pot.notes()}} {{::pot.addlNotes()}}', popover-append-to-body='true',