diff --git a/website/client/src/assets/css/sprites/spritesmith-main-21.css b/website/client/src/assets/css/sprites/spritesmith-main-21.css index 5e53722b25..b6e88253dd 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main-21.css +++ b/website/client/src/assets/css/sprites/spritesmith-main-21.css @@ -1,9 +1,3 @@ -.Mount_Head-Wolf_Aurora { - background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); - background-position: 0px -136px; - width: 135px; - height: 135px; -} .Mount_Head_TRex-Skeleton { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: 0px 0px; @@ -24,7 +18,7 @@ } .Mount_Head_Triceratops-Base { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); - background-position: -424px -1134px; + background-position: -1164px -424px; width: 105px; height: 105px; } @@ -346,270 +340,276 @@ width: 135px; height: 135px; } -.Mount_Head_Wolf-Base { +.Mount_Head_Wolf-Aurora { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -816px 0px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Bronze { +.Mount_Head_Wolf-Base { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -680px -680px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Celestial { +.Mount_Head_Wolf-Bronze { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -544px -680px; width: 135px; height: 135px; } -.Mount_Head_Wolf-CottonCandyBlue { +.Mount_Head_Wolf-Celestial { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -408px -680px; width: 135px; height: 135px; } -.Mount_Head_Wolf-CottonCandyPink { +.Mount_Head_Wolf-CottonCandyBlue { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -272px -680px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Cupid { +.Mount_Head_Wolf-CottonCandyPink { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -136px -680px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Desert { +.Mount_Head_Wolf-Cupid { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: 0px -680px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Ember { +.Mount_Head_Wolf-Desert { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -680px -544px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Fairy { +.Mount_Head_Wolf-Ember { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -680px -408px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Floral { +.Mount_Head_Wolf-Fairy { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -680px -272px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Frost { +.Mount_Head_Wolf-Floral { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -680px -136px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Ghost { +.Mount_Head_Wolf-Frost { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -680px 0px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Glass { +.Mount_Head_Wolf-Ghost { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -544px -544px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Glow { +.Mount_Head_Wolf-Glass { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -408px -544px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Golden { +.Mount_Head_Wolf-Glow { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -272px -544px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Holly { +.Mount_Head_Wolf-Golden { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -136px -544px; width: 135px; height: 135px; } -.Mount_Head_Wolf-IcySnow { +.Mount_Head_Wolf-Holly { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: 0px -544px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Peppermint { +.Mount_Head_Wolf-IcySnow { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -544px -408px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Rainbow { +.Mount_Head_Wolf-Peppermint { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -544px -272px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Red { +.Mount_Head_Wolf-Rainbow { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -544px -136px; width: 135px; height: 135px; } -.Mount_Head_Wolf-RoseQuartz { +.Mount_Head_Wolf-Red { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -544px 0px; width: 135px; height: 135px; } -.Mount_Head_Wolf-RoyalPurple { +.Mount_Head_Wolf-RoseQuartz { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -408px -408px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Shade { +.Mount_Head_Wolf-RoyalPurple { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -272px -408px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Shadow { +.Mount_Head_Wolf-Shade { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -136px -408px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Shimmer { +.Mount_Head_Wolf-Shadow { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: 0px -408px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Silver { +.Mount_Head_Wolf-Shimmer { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -408px -272px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Skeleton { +.Mount_Head_Wolf-Silver { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -408px -136px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Spooky { +.Mount_Head_Wolf-Skeleton { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -408px 0px; width: 135px; height: 135px; } -.Mount_Head_Wolf-StarryNight { +.Mount_Head_Wolf-Spooky { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -272px -272px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Sunshine { +.Mount_Head_Wolf-StarryNight { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -136px -272px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Thunderstorm { +.Mount_Head_Wolf-Sunshine { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: 0px -272px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Watery { +.Mount_Head_Wolf-Thunderstorm { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -272px -136px; width: 135px; height: 135px; } -.Mount_Head_Wolf-White { +.Mount_Head_Wolf-Watery { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -272px 0px; width: 135px; height: 135px; } -.Mount_Head_Wolf-Zombie { +.Mount_Head_Wolf-White { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -136px -136px; width: 135px; height: 135px; } -.Mount_Head_Yarn-Base { +.Mount_Head_Wolf-Zombie { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); - background-position: -1164px -424px; - width: 105px; - height: 105px; + background-position: 0px -136px; + width: 135px; + height: 135px; } -.Mount_Head_Yarn-CottonCandyBlue { +.Mount_Head_Yarn-Base { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -1164px -530px; width: 105px; height: 105px; } -.Mount_Head_Yarn-CottonCandyPink { +.Mount_Head_Yarn-CottonCandyBlue { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -1164px -636px; width: 105px; height: 105px; } -.Mount_Head_Yarn-Desert { +.Mount_Head_Yarn-CottonCandyPink { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -1164px -742px; width: 105px; height: 105px; } -.Mount_Head_Yarn-Golden { +.Mount_Head_Yarn-Desert { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -1164px -848px; width: 105px; height: 105px; } -.Mount_Head_Yarn-Red { +.Mount_Head_Yarn-Golden { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -1164px -954px; width: 105px; height: 105px; } -.Mount_Head_Yarn-Shade { +.Mount_Head_Yarn-Red { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: 0px -1134px; width: 105px; height: 105px; } -.Mount_Head_Yarn-Skeleton { +.Mount_Head_Yarn-Shade { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -106px -1134px; width: 105px; height: 105px; } -.Mount_Head_Yarn-White { +.Mount_Head_Yarn-Skeleton { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -212px -1134px; width: 105px; height: 105px; } -.Mount_Head_Yarn-Zombie { +.Mount_Head_Yarn-White { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -318px -1134px; width: 105px; height: 105px; } +.Mount_Head_Yarn-Zombie { + background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); + background-position: -424px -1134px; + width: 105px; + height: 105px; +} .Mount_Icon_Aether-Invisible { background-image: url('~@/assets/images/sprites/spritesmith-main-21.png'); background-position: -848px -816px; diff --git a/website/client/src/assets/images/sprites/spritesmith-main-21.png b/website/client/src/assets/images/sprites/spritesmith-main-21.png index 3b9ad96c86..8e7224af84 100644 Binary files a/website/client/src/assets/images/sprites/spritesmith-main-21.png and b/website/client/src/assets/images/sprites/spritesmith-main-21.png differ diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue index b4e3c7492c..d3f75ad702 100644 --- a/website/client/src/components/shops/quests/buyQuestModal.vue +++ b/website/client/src/components/shops/quests/buyQuestModal.vue @@ -33,6 +33,9 @@
{{ $t('howManyToBuy') }}
+
+ {{ item.addlNotes }} +

Note: “Trapper Santa” awards a stackable quest achievement but gives a rare mount that can only be added to your stable once.", "questEvilSantaCompletion": "Trapper Santa squeals in anger, and bounces off into the night. The grateful she-bear, through roars and growls, tries to tell you something. You take her back to the stables, where Matt Boch the Beast Master listens to her tale with a gasp of horror. She has a cub! He ran off into the icefields when mama bear was captured.", "questEvilSantaBoss": "Trapper Santa", "questEvilSantaDropBearCubPolarMount": "Polar Bear (Mount)", "questEvilSanta2Text": "Find The Cub", - "questEvilSanta2Notes": "When Trapper Santa captured the polar bear mount, her cub ran off into the icefields. You hear twig-snaps and snow crunch through the crystalline sound of the forest. Paw prints! You start racing to follow the trail. Find all the prints and broken twigs, and retrieve the cub!", + "questEvilSanta2Notes": "When Trapper Santa captured the polar bear mount, her cub ran off into the icefields. You hear twig-snaps and snow crunch through the crystalline sound of the forest. Paw prints! You start racing to follow the trail. Find all the prints and broken twigs, and retrieve the cub!

Note: “Find the Cub” awards a stackable quest achievement but gives a rare pet that can only be added to your stable once.", "questEvilSanta2Completion": "You've found the cub! It will keep you company forever.", "questEvilSanta2CollectTracks": "Tracks", "questEvilSanta2CollectBranches": "Broken Twigs", "questEvilSanta2DropBearCubPolarPet": "Polar Bear (Pet)", + "evilSantaAddlNotes": "Note that Trapper Santa and Find the Cub have stackable quest achievements but give a rare pet and mount that can only be added to your stable once.", + "questGryphonText": "The Fiery Gryphon", "questGryphonNotes": "The grand beast master, baconsaur, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"", "questGryphonCompletion": "Defeated, the mighty beast ashamedly slinks back to its master. \"My word! Well done, adventurers!\" baconsaur exclaims, \"Please, have some of the gryphon's eggs. I am sure you will raise these young ones well!\"", diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js index fc3da66e0f..ce217d4793 100644 --- a/website/common/script/content/bundles.js +++ b/website/common/script/content/bundles.js @@ -74,6 +74,7 @@ const bundles = { key: 'winterQuests', text: t('winterQuestsText'), notes: t('winterQuestsNotes'), + addlNotes: t('evilSantaAddlNotes'), bundleKeys: [ 'evilsanta', 'evilsanta2', diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js index 83de06bfb0..983e33fef4 100644 --- a/website/common/script/content/quests.js +++ b/website/common/script/content/quests.js @@ -262,6 +262,7 @@ const quests = { }, text: t('questEvilSantaText'), notes: t('questEvilSantaNotes'), + addlNotes: t('evilSantaAddlNotes'), completion: t('questEvilSantaCompletion'), value: 4, category: 'pet', @@ -288,6 +289,7 @@ const quests = { }, text: t('questEvilSanta2Text'), notes: t('questEvilSanta2Notes'), + addlNotes: t('evilSantaAddlNotes'), completion: t('questEvilSanta2Completion'), value: 4, category: 'pet', diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js index 9b588dbffd..c2c682175c 100644 --- a/website/common/script/libs/getItemInfo.js +++ b/website/common/script/libs/getItemInfo.js @@ -115,6 +115,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang key: item.key, text: item.text(language), notes: item.notes(language), + addlNotes: item.addlNotes ? item.addlNotes(language) : null, value: item.value, currency: 'gems', class: `quest_bundle_${item.key}`, @@ -130,6 +131,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang key: item.key, text: item.text(language), notes: item.notes(language), + addlNotes: item.addlNotes ? item.addlNotes(language) : null, group: item.group, value: item.goldValue ? item.goldValue : item.value, locked, diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head-Wolf_Aurora.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Aurora.png similarity index 100% rename from website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head-Wolf_Aurora.png rename to website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Aurora.png