diff --git a/migrations/mystery_items.js b/migrations/mystery_items.js index 0558c8a8c1..b4217ce681 100644 --- a/migrations/mystery_items.js +++ b/migrations/mystery_items.js @@ -2,7 +2,7 @@ var _id = ''; var update = { $addToSet: { 'purchased.plan.mysteryItems':{ - $each:['head_mystery_201609','armor_mystery_201609'] + $each:['head_mystery_201610','armor_mystery_201610'] } } }; diff --git a/test/common/fns/ultimateGear.js b/test/common/fns/ultimateGear.js index dc2b401e81..06530dd938 100644 --- a/test/common/fns/ultimateGear.js +++ b/test/common/fns/ultimateGear.js @@ -38,7 +38,8 @@ describe('shared.fns.ultimateGear', () => { expect(user.addNotification).to.be.calledWith('ULTIMATE_GEAR_ACHIEVEMENT'); }); - it('does not set armoirEnabled when gear is not owned', () => { + it('does not set armoireEnabled when gear is not owned', () => { + user.flags.armoireEnabled = false; let items = { gear: { owned: { diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201610/broad_armor_mystery_201610.png b/website/assets/sprites/spritesmith/gear/events/mystery_201610/broad_armor_mystery_201610.png new file mode 100644 index 0000000000..ba4023cf5d Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201610/broad_armor_mystery_201610.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201610/head_mystery_201610.png b/website/assets/sprites/spritesmith/gear/events/mystery_201610/head_mystery_201610.png new file mode 100644 index 0000000000..78e8845c8b Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201610/head_mystery_201610.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201610/shop_armor_mystery_201610.png b/website/assets/sprites/spritesmith/gear/events/mystery_201610/shop_armor_mystery_201610.png new file mode 100644 index 0000000000..88f2cba7d2 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201610/shop_armor_mystery_201610.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201610/shop_head_mystery_201610.png b/website/assets/sprites/spritesmith/gear/events/mystery_201610/shop_head_mystery_201610.png new file mode 100644 index 0000000000..b042b4a43b Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201610/shop_head_mystery_201610.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_201610/slim_armor_mystery_201610.png b/website/assets/sprites/spritesmith/gear/events/mystery_201610/slim_armor_mystery_201610.png new file mode 100644 index 0000000000..620602a2af Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_201610/slim_armor_mystery_201610.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_mystery_201610.png b/website/assets/sprites/spritesmith_large/promo/promo_mystery_201610.png new file mode 100644 index 0000000000..8b0ceb0f49 Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_mystery_201610.png differ diff --git a/website/common/locales/en/character.json b/website/common/locales/en/character.json index 3f59364752..2b6d54afb5 100644 --- a/website/common/locales/en/character.json +++ b/website/common/locales/en/character.json @@ -60,7 +60,7 @@ "useCostumeInfo2": "Once you click \"Use Costume\" your avatar will look pretty basic... but don't worry! If you look on the left, you'll see that your Battle Gear is still equipped. Next, you can make things fancy! Anything you equip on the right won't affect your stats, but can make you look super awesome. Try out different combos, mixing sets, and coordinating your Costume with your pets, mounts, and backgrounds.

Got more questions? Check out the Costume page on the wiki. Find the perfect ensemble? Show it off in the Costume Carnival guild or brag in the Tavern!", "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:", "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!", - "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.", + "armoireUnlocked": "For more equipment, check out the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.", "ultimGearName": "Ultimate Gear", "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:", "level": "Level", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 3dfe08111b..b21dad9575 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -113,6 +113,7 @@ "mysterySet201607": "Seafloor Rogue Set", "mysterySet201608": "Thunderstormer Set", "mysterySet201609": "Cow Costume Set", + "mysterySet201610": "Spectral Flame Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index 34256cabf6..a3524924a5 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -139,6 +139,12 @@ let armor = { mystery: '201609', value: 0, }, + 201610: { + text: t('armorMystery201610Text'), + notes: t('armorMystery201610Notes'), + mystery: '201610', + value: 0, + }, 301404: { text: t('armorMystery301404Text'), notes: t('armorMystery301404Notes'), @@ -364,6 +370,12 @@ let head = { mystery: '201609', value: 0, }, + 201610: { + text: t('headMystery201610Text'), + notes: t('headMystery201610Notes'), + mystery: '201610', + value: 0, + }, 301404: { text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), diff --git a/website/common/script/content/mystery-sets.js b/website/common/script/content/mystery-sets.js index 5c9b809a04..ca9cfaf679 100644 --- a/website/common/script/content/mystery-sets.js +++ b/website/common/script/content/mystery-sets.js @@ -130,6 +130,10 @@ let mysterySets = { start: '2016-09-22', end: '2016-10-02', }, + 201610: { + start: '2016-10-25', + end: '2016-11-02', + }, 301404: { start: '3014-03-24', end: '3014-04-02', diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index cec8d214df..1447fad50f 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -77,13 +77,7 @@ function _setUpNewUser (user) { let taskTypes; let iterableFlags = user.flags.toObject(); - // A/B Test 2016-09-26: Start with Armoire Enabled? - if (Math.random() < 0.5) { - user.flags.armoireEnabled = true; - user._ABtest = '20160926-armoireEnabled'; - } else { - user._ABtest = '20160926-armoireDisabled'; - } + user._ABtest = ''; if (user.registeredThrough === 'habitica-web' || user.registeredThrough === 'habitica-android') { taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag']; diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 5c7d45901e..d9c613b1e5 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -232,7 +232,7 @@ let schema = new Schema({ communityGuidelinesAccepted: {type: Boolean, default: false}, cronCount: {type: Number, default: 0}, welcomed: {type: Boolean, default: false}, - armoireEnabled: {type: Boolean, default: false}, + armoireEnabled: {type: Boolean, default: true}, armoireOpened: {type: Boolean, default: false}, armoireEmpty: {type: Boolean, default: false}, cardReceived: {type: Boolean, default: false}, diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 201e7dca06..871e7ce108 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,21 +1,38 @@ -h2 10/19/2016 - GOLD-PURCHASABLE QUEST LINE: TERROR IN THE TASKWOODS +h2 10/25/2016 - SPECTRAL FLAME ITEM SET AND ENCHANTED ARMOIRE CHANGES hr tr td - .promo_pyromancer.pull-right - h3 New Gold-Purchasable Quest Line - p There's a new set of gold-purchasable quests available in the Quest Shop: the Terror in the Taskwoods Quest Line! The wild orchards near the Flourishing Fields are ablaze, and this time Burnout isn't responsible. Can you help the Joyful Reaper douse the mysterious flames? If so, you'll earn the exclusive Pyromancer Armor Set. + .promo_backgrounds_armoire_201610.pull-left.slight-right-margin + .promo_mystery_201610.pull-right + h3 October Subscriber Items Revealed! + p The October Subscriber Item has been revealed: the Spectral Flame Item Set! You still have 6 days to subscribe and receive the item set. br - p As time goes on, we'll be adding more gold-purchasable quests. Terror in the Taskwoods is not a limited-edition quest line, so you have plenty of time to save up! - p.small.muted by SabreCat, Beffymaroo, and Lemoness - p.small.muted Written by liorsamuel and Lemoness - p.small.muted Art by Kiwibot, Beffymaroo, and bridgetteempress + 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 + h3 Enchanted Armoire Changes + p We have an exciting change to the Enchanted Armoire! We've received a lot of feedback about how motivating users find the random reward system, so the Enchanted Armoire will now be available to all users in the Reward Column, regardless of whether or not they've already unlocked the Ultimate Gear achievement. + br + p Every time you click on the Enchanted Armoire, you'll have a chance to earn a random piece of equipment, food, or experience. New equipment is added every month! Now go work hard on your tasks to collect it all. + p.small.muted by SabreCat if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 10/19/2016 - GOLD-PURCHASABLE QUEST LINE: TERROR IN THE TASKWOODS + tr + td + .promo_pyromancer.pull-right + h3 New Gold-Purchasable Quest Line + p There's a new set of gold-purchasable quests available in the Quest Shop: the Terror in the Taskwoods Quest Line! The wild orchards near the Flourishing Fields are ablaze, and this time Burnout isn't responsible. Can you help the Joyful Reaper douse the mysterious flames? If so, you'll earn the exclusive Pyromancer Armor Set. + br + p As time goes on, we'll be adding more gold-purchasable quests. Terror in the Taskwoods is not a limited-edition quest line, so you have plenty of time to save up! + p.small.muted by SabreCat, Beffymaroo, and Lemoness + p.small.muted Written by liorsamuel and Lemoness + p.small.muted Art by Kiwibot, Beffymaroo, and bridgetteempress h2 10/13/2016 - SPOOKY SPARKLES IN THE APPS AND CANTRAS BLOG SPOTLIGHT! tr td