Move quest set defaults to helpers

common/script/src/content/helpers.js

@@ -123,6 +123,20 @@ export function setQuestDefaults(quests) {
   });
 };
 
+export function setQuestSetDefaults(quests, mainDefaultsFunction, dropDefaultsFunction) {
+  each(quests, (quest, name) => {
+    let formattedName = formatForTranslator(name);
+    let mainDefaults = mainDefaultsFunction(formattedName);
+
+    defaults(quest, mainDefaults);
+
+    if (quest.drop && dropDefaultsFunction) {
+      let dropDefaults = dropDefaultsFunction(formattedName);
+      defaults(quest.drop, dropDefaults);
+    }
+  });
+};
+
 //----------------------------------------
 // Generators
 //----------------------------------------

common/script/src/content/quests/gold-purchasable.js

@@ -1,8 +1,7 @@
-import {each, defaults} from 'lodash';
 import {
   translator as t,
   merge,
-  formatForTranslator
+  setQuestSetDefaults,
 } from '../helpers';
 
 let dilatoryDistressSeries = {
@@ -99,21 +98,19 @@ let dilatoryDistressSeries = {
 
 let goldPurchasableQuests = merge([dilatoryDistressSeries]);
 
-each(goldPurchasableQuests, (quest, name) => {
+let questDefaults = (name) => {
-  let formattedName = formatForTranslator(name);
+  return {
-
+    completion: t(`quest${name}Completion`),
-  let questDefaults = {
-    completion: t(`quest${formattedName}Completion`),
     category: 'gold',
-  };
+  }
+};
 
-  let dropDefaults = {
+let dropDefaults = () => {
-    gold: 0
+  return {
-  };
+    gold: 0,
+  }
+};
 
-  defaults(quest, questDefaults);
+setQuestSetDefaults(goldPurchasableQuests, questDefaults, dropDefaults);
-
-  if (quest.drop) defaults(quest.drop, dropDefaults);
-});
 
 export default goldPurchasableQuests;

common/script/src/content/quests/holiday.js

@@ -1,6 +1,8 @@
 import {each, defaults} from 'lodash';
-import capitalize from 'lodash.capitalize';
+import {
-import {translator as t} from '../helpers';
+  translator as t,
+  setQuestSetDefaults,
+} from '../helpers';
 
 let holidayQuests = {
   evilsanta: {
@@ -106,16 +108,14 @@ let holidayQuests = {
   },
 };
 
-each(holidayQuests, (quest, name) => {
+let questDefaults = (name) => {
-  let capitalizedName = capitalize(name);
+  return  {
-  let questDefaults = {
+    completion: t(`quest${name}Completion`),
-    completion: t(`quest${capitalizedName}Completion`),
     canBuy: false,
     category: 'pet',
-  };
+  }
-
+};
-  defaults(quest, questDefaults);
-});
 
+setQuestSetDefaults(holidayQuests, questDefaults);
 
 export default holidayQuests;

common/script/src/content/quests/pet.js

@@ -1,7 +1,7 @@
-import {each, defaults} from 'lodash';
+import {
-import capitalize from 'lodash.capitalize';
+  translator as t,
-import camelCase from 'lodash.camelcase';
+  setQuestSetDefaults,
-import {translator as t} from '../helpers';
+} from '../helpers';
 
 let petQuests = {
   gryphon: {
@@ -328,38 +328,30 @@ let petQuests = {
   }
 };
 
-each(petQuests, (quest, name) => {
+let questDefaults = (name) => {
-  let camelName = camelCase(name);
+  return {
-  let capitalizedName = capitalize(camelName);
+    completion: t(`quest${name}Completion`),
-
-  let questDefaults = {
-    completion: t(`quest${capitalizedName}Completion`),
     category: 'pet',
+  }
+};
+
+let dropDefaults = (name) => {
+  let eggReward = {
+    type: 'eggs',
+    key: name,
+    text: t(`quest${name}Drop${name}Egg`)
   };
 
-  let dropDefaults = {
+  return {
     items: [
-        {
+      eggReward,
-          type: 'eggs',
+      eggReward,
-          key: capitalizedName,
+      eggReward
-          text: t(`quest${capitalizedName}Drop${capitalizedName}Egg`)
-        }, {
-          type: 'eggs',
-          key: capitalizedName,
-          text: t(`quest${capitalizedName}Drop${capitalizedName}Egg`)
-        }, {
-          type: 'eggs',
-          key: capitalizedName,
-          text: t(`quest${capitalizedName}Drop${capitalizedName}Egg`)
-        },
     ],
-      unlock: t(`quest${capitalizedName}UnlockText`),
+    unlock: t(`quest${name}UnlockText`),
   };
+};
 
-  defaults(quest, questDefaults);
+setQuestSetDefaults(petQuests, questDefaults, dropDefaults);
-
-  if (quest.drop) defaults(quest.drop, dropDefaults);
-});
-
 
 export default petQuests;

common/script/src/content/quests/unlockable.js

@@ -1,8 +1,7 @@
-import {each, defaults} from 'lodash';
 import {
   translator as t,
   merge,
-  formatForTranslator
+  setQuestSetDefaults,
 } from '../helpers';
 
 let inviteFriends = {
@@ -354,12 +353,10 @@ let unlockableQuests = merge([
   goldenKnightSeries,
 ]);
 
-each(unlockableQuests, (quest, name) => {
+let questDefaults = () => {
-  let questDefaults = {
+  return { category: 'unlockable' }
-    category: 'unlockable',
+};
-  };
 
-  defaults(quest, questDefaults);
+setQuestSetDefaults(unlockableQuests, questDefaults);
-});
 
 export default unlockableQuests;

common/script/src/content/quests/world.js

@@ -1,6 +1,7 @@
-import {each, defaults} from 'lodash';
+import {
-import capitalize from 'lodash.capitalize';
+  translator as t,
-import {translator as t} from '../helpers';
+  setQuestSetDefaults,
+} from '../helpers';
 
 let worldQuests = {
   dilatory: {
@@ -155,16 +156,15 @@ let worldQuests = {
   },
 };
 
-each(worldQuests, (quest, name) => {
+let questDefaults = (name) => {
-  let capitalizedName = capitalize(name);
+  return {
-  let questDefaults = {
+    completion: t(`quest${name}Completion`),
-    completion: t(`quest${capitalizedName}Completion`),
     value: 0,
     canBuy: false,
     category: 'world',
-  };
+  }
+};
 
-  defaults(quest, questDefaults);
+setQuestSetDefaults(worldQuests, questDefaults);
-});
 
 export default worldQuests;