Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into release

Browse Source
This commit is contained in:
Sabe Jones
2021-06-03 15:02:09 -05:00
parent 3c8c74f455 bc730a0d59
commit 207516d66a
231 changed files with 6469 additions and 3084 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/common/script/content/gear/sets/special/index.js
+4 -3
View File
@@ -13,6 +13,7 @@ import * as contributorGear from './special-contributor';
import * as takeThisGear from './special-takeThis';
import * as wonderconGear from './special-wondercon';
import t from '../../../translation';
import { getClassName } from '../../../../libs/getClassName';
const CURRENT_EVENT = find(
EVENTS, event => moment().isBetween(event.start, event.end) && Boolean(event.season),
@@ -714,7 +715,7 @@ const armorStats = {
Object.keys(gearEvents).forEach(event => {
CLASSES.forEach(klass => {
const classNameString = klass === 'wizard' ? 'mage' : klass;
const classNameString = getClassName(klass);
const eventString = `${event}${upperFirst(classNameString)}`;
const textString = `armorSpecial${upperFirst(event)}${upperFirst(classNameString)}`;
defaults(armor[eventString], {
@@ -1761,7 +1762,7 @@ const headStats = {
Object.keys(gearEvents).forEach(event => {
CLASSES.forEach(klass => {
const classNameString = klass === 'wizard' ? 'mage' : klass;
const classNameString = getClassName(klass);
const eventString = `${event}${upperFirst(classNameString)}`;
const textString = `headSpecial${upperFirst(event)}${upperFirst(classNameString)}`;
defaults(head[eventString], {
@@ -3192,7 +3193,7 @@ const weaponCosts = {
Object.keys(gearEvents).forEach(event => {
CLASSES.forEach(klass => {
const classNameString = klass === 'wizard' ? 'mage' : klass;
const classNameString = getClassName(klass);
const eventString = `${event}${upperFirst(classNameString)}`;
const textString = `weaponSpecial${upperFirst(event)}${upperFirst(classNameString)}`;
defaults(weapon[eventString], {