sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-04-14 19:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
SabreCat 2022-08-15 15:36:18 -05:00
commit 71fa4d6cb7
8 changed files with 220 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
habitica-images

@ -1 +1 @@
Subproject commit 6e9d17b8a4af295ba2d9dc9870b2904035d6fba7
Subproject commit 6610fcd01761149ce5391cbe85a249fd80d7983c

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.239.0",
"version": "4.240.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.239.0",
"version": "4.240.0",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.18.10",

185
website/client/src/assets/css/sprites/spritesmith-main.css
View file

@ -36693,6 +36693,11 @@
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_BearCub-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_BearCub-Rainbow.png');
width: 105px;
@ -37108,6 +37113,11 @@
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Cactus-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Cactus-Rainbow.png');
width: 105px;
@ -37623,6 +37633,11 @@
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Dragon-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Dragon-Rainbow.png');
width: 105px;
@ -38038,6 +38053,11 @@
width: 105px;
height: 105px;
}
.Mount_Body_FlyingPig-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_FlyingPig-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Body_FlyingPig-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_FlyingPig-Rainbow.png');
width: 105px;
@ -38303,6 +38323,11 @@
width: 105px;
height: 105px;
}
.Mount_Body_Fox-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Fox-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Body_Fox-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Fox-Rainbow.png');
width: 105px;
@ -38958,6 +38983,11 @@
width: 105px;
height: 105px;
}
.Mount_Body_LionCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_LionCub-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Body_LionCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_LionCub-Rainbow.png');
width: 105px;
@ -39443,6 +39473,11 @@
width: 105px;
height: 105px;
}
.Mount_Body_PandaCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_PandaCub-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Body_PandaCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_PandaCub-Rainbow.png');
width: 105px;
@ -40663,6 +40698,11 @@
width: 105px;
height: 105px;
}
.Mount_Body_TigerCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_TigerCub-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Body_TigerCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_TigerCub-Rainbow.png');
width: 105px;
@ -41238,6 +41278,11 @@
width: 135px;
height: 135px;
}
.Mount_Body_Wolf-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Wolf-Porcelain.png');
width: 135px;
height: 135px;
}
.Mount_Body_Wolf-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Wolf-Rainbow.png');
width: 135px;
@ -41758,6 +41803,11 @@
width: 105px;
height: 105px;
}
.Mount_Head_BearCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_BearCub-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Head_BearCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_BearCub-Rainbow.png');
width: 105px;
@ -42173,6 +42223,11 @@
width: 105px;
height: 105px;
}
.Mount_Head_Cactus-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Cactus-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Head_Cactus-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Cactus-Rainbow.png');
width: 105px;
@ -42688,6 +42743,11 @@
width: 105px;
height: 105px;
}
.Mount_Head_Dragon-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Dragon-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Head_Dragon-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Dragon-Rainbow.png');
width: 105px;
@ -43103,6 +43163,11 @@
width: 105px;
height: 105px;
}
.Mount_Head_FlyingPig-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_FlyingPig-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Head_FlyingPig-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_FlyingPig-Rainbow.png');
width: 105px;
@ -43368,6 +43433,11 @@
width: 105px;
height: 105px;
}
.Mount_Head_Fox-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Fox-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Head_Fox-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Fox-Rainbow.png');
width: 105px;
@ -44023,6 +44093,11 @@
width: 105px;
height: 105px;
}
.Mount_Head_LionCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_LionCub-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Head_LionCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_LionCub-Rainbow.png');
width: 105px;
@ -44508,6 +44583,11 @@
width: 105px;
height: 105px;
}
.Mount_Head_PandaCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_PandaCub-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Head_PandaCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_PandaCub-Rainbow.png');
width: 105px;
@ -45728,6 +45808,11 @@
width: 105px;
height: 105px;
}
.Mount_Head_TigerCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_TigerCub-Porcelain.png');
width: 105px;
height: 105px;
}
.Mount_Head_TigerCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_TigerCub-Rainbow.png');
width: 105px;
@ -46303,6 +46388,11 @@
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Wolf-Porcelain.png');
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Wolf-Rainbow.png');
width: 135px;
@ -46828,6 +46918,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_BearCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_BearCub-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_BearCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_BearCub-Rainbow.png');
width: 81px;
@ -47243,6 +47338,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_Cactus-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Cactus-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Cactus-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Cactus-Rainbow.png');
width: 81px;
@ -47758,6 +47858,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_Dragon-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Dragon-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Dragon-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Dragon-Rainbow.png');
width: 81px;
@ -48173,6 +48278,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_FlyingPig-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_FlyingPig-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_FlyingPig-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_FlyingPig-Rainbow.png');
width: 81px;
@ -48438,6 +48548,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_Fox-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Fox-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Fox-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Fox-Rainbow.png');
width: 81px;
@ -49098,6 +49213,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_LionCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_LionCub-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_LionCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_LionCub-Rainbow.png');
width: 81px;
@ -49583,6 +49703,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_PandaCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_PandaCub-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_PandaCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_PandaCub-Rainbow.png');
width: 81px;
@ -50803,6 +50928,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_TigerCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_TigerCub-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_TigerCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_TigerCub-Rainbow.png');
width: 81px;
@ -51378,6 +51508,11 @@
width: 81px;
height: 99px;
}
.Mount_Icon_Wolf-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Wolf-Porcelain.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Wolf-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Wolf-Rainbow.png');
width: 81px;
@ -51908,6 +52043,11 @@
width: 81px;
height: 99px;
}
.Pet-BearCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-BearCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Rainbow.png');
width: 81px;
@ -52338,6 +52478,11 @@
width: 81px;
height: 99px;
}
.Pet-Cactus-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-Cactus-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Rainbow.png');
width: 81px;
@ -52873,6 +53018,11 @@
width: 81px;
height: 99px;
}
.Pet-Dragon-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-Dragon-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Rainbow.png');
width: 81px;
@ -53303,6 +53453,11 @@
width: 81px;
height: 99px;
}
.Pet-FlyingPig-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-FlyingPig-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Rainbow.png');
width: 81px;
@ -53583,6 +53738,11 @@
width: 81px;
height: 99px;
}
.Pet-Fox-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-Fox-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Rainbow.png');
width: 81px;
@ -54258,6 +54418,11 @@
width: 81px;
height: 99px;
}
.Pet-LionCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-LionCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Rainbow.png');
width: 81px;
@ -54758,6 +54923,11 @@
width: 81px;
height: 99px;
}
.Pet-PandaCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-PandaCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Rainbow.png');
width: 81px;
@ -56003,6 +56173,11 @@
width: 81px;
height: 99px;
}
.Pet-TigerCub-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-TigerCub-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Rainbow.png');
width: 81px;
@ -56598,6 +56773,11 @@
width: 81px;
height: 99px;
}
.Pet-Wolf-Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Porcelain.png');
width: 81px;
height: 99px;
}
.Pet-Wolf-Rainbow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Rainbow.png');
width: 81px;
@ -56928,6 +57108,11 @@
width: 68px;
height: 68px;
}
.Pet_HatchingPotion_Porcelain {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Porcelain.png');
width: 68px;
height: 68px;
}
.Pet_HatchingPotion_Purple {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Purple.png');
width: 68px;

1
website/common/locales/en/content.json
View file

@ -309,6 +309,7 @@
"hatchingPotionSolarSystem": "Solar System",
"hatchingPotionOnyx": "Onyx",
"hatchingPotionVirtualPet": "Virtual Pet",
"hatchingPotionPorcelain": "Porcelain",
"hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
"premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",

16
website/common/script/content/constants/events.js
View file

@ -9,12 +9,18 @@ const gemsPromo = {
};
export const EVENTS = {
noCurrentEventAfter: {
start: '2022-09-30T20:00-04:00',
noCurrentEvent: {
start: '2022-08-31T20:00-04:00',
end: '2022-12-21T08:00-04:00',
season: 'normal',
npcImageSuffix: '',
},
potions202208: {
start: '2022-08-16T08:00-04:00',
end: '2022-08-31T20:00-04:00',
season: 'normal',
npcImageSuffix: '',
},
bundle202208: {
start: '2022-08-09T08:00-04:00',
end: '2022-09-30T20:00-04:00',
@ -28,12 +34,6 @@ export const EVENTS = {
npcImageSuffix: '_summer',
gear: true,
},
noCurrentEvent: {
start: '2022-04-30T20:00-04:00',
end: '2022-06-21T08:00-04:00',
season: 'normal',
npcImageSuffix: '',
},
bundle202206: {
start:'2022-06-14T08:00-04:00',
end:'2022-06-30T20:00-04:00',

17
website/common/script/content/hatching-potions.js
View file

@ -503,12 +503,13 @@ const premium = {
value: 2,
text: t('hatchingPotionMoonglow'),
limited: true,
event: EVENTS.potions202108,
event: EVENTS.potions202208,
_addlNotes: t('premiumPotionAddlNotes', {
date: t('dateEndAugust'),
previousDate: t('augustYYYY', { year: 2021 }),
}),
canBuy () {
return moment().isBetween(EVENTS.potions202108.start, EVENTS.potions202108.end);
return moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end);
},
},
SolarSystem: {
@ -525,6 +526,18 @@ const premium = {
canBuy: hasQuestAchievementFunction('onyx'),
_addlNotes: t('premiumPotionUnlimitedNotes'),
},
Porcelain: {
value: 2,
text: t('hatchingPotionPorcelain'),
limited: true,
event: EVENTS.potions202208,
_addlNotes: t('premiumPotionAddlNotes', {
date: t('dateEndAugust'),
}),
canBuy () {
return moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end);
},
},
};
const wacky = {

16
website/common/script/content/shop-featuredItems.js
View file

@ -5,7 +5,7 @@ import { EVENTS } from './constants';
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
if (moment().isBefore(EVENTS.summer2022.end)) {
if (moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end)) {
return [
{
type: 'armoire',
@ -13,15 +13,15 @@ const featuredItems = {
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Sunset',
path: 'premiumHatchingPotions.Moonglow',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Watery',
path: 'premiumHatchingPotions.Porcelain',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Aquatic',
type: 'food',
path: 'food.Milk',
},
];
}
@ -32,15 +32,15 @@ const featuredItems = {
},
{
type: 'food',
path: 'food.Honey',
path: 'food.RottenMeat',
},
{
type: 'hatchingPotions',
path: 'hatchingPotions.CottonCandyPink',
path: 'hatchingPotions.Zombie',
},
{
type: 'eggs',
path: 'eggs.BearCub',
path: 'eggs.Dragon',
},
];
},