sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 23:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2021-05-13 15:09:38 -05:00
commit 9f17c3eac4
9 changed files with 61 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.192.1",
"version": "4.192.2",
"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.192.1",
"version": "4.192.2",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.13.16",

10
website/client/src/components/shops/quests/buyQuestModal.vue
View file

@ -26,7 +26,10 @@
class="content"
>
<div class="inner-content">
<questDialogContent :item="item" />
<questDialogContent
:item="item"
:abbreviated="true"
/>
<div
v-if="!item.locked"
class="purchase-amount"
@ -131,11 +134,6 @@
padding-bottom: 0px;
}
.questInfo {
width: 70%;
margin: 0 auto 10px auto;
}
.right-sidebar {
position: absolute;
right: -350px;

1
website/client/src/components/shops/quests/questDialogContent.vue
View file

@ -14,6 +14,7 @@
<questInfo
class="questInfo"
:quest="item"
:abbreviated="true"
/>
</div>
</template>

75
website/client/src/components/shops/quests/questInfo.vue
View file

@ -1,42 +1,43 @@
<template>
<div>
<div
class="d-flex flex-column justify-content-center"
>
<div
class="row"
v-if="quest.collect"
class="table-row m-auto"
>
<div
v-if="quest.collect"
class="table-row"
>
<dt>{{ $t('collect') + ':' }}</dt>
<dd>
<div
v-for="(collect, key) of quest.collect"
:key="key"
>
<span>{{ collect.count }} {{ getCollectText(collect) }}</span>
</div>
</dd>
</div>
<div
v-if="quest.boss"
class="table-row"
>
<dt>{{ $t('bossHP') + ':' }}</dt>
<dd>{{ quest.boss.hp }}</dd>
</div>
<div class="table-row">
<dt>{{ $t('difficulty') + ':' }}</dt>
<dd>
<div
v-for="(star, index) of stars()"
:key="index"
class="svg-icon inline icon-16"
v-html="icons[star]"
></div>
</dd>
</div>
<dt>{{ $t('collect') + ':' }}</dt>
<dd>
<div
v-for="(collect, key) of quest.collect"
:key="key"
>
<span>{{ collect.count }} {{ getCollectText(collect) }}</span>
</div>
</dd>
</div>
<div v-if="quest.event">
<div
v-if="quest.boss"
class="table-row m-auto"
>
<dt>{{ $t('bossHP') + ':' }}</dt>
<dd>{{ quest.boss.hp }}</dd>
</div>
<div class="table-row m-auto">
<dt>{{ $t('difficulty') + ':' }}</dt>
<dd>
<div
v-for="(star, index) of stars()"
:key="index"
class="svg-icon inline icon-16"
v-html="icons[star]"
></div>
</dd>
</div>
<div
v-if="quest.event && !abbreviated"
class="m-auto"
>
{{ limitedString }}
</div>
</div>
@ -131,6 +132,10 @@ export default {
quest: {
type: Object,
},
abbreviated: {
type: Boolean,
default: false,
},
},
data () {
return {

20
website/common/locales/en/gear.json
View file

@ -2156,25 +2156,25 @@
"shieldArmoireSoftPinkPillowNotes": "The sensible warrior packs a pillow for any expedition. Soften life's blows... even while you nap. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Pink Loungewear Set (item 3 of 3).",
"shieldArmoireClownsBalloonsText": "Clown's Balloons",
"shieldArmoireClownsBalloonsNotes": "Be careful: replacing these balloons would be a bit expensive... because of the inflation! Increases Perception by <%= per %>. Enchanted Armoire: Clown Set (Item 4 of 5).",
"shieldArmoireStrawberryFoodText": "Strawberry",
"shieldArmoireStrawberryFoodText": "Decorative Strawberry",
"shieldArmoireStrawberryFoodNotes": "A delicious fresh strawberry to feed to your pets! Do you know which pets like strawberries best? Increases Strength by <%= str %>. Enchanted Armoire: Pet Food Set (Item 1 of 10).",
"shieldArmoireRottenMeatFoodText": "Rotten Meat",
"shieldArmoireRottenMeatFoodText": "Decorative Rotten Meat",
"shieldArmoireRottenMeatFoodNotes": "Hold your nose! This rotten meat might be disgusting to you, but it's perfect for some of your pets! Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 2 of 10).",
"shieldArmoirePotatoFoodText": "Potato",
"shieldArmoirePotatoFoodText": "Decorative Potato",
"shieldArmoirePotatoFoodNotes": "Potatoes are a staple of many diets, but some pets would like to live on potatoes alone... Increases Perception by <%= per %>. Enchanted Armoire: Pet Food Set (Item 3 of 10).",
"shieldArmoirePinkCottonCandyFoodText": "Pink Cotton Candy",
"shieldArmoirePinkCottonCandyFoodText": "Decorative Pink Cotton Candy",
"shieldArmoirePinkCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Intelligence by <%= int %>. Enchanted Armoire: Pet Food Set (Item 4 of 10).",
"shieldArmoireMilkFoodText": "Milk",
"shieldArmoireMilkFoodText": "Decorative Milk",
"shieldArmoireMilkFoodNotes": "There are many sayings about the health benefits of milk, but the pets who favor it just love its creamy taste. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Pet Food Set (Item 10 of 10)",
"shieldArmoireMeatFoodText": "Meat",
"shieldArmoireMeatFoodText": "Decorative Meat",
"shieldArmoireMeatFoodNotes": "Sometimes a bit of protein is what you need to grow up big and strong. Some of your pets are more eager for it than others! Increases Strength by <%= str %>. Enchanted Armoire: Pet Food Set (Item 5 of 10).",
"shieldArmoireHoneyFoodText": "Honey",
"shieldArmoireHoneyFoodText": "Decorative Honey",
"shieldArmoireHoneyFoodNotes": "Watch out for sticky paws once you've fed your pets this honey! Some pets crave this natural sweetness; can you guess who? Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Pet Food Set (Item 6 of 10).",
"shieldArmoireFishFoodText": "Fish",
"shieldArmoireFishFoodText": "Decorative Fish",
"shieldArmoireFishFoodNotes": "This fish will help your pets have good bones! But you'll have to guess which of your pets like it the most. Increases Perception by <%= per %>. Enchanted Armoire: Pet Food Set (Item 7 of 10).",
"shieldArmoireChocolateFoodText": "Chocolate",
"shieldArmoireChocolateFoodText": "Decorative Chocolate",
"shieldArmoireChocolateFoodNotes": "Everybody likes a little chocolate, but some of your pets are keener than others... Increases Intelligence by <%= int %>. Enchanted Armoire: Pet Food Set (Item 8 of 10).",
"shieldArmoireBlueCottonCandyFoodText": "Blue Cotton Candy",
"shieldArmoireBlueCottonCandyFoodText": "Decorative Blue Cotton Candy",
"shieldArmoireBlueCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 9 of 10).",
"back": "Back Accessory",

3
website/common/script/content/bundles.js
View file

@ -21,8 +21,9 @@ const bundles = {
'harpy',
'owl',
],
event: EVENTS.potions202105,
canBuy () {
return moment().isBetween('2019-05-09', '2019-06-02');
return moment().isBefore(EVENTS.potions202105.end);
},
type: 'quests',
class: 'quest_bundle_featheredFriends',

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

@ -102,7 +102,7 @@ const premium = {
event: EVENTS.potions202105,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndMay'),
previousDate: t('mayYYYY', { year: 2016 }),
previousDate: t('mayYYYY', { year: 2019 }),
}),
canBuy () {
return moment().isBefore(EVENTS.potions202105.end);

1
website/common/script/libs/getItemInfo.js
View file

@ -122,6 +122,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
purchaseType: 'bundles',
path: `bundles.${item.key}`,
pinType: 'bundles',
event: item.event,
};
break;
case 'quests': // eslint-disable-line no-case-declarations