sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 15:38:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2018-11-06 15:02:24 -06:00
commit 9f494360ef
3 changed files with 17 additions and 17 deletions
Show stats 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", "name": "habitica",
"version": "4.69.0", "version": "4.69.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View file

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

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

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