diff --git a/common/script/src/content/quests/gold-purchasable.js b/common/script/src/content/quests/gold-purchasable.js index 2f4be14923..905deed33f 100644 --- a/common/script/src/content/quests/gold-purchasable.js +++ b/common/script/src/content/quests/gold-purchasable.js @@ -104,15 +104,8 @@ each(goldPurchasableQuests, (quest, name) => { let capitalizedName = capitalize(camelName); let questDefaults = { - text: t(`quest${capitalizedName}Text`), - notes: t(`quest${capitalizedName}Notes`), completion: t(`quest${capitalizedName}Completion`), category: 'gold', - value: 4, - }; - - let bossDefaults = { - name: t(`quest${capitalizedName}Boss`), }; let dropDefaults = { @@ -121,7 +114,6 @@ each(goldPurchasableQuests, (quest, name) => { defaults(quest, questDefaults); - if (quest.boss) defaults(quest.boss, bossDefaults); if (quest.drop) defaults(quest.drop, dropDefaults); }); diff --git a/common/script/src/content/quests/holiday.js b/common/script/src/content/quests/holiday.js index b01357a436..364bed8d52 100644 --- a/common/script/src/content/quests/holiday.js +++ b/common/script/src/content/quests/holiday.js @@ -109,11 +109,8 @@ let holidayQuests = { each(holidayQuests, (quest, name) => { let capitalizedName = capitalize(name); let questDefaults = { - text: t(`quest${capitalizedName}Text`), - notes: t(`quest${capitalizedName}Notes`), completion: t(`quest${capitalizedName}Completion`), canBuy: false, - value: 4, category: 'pet', }; diff --git a/common/script/src/content/quests/index.js b/common/script/src/content/quests/index.js index 4d088fe72f..711a21f64f 100644 --- a/common/script/src/content/quests/index.js +++ b/common/script/src/content/quests/index.js @@ -1,4 +1,6 @@ import {each, assign, defaults, sortBy} from 'lodash'; +import capitalize from 'lodash.capitalize'; +import camelCase from 'lodash.camelCase'; import t from '../helpers/translator'; import worldQuests from './world'; @@ -7,12 +9,6 @@ import petQuests from './pet'; import unlockableQuests from './unlockable'; import goldPurchasableQuests from './gold-purchasable'; -const QUEST_BOSS_DEFAULTS = { str: 1, def: 1 }; -const QUEST_BOSS_RAGE_DEFAULTS = { - title: t('bossRageTitle'), - description: t('bossRageDescription'), -}; - let allQuests = { }; assign(allQuests, worldQuests); @@ -22,18 +18,37 @@ assign(allQuests, unlockableQuests); assign(allQuests, goldPurchasableQuests); each(allQuests, function(quest, key) { - defaults(quest, { + let camelName = camelCase(key); + let capitalizedName = capitalize(camelName); + + let questDefaults = { key: key, - canBuy: true - }); + text: t(`quest${capitalizedName}Text`), + notes: t(`quest${capitalizedName}Notes`), + canBuy: true, + value: 4, + }; + + let questBossDefaults = { + name: t(`quest${capitalizedName}Boss`), + str: 1, + def: 1, + }; + + let questBossRageDefaults = { + title: t('bossRageTitle'), + description: t('bossRageDescription'), + }; + + defaults(quest, questDefaults); let boss = quest.boss; if (boss) { - defaults(boss, QUEST_BOSS_DEFAULTS); + defaults(boss, questBossDefaults); if (boss.rage) { - defaults(boss.rage, QUEST_BOSS_RAGE_DEFAULTS); + defaults(boss.rage, questBossRageDefaults); } } }); diff --git a/common/script/src/content/quests/pet.js b/common/script/src/content/quests/pet.js index f0a785beb9..305727c75c 100644 --- a/common/script/src/content/quests/pet.js +++ b/common/script/src/content/quests/pet.js @@ -333,15 +333,8 @@ each(petQuests, (quest, name) => { let capitalizedName = capitalize(camelName); let questDefaults = { - text: t(`quest${capitalizedName}Text`), - notes: t(`quest${capitalizedName}Notes`), completion: t(`quest${capitalizedName}Completion`), category: 'pet', - value: 4, - }; - - let bossDefaults = { - name: t(`quest${capitalizedName}Boss`), }; let dropDefaults = { @@ -365,7 +358,6 @@ each(petQuests, (quest, name) => { defaults(quest, questDefaults); - if (quest.boss) defaults(quest.boss, bossDefaults); if (quest.drop) defaults(quest.drop, dropDefaults); }); diff --git a/common/script/src/content/quests/unlockable.js b/common/script/src/content/quests/unlockable.js index 2913c3920a..2017df13b7 100644 --- a/common/script/src/content/quests/unlockable.js +++ b/common/script/src/content/quests/unlockable.js @@ -1,6 +1,4 @@ import {each, defaults, assign} from 'lodash'; -import capitalize from 'lodash.capitalize'; -import camelCase from 'lodash.camelCase'; import t from '../helpers/translator'; let inviteFriends = { @@ -353,23 +351,11 @@ assign(unlockableQuests, moonstoneSeries); assign(unlockableQuests, goldenKnightSeries); each(unlockableQuests, (quest, name) => { - let camelName = camelCase(name); - let capitalizedName = capitalize(camelName); - let questDefaults = { - text: t(`quest${capitalizedName}Text`), - notes: t(`quest${capitalizedName}Notes`), category: 'unlockable', - value: 4, - }; - - let bossDefaults = { - name: t(`quest${capitalizedName}Boss`), }; defaults(quest, questDefaults); - - if (quest.boss) defaults(quest.boss, bossDefaults); }); export default unlockableQuests; diff --git a/common/script/src/content/quests/world.js b/common/script/src/content/quests/world.js index ca1da4508b..99a3d3fed2 100644 --- a/common/script/src/content/quests/world.js +++ b/common/script/src/content/quests/world.js @@ -158,8 +158,6 @@ let worldQuests = { each(worldQuests, (quest, name) => { let capitalizedName = capitalize(name); let questDefaults = { - text: t(`quest${capitalizedName}Text`), - notes: t(`quest${capitalizedName}Notes`), completion: t(`quest${capitalizedName}Completion`), value: 0, canBuy: false,