diff --git a/gfx/characters/tauren_male/tauren_male_base_1.dds b/gfx/characters/tauren_male/tauren_male_base_1.dds index b50d4b5658..46e95f8c60 100644 Binary files a/gfx/characters/tauren_male/tauren_male_base_1.dds and b/gfx/characters/tauren_male/tauren_male_base_1.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_base_placeholder.dds b/gfx/characters/tauren_male/tauren_male_base_placeholder.dds new file mode 100644 index 0000000000..bd11333923 Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_base_placeholder.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_beard_1.dds b/gfx/characters/tauren_male/tauren_male_beard_1.dds new file mode 100644 index 0000000000..a18e2f9115 Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_beard_1.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_cheeks_1.dds b/gfx/characters/tauren_male/tauren_male_cheeks_1.dds new file mode 100644 index 0000000000..d92efa413e Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_cheeks_1.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_clothes.dds b/gfx/characters/tauren_male/tauren_male_clothes.dds new file mode 100644 index 0000000000..b0a3498057 Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_clothes.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_hair_1.dds b/gfx/characters/tauren_male/tauren_male_hair_1.dds new file mode 100644 index 0000000000..422f090cc5 Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_hair_1.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_hair_ties_front.dds b/gfx/characters/tauren_male/tauren_male_hair_ties_front.dds new file mode 100644 index 0000000000..74ce137f46 Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_hair_ties_front.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_headgear.dds b/gfx/characters/tauren_male/tauren_male_headgear.dds new file mode 100644 index 0000000000..5d2a0afe28 Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_headgear.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_horns_1.dds b/gfx/characters/tauren_male/tauren_male_horns_1.dds new file mode 100644 index 0000000000..7c76622e64 Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_horns_1.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_iris.dds b/gfx/characters/tauren_male/tauren_male_iris.dds new file mode 100644 index 0000000000..fae3e8b54b Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_iris.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_mouth_1.dds b/gfx/characters/tauren_male/tauren_male_mouth_1.dds new file mode 100644 index 0000000000..9f0b03b147 Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_mouth_1.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_neck_1.dds b/gfx/characters/tauren_male/tauren_male_neck_1.dds index 5a63f3714c..36d9fd4476 100644 Binary files a/gfx/characters/tauren_male/tauren_male_neck_1.dds and b/gfx/characters/tauren_male/tauren_male_neck_1.dds differ diff --git a/gfx/characters/tauren_male/tauren_male_nose_1.dds b/gfx/characters/tauren_male/tauren_male_nose_1.dds new file mode 100644 index 0000000000..71567d7b2a Binary files /dev/null and b/gfx/characters/tauren_male/tauren_male_nose_1.dds differ diff --git a/interface/portraits/portraits_tauren.gfx b/interface/portraits/portraits_tauren.gfx index a99fa413f5..d69d17f7ea 100644 --- a/interface/portraits/portraits_tauren.gfx +++ b/interface/portraits/portraits_tauren.gfx @@ -12,8 +12,20 @@ spriteTypes = { layer = { # GFX_TYPE:[d|p]INDEX:COLOR_LINK:DONT_REFRESH_IF_VALID:CULTURE_INDEX "GFX_character_background:p0" - "GFX_tauren_male_base:p2" - "GFX_tauren_male_neck:d0" + "GFX_tauren_male_base:p2" + "GFX_tauren_male_chin:d1" + "GFX_tauren_male_eyes:d6" + "GFX_tauren_male_neck:d0" + "GFX_tauren_male_iris:d6:e" + "GFX_tauren_male_mouth:d2:y" + "GFX_tauren_male_clothes:p3" + "GFX_tauren_male_cheeks:d4:y" + "GFX_tauren_male_beard:p4:h:y" + "GFX_tauren_male_hair:p1:h:y" + "GFX_tauren_male_hair_ties_front:p1:y" + "GFX_tauren_male_headgear:p5" + "GFX_tauren_male_ear:d7" + "GFX_tauren_male_nose:d3" "GFX_tauren_druid_form:p19" "GFX_character_imprisoned:p6" @@ -23,15 +35,22 @@ spriteTypes = { hair_color_index = 8 hair_color = { # dark, base, highlight - { 36 35 29 } { 196 172 91 } { 255 255 255 } + { 0 0 0 } { 33 33 33 } { 255 255 255 } # Black + { 0 0 0 } { 80 33 22 } { 255 255 255 } # Dark Brown + { 0 0 0 } { 110 55 30 } { 255 255 255 } # Brown + { 0 0 0 } { 122 88 65 } { 255 255 255 } # Dark hay } eye_color_index = 9 eye_color = { - { 58 109 193} + { 151 99 12} + { 190 169 13} + { 140 55 22 } + { 34 193 36 } + { 34 144 225 } } - headgear_that_hides_hair = { 1 10 } + headgear_that_hides_hair = { } } # middle age @@ -42,7 +61,19 @@ spriteTypes = { "GFX_character_background:p0" "GFX_tauren_male_base:p2" + "GFX_tauren_male_chin:d1" + "GFX_tauren_male_eyes:d6" "GFX_tauren_male_neck:d0" + "GFX_tauren_male_iris:d6:e" + "GFX_tauren_male_mouth:d2:y" + "GFX_tauren_male_clothes:p3" + "GFX_tauren_male_cheeks:d4:y" + "GFX_tauren_male_beard:p4:h:y" + "GFX_tauren_male_hair:p1:h:y" + "GFX_tauren_male_hair_ties_front:p1:y" + "GFX_tauren_male_headgear:p5" + "GFX_tauren_male_ear:d7" + "GFX_tauren_male_nose:d3" "GFX_tauren_druid_form:p19" "GFX_character_imprisoned:p6" @@ -52,15 +83,22 @@ spriteTypes = { hair_color_index = 8 hair_color = { # dark, base, highlight - { 36 35 29 } { 196 172 91 } { 255 255 255 } + { 0 0 0 } { 33 33 33 } { 255 255 255 } # Black + { 0 0 0 } { 80 33 22 } { 255 255 255 } # Dark Brown + { 0 0 0 } { 110 55 30 } { 255 255 255 } # Brown + { 0 0 0 } { 122 88 65 } { 255 255 255 } # Dark hay } eye_color_index = 9 eye_color = { - { 58 109 193} + { 151 99 12} + { 190 169 13} + { 140 55 22 } + { 34 193 36 } + { 34 144 225 } } - headgear_that_hides_hair = { 1 10 } + headgear_that_hides_hair = { } } # old age @@ -71,7 +109,19 @@ spriteTypes = { "GFX_character_background:p0" "GFX_tauren_male_base:p2" + "GFX_tauren_male_chin:d1" + "GFX_tauren_male_eyes:d6" "GFX_tauren_male_neck:d0" + "GFX_tauren_male_iris:d6:e" + "GFX_tauren_male_mouth:d2:y" + "GFX_tauren_male_clothes:p3" + "GFX_tauren_male_cheeks:d4:y" + "GFX_tauren_male_beard:p4:h:y" + "GFX_tauren_male_hair:p1:h:y" + "GFX_tauren_male_hair_ties_front:p1:y" + "GFX_tauren_male_headgear:p5" + "GFX_tauren_male_ear:d7" + "GFX_tauren_male_nose:d3" "GFX_tauren_druid_form:p19" "GFX_character_imprisoned:p6" @@ -81,15 +131,22 @@ spriteTypes = { hair_color_index = 8 hair_color = { # dark, base, highlight - { 30 22 18 } { 180 170 151 } { 255 255 255 } + { 0 0 0 } { 88 88 88 } { 255 255 255 } # Black + { 0 0 0 } { 112 112 112 } { 255 255 255 } # Dark Brown + { 0 0 0 } { 155 155 155 } { 255 255 255 } # Brown + { 0 0 0 } { 186 186 186 } { 255 255 255 } # Dark hay } eye_color_index = 9 eye_color = { - { 58 109 193} + { 151 99 12} + { 190 169 13} + { 140 55 22 } + { 34 193 36 } + { 34 144 225 } } - headgear_that_hides_hair = { 1 10 } + headgear_that_hides_hair = { } } ### tauren FEMALE #### diff --git a/interface/portraits/portraits_tauren_sprites.gfx b/interface/portraits/portraits_tauren_sprites.gfx index 7191b0f6e1..96749b6653 100644 --- a/interface/portraits/portraits_tauren_sprites.gfx +++ b/interface/portraits/portraits_tauren_sprites.gfx @@ -72,7 +72,7 @@ spriteTypes = { spriteType = { name = "GFX_tauren_male_base_oldage" - texturefile = "gfx\\characters\\tauren_male\\tauren_male_base_3.dds" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_base_1.dds" noOfFrames = 1 norefcount = yes } @@ -80,7 +80,7 @@ spriteTypes = { spriteType = { name = "GFX_tauren_male_neck" texturefile = "gfx\\characters\\tauren_male\\tauren_male_neck_1.dds" - noOfFrames = 12 + noOfFrames = 24 norefcount = yes can_be_lowres = yes } @@ -88,18 +88,125 @@ spriteTypes = { spriteType = { name = "GFX_tauren_male_neck_midage" texturefile = "gfx\\characters\\tauren_male\\tauren_male_neck_1.dds" - noOfFrames = 12 + noOfFrames = 24 norefcount = yes can_be_lowres = yes } spriteType = { name = "GFX_tauren_male_neck_oldage" - texturefile = "gfx\\characters\\tauren_male\\tauren_male_neck_3.dds" - noOfFrames = 12 + texturefile = "gfx\\characters\\tauren_male\\tauren_male_neck_1.dds" + noOfFrames = 24 norefcount = yes can_be_lowres = yes } + + spriteType = { + name = "GFX_tauren_male_beard" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_beard_1.dds" + noOfFrames = 10 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_beard_midage" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_beard_1.dds" + noOfFrames = 10 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_beard_oldage" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_beard_1.dds" + noOfFrames = 10 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_chin" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_placeholder.dds" + noOfFrames = 1 + norefcount = yes + } + + spriteType = { + name = "GFX_tauren_male_eyes" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_placeholder.dds" + noOfFrames = 1 + norefcount = yes + } + + spriteType = { + name = "GFX_tauren_male_hair" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_hair_1.dds" + noOfFrames = 8 + norefcount = yes + } + + spriteType = { + name = "GFX_tauren_male_hair_ties_front" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_hair_ties_front.dds" + noOfFrames = 8 + norefcount = yes + } + + spriteType = { + name = "GFX_tauren_male_ear" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_horns_1.dds" + noOfFrames = 18 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_cheeks" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_cheeks_1.dds" + noOfFrames = 8 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_mouth" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_mouth_1.dds" + noOfFrames = 18 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_clothes" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_clothes.dds" + noOfFrames = 12 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_nose" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_nose_1.dds" + noOfFrames = 8 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_headgear" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_headgear.dds" + noOfFrames = 12 + norefcount = yes + can_be_lowres = yes + } + + spriteType = { + name = "GFX_tauren_male_iris" + texturefile = "gfx\\characters\\tauren_male\\tauren_male_iris.dds" + noOfFrames = 1 + norefcount = yes + } #### tauren FEMALE ####