diff --git a/common/script/src/content/gear/head.js b/common/script/src/content/gear/head.js index d36ce251d4..9b102145d8 100644 --- a/common/script/src/content/gear/head.js +++ b/common/script/src/content/gear/head.js @@ -2,6 +2,7 @@ import {translator as t} from '../helpers'; import events from '../events'; import {head as warriorHead} from './sets/warrior'; +import {head as wizardHead} from './sets/wizard'; let head = { base: { @@ -55,49 +56,7 @@ let head = { last: true } }, - wizard: { - 1: { - text: t('headWizard1Text'), - notes: t('headWizard1Notes', { - per: 2 - }), - per: 2, - value: 15 - }, - 2: { - text: t('headWizard2Text'), - notes: t('headWizard2Notes', { - per: 3 - }), - per: 3, - value: 25 - }, - 3: { - text: t('headWizard3Text'), - notes: t('headWizard3Notes', { - per: 5 - }), - per: 5, - value: 40 - }, - 4: { - text: t('headWizard4Text'), - notes: t('headWizard4Notes', { - per: 7 - }), - per: 7, - value: 60 - }, - 5: { - text: t('headWizard5Text'), - notes: t('headWizard5Notes', { - per: 10 - }), - per: 10, - value: 80, - last: true - } - }, + wizard: wizardHead, healer: { 1: { text: t('headHealer1Text'), diff --git a/common/script/src/content/gear/sets/wizard.js b/common/script/src/content/gear/sets/wizard.js index 483b23230a..e3d18ef6d7 100644 --- a/common/script/src/content/gear/sets/wizard.js +++ b/common/script/src/content/gear/sets/wizard.js @@ -1,46 +1,45 @@ -import {translator as t} from '../../helpers'; +import {setGearSetDefaults} from '../../helpers'; import events from '../../events'; -export var armor = { - 1: { - text: t('armorWizard1Text'), - notes: t('armorWizard1Notes', { - int: 2 - }), - int: 2, - value: 30 - }, - 2: { - text: t('armorWizard2Text'), - notes: t('armorWizard2Notes', { - int: 4 - }), - int: 4, - value: 45 - }, - 3: { - text: t('armorWizard3Text'), - notes: t('armorWizard3Notes', { - int: 6 - }), - int: 6, - value: 65 - }, - 4: { - text: t('armorWizard4Text'), - notes: t('armorWizard4Notes', { - int: 9 - }), - int: 9, - value: 90 - }, - 5: { - text: t('armorWizard5Text'), - notes: t('armorWizard5Notes', { - int: 12 - }), - int: 12, - value: 120, - last: true - } +let armor = { + 1: { int: 2, value: 30 }, + 2: { int: 4, value: 45 }, + 3: { int: 6, value: 65 }, + 4: { int: 9, value: 90 }, + 5: { int: 12, value: 120, last: true }, }; + +let head = { + 1: { per: 2, value: 15 }, + 2: { per: 3, value: 25 }, + 3: { per: 5, value: 40 }, + 4: { per: 7, value: 60 }, + 5: { per: 10, value: 80, last: true }, +}; + +let shield = { + // Wizard's weapons are two handed + // And thus do not have shields + // But the content structure still expects an object +}; + +let weapon = { + 0: { twoHanded: true, value: 0 }, + 1: { twoHanded: true, int: 3, per: 1, value: 30 }, + 2: { twoHanded: true, int: 6, per: 2, value: 50 }, + 3: { twoHanded: true, int: 9, per: 3, value: 80 }, + 4: { twoHanded: true, int: 12, per: 5, value: 120 }, + 5: { twoHanded: true, int: 15, per: 7, value: 160 }, + 6: { twoHanded: true, int: 18, per: 10, value: 200, last: true }, +}; + +let wizardSet = { + armor: armor, + head: head, + shield: shield, + weapon: weapon, +}; + +setGearSetDefaults(wizardSet, {setName: 'wizard'}); + +export default wizardSet; diff --git a/common/script/src/content/gear/shield.js b/common/script/src/content/gear/shield.js index 691f89d3a3..9d7235404f 100644 --- a/common/script/src/content/gear/shield.js +++ b/common/script/src/content/gear/shield.js @@ -2,6 +2,7 @@ import {translator as t} from '../helpers'; import events from '../events'; import {shield as warriorShield} from './sets/warrior'; +import {shield as wizardShield} from './sets/wizard'; let shield = { base: { @@ -69,7 +70,7 @@ let shield = { last: true } }, - wizard: {}, + wizard: wizardShield, healer: { 1: { text: t('shieldHealer1Text'), diff --git a/common/script/src/content/gear/weapon.js b/common/script/src/content/gear/weapon.js index ee7faf8bf4..e5f6be7fc6 100644 --- a/common/script/src/content/gear/weapon.js +++ b/common/script/src/content/gear/weapon.js @@ -2,6 +2,7 @@ import {translator as t} from '../helpers'; import events from '../events'; import {weapon as warriorWeapon} from './sets/warrior'; +import {weapon as wizardWeapon} from './sets/wizard'; let weapon = { base: { @@ -69,81 +70,7 @@ let weapon = { last: true } }, - wizard: { - 0: { - twoHanded: true, - text: t('weaponWizard0Text'), - notes: t('weaponWizard0Notes'), - value: 0 - }, - 1: { - twoHanded: true, - text: t('weaponWizard1Text'), - notes: t('weaponWizard1Notes', { - int: 3, - per: 1 - }), - int: 3, - per: 1, - value: 30 - }, - 2: { - twoHanded: true, - text: t('weaponWizard2Text'), - notes: t('weaponWizard2Notes', { - int: 6, - per: 2 - }), - int: 6, - per: 2, - value: 50 - }, - 3: { - twoHanded: true, - text: t('weaponWizard3Text'), - notes: t('weaponWizard3Notes', { - int: 9, - per: 3 - }), - int: 9, - per: 3, - value: 80 - }, - 4: { - twoHanded: true, - text: t('weaponWizard4Text'), - notes: t('weaponWizard4Notes', { - int: 12, - per: 5 - }), - int: 12, - per: 5, - value: 120 - }, - 5: { - twoHanded: true, - text: t('weaponWizard5Text'), - notes: t('weaponWizard5Notes', { - int: 15, - per: 7 - }), - int: 15, - per: 7, - value: 160 - }, - 6: { - twoHanded: true, - text: t('weaponWizard6Text'), - notes: t('weaponWizard6Notes', { - int: 18, - per: 10 - }), - int: 18, - per: 10, - value: 200, - last: true - } - }, + wizard: wizardWeapon, healer: { 0: { text: t('weaponHealer0Text'),