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

chore(event): NPCs and auto award turkey

Browse Source
This commit is contained in:
Sabe Jones
2020-11-26 14:01:23 -06:00
parent 3b7bf5de75
commit f31370d7ba
5 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
website/client/src/assets/images/sprites/spritesmith-main-13.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 KiB

After

Width:  |  Height:  |  Size: 315 KiB

8
website/client/src/assets/scss/variables.scss
View File

@@ -2,10 +2,10 @@
// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, normal // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, normal
// more to be added on future seasons // more to be added on future seasons
$npc_market_flavor: 'normal'; $npc_market_flavor: 'thanksgiving';
$npc_quests_flavor: 'normal'; $npc_quests_flavor: 'thanksgiving';
$npc_seasonal_flavor: 'normal'; $npc_seasonal_flavor: 'thanksgiving';
$npc_timetravelers_flavor: 'normal'; $npc_timetravelers_flavor: 'normal';
$npc_tavern_flavor: 'normal'; $npc_tavern_flavor: 'thanksgiving';
$menuToolbarHeight: 56px; $menuToolbarHeight: 56px;

BIN
website/raw_sprites/spritesmith/npcs/npc_bailey.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
website/raw_sprites/spritesmith/npcs/npc_matt.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

20
website/server/models/user/hooks.js
View File

@@ -144,22 +144,10 @@ function _setUpNewUser (user) {
user.items.quests.dustbunnies = 1; user.items.quests.dustbunnies = 1;
user.purchased.background.violet = true; user.purchased.background.violet = true;
user.preferences.background = 'violet'; user.preferences.background = 'violet';
if (moment().isBefore('2020-11-02')) { if (moment().isBefore('2020-11-30')) {
user.migration = '20201029_habitoween_ladder'; user.migration = '20201126_harvest_feast';
user.items.pets['JackOLantern-Base'] = 5; user.items.pets['Turkey-Base'] = 5;
user.items.currentPet = 'JackOLantern-Base'; user.items.currentPet = 'Turkey-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,
};
} }
user.markModified('items achievements'); user.markModified('items achievements');