From 4cb6783544b483865d008990e7e6f243e8339e52 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 17 Mar 2015 21:24:46 -0500 Subject: [PATCH] feat(quest): Bunny quest --- common/locales/en/content.json | 3 + common/locales/en/quests.json | 3 +- common/locales/en/questsContent.json | 9 ++- common/script/content.coffee | 65 ++++++++++++++++++- .../views/options/inventory/inventory.jade | 2 +- .../views/shared/modals/quest-rewards.jade | 3 + website/views/shared/new-stuff.jade | 48 ++++++++++---- 7 files changed, 116 insertions(+), 17 deletions(-) diff --git a/common/locales/en/content.json b/common/locales/en/content.json index c32c86ac82..7b574b6508 100644 --- a/common/locales/en/content.json +++ b/common/locales/en/content.json @@ -75,6 +75,9 @@ "questEggRockText": "Rock", "questEggRockAdjective": "lively", + "questEggBunnyText": "Bunny", + "questEggBunnyAdjective": "snuggly", + "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into a <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Base", diff --git a/common/locales/en/quests.json b/common/locales/en/quests.json index 55a59502a7..21f7315623 100644 --- a/common/locales/en/quests.json +++ b/common/locales/en/quests.json @@ -42,5 +42,6 @@ "doubleSureAbort": "Are you double sure? Make sure they won't hate you forever!", "questWarning": "If new players join the party before the quest starts, they will also receive an invitation. However once the quest has started, no new party members can join the quest.", "bossRageTitle": "Rage", - "bossRageDescription": "When this bar fills, the boss will unleash a special attack" + "bossRageDescription": "When this bar fills, the boss will unleash a special attack!", + "questEggUnlockText": "Unlocks purchasable <%= unlock %> eggs in the Market" } diff --git a/common/locales/en/questsContent.json b/common/locales/en/questsContent.json index f116b8aa18..fcbaf7dc3a 100644 --- a/common/locales/en/questsContent.json +++ b/common/locales/en/questsContent.json @@ -203,5 +203,12 @@ "questRockNotes": "Crossing Habitica's Meandering Mountains with some friends, you make camp one night in a beautiful cave laced with shining minerals. But when you wake up the next morning, the entrance has disappeared, and the floor of the cave is shifting underneath you.

\"The mountain's alive!\" shouts your companion @pfeffernusse. \"These aren't crystals - these are teeth!\"

@Painter de Cluster grabs your hand. \"We'll have to find another way out – stay with me and don't get distracted, or we could be trapped in here forever!\"", "questRockBoss": "Crystal Colossus", "questRockCompletion": "Your diligence has allowed you to find a safe path through the living mountain. Standing in the sunshine, your friend @intune notices something glinting on the ground by the cave’s exit. You stoop to pick it up, and see that it’s a small rock with a vein of gold running through it. Beside it are a number of other rocks with rather peculiar shapes. They almost look like… eggs?", - "questRockDropRockEgg": "Rock (Egg)" + "questRockDropRockEgg": "Rock (Egg)", + + "questBunnyText": "The Killer Bunny", + "questBunnyNotes": "After many difficult days, you reach the peak of Mount Procrastination and stand before the imposing doors of the Fortress of Neglect. You read the inscription in the stone. \"Inside resides the creature that embodies your greatest fears, the reason for your inaction. Knock and face your demon!\" You tremble, imagining the horror within and feel the urge to flee as you have done so many times before. @Draayder holds you back. \"Steady, my friend! The time has come at last. You must do this!\"

