From fb017e1f08d43ea1a1ff9cd9115902ed64db17a3 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 5 Apr 2022 16:03:46 -0500 Subject: [PATCH] fix(pets): various quest and animation corrections --- habitica-images | 2 +- website/client/src/assets/css/sprites.css | 12 +++++- .../assets/css/sprites/spritesmith-main.css | 41 +++++++++++-------- website/client/src/assets/scss/animals.scss | 2 +- website/common/locales/en/questsContent.json | 4 +- website/common/script/content/quests.js | 10 ++--- 6 files changed, 43 insertions(+), 28 deletions(-) diff --git a/habitica-images b/habitica-images index c5147c3b47..9a49b61e94 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit c5147c3b4727f6fb274f0f9cab5525b7ac4cc9a3 +Subproject commit 9a49b61e94b556856d3ebbf643c0be18137e8b53 diff --git a/website/client/src/assets/css/sprites.css b/website/client/src/assets/css/sprites.css index 2bf4ec2834..1ad358a468 100755 --- a/website/client/src/assets/css/sprites.css +++ b/website/client/src/assets/css/sprites.css @@ -16,7 +16,13 @@ height: 219px; } -.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup { +.quest_virtualPet { + background: url("~@/assets/images/animated/quest_virtualPet.gif") no-repeat; + width: 219px; + height: 219px; +} + +.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet { width: 68px; height: 68px; } @@ -33,6 +39,10 @@ background: url("~@/assets/images/animated/Pet_HatchingPotion_Windup.gif") no-repeat; } +.Pet_HatchingPotion_VirtualPet { + background: url("~@/assets/images/animated/Pet_HatchingPotion_VirtualPet.gif") no-repeat; +} + .Gems { display:inline-block; margin-right:5px; diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 4d79e34852..d8cc01705b 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -33648,6 +33648,11 @@ width: 68px; height: 68px; } +.inventory_quest_scroll_virtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_virtualPet.png'); + width: 68px; + height: 68px; +} .inventory_quest_scroll_waffle { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_waffle.png'); width: 68px; @@ -50113,8 +50118,8 @@ width: 81px; height: 99px; } -.Pet-BearCub-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Virtual.png'); +.Pet-BearCub-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-VirtualPet.png'); width: 81px; height: 99px; } @@ -50543,8 +50548,8 @@ width: 81px; height: 99px; } -.Pet-Cactus-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Virtual.png'); +.Pet-Cactus-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-VirtualPet.png'); width: 81px; height: 99px; } @@ -51078,8 +51083,8 @@ width: 81px; height: 99px; } -.Pet-Dragon-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Virtual.png'); +.Pet-Dragon-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-VirtualPet.png'); width: 81px; height: 99px; } @@ -51508,8 +51513,8 @@ width: 81px; height: 99px; } -.Pet-FlyingPig-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Virtual.png'); +.Pet-FlyingPig-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-VirtualPet.png'); width: 81px; height: 99px; } @@ -51793,8 +51798,8 @@ width: 81px; height: 99px; } -.Pet-Fox-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Virtual.png'); +.Pet-Fox-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-VirtualPet.png'); width: 81px; height: 99px; } @@ -52463,8 +52468,8 @@ width: 81px; height: 99px; } -.Pet-LionCub-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Virtual.png'); +.Pet-LionCub-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-VirtualPet.png'); width: 81px; height: 99px; } @@ -52963,8 +52968,8 @@ width: 81px; height: 99px; } -.Pet-PandaCub-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Virtual.png'); +.Pet-PandaCub-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-VirtualPet.png'); width: 81px; height: 99px; } @@ -54208,8 +54213,8 @@ width: 81px; height: 99px; } -.Pet-TigerCub-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Virtual.png'); +.Pet-TigerCub-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-VirtualPet.png'); width: 81px; height: 99px; } @@ -54808,8 +54813,8 @@ width: 81px; height: 99px; } -.Pet-Wolf-Virtual { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Virtual.png'); +.Pet-Wolf-VirtualPet { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-VirtualPet.png'); width: 81px; height: 99px; } diff --git a/website/client/src/assets/scss/animals.scss b/website/client/src/assets/scss/animals.scss index 7b1343523f..22239d1c5d 100644 --- a/website/client/src/assets/scss/animals.scss +++ b/website/client/src/assets/scss/animals.scss @@ -19,7 +19,7 @@ top: -16px !important; } -.Pet.Pet-FlyingPig-Veggie, .Pet.Pet-FlyingPig-Dessert, .Pet.Pet-FlyingPig-Virtual { +.Pet.Pet-FlyingPig-Veggie, .Pet.Pet-FlyingPig-Dessert, .Pet.Pet-FlyingPig-VirtualPet { top: -28px !important; } diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index 409e007288..339fadf53b 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -875,7 +875,7 @@ "questVirtualPetBoss": "Wotchimon", "questVirtualPetRageTitle": "The Beepening", "questVirtualPetRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Wotchiman will heal 30% of its remaining health!", - "questVirtualPetRageEffect": "Wotchimon uses Bothersome Beep!\n\nWotchiman sounds a bothersome beep, and its happiness bar suddenly disappears!", + "questVirtualPetRageEffect": "`Wotchimon uses Bothersome Beep!` Wotchimon sounds a bothersome beep, and its happiness bar suddenly disappears! Pending damage reduced.", "questVirtualPetDropVirtualPetPotion": "Virtual Pet Hatching Potion", - "questVirtualPetUnlockText": "Unlocks Virtual Pet Hatching Potion for purchase in the Market", + "questVirtualPetUnlockText": "Unlocks Virtual Pet Hatching Potion for purchase in the Market" } diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js index ce73b3d663..cdf3578061 100644 --- a/website/common/script/content/quests.js +++ b/website/common/script/content/quests.js @@ -3891,11 +3891,11 @@ const quests = { hp: 500, str: 2, rage: { - title: t('questWaffleVirtualPetTitle'), + title: t('questVirtualPetRageTitle'), description: t('questVirtualPetRageDescription'), value: 50, progressDrain: 0.5, - effect: t('questWaffleRageEffect'), + effect: t('questVirtualPetRageEffect'), }, }, drop: { @@ -3903,15 +3903,15 @@ const quests = { { type: 'hatchingPotions', key: 'VirtualPet', - text: t('questVirtualPetDropDessertPotion'), + text: t('questVirtualPetDropVirtualPetPotion'), }, { type: 'hatchingPotions', key: 'VirtualPet', - text: t('questVirtualPetDropDessertPotion'), + text: t('questVirtualPetDropVirtualPetPotion'), }, { type: 'hatchingPotions', key: 'VirtualPet', - text: t('questVirtualPetDropDessertPotion'), + text: t('questVirtualPetDropVirtualPetPotion'), }, ], gp: 40,