2022 Summer Gala Content (#14067)

* merge upstream/release into origin/release * Revert "merge upstream/release into origin/release" This reverts commit 902ed08cc3. * Summer Splash 2022 Content * added magic hatching potions * updated events for testing * fix whitespace * various corrections * fix(gear): mage set, healer set, event start date * update: habitica-images * fix(events): include normal/empty season data outside of gala * fix(string): missing attribute and event verbiage for warrior item Co-authored-by: SabreCat <sabe@habitica.com>
2025-12-15 21:57:22 +01:00 · 2022-06-21 10:29:53 -04:00
parent 170146f91e
commit f0c25dab05
10 changed files with 309 additions and 24 deletions
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -9,9 +9,22 @@ const gemsPromo = {
 };

 export const EVENTS = {
+  noCurrentEventAfter: {
+    start: '2022-07-31T20:00-04:00',
+    end: '2022-12-21T08:00-04:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
+  summer2022: {
+    start: '2022-06-21T08:00-04:00',
+    end: '2022-07-31T20:00-04:00',
+    season: 'summer',
+    npcImageSuffix: '_summer',
+    gear: true,
+  },
  noCurrentEvent: {
-    start: '2022-05-31T20:00-04:00',
-    end: '2022-06-30T20:00-05:00',
+    start: '2022-04-30T20:00-04:00',
+    end: '2022-06-21T08:00-04:00',
    season: 'normal',
    npcImageSuffix: '',
  },
--- a/website/common/script/content/constants/seasonalSets.js
+++ b/website/common/script/content/constants/seasonalSets.js
@@ -140,6 +140,11 @@ const SEASONAL_SETS = {
    'summer2021ClownfishRogueSet',
    'summer2021FlyingFishWarriorSet',
    'summer2021NautilusMageSet',
+
+    'summer2022CrabRogueSet',
+    'summer2022WaterspoutWarriorSet',
+    'summer2022MantaRayMageSet',
+    'summer2022AngelfishHealerSet',
  ],
  fall: [
    // fall 2014
--- a/website/common/script/content/gear/sets/special/index.js
+++ b/website/common/script/content/gear/sets/special/index.js
@@ -686,15 +686,19 @@ const armor = {
  },
  summer2021Rogue: {
    set: 'summer2021ClownfishRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Warrior: {
    set: 'summer2021FlyingFishWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Mage: {
    set: 'summer2021NautilusMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Healer: {
    set: 'summer2021ParrotHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  fall2021Rogue: {
    set: 'fall2021OozeRogueSet',
@@ -732,13 +736,24 @@ const armor = {
  spring2022Healer: {
    set: 'spring2022PeridotHealerSet',
  },
-
  birthday2022: {
    text: t('armorSpecialBirthday2022Text'),
    notes: t('armorSpecialBirthday2022Notes'),
    value: 0,
    canOwn: ownsItem('armor_special_birthday2022'),
  },
+  summer2022Rogue: {
+    set: 'summer2022CrabRogueSet',
+  },
+  summer2022Warrior: {
+    set: 'summer2022WaterspoutWarriorSet',
+  },
+  summer2022Mage: {
+    set: 'summer2022MantaRayMageSet',
+  },
+  summer2022Healer: {
+    set: 'summer2022AngelfishHealerSet',
+  },
 };

 const armorStats = {
@@ -1761,15 +1776,19 @@ const head = {
  },
  summer2021Rogue: {
    set: 'summer2021ClownfishRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Warrior: {
    set: 'summer2021FlyingFishWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Mage: {
    set: 'summer2021NautilusMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Healer: {
    set: 'summer2021ParrotHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  fall2021Rogue: {
    set: 'fall2021OozeRogueSet',
@@ -1813,6 +1832,18 @@ const head = {
  spring2022Healer: {
    set: 'spring2022PeridotHealerSet',
  },
+  summer2022Rogue: {
+    set: 'summer2022CrabRogueSet',
+  },
+  summer2022Warrior: {
+    set: 'summer2022WaterspoutWarriorSet',
+  },
+  summer2022Mage: {
+    set: 'summer2022MantaRayMageSet',
+  },
+  summer2022Healer: {
+    set: 'summer2022AngelfishHealerSet',
+  },
 };

 const headStats = {
@@ -2549,12 +2580,15 @@ const shield = {
  },
  summer2021Rogue: {
    set: 'summer2021ClownfishRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Warrior: {
    set: 'summer2021FlyingFishWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Healer: {
    set: 'summer2021ParrotHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  fall2021Rogue: {
    set: 'fall2021OozeRogueSet',
@@ -2583,6 +2617,15 @@ const shield = {
  spring2022Healer: {
    set: 'spring2022PeridotHealerSet',
  },
+  summer2022Rogue: {
+    set: 'summer2022CrabRogueSet',
+  },
+  summer2022Warrior: {
+    set: 'summer2022WaterspoutWarriorSet',
+  },
+  summer2022Healer: {
+    set: 'summer2022AngelfishHealerSet',
+  },
 };

 const shieldStats = {
@@ -3229,15 +3272,19 @@ const weapon = {
  },
  summer2021Rogue: {
    set: 'summer2021ClownfishRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Warrior: {
    set: 'summer2021FlyingFishWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Mage: {
    set: 'summer2021NautilusMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  summer2021Healer: {
    set: 'summer2021ParrotHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
  },
  fall2021Rogue: {
    set: 'fall2021OozeRogueSet',
@@ -3275,6 +3322,18 @@ const weapon = {
  spring2022Healer: {
    set: 'spring2022PeridotHealerSet',
  },
+  summer2022Rogue: {
+    set: 'summer2022CrabRogueSet',
+  },
+  summer2022Warrior: {
+    set: 'summer2022WaterspoutWarriorSet',
+  },
+  summer2022Mage: {
+    set: 'summer2022MantaRayMageSet',
+  },
+  summer2022Healer: {
+    set: 'summer2022AngelfishHealerSet',
+  },
 };

 const weaponStats = {
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -109,13 +109,13 @@ const premium = {
    value: 2,
    text: t('hatchingPotionAquatic'),
    limited: true,
-    event: EVENTS.summer2020,
+    event: EVENTS.summer2022,
    _addlNotes: t('eventAvailabilityReturning', {
      availableDate: t('dateEndJuly'),
-      previousDate: t('juneYYYY', { year: 2017 }),
+      previousDate: t('augustYYYY', { year: 2020 }),
    }),
    canBuy () {
-      return moment().isBefore('2020-08-02');
+      return moment().isBetween(EVENTS.summer2022.start, EVENTS.summer2022.end);
    },
  },
  Ember: {
@@ -317,13 +317,13 @@ const premium = {
    value: 2,
    text: t('hatchingPotionWatery'),
    limited: true,
-    event: EVENTS.summer2020,
+    event: EVENTS.summer2022,
    _addlNotes: t('eventAvailabilityReturning', {
      availableDate: t('dateEndJuly'),
-      previousDate: t('juneYYYY', { year: 2019 }),
+      previousDate: t('julyYYYY', { year: 2020 }),
    }),
    canBuy () {
-      return moment().isBefore('2020-08-02');
+      return moment().isBetween(EVENTS.summer2022.start, EVENTS.summer2022.end);
    },
  },
  Silver: {
@@ -490,12 +490,13 @@ const premium = {
    value: 2,
    text: t('hatchingPotionSunset'),
    limited: true,
-    event: EVENTS.summer2021,
+    event: EVENTS.summer2022,
    _addlNotes: t('premiumPotionAddlNotes', {
      date: t('dateEndJuly'),
+      previousDate: t('julyYYYY', { year: 2021 }),
    }),
    canBuy () {
-      return moment().isBetween(EVENTS.summer2021.start, EVENTS.summer2021.end);
+      return moment().isBetween(EVENTS.summer2022.start, EVENTS.summer2022.end);
    },
  },
  Moonglow: {
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
  market () {
-    if (moment().isBefore('2022-05-31T20:00-04:00')) {
+    if (moment().isBefore(EVENTS.summer2022.end)) {
      return [
        {
          type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
        },
        {
          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Sunshine',
+          path: 'premiumHatchingPotions.Sunset',
        },
        {
          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Floral',
+          path: 'premiumHatchingPotions.Watery',
        },
        {
-          type: 'hatchingPotions',
-          path: 'hatchingPotions.Golden',
+          type: 'premiumHatchingPotion',
+          path: 'premiumHatchingPotions.Aquatic',
        },
      ];
    }