Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2020-11-01 22:03:42 -06:00
parent d678eb920f b17c9a33a5
commit 6fa7fbce3f
10 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/assets/images/sprites/spritesmith-main-13.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 KiB

After

Width:  |  Height:  |  Size: 344 KiB

website/client/src/assets/scss/variables.scss
+5 -5
View File
@@ -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;
website/client/src/components/achievements/chooseClass.vue
+15 -16
View File
@@ -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) {