initial commit

CuriousMagpie · Mar 4, 2024 · 563a05f · 563a05f
1 parent 56f73a3
commit 563a05f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git 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;
+$foolPets: Veggie, Dessert, VirtualPet, TeaShop, Fungus;
 
 @each $foolPet in $foolPets {
   .Pet.Pet-FlyingPig-#{$foolPet} {

diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue
@@ -250,7 +250,7 @@ export default {
     petClass () {
       if (some(
         this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'teaShop',
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'Fungus',
       )) {
         return this.foolPet(this.member.items.currentPet);
       }

diff --git a/website/client/src/components/inventory/stable/petItem.vue b/website/client/src/components/inventory/stable/petItem.vue
@@ -171,7 +171,7 @@ export default {
     getPetItemClass () {
       if (this.isOwned() && some(
         this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'teaShop',
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'Fungus',
       )) {
         if (this.isSpecial()) return `Pet ${this.foolPet(this.item.key)}`;
         const petString = `${this.item.eggKey}-${this.item.key}`;

diff --git a/website/client/src/mixins/foolPet.js b/website/client/src/mixins/foolPet.js
@@ -40,15 +40,15 @@ export default {
         'Dragon',
         'Cactus',
       ];
-      if (!pet) return 'Pet-TigerCub-TeaShop';
+      if (!pet) return 'Pet-TigerCub-Fungus';
       if (SPECIAL_PETS.indexOf(pet) !== -1) {
-        return 'Pet-Dragon-TeaShop';
+        return 'Pet-Dragon-Fungus';
       }
       const species = pet.slice(0, pet.indexOf('-'));
       if (includes(BASE_PETS, species)) {
-        return `Pet-${species}-TeaShop`;
+        return `Pet-${species}-Fungus`;
       }
-      return 'Pet-BearCub-TeaShop';
+      return 'Pet-BearCub-Fungus';
     },
   },
 };
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
@@ -15,6 +15,11 @@ export const EVENTS = {
     season: 'normal',
     npcImageSuffix: '',
   },
+  aprilFools2024: {
+    start: '2024-03-01T08:00-04:00',
+    end: '2023-04-02T08:00-04:00',
+    aprilFools: 'Fungus',
+  },
   bundle202403: {
     start: '2024-03-19T00:00-05:00',
     end: '2024-03-31T08:00-05:00',