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

Fixed equiping glasses and ears (#9585)

Browse Source
This commit is contained in:
Keith Holliday
2017-11-27 12:19:36 -06:00
committed by GitHub
parent 137d6c1f9d
commit 33a235b46c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
website/client/components/creatorIntro.vue
View File

@@ -1023,7 +1023,8 @@ export default {
option.key = key; option.key = key;
option.active = this.user.preferences.costume ? this.user.items.gear.costume.eyewear === newKey : this.user.items.gear.equipped.eyewear === newKey; option.active = this.user.preferences.costume ? this.user.items.gear.costume.eyewear === newKey : this.user.items.gear.equipped.eyewear === newKey;
option.click = () => { option.click = () => {
return this.equip(newKey); let type = this.user.preferences.costume ? 'costume' : 'equipped';
return this.equip(newKey, type);
}; };
return option; return option;
}); });
@@ -1061,7 +1062,8 @@ export default {
option.active = this.user.preferences.costume ? this.user.items.gear.costume.headAccessory === newKey : this.user.items.gear.equipped.headAccessory === newKey; option.active = this.user.preferences.costume ? this.user.items.gear.costume.headAccessory === newKey : this.user.items.gear.equipped.headAccessory === newKey;
option.locked = locked; option.locked = locked;
option.click = () => { option.click = () => {
return locked ? this.purchase('gear', newKey) : this.equip(newKey); let type = this.user.preferences.costume ? 'costume' : 'equipped';
return locked ? this.purchase('gear', newKey) : this.equip(newKey, type);
}; };
return option; return option;
}); });
@@ -1306,9 +1308,8 @@ export default {
set (settings) { set (settings) {
this.$store.dispatch('user:set', settings); this.$store.dispatch('user:set', settings);
}, },
equip (key) { equip (key, type) {
this.$store.dispatch('common:equip', {key, type: 'equipped'}); this.$store.dispatch('common:equip', {key, type});
this.user.items.gear.equipped[key] = !this.user.items.gear.equipped[key];
}, },
async done () { async done () {
this.loading = true; this.loading = true;