From f3029953dcd8ef5dd0f3c3d70e6acc69e54ba6e0 Mon Sep 17 00:00:00 2001
From: Kalista Payne <sabrecat@gmail.com>
Date: Fri, 21 Mar 2025 15:02:31 -0500
Subject: [PATCH] Squashed commit of the following:

commit bde71cc45d886517a111802976c5e3fd9994eeb3
Author: Kalista Payne <sabrecat@gmail.com>
Date:   Thu Mar 20 15:25:11 2025 -0500

    fix(potions): add missing Cryptid release date

commit 1a50413402cc4191be99d566b76061ef794a7b7d
Author: Kalista Payne <sabrecat@gmail.com>
Date:   Tue Mar 18 16:52:19 2025 -0500

    fix(wacky): revise text, address linting

commit 2d49a16f5505329c90e9f6898108420f7da9f414
Author: Phillip Thelen <phillip@habitica.com>
Date:   Tue Mar 18 16:05:17 2025 +0100

    Fix displaying countdown for recurring event items

commit cf20b30975b1a3ec10a50263cd87a96b6ea2be80
Author: Kalista Payne <sabrecat@gmail.com>
Date:   Fri Mar 14 18:01:37 2025 -0500

    fix(lint): line length

commit e39e490e41dd77da925114d121ed190df3df5900
Author: Kalista Payne <sabrecat@gmail.com>
Date:   Fri Mar 14 17:55:12 2025 -0500

    fix(foolin): correct animation and end date of potions

commit 164e2eefdd5b187f9148a09ff62b741cfd36b5d1
Author: Kalista Payne <sabrecat@gmail.com>
Date:   Thu Mar 13 17:25:14 2025 -0500

    fix(event): Panda Cub typo, shift start date

commit 394c922287924d684dd707cc3eb6a36adfc32101
Author: Kalista Payne <sabrecat@gmail.com>
Date:   Thu Mar 13 17:02:12 2025 -0500

    fix(test): account for addition of Cryptid

commit bea9e4033802f85715146b909115a1e2f35687a3
Author: Kalista Payne <sabrecat@gmail.com>
Date:   Thu Mar 13 16:52:37 2025 -0500

    feat(event): April Fools 2025
---
 test/content/schedule.test.js                 |  2 +-
 website/client/src/assets/css/sprites.css     |  7 +-
 .../assets/css/sprites/spritesmith-main.css   | 45 ++++++++++++
 website/client/src/assets/scss/animals.scss   |  2 +-
 website/client/src/components/avatar.vue      | 10 ++-
 .../components/inventory/stable/petItem.vue   | 12 ++--
 website/client/src/mixins/foolPet.js          | 71 ++++++++++---------
 website/common/locales/en/content.json        |  3 +
 .../common/script/content/constants/events.js |  9 ++-
 .../script/content/constants/gifSprites.js    | 57 ++++++++-------
 .../script/content/constants/releaseDates.js  |  1 +
 .../script/content/constants/schedule.js      | 69 ++++++++++++------
 .../common/script/content/hatching-potions.js |  5 +-
 website/common/script/libs/getItemInfo.js     |  2 +-
 website/common/script/libs/shops.js           |  6 +-
 15 files changed, 194 insertions(+), 107 deletions(-)

diff --git a/test/content/schedule.test.js b/test/content/schedule.test.js
index 7903807386..ab0caf9b96 100644
--- a/test/content/schedule.test.js
+++ b/test/content/schedule.test.js
@@ -190,7 +190,7 @@ describe('Content Schedule', () => {
     const date = new Date('2024-04-15');
     const matchers = getAllScheduleMatchingGroups(date);
     expect(matchers.premiumHatchingPotions).to.exist;
-    expect(matchers.premiumHatchingPotions.items.length).to.equal(5);
+    expect(matchers.premiumHatchingPotions.items.length).to.equal(6);
     expect(matchers.premiumHatchingPotions.items.indexOf('Veggie')).to.not.equal(-1);
     expect(matchers.premiumHatchingPotions.items.indexOf('Porcelain')).to.not.equal(-1);
   });
