From 22c69c7e2f390035a224da8150852cd64bec121c Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 1 Oct 2015 16:53:11 -0400 Subject: [PATCH] fix(magic-potions): Correct potion list merge --- common/script/content/index.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/script/content/index.coffee b/common/script/content/index.coffee index 4261fdfb13..0c2f4bec44 100644 --- a/common/script/content/index.coffee +++ b/common/script/content/index.coffee @@ -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) ->