Merge branch 'sabrecat/postfixes' into develop

website/client/src/components/shops/buyModal.vue

@@ -715,6 +715,12 @@ export default {
       if (this.item.notes instanceof Function) {
         return this.item.notes();
       }
+      if (this.item.items) {
+        if (this.item.items[0].notes instanceof Function) {
+          return this.item.items[0].notes();
+        }
+        return this.item.items[0].notes;
+      }
       return this.item.notes;
     },
     gemsLeft () {

website/client/src/components/shops/quests/buyQuestModal.vue

@@ -28,6 +28,12 @@
           :item="item"
           :abbreviated="true"
         />
+        <div
+          v-if="item.addlNotes"
+          class="mx-4 mb-3"
+        >
+          {{ item.addlNotes }}
+        </div>
         <quest-rewards :quest="item" />
         <div
           v-if="!item.locked"
@@ -52,12 +58,6 @@
           <div class="how-many-to-buy">
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
-          <div
-            v-if="item.addlNotes"
-            class="mb-3"
-          >
-            {{ item.addlNotes }}
-          </div>
           <div>
             <number-increment
               @updateQuantity="selectedAmountToBuy = $event"
@@ -82,7 +82,7 @@
           v-if="priceType === 'gems'
             && !enoughCurrency(priceType, item.value * selectedAmountToBuy)
             && !item.locked"
-          class="btn btn-primary"
+          class="btn btn-primary mb-3"
           @click="purchaseGems()"
         >
           {{ $t('purchaseGems') }}
@@ -177,7 +177,6 @@
 
     .inner-content {
       margin: 33px auto auto;
-      padding: 0px 24px;
     }
 
     .item-notes {
@@ -233,8 +232,6 @@
     }
 
     .purchase-amount {
-      margin-top: 24px;
-
       .how-many-to-buy {
         margin-bottom: 16px;
       }

website/client/src/components/shops/quests/questDialogContent.vue

@@ -2,7 +2,7 @@
   <div class="quest-content">
     <div
       class="quest-image"
-      :class="'quest_' + item.key"
+      :class="item.purchaseType === 'bundles' ? `quest_bundle_${item.key}` : `quest_${item.key}`"
     ></div>
     <h3 class="text-center">
       {{ itemText }}
@@ -17,7 +17,7 @@
       <user-label :user="leader" />
     </div>
     <div
-      class="text"
+      class="mx-4"
       v-html="itemNotes"
     ></div>
     <questInfo
@@ -42,12 +42,6 @@
     margin-top: 24px;
   }
 
-  .text {
-    margin: 16px 16px;
-    overflow-y: auto;
-    text-overflow: ellipsis;
-  }
-
   .leader-label {
     font-size: 14px;
     font-weight: bold;

website/client/src/components/shops/quests/questInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div
-      class="row"
+      class="row mt-3"
     >
       <div
         v-if="quest.collect"
@@ -25,7 +25,10 @@
         <dt>{{ $t('bossHP') + ':' }}</dt>
         <dd>{{ quest.boss.hp }}</dd>
       </div>
-      <div class="table-row">
+      <div
+        class="table-row"
+        v-if="quest.purchaseType !== 'bundles'"
+      >
         <dt>{{ $t('difficulty') + ':' }}</dt>
         <dd>
           <div
@@ -39,7 +42,6 @@
     </div>
     <div
       v-if="quest.end && !abbreviated"
-      class="m-auto"
     >
       {{ limitedString }}
     </div>

website/client/src/components/shops/quests/questRewards.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="quest.drop"
-    class="quest-rewards"
+    class="quest-rewards mb-3"
   >
     <div
       class="header d-flex align-items-center"

website/common/locales/en/questsContent.json

@@ -576,7 +576,7 @@
   "questMayhemMistiflying3DropWeapon": "Roguish Rainbow Message (Main-Hand Item)",
 
   "featheredFriendsText": "Feathered Friends Quest Bundle",
-  "featheredFriendsNotes": "Contains 'Help! Harpy!', 'The Night-Owl', and 'The Birds of Preycrastination'.",
+  "featheredFriendsNotes": "Contains Quests to obtain Owl, Parrot, and Hawk Pet eggs: The Night-Owl, Help! Harpy!, and The Birds of Preycrastination.",
 
   "questNudibranchText": "Infestation of the NowDo Nudibranchs",
   "questNudibranchNotes": "You finally get around to checking your To Do's on a lazy day in Habitica. Bright against your deepest red tasks are a gaggle of vibrant blue sea slugs. You are entranced! Their sapphire colors make your most intimidating tasks look as easy as your best Habits. In a feverish stupor you get to work, tackling one task after the other in a ceaseless frenzy...<br><br>The next thing you know, @LilithofAlfheim is pouring cold water over you. “The NowDo Nudibranchs have been stinging you all over! You need to take a break!”<br><br>Shocked, you see that your skin is as bright red as your To Do list was. \"Being productive is one thing,\" @beffymaroo says, \"but you've also got to take care of yourself. Hurry, let's get rid of them!\"",
@@ -586,7 +586,7 @@
   "questNudibranchUnlockText": "Unlocks Nudibranch Eggs for purchase in the Market",
 
   "splashyPalsText": "Splashy Pals Quest Bundle",
-  "splashyPalsNotes": "Contains 'The Dilatory Derby', 'Guide the Turtle', and 'Wail of the Whale'.",
+  "splashyPalsNotes": "Contains Quests to obtain Turtle, Whale, and Seahorse Pet eggs: Guide the Turtle, Wail of the Whale, and The Dilatory Derby.",
 
   "questHippoText": "What a Hippo-Crite",
   "questHippoNotes": "You and @awesomekitty collapse into the shade of a palm tree, exhausted. The sun beats down over the Sloensteadi Savannah, scorching the ground below. It’s been a productive day so far, conquering your Dailies, and this oasis looks like a nice place to take a break and refresh. Stooping near the water to get a drink, you stumble back in shock as a massive hippopotamus rises. “Resting so soon? Don’t be so lazy, get back to work.” You try and protest that you’ve been working hard and need a break, but the hippo isn’t having any of it.<br><br>@khdarkwolf whispers to you, “Notice how it’s lounging around all day but has the nerve to call you lazy? It’s the Hippo-Crite!”<br><br>Your friend @jumorales nods. “Let’s show it what hard work looks like!”",
@@ -596,10 +596,10 @@
   "questHippoUnlockText": "Unlocks Hippo Eggs for purchase in the Market",
 
   "farmFriendsText": "Farm Friends Quest Bundle",
-  "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'.",
+  "farmFriendsNotes": "Contains Quests to obtain Horse, Sheep, and Cow Pet eggs: Ride the Night-Mare, The Thunder Ram, and The Mootant Cow.",
 
   "witchyFamiliarsText": "Witchy Familiars Quest Bundle",
-  "witchyFamiliarsNotes": "Contains 'The Rat King', 'The Icy Arachnid', and 'Swamp of the Clutter Frog'.",
+  "witchyFamiliarsNotes": "Contains Quests to obtain Frog, Spider, and Rat Pet eggs: Swamp of the Clutter Frog, The Icy Arachnid, and The Rat King.",
 
   "questGroupLostMasterclasser": "Mystery of the Masterclassers",
   "questUnlockLostMasterclasser": "To unlock this quest, complete the final quests of these quest chains: 'Dilatory Distress', 'Mayhem in Mistiflying', 'Stoïkalm Calamity', and 'Terror in the Taskwoods'.",
@@ -650,7 +650,7 @@
   "questYarnUnlockText": "Unlocks Yarn Eggs for purchase in the Market",
 
   "winterQuestsText": "Winter Quest Bundle",
-  "winterQuestsNotes": "Contains 'Trapper Santa', 'Find the Cub', and 'The Fowl Frost'. Note that Trapper Santa and Find the Cub have stackable quest achievements but give a rare pet and mount that can only be obtained once each.",
+  "winterQuestsNotes": "Contains Quests to obtain the Polar Bear Pet, the Polar Bear Mount, and Penguin Pet eggs: Find the Cub, Trapper Santa, and The Fowl Frost.",
 
   "questPterodactylText": "The Pterror-dactyl",
   "questPterodactylNotes": "You're taking a stroll along the peaceful Stoïkalm Cliffs when an evil screech rends the air. You turn to find a hideous creature flying towards you and are overcome by a powerful terror. As you turn to flee, @Lilith of Alfheim grabs you. \"Don't panic! It's just a Pterror-dactyl.\"<br><br>@Procyon P nods. \"They nest nearby, but they're attracted to the scent of negative Habits and undone Dailies.\"<br><br>\"Don't worry,\" @Katy133 says. \"We just need to be extra productive to defeat it!\" You are filled with a renewed sense of purpose and turn to face your foe.",
@@ -689,7 +689,7 @@
   "dysheartenerArtCredit": "Artwork by @AnnDeLune",
 
   "hugabugText": "Hug a Bug Quest Bundle",
-  "hugabugNotes": "Contains 'The CRITICAL BUG', 'The Snail of Drudgery Sludge', and 'Bye, Bye, Butterfry'.",
+  "hugabugNotes": "Contains Quests to obtain Beetle, Caterpillar, and Snail Pet eggs: The CRITICAL BUG, Bye Bye Butterfry, and The Snail of Drudgery Sludge.",
 
   "questSquirrelText": "The Sneaky Squirrel",
   "questSquirrelNotes": "You wake up and find you’ve overslept! Why didn’t your alarm go off? … How did an acorn get stuck in the ringer?<br><br>When you try to make breakfast, the toaster is stuffed with acorns. When you go to retrieve your mount, @Shtut is there, trying unsuccessfully to unlock their stable. They look into the keyhole. “Is that an acorn in there?”<br><br>@randomdaisy cries out, “Oh no! I knew my pet squirrels had gotten out, but I didn’t know they’d made such trouble! Can you help me round them up before they make any more of a mess?”<br><br>Following the trail of mischievously placed oak nuts, you track and catch the wayward sciurines, with @Cantras helping secure each one safely at home. But just when you think your task is almost complete, an acorn bounces off your helm! You look up to see a mighty beast of a squirrel, crouched in defense of a prodigious pile of seeds.<br><br>“Oh dear,” says @randomdaisy, softly. “She’s always been something of a resource guarder. We’ll have to proceed very carefully!” You circle up with your party, ready for trouble!",
@@ -699,10 +699,10 @@
   "questSquirrelUnlockText": "Unlocks Squirrel Eggs for purchase in the Market",
 
   "cuddleBuddiesText": "Cuddle Buddies Quest Bundle",
-  "cuddleBuddiesNotes": "Contains 'The Killer Bunny', 'The Nefarious Ferret', and 'The Guinea Pig Gang'.",
+  "cuddleBuddiesNotes": "Contains Quests to obtain Rabbit, Ferret, and Guinea Pig Pet eggs: The Killer Bunny, The Nefarious Ferret, and The Guinea Pig Gang.",
 
   "aquaticAmigosText": "Aquatic Amigos Quest Bundle",
-  "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'.",
+  "aquaticAmigosNotes": "Contains Quests to obtain Cuttlefish, Octopus, and Axolotl Pet eggs: The Kraken of Inkomplete, The Call of Octothulu, and The Magical Axolotl.",
 
   "questSeaSerpentText": "Danger in the Depths: Sea Serpent Strike!",
   "questSeaSerpentNotes": "Your streaks have you feeling lucky—it’s the perfect time for a trip to the seahorse racetrack. You board the submarine at Diligent Docks and settle in for the trip to Dilatory, but you’ve barely submerged when an impact rocks the sub, sending its occupants tumbling. “What’s going on?” @AriesFaries shouts.<br><br>You glance through a nearby porthole and are shocked by the wall of shimmering scales passing by it. “Sea serpent!” Captain @Witticaster calls through the intercom. “Brace yourselves, it’s coming ‘round again!” As you grip the arms of your seat, your unfinished tasks flash before your eyes. ‘Maybe if we work together and complete them,’ you think, ‘we can drive this monster away!’",
@@ -719,7 +719,7 @@
   "questKangarooUnlockText": "Unlocks Kangaroo Eggs for purchase in the Market",
 
   "forestFriendsText": "Forest Friends Quest Bundle",
-  "forestFriendsNotes": "Contains 'The Spirit of Spring', 'The Hedgebeast', and 'The Tangle Tree'.",
+  "forestFriendsNotes": "Contains Quests to obtain Treeling, Deer, and Hedgehog Pet eggs: The Tangle Tree, The Spirit of Spring, and The Hedgebeast.",
 
   "questAlligatorText": "The Insta-Gator",
   "questAlligatorNotes": "“Crikey!” exclaims @gully. “An Insta-Gator in its natural habitat! Careful, it distracts its prey with things that seem urgent THIS INSTANT, and it feeds on the unchecked Dailies that result.” You fall silent to avoid attracting its attention, but to no avail. The Insta-Gator spots you and charges! Distracting voices rise up from Swamps of Stagnation, grabbing for your attention: “Read this post! See this photo! Pay attention to me THIS INSTANT!” You scramble to mount a counterattack, completing your Dailies and bolstering your good Habits to fight off the dreaded Insta-Gator.",
@@ -729,10 +729,10 @@
   "questAlligatorUnlockText": "Unlocks Alligator Eggs for purchase in the Market",
 
   "oddballsText": "Oddballs Quest Bundle",
-  "oddballsNotes": "Contains 'The Jelly Regent', 'Escape the Cave Creature', and 'A Tangled Yarn'.",
+  "oddballsNotes": "Contains Quests to obtain Slime, Yarn, and Rock Pet eggs: The Jelly Regent, A Tangled Yarn, and Escape the Cave Creature.",
 
   "birdBuddiesText": "Bird Buddies Quest Bundle",
-  "birdBuddiesNotes": "Contains 'The Fowl Frost', 'Rooster Rampage', and 'The Push-and-Pull Peacock'.",
+  "birdBuddiesNotes": "Contains Quests to obtain Peacock, Penguin, and Rooster Pet eggs: The Push-and-Pull Peacock, The Fowl Frost, and Rooster Rampage.",
 
   "questVelociraptorText": "The Veloci-Rapper",
   "questVelociraptorNotes": "You’re sharing honey cakes with @*~Seraphina~*, @Procyon P, and @Lilith of Alfheim by a lake in the Stoïkalm Steppes. Suddenly, a mournful voice interrupts your picnic.<br><br><em>My Habits took a hit, I missed my Dailies,<br>I’m losing it, sinking with doubt and maybes,<br>At the top of my game I used to be so fly,<br>But now I just let my Due Dates go by.</em><br><br>@*~Seraphina~* peers behind a stand of grass. “It’s the Veloci-Rapper. It seems... distraught?”<br><br>You pump a fist in determination. “There's only one thing to do. Rap battle time!”",
@@ -742,7 +742,7 @@
   "questVelociraptorUnlockText": "Unlocks Velociraptor Eggs for purchase in the Market",
 
   "mythicalMarvelsText": "Mythical Marvels Quest Bundle",
-  "mythicalMarvelsNotes": "Contains 'Convincing the Unicorn Queen', 'The Fiery Gryphon', and 'Danger in the Depths: Sea Serpent Strike!'",
+  "mythicalMarvelsNotes": "Contains Quests to obtain Unicorn, Gryphon, and Sea Serpent Pet eggs: Convincing the Unicorn Queen, The Fiery Gryphon, and Danger in the Depths: Sea Serpent Strike!",
 
   "questBronzeText": "Brazen Beetle Battle",
   "questBronzeNotes": "On a refreshing break between tasks, you and some friends take a stroll through the forest trails of the Taskwoods. You come upon a large hollow log and a sparkle from inside catches your attention.<br><br>Why, it's a cache of Magic Hatching Potions! The shimmering bronze liquid swirls gently in the bottles, and @Hachiseiko reaches to pick one up to examine it.<br><br>“Halt!” hisses a voice from behind you. It's a gigantic beetle with a carapace of gleaming bronze, raising her clawed feet in a fighting stance. “Those are my potions, and if you wish to earn them, you must prove yourself in a gentlefolks' duel!”",
@@ -777,10 +777,10 @@
   "questRobotUnlockText": "Unlocks purchasable Robot Eggs in the Market",
 
   "rockingReptilesText": "Rocking Reptiles Quest Bundle",
-  "rockingReptilesNotes": "Contains 'The Insta-Gator', 'The Serpent of Distraction', and 'The Veloci-Rapper'.",
+  "rockingReptilesNotes": "Contains Quests to obtain Alligator, Velociraptor, and Snake Pet eggs: The Insta-Gator, The Veloci-Rapper, and The Serpent of Distraction.",
 
   "delightfulDinosText": "Delightful Dinos Quest Bundle",
-  "delightfulDinosNotes": "Contains 'The Pterror-dactyl', 'The Trampling Triceratops', and 'The Dinosaur Unearthed'.",
+  "delightfulDinosNotes": "Contains Quests to obtain Triceratops, T-Rex, and Pterodactyl Pet eggs: The Trampling Triceratops, The Dinosaur Unearthed, and The Pterror-dactyl.",
 
   "questAmberText": "The Amber Alliance",
   "questAmberNotes": "You’re sitting in the Tavern with @beffymaroo and @-Tyr- when @Vikte bursts through the door and excitedly tells you about the rumors of another type of Magic Hatching Potion hidden in the Taskwoods. Having completed your Dailies, the three of you immediately agree to help @Vikte on their search. After all, what’s the harm in a little adventure?<br><br>After walking through the Taskwoods for hours, you’re beginning to regret joining such a wild chase. You’re about to head home, when you hear a surprised yelp and turn to see a huge lizard with shiny amber scales coiled around a tree, clutching @Vikte in her claws. @beffymaroo reaches for her sword.<br><br>“Wait!” cries @-Tyr-. “It’s the Trerezin! She’s not dangerous, just dangerously clingy!”",
@@ -809,7 +809,7 @@
   "questWaffleUnlockText": "Unlocks Confection Hatching Potions for purchase in the Market",
 
   "jungleBuddiesText": "Jungle Buddies Quest Bundle",
-  "jungleBuddiesNotes": "Contains 'Monstrous Mandrill and the Mischief Monkeys', 'The Somnolent Sloth', and 'The Tangle Tree'.",
+  "jungleBuddiesNotes": "Contains Quests to obtain Monkey, Treeling, and Sloth Pet eggs: Monstrous Mandrill and the Mischief Monkeys, The Tangle Tree, and The Somnolent Sloth.",
 
   "questFluoriteText": "A Bright Fluorite Fright",
   "questFluoriteNotes": "Unusual minerals are in high demand these days, so you and a few friends have trekked deep into the mines of the Meandering Mountains, in search of exciting ores. It’s a long and boring expedition, until @-Tyr- stumbles over a large rock, sitting right in the middle of the tunnel.<br><br>“This should help brighten things up,” says @nirbhao, before conjuring up an orb of light.<br><br>A warm brightness fills the tunnel, but something odd starts happening to that large rock. Feeding on the magical light, it begins to glow with fluorescent blues, greens and purples. Then it rears upright into a vaguely humanoid shape, complete with glowing red eyes fixed right on you! You jump into action with flashing spells and shining weapons.",
@@ -835,7 +835,7 @@
   "questTurquoiseUnlockText": "Unlocks Turquoise Hatching Potions for purchase in the Market",
 
   "sandySidekicksText": "Sandy Sidekicks Quest Bundle",
-  "sandySidekicksNotes": "Contains 'The Indulgent Armadillo', 'The Serpent of Distraction', and 'The Icy Arachnid'.",
+  "sandySidekicksNotes": "Contains Quests to obtain Spider, Armadillo, and Snake Pet eggs: The Icy Arachnid, The Indulgent Armadillo, and The Serpent of Distraction.",
 
   "questBlackPearlText": "A Startling Starry Idea",
   "questBlackPearlNotes": "You’ve been feeling uninspired lately, so when @jjgame83 suggests a trip to Lively Lake, you jump at the chance for a change of scenery. As @QuartzFox lays out a picnic on the shore, you find something glinting in the shallows. A strange black pearl.<br><br>“I wish I had a new idea,” you sigh.<br><br>A chill washes over the shore. The lake turns to black ink. The stars rise as noon becomes midnight in a heartbeat.<br><br>“Those aren’t good signs,” says @PixelStormArt.<br><br>A towering mass of arms bursts from the lake in a spray of foam, and from its beak, it booms: “BEHOLD ASTEROIDEA, THE IDEA FROM BEYOND THE STARS!”<br><br>A tentacle slams down onto the picnic basket. Good idea or not, you leap into action.",

website/common/script/content/constants/schedule.js

@@ -583,6 +583,7 @@ export const MONTHLY_SCHEDULE = {
         type: 'bundles',
         items: [
           'forestFriends',
+          'oddballs',
         ],
       },
     ],