Merge pull request #1575 from Shaners/newSkin

New skin tones
This commit is contained in:
Tyler Renelle 2013-10-04 15:27:09 -07:00
commit 43be09a5d5
2 changed files with 23 additions and 7 deletions

View file

@ -56,9 +56,10 @@ menu
.customize-menu
.m_hair_blond,.m_hair_black,.m_hair_brown,.m_hair_white,
.f_hair_blond,.f_hair_black,.f_hair_brown,.f_hair_white,
.m_skin_dead,.m_skin_orc,.m_skin_asian,.m_skin_black,.m_skin_white,
.f_skin_dead,.f_skin_orc,.f_skin_asian,.f_skin_black,.f_skin_white,
.m_head_0,.f_head_0
.m_skin_dead,.m_skin_orc,.m_skin_asian,.m_skin_black,.m_skin_white,.m_skin_ea8349,.m_skin_c06534,.m_skin_98461a,
.f_skin_dead,.f_skin_orc,.f_skin_asian,.f_skin_black,.f_skin_white,.f_skin_ea8349,.f_skin_c06534,.f_skin_98461a,
.m_head_0,.f_head_0,
.f_armor_0_v1,.f_armor_0_v2
width: 60px
height: 60px
@ -87,6 +88,12 @@ menu
background-position: -2817px -20px;
.m_skin_white
background-position: -2907px -20px;
.m_skin_ea8349
background-position: -2997px -20px;
.m_skin_c06534
background-position: -3087px -20px;
.m_skin_98461a
background-position: -3177px -20px;
// head
.f_head_0
@ -113,9 +120,15 @@ menu
background-position: -3267px -20px;
.f_skin_white
background-position: -3357px -20px;
.f_skin_ea8349
background-position: -3447px -20px;
.f_skin_c06534
background-position: -3537px -20px;
.f_skin_98461a
background-position: -3627px -20px;
// starting armor
.f_armor_0_v2
background-position: -2819px -38px;
.f_armor_0_v1
background-position: -2909px -38px;
background-position: -2909px -38px;

View file

@ -21,11 +21,14 @@
// skin
li.customize-menu
menu(label='Skin')
button.customize-option(class='{{user.preferences.gender}}_skin_asian', type='button', ng-click='set("preferences.skin","asian")')
button.customize-option(class='{{user.preferences.gender}}_skin_white', type='button', ng-click='set("preferences.skin","white")')
button.customize-option(class='{{user.preferences.gender}}_skin_ea8349', type='button', ng-click='set("preferences.skin","ea8349")')
button.customize-option(class='{{user.preferences.gender}}_skin_c06534', type='button', ng-click='set("preferences.skin","c06534")')
button.customize-option(class='{{user.preferences.gender}}_skin_98461a', type='button', ng-click='set("preferences.skin","98461a")')
button.customize-option(class='{{user.preferences.gender}}_skin_black', type='button', ng-click='set("preferences.skin","black")')
button.customize-option(class='{{user.preferences.gender}}_skin_dead', type='button', ng-click='set("preferences.skin","dead")')
button.customize-option(class='{{user.preferences.gender}}_skin_orc', type='button', ng-click='set("preferences.skin","orc")')
button.customize-option(class='{{user.preferences.gender}}_skin_asian', type='button', ng-click='set("preferences.skin","asian")')
button.customize-option(class='{{user.preferences.gender}}_skin_black', type='button', ng-click='set("preferences.skin","black")')
button.customize-option(class='{{user.preferences.gender}}_skin_white', type='button', ng-click='set("preferences.skin","white")')
menu(ng-show='user.preferences.gender=="f"', type='list')
li.customize-menu
menu(label='Clothing')