From 70b68707b585eaae8368c226007b04382b1e09ac Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 26 Sep 2015 16:09:36 -0500 Subject: [PATCH] Move quest defaults function to helpers --- common/script/src/content/helpers.js | 37 +++++++++++++++++++++ common/script/src/content/quests/index.js | 40 ++--------------------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/common/script/src/content/helpers.js b/common/script/src/content/helpers.js index 98c257ef0b..72e92657a7 100644 --- a/common/script/src/content/helpers.js +++ b/common/script/src/content/helpers.js @@ -86,6 +86,43 @@ export function setHatchingPotionDefaults(hatchingPotions) { }); }; +export function setQuestDefaults(quests) { + each(quests, function(quest, key) { + let formattedName = formatForTranslator(key); + + let questDefaults = { + key: key, + text: translator(`quest${formattedName}Text`), + notes: translator(`quest${formattedName}Notes`), + canBuy: true, + value: 4, + }; + + let questBossDefaults = { + name: translator(`quest${formattedName}Boss`), + str: 1, + def: 1, + }; + + let questBossRageDefaults = { + title: translator('bossRageTitle'), + description: translator('bossRageDescription'), + }; + + defaults(quest, questDefaults); + + let boss = quest.boss; + + if (boss) { + defaults(boss, questBossDefaults); + + if (boss.rage) { + defaults(boss.rage, questBossRageDefaults); + } + } + }); +}; + //---------------------------------------- // Generators //---------------------------------------- diff --git a/common/script/src/content/quests/index.js b/common/script/src/content/quests/index.js index c0fdde2925..3ce9b62809 100644 --- a/common/script/src/content/quests/index.js +++ b/common/script/src/content/quests/index.js @@ -1,8 +1,7 @@ -import {each, defaults, sortBy} from 'lodash'; +import {sortBy} from 'lodash'; import { - translator as t, merge, - formatForTranslator + setQuestDefaults, } from '../helpers'; import worldQuests from './world'; @@ -19,40 +18,7 @@ let allQuests = merge([ goldPurchasableQuests ]); -each(allQuests, function(quest, key) { - let formattedName = formatForTranslator(key); - - let questDefaults = { - key: key, - text: t(`quest${formattedName}Text`), - notes: t(`quest${formattedName}Notes`), - canBuy: true, - value: 4, - }; - - let questBossDefaults = { - name: t(`quest${formattedName}Boss`), - str: 1, - def: 1, - }; - - let questBossRageDefaults = { - title: t('bossRageTitle'), - description: t('bossRageDescription'), - }; - - defaults(quest, questDefaults); - - let boss = quest.boss; - - if (boss) { - defaults(boss, questBossDefaults); - - if (boss.rage) { - defaults(boss.rage, questBossRageDefaults); - } - } -}); +setQuestDefaults(allQuests); let questsByLevel = sortBy(allQuests, (quest) => { return quest.lvl || 0;