Added whale quest back in, refactor

website/views/options/inventory/drops.jade

@@ -9,7 +9,12 @@
           menu.pets-menu(label=(env.t('eggs') + ' ({{eggCount}})'))
             p.muted(ng-show='eggCount < 1')=env.t('noEggs')
             div(ng-repeat='(egg,points) in ownedItems(user.items.eggs)')
-              button.customize-option(popover='{{::Content.eggs[egg].notes()}}', popover-title!=env.t("egg", {eggType: "{{::Content.eggs[egg].text()}}"}), popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='chooseEgg(egg)', class='Pet_Egg_{{::egg}}', ng-class='{selectableInventory: selectedPotion && !(user.items.pets[egg+"-"+selectedPotion.key]>0)}')
+              button.customize-option(class='Pet_Egg_{{::egg}}',
+                ng-class='{selectableInventory: selectedPotion && !(user.items.pets[egg+"-"+selectedPotion.key]>0)}',
+                popover='{{::Content.eggs[egg].notes()}}', popover-append-to-body='true',
+                popover-title!=env.t("egg", {eggType: "{{::Content.eggs[egg].text()}}"}),
+                popover-trigger='mouseenter', popover-placement='right',
+                ng-click='chooseEgg(egg)')
                 .badge.badge-info.stack-count {{points}}
               //-p {{Content.eggs[egg].text()}}
 
@@ -17,7 +22,13 @@
           menu.hatchingPotion-menu(label=(env.t('hatchingPotions') + ' ({{potCount}})'))
             p.muted(ng-show='potCount < 1')=env.t('noHatchingPotions')
             div(ng-repeat='(pot,points) in ownedItems(user.items.hatchingPotions)')
-              button.customize-option(popover='{{::Content.hatchingPotions[pot].notes()}}', popover-title!=env.t("potion", {potionType: "{{::Content.hatchingPotions[pot].text()}}"}), popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='choosePotion(pot)', class='Pet_HatchingPotion_{{::pot}}', ng-class='{selectableInventory: selectedEgg && !(user.items.pets[selectedEgg.key+"-"+pot]>0)}')
+              button.customize-option(class='Pet_HatchingPotion_{{::pot}}',
+                ng-class='{selectableInventory: selectedEgg && !(user.items.pets[selectedEgg.key+"-"+pot]>0)}',
+                popover='{{::Content.hatchingPotions[pot].notes()}}',
+                popover-title!=env.t("potion", {potionType: "{{::Content.hatchingPotions[pot].text()}}"}),
+                popover-trigger='mouseenter', popover-placement='right',
+                popover-append-to-body='true',
+                ng-click='choosePotion(pot)')
                 .badge.badge-info.stack-count {{points}}
 
         li.customize-menu
@@ -25,14 +36,22 @@
             p.muted(ng-show='questCount < 1')=env.t('noScrolls')
             p.muted!=env.t('scrollsText1') + ' <a href="/#/options/groups/party">' + env.t('scrollsText2') + '</a>'
             div(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]')
