mirror/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2026-05-12 19:54:04 -05:00
Code Issues Packages Projects Releases 126 Wiki Activity

Squashed commit of the following:

Browse Source 
commit dd4d53a68ccf547857c05402cdb569460589a223
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Oct 1 11:17:04 2020 -0500

    refactor(event): needless event thing

commit d1254af5218f6ae85bc64b45c55aea46388b665b
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Oct 1 10:56:06 2020 -0500

    fix(event): clone, not reassign

commit 50bd3199dc35ff215f7cb80b8e5db6770e7f436a
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Oct 1 10:36:39 2020 -0500

    fix(event): create interim period and handle it in gear generation
This commit is contained in:
Sabe Jones
2020-10-01 11:24:31 -05:00
parent efe7ea52bc
commit 679d615224
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/common/script/content/gear/sets/special/index.js
+14 -12
View File
@@ -1,4 +1,5 @@
import moment from 'moment';
import cloneDeep from 'lodash/cloneDeep';
import defaults from 'lodash/defaults';
import upperFirst from 'lodash/upperFirst';
import {
@@ -13,6 +14,11 @@ import * as wonderconGear from './special-wondercon';
import t from '../../../translation';
const CURRENT_SEASON = moment().isBefore('2020-11-02') ? 'fall' : '_NONE_';
const gearEvents = cloneDeep(EVENTS);
gearEvents.fall2020.end = gearEvents.fall2020SecondPromo.end;
['winter', 'birthday', 'gaymerx', 'fall2020SecondPromo'].forEach(nonGearEvent => {
delete gearEvents[nonGearEvent];
});
const armor = {
0: backerGear.armorSpecial0,
@@ -648,14 +654,13 @@ const armorStats = {
wizard: { int: 9 },
};
Object.keys(EVENTS).forEach(event => {
if (['winter', 'birthday', 'gaymerx'].indexOf(event) !== -1) return;
Object.keys(gearEvents).forEach(event => {
CLASSES.forEach(klass => {
const classNameString = klass === 'wizard' ? 'mage' : klass;
const eventString = `${event}${upperFirst(classNameString)}`;
const textString = `armorSpecial${upperFirst(event)}${upperFirst(classNameString)}`;
defaults(armor[eventString], {
event: EVENTS[event],
event: gearEvents[event],
specialClass: klass,
text: t(`${textString}Text`),
notes: t(`${textString}Notes`, armorStats[klass]),
@@ -1638,14 +1643,13 @@ const headStats = {
wizard: { per: 7 },
};
Object.keys(EVENTS).forEach(event => {
if (['winter', 'birthday', 'gaymerx'].indexOf(event) !== -1) return;
Object.keys(gearEvents).forEach(event => {
CLASSES.forEach(klass => {
const classNameString = klass === 'wizard' ? 'mage' : klass;
const eventString = `${event}${upperFirst(classNameString)}`;
const textString = `headSpecial${upperFirst(event)}${upperFirst(classNameString)}`;
defaults(head[eventString], {
event: EVENTS[event],
event: gearEvents[event],
specialClass: klass,
text: t(`${textString}Text`),
notes: t(`${textString}Notes`, headStats[klass]),
@@ -2361,15 +2365,14 @@ const shieldStats = {
warrior: { con: 7 },
};
Object.keys(EVENTS).forEach(event => {
if (['winter', 'birthday', 'gaymerx'].indexOf(event) !== -1) return;
Object.keys(gearEvents).forEach(event => {
CLASSES.forEach(klass => {
if (klass === 'wizard') return;
const eventString = `${event}${upperFirst(klass)}`;
const textString = klass === 'rogue' ? `weaponSpecial${upperFirst(event)}Rogue`
: `shieldSpecial${upperFirst(event)}${upperFirst(klass)}`;
defaults(shield[eventString], {
event: EVENTS[event],
event: gearEvents[event],
specialClass: klass,
text: t(`${textString}Text`),
notes: t(`${textString}Notes`, shieldStats[klass]),
@@ -2979,14 +2982,13 @@ const weaponCosts = {
wizard: 160,
};
Object.keys(EVENTS).forEach(event => {
if (['winter', 'birthday', 'gaymerx'].indexOf(event) !== -1) return;
Object.keys(gearEvents).forEach(event => {
CLASSES.forEach(klass => {
const classNameString = klass === 'wizard' ? 'mage' : klass;
const eventString = `${event}${upperFirst(classNameString)}`;
const textString = `weaponSpecial${upperFirst(event)}${upperFirst(classNameString)}`;
defaults(weapon[eventString], {
event: EVENTS[event],
event: gearEvents[event],
specialClass: klass,
text: t(`${textString}Text`),
notes: t(`${textString}Notes`, weaponStats[klass]),