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

fix(magic-potions): Correct potion list merge

Browse Source
This commit is contained in:
Sabe Jones
2015-10-01 16:53:11 -04:00
parent 8e69681718
commit 22c69c7e2f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1182,8 +1182,9 @@ _.each api.dropHatchingPotions, (pot,key) ->
_.each api.premiumHatchingPotions, (pot,key) ->
_.defaults pot, {key, value: 2, notes: t('hatchingPotionNotes', {potText: pot.text}), premium: true, limited: false, canBuy: (()->true)}
api.hatchingPotions = _.merge(api.dropHatchingPotions, api.premiumHatchingPotions)
api.hatchingPotions = {}
_.merge(api.hatchingPotions, api.dropHatchingPotions)
_.merge(api.hatchingPotions, api.premiumHatchingPotions)
api.pets = _.transform api.dropEggs, (m, egg) ->
_.defaults m, _.transform api.hatchingPotions, (m2, pot) ->