diff --git a/website/client/assets/css/sprites/spritesmith-main-11.css b/website/client/assets/css/sprites/spritesmith-main-11.css index b5ad1a11af..a60d05a293 100644 --- a/website/client/assets/css/sprites/spritesmith-main-11.css +++ b/website/client/assets/css/sprites/spritesmith-main-11.css @@ -1,8 +1,8 @@ .npc_bailey { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1963px -836px; - width: 63px; - height: 93px; + width: 60px; + height: 72px; } .npc_justin { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); @@ -24,7 +24,7 @@ } .banner_flair_dysheartener { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1963px -930px; + background-position: -1963px -909px; width: 69px; height: 18px; } diff --git a/website/client/assets/images/sprites/spritesmith-main-11.png b/website/client/assets/images/sprites/spritesmith-main-11.png index c776f8c5cf..ebec75671d 100644 Binary files a/website/client/assets/images/sprites/spritesmith-main-11.png and b/website/client/assets/images/sprites/spritesmith-main-11.png differ diff --git a/website/client/assets/scss/variables.scss b/website/client/assets/scss/variables.scss index bc3827916d..573376536b 100644 --- a/website/client/assets/scss/variables.scss +++ b/website/client/assets/scss/variables.scss @@ -2,8 +2,8 @@ // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer // more to be added on future seasons -$npc_market_flavor: 'birthday'; -$npc_quests_flavor: 'birthday'; -$npc_seasonal_flavor: 'birthday'; -$npc_timetravelers_flavor: 'birthday'; -$npc_tavern_flavor: 'birthday'; +$npc_market_flavor: 'normal'; +$npc_quests_flavor: 'normal'; +$npc_seasonal_flavor: 'normal'; +$npc_timetravelers_flavor: 'normal'; +$npc_tavern_flavor: 'normal'; diff --git a/website/client/components/achievements/chooseClass.vue b/website/client/components/achievements/chooseClass.vue index e832197026..d6dcccf56d 100644 --- a/website/client/components/achievements/chooseClass.vue +++ b/website/client/components/achievements/chooseClass.vue @@ -164,30 +164,30 @@ export default { classGear (heroClass) { if (heroClass === 'rogue') { return { - armor: 'armor_special_winter2019Rogue', - head: 'head_special_winter2019Rogue', - shield: 'shield_special_winter2019Rogue', - weapon: 'weapon_special_winter2019Rogue', + armor: 'armor_rogue_5', + head: 'head_rogue_5', + shield: 'shield_rogue_6', + weapon: 'weapon_rogue_6', }; } else if (heroClass === 'wizard') { return { - armor: 'armor_special_winter2019Mage', - head: 'head_special_winter2019Mage', - weapon: 'weapon_special_winter2019Mage', + armor: 'armor_wizard_5', + head: 'head_wizard_5', + weapon: 'weapon_wizard_6', }; } else if (heroClass === 'healer') { return { - armor: 'armor_special_winter2019Healer', - head: 'head_special_winter2019Healer', - shield: 'shield_special_winter2019Healer', - weapon: 'weapon_special_winter2019Healer', + armor: 'armor_healer_5', + head: 'head_healer_5', + shield: 'shield_healer_5', + weapon: 'weapon_healer_6', }; } else { return { - armor: 'armor_special_winter2019Warrior', - head: 'head_special_winter2019Warrior', - shield: 'shield_special_winter2019Warrior', - weapon: 'weapon_special_winter2019Warrior', + armor: 'armor_warrior_5', + head: 'head_warrior_5', + shield: 'shield_warrior_5', + weapon: 'weapon_warrior_6', }; } }, diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js index dc8cc9e8c7..7704437e33 100644 --- a/website/common/script/content/gear/sets/special/index.js +++ b/website/common/script/content/gear/sets/special/index.js @@ -8,7 +8,7 @@ import takeThisGear from './special-takeThis'; import wonderconGear from './special-wondercon'; import t from '../../../translation'; -const CURRENT_SEASON = 'winter'; +const CURRENT_SEASON = '_NONE_'; let armor = { 0: backerGear.armorSpecial0, diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index ab47dd8158..191a489fee 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -3,7 +3,7 @@ import defaults from 'lodash/defaults'; import each from 'lodash/each'; import t from './translation'; -const CURRENT_SEASON = 'January'; +const CURRENT_SEASON = '_NONE_'; let drops = { Base: { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 53b2835960..66855c56ad 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -8,30 +8,30 @@ const featuredItems = { path: 'armoire', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Peppermint', + type: 'hatchingPotions', + path: 'hatchingPotions.CottonCandyPink', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.IcySnow', + type: 'eggs', + path: 'eggs.TigerCub', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.StarryNight', + type: 'card', + path: 'cardTypes.birthday', }, ], quests: [ { type: 'quests', - path: 'quests.evilsanta', + path: 'quests.treeling', }, { type: 'quests', - path: 'quests.evilsanta2', + path: 'quests.sabretooth', }, { type: 'quests', - path: 'quests.penguin', + path: 'quests.rock', }, ], seasonal: '', diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index 64ec6b7565..4f38ef5b53 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -1,31 +1,23 @@ -import { SEASONAL_SETS } from '../content/constants'; +// import { SEASONAL_SETS } from '../content/constants'; module.exports = { - opened: true, + opened: false, - currentSeason: 'Winter', + currentSeason: 'Closed', - dateRange: { start: '2018-12-20', end: '2019-01-31' }, + dateRange: { start: '2018-09-20', end: '2018-10-31' }, availableSets: [ - ...SEASONAL_SETS.winter, ], pinnedSets: { - wizard: 'winter2019PyrotechnicSet', - warrior: 'winter2019BlizzardSet', - rogue: 'winter2019PoinsettiaSet', - healer: 'winter2019WinterStarSet', }, availableSpells: [ - 'snowball', ], availableQuests: [ - 'evilsanta', - 'evilsanta2', ], - featuredSet: 'winter2017WinterWolfSet', + featuredSet: 'mummyMedicSet', }; diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index 77347e3749..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 08ad42e374..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 056b638cdc..2531f1084b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_matt.png and b/website/raw_sprites/spritesmith/npcs/npc_matt.png differ diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index 3279421207..020dd59ebe 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -127,10 +127,6 @@ function _setUpNewUser (user) { user.items.quests.dustbunnies = 1; user.purchased.background.violet = true; user.preferences.background = 'violet'; - user.items.gear.owned.armor_special_birthday = true; // eslint-disable-line camelcase - user.items.gear.equipped.armor = 'armor_special_birthday'; - user.items.gear.costume.armor = 'armor_special_birthday'; - user.migration = '20190131_habit_birthday'; if (user.registeredThrough === 'habitica-web') { taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];