Merge pull request #6072 from HabitRPG/sabrecat/pets-201510

Pet Quest for October 2015

common/locales/en/content.json

@@ -135,6 +135,10 @@
   "questEggHorseMountText": "Horse",
   "questEggHorseAdjective": "a galloping",
 
+  "questEggFrogText": "Frog",
+  "questEggFrogMountText": "Frog",
+  "questEggFrogAdjective": "a princely",
+
   "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
 
   "hatchingPotionBase": "Base",

common/locales/en/groups.json

@@ -3,6 +3,7 @@
     "innCheckOut": "Check Out of Inn",
     "innCheckIn": "Rest in the Inn",
     "innText": "You're resting in the Inn! While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day. Be warned: If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies unless they are also in the Inn! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
+    "innTextBroken": "You're resting in the Inn, I guess... While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day...  If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies... unless they are also in the Inn... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn... so tired...",
     "lfgPosts": "Looking for Group (Party Wanted) Posts",
     "tutorial": "Tutorial",
     "glossary": "Glossary",

common/locales/en/limited.json

@@ -30,6 +30,7 @@
     "seasonalShopText": "Welcome to the Seasonal Shop!! We're stocking springtime <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Spring Fling event each year, but we're only open until April 30th, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
     "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
     "seasonalShopFallText": "Welcome to the Seasonal Shop!! We're stocking autumn <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
+    "seasonalShopFallTextBroken": "Oh.... Welcome to the Seasonal Shop... We're stocking autumn Seasonal Edition goodies, or something... Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31... I guess you should to stock up now, or you'll have to wait... and wait... and wait... <strong>*sigh*</strong>",
     "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",
     "candycaneSet": "Candy Cane (Mage)",
     "skiSet": "Ski-sassin (Rogue)",

common/locales/en/npc.json

@@ -7,6 +7,8 @@
     "daniel": "Daniel",
     "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
     "danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
+    "danielTextBroken": "Welcome to the Tavern... I guess... If you need to rest, I'll set you up at the Inn... While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off... if you have the energy...",
+    "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
     "alexander": "Alexander the Merchant",
     "welcomeMarket": "Welcome to the Market! Buy hard-to-find eggs and potions! Sell your extras! Commission useful services! Come see what we have to offer.",
     "sellForGold": "Sell <%= item %> for <%= gold %> Gold",

common/locales/en/questsContent.json

@@ -304,5 +304,13 @@
   "questBurnoutDropPhoenixMount": "Phoenix (Mount)",
   "questBurnoutBossRageQuests": "`Burnout uses EXHAUST STRIKE!`\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and now Burnout is inflamed with energy! With a crackling snarl, it engulfs Ian the Quest Master in a surge of spectral fire. As fallen quest scrolls smolder, the smoke clears, and you see that Ian has been drained of energy and turned into a drifting Exhaust Spirit!\n\nOnly defeating Burnout can break the spell and restore our beloved Quest Master. Let's keep our Dailies in check and defeat this monster before it attacks again!",
   "questBurnoutBossRageSeasonalShop": "`Burnout uses EXHAUST STRIKE!`\n\nAhh!!! Our incomplete Dailies have fed the flames of Burnout, and now it has enough energy to strike again! It lets loose a gout of spectral flame that sears the Seasonal Shop. You're horrified to see that the cheery Seasonal Sorceress has been transformed into a drooping Exhaust Spirit.\n\nWe have to rescue our NPCs! Hurry, Habiticans, complete your tasks and defeat Burnout before it strikes for a third time!",
-  "questBurnoutBossRageTavern": "`Burnout uses EXHAUST STRIKE!`\n\nMany Habiticans have been hiding from Burnout in the Tavern, but no longer! With a screeching howl, Burnout rakes the Tavern with its white-hot hands. As the Tavern patrons flee, Daniel is caught in Burnout's grip, and transforms into an Exhaust Spirit right in front of you!\n\nThis hot-headed horror has gone on for too long. Don't give up... we're so close to vanquishing Burnout for once and for all!"
+  "questBurnoutBossRageTavern": "`Burnout uses EXHAUST STRIKE!`\n\nMany Habiticans have been hiding from Burnout in the Tavern, but no longer! With a screeching howl, Burnout rakes the Tavern with its white-hot hands. As the Tavern patrons flee, Daniel is caught in Burnout's grip, and transforms into an Exhaust Spirit right in front of you!\n\nThis hot-headed horror has gone on for too long. Don't give up... we're so close to vanquishing Burnout for once and for all!",
+
+  "questFrogText": "Swamp of the Clutter Frog",
+  "questFrogNotes": "As you and your friends are slogging through the Swamps of Stagnation, @starsystemic points at a large sign. \"Stay on the path -- if you can.\"<br><br>\"Surely that isn't hard!\" @RosemonkeyCT says. \"It's broad and clear.\"<br><br>But as you continue, you notice that path is gradually overtaken by the muck of the swamp, laced with bits of strange blue debris and clutter, until it's impossible to proceed.<br><br>As you look around, wondering how it got this messy, @Jon Arjinborn shouts, \"Look out!\" An angry frog leaps from the sludge, clad in dirty laundry and lit by blue fire. You will have to overcome this poisonous Clutter Frog to progress!",
+  "questFrogCompletion": "The frog cowers back into the muck, defeated. As it slinks away, the blue slime fades, leaving the way ahead clear.<br><br>Sitting in the middle of the path are three pristine eggs. \"You can even see the tiny tadpoles and through the clear casing!\" @Breadstrings says. \"Here, you should take them.\"",
+  "questFrogBoss": "Clutter Frog",
+  "questFrogDropFrogEgg": "Frog (Egg)",
+  "questFrogUnlockText": "Unlocks purchasable Frog eggs in the Market"
+
 }