You knock and the doors swing inward. From within the gloom you hear a deafening roar, and you draw your weapon." + "questBunnyBoss": "Killer Bunny", + "questBunnyCompletion": "With one final blow the killer rabbit sinks to the ground. A sparkly mist rises from her body as she shrinks down into a tiny bunny… nothing like the cruel beast you faced a moment before. Her nose twitches adorably and she hops away, leaving some eggs behind. @Gully3 laughs. \"Mount Procrastination has a way of making even the smallest challenges seem insurmountable. Let’s gather these eggs and head for home.\"", + "questBunnyDropBunnyEgg": "Bunny (Egg)" + } diff --git a/common/script/content.coffee b/common/script/content.coffee index 08b41e97bb..6982fdf60d 100644 --- a/common/script/content.coffee +++ b/common/script/content.coffee @@ -802,6 +802,7 @@ api.questEggs = Penguin: text: t('questEggPenguinText'), adjective: t('questEggPenguinAdjective'), canBuy: false TRex: text: t('questEggTRexText'), adjective: t('questEggTRexAdjective'), canBuy: false Rock: text: t('questEggRockText'), adjective: t('questEggRockAdjective'), canBuy: false + Bunny: text: t('questEggBunnyText'), adjective: t('questEggBunnyAdjective'), canBuy: false _.each api.questEggs, (egg,key) -> _.defaults egg, @@ -1043,6 +1044,9 @@ api.quests = ] gp: 25 exp: 125 + unlock: + text: t('questEggUnlockText') + item: t('questEggGryphonText') hedgehog: text: t('questHedgehogText') @@ -1061,7 +1065,9 @@ api.quests = ] gp: 30 exp: 125 - + unlock: + text: t('questEggUnlockText') + item: t('questEggHedgehogText') ghost_stag: text: t('questGhostStagText') @@ -1080,6 +1086,9 @@ api.quests = ] gp: 80 exp: 800 + unlock: + text: t('questEggUnlockText') + item: t('questEggDeerText') vice1: @@ -1176,6 +1185,9 @@ api.quests = ] gp: 80 exp: 800 + unlock: + text: t('questEggUnlockText') + item: t('questEggRatText') octopus: text: t('questOctopusText') @@ -1194,6 +1206,9 @@ api.quests = ] gp: 80 exp: 800 + unlock: + text: t('questEggUnlockText') + item: t('questEggOctopusText') dilatory_derby: text: t('questSeahorseText') @@ -1212,6 +1227,9 @@ api.quests = ] gp: 25 exp: 125 + unlock: + text: t('questEggUnlockText') + item: t('questEggSeahorseText') atom1: text: t('questAtom1Text') @@ -1279,6 +1297,9 @@ api.quests = ] gp: 43 exp: 350 + unlock: + text: t('questEggUnlockText') + item: t('questEggParrotText') rooster: text: t('questRoosterText') @@ -1297,6 +1318,9 @@ api.quests = ] gp: 25 exp: 125 + unlock: + text: t('questEggUnlockText') + item: t('questEggRoosterText') spider: text: t('questSpiderText') @@ -1315,6 +1339,9 @@ api.quests = ] gp: 31 exp: 200 + unlock: + text: t('questEggUnlockText') + item: t('questEggSpiderText') moonstone1: text: t('questMoonstone1Text') @@ -1454,6 +1481,9 @@ api.quests = ] gp: 37 exp: 275 + unlock: + text: t('questEggUnlockText') + item: t('questEggOwlText') penguin: text: t('questPenguinText') @@ -1472,6 +1502,9 @@ api.quests = ] gp: 31 exp: 200 + unlock: + text: t('questEggUnlockText') + item: t('questEggPenguinText') trex: text: t('questTRexText') @@ -1490,6 +1523,9 @@ api.quests = ] gp: 55 exp: 500 + unlock: + text: t('questEggUnlockText') + item: t('questEggTRexText') trex_undead: text: t('questTRexUndeadText') @@ -1514,6 +1550,9 @@ api.quests = ] gp: 55 exp: 500 + unlock: + text: t('questEggUnlockText') + item: t('questEggTRexText') rock: text: t('questRockText') @@ -1532,6 +1571,30 @@ api.quests = ] gp: 31 exp: 200 + unlock: + text: t('questEggUnlockText') + item: t('questEggRockText') + + bunny: + text: t('questBunnyText') + notes: t('questBunnyNotes') + completion: t('questBunnyCompletion') + value: 4 + boss: + name: t('questBunnyBoss') + hp: 300 + str: 1.5 + drop: + items: [ + {type: 'eggs', key: 'Bunny', text: t('questBunnyDropBunnyEgg')} + {type: 'eggs', key: 'Bunny', text: t('questBunnyDropBunnyEgg')} + {type: 'eggs', key: 'Bunny', text: t('questBunnyDropBunnyEgg')} + ] + gp: 25 + exp: 125 + unlock: + text: t('questEggUnlockText') + item: t('questEggBunnyText') _.each api.quests, (v,key) -> _.defaults v, {key,canBuy:true} diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade index 5a024c6a54..cd6b656260 100644 --- a/website/views/options/inventory/inventory.jade +++ b/website/views/options/inventory/inventory.jade @@ -188,7 +188,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') | {{::egg.value}}  span.Pet_Currency_Gem1x.inline-gems //- buyable quest eggs - each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock'} + each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny'} div(ng-show='user.achievements.quests.#{quest} > 0') button.customize-option(popover='{{::Content.eggs.#{egg}.notes()}}', popover-title!=env.t("egg", {eggType: "{{::Content.eggs.#{egg}.text()}}"}), popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', ng-click='purchase("eggs", Content.eggs.#{egg})', class='Pet_Egg_#{egg}') p diff --git a/website/views/shared/modals/quest-rewards.jade b/website/views/shared/modals/quest-rewards.jade index f5dc816501..72fa63fb14 100644 --- a/website/views/shared/modals/quest-rewards.jade +++ b/website/views/shared/modals/quest-rewards.jade @@ -10,3 +10,6 @@ script(id='partials/options.social.party.quest-rewards.html', type='text/ng-temp tr td {{quest.drop.gp}} =env.t('gold') + tr + td {{quest.drop.unlock}} + =env.t('quest.drop.unlock.text()', {unlock: 'quest.drop.unlock.item'}) diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 2a67b15a76..354bd6e9a4 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,27 +1,49 @@ -h5 3/10/2015 - SURVEY, TESTIMONIALS GUILD, AND CHAT EXTENSION +h5 3/17/2015 - BUNNY PET QUEST, EGG PURCHASING CHANGE, LAST DAY FOR SURVEY AND ACHIEVEMENT, AND UNEQUIP BUTTONS hr tr td - h5 Survey and Achievement - .achievement.achievement-tree.pull-right - p We're giving out the rare Helped Habit Grow achievement to all users who help us out by completing this 10-question survey! If you already received this badge, taking this new survey will stack your achievement. Thanks for sparing a minute to let us know what you think about HabitRPG! + h5 New Pet Quest: Killer Bunny + p There's a new quest scroll in the Market! Deep within Mount Procrastination lies a once-sweet beast grown horrifying with neglect. Can you rally your strength to defeat the Killer Bunny? If so, you'll get some bunny eggs! + p.small.muted by Draayder, Gully3, and TetoIsGreat + tr + td + h5 Egg Purchasing Change + p You can now purchase quest eggs from the Market after defeating the corresponding boss at least once! Previously, you had to defeat the boss at least twice before being able to purchase the eggs. + p.small.muted by Blade + tr + td + h5 Last Day for Survey and Achievement + p March 18th is the final day to complete this survey to receive or stack the Helped Habit Grow survey! After it is closed, it will take us several days to award the badges. Thanks so much for sharing your feedback with us! p.small.muted by sugarfiend and SabreCat tr td - h5 Testimonials Guild - p We're collecting testimonials from users to display on the front page along with pictures of their avatars. If HabitRPG has been helpful to you and you feel comfortable leaving a short testimonial for us, you can post it here. Thanks for all your help! <3 - tr - td - h5 Chat Extension - p Horacious Moreau has made a chat extension for HabitRPG! It creates a chat box for Tavern, parties, and Guilds. :) - br - p The Chat Client is also open-source! You can check out the project here. - p.small.muted by Horacious Moreau + h5 Unequip Buttons + p It’s now easier to switch your avatar’s costume! You can now unequip all your battle gear, costume pieces, and/or pets from the Equipment page using the new Unequip buttons. + p.small.muted by TheHolidayInn hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h5 3/10/2015 - SURVEY, TESTIMONIALS GUILD, AND CHAT EXTENSION + hr + tr + td + h5 Survey and Achievement + .achievement.achievement-tree.pull-right + p We're giving out the rare Helped Habit Grow achievement to all users who help us out by completing this 10-question survey! If you already received this badge, taking this new survey will stack your achievement. Thanks for sparing a minute to let us know what you think about HabitRPG! + p.small.muted by sugarfiend and SabreCat + tr + td + h5 Testimonials Guild + p We're collecting testimonials from users to display on the front page along with pictures of their avatars. If HabitRPG has been helpful to you and you feel comfortable leaving a short testimonial for us, you can post it here. Thanks for all your help! <3 + tr + td + h5 Chat Extension + p Horacious Moreau has made a chat extension for HabitRPG! It creates a chat box for Tavern, parties, and Guilds. :) + br + p The Chat Client is also open-source! You can check out the project here. + p.small.muted by Horacious Moreau h5 3/3/2015 - MARCH BACKGROUNDS, ANDROID APP NOTIFICATIONS, AND MARCH MYSTERY BOX tr td