diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Aquatic.png new file mode 100644 index 0000000000..ae103508bf Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Aquatic.png new file mode 100644 index 0000000000..e3186a8f94 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Aquatic.png new file mode 100644 index 0000000000..71f74dff35 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Aquatic.png new file mode 100644 index 0000000000..d0e4bd4263 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Aquatic.png new file mode 100644 index 0000000000..b362737b3c Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Aquatic.png new file mode 100644 index 0000000000..286acf290e Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Aquatic.png new file mode 100644 index 0000000000..773ca6e4f7 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Aquatic.png new file mode 100644 index 0000000000..85034fd109 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Aquatic.png new file mode 100644 index 0000000000..476a359686 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Aquatic.png new file mode 100644 index 0000000000..bf156eb7a8 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Aquatic.png new file mode 100644 index 0000000000..3d0c1dd3e2 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Aquatic.png new file mode 100644 index 0000000000..dc83c3a7ac Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Aquatic.png new file mode 100644 index 0000000000..5236676f30 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Aquatic.png new file mode 100644 index 0000000000..7198f4ef55 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Aquatic.png new file mode 100644 index 0000000000..b5bb612942 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Aquatic.png new file mode 100644 index 0000000000..c6c2472384 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Aquatic.png new file mode 100644 index 0000000000..5520b1e726 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Aquatic.png new file mode 100644 index 0000000000..50591a4ed7 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Aquatic.png new file mode 100644 index 0000000000..b86d37e5b8 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Aquatic.png new file mode 100644 index 0000000000..17f0cf472a Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Aquatic.png new file mode 100644 index 0000000000..70c9110c3d Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Aquatic.png new file mode 100644 index 0000000000..72ba9a9718 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Aquatic.png new file mode 100644 index 0000000000..a06c2f61c9 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Aquatic.png new file mode 100644 index 0000000000..cea752ea11 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Aquatic.png new file mode 100644 index 0000000000..031b87c6a8 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Aquatic.png new file mode 100644 index 0000000000..ad2cfde65d Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Aquatic.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Aquatic.png new file mode 100644 index 0000000000..75c4832bdd Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-BearCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-BearCub-Aquatic.png new file mode 100644 index 0000000000..3350174df6 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-BearCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Cactus-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Cactus-Aquatic.png new file mode 100644 index 0000000000..140319874a Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Cactus-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Dragon-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Dragon-Aquatic.png new file mode 100644 index 0000000000..0e4b24ce44 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Dragon-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-FlyingPig-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-FlyingPig-Aquatic.png new file mode 100644 index 0000000000..c914b7db69 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-FlyingPig-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Fox-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Fox-Aquatic.png new file mode 100644 index 0000000000..e0487723c4 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Fox-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-LionCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-LionCub-Aquatic.png new file mode 100644 index 0000000000..4853391c01 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-LionCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-PandaCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-PandaCub-Aquatic.png new file mode 100644 index 0000000000..b671681584 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-PandaCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-TigerCub-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-TigerCub-Aquatic.png new file mode 100644 index 0000000000..d5dfa26fab Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-TigerCub-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Wolf-Aquatic.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Wolf-Aquatic.png new file mode 100644 index 0000000000..cd0b064d7a Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Wolf-Aquatic.png differ diff --git a/website/assets/sprites/spritesmith/stable/potions/Pet_HatchingPotion_Aquatic.png b/website/assets/sprites/spritesmith/stable/potions/Pet_HatchingPotion_Aquatic.png new file mode 100644 index 0000000000..44b19ba2b8 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/potions/Pet_HatchingPotion_Aquatic.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_aquatic_potions.png b/website/assets/sprites/spritesmith_large/promo/promo_aquatic_potions.png new file mode 100644 index 0000000000..5c6dd76206 Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_aquatic_potions.png differ diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index 56985237b3..c106872f54 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -230,6 +230,7 @@ "hatchingPotionSpooky": "Spooky", "hatchingPotionPeppermint": "Peppermint", "hatchingPotionFloral": "Floral", + "hatchingPotionAquatic": "Aquatic", "hatchingPotionThunderstorm": "Thunderstorm", "hatchingPotionGhost": "Ghost", "hatchingPotionRoyalPurple": "Royal Purple", diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json index e9653c7d4a..743ab7b679 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -112,5 +112,6 @@ "dateEndApril": "April 19", "dateEndMay": "May 17", "dateEndJune": "June 14", + "dateEndJuly": "July 29", "discountBundle": "bundle" } diff --git a/website/common/locales/en/pets.json b/website/common/locales/en/pets.json index 82ceccd998..343f063260 100644 --- a/website/common/locales/en/pets.json +++ b/website/common/locales/en/pets.json @@ -67,14 +67,14 @@ "firstDrop": "You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item, including eggs, potions, and food! You just found a <%= eggText %> Egg! <%= eggNotes %>", "useGems": "If you've got your eye on a pet, but can't wait any longer for it to drop, use Gems in Inventory > Market to buy one!", "hatchAPot": "Hatch a <%= potion %> <%= egg %>?", - "hatchedPet": "You hatched a <%= potion %> <%= egg %>!", + "hatchedPet": "You hatched a new <%= potion %> <%= egg %>!", "displayNow": "Display Now", "displayLater": "Display Later", "petNotOwned": "You do not own this pet.", "earnedCompanion": "With all your productivity, you've earned a new companion. Feed it to make it grow!", "feedPet": "Feed <%= article %><%= text %> to your <%= name %>?", "useSaddle": "Saddle <%= pet %>?", - "raisedPet": "You grew a <%= pet %>!", + "raisedPet": "You grew your <%= pet %>!", "earnedSteed": "By completing your tasks, you've earned a faithful steed!", "rideNow": "Ride Now", "rideLater": "Ride Later", diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index a1ab7eba5c..fdb8508630 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: { @@ -78,6 +78,12 @@ let premium = { limited: true, _season: 'June', }, + Aquatic: { + value: 2, + text: t('hatchingPotionAquatic'), + limited: true, + _season: 'July', + }, Thunderstorm: { value: 2, text: t('hatchingPotionThunderstorm'), diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 49f58ef23a..f5c6888394 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,17 +1,34 @@ -h2 6/27/2017 - GUILD SPOTLIGHT: OUTDOOR HOBBIES +.promo_aquatic_potions.pull-right +h2 6/29/2017 - AQUATIC HATCHING POTIONS AND LAST CHANCE FOR JUNE SUBSCRIBER ITEMS hr tr td - .scene_raking_leaves.pull-right - h3 Guild Spotlight: Outdoor Hobbies! - p There's a new Guild Spotlight on the blog that highlights the Guilds that can help you find fun and exciting activities in the great outdoors! Check it out now to find Habitica's best Outdoor Hobby communities. - p.small.muted by Beffymaroo + h3 Aquatic Hatching Potions + p There's a new pet breed in town! Between now and July 29th, you can buy 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.) Aquatic Potion Pets aren't picky, so they'll happily eat any kind of food that you feed them! + br + p After they're gone, it will be at least a year before the Aquatic Hatching Potions are available again, so be sure to get them now! + p.small.muted by Stefalupagus, Beffymaroo, and SabreCat + tr + td + .promo_mystery_201706.pull-left.slight-right-margin + h3 Last Chance for Pirate Pioneer Set + p Reminder: tomorrow is the final day to subscribe and receive the Pirate Pioneer Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get! + br + p Thanks so much for your support! You help keep Habitica running. + p.small.muted by Lemoness if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 6/27/2017 - GUILD SPOTLIGHT: OUTDOOR HOBBIES + tr + td + .scene_raking_leaves.pull-right + h3 Guild Spotlight: Outdoor Hobbies! + p There's a new Guild Spotlight on the blog that highlights the Guilds that can help you find fun and exciting activities in the great outdoors! Check it out now to find Habitica's best Outdoor Hobby communities. + p.small.muted by Beffymaroo h2 6/22/2017 - JUNE SUBSCRIBER ITEMS: PIRATE PIONEER SET tr td