common/script/content/index.coffee

@@ -1121,6 +1121,7 @@ api.questEggs =
   Whale:            text: t('questEggWhaleText'), adjective: t('questEggWhaleAdjective'), canBuy: ((u)-> u.achievements.quests && u.achievements.quests.whale? > 0)
   Cheetah:          text: t('questEggCheetahText'), adjective: t('questEggCheetahAdjective'), canBuy: ((u)-> u.achievements.quests && u.achievements.quests.cheetah? > 0)
   Horse:            text: t('questEggHorseText'), adjective: t('questEggHorseAdjective'), canBuy: ((u)-> u.achievements.quests && u.achievements.quests.horse? > 0)
+  Frog:             text: t('questEggFrogText'), adjective: t('questEggFrogAdjective'), canBuy: ((u)-> u.achievements.quests && u.achievements.quests.frog? > 0)
 
 _.each api.questEggs, (egg,key) ->
   _.defaults egg,
@@ -2179,6 +2180,26 @@ api.quests =
       exp: 275
       unlock: t('questHorseUnlockText')
 
+  frog:
+    text: t('questFrogText')
+    notes: t('questFrogNotes')
+    completion: t('questFrogCompletion')
+    value: 4
+    category: 'pet'
+    boss:
+      name: t('questFrogBoss')
+      hp: 300
+      str: 1.5
+    drop:
+      items: [
+        {type: 'eggs', key: 'Frog', text: t('questFrogDropFrogEgg')}
+        {type: 'eggs', key: 'Frog', text: t('questFrogDropFrogEgg')}
+        {type: 'eggs', key: 'Frog', text: t('questFrogDropFrogEgg')}
+      ]
+      gp: 25
+      exp: 125
+      unlock: t('questFrogUnlockText')
+
 _.each api.quests, (v,key) ->
   _.defaults v, {key,canBuy:(()->true)}
   b = v.boss

common/script/src/content/eggs/quest.js

@@ -22,6 +22,7 @@ const QUEST_EGGS = [
   'Whale',
   'Cheetah',
   'Horse',
+  'Frog'
 ];
 
 let eggDefaults = {

common/script/src/content/quests/pet.js

@@ -325,6 +325,16 @@ let petQuests = {
       gp: 37,
       exp: 275,
     }
+  },
+  frog: {
+    boss: {
+      hp: 300,
+      str: 1.5
+    },
+    drop: {
+      gp: 25,
+      exp: 125,
+    }
   }
 };
 

website/views/options/inventory/seasonal-shop.jade

@@ -5,7 +5,8 @@
       .arrow.hidden-xs
       h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
       .popover-content
-        p!=env.t('seasonalShopFallText')
+        p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopFallText')
+        p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopFallTextBroken')
 
   .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
 

website/views/options/social/tavern.jade

@@ -14,10 +14,12 @@
               h3.popover-title
                 a(target='_blank', href='http://www.kickstarter.com/profile/2014640723')=env.t('daniel')
               .popover-content
-                | {{user.preferences.sleep ? env.t('innText',{name: user.profile.name}) : env.t('danielText')}}
+                span(ng-if='!env.worldDmg.tavern') {{user.preferences.sleep ? env.t('innText',{name: user.profile.name}) : env.t('danielText')}}
+                span(ng-if='env.worldDmg.tavern') {{user.preferences.sleep ? env.t('innTextBroken',{name: user.profile.name}) : env.t('danielTextBroken')}}
                 button.btn-block.btn.btn-lg.btn-success(ng-click='User.user.ops.sleep({})')
                   | {{user.preferences.sleep ? env.t('innCheckOut') : env.t('innCheckIn')}}
-                span(ng-if='!user.preferences.sleep')=env.t('danielText2')
+                span(ng-if='!user.preferences.sleep && !env.worldDmg.tavern')=env.t('danielText2')
+                span(ng-if='!user.preferences.sleep && env.worldDmg.tavern')=env.t('danielText2Broken')
 
 
       // Resources

