diff --git a/common/ethnicities/wc_ethnicities_static.txt b/common/ethnicities/wc_ethnicities_static.txt index a7f207351f..e72b8393d8 100644 --- a/common/ethnicities/wc_ethnicities_static.txt +++ b/common/ethnicities/wc_ethnicities_static.txt @@ -80,8 +80,7 @@ pandaren_black_ethnicity = { gene_race = { 1 = { name = creature_pandaren range = { 0 1 } } } hair_color = { - # Black - ercarp, set me :> - 1 = { 0 0 0 0 } + 1 = { 0.008 0.008 0.008 0.008 } } static_model = { @@ -113,8 +112,7 @@ pandaren_brown_ethnicity = { visible = no hair_color = { - # Brown - ercarp, set me :> - 1 = { 0 0 0 0 } + 1 = { 0.114 0.867 0.157 0.867 } } static_model = { @@ -128,8 +126,7 @@ pandaren_red_ethnicity = { visible = no hair_color = { - # Red - ercarp, set me :> - 1 = { 0 0 0 0 } + 1 = { 0.082 0.557 0.082 0.714 } } static_model = { @@ -143,8 +140,7 @@ pandaren_gray_ethnicity = { visible = no hair_color = { - # Gray - ercarp, set me :> - 1 = { 0 0 0 0 } + 1 = { 0.792 0.031 0.792 0.031 } } static_model = { @@ -158,8 +154,7 @@ pandaren_white_ethnicity = { visible = no hair_color = { - # White - ercarp, set me :> - 1 = { 0 0 0 0 } + 1 = { 0.192 0.062 0.192 0.110 } } static_model = { diff --git a/common/genes/wc_genes_static_models.txt b/common/genes/wc_genes_static_models.txt index c23900bcc6..4cd0c1fbb5 100644 --- a/common/genes/wc_genes_static_models.txt +++ b/common/genes/wc_genes_static_models.txt @@ -713,14 +713,17 @@ 1 = femalepandakidb2 } } - static_pandaren_white = { # Male only, has no female equivalent in WoW + static_pandaren_white = { index = 46 male = { 1 = malepandaren4 1 = malepandaren10 } female = { - 1 = empty + # gray, since white fur doesn't exist for female pandaren + 1 = femalepandaren2 + 1 = femalepandaren6 + 1 = femalepandaren10 } boy = { 1 = malepandakida1 diff --git a/gfx/models/portraits/static_races/pandaren/malepanda_eyebrows.asset b/gfx/models/portraits/static_races/pandaren/malepanda_eyebrows.asset index 36d1884a87..6ad7fdfbcb 100644 --- a/gfx/models/portraits/static_races/pandaren/malepanda_eyebrows.asset +++ b/gfx/models/portraits/static_races/pandaren/malepanda_eyebrows.asset @@ -20,62 +20,22 @@ pdxmesh = { name = "malepanda_eyebrows1Shape" index = 0 texture_diffuse = "malepandabeard-white.dds" - texture_normal = "default_yellow_normal.dds" + texture_normal = "default_blue_normal.dds" texture_specular = "male_elven_eyebrows_0_properties.dds" - shader = "portrait_attachment_alpha_to_coverage" + shader = "portrait_hair" shader_file = "gfx/FX/jomini/portrait.shader" } } entity = { name = "malepanda_eyebrows1_black_entity" pdxmesh = "malepanda_eyebrows1_mesh" -} - -###malepanda_eyebrows1_brown -entity = { - name = "malepanda_eyebrows1_brown_entity" - pdxmesh = "malepanda_eyebrows1_mesh" - - meshsettings = { - name = "malepanda_eyebrows1Shape" - index = 0 - texture_diffuse = "malepandabeard-brown.dds" - } -} - -###malepanda_eyebrows1_red -entity = { - name = "malepanda_eyebrows1_red_entity" - pdxmesh = "malepanda_eyebrows1_mesh" - - meshsettings = { - name = "malepanda_eyebrows1Shape" - index = 0 - texture_diffuse = "malepandabeard-red.dds" - } -} - -###malepanda_eyebrows1_gray -entity = { - name = "malepanda_eyebrows1_gray_entity" - pdxmesh = "malepanda_eyebrows1_mesh" - - meshsettings = { - name = "malepanda_eyebrows1Shape" - index = 0 - texture_diffuse = "malepandabeard-gray.dds" - } -} -###malepanda_eyebrows1_white -entity = { - name = "malepanda_eyebrows1_white_entity" - pdxmesh = "malepanda_eyebrows1_mesh" - - meshsettings = { - name = "malepanda_eyebrows1Shape" - index = 0 - texture_diffuse = "malepandabeard-white.dds" + game_data = { + portrait_entity_user_data = { + color_mask_remap_interval = { + interval = {0.0 1.0} + } + } } } @@ -91,62 +51,22 @@ pdxmesh = { name = "malepanda_eyebrows2Shape" index = 0 texture_diffuse = "malepandabeard-white.dds" - texture_normal = "default_yellow_normal.dds" + texture_normal = "default_blue_normal.dds" texture_specular = "male_elven_eyebrows_0_properties.dds" - shader = "portrait_attachment_alpha_to_coverage" + shader = "portrait_hair" shader_file = "gfx/FX/jomini/portrait.shader" } } entity = { name = "malepanda_eyebrows2_black_entity" pdxmesh = "malepanda_eyebrows2_mesh" -} -###malepanda_eyebrows2_brown -entity = { - name = "malepanda_eyebrows2_brown_entity" - pdxmesh = "malepanda_eyebrows2_mesh" - - meshsettings = { - name = "malepanda_eyebrows2Shape" - index = 0 - texture_diffuse = "malepandabeard-brown.dds" - } -} - -###malepanda_eyebrows2_red -entity = { - name = "malepanda_eyebrows2_red_entity" - pdxmesh = "malepanda_eyebrows2_mesh" - - meshsettings = { - name = "malepanda_eyebrows2Shape" - index = 0 - texture_diffuse = "malepandabeard-red.dds" - } -} - -###malepanda_eyebrows2_gray -entity = { - name = "malepanda_eyebrows2_gray_entity" - pdxmesh = "malepanda_eyebrows2_mesh" - - meshsettings = { - name = "malepanda_eyebrows2Shape" - index = 0 - texture_diffuse = "malepandabeard-gray.dds" - } -} - -###malepanda_eyebrows2_white -entity = { - name = "malepanda_eyebrows2_white_entity" - pdxmesh = "malepanda_eyebrows2_mesh" - - meshsettings = { - name = "malepanda_eyebrows2Shape" - index = 0 - texture_diffuse = "malepandabeard-white.dds" + game_data = { + portrait_entity_user_data = { + color_mask_remap_interval = { + interval = {0.0 1.0} + } + } } } @@ -162,66 +82,25 @@ pdxmesh = { name = "malepanda_eyebrows3Shape" index = 0 texture_diffuse = "malepandabeard-white.dds" - texture_normal = "default_yellow_normal.dds" + texture_normal = "default_blue_normal.dds" texture_specular = "male_elven_eyebrows_0_properties.dds" - shader = "portrait_attachment_alpha_to_coverage" + shader = "portrait_hair" shader_file = "gfx/FX/jomini/portrait.shader" } } entity = { name = "malepanda_eyebrows3_black_entity" pdxmesh = "malepanda_eyebrows3_mesh" -} -###malepanda_eyebrows3_brown -entity = { - name = "malepanda_eyebrows3_brown_entity" - pdxmesh = "malepanda_eyebrows3_mesh" - - meshsettings = { - name = "malepanda_eyebrows3Shape" - index = 0 - texture_diffuse = "malepandabeard-brown.dds" - } -} - -###malepanda_eyebrows3_red -entity = { - name = "malepanda_eyebrows3_red_entity" - pdxmesh = "malepanda_eyebrows3_mesh" - - meshsettings = { - name = "malepanda_eyebrows3Shape" - index = 0 - texture_diffuse = "malepandabeard-red.dds" + game_data = { + portrait_entity_user_data = { + color_mask_remap_interval = { + interval = {0.0 1.0} + } + } } } -###malepanda_eyebrows3_gray -entity = { - name = "malepanda_eyebrows3_gray_entity" - pdxmesh = "malepanda_eyebrows3_mesh" - - meshsettings = { - name = "malepanda_eyebrows3Shape" - index = 0 - texture_diffuse = "malepandabeard-gray.dds" - } -} - -###malepanda_eyebrows3_white -entity = { - name = "malepanda_eyebrows3_white_entity" - pdxmesh = "malepanda_eyebrows3_mesh" - - meshsettings = { - name = "malepanda_eyebrows3Shape" - index = 0 - texture_diffuse = "malepandabeard-white.dds" - } -} - - # Eyebrows 4 ###malepanda_eyebrows4_black @@ -233,61 +112,21 @@ pdxmesh = { name = "malepanda_eyebrows4Shape" index = 0 texture_diffuse = "malepandabeard-white.dds" - texture_normal = "default_yellow_normal.dds" + texture_normal = "default_blue_normal.dds" texture_specular = "male_elven_eyebrows_0_properties.dds" - shader = "portrait_attachment_alpha_to_coverage" + shader = "portrait_hair" shader_file = "gfx/FX/jomini/portrait.shader" } } entity = { name = "malepanda_eyebrows4_black_entity" pdxmesh = "malepanda_eyebrows4_mesh" -} - -###malepanda_eyebrows4_brown -entity = { - name = "malepanda_eyebrows4_brown_entity" - pdxmesh = "malepanda_eyebrows4_mesh" - - meshsettings = { - name = "malepanda_eyebrows4Shape" - index = 0 - texture_diffuse = "malepandabeard-brown.dds" - } -} -###malepanda_eyebrows4_red -entity = { - name = "malepanda_eyebrows4_red_entity" - pdxmesh = "malepanda_eyebrows4_mesh" - - meshsettings = { - name = "malepanda_eyebrows4Shape" - index = 0 - texture_diffuse = "malepandabeard-red.dds" - } -} - -###malepanda_eyebrows4_gray -entity = { - name = "malepanda_eyebrows4_gray_entity" - pdxmesh = "malepanda_eyebrows4_mesh" - - meshsettings = { - name = "malepanda_eyebrows4Shape" - index = 0 - texture_diffuse = "malepandabeard-gray.dds" - } -} - -###malepanda_eyebrows4_white -entity = { - name = "malepanda_eyebrows4_white_entity" - pdxmesh = "malepanda_eyebrows4_mesh" - - meshsettings = { - name = "malepanda_eyebrows4Shape" - index = 0 - texture_diffuse = "malepandabeard-white.dds" + game_data = { + portrait_entity_user_data = { + color_mask_remap_interval = { + interval = {0.0 1.0} + } + } } } \ No newline at end of file