diff --git a/test/client/unit/specs/components/avatar.vue.test.js b/test/client/unit/specs/components/avatar.vue.test.js
index 1b871f96d6..8de44ebb21 100644
--- a/test/client/unit/specs/components/avatar.vue.test.js
+++ b/test/client/unit/specs/components/avatar.vue.test.js
@@ -83,12 +83,12 @@ context('avatar.vue', () => {
expect(vm.paddingTop).to.equal('28px');
});
- it('is 24.5px if user has a pet', () => {
+ it('is 24px if user has a pet', () => {
vm.member.items = {
currentPet: { name: 'Foo' },
};
- expect(vm.paddingTop).to.equal('24.5px');
+ expect(vm.paddingTop).to.equal('24px');
});
it('is 0px if user has a mount', () => {
@@ -297,4 +297,4 @@ context('avatar.vue', () => {
});
});
});
-});
\ No newline at end of file
+});
diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue
index 516535cf65..db56336a60 100644
--- a/website/client/components/avatar.vue
+++ b/website/client/components/avatar.vue
@@ -139,7 +139,7 @@ export default {
let val = '28px';
if (!this.avatarOnly) {
- if (this.member.items.currentPet) val = '24.5px';
+ if (this.member.items.currentPet) val = '24px';
if (this.member.items.currentMount) val = '0px';
}
diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json
index beb058181e..d3e90891c3 100644
--- a/website/common/locales/en/content.json
+++ b/website/common/locales/en/content.json
@@ -288,6 +288,7 @@
"hatchingPotionVeggie": "Garden",
"hatchingPotionSunshine": "Sunshine",
"hatchingPotionBronze": "Bronze",
+ "hatchingPotionWatery": "Watery",
"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 96e4729a28..54be8e4479 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -143,10 +143,12 @@
"summer2019ConchHealerSet": "Conch (Healer)",
"summer2019HammerheadRogueSet": "Hammerhead (Rogue)",
"eventAvailability": "Available for purchase until <%= date(locale) %>.",
+ "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was previously released in <%= previousDate(locale) %>.",
"dateEndMarch": "April 30",
"dateEndApril": "April 19",
"dateEndMay": "May 31",
"dateEndJune": "June 14",
+ "june2018": "June 2018",
"dateEndJuly": "July 31",
"dateEndAugust": "August 31",
"dateEndSeptember": "September 21",
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index 0bb75815ba..31cd193398 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';
function hasQuestAchievementFunction (key) {
return (user) => {
@@ -143,7 +143,11 @@ let premium = {
value: 2,
text: t('hatchingPotionGlass'),
limited: true,
- _season: '_PENDING_',
+ _season: 'July',
+ _addlNotes: t('eventAvailabilityReturning', {
+ availableDate: t('dateEndJuly'),
+ previousDate: t('june2018'),
+ }),
},
Glow: {
value: 2,
@@ -190,6 +194,12 @@ let premium = {
return '';
},
},
+ Watery: {
+ value: 2,
+ text: t('hatchingPotionWatery'),
+ limited: true,
+ _season: 'July',
+ },
};
const wacky = {
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 677ae91d85..c8586a98bf 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -9,15 +9,15 @@ const featuredItems = {
},
{
type: 'eggs',
- path: 'eggs.Fox',
+ path: 'eggs.BearCub',
},
{
- type: 'hatchingPotions',
- path: 'hatchingPotions.CottonCandyBlue',
+ type: 'premiumHatchingPotion',
+ path: 'premiumHatchingPotions.Glass',
},
{
- type: 'card',
- path: 'cardTypes.congrats',
+ type: 'premiumHatchingPotion',
+ path: 'premiumHatchingPotions.Watery',
},
],
quests: [
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_greenFestivalYukata.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_greenFestivalYukata.png
index e2af431f4b..6c1629ef46 100755
Binary files a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_greenFestivalYukata.png and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_greenFestivalYukata.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_robeOfDiamonds.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_robeOfDiamonds.png
index 9c166874c8..7a83ea84bc 100644
Binary files a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_robeOfDiamonds.png and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_robeOfDiamonds.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_swanDancerTutu.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_swanDancerTutu.png
index 42a5d957af..c6fe4dd8ef 100755
Binary files a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_swanDancerTutu.png and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_swanDancerTutu.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_vernalVestment.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_vernalVestment.png
index cf506fb429..ae205103e1 100644
Binary files a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_vernalVestment.png and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_vernalVestment.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_greenFestivalYukata.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_greenFestivalYukata.png
index b3f97e934e..7d85689e17 100755
Binary files a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_greenFestivalYukata.png and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_greenFestivalYukata.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_robeOfDiamonds.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_robeOfDiamonds.png
index 2444309a6a..af45da72da 100644
Binary files a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_robeOfDiamonds.png and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_robeOfDiamonds.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_swanDancerTutu.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_swanDancerTutu.png
index 842fe868a0..fd32fccfd8 100755
Binary files a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_swanDancerTutu.png and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_swanDancerTutu.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_vernalVestment.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_vernalVestment.png
index 2b4e13f842..c84e5780d8 100644
Binary files a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_vernalVestment.png and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_vernalVestment.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armor/broad_armor_special_sneakthiefRobes.png b/website/raw_sprites/spritesmith/gear/armor/broad_armor_special_sneakthiefRobes.png
index 765f9978b1..c2844f4438 100755
Binary files a/website/raw_sprites/spritesmith/gear/armor/broad_armor_special_sneakthiefRobes.png and b/website/raw_sprites/spritesmith/gear/armor/broad_armor_special_sneakthiefRobes.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armor/slim_armor_special_sneakthiefRobes.png b/website/raw_sprites/spritesmith/gear/armor/slim_armor_special_sneakthiefRobes.png
index f642a1f717..85b6ff072e 100755
Binary files a/website/raw_sprites/spritesmith/gear/armor/slim_armor_special_sneakthiefRobes.png and b/website/raw_sprites/spritesmith/gear/armor/slim_armor_special_sneakthiefRobes.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Watery.png
new file mode 100644
index 0000000000..672a6c82e7
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Watery.png
new file mode 100644
index 0000000000..6548cfff81
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Watery.png
new file mode 100644
index 0000000000..e79077b914
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Watery.png
new file mode 100644
index 0000000000..0073043b24
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Watery.png
new file mode 100644
index 0000000000..4eb95202af
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Watery.png
new file mode 100644
index 0000000000..91b838aed0
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Watery.png
new file mode 100644
index 0000000000..4f1e62f747
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Watery.png
new file mode 100644
index 0000000000..623d7703bb
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Watery.png
new file mode 100644
index 0000000000..7344dda2ab
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Watery.png
new file mode 100644
index 0000000000..960db8bf25
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Watery.png
new file mode 100644
index 0000000000..581e48ca56
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Watery.png
new file mode 100644
index 0000000000..8880e92ad6
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Watery.png
new file mode 100644
index 0000000000..17e1f0edd4
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Watery.png
new file mode 100644
index 0000000000..496569f3da
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Watery.png
new file mode 100644
index 0000000000..f697970a2a
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Watery.png
new file mode 100644
index 0000000000..c34f37cd69
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Watery.png
new file mode 100644
index 0000000000..9795b0f778
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Watery.png
new file mode 100644
index 0000000000..792a6367a7
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Watery.png
new file mode 100644
index 0000000000..bd46001fa4
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Watery.png
new file mode 100644
index 0000000000..1d0810217d
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Watery.png
new file mode 100644
index 0000000000..b5ba4aa135
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Watery.png
new file mode 100644
index 0000000000..ae799f60f0
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Watery.png
new file mode 100644
index 0000000000..1a02d8e0f2
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Watery.png
new file mode 100644
index 0000000000..e32ba0f743
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Watery.png
new file mode 100644
index 0000000000..21477c0c8b
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Watery.png
new file mode 100644
index 0000000000..3d90197d3d
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Watery.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Watery.png
new file mode 100644
index 0000000000..e8ab0b3b7c
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Watery.png
new file mode 100644
index 0000000000..18778f49da
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Watery.png
new file mode 100644
index 0000000000..e3d4a62a17
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Watery.png
new file mode 100644
index 0000000000..323b4d98a3
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Watery.png
new file mode 100644
index 0000000000..3c92652da3
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Watery.png
new file mode 100644
index 0000000000..88cc696ccf
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Watery.png
new file mode 100644
index 0000000000..97a24c1411
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Watery.png
new file mode 100644
index 0000000000..53eb732e34
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Watery.png
new file mode 100644
index 0000000000..82a81adc05
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Watery.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Watery.png
new file mode 100644
index 0000000000..c99331d61e
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Watery.png differ
diff --git a/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Watery.png b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Watery.png
new file mode 100644
index 0000000000..6d021a4506
Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Watery.png differ
diff --git a/website/raw_sprites/spritesmith_large/promo_floral_sunshine_potions.png b/website/raw_sprites/spritesmith_large/promo_floral_sunshine_potions.png
deleted file mode 100644
index 4e0c1abb4c..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_floral_sunshine_potions.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_glass_watery_potions.png b/website/raw_sprites/spritesmith_large/promo_glass_watery_potions.png
new file mode 100644
index 0000000000..e6406f5e60
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_glass_watery_potions.png differ
diff --git a/website/raw_sprites/spritesmith_large/scene_casting_spells.png b/website/raw_sprites/spritesmith_large/scene_casting_spells.png
new file mode 100644
index 0000000000..d94cf31d51
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_casting_spells.png differ
diff --git a/website/raw_sprites/spritesmith_large/scene_hiking.png b/website/raw_sprites/spritesmith_large/scene_hiking.png
deleted file mode 100644
index 884f9be27d..0000000000
Binary files a/website/raw_sprites/spritesmith_large/scene_hiking.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/scene_positivity.png b/website/raw_sprites/spritesmith_large/scene_positivity.png
new file mode 100644
index 0000000000..e5268b8fb3
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_positivity.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 389bad3440..e38186e3fa 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 = 'SUMMER SPLASH BEGINS! CLASS OUTFITS, SEASONAL SHOP, ORCAS, AND NPC DECORATIONS';
+const LAST_ANNOUNCEMENT_TITLE = 'NEW AND RETURNING HATCHING POTIONS, USE CASE SPOTLIGHT, AND GUILD SPOTLIGHT';
const worldDmg = { // @TODO
bailey: false,
};
@@ -30,27 +30,24 @@ api.getNews = {
${res.t('newStuff')}
- 6/18/2019 - ${LAST_ANNOUNCEMENT_TITLE}
+ 6/20/2019 - ${LAST_ANNOUNCEMENT_TITLE}
- To escape the summer heat in Habit City, everyone's moved down to the undersea city of Dilatory. The Summer Splash event has begun!
-
- Summer Class Outfits
- From now until July 31st, limited edition outfits are available in the Rewards column. Depending on your class, you can be a Sea Turtle Warrior, Hammerhead Rogue, Conch Healer, or Water Lily Mage! You'd better get productive to earn enough gold before they disappear. Good luck!
- by AnnDeLune, gawrone, Vikte, and SabreCat
-
- Seasonal Shop is Open!
- The Seasonal Shop has opened! The Seasonal Sorceress is stocking the seasonal edition versions of previous summer outfits, now available for Gems instead of Gold. Plus, there will be more fun things in the shop as the event progresses. The Seasonal Shop will only be open until July 31st, so don't wait!
- by SabreCat, Lemoness, Giu09, JaizakAripaik, Teto Forever, Kai, AnnDeLune, Vampitch, TheDudeAbides, Lalaitha, nonight, tricksy.fox, and Beffymaroo
-
- Orcas for Everyone!
- Dolphins aren't the only animals riding the waves around the city of Dilatory: it looks like some friendly Orcas are swimming into Habiticans' stables! In honor of the Summer Splash event, everyone who didn't already have an Orca gets either the mount or the pet. Enjoy!
- by Beffymaroo and UncommonCriminal
-
- NPC Costumes
- Looks like the NPCs are really getting in to the cheery summer mood around the site. Who wouldn't? After all, there's plenty more celebration to come...
- by Lemoness
+
+ Watery and Glass Hatching Potions
+ There's a new pet breed in town! Check out the brand-new Watery Potions and the return of Glass Potions. You can get them in 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!
+ These potions will be available until the Summer Splash Gala ends on July 31. After they're gone, it will be at least a year before the Watery or Glass Hatching Potions are available again, so be sure to get them now!
+ by Mako, Willow the Witty, Persephone, and SabreCat
+
+ Use Case Spotlight: The Warrior
+ This month's Use Case Spotlight is about the Warrior class! It features a number of great suggestions submitted by Habiticans in the Use Case Spotlights Guild. We hope it helps any of you who might be deciding which class is best for your play style.
+ Plus, we're collecting user submissions for the next spotlight! We want to hear your best tricks and strategies for playing the Healer class to its full advantage. 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!
+ by shanaqui
+
+ Guild Spotlight: More New and Notable Guilds
+ There's a new Guild Spotlight on the blog that highlights a brand new group of new and upcoming Guilds! Check it out now to find up and coming communities where you can discuss your goals and interests.
+ by shanaqui
`,
});
diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js
index 676231ef59..d5c6a3808d 100644
--- a/website/server/models/user/hooks.js
+++ b/website/server/models/user/hooks.js
@@ -127,6 +127,9 @@ function _setUpNewUser (user) {
user.items.quests.dustbunnies = 1;
user.markModified('items.quests');
+ user.items.mounts['Orca-Base'] = true;
+ user.markModified('items.mounts');
+
user.purchased.background.violet = true;
user.preferences.background = 'violet';