diff --git a/website/client/components/inventory/stable/index.vue b/website/client/components/inventory/stable/index.vue index e0b2816008..a9f467471b 100644 --- a/website/client/components/inventory/stable/index.vue +++ b/website/client/components/inventory/stable/index.vue @@ -904,7 +904,7 @@ this.$store.dispatch('common:hatch', {egg: pet.eggKey, hatchingPotion: pet.potionKey}); this.closeHatchPetDialog(); - this.$root.$emit('hatchedPet::open', pet); + // this.$root.$emit('hatchedPet::open', pet); }, onDragStart (ev, food) { diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index 6e7342d6ec..dd84e7366c 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -256,6 +256,7 @@ "hatchingPotionShimmer": "Shimmer", "hatchingPotionFairy": "Fairy", "hatchingPotionStarryNight": "Starry Night", + "hatchingPotionRainbow": "Rainbow", "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs.", diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json index 52785e0b94..2ba6c562c3 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -118,6 +118,7 @@ "winter2018MistletoeSet": "Mistletoe Healer (Healer)", "winter2018ReindeerSet": "Reindeer Rogue (Rogue)", "eventAvailability": "Available for purchase until <%= date(locale) %>.", + "dateEndMarch": "March 31", "dateEndApril": "April 19", "dateEndMay": "May 17", "dateEndJune": "June 14", diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index a74d2d6489..a35ebde7f3 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -3,7 +3,7 @@ import defaults from 'lodash/defaults'; import each from 'lodash/each'; import t from './translation'; -const CURRENT_SEASON = 'None'; +const CURRENT_SEASON = 'March'; let drops = { Base: { @@ -64,7 +64,7 @@ let premium = { value: 2, text: t('hatchingPotionShimmer'), limited: true, - _season: 'April', + _season: 'March', }, Fairy: { value: 2, @@ -126,6 +126,12 @@ let premium = { limited: true, _season: 'January', }, + Rainbow: { + value: 2, + text: t('hatchingPotionRainbow'), + limited: true, + _season: 'March', + }, }; each(drops, (pot, key) => { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 5bfcfbc70a..011ce22b2d 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -6,11 +6,11 @@ const featuredItems = { }, { type: 'hatchingPotions', - path: 'hatchingPotions.Golden', + path: 'hatchingPotions.Shimmer', }, { - type: 'eggs', - path: 'eggs.BearCub', + type: 'hatchingPotions', + path: 'hatchingPotions.Rainbow', }, { type: 'card', diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Rainbow.png new file mode 100644 index 0000000000..37dd6feb95 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Rainbow.png new file mode 100644 index 0000000000..66e8fdb76e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Rainbow.png new file mode 100644 index 0000000000..f071c2801e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Rainbow.png new file mode 100644 index 0000000000..5297b85100 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Rainbow.png new file mode 100644 index 0000000000..c46c8e3bcb Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Rainbow.png new file mode 100644 index 0000000000..24f132fa20 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Rainbow.png new file mode 100644 index 0000000000..3df87359a6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Rainbow.png new file mode 100644 index 0000000000..a1e98895ab Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Rainbow.png new file mode 100644 index 0000000000..8eb1c1d486 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Rainbow.png new file mode 100644 index 0000000000..cba9fb76f5 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Rainbow.png new file mode 100644 index 0000000000..00e9c9a868 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Rainbow.png new file mode 100644 index 0000000000..257c899710 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Rainbow.png new file mode 100644 index 0000000000..d79ec4f68c Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Rainbow.png new file mode 100644 index 0000000000..12ff1e06d1 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Rainbow.png new file mode 100644 index 0000000000..a855f8b297 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Rainbow.png new file mode 100644 index 0000000000..a52657003e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Rainbow.png new file mode 100644 index 0000000000..7d85e6bfd5 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Rainbow.png new file mode 100644 index 0000000000..b1ef1c2053 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Rainbow.png new file mode 100644 index 0000000000..904784daa0 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Rainbow.png new file mode 100644 index 0000000000..faf1c04f1d Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Rainbow.png new file mode 100644 index 0000000000..4a59160f0f Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Rainbow.png new file mode 100644 index 0000000000..e7a4d1dd45 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Rainbow.png new file mode 100644 index 0000000000..aa15672a3a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Rainbow.png new file mode 100644 index 0000000000..77b5498174 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Rainbow.png new file mode 100644 index 0000000000..e7ff4872c2 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Rainbow.png new file mode 100644 index 0000000000..070bc5cb2f Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Rainbow.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Rainbow.png new file mode 100644 index 0000000000..10d8c6683a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Rainbow.png new file mode 100644 index 0000000000..ec39eaf4d5 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Rainbow.png new file mode 100644 index 0000000000..1eb8660bfa Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Rainbow.png new file mode 100644 index 0000000000..5c392a3daa Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Rainbow.png new file mode 100644 index 0000000000..0562dddb48 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Rainbow.png new file mode 100644 index 0000000000..2dc7f29bde Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Rainbow.png new file mode 100644 index 0000000000..a979c4f912 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Rainbow.png new file mode 100644 index 0000000000..68b9efc69a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Rainbow.png new file mode 100644 index 0000000000..9ff0a38112 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Rainbow.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Rainbow.png new file mode 100644 index 0000000000..7028f70feb Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Rainbow.png differ diff --git a/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Rainbow.png b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Rainbow.png new file mode 100644 index 0000000000..42b3a6484c Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Rainbow.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_rainbow_potions.png b/website/raw_sprites/spritesmith_large/promo_rainbow_potions.png new file mode 100644 index 0000000000..608376927e Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_rainbow_potions.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_sweeping.png b/website/raw_sprites/spritesmith_large/scene_sweeping.png new file mode 100644 index 0000000000..d4d51126f8 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_sweeping.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index f0b087a1aa..c2ce4334c2 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'DYSHEARTENER DEFEATED!'; +const LAST_ANNOUNCEMENT_TITLE = 'SHIMMER AND RAINBOW HATCHING POTIONS; SPRING CLEANING GUILD SPOTLIGHT'; const worldDmg = { // @TODO bailey: false, }; @@ -31,18 +31,26 @@ api.getNews = {
Together, everyone in Habitica strikes a final blow to their tasks, and the Dysheartener rears back, shrieking with dismay. "What's wrong, Dysheartener?" AnnDeLune calls, eyes sparkling. "Feeling discouraged?"
-Glowing pink fractures crack across the Dysheartener's carapace, and it shatters in a puff of pink smoke. As a renewed sense of vigor and determination sweeps across the land, a flurry of delightful sweets rains down upon everyone.
-The crowd cheers wildly, hugging each other as their pets happily chew on the belated Valentine's treats. Suddenly, a joyful chorus of song cascades through the air, and gleaming silhouettes soar across the sky.
-Our newly-invigorated optimism has attracted a flock of Hopeful Hippogriffs! The graceful creatures alight upon the ground, ruffling their feathers with interest and prancing about. "It looks like we've made some new friends to help keep our spirits high, even when our tasks are daunting," Lemoness says.
-Beffymaroo already has her arms full with feathered fluffballs. "Maybe they'll help us rebuild the damaged areas of Habitica!"
-Crooning and singing, the Hippogriffs lead the way as all the Habitcans work together to restore our beloved home.
-We've brought back Shimmer Potions, and added a brand-new Magic Hatching Potion: Rainbow! Between now and March 31st, you can buy these Hatching Potions from the Market and use them to hatch any standard pet egg. (Magic Hatching Potions do not work on Quest Pet eggs.) Magic Hatching Potion Pets aren't picky, so they'll happily eat any kind of food that you feed them!
+After they're gone, it will be at least a year before the Shimmer or Rainbow Hatching Potions are available again, so be sure to get them now!
+There's a new Guild Spotlight on the blog that highlights the Guilds that can help you with your Spring Cleaning! Check it out now to find Habitica's best communities for help and motivation with cleaning.
+