krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 06:07:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(pets): various quest and animation corrections

Browse Source
This commit is contained in:
SabreCat
2022-04-05 16:03:46 -05:00
parent 1ca528eb95
commit fb017e1f08
6 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
habitica-images

Submodule habitica-images updated: c5147c3b47...9a49b61e94

12
website/client/src/assets/css/sprites.css
View File

@@ -16,7 +16,13 @@
height: 219px; 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; width: 68px;
height: 68px; height: 68px;
} }
@@ -33,6 +39,10 @@
background: url("~@/assets/images/animated/Pet_HatchingPotion_Windup.gif") no-repeat; 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 { .Gems {
display:inline-block; display:inline-block;
margin-right:5px; margin-right:5px;

41
website/client/src/assets/css/sprites/spritesmith-main.css
View File

@@ -33648,6 +33648,11 @@
width: 68px; width: 68px;
height: 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 { .inventory_quest_scroll_waffle {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_waffle.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_waffle.png');
width: 68px; width: 68px;
@@ -50113,8 +50118,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-BearCub-Virtual { .Pet-BearCub-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -50543,8 +50548,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-Cactus-Virtual { .Pet-Cactus-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -51078,8 +51083,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-Dragon-Virtual { .Pet-Dragon-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -51508,8 +51513,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-FlyingPig-Virtual { .Pet-FlyingPig-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -51793,8 +51798,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-Fox-Virtual { .Pet-Fox-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -52463,8 +52468,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-LionCub-Virtual { .Pet-LionCub-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -52963,8 +52968,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-PandaCub-Virtual { .Pet-PandaCub-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -54208,8 +54213,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-TigerCub-Virtual { .Pet-TigerCub-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -54808,8 +54813,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-Wolf-Virtual { .Pet-Wolf-VirtualPet {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Virtual.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-VirtualPet.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }

2
website/client/src/assets/scss/animals.scss
View File

@@ -19,7 +19,7 @@
top: -16px !important; 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; top: -28px !important;
} }

4
website/common/locales/en/questsContent.json
View File

@@ -875,7 +875,7 @@
"questVirtualPetBoss": "Wotchimon", "questVirtualPetBoss": "Wotchimon",
"questVirtualPetRageTitle": "The Beepening", "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!", "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", "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"
} }

10
website/common/script/content/quests.js
View File

@@ -3891,11 +3891,11 @@ const quests = {
hp: 500, hp: 500,
str: 2, str: 2,
rage: { rage: {
title: t('questWaffleVirtualPetTitle'), title: t('questVirtualPetRageTitle'),
description: t('questVirtualPetRageDescription'), description: t('questVirtualPetRageDescription'),
value: 50, value: 50,
progressDrain: 0.5, progressDrain: 0.5,
effect: t('questWaffleRageEffect'), effect: t('questVirtualPetRageEffect'),
}, },
}, },
drop: { drop: {
@@ -3903,15 +3903,15 @@ const quests = {
{ {
type: 'hatchingPotions', type: 'hatchingPotions',
key: 'VirtualPet', key: 'VirtualPet',
text: t('questVirtualPetDropDessertPotion'), text: t('questVirtualPetDropVirtualPetPotion'),
}, { }, {
type: 'hatchingPotions', type: 'hatchingPotions',
key: 'VirtualPet', key: 'VirtualPet',
text: t('questVirtualPetDropDessertPotion'), text: t('questVirtualPetDropVirtualPetPotion'),
}, { }, {
type: 'hatchingPotions', type: 'hatchingPotions',
key: 'VirtualPet', key: 'VirtualPet',
text: t('questVirtualPetDropDessertPotion'), text: t('questVirtualPetDropVirtualPetPotion'),
}, },
], ],
gp: 40, gp: 40,