Skip to content

Commit

Permalink
Merge branch 'dev' into velius-drust-crisis
Browse files Browse the repository at this point in the history
  • Loading branch information
@Malicos
Malicos committed Oct 18, 2024
2 parents 34546d9 + e727c8d commit 1755a03
Show file tree
Hide file tree
Showing 14 changed files with 447 additions and 100 deletions.
57 changes: 46 additions & 11 deletions common/bookmark_portraits/arthas_menethil_character.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# History database id:60003
arthas_menethil_character={
type=male
id=32807
id=647103076
age=0.230000
genes={ hair_color={ 43 85 30 226 }
skin_color={ 19 50 47 43 }
Expand Down Expand Up @@ -90,13 +90,13 @@ arthas_menethil_character={
face_detail_nose_ridge_def={ "nose_ridge_def_pos" 137 "nose_ridge_def_neg" 8 }
face_detail_nose_tip_def={ "nose_tip_def" 66 "nose_tip_def" 240 }
face_detail_temple_def={ "temple_def" 77 "temple_def" 166 }
expression_brow_wrinkles={ "brow_wrinkles_04" 255 "brow_wrinkles_04" 218 }
expression_eye_wrinkles={ "eye_wrinkles_02" 0 "eye_wrinkles_02" 207 }
expression_brow_wrinkles={ "brow_wrinkles_04" 151 "brow_wrinkles_04" 218 }
expression_eye_wrinkles={ "eye_wrinkles_02" 166 "eye_wrinkles_02" 207 }
expression_forehead_wrinkles={ "forehead_wrinkles_02" 0 "forehead_wrinkles_02" 224 }
expression_other={ "cheek_wrinkles_both_01" 68 "cheek_wrinkles_left_01" 127 }
complexion={ "complexion_3" 170 "complexion_3" 80 }
gene_height={ "normal_height" 138 "normal_height" 159 }
gene_bs_body_type={ "body_fat_head_fat_low" 72 "body_fat_head_fat_low" 138 }
gene_bs_body_type={ "body_fat_head_fat_low" 68 "body_fat_head_fat_low" 138 }
gene_bs_body_shape={ "body_shape_triangle_half" 255 "body_shape_triangle_full" 16 }
gene_bs_bust={ "bust_clothes" 131 "bust_default" 205 }
gene_age={ "old_2" 143 "old_2" 143 }
Expand All @@ -106,7 +106,6 @@ arthas_menethil_character={
gene_hair_type={ "hair_straight" 127 "hair_straight" 127 }
gene_baldness={ "no_baldness" 127 "no_baldness" 127 }
eye_accessory={ "normal_eyes" 70 "normal_eyes" 70 }
##eye_left_accessory={ "normal_eyes" 0 "normal_eyes" 0 }
teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 }
eyelashes_accessory={ "normal_eyelashes" 133 "normal_eyelashes" 133 }
gene_body_markings={ "no_body_markings" 127 "no_body_markings" 127 }
Expand Down Expand Up @@ -140,14 +139,50 @@ arthas_menethil_character={
tail={ "no_tail" 0 "no_tail" 0 }
tendrils={ "no_tendrils" 0 "no_tendrils" 0 }
wings={ "no_wings" 0 "no_wings" 0 }
pose={ "" 255 "" 0 }
beards={ "no_beard" 201 "no_beard" 0 }
clothes={ "western_low_nobility_clothes" 149 "most_clothes" 0 }
beards={ "no_beard" 135 "no_beard" 0 }
cloaks={ "no_cloak" 135 "no_cloak" 0 }
hairstyles={ "scripted_character_hairstyles_01" 158 "all_hairstyles" 0 }
legwear={ "western_common_legwear" 138 "all_legwear" 0 }
legwear={ "western_common_legwear" 144 "all_legwear" 0 }
gene_shrink_body={ "shrink_all" 255 "" 0 }
#gene_facial_markings={ "no_markings" 255 "no_markings" 0 }
gene_bs_additive_headgears={ "additive_headgears" 255 "" 0 }
gene_bs_cloak_offset={ "cloak_offset" 255 "" 0 }
gene_bs_long_beard={ "long_beard" 255 "" 0 }
gene_bs_no_jaw={ "no_jaw" 255 "" 0 }
gene_facial_markings={ "no_markings" 255 "no_markings" 0 }
clothes={ "western_high_nobility_clothes" 213 "most_clothes" 0 }
headgear={ "western_high_nobility" 165 "no_headgear" 0 }
additive_headgear={ "ep2_western_era2_veils" 144 "no_additive" 0 }
gene_balding_hair_effect={ "no_baldness" 255 "no_baldness" 0 }
}
entity={ 979141817 979141817 }
tags={ {
hash=2125534279
invert=no
}
{
hash=681013727
invert=no
}
{
hash=2670398845
invert=no
}
{
hash=1500963499
invert=no
}
{
hash=1563190100
invert=no
}
{
hash=2635852190
invert=no
}
{
hash=1945936758
invert=no
}
}
entity={ 1863162561 1863162561 }
}

55 changes: 45 additions & 10 deletions common/bookmark_portraits/darkhan_character.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# History database id:42078
darkhan_character={
type=male
id=7771
id=3597984731
age=0.372330
genes={ hair_color={ 14 255 33 109 }
skin_color={ 14 45 18 48 }
Expand Down Expand Up @@ -93,10 +93,10 @@ darkhan_character={
expression_brow_wrinkles={ "brow_wrinkles_04" 255 "brow_wrinkles_01" 109 }
expression_eye_wrinkles={ "eye_wrinkles_02" 255 "eye_wrinkles_02" 84 }
expression_forehead_wrinkles={ "forehead_wrinkles_03" 0 "forehead_wrinkles_02" 0 }
expression_other={ "cheek_wrinkles_both_01" 44 "cheek_wrinkles_both_01" 99 }
expression_other={ "cheek_wrinkles_both_01" 49 "cheek_wrinkles_both_01" 99 }
complexion={ "complexion_3" 54 "complexion_3" 54 }
gene_height={ "normal_height" 133 "normal_height" 133 }
gene_bs_body_type={ "body_fat_head_fat_low" 132 "body_fat_head_fat_low" 96 }
gene_bs_body_type={ "body_fat_head_fat_low" 131 "body_fat_head_fat_low" 96 }
gene_bs_body_shape={ "body_shape_average" 255 "body_shape_average" 126 }
gene_bs_bust={ "bust_clothes" 6 "bust_shape_4_full" 11 }
gene_age={ "old_beauty_1" 103 "old_beauty_1" 103 }
Expand All @@ -106,7 +106,6 @@ darkhan_character={
gene_hair_type={ "hair_wavy" 106 "hair_wavy" 106 }
gene_baldness={ "male_pattern_baldness" 58 "male_pattern_baldness" 58 }
eye_accessory={ "normal_eyes" 172 "normal_eyes" 172 }
##eye_left_accessory={ "normal_eyes" 216 "normal_eyes" 216 }
teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 }
eyelashes_accessory={ "normal_eyelashes" 3 "normal_eyelashes" 3 }
gene_body_markings={ "no_body_markings" 255 "no_body_markings" 255 }
Expand Down Expand Up @@ -140,20 +139,56 @@ darkhan_character={
tail={ "no_tail" 0 "no_tail" 0 }
tendrils={ "no_tendrils" 0 "no_tendrils" 0 }
wings={ "no_wings" 0 "no_wings" 0 }
pose={ "" 255 "" 0 }
beards={ "no_beard" 227 "no_beard" 0 }
clothes={ "byzantine_high_nobility_clothes" 131 "most_clothes" 0 }
beards={ "no_beard" 42 "no_beard" 0 }
hairstyles={ "scripted_character_hairstyles_01" 221 "all_hairstyles" 0 }
headgear={ "high_elven_crowns" 134 "no_headgear" 0 }
legwear={ "western_common_legwear" 72 "all_legwear" 0 }
legwear={ "western_common_legwear" 99 "all_legwear" 0 }
gene_shrink_body={ "shrink_all" 255 "" 0 }
#gene_facial_markings={ "no_markings" 255 "no_markings" 0 }
gene_bs_additive_headgears={ "additive_headgears" 255 "" 0 }
gene_bs_cloak_offset={ "cloak_offset" 255 "" 0 }
gene_bs_long_beard={ "long_beard" 255 "" 0 }
gene_bs_no_jaw={ "no_jaw" 255 "" 0 }
gene_facial_markings={ "no_markings" 255 "no_markings" 0 }
clothes={ "byzantine_high_nobility_clothes" 231 "most_clothes" 0 }
headgear={ "high_elven_crowns" 215 "no_headgear" 0 }
gene_balding_hair_effect={ "no_baldness" 255 "no_baldness" 0 }
}
entity={ 2268070609 2720375217 }
tags={ {
hash=2125534279
invert=no
}
{
hash=681013727
invert=no
}
{
hash=3672171019
invert=no
}
{
hash=2670398845
invert=no
}
{
hash=1500963499
invert=no
}
{
hash=1022698243
invert=no
}
{
hash=1563190100
invert=no
}
{
hash=1015114348
invert=no
}
{
hash=1945936758
invert=no
}
}
}

58 changes: 39 additions & 19 deletions common/bookmark_portraits/garithos_character.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# History database id:60030
garithos_character={
type=male
id=31915
id=2804857459
age=0.390000
genes={ hair_color={ 23 234 46 239 }
skin_color={ 28 43 45 50 }
Expand Down Expand Up @@ -53,7 +53,7 @@ garithos_character={
gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_pos" 255 "eye_upper_lid_size_pos" 7 }
gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 255 "forehead_brow_curve_pos" 49 }
gene_bs_forehead_brow_forward={ "forehead_brow_forward_pos" 81 "forehead_brow_forward_neg" 39 }
gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_neg" 228 "forehead_brow_inner_height_neg" 59 }
gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_pos" 102 "forehead_brow_inner_height_neg" 59 }
gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_pos" 255 "forehead_brow_outer_height_pos" 22 }
gene_bs_forehead_brow_width={ "forehead_brow_width_pos" 255 "forehead_brow_width_pos" 98 }
gene_bs_jaw_def={ "jaw_def_pos" 116 "jaw_def_pos" 67 }
Expand Down Expand Up @@ -90,13 +90,13 @@ garithos_character={
face_detail_nose_ridge_def={ "nose_ridge_def_neg" 247 "nose_ridge_def_neg" 247 }
face_detail_nose_tip_def={ "nose_tip_def" 225 "nose_tip_def" 225 }
face_detail_temple_def={ "temple_def" 92 "temple_def" 92 }
expression_brow_wrinkles={ "brow_wrinkles_04" 204 "brow_wrinkles_01" 2 }
expression_brow_wrinkles={ "brow_wrinkles_04" 255 "brow_wrinkles_01" 2 }
expression_eye_wrinkles={ "eye_wrinkles_01" 255 "eye_wrinkles_01" 52 }
expression_forehead_wrinkles={ "forehead_wrinkles_03" 151 "forehead_wrinkles_01" 31 }
expression_other={ "nose_wrinkles_01" 255 "cheek_wrinkles_left_01" 127 }
expression_other={ "cheek_wrinkles_both_01" 255 "cheek_wrinkles_left_01" 127 }
complexion={ "complexion_1" 133 "complexion_5" 133 }
gene_height={ "normal_height" 131 "normal_height" 139 }
gene_bs_body_type={ "body_fat_head_fat_full" 154 "body_fat_head_fat_full" 125 }
gene_bs_body_type={ "body_fat_head_fat_full" 123 "body_fat_head_fat_full" 125 }
gene_bs_body_shape={ "body_shape_triangle_full" 255 "body_shape_triangle_half" 0 }
gene_bs_bust={ "bust_clothes" 116 "bust_shape_1_full" 183 }
gene_age={ "old_3" 22 "old_3" 22 }
Expand All @@ -106,10 +106,10 @@ garithos_character={
gene_hair_type={ "hair_straight" 127 "hair_straight" 127 }
gene_baldness={ "no_baldness" 127 "no_baldness" 127 }
eye_accessory={ "normal_eyes" 221 "normal_eyes" 221 }
##eye_left_accessory={ "normal_eyes" 221 "normal_eyes" 221 }
teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 }
eyelashes_accessory={ "normal_eyelashes" 169 "normal_eyelashes" 169 }
gene_body_markings={ "no_body_markings" 127 "no_body_markings" 127 }
gene_facial_markings={ "no_markings" 127 "no_markings" 127 }
gene_facial_markings_2={ "no_markings" 127 "no_markings" 127 }
special_eyebrows={ "no_eyebrows" 93 "no_eyebrows" 93 }
claws={ "no_claws" 0 "no_claws" 0 }
Expand Down Expand Up @@ -139,24 +139,44 @@ garithos_character={
tail={ "no_tail" 0 "no_tail" 0 }
tendrils={ "no_tendrils" 0 "no_tendrils" 0 }
wings={ "no_wings" 0 "no_wings" 0 }
pose={ "" 255 "" 0 }
beards={ "scripted_character_beards_01" 188 "no_beard" 0 }
cloaks={ "human_shoulderpad" 172 "no_cloak" 0 }
hairstyles={ "no_hairstyles" 108 "all_hairstyles" 0 }
legwear={ "western_war_legwear" 253 "all_legwear" 0 }
cloaks={ "ep2_cloak_western_era1_low_nobility" 20 "no_cloak" 0 }
hairstyles={ "no_hairstyles" 64 "all_hairstyles" 0 }
legwear={ "western_common_legwear" 204 "all_legwear" 0 }
gene_shrink_body={ "shrink_all" 255 "" 0 }
gene_bs_additive_headgears={ "additive_headgears" 255 "" 0 }
gene_bs_cloak_offset={ "cloak_offset" 255 "" 0 }
gene_bs_long_beard={ "long_beard" 255 "" 0 }
gene_bs_no_jaw={ "no_jaw" 255 "" 0 }
gene_facial_markings={ "no_markings" 255 "no_markings" 0 }
clothes={ "western_war_nobility_clothes" 255 "most_clothes" 0 }
headgear={ "western_war" 255 "no_headgear" 0 }
additive_headgear={ "ep2_western_era2_veils" 108 "western_veils" 0 }
clothes={ "western_high_nobility_clothes" 217 "most_clothes" 0 }
gene_balding_hair_effect={ "no_baldness" 255 "no_baldness" 0 }
}
override={
portrait_modifier_overrides={
custom_headgear=m_headgear_sec_western_war_nob_01
entity={ 2268070609 2268070609 }
tags={ {
hash=1367985987
invert=no
}
}

entity={ 979141817 979141817 }
{
hash=2125534279
invert=no
}
{
hash=2670398845
invert=no
}
{
hash=681013727
invert=no
}
{
hash=1563190100
invert=no
}
{
hash=1945936758
invert=no
}
}
}

Loading

0 comments on commit 1755a03

Please sign in to comment.