diff --git a/migrations/mystery_items.js b/migrations/mystery_items.js index bce80d8ef4..7c72289b98 100644 --- a/migrations/mystery_items.js +++ b/migrations/mystery_items.js @@ -2,7 +2,7 @@ var _id = ''; var update = { $addToSet: { 'purchased.plan.mysteryItems':{ - $each:['back_mystery_201704','armor_mystery_201704'] + $each:['body_mystery_201705','head_mystery_201705'] } } }; diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201705/body_mystery_201705.png b/website/assets/sprites/spritesmith/gear/events/mystery_201705/body_mystery_201705.png new file mode 100644 index 0000000000..770e840101 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201705/body_mystery_201705.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201705/head_mystery_201705.png b/website/assets/sprites/spritesmith/gear/events/mystery_201705/head_mystery_201705.png new file mode 100644 index 0000000000..55a5e1228e Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201705/head_mystery_201705.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201705/shop_body_mystery_201705.png b/website/assets/sprites/spritesmith/gear/events/mystery_201705/shop_body_mystery_201705.png new file mode 100644 index 0000000000..c07bcace29 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201705/shop_body_mystery_201705.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201705/shop_head_mystery_201705.png b/website/assets/sprites/spritesmith/gear/events/mystery_201705/shop_head_mystery_201705.png new file mode 100644 index 0000000000..5165dd483a Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201705/shop_head_mystery_201705.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_mystery_201705.png b/website/assets/sprites/spritesmith_large/promo/promo_mystery_201705.png new file mode 100644 index 0000000000..d6df3658be Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_mystery_201705.png differ diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index d498caa24d..79c7328934 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -906,6 +906,8 @@ "headMystery201702Notes": "Though this hood conceals your face, it only magnifies your powers of attraction! Confers no benefit. February 2017 Subscriber Item.", "headMystery201703Text": "Shimmer Helm", "headMystery201703Notes": "The soft light reflected from this horned helm will soothe even the most enraged foe. Confers no benefit. March 2017 Subscriber Item.", + "headMystery201705Text": "Feathered Fighter Helm", + "headMystery201705Notes": "Habitica is known for its fierce and productive Gryphon Warriors! Join their prestigious ranks when you don this feathery helm. Confers no benefit. May 2017 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Basic Top Hat", @@ -1226,6 +1228,9 @@ "bodySpecialSummer2015HealerText": "Sailor's Neckerchief", "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.", + "bodyMystery201705Text": "Folded Feathered Fighter Wings", + "bodyMystery201705Notes": "These folded wings don't just look snazzy: they will give you the speed and agility of a gryphon! Confers no benefit. May 2017 Subscriber Item.", + "headAccessory": "head accessory", "headAccessoryCapitalized": "Head Accessory", "accessories": "Accessories", diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json index 451ce916d1..86d3989ff5 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -107,5 +107,6 @@ "eventAvailability": "Available for purchase until <%= date(locale) %>.", "dateEndApril": "April 19", "dateEndMay": "May 17", + "dateEndJune": "June 14", "discountBundle": "bundle" } diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index dcde3d0e1d..5ccdc568ff 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -127,6 +127,7 @@ "mysterySet201702": "Heartstealer Set", "mysterySet201703": "Shimmer Set", "mysterySet201704": "Fairytale Set", + "mysterySet201705": "Feathered Fighter Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySet301703": "Peacock Steampunk Set", diff --git a/website/common/script/content/gear/body.js b/website/common/script/content/gear/body.js index 1e2fff5373..e7a9e5e750 100644 --- a/website/common/script/content/gear/body.js +++ b/website/common/script/content/gear/body.js @@ -1,9 +1,11 @@ import {body as baseBody} from './sets/base'; +import {body as mysteryBody} from './sets/mystery'; import {body as specialBody} from './sets/special'; let body = { base: baseBody, + mystery: mysteryBody, special: specialBody, }; diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index f311eab77b..797fb46014 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -246,6 +246,15 @@ let back = { }, }; +let body = { + 201705: { + text: t('bodyMystery201705Text'), + notes: t('bodyMystery201705Notes'), + mystery: '201705', + value: 0, + }, +}; + let eyewear = { 201503: { text: t('eyewearMystery201503Text'), @@ -454,6 +463,12 @@ let head = { mystery: '201703', value: 0, }, + 201705: { + text: t('headMystery201705Text'), + notes: t('headMystery201705Notes'), + mystery: '201705', + value: 0, + }, 301404: { text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), @@ -582,6 +597,7 @@ let weapon = { let mysterySet = { armor, back, + body, eyewear, head, headAccessory, diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index c88ca45b8b..ee78e6959d 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 = 'June'; let drops = { Base: { @@ -76,7 +76,7 @@ let premium = { value: 2, text: t('hatchingPotionFloral'), limited: true, - _season: 'spring', + _season: 'June', }, Thunderstorm: { value: 2, diff --git a/website/common/script/content/mystery-sets.js b/website/common/script/content/mystery-sets.js index 0259ba63e5..67bbcf80b1 100644 --- a/website/common/script/content/mystery-sets.js +++ b/website/common/script/content/mystery-sets.js @@ -158,6 +158,10 @@ let mysterySets = { start: '2017-04-25', end: '2017-05-02', }, + 201705: { + start: '2017-05-23', + end: '2017-06-02', + }, 301404: { start: '3014-03-24', end: '3014-04-02', diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 3337d48abf..5311fc4173 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,25 +1,51 @@ -h2 5/18/2017 - DISCOUNTED QUEST BUNDLE AND LAST CHANCE FOR FAIRY POTIONS - .promo_bundle_feathered.pull-right +h2 5/23/2017 - MAY SUBSCRIBER ITEMS, DEVELOPER BLOG POST, GUILD ACHIEVEMENT, AND PARTY SURVEY hr tr td - h3 New Discounted Pet Quest Bundle: Feathered Friends - p If you're a fan of bird pets and mounts, you're in luck! From now until May 31, you can purchase the Feathered Friends Pet Quest Bundle and receive the Parrot, Owl, and Falcon quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the Quest Shop today! - p.small.muted by Lemoness and SabreCat - p.small.muted Art by Casey, Teto Forever, Eevachu, UncommonCriminal, JonArinbjorn, Trogdorina, Onheiron, Squish - p.small.muted Writing by Lemoness, Token, and Bartelmy + .promo_mystery_201705.center-block + h3 May Subscriber Item Set Revealed! + p The May Subscriber Item has been revealed: the Feathered Fighter Item Set! You only have seven days to receive the item set when you subscribe. If you're already an active subscriber, reload the site and then head to Inventory > Equipment to claim your gear! + br + p Subscribers also receive the ability to buy gems for gold -- the longer you subscribe, the more gems you can buy per month! There are other perks as well, such as longer access to uncompressed data. Best of all, subscriptions let us keep Habitica running. Thank you very much for your support -- it means a lot to us. + p.small.muted by Lemoness tr td - .Pet-LionCub-Fairy.pull-left.slight-right-margin - h3 Last Chance for Fairy Hatching Potions - p Reminder: this is the final day to buy Fairy Hatching Potions! If they come back, it won't be until next year at the earliest, so don't delay! - p.small.muted by Edge + h3 Developers' Blog: Important Upcoming API Changes + p If you're a third-party developer, there are some important upcoming technical changes to Habitica's API that you should know about. Read more about these exciting updates and how to prepare for your app for them on the Habitica developers' blog, The Forge! + p.small.muted by TheHollidayInn + tr + td + .achievement-guild2x.pull-right + h3 New Badge and Achievement: Joined a Guild + p There's a brand new badge you can earn by joining a Guild! Guilds are a great way to meet fellow Habiticans who share your interests and/or goals! Earn the new achievement by joining one or more Guilds. If you're already in a Guild, you've received the achievement automatically! Have fun. + p.small.muted by SabreCat and Vampitch + tr + td + .achievement-tree2x.pull-left.slight-right-margin + h3 Help Habitica Grow! Party Usage Survey + p Are you in a Party? We'd love to know more about how your Party uses the text features on your Party page! Click here to take a brief survey. If you provide your User ID at the end, you'll earn the Helped Habitica Grow achievement! + p.small.muted by Sara Olson if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 5/18/2017 - DISCOUNTED QUEST BUNDLE AND LAST CHANCE FOR FAIRY POTIONS + .promo_bundle_feathered.pull-right + tr + td + h3 New Discounted Pet Quest Bundle: Feathered Friends + p If you're a fan of bird pets and mounts, you're in luck! From now until May 31, you can purchase the Feathered Friends Pet Quest Bundle and receive the Parrot, Owl, and Falcon quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the Quest Shop today! + p.small.muted by Lemoness and SabreCat + p.small.muted Art by Casey, Teto Forever, Eevachu, UncommonCriminal, JonArinbjorn, Trogdorina, Onheiron, Squish + p.small.muted Writing by Lemoness, Token, and Bartelmy + tr + td + .Pet-LionCub-Fairy.pull-left.slight-right-margin + h3 Last Chance for Fairy Hatching Potions + p Reminder: this is the final day to buy Fairy Hatching Potions! If they come back, it won't be until next year at the earliest, so don't delay! + p.small.muted by Edge h2 5/11/2017 - BLOG BONANZA: USE CASES, WIKI, AND BEHIND THE SCENES tr td