-              button.customize-option(data-popover-html="{{:: quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='showQuest(quest_key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"')
+              button.customize-option(ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"',
+                data-popover-html="{{:: quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}",
+                popover-title='{{::quest.text()}}', popover-trigger='mouseenter',
+                popover-placement='right', popover-append-to-body='true',
+                ng-click='showQuest(quest_key)')
                 .badge.badge-info.stack-count {{points}}
 
         li.customize-menu
           menu.pets-menu(label=env.t('food') + ' ({{foodCount}})')
             p.muted(ng-show='foodCount < 1')=env.t('noFood')
             div(ng-repeat='(food,points) in ownedItems(user.items.food)')
-              button.customize-option(popover='{{::Content.food[food].notes()}}', popover-title='{{::Content.food[food].text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='chooseFood(food)', class='Pet_Food_{{::food}}')
+              button.customize-option(class='Pet_Food_{{::food}}',
+                popover='{{::Content.food[food].notes()}}', popover-title='{{::Content.food[food].text()}}',
+                popover-trigger='mouseenter', popover-placement='right',
+                popover-append-to-body='true',
+                ng-click='chooseFood(food)')
                 .badge.badge-info.stack-count {{points}}
 
 
@@ -40,26 +59,46 @@
           menu.pets-menu(label=env.t('special'))
             mixin specialItem(k)
               div(ng-if='user.items.special.#{k}')
-                button.customize-option(popover='{{::Content.special.#{k}.notes()}}', popover-title='{{::Content.special.#{k}.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.special.#{k})', class='inventory_special_#{k}')
+                button.customize-option(class='inventory_special_#{k}',
+                  popover='{{::Content.special.#{k}.notes()}}',
+                  popover-title='{{::Content.special.#{k}.text()}}',
+                  popover-trigger='mouseenter', popover-placement='right',
+                  popover-append-to-body='true',
+                  ng-click='castStart(Content.special.#{k})')
                   .badge.badge-info.stack-count {{user.items.special.#{k}}}
             +specialItem('snowball')
             +specialItem('spookDust')
             +specialItem('shinySeed')
+            +specialItem('seafoam')
 
             div(ng-if='user.items.special.valentineReceived[0]')
-              button.customize-option(popover="Valentine's Day Card from {{User.user.items.special.valentineReceived[0]}}", popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='openModal("valentine")', class='inventory_special_valentine')
+              button.customize-option(class='inventory_special_valentine',
+                popover="Valentine's Day Card from {{User.user.items.special.valentineReceived[0]}}",
+                popover-trigger='mouseenter', popover-placement='right',
+                popover-append-to-body='true',
+                ng-click='openModal("valentine")')
                 .badge.badge-info.stack-count {{user.items.special.valentineReceived.length}}
 
             div(ng-if='user.purchased.plan.customerId || user.purchased.plan.mysteryItems.length')
-              button.customize-option(popover=env.t('subscriberItemText'), popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', class='inventory_present inventory_present_{{moment().format("MM")}}', ng-click="user.ops.openMysteryItem({})")
+              button.customize-option(class='inventory_present inventory_present_{{moment().format("MM")}}',
+                popover=env.t('subscriberItemText'), popover-trigger='mouseenter',
+                popover-placement='right', popover-append-to-body='true',
+                ng-click="user.ops.openMysteryItem({})")
                 .badge.badge-info.stack-count {{user.purchased.plan.mysteryItems.length}}
 
             div(ng-if='user.purchased.plan.consecutive.trinkets')
-              button.customize-option(popover=env.t('mysticHourglassPopover'), popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', class='inventory_special_trinket', ng-click="$state.go('options.inventory.timetravelers')")
+              button.customize-option(class='inventory_special_trinket',
+                popover=env.t('mysticHourglassPopover'), popover-trigger='mouseenter',
+                popover-placement='right', popover-append-to-body='true',
+                ng-click="$state.go('options.inventory.timetravelers')")
                 .badge.badge-info.stack-count {{user.purchased.plan.consecutive.trinkets}}
 
             div(ng-if='user.items.special.nyeReceived[0]')
-              button.customize-option(popover="New Year's Card from {{User.user.items.special.nyeReceived[0]}}", popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='openModal("nye")', class='inventory_special_nye')
+              button.customize-option(class='inventory_special_nye',
+                popover="New Year's Card from {{User.user.items.special.nyeReceived[0]}}",
+                popover-trigger='mouseenter', popover-placement='right',
+                popover-append-to-body='true',
+                ng-click='openModal("nye")')
                 .badge.badge-info.stack-count {{user.items.special.nyeReceived.length}}
 
     .col-md-6.border-left
@@ -90,13 +129,12 @@
                   popover='{{::egg.notes()}}', popover-append-to-body='true',
                   popover-title!=env.t("egg", {eggType: "{{::egg.text()}}"}),
                   popover-trigger='mouseenter', popover-placement='top',
-                  ng-click='purchase("eggs", egg)', )
+                  ng-click='purchase("eggs", egg)')
                 p {{::egg.value}}&nbsp;
                   span.Pet_Currency_Gem1x.inline-gems
-
               //- buyable quest eggs. TODO: Get this from a collection so we don't have to maintain this ridiculous comma-delimited list
               //- The hard part will be the trex stuff, since it is allowed to exist with two quests
-              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',slime:'Slime',sheep:'Sheep',kraken:'Cuttlefish'}
+              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',slime:'Slime',sheep:'Sheep',kraken:'Cuttlefish',whale:'Whale'}
                 div(ng-show='user.achievements.quests.#{quest} > 0')
                   button.customize-option(class='Pet_Egg_#{egg}',
                     popover='{{::Content.eggs.#{egg}.notes()}}', popover-append-to-body='true',
@@ -145,7 +183,11 @@
             menu.pets-menu(label=env.t('quests'))
               p.muted!=env.t('scrollsText1') + ' <a href="/#/options/groups/party">' + env.t('scrollsText2') + '</a>'
               div(ng-repeat='quest in Content.quests', ng-if='quest.canBuy')
-                button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-title='{{::quest.text()}}', popover-append-to-body="true", popover-trigger='mouseenter', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"')
+                button.customize-option(ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"',
+                  data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}",
+                  popover-title='{{::quest.text()}}', popover-append-to-body="true",
+                  popover-trigger='mouseenter',
+                  ng-click='buyQuest(quest.key)')
                 p
                   |  {{::quest.value}}&nbsp;
                   span.Pet_Currency_Gem1x.inline-gems
@@ -153,17 +195,29 @@
           li.customize-menu
             menu.pets-menu(label=env.t('special'))
               div
-                button.customize-option(popover=env.t('fortifyPop'), popover-title=env.t('fortifyName'), popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', ng-click='openModal("reroll")', class='inventory_special_fortify')
+                button.customize-option(class='inventory_special_fortify',
+                  popover=env.t('fortifyPop'),
+                  popover-title=env.t('fortifyName'),
+                  popover-trigger='mouseenter', popover-placement='top',
+                  popover-append-to-body='true',
+                  ng-click='openModal("reroll")')
                 p
                   | 4&nbsp;
                   span.Pet_Currency_Gem1x.inline-gems
               div(ng-show='user.flags.rebirthEnabled')
-                button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', ng-click='openModal("rebirth")', class='rebirth_orb')
+                button.customize-option(class='rebirth_orb',
+                  popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'),
+                  popover-trigger='mouseenter', popover-placement='top',
+                  popover-append-to-body='true',
+                  ng-click='openModal("rebirth")')
                 p(ng-show='user.stats.lvl < 100')
                   | 8&nbsp;
                   span.Pet_Currency_Gem1x.inline-gems
               div(ng-show='petCount >= 90 || mountCount >= 90')
-                button.customize-option(popover=env.t('petKeyPop'), popover-title=env.t('petKeyName'), popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', ng-click='openModal("pet-key", {size:"lg"})', class='pet_key')
+                button.customize-option(popover=env.t('petKeyPop'), popover-title=env.t('petKeyName'),
+                  popover-trigger='mouseenter', popover-placement='top',
+                  popover-append-to-body='true',
+                  ng-click='openModal("pet-key", {size:"lg"})', class='pet_key')
                 p(ng-show='petCount < 90 || mountCount < 90 || !user.achievements.triadBingo')
                   | 4&nbsp;
                   span.Pet_Currency_Gem1x.inline-gems
@@ -178,7 +232,12 @@
                   | 20&nbsp;
                   span.shop_gold
               // div
-                button.customize-option(popover='{{::Content.spells.special.valentine.notes()}}', popover-title='{{::Content.spells.special.valentine.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.valentine)', class='inventory_special_valentine')
+                button.customize-option(class='inventory_special_valentine',
+                popover='{{::Content.spells.special.valentine.notes()}}',
+                popover-title='{{::Content.spells.special.valentine.text()}}',
+                popover-trigger='mouseenter', popover-placement='right',
+                popover-append-to-body='true',
+                ng-click='castStart(Content.spells.special.valentine)')
                 p
                   | {{Content.spells.special.valentine.value}}
                   span(class='shop_gold')