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

Squashed commit of the following:

Browse Source 
commit 0eb12305a58c148027759ea257f0f287796afdda
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 17:13:05 2024 -0500

    feat(event): start April 1 midnight end April 2 8pm

commit de75cf2b9616ad4fe56051d5644c556bd40b874e
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 08:52:01 2024 -0500

    fix(event): correct start timing

commit 34b72be4f447f00c31169c4cd6e8ba79655adf8a
Author: Sabe Jones <sabe@habitica.com>
Date:   Wed Mar 27 08:56:27 2024 -0500

    feat(event): AF by @CuriousMagpie
This commit is contained in:
Sabe Jones
2024-03-28 17:17:17 -05:00
parent c762146ec9
commit ef1f27c09f
7 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@
height: 219px; height: 219px;
} }
.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet { .Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet, .Pet_HatchingPotion_Fungi {
width: 68px; width: 68px;
height: 68px; height: 68px;
} }
@@ -43,6 +43,10 @@
background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_VirtualPet.gif") no-repeat; background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_VirtualPet.gif") no-repeat;
} }
.Pet_HatchingPotion_Fungi {
background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Fungi.gif") no-repeat;
}
.Gems { .Gems {
display:inline-block; display:inline-block;
margin-right:5px; margin-right:5px;

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

@@ -38392,11 +38392,6 @@
width: 68px; width: 68px;
height: 68px; height: 68px;
} }
.inventory_quest_scroll_fungus {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_fungus.png');
width: 68px;
height: 68px;
}
.inventory_quest_scroll_ghost_stag { .inventory_quest_scroll_ghost_stag {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_ghost_stag.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_ghost_stag.png');
width: 68px; width: 68px;
@@ -55557,8 +55552,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-BearCub-Fungus { .Pet-BearCub-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -56017,8 +56012,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-Cactus-Fungus { .Pet-Cactus-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -56572,8 +56567,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-Dragon-Fungus { .Pet-Dragon-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -57037,8 +57032,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-FlyingPig-Fungus { .Pet-FlyingPig-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -57342,8 +57337,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-Fox-Fungus { .Pet-Fox-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -58042,8 +58037,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-LionCub-Fungus { .Pet-LionCub-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -58567,8 +58562,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-PandaCub-Fungus { .Pet-PandaCub-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -59832,8 +59827,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-TigerCub-Fungus { .Pet-TigerCub-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -60452,8 +60447,8 @@
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
.Pet-Wolf-Fungus { .Pet-Wolf-Fungi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Fungus.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Fungi.png');
width: 81px; width: 81px;
height: 99px; height: 99px;
} }
@@ -60812,11 +60807,6 @@
width: 68px; width: 68px;
height: 68px; height: 68px;
} }
.Pet_HatchingPotion_Fungus {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Fungus.png');
width: 68px;
height: 68px;
}
.Pet_HatchingPotion_Ghost { .Pet_HatchingPotion_Ghost {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Ghost.png'); background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Ghost.png');
width: 68px; width: 68px;

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

@@ -19,7 +19,7 @@
top: -16px !important; top: -16px !important;
} }
$foolPets: Veggie, Dessert, VirtualPet, TeaShop; $foolPets: Veggie, Dessert, VirtualPet, TeaShop, Fungi;
@each $foolPet in $foolPets { @each $foolPet in $foolPets {
.Pet.Pet-FlyingPig-#{$foolPet} { .Pet.Pet-FlyingPig-#{$foolPet} {

2
website/client/src/components/avatar.vue
View File

@@ -250,7 +250,7 @@ export default {
petClass () { petClass () {
if (some( if (some(
this.currentEventList, this.currentEventList,
event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'teaShop', event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'Fungi',
)) { )) {
return this.foolPet(this.member.items.currentPet); return this.foolPet(this.member.items.currentPet);
} }

2
website/client/src/components/inventory/stable/petItem.vue
View File

@@ -171,7 +171,7 @@ export default {
getPetItemClass () { getPetItemClass () {
if (this.isOwned() && some( if (this.isOwned() && some(
this.currentEventList, this.currentEventList,
event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'teaShop', event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'Fungi',
)) { )) {
if (this.isSpecial()) return `Pet ${this.foolPet(this.item.key)}`; if (this.isSpecial()) return `Pet ${this.foolPet(this.item.key)}`;
const petString = `${this.item.eggKey}-${this.item.key}`; const petString = `${this.item.eggKey}-${this.item.key}`;

8
website/client/src/mixins/foolPet.js
View File

@@ -40,15 +40,15 @@ export default {
'Dragon', 'Dragon',
'Cactus', 'Cactus',
]; ];
if (!pet) return 'Pet-TigerCub-TeaShop'; if (!pet) return 'Pet-TigerCub-Fungi';
if (SPECIAL_PETS.indexOf(pet) !== -1) { if (SPECIAL_PETS.indexOf(pet) !== -1) {
return 'Pet-Dragon-TeaShop'; return 'Pet-Dragon-Fungi';
} }
const species = pet.slice(0, pet.indexOf('-')); const species = pet.slice(0, pet.indexOf('-'));
if (includes(BASE_PETS, species)) { if (includes(BASE_PETS, species)) {
return `Pet-${species}-TeaShop`; return `Pet-${species}-Fungi`;
} }
return 'Pet-BearCub-TeaShop'; return 'Pet-BearCub-Fungi';
}, },
}, },
}; };

9
website/common/script/content/constants/events.js
View File

@@ -10,11 +10,16 @@ const gemsPromo = {
export const EVENTS = { export const EVENTS = {
noEvent: { noEvent: {
start: '2024-05-01T00:00-05:00', start: '2024-05-01T00:00-04:00',
end: '2024-06-20T08:00-05:00', end: '2024-06-20T23:59-04:00',
season: 'normal', season: 'normal',
npcImageSuffix: '', npcImageSuffix: '',
}, },
aprilFools2024: {
start: '2024-04-01T00:00-04:00',
end: '2024-04-02T20:00-04:00',
aprilFools: 'Fungi',
},
spring2024: { spring2024: {
start: '2024-03-21T00:00-04:00', start: '2024-03-21T00:00-04:00',
end: '2024-04-30T23:59-04:00', end: '2024-04-30T23:59-04:00',