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 fcee1233f9..c2f32a7652 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 e411e6ab13..1b29e6ba45 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: 'normal'; -$npc_quests_flavor: 'normal'; -$npc_seasonal_flavor: 'normal'; +$npc_market_flavor: 'thanksgiving'; +$npc_quests_flavor: 'thanksgiving'; +$npc_seasonal_flavor: 'thanksgiving'; $npc_timetravelers_flavor: 'normal'; -$npc_tavern_flavor: 'normal'; +$npc_tavern_flavor: 'thanksgiving'; $menuToolbarHeight: 56px; diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index d5940b986b..ee18cd560d 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_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png index 2531f1084b..ef720ee718 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 140c232314..a6e712b5ae 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -144,22 +144,10 @@ function _setUpNewUser (user) { user.items.quests.dustbunnies = 1; user.purchased.background.violet = true; user.preferences.background = 'violet'; - if (moment().isBefore('2020-11-02')) { - user.migration = '20201029_habitoween_ladder'; - user.items.pets['JackOLantern-Base'] = 5; - user.items.currentPet = 'JackOLantern-Base'; - user.items.food = { - Candy_Skeleton: 1, - Candy_Base: 1, - Candy_CottonCandyBlue: 1, - Candy_CottonCandyPink: 1, - Candy_Shade: 1, - Candy_White: 1, - Candy_Golden: 1, - Candy_Zombie: 1, - Candy_Desert: 1, - Candy_Red: 1, - }; + if (moment().isBefore('2020-11-30')) { + user.migration = '20201126_harvest_feast'; + user.items.pets['Turkey-Base'] = 5; + user.items.currentPet = 'Turkey-Base'; } user.markModified('items achievements');