website/views/shared/new-stuff.jade

@@ -1,20 +1,25 @@
-h2 10/14/2015 - JACK O'LANTERN PETS AND MOUNTS! WORLD BOSS EXHAUST STRIKE!
+h2 10/21/2015 - FROG PET QUEST, TO-DO SORTING FIX, AND SECOND WORLD BOSS EXHAUST STRIKE
   hr
   tr
     td
-      .Pet-JackOLantern-Base.pull-right
-      h3 Jack O'Lantern Pets and Mounts
-      p The Flourishing Fields are full of cute carved pumpkins - and it looks like one has followed you home! It must be frightened of Burnout and looking for an adventurer to protect it.
-      br
-      p Those of you who weren't around last Fall Festival have received a pet Jack-O-Lantern, and those of you who got one last year have received a Jack-O-Lantern Mount! Happy Fall Festival.
-      p.small.muted by Lemoness
+      span.Mount_Body_Frog-Base.pull-right
+        span.Mount_Head_Frog-Base.pull-right(style='margin:0')
+      h3 Frog Pet Quest
+      p Deep in the Swamps of Stagnation, you find your path obstructed by debris... and an angry amphibian. Yuck! If you complete the <a href='/#/options/inventory/quests/'>Clutter Frog quest</a>, you'll be rewarded with some princely Frog pets!
+      p.small.muted Art by starsystemic, RosemonkeyCT, Jon Arjinborn, and Breadstrings
+      p.small.muted Writing by Fluitare
   tr
     td
-      .npc_ian_broken.pull-right
+      h3 To-Do Sorting Fix
+      p To-dos will now stay sorted when you drag and drop them! Often, To-Dos used to change their order unless you cleared your completed To-Dos on a regular basis. That should no longer be a problem.
+      p.small.muted by ikadzuchi and Alys
+  tr
+    td
+      .seasonalshop_broken.pull-right
       h3 World Boss: Burnout Uses Exhaust Strike!
-      p Oh no! Despite our best efforts, we've let some Dailies get away from us, and now Burnout is inflamed with energy! With a crackling snarl, it engulfs Ian the Quest Master in a surge of spectral fire. As fallen quest scrolls smolder, the smoke clears, and you see that Ian has been drained of energy and turned into a drifting Exhaust Spirit!
+      p Ahh!!! Our incomplete Dailies have fed the flames of Burnout, and now it has enough energy to strike again! It lets loose a gout of spectral flame that sears the Seasonal Shop. You're horrified to see that the cheery Seasonal Sorceress has been transformed into a sorrowful Exhaust Spirit!
       br
-      p Only defeating Burnout can break the spell and save our beloved Quest Master. Let's keep our Dailies in check and defeat this monster before it attacks again!
+      p We have to rescue our NPCs! Hurry, Habiticans, complete your tasks and defeat Burnout before it strikes for a third time!
       br
       p Late to the fight? Learn about Burnout and how to defeat World Bosses <a href='http://habitica.wikia.com/wiki/Boss#World_Bosses' target='_blank'>here</a>.
 
@@ -23,6 +28,26 @@ if menuItem !== 'oldNews'
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 10/14/2015 - JACK O'LANTERN PETS AND MOUNTS! WORLD BOSS EXHAUST STRIKE!
+    hr
+    tr
+      td
+        .Pet-JackOLantern-Base.pull-right
+        h3 Jack O'Lantern Pets and Mounts
+        p The Flourishing Fields are full of cute carved pumpkins - and it looks like one has followed you home! It must be frightened of Burnout and looking for an adventurer to protect it.
+        br
+        p Those of you who weren't around last Fall Festival have received a pet Jack-O-Lantern, and those of you who got one last year have received a Jack-O-Lantern Mount! Happy Fall Festival.
+        p.small.muted by Lemoness
+    tr
+      td
+        .npc_ian_broken.pull-right
+        h3 World Boss: Burnout Uses Exhaust Strike!
+        p Oh no! Despite our best efforts, we've let some Dailies get away from us, and now Burnout is inflamed with energy! With a crackling snarl, it engulfs Ian the Quest Master in a surge of spectral fire. As fallen quest scrolls smolder, the smoke clears, and you see that Ian has been drained of energy and turned into a drifting Exhaust Spirit!
+        br
+        p Only defeating Burnout can break the spell and save our beloved Quest Master. Let's keep our Dailies in check and defeat this monster before it attacks again!
+        br
+        p Late to the fight? Learn about Burnout and how to defeat World Bosses <a href='http://habitica.wikia.com/wiki/Boss#World_Bosses' target='_blank'>here</a>.
+
   h2 10/8/2015 - WORLD BOSS REVEALED: BURNOUT!
     tr
       td