diff --git a/common/img/sprites/spritesmith/quests/bosses/quest_turtle.png b/common/img/sprites/spritesmith/quests/bosses/quest_turtle.png new file mode 100644 index 0000000000..094557c832 Binary files /dev/null and b/common/img/sprites/spritesmith/quests/bosses/quest_turtle.png differ diff --git a/common/img/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_turtle.png b/common/img/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_turtle.png new file mode 100644 index 0000000000..5de1677987 Binary files /dev/null and b/common/img/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_turtle.png differ diff --git a/common/img/sprites/spritesmith/stable/eggs/Pet_Egg_Turtle.png b/common/img/sprites/spritesmith/stable/eggs/Pet_Egg_Turtle.png new file mode 100644 index 0000000000..05e5689246 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/eggs/Pet_Egg_Turtle.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Base.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Base.png new file mode 100644 index 0000000000..0569dabcbc Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-CottonCandyBlue.png new file mode 100644 index 0000000000..79ba9a3cdd Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-CottonCandyPink.png new file mode 100644 index 0000000000..d5bf8e2e46 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Desert.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Desert.png new file mode 100644 index 0000000000..ef0b60074c Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Golden.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Golden.png new file mode 100644 index 0000000000..0513520bb3 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Red.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Red.png new file mode 100644 index 0000000000..39ad92ddb3 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Shade.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Shade.png new file mode 100644 index 0000000000..42fdfe4ee5 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Skeleton.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Skeleton.png new file mode 100644 index 0000000000..9e75030c06 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-White.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-White.png new file mode 100644 index 0000000000..e93aa0e247 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-White.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Zombie.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Zombie.png new file mode 100644 index 0000000000..17157668f8 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Turtle-Zombie.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Base.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Base.png new file mode 100644 index 0000000000..1e8f2c5ce0 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-CottonCandyBlue.png new file mode 100644 index 0000000000..4968bf9780 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-CottonCandyPink.png new file mode 100644 index 0000000000..1ec79e2eef Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Desert.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Desert.png new file mode 100644 index 0000000000..9c08a02225 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Golden.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Golden.png new file mode 100644 index 0000000000..f699fd75d7 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Red.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Red.png new file mode 100644 index 0000000000..e88a9578fa Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Shade.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Shade.png new file mode 100644 index 0000000000..9166bdc30e Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Skeleton.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Skeleton.png new file mode 100644 index 0000000000..5d8b619bd7 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-White.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-White.png new file mode 100644 index 0000000000..28d5d9bf2e Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-White.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Zombie.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Zombie.png new file mode 100644 index 0000000000..3a61a8af00 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Turtle-Zombie.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Base.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Base.png new file mode 100644 index 0000000000..1e8f2c5ce0 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-CottonCandyBlue.png new file mode 100644 index 0000000000..4968bf9780 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-CottonCandyPink.png new file mode 100644 index 0000000000..1ec79e2eef Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Desert.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Desert.png new file mode 100644 index 0000000000..9c08a02225 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Golden.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Golden.png new file mode 100644 index 0000000000..f699fd75d7 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Red.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Red.png new file mode 100644 index 0000000000..e88a9578fa Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Shade.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Shade.png new file mode 100644 index 0000000000..9166bdc30e Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Skeleton.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Skeleton.png new file mode 100644 index 0000000000..5d8b619bd7 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-White.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-White.png new file mode 100644 index 0000000000..28d5d9bf2e Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-White.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Zombie.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Zombie.png new file mode 100644 index 0000000000..3a61a8af00 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Turtle-Zombie.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Base.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Base.png new file mode 100644 index 0000000000..3aab68efa1 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-CottonCandyBlue.png new file mode 100644 index 0000000000..e6a7b850a9 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-CottonCandyPink.png new file mode 100644 index 0000000000..c0e9c0a54b Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Desert.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Desert.png new file mode 100644 index 0000000000..8b6153d38b Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Golden.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Golden.png new file mode 100644 index 0000000000..02d1baacea Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Red.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Red.png new file mode 100644 index 0000000000..0631f9390e Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Shade.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Shade.png new file mode 100644 index 0000000000..db115fefca Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Skeleton.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Skeleton.png new file mode 100644 index 0000000000..2cbbf96c14 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-White.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-White.png new file mode 100644 index 0000000000..1c69d57579 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-White.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Zombie.png b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Zombie.png new file mode 100644 index 0000000000..e838662862 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Turtle-Zombie.png differ diff --git a/common/locales/en/content.json b/common/locales/en/content.json index 6d2926c980..7d252f3aed 100644 --- a/common/locales/en/content.json +++ b/common/locales/en/content.json @@ -171,6 +171,10 @@ "questEggAxolotlMountText": "Axolotl", "questEggAxolotlAdjective": "a little", + "questEggTurtleText": "Sea Turtle", + "questEggTurtleMountText": "Giant Sea Turtle", + "questEggTurtleAdjective": "a peaceful", + "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Base", diff --git a/common/locales/en/questsContent.json b/common/locales/en/questsContent.json index 9be78f5623..46e486e672 100644 --- a/common/locales/en/questsContent.json +++ b/common/locales/en/questsContent.json @@ -382,5 +382,12 @@ "questAxolotlUnlockText": "Unlocks purchasable Axolotl eggs in the Market", "questAxolotlRageTitle": "Axolotl Regeneration", "questAxolotlRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Magical Axolotl will heal 30% of its remaining health!", - "questAxolotlRageEffect": "`Magical Axolotl uses AXOLOTL REGENERATION!`\n\nA curtain of colorful bubbles obscures the monster for a moment, and when it clears, some of its wounds have vanished!" + "questAxolotlRageEffect": "`Magical Axolotl uses AXOLOTL REGENERATION!`\n\nA curtain of colorful bubbles obscures the monster for a moment, and when it clears, some of its wounds have vanished!", + + "questTurtleText": "Guide the Turtle", + "questTurtleNotes": "Help! This giant sea turtle cannot find her way to her nesting beach. She returns there every year to lay her eggs, but this year Inkomplete Bay is filled with toxic Task Flotsam made of red dailies and unchecked to-dos. \"She's thrashing in a panic!\" @JessicaChase says.

