diff --git a/migrations/takeThis.js b/migrations/takeThis.js index 42d26570f0..c2a29fd7f3 100644 --- a/migrations/takeThis.js +++ b/migrations/takeThis.js @@ -1,4 +1,4 @@ -var migrationName = '20170201_takeThis.js'; // Update per month +var migrationName = '20170404_takeThis.js'; // Update per month var authorName = 'Sabe'; // in case script author needs to know when their ... var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done @@ -14,7 +14,7 @@ function processUsers(lastId) { // specify a query to limit the affected users (empty for all users): var query = { 'migration':{$ne:migrationName}, - 'challenges':{$in:['b1d436b5-c784-42e3-9b07-7072479a6f8e']} // Update per month + 'challenges':{$in:['630018a7-49ab-4e95-ac26-12417b746e1c']} // Update per month }; if (lastId) { diff --git a/website/assets/sprites/spritesmith/backgrounds/background_bug_covered_log.png b/website/assets/sprites/spritesmith/backgrounds/background_bug_covered_log.png new file mode 100644 index 0000000000..0b4789e317 Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_bug_covered_log.png differ diff --git a/website/assets/sprites/spritesmith/backgrounds/background_giant_birdhouse.png b/website/assets/sprites/spritesmith/backgrounds/background_giant_birdhouse.png new file mode 100644 index 0000000000..e1dc6d6543 Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_giant_birdhouse.png differ diff --git a/website/assets/sprites/spritesmith/backgrounds/background_mist_shrouded_mountain.png b/website/assets/sprites/spritesmith/backgrounds/background_mist_shrouded_mountain.png new file mode 100644 index 0000000000..7087abde86 Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_mist_shrouded_mountain.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_greenFestivalYukata.png b/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_greenFestivalYukata.png new file mode 100644 index 0000000000..e2af431f4b Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_greenFestivalYukata.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_festivalParasol.png b/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_festivalParasol.png new file mode 100644 index 0000000000..1647ce33ad Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_festivalParasol.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_greenFestivalYukata.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_greenFestivalYukata.png new file mode 100644 index 0000000000..7e2b5680a9 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_greenFestivalYukata.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_festivalParasol.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_festivalParasol.png new file mode 100644 index 0000000000..ccfb9b3e62 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_festivalParasol.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_festivalFirecracker.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_festivalFirecracker.png new file mode 100644 index 0000000000..96ed68f215 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_festivalFirecracker.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_greenFestivalYukata.png b/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_greenFestivalYukata.png new file mode 100644 index 0000000000..b3f97e934e Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_greenFestivalYukata.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/weapon_armoire_festivalFirecracker.png b/website/assets/sprites/spritesmith/gear/armoire/weapon_armoire_festivalFirecracker.png new file mode 100644 index 0000000000..79c48c0645 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/weapon_armoire_festivalFirecracker.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2017Healer.png b/website/assets/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2017Healer.png index 8060e37ad0..0d7c1b7e66 100644 Binary files a/website/assets/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2017Healer.png and b/website/assets/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2017Healer.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/spring/head_special_spring2017Healer.png b/website/assets/sprites/spritesmith/gear/events/spring/head_special_spring2017Healer.png index f5654de2bb..2ba2af639d 100644 Binary files a/website/assets/sprites/spritesmith/gear/events/spring/head_special_spring2017Healer.png and b/website/assets/sprites/spritesmith/gear/events/spring/head_special_spring2017Healer.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201704.png b/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201704.png new file mode 100644 index 0000000000..7a9390b930 Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201704.png differ diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index f21dd0a2a4..37c93f9271 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -289,5 +289,13 @@ "backgroundMeanderingCaveText": "Meandering Cave", "backgroundMeanderingCaveNotes": "Explore the Meandering Cave.", "backgroundMistiflyingCircusText": "Mistiflying Circus", - "backgroundMistiflyingCircusNotes": "Carouse in the Mistiflying Circus." + "backgroundMistiflyingCircusNotes": "Carouse in the Mistiflying Circus.", + + "backgrounds042017": "SET 35: Released April 2017", + "backgroundBugCoveredLogText": "Bug-Covered Log", + "backgroundBugCoveredLogNotes": "Investigate a Bug-Covered Log.", + "backgroundGiantBirdhouseText": "Giant Birdhouse", + "backgroundGiantBirdhouseNotes": "Perch in a Giant Birdhouse.", + "backgroundMistShroudedMountainText": "Mist-Shrouded Mountain", + "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index b216ba1cab..b7648d82de 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -279,6 +279,8 @@ "weaponArmoireWandOfHeartsNotes": "This wand sparkles with a warm red light. It will also grant your heart wisdom. Increases Intelligence by <%= int %>. Enchanted Armoire: Queen of Hearts Set (Item 3 of 3).", "weaponArmoireForestFungusStaffText": "Forest Fungus Staff", "weaponArmoireForestFungusStaffNotes": "Use this gnarled staff to work mycological magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.", + "weaponArmoireFestivalFirecrackerText": "Festival Firecracker", + "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -599,6 +601,8 @@ "armorArmoireGownOfHeartsNotes": "This gown has all the frills! But that's not all, it will also increase your heart's fortitude. Increases Constitution by <%= con %>. Enchanted Armoire: Queen of Hearts Set (Item 2 of 3).", "armorArmoireMushroomDruidArmorText": "Mushroom Druid Armor", "armorArmoireMushroomDruidArmorNotes": "This woody brown armor, capped with tiny mushrooms, will help you hear the whispers of forest life. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Mushroom Druid Set (Item 2 of 3).", + "armorArmoireGreenFestivalYukataText": "Green Festival Yukata", + "armorArmoireGreenFestivalYukataNotes": "This fine lightweight yukata will keep you cool while you enjoy any festive occasion. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Festival Attire Set (Item 1 of 3).", "headgear": "headgear", "headgearCapitalized": "Headgear", @@ -1109,6 +1113,8 @@ "shieldArmoireRedRoseNotes": "This deep red rose smells enchanting. It will also sharpen your understanding. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", "shieldArmoireMushroomDruidShieldText": "Mushroom Druid Shield", "shieldArmoireMushroomDruidShieldNotes": "Though made from a mushroom, there's nothing mushy about this tough shield! Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Mushroom Druid Set (Item 3 of 3).", + "shieldArmoireFestivalParasolText": "Festival Parasol", + "shieldArmoireFestivalParasolNotes": "This lightweight parasol will shield you from the glare--whether it's from the sun or from dark red Dailies! Increases Constitution by <%= con %>. Enchanted Armoire: Festival Attire Set (Item 2 of 3).", "back": "Back Accessory", "backBase0Text": "No Back Accessory", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index a2ab0fb2f4..8818536958 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -479,6 +479,20 @@ let backgrounds = { notes: t('backgroundMistiflyingCircusNotes'), }, }, + backgrounds042017: { + bug_covered_log: { + text: t('backgroundBugCoveredLogText'), + notes: t('backgroundBugCoveredLogNotes'), + }, + giant_birdhouse: { + text: t('backgroundGiantBirdhouseText'), + notes: t('backgroundGiantBirdhouseNotes'), + }, + mist_shrouded_mountain: { + text: t('backgroundMistShroudedMountainText'), + notes: t('backgroundMistShroudedMountainNotes'), + }, + }, incentiveBackgrounds: { violet: { text: t('backgroundVioletText'), diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 700d5d9503..07a4a223e0 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -226,6 +226,15 @@ let armor = { set: 'mushroomDruid', canOwn: ownsItem('armor_armoire_mushroomDruidArmor'), }, + greenFestivalYukata: { + text: t('armorArmoireGreenFestivalYukataText'), + notes: t('armorArmoireGreenFestivalYukataNotes', { attrs: 8 }), + value: 100, + con: 8, + per: 8, + set: 'festivalAttire', + canOwn: ownsItem('armor_armoire_greenFestivalYukata'), + }, }; let eyewear = { @@ -617,6 +626,14 @@ let shield = { set: 'mushroomDruid', canOwn: ownsItem('shield_armoire_mushroomDruidShield'), }, + festivalParasol: { + text: t('shieldArmoireFestivalParasolText'), + notes: t('shieldArmoireFestivalParasolNotes', { con: 8 }), + value: 100, + con: 8, + set: 'festivalAttire', + canOwn: ownsItem('shield_armoire_festivalParasol'), + }, }; let headAccessory = { @@ -829,6 +846,14 @@ let weapon = { per: 9, canOwn: ownsItem('weapon_armoire_forestFungusStaff'), }, + festivalFirecracker: { + text: t('weaponArmoireFestivalFirecrackerText'), + notes: t('weaponArmoireFestivalFirecrackerNotes', { per: 8 }), + value: 100, + per: 8, + set: 'festivalAttire', + canOwn: ownsItem('weapon_armoire_festivalFirecracker'), + }, }; let armoireSet = { diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index acf5b4b5db..d84b8a4a5c 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,25 +1,44 @@ -h2 4/1/2017 - THE APRIL FOOL'S DISTRACTION DISCOTHEQUE AND DAZZLE DANCE EMPORIUM +h2 4/4/2017 - APRIL BACKGROUNDS, ARMOIRE ITEMS, AND TAKE THIS CHALLENGE + .promo_backgrounds_armoire_201704.pull-right hr tr td - h3 Welcome to the Distraction Discotheque and Dazzle Dance Emporium! - p "It's a marvelous day, and I, Bailey the Town DJ, would like to warmly welcome you to the Distraction Discotheque and Dazzle Dance Emporium! This festive location was set up by the dashing, brilliant, and humble April Fool. It's entirely devoted to sparkly diversion -- and avoiding productivity at all costs! - tr - td - h3 Rad New NPCs! - p Be sure to check out all your favorite places on Habitica today to visit the Non-Player Characters, a set of ENTIRELY unique individuals, as I... er, they... have a grand time and dance the day away! - tr - td - h3 Party with the April Fool and Win Gems! - p You're going to have a wonderful time, not least of all because the April Fool, in his endless magnanimity, is making the time to party with every single one of you -- take a peek at your avatar! + h3 April Backgrounds and Armoire Items! + p We’ve added three new backgrounds to the Background Shop! Now your avatar can summit a Mist-Shrouded Mountain, investigate a Bug-Covered Log, and perch in a Giant Birdhouse. br - p For even more fun, check out the official Challenge posted especially for today! Share your avatar featuring that fantastic Fool on social media, and you'll have a chance to win gems. Now go boogie!" + p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Festival Attire set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :) + p.small.muted by CarolinaAsh, Katy133, James Danger, and AnnDeLune + tr + td + .promo_takeThis_gear.pull-left.slight-right-margin + h3 April Take This Challenge + p The next Take This Challenge has launched, "Check Your HP!," with a focus on tracking one's mood over time. Be sure to check it out to earn additional pieces of the Take This armor set! + br + p Take This is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness. + br + p Congratulations to the winners of the last Take This Challenge, "It's Dangerous to Go Alone": grand prize winner SuchARarity, and runners-up miketheguy101, TheRossGamer, B_Rud, Cj_Cesareo, and Jacob Da Jeweler! Plus, all participants in that Challenge have received a piece of the Take This item set, if they hadn't completed the set already. New set pieces appear in your Rewards column. Enjoy! + p.small.muted by Doctor B, the Take This team, Lemoness, and SabreCat if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 4/1/2017 - THE APRIL FOOL'S DISTRACTION DISCOTHEQUE AND DAZZLE DANCE EMPORIUM + tr + td + h3 Welcome to the Distraction Discotheque and Dazzle Dance Emporium! + p "It's a marvelous day, and I, Bailey the Town DJ, would like to warmly welcome you to the Distraction Discotheque and Dazzle Dance Emporium! This festive location was set up by the dashing, brilliant, and humble April Fool. It's entirely devoted to sparkly diversion -- and avoiding productivity at all costs! + tr + td + h3 Rad New NPCs! + p Be sure to check out all your favorite places on Habitica today to visit the Non-Player Characters, a set of ENTIRELY unique individuals, as I... er, they... have a grand time and dance the day away! + tr + td + h3 Party with the April Fool and Win Gems! + p You're going to have a wonderful time, not least of all because the April Fool, in his endless magnanimity, is making the time to party with every single one of you -- take a peek at your avatar! + br + p For even more fun, check out the official Challenge posted especially for today! Share your avatar featuring that fantastic Fool on social media, and you'll have a chance to win gems. Now go boogie!" h2 3/30/2017 - LAST CHANCE FOR SHIMMER ARMOR SET, AND... WHAT IS THE APRIL FOOL UP TO? tr td