diff --git a/website/assets/sprites/spritesmith/gear/armor/broad_armor_special_pyromancersRobes.png b/website/assets/sprites/spritesmith/gear/armor/broad_armor_special_pyromancersRobes.png new file mode 100644 index 0000000000..7f6e728425 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armor/broad_armor_special_pyromancersRobes.png differ diff --git a/website/assets/sprites/spritesmith/gear/armor/shop/shop_armor_special_pyromancersRobes.png b/website/assets/sprites/spritesmith/gear/armor/shop/shop_armor_special_pyromancersRobes.png new file mode 100644 index 0000000000..7ba601aeaf Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armor/shop/shop_armor_special_pyromancersRobes.png differ diff --git a/website/assets/sprites/spritesmith/gear/armor/slim_armor_special_pyromancersRobes.png b/website/assets/sprites/spritesmith/gear/armor/slim_armor_special_pyromancersRobes.png new file mode 100644 index 0000000000..54adcab846 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/armor/slim_armor_special_pyromancersRobes.png differ diff --git a/website/assets/sprites/spritesmith/gear/head/head_special_pyromancersTurban.png b/website/assets/sprites/spritesmith/gear/head/head_special_pyromancersTurban.png new file mode 100644 index 0000000000..b44316624d Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/head/head_special_pyromancersTurban.png differ diff --git a/website/assets/sprites/spritesmith/gear/head/shop/shop_head_special_pyromancersTurban.png b/website/assets/sprites/spritesmith/gear/head/shop/shop_head_special_pyromancersTurban.png new file mode 100644 index 0000000000..e79a414e52 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/head/shop/shop_head_special_pyromancersTurban.png differ diff --git a/website/assets/sprites/spritesmith/gear/weapon/shop/shop_weapon_special_taskwoodsLantern.png b/website/assets/sprites/spritesmith/gear/weapon/shop/shop_weapon_special_taskwoodsLantern.png new file mode 100644 index 0000000000..de82ae06e9 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/weapon/shop/shop_weapon_special_taskwoodsLantern.png differ diff --git a/website/assets/sprites/spritesmith/gear/weapon/weapon_special_taskwoodsLantern.png b/website/assets/sprites/spritesmith/gear/weapon/weapon_special_taskwoodsLantern.png new file mode 100644 index 0000000000..c20d665008 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/weapon/weapon_special_taskwoodsLantern.png differ diff --git a/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror1.png b/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror1.png new file mode 100644 index 0000000000..aa55a82422 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror1.png differ diff --git a/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror2.png b/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror2.png new file mode 100644 index 0000000000..baaef9d0f0 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror2.png differ diff --git a/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror3.png b/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror3.png new file mode 100644 index 0000000000..804a9cda38 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/bosses/quest_taskwoodsTerror3.png differ diff --git a/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_brownie.png b/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_brownie.png new file mode 100644 index 0000000000..eaf5ea2505 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_brownie.png differ diff --git a/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_dryad.png b/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_dryad.png new file mode 100644 index 0000000000..6699a7dcde Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_dryad.png differ diff --git a/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_pixie.png b/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_pixie.png new file mode 100644 index 0000000000..5a08e93fa4 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/items/quest_taskwoodsTerror2_pixie.png differ diff --git a/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror1.png b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror1.png new file mode 100644 index 0000000000..9919bb1dab Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror1.png differ diff --git a/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror2.png b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror2.png new file mode 100644 index 0000000000..f4addd3104 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror2.png differ diff --git a/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror2_locked.png b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror2_locked.png new file mode 100644 index 0000000000..90a0b8b366 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror2_locked.png differ diff --git a/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror3.png b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror3.png new file mode 100644 index 0000000000..7adeaf2263 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror3.png differ diff --git a/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror3_locked.png b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror3_locked.png new file mode 100644 index 0000000000..578ceee0ff Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_taskwoodsTerror3_locked.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_pyromancer.png b/website/assets/sprites/spritesmith_large/promo/promo_pyromancer.png new file mode 100644 index 0000000000..f7d95b1737 Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_pyromancer.png differ diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index 5a8cb953b1..b4d6bdc85e 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -420,7 +420,7 @@ "questTaskwoodsTerror1RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Fire Skull Swarm will heal 30% of its remaining health!", "questTaskwoodsTerror1RageEffect": "`Fire Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls swirl around you in a gout of flame!", "questTaskwoodsTerror1DropSkeletonPotion": "Skeleton Hatching Potion", - "questTaskwoodsTerror1DropCottonCandyBluePotion": "Red Hatching Potion", + "questTaskwoodsTerror1DropRedPotion": "Red Hatching Potion", "questTaskwoodsTerror1DropHeadgear": "Pyromancer's Turban (Headgear)", "questTaskwoodsTerror2Text": "Terror in the Taskwoods, Part 2: Finding the Flourishing Fairies", diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js index 87376bce69..1e4f261f32 100644 --- a/website/common/script/content/gear/sets/special/index.js +++ b/website/common/script/content/gear/sets/special/index.js @@ -20,6 +20,13 @@ let armor = { value: 130, canOwn: ownsItem('armor_special_finnedOceanicArmor'), }, + pyromancersRobes: { + text: t('armorSpecialPyromancersRobesText'), + notes: t('armorSpecialPyromancersRobesNotes', { con: 15 }), + con: 15, + value: 130, + canOwn: ownsItem('armor_special_pyromancersRobes'), + }, yeti: { event: EVENTS.winter, specialClass: 'warrior', @@ -588,6 +595,13 @@ let head = { value: 130, canOwn: ownsItem('head_special_fireCoralCirclet'), }, + pyromancersTurban: { + text: t('headSpecialPyromancersTurbanText'), + notes: t('headSpecialPyromancersTurbanNotes', { str: 15 }), + str: 15, + value: 130, + canOwn: ownsItem('head_special_pyromancersTurban'), + }, nye: { event: EVENTS.winter2016, text: t('headSpecialNyeText'), @@ -1530,6 +1544,15 @@ let weapon = { value: 130, canOwn: ownsItem('weapon_special_tridentOfCrashingTides'), }, + taskwoodsLantern: { + text: t('weaponSpecialTaskwoodsLanternText'), + notes: t('weaponSpecialTaskwoodsLanternNotes', { attrs: 15 }), + twoHanded: true, + per: 15, + int: 15, + value: 130, + canOwn: ownsItem('weapon_special_taskwoodsLantern'), + }, yeti: { event: EVENTS.winter, specialClass: 'warrior', diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 524c1fce51..3531d41df2 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -2464,6 +2464,115 @@ api.quests = { unlock: t('questBeetleUnlockText'), }, }, + taskwoodsTerror1: { + text: t('questTaskwoodsTerror1Text'), + notes: t('questTaskwoodsTerror1Notes'), + completion: t('questTaskwoodsTerror1Completion'), + value: 4, + goldValue: 200, + category: 'gold', + boss: { + name: t('questTaskwoodsTerror1Boss'), + hp: 500, + rage: { + title: t("questTaskwoodsTerror1RageTitle"), + description: t("questTaskwoodsTerror1RageDescription"), + value: 50, + healing: .3, + effect: t('questTaskwoodsTerror1RageEffect') + } + }, + drop: { + items: [ + { + type: 'hatchingPotions', + key: 'Skeleton', + text: t('questTaskwoodsTerror1DropSkeletonPotion') + }, { + type: 'hatchingPotions', + key: 'Red', + text: t('questTaskwoodsTerror1DropRedPotion') + }, { + type: 'gear', + key: "head_special_pyromancersTurban", + text: t('questTaskwoodsTerror1DropHeadgear') + } + ], + gp: 0, + exp: 500 + } + }, + taskwoodsTerror2: { + text: t('questTaskwoodsTerror2Text'), + notes: t('questTaskwoodsTerror2Notes'), + completion: t('questTaskwoodsTerror2Completion'), + previous: 'taskwoodsTerror1', + value: 4, + goldValue: 300, + category: 'gold', + collect: { + pixie: { + text: t('questTaskwoodsTerror2CollectPixies'), + count: 25 + }, + brownie: { + text: t('questTaskwoodsTerror2CollectBrownies'), + count: 15 + }, + dryad: { + text: t('questTaskwoodsTerror2CollectDryads'), + count: 10 + }, + }, + drop: { + items: [ + { + type: 'gear', + key: "armor_special_pyromancersRobes", + text: t('questTaskwoodsTerror2DropArmor') + } + ], + gp: 0, + exp: 75 + } + }, + taskwoodsTerror3: { + text: t('questTaskwoodsTerror3Text'), + notes: t('questTaskwoodsTerror3Notes'), + completion: t('questTaskwoodsTerror3Completion'), + previous: 'taskwoodsTerror2', + value: 4, + goldValue: 400, + category: 'gold', + boss: { + name: t('questTaskwoodsTerror3Boss'), + hp: 1000, + str: 2 + }, + drop: { + items: [ + { + type: 'food', + key: 'Strawberry', + text: t('questTaskwoodsTerror3DropStrawberry') + }, { + type: 'food', + key: 'Strawberry', + text: t('questTaskwoodsTerror3DropStrawberry') + }, { + type: 'food', + key: 'Strawberry', + text: t('questTaskwoodsTerror3DropStrawberry') + }, { + type: 'gear', + key: "weapon_special_taskwoodsLantern", + text: t('questTaskwoodsTerror3DropWeapon') + }, + ], + gp: 0, + exp: 650 + } + }, }; _.each(api.quests, function(v, key) { diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js index ee9a9be97f..2621817041 100644 --- a/website/common/script/libs/shops.js +++ b/website/common/script/libs/shops.js @@ -131,7 +131,7 @@ shops.getQuestShopCategories = function getQuestShopCategories (user, language) boss: quest.boss, collect: quest.collect, lvl: quest.lvl, - class: locked ? `inventory_quest_scroll_${quest.key}_locked` : `inventory_quest_scroll_${quest.key}`, + class: locked ? `inventory_quest_scroll_locked inventory_quest_scroll_${quest.key}_locked` : `inventory_quest_scroll inventory_quest_scroll_${quest.key}`, purchaseType: 'quests', }; }).value(); diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index e3722729c2..201e7dca06 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,27 +1,38 @@ -h2 10/13/2016 - SPOOKY SPARKLES IN THE APPS AND CANTRAS BLOG SPOTLIGHT! +h2 10/19/2016 - GOLD-PURCHASABLE QUEST LINE: TERROR IN THE TASKWOODS hr tr td - .promo_spooky_sparkles_fall_2016.pull-right - h3 New iOS + Android Update: Spooky Sparkles! - p We've released a new iOS update and a new Android update that include Spooky Sparkles! + .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 In fact, all transformation items now work on the apps. Plus, if you'd like to help Habitica stay alive and constantly updating, we've introduced some additional gem bundles that can be purchased via the apps. Thanks for your support! - 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! (On iOS, 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 and andrewlord1990 - tr - td - .promo_contrib_spotlight_cantras.pull-left.slight-right-margin - h3 Contributor Spotlight: Cantras! - p We've posted a new Contributor Spotlight on the blog! Check out our latest interview with Cantras, a longtime Moderator and Challenger, to learn more about how she uses Habitica. - p.small.muted by Cantras, Beffymaroo, and Lemoness + 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 if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 10/13/2016 - SPOOKY SPARKLES IN THE APPS AND CANTRAS BLOG SPOTLIGHT! + tr + td + .promo_spooky_sparkles_fall_2016.pull-right + h3 New iOS + Android Update: Spooky Sparkles! + p We've released a new iOS update and a new Android update that include Spooky Sparkles! + br + p In fact, all transformation items now work on the apps. Plus, if you'd like to help Habitica stay alive and constantly updating, we've introduced some additional gem bundles that can be purchased via the apps. Thanks for your support! + 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! (On iOS, 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 and andrewlord1990 + tr + td + .promo_contrib_spotlight_cantras.pull-left.slight-right-margin + h3 Contributor Spotlight: Cantras! + p We've posted a new Contributor Spotlight on the blog! Check out our latest interview with Cantras, a longtime Moderator and Challenger, to learn more about how she uses Habitica. + p.small.muted by Cantras, Beffymaroo, and Lemoness h2 10/11/2016 - BEETLE PETS, TOGGL GUEST POST, NEW MODERATORS, AND CHANGE TO CHAT MESSAGES tr td