From 43fbe23b059ddd534e99dc9c2738bd725ee57635 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 27 Sep 2015 09:53:43 -0500 Subject: [PATCH] Extract rogue gear into set --- common/script/src/content/gear/head.js | 45 +--------- common/script/src/content/gear/sets/rogue.js | 89 ++++++++++---------- common/script/src/content/gear/shield.js | 59 +------------ common/script/src/content/gear/weapon.js | 59 +------------ 4 files changed, 52 insertions(+), 200 deletions(-) diff --git a/common/script/src/content/gear/head.js b/common/script/src/content/gear/head.js index 2c8a859946..66adb54270 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 healerHead} from './sets/healer'; +import {head as rogueHead} from './sets/rogue'; import {head as warriorHead} from './sets/warrior'; import {head as wizardHead} from './sets/wizard'; @@ -14,49 +15,7 @@ let head = { } }, warrior: warriorHead, - rogue: { - 1: { - text: t('headRogue1Text'), - notes: t('headRogue1Notes', { - per: 2 - }), - per: 2, - value: 15 - }, - 2: { - text: t('headRogue2Text'), - notes: t('headRogue2Notes', { - per: 4 - }), - per: 4, - value: 25 - }, - 3: { - text: t('headRogue3Text'), - notes: t('headRogue3Notes', { - per: 6 - }), - per: 6, - value: 40 - }, - 4: { - text: t('headRogue4Text'), - notes: t('headRogue4Notes', { - per: 9 - }), - per: 9, - value: 60 - }, - 5: { - text: t('headRogue5Text'), - notes: t('headRogue5Notes', { - per: 12 - }), - per: 12, - value: 80, - last: true - } - }, + rogue: rogueHead, wizard: wizardHead, healer: healerHead, special: { diff --git a/common/script/src/content/gear/sets/rogue.js b/common/script/src/content/gear/sets/rogue.js index 0959526945..4d27160da4 100644 --- a/common/script/src/content/gear/sets/rogue.js +++ b/common/script/src/content/gear/sets/rogue.js @@ -1,46 +1,49 @@ -import {translator as t} from '../../helpers'; +import {setGearSetDefaults} from '../../helpers'; import events from '../../events'; -export var armor = { - 1: { - text: t('armorRogue1Text'), - notes: t('armorRogue1Notes', { - per: 6 - }), - per: 6, - value: 30 - }, - 2: { - text: t('armorRogue2Text'), - notes: t('armorRogue2Notes', { - per: 9 - }), - per: 9, - value: 45 - }, - 3: { - text: t('armorRogue3Text'), - notes: t('armorRogue3Notes', { - per: 12 - }), - per: 12, - value: 65 - }, - 4: { - text: t('armorRogue4Text'), - notes: t('armorRogue4Notes', { - per: 15 - }), - per: 15, - value: 90 - }, - 5: { - text: t('armorRogue5Text'), - notes: t('armorRogue5Notes', { - per: 18 - }), - per: 18, - value: 120, - last: true - } +let armor = { + 1: { per: 6, value: 30 }, + 2: { per: 9, value: 45 }, + 3: { per: 12, value: 65 }, + 4: { per: 15, value: 90 }, + 5: { per: 18, value: 120, last: true }, }; + +let head = { + 1: { per: 2, value: 15 }, + 2: { per: 4, value: 25 }, + 3: { per: 6, value: 40 }, + 4: { per: 9, value: 60 }, + 5: { per: 12, value: 80, last: true }, +}; + +let shield = { + 0: { str: 0, value: 0 }, + 1: { str: 2, value: 20 }, + 2: { str: 3, value: 35 }, + 3: { str: 4, value: 50 }, + 4: { str: 6, value: 70 }, + 5: { str: 8, value: 90 }, + 6: { str: 10, value: 120, last: true }, +}; + +let weapon = { + 0: { str: 0, value: 0 }, + 1: { str: 2, value: 20 }, + 2: { str: 3, value: 35 }, + 3: { str: 4, value: 50 }, + 4: { str: 6, value: 70 }, + 5: { str: 8, value: 90 }, + 6: { str: 10, value: 120, last: true }, +}; + +let rogueSet = { + armor: armor, + head: head, + shield: shield, + weapon: weapon, +}; + +setGearSetDefaults(rogueSet, {setName: 'rogue'}); + +export default rogueSet; diff --git a/common/script/src/content/gear/shield.js b/common/script/src/content/gear/shield.js index eec95f0b4a..12dffc5b23 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 healerShield} from './sets/healer'; +import {shield as rogueShield} from './sets/rogue'; import {shield as warriorShield} from './sets/warrior'; import {shield as wizardShield} from './sets/wizard'; @@ -14,63 +15,7 @@ let shield = { } }, warrior: warriorShield, - rogue: { - 0: { - text: t('weaponRogue0Text'), - notes: t('weaponRogue0Notes'), - str: 0, - value: 0 - }, - 1: { - text: t('weaponRogue1Text'), - notes: t('weaponRogue1Notes', { - str: 2 - }), - str: 2, - value: 20 - }, - 2: { - text: t('weaponRogue2Text'), - notes: t('weaponRogue2Notes', { - str: 3 - }), - str: 3, - value: 35 - }, - 3: { - text: t('weaponRogue3Text'), - notes: t('weaponRogue3Notes', { - str: 4 - }), - str: 4, - value: 50 - }, - 4: { - text: t('weaponRogue4Text'), - notes: t('weaponRogue4Notes', { - str: 6 - }), - str: 6, - value: 70 - }, - 5: { - text: t('weaponRogue5Text'), - notes: t('weaponRogue5Notes', { - str: 8 - }), - str: 8, - value: 90 - }, - 6: { - text: t('weaponRogue6Text'), - notes: t('weaponRogue6Notes', { - str: 10 - }), - str: 10, - value: 120, - last: true - } - }, + rogue: rogueShield, wizard: wizardShield, healer: healerShield, special: { diff --git a/common/script/src/content/gear/weapon.js b/common/script/src/content/gear/weapon.js index 0ae0e825fb..4a08fa8c6d 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 healerWeapon} from './sets/healer'; +import {weapon as rogueWeapon} from './sets/rogue'; import {weapon as warriorWeapon} from './sets/warrior'; import {weapon as wizardWeapon} from './sets/wizard'; @@ -14,63 +15,7 @@ let weapon = { } }, warrior: warriorWeapon, - rogue: { - 0: { - text: t('weaponRogue0Text'), - notes: t('weaponRogue0Notes'), - str: 0, - value: 0 - }, - 1: { - text: t('weaponRogue1Text'), - notes: t('weaponRogue1Notes', { - str: 2 - }), - str: 2, - value: 20 - }, - 2: { - text: t('weaponRogue2Text'), - notes: t('weaponRogue2Notes', { - str: 3 - }), - str: 3, - value: 35 - }, - 3: { - text: t('weaponRogue3Text'), - notes: t('weaponRogue3Notes', { - str: 4 - }), - str: 4, - value: 50 - }, - 4: { - text: t('weaponRogue4Text'), - notes: t('weaponRogue4Notes', { - str: 6 - }), - str: 6, - value: 70 - }, - 5: { - text: t('weaponRogue5Text'), - notes: t('weaponRogue5Notes', { - str: 8 - }), - str: 8, - value: 90 - }, - 6: { - text: t('weaponRogue6Text'), - notes: t('weaponRogue6Notes', { - str: 10 - }), - str: 10, - value: 120, - last: true - } - }, + rogue: rogueWeapon, wizard: wizardWeapon, healer: healerWeapon, special: {