Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

This commit is contained in:
edwardtheelbowhigh 2026-04-27 18:24:06 +01:00
commit 7239e4b1f4
11 changed files with 471 additions and 118 deletions

View file

@ -12143,26 +12143,6 @@ k_tuva = {
}
k_caucasus = {
pattern = "pattern_solid.dds"
color1 = "green"
color2 = "red"
colored_emblem = {
texture = "ce_ordinary_fess_5.dds"
color1 = "black"
color2 = "black"
instance = { position = { 0.5 0.5 } scale = { 1.0 2.0 } }
}
colored_emblem = {
texture = "ce_leopard_passant_guardant.dds"
color1 = "yellow"
color2 = "yellow"
color3 = "black"
instance = { position = { 0.5 0.48 } scale = { 0.9 1.1 } }
}
}
k_xia = {
pattern = "pattern_solid.dds"
color1 = "red"
@ -33043,3 +33023,183 @@ d_halych={
}
}
k_crimea={
custom=yes
pattern="pattern_horizontal_split_01.dds"
color1=blue
color2=red
color3=red
colored_emblem={
color1=yellow
texture="NEOW_ce_giray.dds"
instance={
position={ 0.500000 0.530000 }
scale={ 0.575000 0.575000 }
}
}
colored_emblem={
color1=white
texture="ce_block_01.dds"
instance={
depth=1.010000
}
}
}
k_kalmykia={
custom=yes
pattern="pattern_solid.dds"
color1=yellow
color2=yellow
color3=blue
colored_emblem={
color1=white
texture="NEOW_ce_lotus.dds"
instance={
scale={ 0.525000 0.525000 }
}
}
colored_emblem={
color1=blue_light
texture="ce_circle_mask.dds"
instance={
scale={ 0.570000 0.570000 }
depth=1.010000
}
}
}
d_dagestan={
custom=yes
pattern="pattern_tricolor_horizontal_01.dds"
color1=green
color2=blue_light
color3=red
}
k_caucasus={
custom=yes
pattern="pattern__solid_designer.dds"
color1=blue_light
color2=blue_light
color3=red
colored_emblem={
color1=yellow
texture="ce_star_05.dds"
instance={
position={ 0.800000 0.220000 }
scale={ 0.190000 0.190000 }
}
instance={
position={ 0.600000 0.300000 }
scale={ 0.190000 0.190000 }
depth=1.010000
}
instance={
position={ 0.600000 0.150000 }
scale={ 0.190000 0.190000 }
depth=2.010000
}
instance={
position={ 0.400000 0.300000 }
scale={ 0.190000 0.190000 }
depth=3.010000
}
instance={
position={ 0.400000 0.150000 }
scale={ 0.190000 0.190000 }
depth=4.010000
}
instance={
position={ 0.200000 0.300000 }
scale={ 0.190000 0.190000 }
depth=5.010000
}
instance={
position={ 0.200000 0.150000 }
scale={ 0.190000 0.190000 }
depth=6.010000
}
}
colored_emblem={
color1=green
color2=white
texture="ce_horizontal_stripes_02.dds"
instance={
position={ 0.500000 0.895000 }
depth=7.010000
rotation=90
}
}
}
k_khazaria={
custom=yes
pattern="pattern_solid.dds"
color1=red
color2=white
color3=red
colored_emblem={
color1=white
texture="ce_block_02.dds"
instance={
position={ 0.500000 0.760000 }
scale={ 1.000000 0.255000 }
depth=3.010000
}
}
colored_emblem={
color1=white
texture="NEOW_ce_volgograd.dds"
instance={
position={ 0.500000 0.340000 }
scale={ 0.579000 0.579000 }
}
}
colored_emblem={
color1=blue
texture="ce_block_03.dds"
instance={
position={ 0.500000 0.760000 }
scale={ 1.000000 0.830000 }
depth=2.010000
}
}
colored_emblem={
color1=white
texture="ce_block_05.dds"
instance={
position={ 0.500000 0.760000 }
scale={ 1.000000 0.410000 }
depth=1.010000
}
}
}

View file