@UncommonCriminal nods. \"It's because her guiding senses are fogged and confused.\"

@Scarabsi grabs your arm. \"Can you help clear the Task Flotsam blocking her path? It may be hazardous, but we have to help her!\"", + "questTurtleCompletion": "Your valiant work has cleared the waters for our sea turtle to find her beach. You, @Bambin, and @JaizakAripaik watch as she buries her brood of eggs deep in the sand so they can grow and hatch into hundreds of little sea turtles. Ever the lady, she gives you three eggs each, asking that you feed and nurture them so one day they become big sea turtles themselves.", + "questTurtleBoss": "Task Flotsam", + "questTurtleDropTurtleEgg": "Turtle (Egg)", + "questTurtleUnlockText": "Unlocks purchasable Turtle eggs in the Market" } diff --git a/common/script/content/index.js b/common/script/content/index.js index 22485ae30a..c9c9c321e7 100644 --- a/common/script/content/index.js +++ b/common/script/content/index.js @@ -401,6 +401,13 @@ api.questEggs = { return u.achievements.quests && (u.achievements.quests.axolotl != null) > 0; }), }, + Turtle: { + text: t('questEggTurtleText'), + adjective: t('questEggTurtleAdjective'), + canBuy: (function(u) { + return u.achievements.quests && (u.achievements.quests.turtle != null) > 0; + }), + }, }; _.each(api.questEggs, function(egg, key) { @@ -2750,6 +2757,38 @@ api.quests = { unlock: t('questAxolotlUnlockText'), }, }, + turtle: { + text: t('questTurtleText'), + notes: t('questTurtleNotes'), + completion: t('questTurtleCompletion'), + value: 4, + category: 'pet', + boss: { + name: t('questTurtleBoss'), + hp: 300, + str: 1.5, + }, + drop: { + items: [ + { + type: 'eggs', + key: 'Turtle', + text: t('questTurtleDropTurtleEgg'), + }, { + type: 'eggs', + key: 'Turtle', + text: t('questTurtleDropTurtleEgg'), + }, { + type: 'eggs', + key: 'Turtle', + text: t('questTurtleDropTurtleEgg'), + } + ], + gp: 25, + exp: 125, + unlock: t('questTurtleUnlockText'), + }, + }, }; _.each(api.quests, function(v, key) { diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 1684723b04..e3f73f1c98 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,29 +1,37 @@ -h2 7/7/2016 - ONGOING TAKE THIS CHALLENGE, NEW BLOG POST, AND CHALLENGE SPOTLIGHT +h2 7/12/2016 - NEW PET QUEST: GUIDE THE TURTLE hr tr td - h3 Ongoing Take This Challenge: Convention Health - p A new ongoing Challenge has been created by our friends at Take This: Playing the Long Con! It's designed to help keep you healthy during convention season. - br - p Unlike the Monthly Take This Challenge, this Challenge doesn't have any prizes or equipment associated with it, but is designed so that you can join it and leave it multiple times a year, as needed. Enjoy! - p.small.muted by DoctorB, Lemoness, and the Take This Team - tr - td - h3 New Blog Posts and July Challenge Spotlight - p There are two new posts on the Habitica blog! - br - p First, we've featured a new Wiki article about how to make Habitica work better for you. Check it out for some great tips. - br - p Plus, the July Challenge Spotlight is up! Check it out for some great Challenges. - br - p Have you made a Challenge that you think deserves to be in the spotlight? Submit it to be featured on our blog! Any Challenge with a Gem prize and a concrete end date is eligible. And feel free to tell us what you think about this month's spotlight in the comments, or on Twitter, Facebook, or Tumblr. Enjoy! - p.small.muted by Lemoness and Redphoenix + .Pet-Turtle-Base.pull-left.slight-right-margin + h3 July Pet Quest: Guide the Turtle! + p The giant sea turtle can't reach the beach because there's too much Task Flotsam in the way! Can you clear a path for her? If so, you'll earn a batch of Turtle Eggs! Get the quest scroll from the Quest Shop now. + p.small.muted Art by Jessica Chase, Uncommon Criminal, Bambin, Scarabsi, JaizakAripaik, and Sungabraverday + p.small.muted Writing by Ginger_Hanna if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 7/7/2016 - ONGOING TAKE THIS CHALLENGE, NEW BLOG POST, AND CHALLENGE SPOTLIGHT + tr + td + h3 Ongoing Take This Challenge: Convention Health + p A new ongoing Challenge has been created by our friends at Take This: Playing the Long Con! It's designed to help keep you healthy during convention season. + br + p Unlike the Monthly Take This Challenge, this Challenge doesn't have any prizes or equipment associated with it, but is designed so that you can join it and leave it multiple times a year, as needed. Enjoy! + p.small.muted by DoctorB, Lemoness, and the Take This Team + tr + td + h3 New Blog Posts and July Challenge Spotlight + p There are two new posts on the Habitica blog! + br + p First, we've featured a new Wiki article about how to make Habitica work better for you. Check it out for some great tips. + br + p Plus, the July Challenge Spotlight is up! Check it out for some great Challenges. + br + p Have you made a Challenge that you think deserves to be in the spotlight? Submit it to be featured on our blog! Any Challenge with a Gem prize and a concrete end date is eligible. And feel free to tell us what you think about this month's spotlight in the comments, or on Twitter, Facebook, or Tumblr. Enjoy! + p.small.muted by Lemoness and Redphoenix h2 7/5/2016 - JULY BACKGROUNDS AND ARMOIRE ITEMS REVEALED! .promo_backgrounds_armoire_201607.pull-right tr