diff --git a/common/dna_data/wc_easter_egg_dna.txt b/common/dna_data/wc_easter_egg_dna.txt index 42a93cc9ac..f747a4c213 100644 --- a/common/dna_data/wc_easter_egg_dna.txt +++ b/common/dna_data/wc_easter_egg_dna.txt @@ -2180,7 +2180,8 @@ yimo_dna = { # by Velius serphentos_dna = { # by Velius portrait_info = { - genes = { hair_color={ 29 126 197 225 } + genes = { + hair_color={ 29 126 197 225 } skin_color={ 29 69 18 65 } eye_color={ 31 83 28 233 } gene_chin_forward={ "chin_forward_neg" 161 "chin_forward_neg" 157 } @@ -2322,3 +2323,149 @@ serphentos_dna = { # by Velius } enabled = yes } + +monori_dna = { # by Velius + portrait_info = { + genes = { + hair_color={ 202 38 139 73 } + skin_color={ 215 62 221 78 } + eye_color={ 167 59 167 59 } + gene_chin_forward={ "chin_forward_neg" 142 "chin_forward_neg" 120 } + gene_chin_height={ "chin_height_pos" 150 "chin_height_pos" 171 } + gene_chin_width={ "chin_width_neg" 86 "chin_width_neg" 67 } + gene_eye_angle={ "eye_angle_neg" 151 "eye_angle_neg" 151 } + gene_eye_depth={ "eye_depth_neg" 129 "eye_depth_neg" 129 } + gene_eye_height={ "eye_height_neg" 121 "eye_height_neg" 121 } + gene_eye_distance={ "eye_distance_neg" 138 "eye_distance_neg" 138 } + gene_eye_shut={ "eye_shut_neg" 132 "eye_shut_neg" 132 } + gene_forehead_angle={ "forehead_angle_neg" 126 "forehead_angle_neg" 87 } + gene_forehead_brow_height={ "forehead_brow_height_neg" 62 "forehead_brow_height_neg" 55 } + gene_forehead_roundness={ "forehead_roundness_neg" 165 "forehead_roundness_neg" 139 } + gene_forehead_width={ "forehead_width_neg" 122 "forehead_width_neg" 144 } + gene_forehead_height={ "forehead_height_neg" 138 "forehead_height_neg" 115 } + gene_head_height={ "head_height_neg" 188 "head_height_neg" 182 } + gene_head_width={ "head_width_neg" 104 "head_width_neg" 89 } + gene_head_profile={ "head_profile_neg" 103 "head_profile_neg" 97 } + gene_head_top_height={ "head_top_height_neg" 144 "head_top_height_neg" 125 } + gene_head_top_width={ "head_top_width_neg" 118 "head_top_width_neg" 122 } + gene_jaw_angle={ "jaw_angle_neg" 95 "jaw_angle_neg" 95 } + gene_jaw_forward={ "jaw_forward_neg" 107 "jaw_forward_neg" 107 } + gene_jaw_height={ "jaw_height_neg" 113 "jaw_height_neg" 113 } + gene_jaw_width={ "jaw_width_pos" 126 "jaw_width_pos" 126 } + gene_mouth_corner_depth={ "mouth_corner_depth_pos" 202 "mouth_corner_depth_pos" 202 } + gene_mouth_corner_height={ "mouth_corner_height_neg" 157 "mouth_corner_height_neg" 157 } + gene_mouth_forward={ "mouth_forward_neg" 188 "mouth_forward_neg" 188 } + gene_mouth_height={ "mouth_height_neg" 69 "mouth_height_neg" 69 } + gene_mouth_width={ "mouth_width_neg" 79 "mouth_width_neg" 79 } + gene_mouth_upper_lip_size={ "mouth_upper_lip_size_neg" 118 "mouth_upper_lip_size_neg" 134 } + gene_mouth_lower_lip_size={ "mouth_lower_lip_size_neg" 147 "mouth_lower_lip_size_neg" 151 } + gene_mouth_open={ "mouth_open_pos" 0 "mouth_open_pos" 0 } + gene_neck_length={ "neck_length_neg" 150 "neck_length_neg" 144 } + gene_neck_width={ "neck_width_pos" 48 "neck_width_pos" 54 } + gene_bs_cheek_forward={ "cheek_forward_pos" 97 "cheek_forward_pos" 116 } + gene_bs_cheek_height={ "cheek_height_pos" 93 "cheek_height_pos" 154 } + gene_bs_cheek_width={ "cheek_width_pos" 81 "cheek_width_pos" 103 } + gene_bs_ear_angle={ "ear_angle_pos" 19 "ear_angle_neg" 0 } + gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 190 "ear_inner_shape_pos" 206 } + gene_bs_ear_bend={ "ear_both_bend_pos" 67 "ear_both_bend_pos" 84 } + gene_bs_ear_outward={ "ear_outward_pos" 52 "ear_outward_pos" 52 } + gene_bs_ear_size={ "ear_size_pos" 107 "ear_size_pos" 157 } + gene_bs_eye_corner_depth={ "eye_corner_depth_neg" 7 "eye_corner_depth_neg" 7 } + gene_bs_eye_fold_shape={ "eye_fold_shape_pos" 111 "eye_fold_shape_pos" 111 } + gene_bs_eye_size={ "eye_size_pos" 113 "eye_size_pos" 113 } + gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_pos" 1 "eye_upper_lid_size_pos" 1 } + gene_bs_forehead_brow_curve={ "forehead_brow_curve_pos" 45 "forehead_brow_curve_pos" 33 } + gene_bs_forehead_brow_forward={ "forehead_brow_forward_pos" 3 "forehead_brow_forward_pos" 45 } + gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_neg" 31 "forehead_brow_inner_height_neg" 31 } + gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_pos" 47 "forehead_brow_outer_height_pos" 26 } + gene_bs_forehead_brow_width={ "forehead_brow_width_neg" 29 "forehead_brow_width_pos" 8 } + gene_bs_jaw_def={ "jaw_def_pos" 98 "jaw_def_pos" 98 } + gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 147 "mouth_lower_lip_def_pos" 238 } + gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_neg" 23 "mouth_lower_lip_full_pos" 50 } + gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_pos" 187 "mouth_lower_lip_pad_pos" 192 } + gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_neg" 93 "mouth_lower_lip_width_neg" 72 } + gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 112 "mouth_philtrum_def_pos" 112 } + gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_neg" 101 "mouth_philtrum_shape_neg" 101 } + gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_pos" 130 "mouth_philtrum_width_pos" 130 } + gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 87 "mouth_upper_lip_def_pos" 103 } + gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_neg" 115 "mouth_upper_lip_full_neg" 137 } + gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_pos" 11 "mouth_upper_lip_profile_pos" 57 } + gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_neg" 51 "mouth_upper_lip_width_neg" 44 } + gene_bs_nose_forward={ "nose_forward_neg" 11 "nose_forward_pos" 27 } + gene_bs_nose_height={ "nose_height_neg" 101 "nose_height_neg" 111 } + gene_bs_nose_length={ "nose_length_pos" 15 "nose_length_neg" 15 } + gene_bs_nose_nostril_height={ "nose_nostril_height_pos" 17 "nose_nostril_height_neg" 12 } + gene_bs_nose_nostril_width={ "nose_nostril_width_pos" 13 "nose_nostril_width_pos" 30 } + gene_bs_nose_profile={ "nose_profile_hawk_pos" 39 "nose_profile_hawk_pos" 69 } + gene_bs_nose_ridge_angle={ "nose_ridge_angle_pos" 68 "nose_ridge_angle_pos" 68 } + gene_bs_nose_ridge_width={ "nose_ridge_width_neg" 217 "nose_ridge_width_neg" 225 } + gene_bs_nose_size={ "nose_size_pos" 17 "nose_size_neg" 19 } + gene_bs_nose_tip_angle={ "nose_tip_angle_pos" 63 "nose_tip_angle_pos" 63 } + gene_bs_nose_tip_forward={ "nose_tip_forward_pos" 69 "nose_tip_forward_pos" 111 } + gene_bs_nose_tip_width={ "nose_tip_width_pos" 69 "nose_tip_width_pos" 74 } + face_detail_cheek_def={ "cheek_def_02" 136 "cheek_def_02" 185 } + face_detail_cheek_fat={ "cheek_fat_02_pos" 73 "cheek_fat_01_neg" 33 } + face_detail_chin_cleft={ "chin_dimple" 0 "chin_dimple" 0 } + face_detail_chin_def={ "chin_def" 218 "chin_def" 239 } + face_detail_eye_lower_lid_def={ "eye_lower_lid_def" 129 "eye_lower_lid_def" 129 } + face_detail_eye_socket={ "eye_socket_01" 242 "eye_socket_01" 242 } + face_detail_nasolabial={ "nasolabial_02" 63 "nasolabial_02" 49 } + face_detail_nose_ridge_def={ "nose_ridge_def_pos" 137 "nose_ridge_def_pos" 137 } + face_detail_nose_tip_def={ "nose_tip_def" 102 "nose_tip_def" 115 } + face_detail_temple_def={ "temple_def" 131 "temple_def" 131 } + expression_brow_wrinkles={ "brow_wrinkles_02" 120 "brow_wrinkles_02" 120 } + expression_eye_wrinkles={ "eye_wrinkles_01" 128 "eye_wrinkles_01" 128 } + expression_forehead_wrinkles={ "forehead_wrinkles_01" 51 "forehead_wrinkles_01" 51 } + expression_other={ "cheek_wrinkles_both_01" 45 "cheek_wrinkles_both_01" 45 } + complexion={ "complexion_4" 95 "complexion_1" 86 } + gene_height={ "normal_height" 160 "normal_height" 160 } + gene_bs_body_type={ "body_fat_head_fat_low" 76 "body_fat_head_fat_low" 76 } + gene_bs_body_shape={ "body_shape_triangle_full" 178 "body_shape_triangle_full" 127 } + gene_bs_bust={ "bust_clothes" 162 "bust_default" 203 } + gene_age={ "old_2" 121 "old_2" 121 } + gene_eyebrows_shape={ "no_eyebrows" 44 "no_eyebrows" 44 } + gene_eyebrows_fullness={ "no_eyebrows" 196 "no_eyebrows" 196 } + gene_body_hair={ "body_hair_sparse" 0 "body_hair_sparse" 0 } + gene_hair_type={ "hair_straight" 112 "hair_straight" 112 } + gene_baldness={ "male_pattern_baldness" 184 "male_pattern_baldness" 184 } + eye_accessory={ "normal_eyes" 222 "normal_eyes" 222 } + eye_left_accessory={ "normal_eyes" 227 "normal_eyes" 227 } + teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 } + eyelashes_accessory={ "normal_eyelashes" 170 "normal_eyelashes" 170 } + gene_body_markings={ "no_body_markings" 255 "no_body_markings" 255 } + gene_facial_markings={ "facial_nightelf_markings_02" 158 "no_markings" 255 } + gene_facial_markings_2={ "nathrezim_lipstick" 138 "no_markings" 127 } + special_eyebrows={ "night_elven_eyebrows" 18 "night_elven_eyebrows" 18 } + claws={ "no_claws" 0 "no_claws" 0 } + hooves={ "no_hoves" 0 "no_hoves" 0 } + horns={ "no_horns" 0 "no_horns" 0 } + legs={ "no_legs" 0 "no_legs" 0 } + gene_race={ "creature_night_elf" 219 "creature_night_elf" 219 } + gene_being={ "no_being" 127 "no_being" 127 } + gene_skin_value={ "skin_value_pos" 0 "skin_value_neg" 0 } + gene_bs_ear_lenght={ "floppy_ear_length" 229 "floppy_ear_length" 236 } + gene_bs_ear_tip={ "ear_tip_pos" 114 "ear_tip_pos" 103 } + gene_bs_mouth_tusks={ "no_mouth_tusks" 0 "no_mouth_tusks" 0 } + gene_bs_fingers={ "fingers_troll" 0 "fingers_troll" 0 } + gene_grade={ "plantigrade" 0 "plantigrade" 0 } + gene_mustaches={ "mustaches" 93 "mustaches" 93 } + gene_hair_aging={ "normal_hair_aging" 127 "normal_hair_aging" 127 } + gene_sexual_dimorphism={ "no_dimorphism" 127 "no_dimorphism" 127 } + leg_skin={ "no_leg_skin" 127 "no_leg_skin" 127 } + special_eyes={ "magic_eyes" 127 "magic_eyes" 127 } + static_eyes={ "no_static_eyes" 0 "no_static_eyes" 0 } + static_hairstyles={ "no_static_hairstyles" 0 "no_static_hairstyles" 0 } + static_hairstyles2={ "no_static_hairstyles2" 0 "no_static_hairstyles2" 0 } + static_model={ "no_static_model" 0 "no_static_model" 0 } + static_mustaches={ "no_static_mustaches" 0 "no_static_mustaches" 0 } + static_beards={ "no_static_beards" 0 "no_static_beards" 0 } + tusks={ "no_tusks" 0 "no_tusks" 0 } + tail={ "no_tail" 0 "no_tail" 0 } + tendrils={ "no_tendrils" 0 "no_tendrils" 0 } + wings={ "no_wings" 0 "no_wings" 0 } + hairstyles={ "western_hairstyles_wavy" 56 "all_hairstyles" 0 } + beards={ "night_elven_straight_beards" 255 "no_beard" 0 } + } + } + enabled = yes +} \ No newline at end of file diff --git a/common/scripted_triggers/wc_his_character_triggers.txt b/common/scripted_triggers/wc_his_character_triggers.txt index fcaf84ff65..8839c235af 100644 --- a/common/scripted_triggers/wc_his_character_triggers.txt +++ b/common/scripted_triggers/wc_his_character_triggers.txt @@ -758,6 +758,11 @@ is_easteregg18_trigger = { exists = character:easteregg18 # Serphentos (Easter Egg) this = character:easteregg18 # Serphentos (Easter Egg) } +is_easteregg19_trigger = { + exists = this + exists = character:easteregg19 # Monóri (Easter Egg) + this = character:easteregg19 # Monóri (Easter Egg) +} #Patreons @@ -1125,6 +1130,7 @@ is_any_historical_character_trigger = { is_easteregg14_trigger = yes is_easteregg15_trigger = yes is_easteregg18_trigger = yes + is_easteregg19_trigger = yes #Patreons is_mahiro_trigger = yes diff --git a/gfx/portraits/portrait_modifiers/50_hairstyles_scripted_characters.txt b/gfx/portraits/portrait_modifiers/50_hairstyles_scripted_characters.txt index de026e549d..01de26f3dc 100644 --- a/gfx/portraits/portrait_modifiers/50_hairstyles_scripted_characters.txt +++ b/gfx/portraits/portrait_modifiers/50_hairstyles_scripted_characters.txt @@ -1491,6 +1491,10 @@ hairstyles_scripted_characters = { add = 200 is_sally_whitemane_trigger = yes } + modifier = { + add = 200 + is_easteregg19_trigger = yes # Monóri (Easter Egg) + } # leave this modifier last modifier = { factor = 0 diff --git a/gfx/portraits/portrait_modifiers/wc_facial_markings.txt b/gfx/portraits/portrait_modifiers/wc_facial_markings.txt index 98c25072f0..0d308506e9 100644 --- a/gfx/portraits/portrait_modifiers/wc_facial_markings.txt +++ b/gfx/portraits/portrait_modifiers/wc_facial_markings.txt @@ -177,6 +177,10 @@ add = 50 has_elunes_marks_trigger = yes } + modifier = { + add = 200 + is_easteregg19_trigger = yes # Monóri (Easter Egg) + } } is_valid_custom = { diff --git a/history/characters/wc_easteregg_characters.txt b/history/characters/wc_easteregg_characters.txt index ff431fcb97..00c2e7fdcf 100644 --- a/history/characters/wc_easteregg_characters.txt +++ b/history/characters/wc_easteregg_characters.txt @@ -587,7 +587,7 @@ easteregg17 = { # Dwarven officer of Ironforge easteregg18 = { name = "Serphentos" - #dna = serphentos_dna + dna = serphentos_dna culture = bronzebeard religion = khazism disallow_random_traits = yes @@ -622,7 +622,8 @@ easteregg18 = { # Sentinel captain of the Alliance easteregg19 = { name = "Monóri" - #dna = monori_dna + dna = monori_dna + female = yes dynasty = easteregg_dyn11 # Silverleaf culture = night_elf religion = kaldorei_religion