diff --git a/website/client/src/assets/css/sprites.css b/website/client/src/assets/css/sprites.css
index 1003d60563..3e61f3bebf 100755
--- a/website/client/src/assets/css/sprites.css
+++ b/website/client/src/assets/css/sprites.css
@@ -22,7 +22,8 @@
   height: 219px;
 }
 
-.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet, .Pet_HatchingPotion_Fungi {
+.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup,
+.Pet_HatchingPotion_VirtualPet, .Pet_HatchingPotion_Fungi, .Pet_HatchingPotion_Cryptid {
   width: 68px;
   height: 68px;
 }
@@ -47,6 +48,10 @@
   background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Fungi.gif") no-repeat;
 }
 
+.Pet_HatchingPotion_Cryptid {
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Cryptid.gif") no-repeat;
+}
+
 .Gems {
   display:inline-block;
   margin-right:5px;
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index cfe602970e..6c38472194 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -52283,6 +52283,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-BearCub-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-BearCub-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Cupid.png');
   width: 81px;
@@ -52763,6 +52768,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Cactus-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Cactus-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Cupid.png');
   width: 81px;
@@ -53543,6 +53553,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Dragon-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Dragon-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Cupid.png');
   width: 81px;
@@ -54028,6 +54043,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-FlyingPig-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-FlyingPig-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Cupid.png');
   width: 81px;
@@ -54353,6 +54373,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Fox-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Fox-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Cupid.png');
   width: 81px;
@@ -55123,6 +55148,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-LionCub-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-LionCub-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Cupid.png');
   width: 81px;
@@ -55718,6 +55748,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-PandaCub-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-PandaCub-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Cupid.png');
   width: 81px;
@@ -57053,6 +57088,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-TigerCub-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-TigerCub-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Cupid.png');
   width: 81px;
@@ -57688,6 +57728,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Cryptid.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Wolf-Cupid {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Cupid.png');
   width: 81px;
diff --git a/website/client/src/assets/scss/animals.scss b/website/client/src/assets/scss/animals.scss
index d2b27e33d8..acb37ae5b6 100644
--- a/website/client/src/assets/scss/animals.scss
+++ b/website/client/src/assets/scss/animals.scss
@@ -19,7 +19,7 @@
   top: -16px !important;
 }
 
-$foolPets: Veggie, Dessert, VirtualPet, TeaShop, Fungi;
+$foolPets: Veggie, Dessert, VirtualPet, TeaShop, Fungi, Cryptid;
 
 @each $foolPet in $foolPets {
   .Pet.Pet-FlyingPig-#{$foolPet} {
diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue
index 4534f6d899..2d05d09e8b 100644
--- a/website/client/src/components/avatar.vue
+++ b/website/client/src/components/avatar.vue
@@ -155,7 +155,6 @@
 </style>
 
 <script>
-import some from 'lodash/some';
 import moment from 'moment';
 import { mapState } from '@/libs/store';
 import foolPet from '../mixins/foolPet';
@@ -322,11 +321,10 @@ export default {
       return null;
     },
     petClass () {
-      if (some(
-        this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'Fungi',
-      )) {
-        return this.foolPet(this.member.items.currentPet);
+      const foolEvent = this.currentEventList?.find(event => moment()
+        .isBetween(event.start, event.end) && event.aprilFools);
+      if (foolEvent) {
+        return this.foolPet(this.member.items.currentPet, foolEvent.aprilFools);
       }
       if (this.member?.items.currentPet) return `Pet-${this.member.items.currentPet}`;
       return '';
diff --git a/website/client/src/components/inventory/stable/petItem.vue b/website/client/src/components/inventory/stable/petItem.vue
index 34b4d14e06..1135ea110b 100644
--- a/website/client/src/components/inventory/stable/petItem.vue
+++ b/website/client/src/components/inventory/stable/petItem.vue
@@ -114,7 +114,6 @@
 </style>
 
 <script>
-import some from 'lodash/some';
 import moment from 'moment';
 import { v4 as uuid } from 'uuid';
 import { mapState } from '@/libs/store';
@@ -183,13 +182,12 @@ export default {
       return 'GreyedOut';
     },
     imageName () {
-      if (this.isOwned() && some(
-        this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'Fungi',
-      )) {
-        if (this.isSpecial()) return `stable_${this.foolPet(this.item.key)}`;
+      const foolEvent = this.currentEventList?.find(event => moment()
+        .isBetween(event.start, event.end) && event.aprilFools);
+      if (this.isOwned() && foolEvent) {
+        if (this.isSpecial()) return `stable_${this.foolPet(this.item.key, foolEvent.aprilFools)}`;
         const petString = `${this.item.eggKey}-${this.item.key}`;
-        return `stable_${this.foolPet(petString)}`;
+        return `stable_${this.foolPet(petString, foolEvent.aprilFools)}`;
       }
 
       if (this.isOwned() || (this.mountOwned() && this.isHatchable())) {
diff --git a/website/client/src/mixins/foolPet.js b/website/client/src/mixins/foolPet.js
index f73cd63b05..0a44b1c7ad 100644
--- a/website/client/src/mixins/foolPet.js
+++ b/website/client/src/mixins/foolPet.js
@@ -2,54 +2,55 @@ import includes from 'lodash/includes';
 
 export default {
   methods: {
-    foolPet (pet) {
+    foolPet (pet, prank) {
       const SPECIAL_PETS = [
-        'Wolf-Veteran',
-        'Wolf-Cerberus',
-        'Dragon-Hydra',
-        'Turkey-Base',
-        'BearCub-Polar',
-        'MantisShrimp-Base',
-        'JackOLantern-Base',
-        'Mammoth-Base',
-        'Tiger-Veteran',
-        'Phoenix-Base',
-        'Turkey-Gilded',
-        'MagicalBee-Base',
-        'Lion-Veteran',
-        'Gryphon-RoyalPurple',
-        'JackOLantern-Ghost',
-        'Jackalope-RoyalPurple',
-        'Orca-Base',
         'Bear-Veteran',
-        'Hippogriff-Hopeful',
-        'Fox-Veteran',
-        'JackOLantern-Glow',
-        'Gryphon-Gryphatrice',
-        'Gryphatrice-Jubilant',
-        'JackOLantern-RoyalPurple',
+        'BearCub-Polar',
         'Cactus-Veteran',
+        'Dragon-Hydra',
+        'Dragon-Veteran',
+        'Fox-Veteran',
+        'Gryphatrice-Jubilant',
+        'Gryphon-Gryphatrice',
+        'Gryphon-RoyalPurple',
+        'Hippogriff-Hopeful',
+        'Jackalope-RoyalPurple',
+        'JackOLantern-Base',
+        'JackOLantern-Ghost',
+        'JackOLantern-Glow',
+        'JackOLantern-RoyalPurple',
+        'Lion-Veteran',
+        'MagicalBee-Base',
+        'Mammoth-Base',
+        'MantisShrimp-Base',
+        'Orca-Base',
+        'Phoenix-Base',
+        'Tiger-Veteran',
+        'Turkey-Base',
+        'Turkey-Gilded',
+        'Wolf-Cerberus',
+        'Wolf-Veteran',
       ];
       const BASE_PETS = [
-        'Wolf',
-        'TigerCub',
-        'PandaCub',
-        'LionCub',
-        'Fox',
-        'FlyingPig',
         'BearCub',
-        'Dragon',
         'Cactus',
+        'Dragon',
+        'FlyingPig',
+        'Fox',
+        'LionCub',
+        'PandaCub',
+        'TigerCub',
+        'Wolf',
       ];
-      if (!pet) return 'Pet-TigerCub-Fungi';
+      if (!pet) return `Pet-TigerCub-${prank}`;
       if (SPECIAL_PETS.indexOf(pet) !== -1) {
-        return 'Pet-Dragon-Fungi';
+        return `Pet-Dragon-${prank}`;
       }
       const species = pet.slice(0, pet.indexOf('-'));
       if (includes(BASE_PETS, species)) {
-        return `Pet-${species}-Fungi`;
+        return `Pet-${species}-${prank}`;
       }
-      return 'Pet-BearCub-Fungi';
+      return `Pet-BearCub-${prank}`;
     },
   },
 };
diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json
index 224b16d035..318edb3e9b 100644
--- a/website/common/locales/en/content.json
+++ b/website/common/locales/en/content.json
@@ -350,9 +350,12 @@
   "hatchingPotionGingerbread": "Gingerbread",
   "hatchingPotionJade": "Jade",
   "hatchingPotionBalloon": "Balloon",
+  "hatchingPotionCryptid": "Cryptid",
 
   "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> Pet.",
   "premiumPotionUnlimitedNotes": "Not usable on Quest Pet eggs.",
+  "wackyPotionNotes": "Pour this on an egg, and it will hatch as a Wacky <%= potText(locale) %> Pet.",
+  "wackyPotionAddlNotes": "Cannot be raised to Mounts or used on Quest Pet eggs.",
 
   "foodMeat": "Meat",
   "foodMeatThe": "the Meat",
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index b2fd857239..afed1efeb1 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -50,8 +50,13 @@ export const REPEATING_EVENTS = {
     end: new Date('1970-03-16T03:59-04:00'),
     foodSeason: 'Pie',
   },
+  aprilFools: {
+    start: new Date('1970-04-01T04:00-04:00'),
+    end: new Date('1970-04-02T03:59-04:00'),
+    aprilFools: 'Cryptid',
+  },
   aprilFoolsResale: {
-    start: new Date('1970-04-07T04:00-04:00'),
+    start: new Date('1970-04-03T04:00-04:00'),
     end: new Date('1970-05-01T03:59-04:00'),
     content: [
       {
@@ -65,6 +70,7 @@ export const REPEATING_EVENTS = {
       {
         type: 'premiumHatchingPotions',
         items: [
+          'Cryptid',
           'Veggie',
           'TeaShop',
         ],
@@ -146,7 +152,6 @@ export const EVENTS = {
     start: '2024-04-09T08:00-04:00',
     end: '2024-04-30T23:59-04:00',
   },
-
   aprilFools2024: {
     start: '2024-04-01T00:00-04:00',
     end: '2024-04-02T08:00-04:00',
diff --git a/website/common/script/content/constants/gifSprites.js b/website/common/script/content/constants/gifSprites.js
index 445095ad04..cd4b6756c1 100644
--- a/website/common/script/content/constants/gifSprites.js
+++ b/website/common/script/content/constants/gifSprites.js
@@ -1,41 +1,40 @@
 export default [
-  'head_special_1',
-  'broad_armor_special_1',
-  'slim_armor_special_1',
-  'head_special_0',
-  'slim_armor_special_0',
-  'broad_armor_special_0',
-  'weapon_special_critical',
-  'weapon_special_0',
-  'shield_special_0',
-  'Pet-Wolf-Cerberus',
-  'stable_Pet-Wolf-Cerberus',
   'armor_special_ks2019',
-  'slim_armor_special_ks2019',
+  'back_special_heroicAureole',
+  'background_airship',
+  'background_clocktower',
+  'background_steamworks',
+  'broad_armor_special_0',
+  'broad_armor_special_1',
   'broad_armor_special_ks2019',
   'eyewear_special_ks2019',
+  'head_special_0',
+  'head_special_1',
   'head_special_ks2019',
-  'shield_special_ks2019',
-  'weapon_special_ks2019',
-  'Pet-Gryphon-Gryphatrice',
-  'stable_Pet-Gryphon-Gryphatrice',
-  'Mount_Head_Gryphon-Gryphatrice',
   'Mount_Body_Gryphon-Gryphatrice',
-  'background_clocktower',
-  'background_airship',
-  'background_steamworks',
-  'Pet_HatchingPotion_Veggie',
+  'Mount_Head_Gryphon-Gryphatrice',
+  'Pet_HatchingPotion_Cryptid',
   'Pet_HatchingPotion_Dessert',
-  'Pet-HatchingPotion-Dessert',
-  'quest_windup',
-  'Pet-HatchingPotion_Windup',
+  'Pet_HatchingPotion_Fungi',
+  'Pet_HatchingPotion_Veggie',
+  'Pet_HatchingPotion_VirtualPet',
   'Pet_HatchingPotion_Windup',
+  'Pet-Gryphatrice-Jubilant',
+  'Pet-Gryphon-Gryphatrice',
+  'Pet-Wolf-Cerberus',
   'quest_solarSystem',
   'quest_virtualpet',
-  'Pet_HatchingPotion_VirtualPet',
-  'Pet-Gryphatrice-Jubilant',
-  'stable_Pet-Gryphatrice-Jubilant',
-  'back_special_heroicAureole',
-  'Pet-HatchingPotion-Funghi',
+  'quest_windup',
+  'shield_special_0',
+  'shield_special_ks2019',
   'shop_armoire',
+  'slim_armor_special_0',
+  'slim_armor_special_1',
+  'slim_armor_special_ks2019',
+  'stable_Pet-Gryphatrice-Jubilant',
+  'stable_Pet-Gryphon-Gryphatrice',
+  'stable_Pet-Wolf-Cerberus',
+  'weapon_special_0',
+  'weapon_special_critical',
+  'weapon_special_ks2019',
 ];
diff --git a/website/common/script/content/constants/releaseDates.js b/website/common/script/content/constants/releaseDates.js
index 24252cf555..8cfd1856fa 100644
--- a/website/common/script/content/constants/releaseDates.js
+++ b/website/common/script/content/constants/releaseDates.js
@@ -36,5 +36,6 @@ export const HATCHING_POTIONS_RELEASE_DATES = {
   Koi: { year: 2024, month: 6, day: 1 },
   Gingerbread: { year: 2024, month: 12, day: 21 },
   Jade: { year: 2025, month: 3, day: 14 },
+  Cryptid: { year: 2025, month: 4, day: 3 },
   Balloon: { year: 2025, month: 4, day: 21 },
 };
diff --git a/website/common/script/content/constants/schedule.js b/website/common/script/content/constants/schedule.js
index a142d422f3..0f6f388dec 100644
--- a/website/common/script/content/constants/schedule.js
+++ b/website/common/script/content/constants/schedule.js
@@ -841,6 +841,30 @@ function getGalaIndex (date) {
   return parseInt((galaCount / 12) * galaMonth, 10);
 }
 
+function makeEndDate (checkedDate, matcher) {
+  let end = moment.utc(checkedDate);
+  end.hour(SWITCHOVER_TIME);
+  end.minute(0);
+  end.second(0);
+  if (matcher.end !== undefined) {
+    end.date(matcher.end.getDate());
+    end.month(matcher.end.getMonth());
+  } else {
+    end.date(TYPE_SCHEDULE[matcher.type]);
+    if (matcher.endMonth !== undefined) {
+      if (matcher.startMonth
+          && matcher.startMonth > matcher.endMonth
+          && checkedDate.getMonth() > matcher.endMonth) {
+        end.year(checkedDate.getFullYear() + 1);
+      }
+      end.month(matcher.endMonth);
+    } else if (end.valueOf() <= checkedDate.getTime()) {
+      end = moment(end).add(1, 'months');
+    }
+  }
+  return end.toDate();
+}
+
 export function assembleScheduledMatchers (date) {
   const items = [];
   const month = getMonth(date);
@@ -865,7 +889,14 @@ export function assembleScheduledMatchers (date) {
   items.push(...galaMatchers);
   getRepeatingEvents(date).forEach(event => {
     if (event.content) {
-      items.push(...event.content);
+      const { content } = event;
+      const end = makeEndDate(date, event);
+      const m = content.map(matcher => {
+        const newMatcher = { ...matcher };
+        newMatcher.end = end;
+        return newMatcher;
+      });
+      items.push(...m);
     }
   });
   return items;
@@ -878,8 +909,15 @@ function makeMatcherClass (date) {
   return {
     matchers: [],
     end: new Date(),
+    specialEnds: {},
     items: [],
     matchingDate: date,
+    getEnd (key) {
+      if (this.specialEnds[key]) {
+        return this.specialEnds[key];
+      }
+      return this.end;
+    },
     match (key) {
       if (this.matchers.length === 0) {
         if (this.items.length > 0) {
@@ -896,25 +934,6 @@ function makeMatcherClass (date) {
   };
 }
 
-function makeEndDate (checkedDate, matcher) {
-  let end = moment.utc(checkedDate);
-  end.date(TYPE_SCHEDULE[matcher.type]);
-  end.hour(SWITCHOVER_TIME);
-  end.minute(0);
-  end.second(0);
-  if (matcher.endMonth !== undefined) {
-    if (matcher.startMonth
-        && matcher.startMonth > matcher.endMonth
-        && checkedDate.getMonth() > matcher.endMonth) {
-      end.year(checkedDate.getFullYear() + 1);
-    }
-    end.month(matcher.endMonth);
-  } else if (end.valueOf() <= checkedDate.getTime()) {
-    end = moment(end).add(1, 'months');
-  }
-  return end.toDate();
-}
-
 export function clearCachedMatchers () {
   cacheDate = null;
   cachedScheduleMatchers = null;
@@ -939,11 +958,19 @@ export function getAllScheduleMatchingGroups (date) {
       if (!cachedScheduleMatchers[matcher.type]) {
         cachedScheduleMatchers[matcher.type] = makeMatcherClass(adjustedDate);
       }
-      cachedScheduleMatchers[matcher.type].end = makeEndDate(checkedDate, matcher);
+      if (matcher.end === undefined) {
+        // we want the default end date to be for matcher type
+        cachedScheduleMatchers[matcher.type].end = makeEndDate(checkedDate, matcher);
+      }
       if (matcher.matcher instanceof Function) {
         cachedScheduleMatchers[matcher.type].matchers.push(matcher.matcher);
       } else if (matcher.items instanceof Array) {
         cachedScheduleMatchers[matcher.type].items.push(...matcher.items);
+        if (matcher.end !== undefined) {
+          matcher.items.forEach(item => {
+            cachedScheduleMatchers[matcher.type].specialEnds[item] = matcher.end;
+          });
+        }
       }
     });
   }
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index d5e135a32e..4682787a9d 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -150,6 +150,7 @@ const wacky = {
     questPotion: true,
     canBuy: hasQuestAchievementFunction('fungi'),
   },
+  Cryptid: {},
 };
 
 each(drops, (pot, key) => {
@@ -190,10 +191,10 @@ each(wacky, (pot, key) => {
     key,
     value: 2,
     text: t(`hatchingPotion${key}`),
-    notes: t('hatchingPotionNotes', {
+    notes: t('wackyPotionNotes', {
       potText: t(`hatchingPotion${key}`),
     }),
-    _addlNotes: t('premiumPotionUnlimitedNotes'),
+    _addlNotes: t('wackyPotionAddlNotes'),
     premium: false,
     limited: true,
     wacky: true,
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index 1ee0406c14..0b10b2613d 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -489,7 +489,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
 
   if (matcher && (!itemInfo.set
     || ALWAYS_AVAILABLE_CUSTOMIZATIONS.indexOf(itemInfo.set.key) === -1)) {
-    itemInfo.end = matcher.end;
+    itemInfo.end = matcher.getEnd(itemInfo.key);
   }
 
   return itemInfo;
diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
index 9b1895716a..aa5e514eab 100644
--- a/website/common/script/libs/shops.js
+++ b/website/common/script/libs/shops.js
@@ -74,11 +74,15 @@ shops.getMarketCategories = function getMarket (user, language) {
   const matchers = getScheduleMatchingGroup('premiumHatchingPotions');
   premiumHatchingPotionsCategory.items = sortBy(values(content.hatchingPotions)
     .filter(hp => hp.limited
-      && (matchers.match(hp.key) || (hp.questPotion === true && hp.canBuy(user))))
+      && (matchers.match(hp.key)
+        || (hp.questPotion === true && hp.canBuy(user))))
     .map(premiumHatchingPotion => {
       if (premiumHatchingPotion.questPotion) {
         return getItemInfo(user, 'premiumHatchingPotion', premiumHatchingPotion, officialPinnedItems, language);
       }
+      if (premiumHatchingPotion.wacky) {
+        return getItemInfo(user, 'premiumHatchingPotion', premiumHatchingPotion, officialPinnedItems, language, matchers);
+      }
       return getItemInfo(user, 'premiumHatchingPotion', premiumHatchingPotion, officialPinnedItems, language, matchers);
     }), 'key');
   if (premiumHatchingPotionsCategory.items.length > 0) {