diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index aff99ebd4d..7ec47d5be7 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -261,6 +261,7 @@ "hatchingPotionFairy": "Fairy", "hatchingPotionStarryNight": "Starry Night", "hatchingPotionRainbow": "Rainbow", + "hatchingPotionGlass": "Glass", "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 57e2fdacca..e0d40d82e0 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -130,7 +130,7 @@ "dateEndApril": "April 19", "dateEndMay": "May 31", "dateEndJune": "June 14", - "dateEndJuly": "July 29", + "dateEndJuly": "July 31", "dateEndAugust": "August 31", "dateEndOctober": "October 31", "dateEndNovember": "November 30", diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index b88eb8916c..b56a8885e7 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 = 'July'; let drops = { Base: { @@ -132,6 +132,12 @@ let premium = { limited: true, _season: 'March', }, + Glass: { + value: 2, + text: t('hatchingPotionGlass'), + limited: true, + _season: 'July', + }, }; each(drops, (pot, key) => { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 671efc1835..4dae9c02fc 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -8,8 +8,8 @@ const featuredItems = { path: 'armoire', }, { - type: 'hatchingPotions', - path: 'hatchingPotions.Desert', + type: 'premiumHatchingPotion', + path: 'premiumHatchingPotions.Glass', }, { type: 'food', diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index 24c467620f..97f2c9281c 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -19,6 +19,7 @@ module.exports = { }, availableSpells: [ + 'seafoam', ], availableQuests: [ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Glass.png new file mode 100644 index 0000000000..2c231f5af6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Glass.png new file mode 100644 index 0000000000..9526e0be1a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Glass.png new file mode 100644 index 0000000000..ac02c4cb3e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Glass.png new file mode 100644 index 0000000000..e84790b137 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Glass.png new file mode 100644 index 0000000000..e7c2e9fb24 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Glass.png new file mode 100644 index 0000000000..9e843c3003 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Glass.png new file mode 100644 index 0000000000..3045bc9670 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Glass.png new file mode 100644 index 0000000000..a52122676b Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Glass.png new file mode 100644 index 0000000000..c329cb8d83 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Glass.png new file mode 100644 index 0000000000..bc606de20f Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Glass.png new file mode 100644 index 0000000000..9ec529f1e3 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Glass.png new file mode 100644 index 0000000000..ef5a5ef1a0 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Glass.png new file mode 100644 index 0000000000..478bf94fd6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Glass.png new file mode 100644 index 0000000000..6e3169f9c1 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Glass.png new file mode 100644 index 0000000000..6f0390e5df Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Glass.png new file mode 100644 index 0000000000..c1dbfb3f82 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Glass.png new file mode 100644 index 0000000000..0fc8f4098b Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Glass.png new file mode 100644 index 0000000000..699fd8b545 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Glass.png new file mode 100644 index 0000000000..5ab75568dc Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Glass.png new file mode 100644 index 0000000000..51b6c95184 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Glass.png new file mode 100644 index 0000000000..801d46bd45 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Glass.png new file mode 100644 index 0000000000..71f2f8456b Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Glass.png new file mode 100644 index 0000000000..8b0e9b4580 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Glass.png new file mode 100644 index 0000000000..eae5dcd1db Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Glass.png new file mode 100644 index 0000000000..92299e3c1d Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Glass.png new file mode 100644 index 0000000000..e284d30aa1 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Glass.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Glass.png new file mode 100644 index 0000000000..a114cf09e3 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Glass.png new file mode 100644 index 0000000000..d8febedd66 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Glass.png new file mode 100644 index 0000000000..94de422336 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Glass.png new file mode 100644 index 0000000000..3d5e69803c Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Glass.png new file mode 100644 index 0000000000..53b39bfdad Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Glass.png new file mode 100644 index 0000000000..a1f07bf7b7 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Glass.png new file mode 100644 index 0000000000..fd42829517 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Glass.png new file mode 100644 index 0000000000..7b3dba6568 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Glass.png new file mode 100644 index 0000000000..662088a2ce Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Glass.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Glass.png new file mode 100644 index 0000000000..a4013d2585 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Glass.png differ diff --git a/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Glass.png b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Glass.png new file mode 100644 index 0000000000..2b080c86a7 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Glass.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_aquatic_glass_potions.png b/website/raw_sprites/spritesmith_large/promo_aquatic_glass_potions.png new file mode 100644 index 0000000000..4c454c944f Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_aquatic_glass_potions.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_seafoam.png b/website/raw_sprites/spritesmith_large/promo_seafoam.png new file mode 100644 index 0000000000..9a2a2b76eb Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_seafoam.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 7c2779650c..81a47eca47 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 = 'USE CASE SPOTLIGHT AND GUILD SPOTLIGHT ON PARENTING AND FAMILY LIFE, PLUS NEW BEHIND THE SCENES POST!'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW GLASS HATCHING POTIONS, AQUATIC HATCHING POTIONS, AND SEAFOAM!'; const worldDmg = { // @TODO bailey: false, }; @@ -30,24 +30,25 @@ api.getNews = {

${res.t('newStuff')}

-

6/22/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

6/26/2018 - ${LAST_ANNOUNCEMENT_TITLE}


+
-

We've got new posts on the blog all about ways to use Habitica to help with parenting and family-related matters! First, there's a Guild Spotlight that highlights the Guilds that can help you as you explore ways to use Habitica to smooth your home and family life. We've also posted a Use Case Spotlight featuring a number of great suggestions for using Habitica's task system to manage parenting and family-related tasks! These suggestions were submitted by Habiticans in the Use Case Spotlights Guild.

-
-
-
-
-
-
-

Plus, we're collecting user submissions for the next Use Case Spotlight! How do you use Habitica to build a routine to challenge your brain and keep your mind sharp? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done!

-

There's also a new Behind the Scenes post on the Habitica blog about fun facts and goofy shenanigans from the Moderator Team and their behind-the-scenes chat channel. Check it out!

-
by Beffymaroo, the Habitica Staff, and the Moderator Team
+

New Glass Magic Hatching Potions and the Return of Aquatic Potions!

+

There's a new pet breed in town! Between now and July 31, you can buy Glass and Aquatic 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 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 Glass and Aquatic Hatching Potions are available again, so be sure to get them now!

+
by stefalupagus, Beffymaroo, Mako413, Willow The Witty, and SabreCat
+

Seafoam!

+

Throw some Seafoam at your friends and they will turn into a cheerful sea star until their next cron! You can buy the Seafoam in the Seasonal Shop for Gold. Plus, if you get splashed by Seafoam, you'll receive the Aquatic Friends badge!

+
+

Don't want to be a sea star? Just buy some Sand from your Rewards column to reverse it.

+

Seafoam will be available until July 31st!

+
by Lemoness
`, });