diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 52989257fb..a8446e551a 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -11,7 +11,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') button.customize-option(popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='equip(user,item)', class='shop_{{item.key}}') label.checkbox.inline input(type="checkbox", ng-model="user.preferences.costume") - | Use Custume  + | Use Costume  i.icon-question-sign(popover="Show something different on your avatar than the gear you have equipped for battle", popover-trigger='mouseenter', popover-placement='right') li.customize-menu(ng-if='user.preferences.costume') menu.pets-menu(label='Gear') diff --git a/views/options/profile.jade b/views/options/profile.jade index 0e05f1690f..69812fcb77 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -29,6 +29,21 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') button(class='hair_bangs_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",2)') button(class='hair_bangs_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",3)') + // Beard + li.customize-menu + menu(label='Beard') + button(class='head_warrior_0 customize-option', type='button', ng-click='set("preferences.hair.beard",0)') + button(class='hair_beard_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.beard",1)') + button(class='hair_beard_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.beard",2)') + button(class='hair_beard_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.beard",3)') + + // Mustache + li.customize-menu + menu(label='Mustache') + button(class='head_warrior_0 customize-option', type='button', ng-click='set("preferences.hair.mustache",0)') + button(class='hair_mustache_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.mustache",1)') + button(class='hair_mustache_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.mustache",2)') + // Base li.customize-menu menu(label='Base') diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index 204dd82ed1..77495879da 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -18,9 +18,13 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember( span(class='hair_base_{{profile.preferences.hair.base}}_{{profile.preferences.hair.color}}') span(class='hair_bangs_{{profile.preferences.hair.bangs}}_{{profile.preferences.hair.color}}') + span(class='{{profile.items.gear.equipped.head}}', ng-if='!profile.preferences.costume') span(class='{{profile.items.gear.costume.head}}', ng-if='profile.preferences.costume') + span(class='hair_beard_{{profile.preferences.hair.beard}}_{{profile.preferences.hair.color}}') + span(class='hair_mustache_{{profile.preferences.hair.mustache}}_{{profile.preferences.hair.color}}') + span(class='{{profile.items.gear.equipped.shield}}', ng-if='!profile.preferences.costume') span(class='{{profile.items.gear.costume.shield}}', ng-if='profile.preferences.costume')