Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into negue/ui/setting

Browse Source 
# Conflicts:
#	website/client/src/components/payments/selectUserModal.vue
#	website/client/src/components/settings/site.vue
#	website/client/src/router/index.js
This commit is contained in:
negue
2023-03-14 21:04:05 +01:00
parent dec1a1159d 377b152ffd
commit 576c80af7e
196 changed files with 3307 additions and 1481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/common/script/content/appearance/backgrounds.js
+10
View File
@@ -540,6 +540,16 @@ const backgrounds = {
snowy_temple: { },
winter_lake_with_swans: { },
},
backgrounds022023: {
in_front_of_fountain: { },
golden_birdcage: { },
fancy_bedroom: { },
},
backgrounds032023: {
jungle_watering_hole: { },
mangrove_forest: { },
old_timey_basketball_court: { },
},
eventBackgrounds: {
birthday_bash: {
price: 0,
website/common/script/content/bundles.js
+2 -1
View File
@@ -194,8 +194,9 @@ const bundles = {
'seaserpent',
'gryphon',
],
event: EVENTS.bundle202302,
canBuy () {
return moment().isBefore('2022-02-28T20:00-05:00');
return moment().isBetween(EVENTS.bundle202302.start, EVENTS.bundle202302.end);
},
type: 'quests',
value: 7,
website/common/script/content/constants/events.js
+16 -2
View File
@@ -10,11 +10,25 @@ const gemsPromo = {
export const EVENTS = {
noEvent: {
start: '2023-02-08T23:59-05:00',
end: '2023-02-14T08:00-05:00',
start: '2023-02-28T23:59-05:00',
end: '2023-03-21T08:00-05:00',
season: 'normal',
npcImageSuffix: '',
},
bundle202302: {
start: '2023-02-21T08:00-05:00',
end: '2023-02-28T23:59-05:00',
},
potions202302:{
start: '2023-02-13T08:00-05:00',
end: '2023-02-28T23:59-05:00',
},
valentines2023: {
start: '2023-02-13T08:00-05:00',
end: '2023-02-17T23:59-05:00',
season: 'valentines',
npcImageSuffix: '_valentines',
},
birthday10: {
start: '2023-01-30T08:00-05:00',
end: '2023-02-08T23:59-05:00',
website/common/script/content/gear/sets/armoire.js
+22
View File
@@ -411,6 +411,15 @@ const armor = {
shawlCollarCoat: {
con: 8,
},
teaGown: {
str: 5,
int: 5,
set: 'teaParty',
},
basketballUniform: {
per: 10,
set: 'oldTimeyBasketball',
},
};
const body = {
@@ -832,6 +841,10 @@ const head = {
per: 8,
set: 'fancyPirate',
},
teaHat: {
per: 10,
set: 'teaParty',
},
};
const shield = {
@@ -1133,6 +1146,15 @@ const shield = {
str: 10,
set: 'jewelers',
},
teaKettle: {
con: 10,
set: 'teaParty',
},
basketball: {
con: 5,
str: 5,
set: 'oldTimeyBasketball',
},
};
const headAccessory = {
website/common/script/content/gear/sets/mystery.js
+4
View File
@@ -97,6 +97,7 @@ const back = {
202205: { },
202206: { },
202301: { },
202302: { },
};
const body = {
@@ -123,6 +124,7 @@ const eyewear = {
'202204A': { mystery: '202204' },
'202204B': { mystery: '202204' },
202208: { },
202303: { },
301404: { },
301405: { },
301703: { },
@@ -200,6 +202,7 @@ const head = {
202210: { },
202211: { },
202301: { },
202303: { },
301404: { },
301405: { },
301703: { },
@@ -227,6 +230,7 @@ const headAccessory = {
202203: { },
202212: { },
202205: { },
202302: { },
301405: { },
};
website/common/script/content/hatching-potions.js
+19 -2
View File
@@ -62,8 +62,13 @@ const premium = {
value: 2,
text: t('hatchingPotionCupid'),
limited: true,
event: EVENTS.potions202302,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndFebruary'),
previousDate: t('februaryYYYY', { year: 2022 }),
}),
canBuy () {
return moment().isBefore('2022-02-28T20:00-05:00');
return moment().isBetween(EVENTS.potions202302.start, EVENTS.potions202302.end);
},
},
Shimmer: {
@@ -278,8 +283,13 @@ const premium = {
value: 2,
text: t('hatchingPotionRoseQuartz'),
limited: true,
event: EVENTS.potions202302,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndFebruary'),
previousDate: t('februaryYYYY', { year: 2022 }),
}),
canBuy () {
return moment().isBefore('2022-02-28T20:00-05:00');
return moment().isBetween(EVENTS.potions202302.start, EVENTS.potions202302.end);
},
},
Celestial: {
@@ -541,6 +551,13 @@ const premium = {
return moment().isBetween(EVENTS.birthday10.start, EVENTS.birthday10.end);
},
},
PinkMarble: {
value: 2,
text: t('hatchingPotionPinkMarble'),
limited: true,
canBuy: hasQuestAchievementFunction('pinkMarble'),
_addlNotes: t('premiumPotionUnlimitedNotes'),
},
};
const wacky = {
website/common/script/content/index.js
+2 -2
View File
@@ -137,7 +137,7 @@ api.cardTypes = {
valentine: {
key: 'valentine',
messageOptions: 4,
yearRound: moment().isBefore('2022-02-18T20:00-05:00'),
yearRound: moment().isBefore('2023-02-17T23:59-05:00'),
},
birthday: {
key: 'birthday',
@@ -203,7 +203,7 @@ api.specialMounts = stable.specialMounts;
api.mountInfo = stable.mountInfo;
// For seasonal events, change this constant:
const FOOD_SEASON = moment().isBefore('2022-02-02T20:00-05:00') ? 'Cake' : 'Normal';
const FOOD_SEASON = moment().isBefore('2023-03-15T12:00-05:00') ? 'Pie' : 'Normal';
api.food = {
Meat: {
website/common/script/content/quests/potions.js
+39
View File
@@ -170,6 +170,45 @@ const QUEST_POTIONS = {
unlock: t('questOnyxUnlockText'),
},
},
pinkMarble: {
text: t('questPinkMarbleText'),
notes: t('questPinkMarbleNotes'),
completion: t('questPinkMarbleCompletion'),
value: 4,
category: 'hatchingPotion',
boss: {
name: t('questPinkMarbleBoss'),
hp: 1200,
str: 2,
rage: {
title: t('questPinkMarbleRageTitle'),
description: t('questPinkMarbleRageDescription'),
value: 50,
progressDrain: 0.5,
effect: t('questPinkMarbleRageEffect'),
},
},
drop: {
items: [
{
type: 'hatchingPotions',
key: 'PinkMarble',
text: t('questPinkMarbleDropPinkMarblePotion'),
}, {
type: 'hatchingPotions',
key: 'PinkMarble',
text: t('questPinkMarbleDropPinkMarblePotion'),
}, {
type: 'hatchingPotions',
key: 'PinkMarble',
text: t('questPinkMarbleDropPinkMarblePotion'),
},
],
gp: 75,
exp: 800,
unlock: t('questPinkMarbleUnlockText'),
},
},
ruby: {
text: t('questRubyText'),
notes: t('questRubyNotes'),
website/common/script/content/shop-featuredItems.js
+9 -9
View File
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
if (moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end)) {
if (moment().isBetween(EVENTS.potions202302.start, EVENTS.potions202302.end)) {
return [
{
type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.StarryNight',
path: 'premiumHatchingPotions.RoseQuartz',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Holly',
path: 'premiumHatchingPotions.Cupid',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Aurora',
type: 'hatchingPotions',
path: 'hatchingPotions.CottonCandyPink',
},
];
}
@@ -45,19 +45,19 @@ const featuredItems = {
];
},
quests () {
if (moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end)) {
if (moment().isBetween(EVENTS.bundle202302.start, EVENTS.bundle202302.end)) {
return [
{
type: 'bundles',
path: 'bundles.winterQuests',
path: 'bundles.mythicalMarvels',
},
{
type: 'quests',
path: 'quests.whale',
path: 'quests.treeling',
},
{
type: 'quests',
path: 'quests.turtle',
path: 'quests.rock',
},
];
}
website/common/script/content/spells.js
+1 -1
View File
@@ -475,7 +475,7 @@ spells.special = {
target: 'user',
notes: t('valentineCardNotes'),
canOwn () {
return false;
return moment().isBetween('2023-02-13T08:00-05:00', '2023-02-17T23:59-05:00');
},
cast (user, target) {
if (user === target) {