@ -5953,120 +5953,44 @@ k_kuban ={
}
k_khazaria={
pattern="pattern_tricolor_horizontal_01.dds"
color1=red
color2=yellow
color3=blue
colored_emblem={
k_crimea={
custom=yes
pattern="pattern_horizontal_split_01.dds"
color1=blue
texture="ce_block_02.dds"
color2=red
color3=red
colored_emblem={
color1=yellow
texture="NEOW_ce_giray.dds"
instance={
depth=5.010000
position={ 0.500000 0.530000 }
scale={ 0.575000 0.575000 }
}
}
colored_emblem={
color1=yellow
texture="ce_antler_pale.dds"
color1=white
texture="ce_block_01.dds"
instance={
position={ 0.780000 0.190000 }
scale={ -0.230000 0.230000 }
depth=2.010000
}
instance={
position={ 0.710000 0.220000 }
scale={ -0.240000 0.240000 }
depth=3.010000
rotation=317
}
}
colored_emblem={
color1=yellow
color2=yellow
texture="ce_arrow.dds"
instance={
position={ 0.370000 0.370000 }
scale={ 0.420000 0.420000 }
depth=1.010000
rotation=228
}
}
colored_emblem={
color1=white
texture="ce_circle_mask.dds"
instance={
position={ 0.430000 0.460000 }
scale={ 0.080000 0.080000 }
}
}
colored_emblem={
color1=white
color2=yellow
color3=black
texture="ce_antelope.dds"
instance={
scale={ -0.940000 0.940000 }
depth=4.010000
}
}
}
k_crimea={
pattern="pattern_tricolor_horizontal_01.dds"
color1=white
color2=blue_light
color3=red
k_kalmykia={
custom=yes
pattern="pattern_solid.dds"
color1=yellow
color2=yellow
color3=blue
colored_emblem={
color1=white
color2=white
color3=white
texture="ce_huma.dds"
texture="NEOW_ce_lotus.dds"
instance={
position={ 0.520000 0.410000 }
scale={ -0.740000 0.340000 }
depth=1.010000
}
}
colored_emblem={
color1=red
texture="ce_circle_mask.dds"
instance={
position={ 0.390000 0.420000 }
scale={ 0.270000 0.200000 }
depth=2.010000
}
}
colored_emblem={
color1=red
texture="ce_block_02.dds"
instance={
depth=4.010000
}
}
colored_emblem={
color1=white
texture="ce_lion_passant.dds"
instance={
position={ 0.500000 0.590000 }
scale={ 1.000000 0.770000 }
depth=3.010000
scale={ 0.525000 0.525000 }
}
}
@ -6075,8 +5999,134 @@ k_crimea={
color1=blue_light
texture="ce_circle_mask.dds"
instance={
position={ 0.180000 0.400000 }
scale={ 0.060000 0.060000 }
scale={ 0.570000 0.570000 }
depth=1.010000
}
}
}
d_dagestan={
custom=yes
pattern="pattern_tricolor_horizontal_01.dds"
color1=green
color2=blue_light
color3=red
}
k_caucasus={
custom=yes
pattern="pattern__solid_designer.dds"
color1=blue_light
color2=blue_light
color3=red
colored_emblem={
color1=yellow
texture="ce_star_05.dds"
instance={
position={ 0.800000 0.220000 }
scale={ 0.190000 0.190000 }
}
instance={
position={ 0.600000 0.300000 }
scale={ 0.190000 0.190000 }
depth=1.010000
}
instance={
position={ 0.600000 0.150000 }
scale={ 0.190000 0.190000 }
depth=2.010000
}
instance={
position={ 0.400000 0.300000 }
scale={ 0.190000 0.190000 }
depth=3.010000
}
instance={
position={ 0.400000 0.150000 }
scale={ 0.190000 0.190000 }
depth=4.010000
}
instance={
position={ 0.200000 0.300000 }
scale={ 0.190000 0.190000 }
depth=5.010000
}
instance={
position={ 0.200000 0.150000 }
scale={ 0.190000 0.190000 }
depth=6.010000
}
}
colored_emblem={
color1=green
color2=white
texture="ce_horizontal_stripes_02.dds"
instance={
position={ 0.500000 0.895000 }
depth=7.010000
rotation=90
}
}
}
k_khazaria={
custom=yes
pattern="pattern_solid.dds"
color1=red
color2=white
color3=red
colored_emblem={
color1=white
texture="ce_block_02.dds"
instance={
position={ 0.500000 0.760000 }
scale={ 1.000000 0.255000 }
depth=3.010000
}
}
colored_emblem={
color1=white
texture="NEOW_ce_volgograd.dds"
instance={
position={ 0.500000 0.340000 }
scale={ 0.579000 0.579000 }
}
}
colored_emblem={
color1=blue
texture="ce_block_03.dds"
instance={
position={ 0.500000 0.760000 }
scale={ 1.000000 0.830000 }
depth=2.010000
}
}
colored_emblem={
color1=white
texture="ce_block_05.dds"
instance={
position={ 0.500000 0.760000 }
scale={ 1.000000 0.410000 }
depth=1.010000
}
}

View file

@ -1960,3 +1960,121 @@ dna_freddiemercury={
enabled=yes
}
dna_gennedy={
genes={ hair_color={ 222 200 222 200 }
skin_color={ 120 100 120 100 }
eye_color={ 164 149 164 149 }
gene_chin_forward={ "chin_forward_pos" 150 "chin_forward_pos" 150 }
gene_chin_height={ "chin_height_pos" 160 "chin_height_pos" 160 }
gene_chin_width={ "chin_width_neg" 94 "chin_width_neg" 94 }
gene_eye_angle={ "eye_angle_pos" 181 "eye_angle_pos" 181 }
gene_eye_depth={ "eye_depth_neg" 100 "eye_depth_neg" 100 }
gene_eye_height={ "eye_height_neg" 35 "eye_height_neg" 35 }
gene_eye_distance={ "eye_distance_neg" 35 "eye_distance_neg" 35 }
gene_eye_shut={ "eye_shut_pos" 160 "eye_shut_pos" 160 }
gene_forehead_angle={ "forehead_angle_neg" 87 "forehead_angle_neg" 87 }
gene_forehead_brow_height={ "forehead_brow_height_neg" 68 "forehead_brow_height_neg" 68 }
gene_forehead_roundness={ "forehead_roundness_pos" 187 "forehead_roundness_pos" 187 }
gene_forehead_width={ "forehead_width_pos" 155 "forehead_width_pos" 155 }
gene_forehead_height={ "forehead_height_neg" 62 "forehead_height_neg" 62 }
gene_head_height={ "head_height_neg" 54 "head_height_neg" 54 }
gene_head_width={ "head_width_pos" 155 "head_width_pos" 155 }
gene_head_profile={ "head_profile_neg" 72 "head_profile_neg" 72 }
gene_head_top_height={ "head_top_height_neg" 98 "head_top_height_neg" 98 }
gene_head_top_width={ "head_top_width_pos" 171 "head_top_width_pos" 171 }
gene_jaw_angle={ "jaw_angle_pos" 155 "jaw_angle_pos" 155 }
gene_jaw_forward={ "jaw_forward_pos" 156 "jaw_forward_pos" 156 }
gene_jaw_height={ "jaw_height_pos" 157 "jaw_height_pos" 157 }
gene_jaw_width={ "jaw_width_pos" 172 "jaw_width_pos" 172 }
gene_mouth_corner_depth={ "mouth_corner_depth_neg" 100 "mouth_corner_depth_neg" 100 }
gene_mouth_corner_height={ "mouth_corner_height_neg" 29 "mouth_corner_height_neg" 29 }
gene_mouth_forward={ "mouth_forward_neg" 97 "mouth_forward_neg" 97 }
gene_mouth_height={ "mouth_height_pos" 217 "mouth_height_pos" 217 }
gene_mouth_width={ "mouth_width_pos" 220 "mouth_width_pos" 220 }
gene_mouth_upper_lip_size={ "mouth_upper_lip_size_neg" 94 "mouth_upper_lip_size_neg" 94 }
gene_mouth_lower_lip_size={ "mouth_lower_lip_size_neg" 30 "mouth_lower_lip_size_neg" 30 }
gene_mouth_open={ "mouth_open_pos" 157 "mouth_open_pos" 157 }
gene_neck_length={ "neck_length_pos" 152 "neck_length_pos" 152 }
gene_neck_width={ "neck_width_neg" 82 "neck_width_neg" 82 }
gene_bs_cheek_forward={ "cheek_forward_pos" 9 "cheek_forward_pos" 9 }
gene_bs_cheek_height={ "cheek_height_pos" 27 "cheek_height_pos" 27 }
gene_bs_cheek_width={ "cheek_width_neg" 17 "cheek_width_neg" 17 }
gene_bs_ear_angle={ "ear_angle_pos" 80 "ear_angle_pos" 80 }
gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 14 "ear_inner_shape_pos" 14 }
gene_bs_ear_bend={ "ear_lower_bend_pos" 10 "ear_lower_bend_pos" 10 }
gene_bs_ear_outward={ "ear_outward_pos" 6 "ear_outward_pos" 6 }
gene_bs_ear_size={ "ear_size_pos" 83 "ear_size_pos" 83 }
gene_bs_eye_corner_depth={ "eye_corner_depth_pos" 30 "eye_corner_depth_pos" 30 }
gene_bs_eye_fold_shape={ "eye_fold_shape_neg" 56 "eye_fold_shape_neg" 56 }
gene_bs_eye_size={ "eye_size_pos" 53 "eye_size_pos" 53 }
gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_pos" 32 "eye_upper_lid_size_pos" 32 }
gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 200 "forehead_brow_curve_neg" 200 }
gene_bs_forehead_brow_forward={ "forehead_brow_forward_neg" 13 "forehead_brow_forward_neg" 13 }
gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_pos" 18 "forehead_brow_inner_height_pos" 18 }
gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_pos" 82 "forehead_brow_outer_height_pos" 82 }
gene_bs_forehead_brow_width={ "forehead_brow_width_pos" 33 "forehead_brow_width_pos" 33 }
gene_bs_jaw_def={ "jaw_def_neg" 17 "jaw_def_neg" 17 }
gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 14 "mouth_lower_lip_def_pos" 14 }
gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_neg" 26 "mouth_lower_lip_full_neg" 26 }
gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_pos" 36 "mouth_lower_lip_pad_pos" 36 }
gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_neg" 1 "mouth_lower_lip_width_neg" 1 }
gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 0 "mouth_philtrum_def_pos" 0 }
gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_pos" 8 "mouth_philtrum_shape_pos" 8 }
gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_pos" 21 "mouth_philtrum_width_pos" 21 }
gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 91 "mouth_upper_lip_def_pos" 91 }
gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_pos" 5 "mouth_upper_lip_full_pos" 5 }
gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_neg" 14 "mouth_upper_lip_profile_neg" 14 }
gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_pos" 30 "mouth_upper_lip_width_pos" 30 }
gene_bs_nose_forward={ "nose_forward_neg" 2 "nose_forward_neg" 2 }
gene_bs_nose_height={ "nose_height_neg" 0 "nose_height_neg" 0 }
gene_bs_nose_length={ "nose_length_pos" 13 "nose_length_pos" 13 }
gene_bs_nose_nostril_height={ "nose_nostril_height_neg" 26 "nose_nostril_height_neg" 26 }
gene_bs_nose_nostril_width={ "nose_nostril_width_neg" 9 "nose_nostril_width_neg" 9 }
gene_bs_nose_profile={ "nose_profile_neg" 28 "nose_profile_neg" 28 }
gene_bs_nose_ridge_angle={ "nose_ridge_angle_pos" 6 "nose_ridge_angle_pos" 6 }
gene_bs_nose_ridge_width={ "nose_ridge_width_pos" 11 "nose_ridge_width_pos" 11 }
gene_bs_nose_size={ "nose_size_neg" 4 "nose_size_neg" 4 }
gene_bs_nose_tip_angle={ "nose_tip_angle_neg" 1 "nose_tip_angle_neg" 1 }
gene_bs_nose_tip_forward={ "nose_tip_forward_pos" 0 "nose_tip_forward_pos" 0 }
gene_bs_nose_tip_width={ "nose_tip_width_pos" 30 "nose_tip_width_pos" 30 }
face_detail_cheek_def={ "cheek_def_02" 47 "cheek_def_02" 47 }
face_detail_cheek_fat={ "cheek_fat_03_pos" 225 "cheek_fat_03_pos" 225 }
face_detail_chin_cleft={ "chin_cleft" 18 "chin_cleft" 18 }
face_detail_chin_def={ "chin_def" 251 "chin_def" 251 }
face_detail_eye_lower_lid_def={ "eye_lower_lid_def" 0 "eye_lower_lid_def" 0 }
face_detail_eye_socket={ "eye_socket_03" 16 "eye_socket_03" 16 }
face_detail_nasolabial={ "nasolabial_01" 43 "nasolabial_01" 43 }
face_detail_nose_ridge_def={ "nose_ridge_def_pos" 3 "nose_ridge_def_pos" 3 }
face_detail_nose_tip_def={ "nose_tip_def" 4 "nose_tip_def" 4 }
face_detail_temple_def={ "temple_def" 156 "temple_def" 156 }
expression_brow_wrinkles={ "brow_wrinkles_02" 255 "brow_wrinkles_02" 255 }
expression_eye_wrinkles={ "eye_wrinkles_02" 233 "eye_wrinkles_02" 233 }
expression_forehead_wrinkles={ "forehead_wrinkles_01" 207 "forehead_wrinkles_01" 207 }
expression_other={ "cheek_wrinkles_both_01" 0 "cheek_wrinkles_both_01" 0 }
complexion={ "complexion_ugly_1" 255 "complexion_1" 255 }
gene_height={ "normal_height" 127 "normal_height" 127 }
gene_bs_body_type={ "body_fat_head_fat_medium" 147 "body_fat_head_fat_medium" 147 }
gene_bs_body_shape={ "body_shape_hourglass_full" 43 "body_shape_hourglass_full" 18 }
gene_bs_bust={ "bust_clothes" 149 "bust_default" 187 }
gene_age={ "old_1" 12 "old_1" 12 }
gene_eyebrows_shape={ "far_spacing_high_thickness" 230 "far_spacing_high_thickness" 230 }
gene_eyebrows_fullness={ "layer_2_lower_thickness" 174 "layer_2_lower_thickness" 174 }
gene_body_hair={ "body_hair_avg" 165 "body_hair_avg" 165 }
gene_hair_type={ "hair_wavy" 176 "hair_wavy" 176 }
gene_baldness={ "male_pattern_baldness" 63 "male_pattern_baldness" 63 }
eye_accessory={ "normal_eyes" 79 "normal_eyes" 79 }
teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 }
eyelashes_accessory={ "normal_eyelashes" 133 "normal_eyelashes" 133 }
beards={ "northern_beards_curly" 255 "no_beard" 0 }
hairstyles={ "northern_hairstyles_curly" 255 "all_hairstyles" 0 }
clothes={ "western_bedchamber" 79 "most_clothes" 0 }
}
override={
portrait_modifier_overrides={
custom_beards=male_beard_western_06
custom_hair=male_hair_mena_04
}
}
entity={ 0 0 }
}

