diff --git a/package-lock.json b/package-lock.json index fb513a115c..efe48bc1fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.167.0", + "version": "4.167.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 46c4936696..20b20fec29 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.167.0", + "version": "4.167.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.12.3", diff --git a/website/client/src/assets/images/sprites/spritesmith-main-13.png b/website/client/src/assets/images/sprites/spritesmith-main-13.png index 7fbb5fad6a..950af243e6 100644 Binary files a/website/client/src/assets/images/sprites/spritesmith-main-13.png and b/website/client/src/assets/images/sprites/spritesmith-main-13.png differ diff --git a/website/client/src/assets/scss/variables.scss b/website/client/src/assets/scss/variables.scss index 82b2befb0a..e411e6ab13 100644 --- a/website/client/src/assets/scss/variables.scss +++ b/website/client/src/assets/scss/variables.scss @@ -2,10 +2,10 @@ // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, normal // more to be added on future seasons -$npc_market_flavor: 'habitoween'; -$npc_quests_flavor: 'habitoween'; -$npc_seasonal_flavor: 'habitoween'; -$npc_timetravelers_flavor: 'fall'; -$npc_tavern_flavor: 'habitoween'; +$npc_market_flavor: 'normal'; +$npc_quests_flavor: 'normal'; +$npc_seasonal_flavor: 'normal'; +$npc_timetravelers_flavor: 'normal'; +$npc_tavern_flavor: 'normal'; $menuToolbarHeight: 56px; diff --git a/website/client/src/components/achievements/chooseClass.vue b/website/client/src/components/achievements/chooseClass.vue index 5fd34d7534..1f5d0e35f5 100644 --- a/website/client/src/components/achievements/chooseClass.vue +++ b/website/client/src/components/achievements/chooseClass.vue @@ -225,31 +225,30 @@ export default { classGear (heroClass) { if (heroClass === 'rogue') { return { - armor: 'armor_special_fall2020Rogue', - head: 'head_special_fall2020Rogue', - shield: 'shield_special_fall2020Rogue', - weapon: 'weapon_special_fall2020Rogue', + armor: 'armor_rogue_5', + head: 'head_rogue_5', + shield: 'shield_rogue_6', + weapon: 'weapon_rogue_6', }; } if (heroClass === 'wizard') { return { - armor: 'armor_special_fall2020Mage', - head: 'head_special_fall2020Mage', - weapon: 'weapon_special_fall2020Mage', - shield: 'shield_warrior_0', + armor: 'armor_wizard_5', + head: 'head_wizard_5', + weapon: 'weapon_wizard_6', }; } if (heroClass === 'healer') { return { - armor: 'armor_special_fall2020Healer', - head: 'head_special_fall2020Healer', - shield: 'shield_special_fall2020Healer', - weapon: 'weapon_special_fall2020Healer', + armor: 'armor_healer_5', + head: 'head_healer_5', + shield: 'shield_healer_5', + weapon: 'weapon_healer_6', }; } return { - armor: 'armor_special_fall2020Warrior', - head: 'head_special_fall2020Warrior', - shield: 'shield_special_fall2020Warrior', - weapon: 'weapon_special_fall2020Warrior', + armor: 'armor_warrior_5', + head: 'head_warrior_5', + shield: 'shield_warrior_5', + weapon: 'weapon_warrior_6', }; }, selectionBox (selectedClass, heroClass) { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 6300b9bbd4..de50c282e4 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -39,7 +39,7 @@ const featuredItems = { }, { type: 'food', - path: 'food.potatoe', + path: 'food.Potatoe', }, ]; }, diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index a497c6cf4f..41594ace67 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -1,25 +1,19 @@ -import { SEASONAL_SETS } from '../content/constants'; +// import { SEASONAL_SETS } from '../content/constants'; export default { - opened: true, + opened: false, - currentSeason: 'Fall', + currentSeason: 'Closed', dateRange: { start: '2020-09-22', end: '2020-10-31' }, availableSets: [ - ...SEASONAL_SETS.fall, ], pinnedSets: { - healer: 'fall2020DeathsHeadMothHealerSet', - rogue: 'fall2020TwoHeadedRogueSet', - warrior: 'fall2020WraithWarriorSet', - wizard: 'fall2020ThirdEyeMageSet', }, availableSpells: [ - 'spookySparkles', ], availableQuests: [ diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index 755699a1cb..d5940b986b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_bailey.png and b/website/raw_sprites/spritesmith/npcs/npc_bailey.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_justin.png b/website/raw_sprites/spritesmith/npcs/npc_justin.png index 97ce158c9f..08ba7025c2 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_justin.png and b/website/raw_sprites/spritesmith/npcs/npc_justin.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png index 30e95d29f3..2531f1084b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_matt.png and b/website/raw_sprites/spritesmith/npcs/npc_matt.png differ