diff --git a/website/assets/sprites/spritesmith/backgrounds/background_giant_seashell.png b/website/assets/sprites/spritesmith/backgrounds/background_giant_seashell.png new file mode 100644 index 0000000000..2ad44b9267 Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_giant_seashell.png differ diff --git a/website/assets/sprites/spritesmith/backgrounds/background_kelp_forest.png b/website/assets/sprites/spritesmith/backgrounds/background_kelp_forest.png new file mode 100644 index 0000000000..aff9b36c5e Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_kelp_forest.png differ diff --git a/website/assets/sprites/spritesmith/backgrounds/background_midnight_lake.png b/website/assets/sprites/spritesmith/backgrounds/background_midnight_lake.png new file mode 100644 index 0000000000..499d81682a Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_midnight_lake.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_swanDancerTutu.png b/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_swanDancerTutu.png new file mode 100644 index 0000000000..16c93fd1e4 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_swanDancerTutu.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/head_armoire_swanFeatherCrown.png b/website/assets/sprites/spritesmith/gear/armoire/head_armoire_swanFeatherCrown.png new file mode 100644 index 0000000000..f1afce7417 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/head_armoire_swanFeatherCrown.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_goldenBaton.png b/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_goldenBaton.png new file mode 100644 index 0000000000..9cfc0657c5 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_goldenBaton.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_swanFeatherFan.png b/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_swanFeatherFan.png new file mode 100644 index 0000000000..7ee0c7142b Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shield_armoire_swanFeatherFan.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_swanDancerTutu.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_swanDancerTutu.png new file mode 100644 index 0000000000..a813dcb245 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_swanDancerTutu.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_head_armoire_swanFeatherCrown.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_head_armoire_swanFeatherCrown.png new file mode 100644 index 0000000000..320c9604a3 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_head_armoire_swanFeatherCrown.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_goldenBaton.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_goldenBaton.png new file mode 100644 index 0000000000..932a8e6b66 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_goldenBaton.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_swanFeatherFan.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_swanFeatherFan.png new file mode 100644 index 0000000000..f09cd23337 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_swanFeatherFan.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_swanDancerTutu.png b/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_swanDancerTutu.png new file mode 100644 index 0000000000..b31255db4d Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_swanDancerTutu.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201707.png b/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201707.png new file mode 100644 index 0000000000..aff0f6bb72 Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201707.png differ diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 8db1e55d98..1c3b566577 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -313,5 +313,13 @@ "backgroundOceanSunriseText": "Ocean Sunrise", "backgroundOceanSunriseNotes": "Admire an Ocean Sunrise.", "backgroundSandcastleText": "Sandcastle", - "backgroundSandcastleNotes": "Rule over a Sandcastle." + "backgroundSandcastleNotes": "Rule over a Sandcastle.", + + "backgrounds072017": "SET 38: Released July 2017", + "backgroundGiantSeashellText": "Giant Seashell", + "backgroundGiantSeashellNotes": "Lounge in a Giant Seashell.", + "backgroundKelpForestText": "Kelp Forest", + "backgroundKelpForestNotes": "Swim through a Kelp Forest.", + "backgroundMidnightLakeText": "Midnight Lake", + "backgroundMidnightLakeNotes": "Rest by a Midnight Lake." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 7e1bcb0576..763295d934 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -653,6 +653,8 @@ "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).", "armorArmoireVikingTunicText": "Viking Tunic", "armorArmoireVikingTunicNotes": "This warm woolen tunic includes a cloak for extra coziness even in ocean gales. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Viking Set (Item 1 of 3).", + "armorArmoireSwanDancerTutuText": "Swan Dancer Tutu", + "armorArmoireSwanDancerTutuNotes": "You just might fly away into the air as you spin in this gorgeous feathered tutu. Increases Intelligence and Strength by <%= attrs %> each. Enchanted Armoire: Swan Dancer Set (Item 2 of 3).", "headgear": "headgear", "headgearCapitalized": "Headgear", @@ -1018,6 +1020,8 @@ "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).", "headArmoireVikingHelmText": "Viking Helm", "headArmoireVikingHelmNotes": "No horns or wings are found on this helm: those are too easy for enemies to grab! Increases Strength by <%= str %> and Perception by <%= per %>. Enchanted Armoire: Viking Set (Item 2 of 3).", + "headArmoireSwanFeatherCrownText": "Swan Feather Crown", + "headArmoireSwanFeatherCrownNotes": "This tiara is lovely and light as a swan's feather! Increases Intelligence by <%= int %>. Enchanted Armoire: Swan Dancer Set (Item 1 of 3).", "offhand": "shield-hand item", "offhandCapitalized": "Shield-Hand Item", @@ -1208,6 +1212,10 @@ "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).", "shieldArmoireVikingShieldText": "Viking Shield", "shieldArmoireVikingShieldNotes": "This sturdy shield of wood and hide can stand up to the most daunting of foes. Increases Perception by <%= per %> and Intelligence by <%= int %>. Enchanted Armoire: Viking Set (Item 3 of 3).", + "shieldArmoireSwanFeatherFanText": "Swan Feather Fan", + "shieldArmoireSwanFeatherFanNotes": "Use this fan to accentuate your movement as you dance like a graceful swan. Increases Strength by <%= str %>. Enchanted Armoire: Swan Dancer Set (Item 3 of 3).", + "shieldArmoireGoldenBatonText": "Golden Baton", + "shieldArmoireGoldenBatonNotes": "When you dance into battle waving this baton to the beat, you are unstoppable! Increases Intelligence and Strength by <%= attrs %> each. Enchanted Armoire: Independent Item.", "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 83bbedf69f..b3f1b422fb 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -521,6 +521,20 @@ let backgrounds = { notes: t('backgroundSandcastleNotes'), }, }, + backgrounds072017: { + giant_seashell: { + text: t('backgroundGiantSeashellText'), + notes: t('backgroundGiantSeashellNotes'), + }, + kelp_forest: { + text: t('backgroundKelpForestText'), + notes: t('backgroundKelpForestNotes'), + }, + midnight_lake: { + text: t('backgroundMidnightLakeText'), + notes: t('backgroundMidnightLakeNotes'), + }, + }, 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 05d37e3435..cc1177c91b 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -252,6 +252,15 @@ let armor = { set: 'viking', canOwn: ownsItem('armor_armoire_vikingTunic'), }, + swanDancerTutu: { + text: t('armorArmoireSwanDancerTutuText'), + notes: t('armorArmoireSwanDancerTutuNotes', { attrs: 8 }), + value: 100, + int: 8, + str: 8, + set: 'swanDancer', + canOwn: ownsItem('armor_armoire_swanDancerTutu'), + }, }; let eyewear = { @@ -568,6 +577,14 @@ let head = { set: 'viking', canOwn: ownsItem('head_armoire_vikingHelm'), }, + swanFeatherCrown: { + text: t('headArmoireSwanFeatherCrownText'), + notes: t('headArmoireSwanFeatherCrownNotes', { int: 8 }), + value: 100, + int: 8, + set: 'swanDancer', + canOwn: ownsItem('head_armoire_swanFeatherCrown'), + }, }; let shield = { @@ -678,6 +695,22 @@ let shield = { set: 'viking', canOwn: ownsItem('shield_armoire_vikingShield'), }, + swanFeatherFan: { + text: t('shieldArmoireSwanFeatherFanText'), + notes: t('shieldArmoireSwanFeatherFanNotes', { str: 8 }), + value: 100, + str: 8, + set: 'swanDancer', + canOwn: ownsItem('shield_armoire_swanFeatherFan'), + }, + goldenBaton: { + text: t('shieldArmoireGoldenBatonText'), + notes: t('shieldArmoireGoldenBatonNotes', { attrs: 4 }), + value: 100, + int: 4, + str: 4, + canOwn: ownsItem('shield_armoire_goldenBaton'), + }, }; let headAccessory = { diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index f5c6888394..8c443ac564 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,27 +1,46 @@ -.promo_aquatic_potions.pull-right -h2 6/29/2017 - AQUATIC HATCHING POTIONS AND LAST CHANCE FOR JUNE SUBSCRIBER ITEMS +.promo_backgrounds_armoire_201707.pull-right +h2 7/3/2017 - JULY BACKGROUNDS, ARMOIRE ITEMS, AND TAKE THIS CHALLENGE hr tr td - 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! + h3 July Backgrounds and Armoire Items! + p We’ve added three new backgrounds to the Background Shop! Now your avatar can lounge in a Seashell, swim through a Kelp Forest, and rest by a Midnight Lake. 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 + p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Swan Dancer. Better work hard on your real-life tasks to earn all the pieces! Enjoy :) + p.small.muted by Manostion, Lilith of Alfheim, Reesachan, and AnnDeLune 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! + .promo_takeThis_gear.pull-left.slight-right-margin + h3 New Take This Challenge! + p The next Take This Challenge has launched, "Test Thy Courage!", with a focus on positive social interactions. Be sure to check it out to earn additional pieces of the Take This armor set! br - p Thanks so much for your support! You help keep Habitica running. - p.small.muted by Lemoness + 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, "I Am the Night!": grand prize winner Chandramani Adil, and runners-up racherinh, auburntouch, lavraiedre, celedine, and 长颈鹿的尾巴. Plus, all participants in that Challenge have received a piece of the Take This item set if they hadn't already completed it. It is located 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 6/29/2017 - AQUATIC HATCHING POTIONS AND LAST CHANCE FOR JUNE SUBSCRIBER ITEMS + .promo_aquatic_potions.pull-right + tr + td + 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 h2 6/27/2017 - GUILD SPOTLIGHT: OUTDOOR HOBBIES tr td