krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unify behaviour for shops (#11829)

Browse Source 
* Change price for basilist and dustbunnies

* return correct unlockCondition for moon quests

* Fix basilist not being buyable
This commit is contained in:
Phillip Thelen
2020-02-20 20:24:43 +01:00
committed by GitHub
parent 12afdc1681
commit 0b57c0a22d
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/client/src/components/shops/quests/index.vue
View File

@@ -209,7 +209,6 @@
<!-- eslint-disable vue/no-use-v-if-with-v-for, max-len --> <!-- eslint-disable vue/no-use-v-if-with-v-for, max-len -->
<div <div
v-for="(items, key) in getGrouped(questItems(category, selectedSortItemsBy,searchTextThrottled, hideLocked, hidePinned))" v-for="(items, key) in getGrouped(questItems(category, selectedSortItemsBy,searchTextThrottled, hideLocked, hidePinned))"
v-if="key !== 'questGroupEarnable'"
:key="key" :key="key"
class="group" class="group"
> >

10
website/common/script/content/quests.js
View File

@@ -1067,7 +1067,7 @@ const quests = {
notes: t('questBasilistNotes'), notes: t('questBasilistNotes'),
group: 'questGroupEarnable', group: 'questGroupEarnable',
completion: t('questBasilistCompletion'), completion: t('questBasilistCompletion'),
value: 4, goldValue: 100,
category: 'unlockable', category: 'unlockable',
unlockCondition: { unlockCondition: {
condition: 'party invite', condition: 'party invite',
@@ -2238,7 +2238,7 @@ const quests = {
notes: t('questDustBunniesNotes'), notes: t('questDustBunniesNotes'),
group: 'questGroupEarnable', group: 'questGroupEarnable',
completion: t('questDustBunniesCompletion'), completion: t('questDustBunniesCompletion'),
value: 4, value: 1,
category: 'unlockable', category: 'unlockable',
unlockCondition: { unlockCondition: {
condition: 'party invite', condition: 'party invite',
@@ -2262,7 +2262,7 @@ const quests = {
value: 4, value: 4,
category: 'unlockable', category: 'unlockable',
unlockCondition: { unlockCondition: {
condition: 'party invite', condition: 'login reward',
incentiveThreshold: 7, incentiveThreshold: 7,
text: t('loginReward', { count: 7 }), text: t('loginReward', { count: 7 }),
}, },
@@ -2293,7 +2293,7 @@ const quests = {
value: 4, value: 4,
category: 'unlockable', category: 'unlockable',
unlockCondition: { unlockCondition: {
condition: 'party invite', condition: 'login reward',
incentiveThreshold: 22, incentiveThreshold: 22,
text: t('loginReward', { count: 22 }), text: t('loginReward', { count: 22 }),
}, },
@@ -2323,7 +2323,7 @@ const quests = {
value: 4, value: 4,
category: 'unlockable', category: 'unlockable',
unlockCondition: { unlockCondition: {
condition: 'party invite', condition: 'login reward',
incentiveThreshold: 40, incentiveThreshold: 40,
text: t('loginReward', { count: 40 }), text: t('loginReward', { count: 40 }),
}, },

2
website/common/script/ops/buy/buyQuestGold.js
View File

@@ -42,7 +42,7 @@ export class BuyQuestWithGoldOperation extends AbstractGoldItemOperation { // es
if (!item) throw new NotFound(errorMessage('questNotFound', { key })); if (!item) throw new NotFound(errorMessage('questNotFound', { key }));
if (!(item.category === 'gold' && item.goldValue)) { if (!(item.goldValue)) {
throw new NotAuthorized(this.i18n('questNotGoldPurchasable', { key })); throw new NotAuthorized(this.i18n('questNotGoldPurchasable', { key }));
} }