Squashed commit of the following:
commit 866f074a15512e2f897d007ad1a5379ffee456d7 Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 18 15:51:18 2026 -0500 fix(quests): remove backticks from text commit d06fc2825e8638d5c127277f92ef94f26f3daba0 Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 18 13:16:32 2026 -0500 fix(background): add missing data commit 55156c5f808e3ad9bf16d6465b5b7596fce12631 Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 18 13:00:43 2026 -0500 fix(lint): max-len commit db88092acfceac7c465c1e01638ae18bd1572ee3 Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 18 12:56:30 2026 -0500 fix(customization): show event backgrounds for AF commit d6fd1ce7fa1b15771786518656a6663e46ba42bc Author: Phillip Thelen <phillip@habitica.com> Date: Tue Mar 17 15:55:53 2026 +0100 set release date commit b876d8c78928283a81fadfeb1116e09c73f3e25f Author: Phillip Thelen <phillip@habitica.com> Date: Tue Mar 17 11:40:17 2026 +0100 Improve swap handling commit f75a4d01473b492ef28b2324f2defe46cb3845f8 Author: Phillip Thelen <phillip@habitica.com> Date: Tue Mar 17 11:22:42 2026 +0100 use correct name for bear sprites commit 195db1b1328a73043e1a1c9014e9ce22a3df72f3 Author: Phillip Thelen <phillip@habitica.com> Date: Mon Mar 16 23:01:35 2026 +0100 more fix commit a42d3f08d749abf2a072805e4c54f67564c1e320 Author: Phillip Thelen <phillip@habitica.com> Date: Mon Mar 16 18:43:21 2026 +0100 fix test commit 9c06299c343fd29c5dcddfe62e83d410f6c93115 Author: Phillip Thelen <phillip@habitica.com> Date: Mon Mar 16 09:13:13 2026 +0100 AF tweaks commit 5465e23e679cad1d81404a0911204aaf18c231b7 Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 11 19:43:01 2026 -0500 fix(sprites): add missing gif redirects commit 5721ecc6f2b21fd6049a028fddc79fb6dea0434e Author: Kalista Payne <kalista@habitica.com> Date: Tue Mar 10 16:34:26 2026 -0500 chore(css): run sprites commit 2184ff2e6937459c404f3067c9d0662c9d908074 Author: Kalista Payne <kalista@habitica.com> Date: Tue Mar 10 10:38:34 2026 -0500 fix(test): date commit d684a7297c2f86f417677a1f0fa7ae47c8d4d1d6 Author: Kalista Payne <kalista@habitica.com> Date: Tue Mar 10 10:32:04 2026 -0500 fix(test): update for 2026, also more lint commit 82e7947fd7bc99d1dd33ff08490f2bda0ff74d2b Author: Kalista Payne <kalista@habitica.com> Date: Tue Mar 10 10:22:05 2026 -0500 fix(event): lint and missing pieces commit 96818b2d778848fdbff99afdf50b9f305c25b1a9 Author: Kalista Payne <kalista@habitica.com> Date: Mon Mar 9 20:11:22 2026 -0500 feat(event): finished Alien build commit 4c9763b676f5873d83c4c9c249e7e0ffb5905a2e Author: Kalista Payne <kalista@habitica.com> Date: Fri Mar 6 16:30:36 2026 -0600 wip(event): April Fools 2026 build commit 2f16a016e63f523c81a9425d5d7c49e9138c46a5 Author: Phillip Thelen <phillip@habitica.com> Date: Wed Feb 4 14:16:50 2026 +0100 add april fools tests commit cd1d926c9898f5faf4fe82e4ecccc4d801248f06 Author: Phillip Thelen <phillip@habitica.com> Date: Wed Feb 4 14:09:16 2026 +0100 make april fools cycle through commit d8a4216c412437448ea15f8fd456765ebd5f53f9 Author: Phillip Thelen <phillip@habitica.com> Date: Mon Feb 2 14:41:26 2026 +0100 fix lint commit 8265a15923f34ad1afdaab05992c3def5cb4d202 Author: Phillip Thelen <phillip@habitica.com> Date: Mon Feb 2 12:34:46 2026 +0100 name key more generic commit 9c7bde8ad563bd346b548fdf59fb0454910ae256 Author: Phillip Thelen <phillip@habitica.com> Date: Mon Feb 2 12:26:43 2026 +0100 right date for april fools commit c2b92c6311d60a609e8b8743fc0efe3cbac853b6 Author: Phillip Thelen <phillip@habitica.com> Date: Mon Feb 2 12:26:19 2026 +0100 rework how april fools works
This commit is contained in:
@@ -321,10 +321,11 @@ export default {
|
||||
return null;
|
||||
},
|
||||
petClass () {
|
||||
const foolEvent = this.currentEventList?.find(event => event.aprilFools && moment()
|
||||
.isBetween(event.start, event.end));
|
||||
if (foolEvent) {
|
||||
return this.foolPet(this.member.items.currentPet, foolEvent.aprilFools);
|
||||
const substitutionEvent = this.currentEventList?.find(event => event.spriteSubstitutions
|
||||
&& moment().isBetween(event.start, event.end));
|
||||
if (substitutionEvent && substitutionEvent.spriteSubstitutions.pets) {
|
||||
return this.foolPet(`Pet-${this.member.items.currentPet}`,
|
||||
substitutionEvent.spriteSubstitutions.pets);
|
||||
}
|
||||
if (this.member?.items.currentPet) return `Pet-${this.member.items.currentPet}`;
|
||||
return '';
|
||||
|
||||
@@ -187,7 +187,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="user.purchased.background.birthday_bash"
|
||||
v-if="user.purchased.background.birthday_bash
|
||||
|| user.purchased.background.on_a_strange_planet"
|
||||
>
|
||||
<div
|
||||
class="row justify-content-center title-row mb-3"
|
||||
|
||||
@@ -182,12 +182,10 @@ export default {
|
||||
return 'GreyedOut';
|
||||
},
|
||||
imageName () {
|
||||
const foolEvent = this.currentEventList?.find(event => moment()
|
||||
.isBetween(event.start, event.end) && event.aprilFools);
|
||||
if (this.isOwned() && foolEvent) {
|
||||
if (this.isSpecial()) return `stable_${this.foolPet(this.item.key, foolEvent.aprilFools)}`;
|
||||
const petString = `${this.item.eggKey}-${this.item.key}`;
|
||||
return `stable_${this.foolPet(petString, foolEvent.aprilFools)}`;
|
||||
const substitutionEvent = this.currentEventList?.find(event => moment()
|
||||
.isBetween(event.start, event.end) && event.spriteSubstitutions);
|
||||
if (this.isOwned() && substitutionEvent && substitutionEvent.spriteSubstitutions.pets) {
|
||||
return `stable_${this.foolPet(`Pet-${this.item.key}`, substitutionEvent.spriteSubstitutions.pets)}`;
|
||||
}
|
||||
|
||||
if (this.isOwned() || (this.mountOwned() && this.isHatchable())) {
|
||||
|
||||
Reference in New Issue
Block a user