BIN
gfx/coat_of_arms/colored_emblems/NEOW_ce_budenovka.dds (Stored with Git LFS) Normal file

Binary file not shown.

BIN
gfx/coat_of_arms/colored_emblems/NEOW_ce_lenin.dds (Stored with Git LFS) Normal file

Binary file not shown.

BIN
gfx/coat_of_arms/colored_emblems/NEOW_ce_sovborder.dds (Stored with Git LFS) Normal file

Binary file not shown.

BIN
gfx/coat_of_arms/colored_emblems/NEOW_ce_sovwreath.dds (Stored with Git LFS) Normal file

Binary file not shown.

BIN
gfx/coat_of_arms/colored_emblems/NEOW_ce_stalin.dds (Stored with Git LFS) Normal file

Binary file not shown.

BIN
gfx/coat_of_arms/colored_emblems/NEOW_ce_volgograd.dds (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -113,6 +113,9 @@ NEOW_ce_head_w_adrian_helmet.dds = { colors = 2 category = figures }
NEOW_ce_johansus1.dds = { colors = 3 category = figures }
NEOW_ce_johansus2.dds = { colors = 3 category = figures }
NEOW_ce_louis.dds = { colors = 2 category = figures }
NEOW_ce_volgograd.dds = { colors = 1 category = figures }
NEOW_ce_stalin.dds = { colors = 2 category = figures }
NEOW_ce_lenin.dds = { colors = 2 category = figures }
###MANMADE
NEOW_ce_armillary_sphere.dds = { colors = 1 category = manmade }
@ -155,6 +158,7 @@ NEOW_ce_whip.dds = { colors = 1 category = manmade }
ce_book_open.dds = { colors = 2 category = manmade }
NEOW_ce_papal_tiara.dds = { colors = 3 category = manmade }
NEOW_ce_jacobinhat.dds = { colors = 3 category = manmade }
NEOW_ce_budenovka.dds = { colors = 3 category = manmade }
###NATURE
NEOW_ce_acorn.dds = { colors = 1 category = nature }
@ -176,6 +180,7 @@ NEOW_ce_vergina.dds = { colors = 1 category = nature }
NEOW_ce_zanzibar.dds = { colors = 1 category = nature }
NEOW_ce_flame.dds = { colors = 1 category = nature }
NEOW_ce_halfsun.dds = { colors = 1 category = nature }
NEOW_ce_sovwreath.dds = { colors = 1 category = nature }
###PATTERNS
NEOW_ce_bend_alsace.dds = { colors = 1 category = patterns }
@ -183,6 +188,7 @@ NEOW_ce_border_shield_embattled.dds = { colors = 1 category = patterns }
NEOW_ce_inescutcheon_lozengy.dds = { colors = 2 category = patterns }
NEOW_ce_wave_single.dds = { colors = 1 category = patterns }
NEOW_ce_waves_05.dds = { colors = 2 category = patterns }
NEOW_ce_sovborder.dds = { colors = 1 category = patterns }
###TRIBAL SEALS
NEOW_ce_giray.dds = { colors = 1 category = tribal_seal }

View file

@ -20,6 +20,7 @@ russia0002 = {
name = "Gennedy"
culture = NEOW_nizhnevolzhan
religion = stalinist
dna = dna_gennedy
trait = education_learning_3
trait = temperate
trait = brave