Squashed commit of the following:

commit 24e299b4663d77daf70c5cca584d27db2df94fe6
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Jun 18 12:29:07 2020 -0500

    fix(gear): Mage Oar is twohanded and grants PER

commit 4f92312b7f409419c37f9f97bc162153ad3103b5
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Jun 18 12:27:27 2020 -0500

    fix(sprites): corrected Mage set

commit 49d86ca8879b66e3531be81d35e6e98916185486
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Wed Jun 17 16:16:56 2020 -0500

    refactor(strings): finish cleaning up redundant seasonal Rogue strings

commit ee513cc1449c52ad72850745ea18a353be5490d2
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Wed Jun 17 16:09:12 2020 -0500

    chore(sprites): compile

commit 0b15f834a000a033925571ff5a15871b0965bc00
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Wed Jun 17 16:08:59 2020 -0500

    feat(content): Splash 2020
This commit is contained in:
Sabe Jones
2020-06-18 13:16:07 -05:00
parent bceccd55bf
commit 5cd9528b77
129 changed files with 15288 additions and 14675 deletions
@@ -1,5 +1,9 @@
/* eslint-disable key-spacing */
import moment from 'moment';
export const CURRENT_SEASON = moment().isBefore('2020-08-02') ? 'summer' : '_NONE_';
export const CLASSES = [
'warrior',
'rogue',
@@ -40,6 +44,7 @@ export const EVENTS = {
fall2019: { start: '2019-09-24', end: '2019-11-02' },
winter2020: { start: '2019-12-19', end: '2020-02-02' },
spring2020: { start: '2020-03-17', end: '2020-05-02' },
summer2020: { start: '2020-06-17', end: '2020-08-02' },
};
export const SEASONAL_SETS = {
@@ -166,6 +171,12 @@ export const SEASONAL_SETS = {
'summer2019WaterLilyMageSet',
'summer2019ConchHealerSet',
'summer2019HammerheadRogueSet',
// summer 2020
'summer2020SeaGlassHealerSet',
'summer2020OarfishMageSet',
'summer2020CrocodileRogueSet',
'summer2020RainbowTroutWarriorSet',
],
fall: [
// fall 2014
@@ -9,7 +9,7 @@ import * as takeThisGear from './special-takeThis';
import * as wonderconGear from './special-wondercon';
import t from '../../../translation';
const CURRENT_SEASON = moment().isBetween('2020-03-17', '2020-05-02') ? 'spring' : '_NONE_';
const CURRENT_SEASON = moment().isBefore('2020-08-02') ? 'summer' : '_NONE_';
const armor = {
0: backerGear.armorSpecial0,
@@ -1192,6 +1192,42 @@ const armor = {
value: 90,
con: 15,
},
summer2020Rogue: {
event: EVENTS.summer2020,
specialClass: 'rogue',
set: 'summer2020CrocodileRogueSet',
text: t('armorSpecialSummer2020RogueText'),
notes: t('armorSpecialSummer2020RogueNotes', { per: 15 }),
value: 90,
per: 15,
},
summer2020Warrior: {
event: EVENTS.summer2020,
specialClass: 'warrior',
set: 'summer2020RainbowTroutWarriorSet',
text: t('armorSpecialSummer2020WarriorText'),
notes: t('armorSpecialSummer2020WarriorNotes', { con: 9 }),
value: 90,
con: 9,
},
summer2020Mage: {
event: EVENTS.summer2020,
specialClass: 'wizard',
set: 'summer2020OarfishMageSet',
text: t('armorSpecialSummer2020MageText'),
notes: t('armorSpecialSummer2020MageNotes', { int: 9 }),
value: 90,
int: 9,
},
summer2020Healer: {
event: EVENTS.summer2020,
specialClass: 'healer',
set: 'summer2020SeaGlassHealerSet',
text: t('armorSpecialSummer2020HealerText'),
notes: t('armorSpecialSummer2020HealerNotes', { con: 15 }),
value: 90,
con: 15,
},
};
const back = {
@@ -2707,6 +2743,42 @@ const head = {
value: 60,
int: 7,
},
summer2020Rogue: {
event: EVENTS.summer2020,
specialClass: 'rogue',
set: 'summer2020CrocodileRogueSet',
text: t('headSpecialSummer2020RogueText'),
notes: t('headSpecialSummer2020RogueNotes', { per: 9 }),
value: 60,
per: 9,
},
summer2020Warrior: {
event: EVENTS.summer2020,
specialClass: 'warrior',
set: 'summer2020RainbowTroutWarriorSet',
text: t('headSpecialSummer2020WarriorText'),
notes: t('headSpecialSummer2020WarriorNotes', { str: 9 }),
value: 60,
str: 9,
},
summer2020Mage: {
event: EVENTS.summer2020,
specialClass: 'wizard',
set: 'summer2020OarfishMageSet',
text: t('headSpecialSummer2020MageText'),
notes: t('headSpecialSummer2020MageNotes', { per: 7 }),
value: 60,
per: 7,
},
summer2020Healer: {
event: EVENTS.summer2020,
specialClass: 'healer',
set: 'summer2020SeaGlassHealerSet',
text: t('headSpecialSummer2020HealerText'),
notes: t('headSpecialSummer2020HealerNotes', { int: 7 }),
value: 60,
int: 7,
},
};
const headAccessory = {
@@ -3064,8 +3136,8 @@ const shield = {
event: EVENTS.spring,
specialClass: 'rogue',
set: 'stealthyKittySet',
text: t('shieldSpecialSpringRogueText'),
notes: t('shieldSpecialSpringRogueNotes', { str: 8 }),
text: t('weaponSpecialSpringRogueText'),
notes: t('weaponSpecialSpringRogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'spring',
@@ -3094,8 +3166,8 @@ const shield = {
event: EVENTS.summer,
specialClass: 'rogue',
set: 'roguishPirateSet',
text: t('shieldSpecialSummerRogueText'),
notes: t('shieldSpecialSummerRogueNotes', { str: 8 }),
text: t('weaponSpecialSummerRogueText'),
notes: t('weaponSpecialSummerRogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'summer',
@@ -3124,8 +3196,8 @@ const shield = {
event: EVENTS.fall,
specialClass: 'rogue',
set: 'vampireSmiterSet',
text: t('shieldSpecialFallRogueText'),
notes: t('shieldSpecialFallRogueNotes', { str: 8 }),
text: t('weaponSpecialFallRogueText'),
notes: t('weaponSpecialFallRogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'fall',
@@ -3154,8 +3226,8 @@ const shield = {
event: EVENTS.winter2015,
specialClass: 'rogue',
set: 'icicleDrakeSet',
text: t('shieldSpecialWinter2015RogueText'),
notes: t('shieldSpecialWinter2015RogueNotes', { str: 8 }),
text: t('weaponSpecialWinter2015RogueText'),
notes: t('weaponSpecialWinter2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'winter',
@@ -3184,8 +3256,8 @@ const shield = {
event: EVENTS.spring2015,
specialClass: 'rogue',
set: 'sneakySqueakerSet',
text: t('shieldSpecialSpring2015RogueText'),
notes: t('shieldSpecialSpring2015RogueNotes', { str: 8 }),
text: t('weaponSpecialSpring2015RogueText'),
notes: t('weaponSpecialSpring2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'spring',
@@ -3214,8 +3286,8 @@ const shield = {
event: EVENTS.summer2015,
specialClass: 'rogue',
set: 'reefRenegadeSet',
text: t('shieldSpecialSummer2015RogueText'),
notes: t('shieldSpecialSummer2015RogueNotes', { str: 8 }),
text: t('weaponSpecialSummer2015RogueText'),
notes: t('weaponSpecialSummer2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'summer',
@@ -3244,8 +3316,8 @@ const shield = {
event: EVENTS.fall2015,
specialClass: 'rogue',
set: 'battleRogueSet',
text: t('shieldSpecialFall2015RogueText'),
notes: t('shieldSpecialFall2015RogueNotes', { str: 8 }),
text: t('weaponSpecialFall2015RogueText'),
notes: t('weaponSpecialFall2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'fall',
@@ -3274,8 +3346,8 @@ const shield = {
event: EVENTS.winter2016,
specialClass: 'rogue',
set: 'cocoaSet',
text: t('shieldSpecialWinter2016RogueText'),
notes: t('shieldSpecialWinter2016RogueNotes', { str: 8 }),
text: t('weaponSpecialWinter2016RogueText'),
notes: t('weaponSpecialWinter2016RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'winter',
@@ -3304,8 +3376,8 @@ const shield = {
event: EVENTS.spring2016,
specialClass: 'rogue',
set: 'cleverDogSet',
text: t('shieldSpecialSpring2016RogueText'),
notes: t('shieldSpecialSpring2016RogueNotes', { str: 8 }),
text: t('weaponSpecialSpring2016RogueText'),
notes: t('weaponSpecialSpring2016RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'spring',
@@ -3334,8 +3406,8 @@ const shield = {
event: EVENTS.summer2016,
specialClass: 'rogue',
set: 'summer2016EelSet',
text: t('shieldSpecialSummer2016RogueText'),
notes: t('shieldSpecialSummer2016RogueNotes', { str: 8 }),
text: t('weaponSpecialSummer2016RogueText'),
notes: t('weaponSpecialSummer2016RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'summer',
@@ -3364,8 +3436,8 @@ const shield = {
event: EVENTS.fall2016,
specialClass: 'rogue',
set: 'fall2016BlackWidowSet',
text: t('shieldSpecialFall2016RogueText'),
notes: t('shieldSpecialFall2016RogueNotes', { str: 8 }),
text: t('weaponSpecialFall2016RogueText'),
notes: t('weaponSpecialFall2016RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'fall',
@@ -3394,8 +3466,8 @@ const shield = {
event: EVENTS.winter2017,
specialClass: 'rogue',
set: 'winter2017FrostyRogueSet',
text: t('shieldSpecialWinter2017RogueText'),
notes: t('shieldSpecialWinter2017RogueNotes', { str: 8 }),
text: t('weaponSpecialWinter2017RogueText'),
notes: t('weaponSpecialWinter2017RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'winter',
@@ -3424,8 +3496,8 @@ const shield = {
event: EVENTS.spring2017,
specialClass: 'rogue',
set: 'spring2017SneakyBunnySet',
text: t('shieldSpecialSpring2017RogueText'),
notes: t('shieldSpecialSpring2017RogueNotes', { str: 8 }),
text: t('weaponSpecialSpring2017RogueText'),
notes: t('weaponSpecialSpring2017RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'spring',
@@ -3454,8 +3526,8 @@ const shield = {
event: EVENTS.summer2017,
specialClass: 'rogue',
set: 'summer2017SeaDragonSet',
text: t('shieldSpecialSummer2017RogueText'),
notes: t('shieldSpecialSummer2017RogueNotes', { str: 8 }),
text: t('weaponSpecialSummer2017RogueText'),
notes: t('weaponSpecialSummer2017RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'summer',
@@ -3484,8 +3556,8 @@ const shield = {
event: EVENTS.fall2017,
specialClass: 'rogue',
set: 'fall2017TrickOrTreatSet',
text: t('shieldSpecialFall2017RogueText'),
notes: t('shieldSpecialFall2017RogueNotes', { str: 8 }),
text: t('weaponSpecialFall2017RogueText'),
notes: t('weaponSpecialFall2017RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'fall',
@@ -3514,8 +3586,8 @@ const shield = {
event: EVENTS.winter2018,
specialClass: 'rogue',
set: 'winter2018ReindeerSet',
text: t('shieldSpecialWinter2018RogueText'),
notes: t('shieldSpecialWinter2018RogueNotes', { str: 8 }),
text: t('weaponSpecialWinter2018RogueText'),
notes: t('weaponSpecialWinter2018RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => CURRENT_SEASON === 'winter',
@@ -3820,6 +3892,33 @@ const shield = {
value: 70,
con: 9,
},
summer2020Warrior: {
event: EVENTS.summer2020,
specialClass: 'warrior',
set: 'summer2020RainbowTroutWarriorSet',
text: t('shieldSpecialSummer2020WarriorText'),
notes: t('shieldSpecialSummer2020WarriorNotes', { con: 7 }),
value: 70,
con: 7,
},
summer2020Healer: {
event: EVENTS.summer2020,
specialClass: 'healer',
set: 'summer2020SeaGlassHealerSet',
text: t('shieldSpecialSummer2020HealerText'),
notes: t('shieldSpecialSummer2020HealerNotes', { con: 9 }),
value: 70,
con: 9,
},
summer2020Rogue: {
event: EVENTS.summer2020,
specialClass: 'rogue',
set: 'summer2020CrocodileRogueSet',
text: t('weaponSpecialSummer2020RogueText'),
notes: t('weaponSpecialSummer2020RogueNotes', { str: 8 }),
value: 80,
str: 8,
},
};
const weapon = {
@@ -5004,6 +5103,44 @@ const weapon = {
value: 90,
int: 9,
},
summer2020Rogue: {
event: EVENTS.summer2020,
specialClass: 'rogue',
set: 'summer2020CrocodileRogueSet',
text: t('weaponSpecialSummer2020RogueText'),
notes: t('weaponSpecialSummer2020RogueNotes', { str: 8 }),
value: 80,
str: 8,
},
summer2020Warrior: {
event: EVENTS.summer2020,
specialClass: 'warrior',
set: 'summer2020RainbowTroutWarriorSet',
text: t('weaponSpecialSummer2020WarriorText'),
notes: t('weaponSpecialSummer2020WarriorNotes', { str: 15 }),
value: 90,
str: 15,
},
summer2020Mage: {
event: EVENTS.summer2020,
specialClass: 'wizard',
set: 'summer2020OarfishMageSet',
text: t('weaponSpecialSummer2020MageText'),
notes: t('weaponSpecialSummer2020MageNotes', { int: 15, per: 7 }),
value: 90,
int: 15,
per: 7,
twoHanded: true,
},
summer2020Healer: {
event: EVENTS.summer2020,
specialClass: 'healer',
set: 'summer2020SeaGlassHealerSet',
text: t('weaponSpecialSummer2020HealerText'),
notes: t('weaponSpecialSummer2020HealerNotes', { int: 9 }),
value: 90,
int: 9,
},
};
export {
@@ -305,6 +305,17 @@ const premium = {
canBuy: hasQuestAchievementFunction('fluorite'),
_addlNotes: t('premiumPotionUnlimitedNotes'),
},
SandSculpture: {
value: 2,
text: t('hatchingPotionSandSculpture'),
limited: true,
canBuy () {
return moment().isBefore('2020-08-02');
},
_addlNotes: t('premiumPotionAddlNotes', {
date: t('dateEndJuly'),
}),
},
};
const wacky = {
@@ -9,16 +9,16 @@ const featuredItems = {
path: 'armoire',
},
{
type: 'hatchingPotions',
path: 'hatchingPotions.Golden',
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.SandSculpture',
},
{
type: 'eggs',
path: 'eggs.Wolf',
path: 'eggs.Dragon',
},
{
type: 'food',
path: 'food.Saddle',
path: 'food.Chocolate',
},
];
},
@@ -38,7 +38,7 @@ const featuredItems = {
},
];
},
seasonal: 'spring2019Rogue',
seasonal: 'summer2019Warrior',
timeTravelers: [
// TODO
],
@@ -1,16 +1,21 @@
// import { SEASONAL_SETS } from '../content/constants';
import { SEASONAL_SETS } from '../content/constants';
export default {
opened: false,
opened: true,
currentSeason: 'Closed',
currentSeason: 'Summer',
dateRange: { start: '2019-09-24', end: '2019-10-31' },
dateRange: { start: '2020-06-17', end: '2020-07-31' },
availableSets: [
...SEASONAL_SETS.summer,
],
pinnedSets: {
healer: 'summer2020SeaGlassHealerSet',
rogue: 'summer2020CrocodileRogueSet',
warrior: 'summer2020RainbowTroutWarriorSet',
wizard: 'summer2020OarfishMageSet',
},
availableSpells: [
@@ -19,5 +24,5 @@ export default {
availableQuests: [
],
featuredSet: 'fall2018AlterEgoSet',
featuredSet: 'summer2019WaterLilyMageSet',
};