krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'CuriousMagpie/2022-spring-fling-gala' into release

Browse Source
This commit is contained in:
SabreCat
2022-03-22 09:41:59 -05:00
parent 33da6b7959 c94195129f
commit e141e2407c
8 changed files with 121 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
website/common/script/content/constants/events.js
View File

@@ -10,11 +10,18 @@ const gemsPromo = {
export const EVENTS = {
noCurrentEvent: {
start: '2022-02-18T20:00-05:00',
end: '2022-03-31T20:00-05:00',
start: '2022-05-01T20:00-05:00',
end: '2022-06-30T20:00-05:00',
season: 'normal',
npcImageSuffix: '',
},
spring2022: {
start: '2022-03-22T08:00-05:00',
end: '2022-04-30T20:00-05:00',
npcImageSuffix: 'spring',
season: 'spring',
gear: true,
},
valentines2022: {
start: '2022-02-14T08:00-05:00',
end: '2022-02-18T20:00-05:00',

7
website/common/script/content/constants/seasonalSets.js
View File

@@ -96,7 +96,14 @@ const SEASONAL_SETS = {
'spring2021WillowHealerSet',
'spring2021SunstoneWarriorSet',
'spring2021TwinFlowerRogueSet',
// spring 2022
'spring2022ForsythiaMageSet',
'spring2022PeridotHealerSet',
'spring2022RainstormWarriorSet',
'spring2022MagpieRogueSet',
],
summer: [
// summer 2014
'daringSwashbucklerSet',

61
website/common/script/content/gear/sets/special/index.js
View File

@@ -670,15 +670,19 @@ const armor = {
},
spring2021Rogue: {
set: 'spring2021TwinFlowerRogueSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Warrior: {
set: 'spring2021SunstoneWarriorSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Mage: {
set: 'spring2021SwanMageSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Healer: {
set: 'spring2021WillowHealerSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
summer2021Rogue: {
set: 'summer2021ClownfishRogueSet',
@@ -716,6 +720,19 @@ const armor = {
winter2022Healer: {
set: 'winter2022IceCrystalHealerSet',
},
spring2022Rogue: {
set: 'spring2022MagpieRogueSet',
},
spring2022Warrior: {
set: 'spring2022RainstormWarriorSet',
},
spring2022Mage: {
set: 'spring2022ForsythiaMageSet',
},
spring2022Healer: {
set: 'spring2022PeridotHealerSet',
},
birthday2022: {
text: t('armorSpecialBirthday2022Text'),
notes: t('armorSpecialBirthday2022Notes'),
@@ -1728,15 +1745,19 @@ const head = {
},
spring2021Rogue: {
set: 'spring2021TwinFlowerRogueSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Warrior: {
set: 'spring2021SunstoneWarriorSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Mage: {
set: 'spring2021SwanMageSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Healer: {
set: 'spring2021WillowHealerSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
summer2021Rogue: {
set: 'summer2021ClownfishRogueSet',
@@ -1780,6 +1801,18 @@ const head = {
value: 0,
canOwn: ownsItem('head_special_nye2021'),
},
spring2022Rogue: {
set: 'spring2022MagpieRogueSet',
},
spring2022Warrior: {
set: 'spring2022RainstormWarriorSet',
},
spring2022Mage: {
set: 'spring2022ForsythiaMageSet',
},
spring2022Healer: {
set: 'spring2022PeridotHealerSet',
},
};
const headStats = {
@@ -2504,12 +2537,15 @@ const shield = {
},
spring2021Rogue: {
set: 'spring2021TwinFlowerRogueSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Warrior: {
set: 'spring2021SunstoneWarriorSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Healer: {
set: 'spring2021WillowHealerSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
summer2021Rogue: {
set: 'summer2021ClownfishRogueSet',
@@ -2538,6 +2574,15 @@ const shield = {
winter2022Healer: {
set: 'winter2022IceCrystalHealerSet',
},
spring2022Rogue: {
set: 'spring2022MagpieRogueSet',
},
spring2022Warrior: {
set: 'spring2022RainstormWarriorSet',
},
spring2022Healer: {
set: 'spring2022PeridotHealerSet',
},
};
const shieldStats = {
@@ -3168,15 +3213,19 @@ const weapon = {
},
spring2021Rogue: {
set: 'spring2021TwinFlowerRogueSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Warrior: {
set: 'spring2021SunstoneWarriorSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Mage: {
set: 'spring2021SwanMageSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
spring2021Healer: {
set: 'spring2021WillowHealerSet',
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
},
summer2021Rogue: {
set: 'summer2021ClownfishRogueSet',
@@ -3214,6 +3263,18 @@ const weapon = {
winter2022Healer: {
set: 'winter2022IceCrystalHealerSet',
},
spring2022Rogue: {
set: 'spring2022MagpieRogueSet',
},
spring2022Warrior: {
set: 'spring2022RainstormWarriorSet',
},
spring2022Mage: {
set: 'spring2022ForsythiaMageSet',
},
spring2022Healer: {
set: 'spring2022PeridotHealerSet',
},
};
const weaponStats = {

2
website/common/script/content/shop-featuredItems.js
View File

@@ -75,7 +75,7 @@ const featuredItems = {
},
];
},
seasonal: 'winter2021Warrior',
seasonal: 'spring2021Healer',
timeTravelers: [
// TODO
],