content fixes after local testing

CuriousMagpie · Apr 3, 2024 · 1eb494c · 1eb494c
1 parent b7dc78f
commit 1eb494c
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 39 deletions.
diff --git a/migrations/archive/2024/20240516_pet_group_achievements.js b/migrations/archive/2024/20240516_pet_group_achievements.js
@@ -14,26 +14,26 @@ async function updateUser (user) {
 
   if (user && user.items && user.items.pets) {
     const pets = user.items.pets;
-    if (pets['Lion-Zombie'] > 0
-      && pets['Lion-Skeleton'] > 0
-      && pets['Lion-Base'] > 0
-      && pets['Lion-Desert'] > 0
-      && pets['Lion-Red'] > 0
-      && pets['Lion-Shade'] > 0
-      && pets['Lion-White']> 0
-      && pets['Lion-Golden'] > 0
-      && pets['Lion-CottonCandyBlue'] > 0
-      && pets['Lion-CottonCandyPink'] > 0
-      && pets['Tiger-Zombie'] > 0
-      && pets['Tiger-Skeleton'] > 0
-      && pets['Tiger-Base'] > 0
-      && pets['Tiger-Desert'] > 0
-      && pets['Tiger-Red'] > 0
-      && pets['Tiger-Shade'] > 0
-      && pets['Tiger-White'] > 0
-      && pets['Tiger-Golden'] > 0
-      && pets['Tiger-CottonCandyBlue'] > 0
-      && pets['Tiger-CottonCandyPink'] > 0
+    if (pets['LionCub-Zombie'] > 0
+      && pets['LionCub-Skeleton'] > 0
+      && pets['LionCub-Base'] > 0
+      && pets['LionCub-Desert'] > 0
+      && pets['LionCub-Red'] > 0
+      && pets['LionCub-Shade'] > 0
+      && pets['LionCub-White']> 0
+      && pets['LionCub-Golden'] > 0
+      && pets['LionCub-CottonCandyBlue'] > 0
+      && pets['LionCub-CottonCandyPink'] > 0
+      && pets['TigerCub-Zombie'] > 0
+      && pets['TigerCub-Skeleton'] > 0
+      && pets['TigerCub-Base'] > 0
+      && pets['TigerCub-Desert'] > 0
+      && pets['TigerCub-Red'] > 0
+      && pets['TigerCub-Shade'] > 0
+      && pets['TigerCub-White'] > 0
+      && pets['TigerCub-Golden'] > 0
+      && pets['TigerCub-CottonCandyBlue'] > 0
+      && pets['TigerCub-CottonCandyPink'] > 0
       && pets['Sabretooth-Zombie'] > 0
       && pets['Sabretooth-Skeleton'] > 0
       && pets['Sabretooth-Base'] > 0

diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
@@ -974,8 +974,8 @@
   "backgrounds052024": "SET 120: Released May 2024",
   "backgroundDragonsBackText": "Dragon's Back",
   "backgroundDragonsBackNotes": "Sail the sky on a Dragon's Back.",
-  "backgroundMerryMaypoleText": "Merry Maypole",
-  "backgroundMerryMaypoleNotes": "Dance around a Merry Maypole",
+  "backgroundMaypoleText": "Maypole",
+  "backgroundMaypoleNotes": "Dance around a merry Maypole",
   "backgroundPottersStudioText": "Potter's Studio",
   "backgroundPottersStudioNotes": "Create art in the Potter's Studio",
 

diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js
@@ -619,7 +619,7 @@ const plannedBackgrounds = {
   },
   backgrounds052024: {
     dragons_back: { },
-    merry_maypole: { },
+    maypole: { },
     potters_studio: { },
   },
   eventBackgrounds: {

diff --git a/website/common/script/content/constants/animalSetAchievements.js b/website/common/script/content/constants/animalSetAchievements.js
@@ -44,12 +44,12 @@ const ANIMAL_SET_ACHIEVEMENTS = {
     type: 'pet',
     species: [
       'Cheetah',
-      'Lion',
+      'LionCub',
       'Sabretooth',
-      'Tiger',
+      'TigerCub',
     ],
     achievementKey: 'cats',
-    noitificationType: 'ACHIEVEMENT_ANIMAL_SET',
+    notificationType: 'ACHIEVEMENT_ANIMAL_SET',
   },
   dinosaurDynasty: {
     type: 'pet',

diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
@@ -30,7 +30,7 @@ export const EVENTS = {
   },
   spring2024: {
     start: '2024-03-21T00:00-04:00',
-    end: '2024-04-30T23:59-04:00',
+    end: '2024-04-01T23:59-04:00',
     npcImageSuffix: '_spring',
     season: 'spring',
     gear: true,

diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js
@@ -980,7 +980,7 @@ const head = {
     set: 'hatterSet',
   },
   pottersBandana: {
-    set: 'potterSet',
+    set: 'pottersSet',
   },
 };
 
@@ -1819,7 +1819,7 @@ const releaseDates = {
   whiteLoungeWear: '2024-02-06T08:00-05:00',
   hatterSet: '2024-03-05T08:00-05:00',
   optimistSet: '2024-04-04T00:00-05:00',
-  pottersSet: '2024-04-07T00:00-04:00',
+  pottersSet: '2024-05-07T00:00-04:00',
 };
 
 forEach({

diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
@@ -103,7 +103,7 @@ const premium = {
       availableDate: t('dateEndMay'),
     }),
     canBuy () {
-      return moment().isBefore(EVENTS.potions202405.end);
+      return moment().isBetween(EVENTS.potions202405.start, EVENTS.potions202405.end);
     },
   },
   Aquatic: {
@@ -295,7 +295,7 @@ const premium = {
       availableDate: t('dateEndMay'),
     }),
     canBuy () {
-      return moment().isBefore(EVENTS.potions202405.end);
+      return moment().isBetween(EVENTS.potions202405.start, EVENTS.potions202405.end);
     },
   },
   Bronze: {

diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
@@ -7,23 +7,23 @@ import { EVENTS } from './constants';
 // hatching potions and food names should be capitalized lest you break the market
 const featuredItems = {
   market () {
-    if (moment().isBetween(EVENTS.spring2024.start, EVENTS.spring2024.end)) {
+    if (moment().isBetween(EVENTS.potions202405.start, EVENTS.potions202405.end)) {
       return [
         {
           type: 'armoire',
           path: 'armoire',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Celestial',
+          path: 'premiumHatchingPotions.Floral',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Shimmer',
+          path: 'premiumHatchingPotions.Sunshine',
         },
         {
-          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Rainbow',
+          type: 'hatchingPotions',
+          path: 'hatchingPotions.Golden',
         },
       ];
     }
@@ -34,15 +34,15 @@ const featuredItems = {
       },
       {
         type: 'food',
-        path: 'food.Fish',
+        path: 'food.Strawberry',
       },
       {
         type: 'hatchingPotions',
-        path: 'hatchingPotions.Skeleton',
+        path: 'hatchingPotions.Red',
       },
       {
         type: 'eggs',
-        path: 'eggs.Fox',
+        path: 'eggs.Cactus',
       },
     ];
   },