diff --git a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
index ddd55cd6f3..25fc59c854 100644
--- a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
+++ b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -6,19 +6,25 @@
}
.promo_costume_achievement {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: 0px -365px;
+ background-position: 0px -513px;
width: 144px;
height: 156px;
}
-.promo_mystery_201910 {
+.promo_ember_thunderstorm_potions {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -477px -148px;
+ width: 423px;
+ height: 147px;
+}
+.promo_mystery_201910 {
+ background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+ background-position: 0px -365px;
width: 282px;
height: 147px;
}
.promo_take_this {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -760px -148px;
+ background-position: -283px -365px;
width: 96px;
height: 69px;
}
diff --git a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png
index 3f7b6b3ac4..4001411a14 100644
Binary files a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png differ
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 690a239527..e8c312ffb3 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -152,14 +152,14 @@
"dateEndApril": "April 19",
"dateEndMay": "May 31",
"dateEndJune": "June 14",
- "june2018": "June 2018",
+ "augustYYYY": "August <%= year %>",
"dateEndJuly": "July 31",
"dateEndAugust": "August 31",
"dateEndSeptember": "September 21",
"september2017": "September 2017",
"september2018": "September 2018",
"dateEndOctober": "October 31",
- "dateEndNovember": "December 3",
+ "dateEndNovember": "November 30",
"dateEndJanuary": "January 31",
"dateEndFebruary": "February 28",
"winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index aa155c6027..ee2554778d 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -1,6 +1,7 @@
import assign from 'lodash/assign';
import defaults from 'lodash/defaults';
import each from 'lodash/each';
+import moment from 'moment';
import t from './translation';
const CURRENT_SEASON = '_NONE_';
@@ -93,13 +94,25 @@ const premium = {
value: 2,
text: t('hatchingPotionEmber'),
limited: true,
- _season: '_PENDING_',
+ _addlNotes: t('eventAvailabilityReturning', {
+ availableDate: t('dateEndNovember'),
+ previousDate: t('augustYYYY', { year: 2017 }),
+ }),
+ canBuy () {
+ return moment().isBetween('2019-11-12', '2019-12-02');
+ },
},
Thunderstorm: {
value: 2,
text: t('hatchingPotionThunderstorm'),
limited: true,
- _season: '_PENDING_',
+ _addlNotes: t('eventAvailabilityReturning', {
+ availableDate: t('dateEndNovember'),
+ previousDate: t('augustYYYY', { year: 2016 }),
+ }),
+ canBuy () {
+ return moment().isBetween('2019-11-12', '2019-12-02');
+ },
},
Spooky: {
value: 2,
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index b9dc7ec9c0..4fc960eaad 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -8,16 +8,16 @@ const featuredItems = {
path: 'armoire',
},
{
- type: 'eggs',
- path: 'eggs.PandaCub',
+ type: 'premiumHatchingPotion',
+ path: 'premiumHatchingPotions.Ember',
},
{
- type: 'hatchingPotions',
- path: 'hatchingPotions.Shade',
+ type: 'premiumHatchingPotion',
+ path: 'premiumHatchingPotions.Thunderstorm',
},
{
type: 'food',
- path: 'food.Potatoe',
+ path: 'food.Saddle',
},
],
quests: [
diff --git a/website/raw_sprites/spritesmith_large/promo_ember_thunderstorm_potions.png b/website/raw_sprites/spritesmith_large/promo_ember_thunderstorm_potions.png
new file mode 100644
index 0000000000..e277878243
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_ember_thunderstorm_potions.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 83b48c12fd..30d1deeb23 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -4,7 +4,7 @@ const api = {};
// @TODO export this const, cannot export it from here because only routes are exported from
// controllers
-const LAST_ANNOUNCEMENT_TITLE = 'NOVEMBER BACKGROUNDS AND ARMOIRE ITEMS!';
+const LAST_ANNOUNCEMENT_TITLE = 'THUNDERSTORM AND EMBER HATCHING POTIONS';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,24 +31,23 @@ api.getNews = {
${res.t('newStuff')}
- 11/5/2019 - ${LAST_ANNOUNCEMENT_TITLE}
+ 11/12/2019 - ${LAST_ANNOUNCEMENT_TITLE}
-
+
- We’ve added three new backgrounds to the Background Shop! Now your avatar can fly
- through a Tumultuous Thunderstorm, find only the strongest elixirs at the Potion Shop,
- and wander through a colorful Farmer's Market. Check them out under User Icon >
- Backgrounds!
+ Two of your favorite Magic Hatching Potions are back! Between now and November 30, you
+ can buy Thunderstorm and Ember 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!
- Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the
- Alchemist Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+ After they're gone, it will be at least a year before the Ember or Thunderstorm Hatching
+ Potions are available again, so be sure to get them now!
-
- by Vikte, QuartzFox, Gully, Aspiring Advocate, Lt. Cabel, and SabreCat
-
+ by Balduranne and SabreCat
`,
});