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

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2018-11-06 15:02:24 -06:00
parent b7f3c0f389 4122bbdecf
commit 9f494360ef
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.69.0",
"version": "4.69.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.69.0",
"version": "4.69.1",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",

30
website/client/components/achievements/chooseClass.vue
View File

@@ -164,30 +164,30 @@ export default {
classGear (heroClass) {
if (heroClass === 'rogue') {
return {
armor: 'armor_special_fall2018Rogue',
head: 'head_special_fall2018Rogue',
shield: 'shield_special_fall2018Rogue',
weapon: 'weapon_special_fall2018Rogue',
armor: 'armor_rogue_5',
head: 'head_rogue_5',
shield: 'shield_rogue_6',
weapon: 'weapon_rogue_6',
};
} else if (heroClass === 'wizard') {
return {
armor: 'armor_special_fall2018Mage',
head: 'head_special_fall2018Mage',
weapon: 'weapon_special_fall2018Mage',
armor: 'armor_wizard_5',
head: 'head_wizard_5',
weapon: 'weapon_wizard_6',
};
} else if (heroClass === 'healer') {
return {
armor: 'armor_special_fall2018Healer',
head: 'head_special_fall2018Healer',
shield: 'shield_special_fall2018Healer',
weapon: 'weapon_special_fall2018Healer',
armor: 'armor_healer_5',
head: 'head_healer_5',
shield: 'shield_healer_5',
weapon: 'weapon_healer_6',
};
} else {
return {
armor: 'armor_special_fall2018Warrior',
head: 'head_special_fall2018Warrior',
shield: 'shield_special_fall2018Warrior',
weapon: 'weapon_special_fall2018Warrior',
armor: 'armor_warrior_5',
head: 'head_warrior_5',
shield: 'shield_warrior_5',
weapon: 'weapon_warrior_6',
};
}
},