Compare commits

...

5 Commits

Author SHA1 Message Date
Matteo Pagliazzi a5a91a3a9c 4.134.3 2020-02-27 14:38:26 +01:00
Matteo Pagliazzi 3650426edc fix(task): hotfix for when task.attribute is sent as null 2020-02-27 14:25:26 +01:00
Sabe Jones 5db606dcfd fix(event): end Valentine's NPCs 2020-02-20 14:26:25 -06:00
Sabe Jones a7fd8f7f52 4.134.2 2020-02-20 13:26:49 -06:00
Phillip Thelen 0b57c0a22d Unify behaviour for shops (#11829)
* Change price for basilist and dustbunnies

* return correct unlockCondition for moon quests

* Fix basilist not being buyable
2020-02-20 13:24:43 -06:00
7 changed files with 16 additions and 11 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.134.1",
"version": "4.134.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.134.1",
"version": "4.134.3",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.8.4",
@@ -2,11 +2,11 @@
// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
// more to be added on future seasons
$npc_market_flavor: 'valentines';
$npc_market_flavor: 'normal';
$npc_quests_flavor: 'normal';
$npc_seasonal_flavor: 'normal';
$npc_timetravelers_flavor: 'normal';
$npc_tavern_flavor: 'valentines';
$npc_tavern_flavor: 'normal';
$restingToolbarHeight: 40px;
$menuToolbarHeight: 56px;
@@ -209,7 +209,6 @@
<!-- eslint-disable vue/no-use-v-if-with-v-for, max-len -->
<div
v-for="(items, key) in getGrouped(questItems(category, selectedSortItemsBy,searchTextThrottled, hideLocked, hidePinned))"
v-if="key !== 'questGroupEarnable'"
:key="key"
class="group"
>
+5 -5
View File
@@ -1067,7 +1067,7 @@ const quests = {
notes: t('questBasilistNotes'),
group: 'questGroupEarnable',
completion: t('questBasilistCompletion'),
value: 4,
goldValue: 100,
category: 'unlockable',
unlockCondition: {
condition: 'party invite',
@@ -2238,7 +2238,7 @@ const quests = {
notes: t('questDustBunniesNotes'),
group: 'questGroupEarnable',
completion: t('questDustBunniesCompletion'),
value: 4,
value: 1,
category: 'unlockable',
unlockCondition: {
condition: 'party invite',
@@ -2262,7 +2262,7 @@ const quests = {
value: 4,
category: 'unlockable',
unlockCondition: {
condition: 'party invite',
condition: 'login reward',
incentiveThreshold: 7,
text: t('loginReward', { count: 7 }),
},
@@ -2293,7 +2293,7 @@ const quests = {
value: 4,
category: 'unlockable',
unlockCondition: {
condition: 'party invite',
condition: 'login reward',
incentiveThreshold: 22,
text: t('loginReward', { count: 22 }),
},
@@ -2323,7 +2323,7 @@ const quests = {
value: 4,
category: 'unlockable',
unlockCondition: {
condition: 'party invite',
condition: 'login reward',
incentiveThreshold: 40,
text: t('loginReward', { count: 40 }),
},
@@ -42,7 +42,7 @@ export class BuyQuestWithGoldOperation extends AbstractGoldItemOperation { // es
if (!item) throw new NotFound(errorMessage('questNotFound', { key }));
if (!(item.category === 'gold' && item.goldValue)) {
if (!(item.goldValue)) {
throw new NotAuthorized(this.i18n('questNotGoldPurchasable', { key }));
}
+6
View File
@@ -162,6 +162,12 @@ TaskSchema.plugin(baseModel, {
}
}
// Fix issue where iOS was sending null as the value of the attribute field
// See https://github.com/HabitRPG/habitica-ios/commit/4cd05f80363502eb7652e057aa564c85546f7806
if (taskObj.attribute === null) {
taskObj.attribute = 'str';
}
return taskObj;
},
private: [],