diff --git a/website/assets/sprites/spritesmith/backgrounds/background_shimmering_ice_prism.png b/website/assets/sprites/spritesmith/backgrounds/background_shimmering_ice_prism.png new file mode 100644 index 0000000000..a415d9475c Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_shimmering_ice_prism.png differ diff --git a/website/assets/sprites/spritesmith/backgrounds/background_winter_fireworks.png b/website/assets/sprites/spritesmith/backgrounds/background_winter_fireworks.png new file mode 100644 index 0000000000..4aabcfe67b Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_winter_fireworks.png differ diff --git a/website/assets/sprites/spritesmith/backgrounds/background_winter_storefront.png b/website/assets/sprites/spritesmith/backgrounds/background_winter_storefront.png new file mode 100644 index 0000000000..7eeeafeb59 Binary files /dev/null and b/website/assets/sprites/spritesmith/backgrounds/background_winter_storefront.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_woodElfArmor.png b/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_woodElfArmor.png new file mode 100644 index 0000000000..b5c27caad2 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/broad_armor_armoire_woodElfArmor.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/head_armoire_woodElfHelm.png b/website/assets/sprites/spritesmith/gear/armoire/head_armoire_woodElfHelm.png new file mode 100644 index 0000000000..3647b4181c Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/head_armoire_woodElfHelm.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_woodElfArmor.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_woodElfArmor.png new file mode 100644 index 0000000000..11667e1472 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_woodElfArmor.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_head_armoire_woodElfHelm.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_head_armoire_woodElfHelm.png new file mode 100644 index 0000000000..c3f58e7ac4 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_head_armoire_woodElfHelm.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_woodElfStaff.png b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_woodElfStaff.png new file mode 100644 index 0000000000..914b6af646 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_woodElfStaff.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_woodElfArmor.png b/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_woodElfArmor.png new file mode 100644 index 0000000000..8f03124215 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/slim_armor_armoire_woodElfArmor.png differ diff --git a/website/assets/sprites/spritesmith/gear/armoire/weapon_armoire_woodElfStaff.png b/website/assets/sprites/spritesmith/gear/armoire/weapon_armoire_woodElfStaff.png new file mode 100644 index 0000000000..762ebd7cbd Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armoire/weapon_armoire_woodElfStaff.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201612.png b/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201612.png new file mode 100644 index 0000000000..e44cb5b82c Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201612.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_contrib_spotlight_Keith.png b/website/assets/sprites/spritesmith_large/promo/promo_contrib_spotlight_Keith.png new file mode 100644 index 0000000000..c0e1ee4c0a Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_contrib_spotlight_Keith.png differ diff --git a/website/client-old/js/services/statServices.js b/website/client-old/js/services/statServices.js index b716dbcaf7..5be427b2a8 100644 --- a/website/client-old/js/services/statServices.js +++ b/website/client-old/js/services/statServices.js @@ -39,7 +39,7 @@ var gear = Content.gear.flat; var total = 0; - var equipmentTypes = ['weapon', 'armor', 'head', 'shield']; + var equipmentTypes = ['weapon', 'armor', 'head', 'shield', 'back', 'body']; _(equipmentTypes).each(function(type) { var equippedItem = equipped[type]; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index aa5029195a..2baeff713a 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -255,5 +255,13 @@ "backgroundRedText": "Red", "backgroundRedNotes": "A rad red backdrop.", "backgroundYellowText": "Yellow", - "backgroundYellowNotes": "A yummy yellow backdrop." + "backgroundYellowNotes": "A yummy yellow backdrop.", + + "backgrounds122016": "SET 31: Released December 2016", + "backgroundShimmeringIcePrismText": "Shimmering Ice Prisms", + "backgroundShimmeringIcePrismNotes": "Dance through the Shimmering Ice Prisms.", + "backgroundWinterFireworksText": "Winter Fireworks", + "backgroundWinterFireworksNotes": "Set off Winter Fireworks.", + "backgroundWinterStorefrontText": "Winter Shop", + "backgroundWinterStorefrontNotes": "Purchase presents from a Winter Shop." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 926138afe5..44954a9e41 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -251,6 +251,8 @@ "weaponArmoireVermilionArcherBowNotes": "Your arrow will fly like a shooting star from this brilliant red bow! Increases Strength by <%= str %>. Enchanted Armoire: Vermilion Archer Set (Item 1 of 3).", "weaponArmoireOgreClubText": "Ogre Club", "weaponArmoireOgreClubNotes": "This club was salvaged from an actual Ogre's lair. Increases Strength by <%= str %>. Enchanted Armoire: Ogre Outfit (Item 2 of 3).", + "weaponArmoireWoodElfStaffText": "Wood Elf Staff", + "weaponArmoireWoodElfStaffNotes": "Made from a fallen limb of an ancient tree, this staff will help you communicate with forest denizens great and small. Increases Intelligence by <%= int %>. Enchanted Armoire: Wood Elf Set (Item 3 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -531,6 +533,8 @@ "armorArmoireIronBlueArcherArmorNotes": "This armor will protect you from flying arrows on the battlefield! Increases Strength by <%= str %>. Enchanted Armoire: Iron Archer Set (Item 2 of 3).", "armorArmoireRedPartyDressText": "Red Party Dress", "armorArmoireRedPartyDressNotes": "You're strong, tough, smart, and so fashionable! Increases Strength, Constitution, and Intelligence by <%= attrs %> each. Enchanted Armoire: Red Hairbow Set (Item 2 of 2).", + "armorArmoireWoodElfArmorText": "Wood Elf Armor", + "armorArmoireWoodElfArmorNotes": "This armor of bark and leaves will serve as durable camoflage in the forest. Increases Perception by <%= per %>. Enchanted Armoire: Wood Elf Set (Item 2 of 3).", "headgear": "headgear", "headgearCapitalized": "Headgear", @@ -827,6 +831,8 @@ "headArmoireOgreMaskNotes": "Your enemies will run for the hills when they see an Ogre coming their way! Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Ogre Outfit (Item 1 of 3).", "headArmoireIronBlueArcherHelmText": "Iron Blue Archer Helm", "headArmoireIronBlueArcherHelmNotes": "Hard-headed? No, you're just well protected. Increases Constitution by <%= con %>. Enchanted Armoire: Iron Archer Set (Item 1 of 3).", + "headArmoireWoodElfHelmText": "Wood Elf Helm", + "headArmoireWoodElfHelmNotes": "This helm of leaves may look delicate, but it can protect you from inclement weather and dangerous foes. Increases Constitution by <%= con %>. Enchanted Armoire: Wood Elf Set (Item 1 of 3).", "offhand": "shield-hand item", "offhandCapitalized": "Shield-Hand Item", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index 49126face4..6d5576d29c 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -423,6 +423,20 @@ let backgrounds = { notes: t('backgroundWindyAutumnNotes'), }, }, + backgrounds122016: { + shimmering_ice_prism: { + text: t('backgroundShimmeringIcePrismText'), + notes: t('backgroundShimmeringIcePrismNotes'), + }, + winter_fireworks: { + text: t('backgroundWinterFireworksText'), + notes: t('backgroundWinterFireworksNotes'), + }, + winter_storefront: { + text: t('backgroundWinterStorefrontText'), + notes: t('backgroundWinterStorefrontNotes'), + }, + }, incentiveBackgrounds: { blue: { text: t('backgroundBlueText'), diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index b3af14a782..223b5f4e58 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -192,6 +192,14 @@ let armor = { set: 'redHairbow', canOwn: ownsItem('armor_armoire_redPartyDress'), }, + woodElfArmor: { + text: t('armorArmoireWoodElfArmorText'), + notes: t('armorArmoireWoodElfArmorNotes', { per: 12 }), + value: 100, + per: 12, + set: 'woodElf', + canOwn: ownsItem('armor_armoire_woodElfArmor'), + }, }; let eyewear = { @@ -456,6 +464,14 @@ let head = { set: 'blueArcher', canOwn: ownsItem('head_armoire_ironBlueArcherHelm'), }, + woodElfHelm: { + text: t('headArmoireWoodElfHelmText'), + notes: t('headArmoireWoodElfHelmNotes', { con: 12 }), + value: 100, + con: 12, + set: 'woodElf', + canOwn: ownsItem('head_armoire_woodElfHelm'), + }, }; let shield = { @@ -712,6 +728,14 @@ let weapon = { set: 'ogre', canOwn: ownsItem('weapon_armoire_ogreClub'), }, + woodElfStaff: { + text: t('weaponArmoireWoodElfStaffText'), + notes: t('weaponArmoireWoodElfStaffNotes', { int: 12 }), + value: 100, + int: 12, + set: 'woodElf', + canOwn: ownsItem('weapon_armoire_woodElfStaff'), + }, }; let armoireSet = { diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index cefad7a025..bc27af78fe 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,25 +1,59 @@ -h2 11/30/2016 - LAST CHANCE FOR NOVEMBER SUBSCRIBER ITEMS, AND HABITICA T-SHIRTS AND MUGS REMINDER +h2 12/1/2016 - NEW BACKGROUNDS AND ARMOIRE ITEMS, iOS UPDATE, TAKE THIS CHALLENGE, AND HABITICA STAFF MEMBER + .promo_backgrounds_armoire_201612.pull-right hr tr td - .promo_mystery_201611.pull-right - h3 Last Chance for Cornucopia Set - p Reminder: this is the final day to subscribe and receive the Cornucopia Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get! + h3 December Backgrounds and Armoire Items! + p We’ve added three new backgrounds to the Background Shop! Now your avatar can set off Winter Fireworks, purchase presents from a Winter Shop, and dance through the Shimmering Ice Prisms. br - p Thanks so much for your support! You help keep Habitica running. - p.small.muted by Lemoness + p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Wood Elf set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :) + p.small.muted by FirozTaverbi, Lilith of Alfheim, KusSv, ACE, and beffymaroo tr td - .promo_coffee_mug.pull-left.slight-right-margin - h3 Habitica T-Shirt and Mug Reminder - p In case you missed it, Habitica is currently running a Teespring campaign to sell Habitica T-shirts and mugs! It's only running until December 13th, so if you want to buy one, be sure to act fast. Thanks for supporting Habitica! - p.small.muted by redphoenix and Sara Olson + h3 New iOS Update + p We've released a new iOS update that includes check-in incentives! + br + p The update also focuses on stability, fixing the issue with Dailies refreshing and resolving several crashes. Be sure to download it now for a better Habitica experience! + br + p If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! Old reviews get hidden with each update, but if you go to the review section you can re-post them again with a single tap. We hope you enjoy the update! + p.small.muted by viirus + tr + td + .promo_takeThis_gear.pull-left.slight-right-margin + h3 New Take This Challenge + p The next Take This Challenge has launched, Hero's Triumph, with a focus on volunteering to help others. 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, "Keep Calm and Carry On!": grand prize winner Rone Filho, and runners-up smurffigueiredo12, spaceauddity, Анна Солопенко, YokiHan, and 淳. Plus, all participants in that Challenge have received a piece of the Take This item set. It is located in your Rewards column. Enjoy! + .promo_contrib_spotlight_Keith.pull-right + p.small.muted by Doctor B, the Take This team, Lemoness, and SabreCat + tr + td + h3 New Staff Member + p We're so excited to welcome a new staff member onto the team: our long-time contributor TheHollidayInn, aka Keith! Go congratulate him in the Tavern :) + p.small.muted by the Habitica Team if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 11/30/2016 - LAST CHANCE FOR NOVEMBER SUBSCRIBER ITEMS, AND HABITICA T-SHIRTS AND MUGS REMINDER + tr + td + .promo_mystery_201611.pull-right + h3 Last Chance for Cornucopia Set + p Reminder: this is the final day to subscribe and receive the Cornucopia 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 + tr + td + .promo_coffee_mug.pull-left.slight-right-margin + h3 Habitica T-Shirt and Mug Reminder + p In case you missed it, Habitica is currently running a Teespring campaign to sell Habitica T-shirts and mugs! It's only running until December 13th, so if you want to buy one, be sure to act fast. Thanks for supporting Habitica! + p.small.muted by redphoenix and Sara Olson h2 11/23/2016 - DAILY CHECK-IN INCENTIVES, AND HABITICA T-SHIRTS AND MUGS tr td