From 91519a5cbe109fbb2492a9d7d459ddecd44e4235 Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Thu, 17 Sep 2026 15:04:42 +0200 Subject: [PATCH] Van duchy --- common/dna_data/NEOW_dna.txt | 162 ++++++++++++++++++ common/dynasties/NEOW_dynasties.txt | 6 + common/landed_titles/LAAMPs.txt | 15 ++ common/landed_titles/mashriq.txt | 157 ++++++----------- gfx/map/map_object_data/activities.txt | 32 ++-- gfx/map/map_object_data/building_locators.txt | 48 +++--- gfx/map/map_object_data/combat_locators.txt | 46 ++--- .../map_object_data/player_stack_locators.txt | 30 ++-- gfx/map/map_object_data/siege_locators.txt | 48 +++--- history/characters/NEOW_e_scandinavia.txt | 20 +++ history/provinces/e_caucasia.txt | 121 ------------- history/provinces/e_mashriq.txt | 86 ++++++---- history/titles/NEOW_laamp_titles.txt | 13 ++ .../english/replace/NEOW_mottos_l_english.yml | 3 +- .../titles_cultural_names_l_english.yml | 14 -- .../english/replace/titles_l_english.yml | 46 +++-- map_data/definition.csv | 6 +- map_data/provinces.png | 4 +- 18 files changed, 450 insertions(+), 407 deletions(-) diff --git a/common/dna_data/NEOW_dna.txt b/common/dna_data/NEOW_dna.txt index 81d056452..185c861ab 100644 --- a/common/dna_data/NEOW_dna.txt +++ b/common/dna_data/NEOW_dna.txt @@ -5893,3 +5893,165 @@ dna_august={ enabled=yes } + +dna_brand_henriksen={ + portrait_info = { + genes={ hair_color={ 4 229 178 229 } + skin_color={ 176 84 153 81 } + eye_color={ 69 7 210 108 } + gene_chin_forward={ "chin_forward_pos" 137 "chin_forward_pos" 137 } + gene_chin_height={ "chin_height_pos" 121 "chin_height_pos" 121 } + gene_chin_width={ "chin_width_neg" 144 "chin_width_neg" 144 } + gene_eye_angle={ "eye_angle_neg" 113 "eye_angle_neg" 113 } + gene_eye_depth={ "eye_depth_pos" 131 "eye_depth_pos" 131 } + gene_eye_height={ "eye_height_pos" 153 "eye_height_pos" 153 } + gene_eye_distance={ "eye_distance_pos" 123 "eye_distance_pos" 123 } + gene_eye_shut={ "eye_shut_pos" 151 "eye_shut_pos" 151 } + gene_forehead_angle={ "forehead_angle_neg" 129 "forehead_angle_neg" 129 } + gene_forehead_brow_height={ "forehead_brow_height_pos" 102 "forehead_brow_height_pos" 102 } + gene_forehead_roundness={ "forehead_roundness_neg" 145 "forehead_roundness_neg" 113 } + gene_forehead_width={ "forehead_width_neg" 153 "forehead_width_neg" 153 } + gene_forehead_height={ "forehead_height_pos" 153 "forehead_height_pos" 153 } + gene_head_height={ "head_height_pos" 151 "head_height_pos" 151 } + gene_head_width={ "head_width_pos" 107 "head_width_pos" 107 } + gene_head_profile={ "head_profile_pos" 114 "head_profile_pos" 114 } + gene_head_top_height={ "head_top_height_pos" 120 "head_top_height_pos" 120 } + gene_head_top_width={ "head_top_width_pos" 139 "head_top_width_pos" 139 } + gene_jaw_angle={ "jaw_angle_pos" 123 "jaw_angle_pos" 123 } + gene_jaw_forward={ "jaw_forward_neg" 137 "jaw_forward_neg" 137 } + gene_jaw_height={ "jaw_height_neg" 102 "jaw_height_neg" 102 } + gene_jaw_width={ "jaw_width_neg" 142 "jaw_width_neg" 142 } + gene_mouth_corner_depth={ "mouth_corner_depth_neg" 130 "mouth_corner_depth_neg" 130 } + gene_mouth_corner_height={ "mouth_corner_height_neg" 128 "mouth_corner_height_neg" 128 } + gene_mouth_forward={ "mouth_forward_neg" 145 "mouth_forward_neg" 145 } + gene_mouth_height={ "mouth_height_neg" 115 "mouth_height_neg" 115 } + gene_mouth_width={ "mouth_width_neg" 113 "mouth_width_neg" 113 } + gene_mouth_upper_lip_size={ "mouth_upper_lip_size_neg" 102 "mouth_upper_lip_size_neg" 102 } + gene_mouth_lower_lip_size={ "mouth_lower_lip_size_neg" 125 "mouth_lower_lip_size_neg" 125 } + gene_mouth_open={ "mouth_open_neg" 102 "mouth_open_neg" 102 } + gene_neck_length={ "neck_length_neg" 128 "neck_length_neg" 128 } + gene_neck_width={ "neck_width_pos" 120 "neck_width_pos" 127 } + gene_bs_cheek_forward={ "cheek_forward_pos" 27 "cheek_forward_pos" 43 } + gene_bs_cheek_height={ "cheek_height_neg" 69 "cheek_height_pos" 23 } + gene_bs_cheek_width={ "cheek_width_pos" 55 "cheek_width_pos" 50 } + gene_bs_ear_angle={ "ear_angle_neg" 13 "ear_angle_neg" 43 } + gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 192 "ear_inner_shape_pos" 180 } + gene_bs_ear_bend={ "ear_both_bend_pos" 77 "ear_both_bend_pos" 85 } + gene_bs_ear_outward={ "ear_outward_neg" 57 "ear_outward_pos" 2 } + gene_bs_ear_size={ "ear_size_pos" 33 "ear_size_neg" 13 } + gene_bs_eye_corner_depth={ "eye_corner_depth_pos" 17 "eye_corner_depth_pos" 1 } + gene_bs_eye_fold_shape={ "eye_fold_shape_pos" 9 "eye_fold_shape_pos" 127 } + gene_bs_eye_size={ "eye_size_neg" 81 "eye_size_neg" 125 } + gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_pos_02" 0 "eye_upper_lid_size_pos_02" 54 } + gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 113 "forehead_brow_curve_neg" 114 } + gene_bs_forehead_brow_forward={ "forehead_brow_forward_pos" 47 "forehead_brow_forward_pos" 36 } + gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_pos" 49 "forehead_brow_inner_height_pos" 30 } + gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_pos" 37 "forehead_brow_outer_height_pos" 29 } + gene_bs_forehead_brow_width={ "forehead_brow_width_pos" 121 "forehead_brow_width_pos" 5 } + gene_bs_jaw_def={ "jaw_def_pos" 115 "jaw_def_neg" 28 } + gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 69 "mouth_lower_lip_def_pos" 37 } + gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_pos" 119 "mouth_lower_lip_full_pos" 45 } + gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_neg" 123 "mouth_lower_lip_pad_pos" 56 } + gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_pos" 75 "mouth_lower_lip_width_pos" 40 } + gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 203 "mouth_philtrum_def_pos" 106 } + gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_pos" 17 "mouth_philtrum_shape_pos" 116 } + gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_pos" 31 "mouth_philtrum_width_neg" 47 } + gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 92 "mouth_upper_lip_def_pos" 53 } + gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_pos" 23 "mouth_upper_lip_full_pos" 18 } + gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_pos" 101 "mouth_upper_lip_profile_pos" 101 } + gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_pos" 37 "mouth_upper_lip_width_neg" 42 } + gene_bs_nose_forward={ "nose_forward_pos" 29 "nose_forward_neg" 6 } + gene_bs_nose_height={ "nose_height_neg" 3 "nose_height_pos" 0 } + gene_bs_nose_length={ "nose_length_pos" 53 "nose_length_pos" 126 } + gene_bs_nose_nostril_height={ "nose_nostril_height_pos" 27 "nose_nostril_height_pos" 4 } + gene_bs_nose_nostril_width={ "nose_nostril_width_neg" 41 "nose_nostril_width_neg" 28 } + gene_bs_nose_profile={ "nose_profile_neg" 90 "nose_profile_aquiline_02" 75 } + gene_bs_nose_ridge_angle={ "nose_ridge_angle_pos" 55 "nose_ridge_angle_pos" 71 } + gene_bs_nose_ridge_width={ "nose_ridge_width_pos" 109 "nose_ridge_width_neg" 48 } + gene_bs_nose_size={ "nose_size_pos" 23 "nose_size_pos" 2 } + gene_bs_nose_tip_angle={ "nose_tip_angle_neg" 15 "nose_tip_angle_neg" 29 } + gene_bs_nose_tip_forward={ "nose_tip_forward_neg" 129 "nose_tip_forward_neg" 44 } + gene_bs_nose_tip_width={ "nose_tip_width_neg" 105 "nose_tip_width_pos" 0 } + face_detail_cheek_def={ "cheek_def_02" 126 "cheek_def_01" 81 } + face_detail_cheek_fat={ "cheek_fat_01_neg" 57 "cheek_fat_02_pos" 2 } + face_detail_chin_cleft={ "chin_dimple" 0 "chin_dimple" 19 } + face_detail_chin_def={ "chin_def" 182 "chin_def_02" 133 } + face_detail_eye_lower_lid_def={ "eye_lower_lid_def" 86 "eye_lower_lid_def" 101 } + face_detail_eye_socket={ "eye_socket_02" 75 "eye_socket_02" 29 } + face_detail_nasolabial={ "nasolabial_04" 154 "nasolabial_01" 50 } + face_detail_nose_ridge_def={ "nose_ridge_def_02_pos" 168 "nose_ridge_def_neg" 25 } + face_detail_nose_tip_def={ "nose_tip_def" 207 "nose_tip_def" 207 } + face_detail_temple_def={ "temple_def" 144 "temple_def" 231 } + expression_brow_wrinkles={ "brow_wrinkles_03" 255 "brow_wrinkles_01" 174 } + expression_eye_wrinkles={ "eye_wrinkles_02" 69 "eye_wrinkles_01" 11 } + expression_forehead_wrinkles={ "forehead_wrinkles_01" 133 "forehead_wrinkles_01" 70 } + expression_other={ "cheek_wrinkles_both_01" 0 "cheek_wrinkles_both_01" 0 } + complexion={ "complexion_14" 0 "complexion_24" 162 } + gene_height={ "normal_height" 126 "normal_height" 127 } + gene_bs_body_type={ "body_fat_head_fat_low" 112 "body_fat_head_fat_full" 114 } + gene_bs_body_shape={ "body_shape_rectangle_half" 255 "body_shape_pear_half" 0 } + gene_bs_bust={ "bust_clothes" 50 "bust_shape_1_half" 63 } + gene_age={ "old_1" 14 "old_1" 8 } + gene_eyebrows_shape={ "avg_spacing_low_thickness" 217 "avg_spacing_lower_thickness" 245 } + gene_eyebrows_fullness={ "layer_2_high_thickness" 255 "layer_2_avg_thickness" 114 } + gene_body_hair={ "body_hair_sparse_lower_stubble" 255 "body_hair_avg" 112 } + gene_hair_type={ "hair_straight" 128 "hair_straight" 164 } + gene_baldness={ "no_baldness" 128 "no_baldness" 127 } + gene_face_dacals={ "no_face_dacal" 0 "face_dacal_07" 23 } + eye_accessory={ "normal_eyes" 229 "normal_eyes" 229 } + teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 } + eyelashes_accessory={ "dark_eyelashes" 17 "normal_eyelashes" 155 } + skin_color_saturation={ "vanilla_skin_saturation" 0 "vanilla_skin_saturation" 0 } + eye_color_saturation={ "eye_color_saturation" 255 "eye_color_saturation" 127 } + gene_bs_eye_height_inside={ "eye_height_inside_neg" 32 "eye_height_inside_pos" 13 } + gene_bs_eye_height_outisde={ "vanilla_eye_height_outisde" 0 "eye_height_outisde_pos" 3 } + gene_bs_ear_lobe={ "ear_lobe_fused" 152 "ear_lobe_fused" 75 } + gene_bs_nose_central_width={ "nose_central_width_pos" 0 "nose_central_width_pos" 95 } + gene_bs_nose_septum_width={ "nose_septum_width_pos" 1 "nose_septum_width_pos" 1 } + gene_bs_mouth_lower_lip_profile={ "lower_lip_profile" 0 "lower_lip_profile" 4 } + gene_bs_eye_outer_width={ "eye_outer_width" 91 "eye_outer_width" 9 } + gene_bs_head_asymmetry_1={ "vanilla_head_asymmetry_1" 126 "head_asymmetry_2" 0 } + gene_bs_mouth_center_curve={ "mouth_center_curve_min" 30 "mouth_center_curve_max" 0 } + gene_bs_eyebrow_straight={ "eyebrow_straight" 91 "eyebrow_straight" 29 } + gene_bs_head_shape={ "head_round_shape" 0 "head_round_shape" 25 } + gene_bs_nose_septum_height={ "nose_septum_height" 0 "nose_septum_height" 163 } + gene_bs_head_lower_height={ "vanilla_head_lower_height" 0 "head_lower_height_max" 1 } + gene_bs_nose_flared_nostril={ "nose_flared_nostril" 30 "nose_flared_nostril" 0 } + gene_bs_mouth_upper_lip_forward={ "mouth_upper_lip_forward" 97 "mouth_upper_lip_forward" 0 } + gene_bs_mouth_lower_lip_forward={ "mouth_lower_lip_forward" 74 "mouth_lower_lip_forward" 0 } + gene_bs_nose_swollen={ "nose_swollen" 0 "nose_swollen" 0 } + gene_bs_ears_fantasy={ "vanilla_ears_fantasy" 0 "vanilla_ears_fantasy" 0 } + gene_bs_mouth_glamour_lips={ "mouth_glamour_lips" 15 "vanilla_mouth_glamour_lips" 0 } + face_detail_eye_upper_lid_def={ "upper_lid_def" 61 "upper_lid_def_2" 166 } + gene_eyebrow_inner_width={ "eyebrow_inner_width_min" 101 "eyebrow_inner_width_max" 49 } + gene_bs_eye_lower_lid_size={ "eye_lower_lid_size" 133 "eye_lower_lid_size" 0 } + gene_bs_eye_shape={ "eye_shape_04" 125 "eye_shape_04" 107 } + gene_beauty_details={ "beauty_details" 25 "beauty_details" 0 } + cloaks={ "ccp7_mino_com_01" 255 "no_cloak" 0 } + hairstyles={ "fp1_hairstyles_straight" 100 "all_hairstyles" 0 } + legwear={ "mena_war_legwear" 255 "all_legwear" 0 } + gene_shrink_body={ "shrink_all" 255 "" 0 } + gene_ear_stretch={ "ear_stretch" 255 "ear_stretch" 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_enclosed_helmet={ "enclosed_helmet" 255 "enclosed_helmet" 0 } + special_accessories_earrings={ "no_earrings" 131 "no_earrings" 0 } + cosmetics_eyeliner={ "iranian_1" 114 "eyeliner_none" 0 } + cosmetics_eyeshadow={ "eyeshadow_none" 255 "eyeshadow_none" 0 } + cosmetics_foundation={ "foundation_none" 255 "foundation_none" 0 } + cosmetics_blush={ "blush_none" 255 "blush_none" 0 } + cosmetics_lipcolor={ "lipcolor_none" 255 "lipcolor_none" 0 } + clothes={ "pol_west_slav_clothes" 223 "most_clothes" 0 } + headgear={ "ep1_western_royalty" 160 "no_headgear" 0 } + clothes_hoods={ "hoods" 255 "no_clothes_hood" 0 } + gene_balding_hair_effect={ "no_baldness" 255 "no_baldness" 0 } + beards={ "ep3_beards_straight" 255 "no_beard" 0 } + props_right={ "fp1_marshal_sword" 255 "no_props" 0 } + gene_additive_animations_fat={ "fat_additive" 2 "fat_additive" 0 } + gene_additive_animations_dwarf={ "dwarf_additive" 0 "dwarf_additive" 0 } + gene_retargeting_fix={ "female_prop" 0 "female_prop" 0 } + } + } + enabled=yes +} \ No newline at end of file diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index 06afbd12b..f52bece0c 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -4099,3 +4099,9 @@ NEOW_ecpat_dyn_galesiotes = { name = dynn_NEOW_ecpat_dyn_galesiotes culture = NEOW_pontic } + +henriksen_dynasty = { + name = dynn_Henriksen + culture = NEOW_pontic + motto = dynn_henriksen_motto +} diff --git a/common/landed_titles/LAAMPs.txt b/common/landed_titles/LAAMPs.txt index 43214276d..448c8d0bb 100644 --- a/common/landed_titles/LAAMPs.txt +++ b/common/landed_titles/LAAMPs.txt @@ -329,5 +329,20 @@ d_laamp_last_of_blood = { destroy_if_invalid_heir = yes + ai_primary_priority = { add = @never_primary_score } +} + +d_laamp_firebrands_of_the_ice = { + color = { 100 100 100 } + capital = c_bothin + + definite_form = yes + landless = yes + ruler_uses_title_name = no + always_follows_primary_heir = yes + no_automatic_claims = no + + destroy_if_invalid_heir = yes + ai_primary_priority = { add = @never_primary_score } } \ No newline at end of file diff --git a/common/landed_titles/mashriq.txt b/common/landed_titles/mashriq.txt index 6dbb64cd0..e67ea5f0d 100644 --- a/common/landed_titles/mashriq.txt +++ b/common/landed_titles/mashriq.txt @@ -998,106 +998,36 @@ e_mashriq = { } } } - d_vaspurakan = { + d_vaspurakan = { # Van color = { 172 82 55 } - capital = c_vaspurakan # Van - cultural_names = { - name_list_turkish = cn_vasburagan - } - - c_vaspurakan = { + c_vaspurakan = { # Van color = { 172 82 55 } - cultural_names = { - name_list_turkish = cn_vasburagan - } - - b_van = { + b_van = { # Van province = 682 - color = { 172 82 55 } cultural_names = { name_list_greek = cn_eua } } - b_berkri = { - province = 5721 - - color = { 172 82 55 } - - cultural_names = { - name_list_turkish = cn_muradiye - } - } - b_akhtamar = { - province = 5723 - - color = { 172 82 55 } - - cultural_names = { - name_list_turkish = cn_akdamar - } - } - b_hadamakert = { - province = 5724 - - color = { 172 82 55 } - - cultural_names = { - name_list_turkish = cn_baskale - } - } - b_arjesh = { - province = 5719 - - color = { 150 65 50 } - - cultural_names = { - name_list_turkish = cn_ercis - } - } - b_juza = { - province = 4817 - - color = { 50 175 80 } - } - } - c_hakkari = { - color = { 50 175 80 } - - b_hakkari = { + b_hakkari = { # Hakkâri province = 4815 - color = { 50 175 80 } } - } - c_apahunik = { - color = { 150 65 50 } - - - b_tatvan = { - province = 5717 - - color = { 150 65 50 } - - cultural_names = { - name_list_armenian = cn_datvan - } + b_juza = { # Başkale + province = 4817 + color = { 50 175 80 } } - b_khlat = { - province = 5718 - - color = { 150 65 50 } - - cultural_names = { - name_list_turkish = cn_ahlat - } + b_akhtamar = { # Gevaş + province = 5723 + color = { 172 82 55 } } } - c_turuberan = { + c_turuberan = { # Muş + color = { 175 60 55 } cultural_names = { name_list_NEOW_griko = cn_turuberan @@ -1105,17 +1035,26 @@ e_mashriq = { name_list_NEOW_cypriot = cn_turuberan name_list_NEOW_greco_turkish = cn_turuberan } - color = { 175 60 55 } - b_musch = { + + b_musch = { # Muş province = 5716 - + color = { 150 65 50 } + } + b_tatvan = { # Tatvan + province = 5717 color = { 150 65 50 } cultural_names = { - name_list_turkish = cn_mus + name_list_armenian = cn_datvan } } - b_varto = { + b_bamardani = { # Bitlis + province = 4776 + color = { 40 190 130 } + } + b_varto = { # Malazgirt + province = 5715 + color = { 175 60 55 } cultural_names = { name_list_NEOW_griko = cn_varto @@ -1123,13 +1062,33 @@ e_mashriq = { name_list_NEOW_cypriot = cn_varto name_list_NEOW_greco_turkish = cn_varto } - province = 5715 - - color = { 175 60 55 } - } - } + } + b_khlat = { # Ahlat + province = 5718 + color = { 150 65 50 } + } + } + c_apahunik = { # Erciş + color = { 150 65 50 } + + b_arjesh = { # Erciş + province = 5719 + color = { 150 65 50 } + } + b_hadamakert = { # Özalp + province = 5724 + color = { 172 82 55 } + } + b_maku = { # Çaldıran + province = 5722 + color = { 172 82 55 } + } + b_berkri = { # Muradiye + province = 5721 + color = { 172 82 55 } + } + } } - d_kurdistan = { color = { 60 210 150 } @@ -1170,11 +1129,6 @@ e_mashriq = { b_khuftiyan = { province = 4773 - color = { 40 190 130 } - } - b_bamardani = { - province = 4776 - color = { 40 190 130 } } } @@ -1272,12 +1226,7 @@ e_mashriq = { province = 5794 color = { 50 115 85 } - } - b_maku = { - province = 5722 - - color = { 172 82 55 } - } + } } c_shahrazur = { color = { 80 230 180 } diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index afa172b80..153eecab0 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -2929,7 +2929,7 @@ } { id=486 - position={ 2459.117188 0.000000 2269.221436 } + position={ 2458.649414 0.000000 2280.313721 } rotation={ -0.000000 0.408358 -0.000000 0.912822 } scale={ 1.000000 1.000000 1.000000 } } @@ -3877,7 +3877,7 @@ } { id=682 - position={ 3322.183350 0.000000 2366.090332 } + position={ 3317.992676 0.000000 2375.890625 } rotation={ -0.000000 0.067180 -0.000000 0.997741 } scale={ 1.000000 1.000000 1.000000 } } @@ -25567,7 +25567,7 @@ } { id=4776 - position={ 3353.775146 0.000000 2279.540527 } + position={ 3265.858643 0.000000 2350.924316 } rotation={ -0.000000 -0.294605 -0.000000 0.955619 } scale={ 1.000000 1.000000 1.000000 } } @@ -25801,8 +25801,8 @@ } { id=4815 - position={ 3298.070068 0.000000 2316.663086 } - rotation={ -0.000000 0.485653 -0.000000 0.874151 } + position={ 3340.701172 0.000000 2302.139404 } + rotation={ -0.000000 0.198792 0.000000 -0.980041 } scale={ 1.000000 1.000000 1.000000 } } { @@ -25813,7 +25813,7 @@ } { id=4817 - position={ 3345.430420 0.000000 2323.858887 } + position={ 3348.393311 0.000000 2337.627441 } rotation={ -0.000000 0.219779 -0.000000 0.975550 } scale={ 1.000000 1.000000 1.000000 } } @@ -31123,31 +31123,31 @@ } { id=5715 - position={ 3210.358154 0.000000 2403.780762 } + position={ 3257.157715 0.000000 2384.167236 } rotation={ -0.000000 0.539535 -0.000000 0.841963 } scale={ 1.000000 1.000000 1.000000 } } { id=5716 - position={ 3242.415283 0.000000 2374.473145 } + position={ 3232.867920 0.000000 2360.929199 } rotation={ -0.000000 -0.362208 -0.000000 0.932097 } scale={ 1.000000 1.000000 1.000000 } } { id=5717 - position={ 3266.515869 0.000000 2360.027100 } + position={ 3291.999756 0.000000 2354.753906 } rotation={ -0.000000 -0.300868 -0.000000 0.953666 } scale={ 1.000000 1.000000 1.000000 } } { id=5718 - position={ 3265.487305 0.000000 2393.936768 } + position={ 3273.073975 0.000000 2385.121826 } rotation={ -0.000000 0.367351 -0.000000 0.930082 } scale={ 1.000000 1.000000 1.000000 } } { id=5719 - position={ 3318.063965 0.000000 2401.572754 } + position={ 3320.763428 0.000000 2419.956543 } rotation={ -0.000000 0.311530 -0.000000 0.950236 } scale={ 1.000000 1.000000 1.000000 } } @@ -31159,25 +31159,25 @@ } { id=5721 - position={ 3349.339844 0.000000 2395.457031 } + position={ 3330.607910 0.000000 2387.913818 } rotation={ -0.000000 -0.480389 -0.000000 0.877055 } scale={ 1.000000 1.000000 1.000000 } } { id=5722 - position={ 3369.007568 0.000000 2389.906738 } + position={ 3341.250000 0.000000 2415.787598 } rotation={ -0.000000 -0.176470 -0.000000 0.984306 } scale={ 1.000000 1.000000 1.000000 } } { id=5723 - position={ 3311.234375 0.000000 2340.539062 } + position={ 3315.585938 0.000000 2329.392090 } rotation={ -0.000000 0.331814 -0.000000 0.943345 } scale={ 1.000000 1.000000 1.000000 } } { id=5724 - position={ 3353.323242 0.000000 2356.494629 } + position={ 3354.316895 0.000000 2364.646729 } rotation={ -0.000000 0.377802 -0.000000 0.925887 } scale={ 1.000000 1.000000 1.000000 } } @@ -31279,7 +31279,7 @@ } { id=5741 - position={ 3294.698975 0.000000 2510.679688 } + position={ 3294.653320 0.000000 2512.974854 } rotation={ -0.000000 0.237871 -0.000000 0.971297 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index 83ef26a1c..f929d071d 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -2899,8 +2899,8 @@ } { id=486 - position={ 2475.977051 0.000000 2264.070801 } - rotation={ -0.000000 -0.274726 -0.000000 -0.961523 } + position={ 2462.562256 0.000000 2267.880615 } + rotation={ -0.000000 0.475659 -0.000000 -0.879630 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3847,8 +3847,8 @@ } { id=682 - position={ 3328.077637 0.000000 2358.085449 } - rotation={ -0.000000 -0.997946 -0.000000 -0.064054 } + position={ 3324.707764 0.000000 2363.474854 } + rotation={ -0.000000 0.360487 -0.000000 -0.932764 } scale={ 1.000000 1.000000 1.000000 } } { @@ -25537,8 +25537,8 @@ } { id=4776 - position={ 3335.077637 0.000000 2292.085449 } - rotation={ -0.000000 -0.780709 -0.000000 0.624895 } + position={ 3258.124512 0.000000 2352.148193 } + rotation={ -0.000000 -0.660742 -0.000000 -0.750614 } scale={ 1.000000 1.000000 1.000000 } } { @@ -25771,8 +25771,8 @@ } { id=4815 - position={ 3306.077637 0.000000 2318.085449 } - rotation={ -0.000000 -0.707767 -0.000000 0.706446 } + position={ 3351.166748 0.000000 2300.677002 } + rotation={ -0.000000 -0.982800 -0.000000 0.184674 } scale={ 1.000000 1.000000 1.000000 } } { @@ -25783,8 +25783,8 @@ } { id=4817 - position={ 3351.077637 0.000000 2329.085449 } - rotation={ -0.000000 -0.045553 -0.000000 -0.998962 } + position={ 3357.385742 0.000000 2335.615234 } + rotation={ -0.000000 -0.544157 -0.000000 -0.838983 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31093,8 +31093,8 @@ } { id=5715 - position={ 3215.077637 0.000000 2395.085449 } - rotation={ -0.000000 -0.951167 -0.000000 -0.308677 } + position={ 3282.045410 0.000000 2400.066162 } + rotation={ -0.000000 -0.116198 -0.000000 -0.993226 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31105,20 +31105,20 @@ } { id=5717 - position={ 3260.077637 0.000000 2362.085449 } + position={ 3270.429688 0.000000 2358.512695 } rotation={ -0.000000 -0.230735 -0.000000 0.973017 } scale={ 1.000000 1.000000 1.000000 } } { id=5718 - position={ 3267.077637 0.000000 2387.085449 } - rotation={ -0.000000 -0.586317 -0.000000 -0.810082 } + position={ 3278.465088 0.000000 2378.830811 } + rotation={ -0.000000 -0.578256 -0.000000 0.815856 } scale={ 1.000000 1.000000 1.000000 } } { id=5719 - position={ 3323.077637 0.000000 2408.085449 } - rotation={ -0.000000 -0.010913 -0.000000 0.999940 } + position={ 3317.509521 0.000000 2399.282715 } + rotation={ -0.000000 -0.700923 -0.000000 0.713237 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31129,26 +31129,26 @@ } { id=5721 - position={ 3339.077637 0.000000 2391.085449 } + position={ 3335.002197 0.000000 2393.561768 } rotation={ -0.000000 -0.934568 -0.000000 0.355784 } scale={ 1.000000 1.000000 1.000000 } } { id=5722 - position={ 3369.077637 0.000000 2381.085449 } - rotation={ -0.000000 -0.357685 -0.000000 -0.933842 } + position={ 3352.905518 0.000000 2414.237061 } + rotation={ -0.000000 -0.231972 -0.000000 -0.972722 } scale={ 1.000000 1.000000 1.000000 } } { id=5723 - position={ 3318.077637 0.000000 2338.085449 } + position={ 3314.817139 0.000000 2347.323975 } rotation={ -0.000000 -0.247758 -0.000000 -0.968822 } scale={ 1.000000 1.000000 1.000000 } } { id=5724 - position={ 3360.077637 0.000000 2351.085449 } - rotation={ -0.000000 -0.999747 -0.000000 0.022504 } + position={ 3359.483887 0.000000 2371.131348 } + rotation={ -0.000000 -0.517472 -0.000000 -0.855700 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31249,7 +31249,7 @@ } { id=5741 - position={ 3273.015869 0.000000 2526.100342 } + position={ 3279.598877 0.000000 2520.055908 } rotation={ -0.000000 -0.956946 -0.000000 0.290266 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index 5094481e2..764c227d8 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -2911,7 +2911,7 @@ } { id=486 - position={ 2480.251465 0.000000 2283.121094 } + position={ 2454.378418 0.000000 2274.330566 } rotation={ -0.000000 -0.424456 -0.000000 0.905449 } scale={ 1.000000 1.000000 1.000000 } } @@ -4027,7 +4027,7 @@ } { id=682 - position={ 3318.900146 0.000000 2376.435547 } + position={ 3344.329590 0.000000 2350.356201 } rotation={ -0.000000 -0.862443 -0.000000 0.506155 } scale={ 1.000000 1.000000 1.000000 } } @@ -27415,8 +27415,8 @@ } { id=4776 - position={ 3356.395020 0.000000 2297.739014 } - rotation={ -0.000000 -0.804845 -0.000000 0.593486 } + position={ 3255.491943 0.000000 2342.739990 } + rotation={ -0.000000 -0.954705 -0.000000 0.297555 } scale={ 1.000000 1.000000 1.000000 } } { @@ -27649,8 +27649,8 @@ } { id=4815 - position={ 3330.312744 0.000000 2313.015381 } - rotation={ -0.000000 -0.895907 -0.000000 0.444241 } + position={ 3363.396729 0.000000 2292.902588 } + rotation={ -0.000000 -0.807881 -0.000000 0.589346 } scale={ 1.000000 1.000000 1.000000 } } { @@ -27661,7 +27661,7 @@ } { id=4817 - position={ 3350.326416 0.000000 2316.818115 } + position={ 3363.460938 0.000000 2346.845703 } rotation={ -0.000000 -0.993592 -0.000000 0.113026 } scale={ 1.000000 1.000000 1.000000 } } @@ -32983,32 +32983,32 @@ } { id=5715 - position={ 3220.736328 0.000000 2411.544189 } + position={ 3256.322021 0.000000 2389.331787 } rotation={ -0.000000 -0.986661 -0.000000 0.162788 } scale={ 1.000000 1.000000 1.000000 } } { id=5716 - position={ 3240.259277 0.000000 2383.865967 } + position={ 3248.788574 0.000000 2368.754395 } rotation={ -0.000000 -0.982857 -0.000000 0.184371 } scale={ 1.000000 1.000000 1.000000 } } { id=5717 - position={ 3266.781494 0.000000 2371.867188 } - rotation={ -0.000000 -0.982323 -0.000000 0.187196 } + position={ 3289.957031 0.000000 2345.588623 } + rotation={ -0.000000 -0.865089 -0.000000 -0.501619 } scale={ 1.000000 1.000000 1.000000 } } { id=5718 - position={ 3256.977295 0.000000 2388.243896 } - rotation={ -0.000000 -0.831068 -0.000000 0.556171 } + position={ 3291.988281 0.000000 2386.185791 } + rotation={ -0.000000 -0.996912 -0.000000 0.078521 } scale={ 1.000000 1.000000 1.000000 } } { id=5719 - position={ 3333.242920 0.000000 2419.619873 } - rotation={ -0.000000 -0.964539 -0.000000 0.263939 } + position={ 3327.031738 0.000000 2408.348877 } + rotation={ -0.000000 -0.793709 -0.000000 0.608298 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33019,26 +33019,26 @@ } { id=5721 - position={ 3344.365967 0.000000 2404.058594 } + position={ 3335.925293 0.000000 2383.702148 } rotation={ -0.000000 -0.974980 -0.000000 0.222291 } scale={ 1.000000 1.000000 1.000000 } } { id=5722 - position={ 3367.000000 0.000000 2398.000000 } - rotation={ -0.000000 -0.961601 -0.000000 0.274452 } + position={ 3357.170654 0.000000 2400.456787 } + rotation={ -0.000000 -0.918442 -0.000000 -0.395556 } scale={ 1.000000 1.000000 1.000000 } } { id=5723 - position={ 3306.000000 0.000000 2347.000000 } + position={ 3323.975586 0.000000 2320.669189 } rotation={ -0.000000 -0.974025 -0.000000 0.226440 } scale={ 1.000000 1.000000 1.000000 } } { id=5724 - position={ 3348.000000 0.000000 2360.000000 } - rotation={ -0.000000 -0.923098 -0.000000 0.384566 } + position={ 3369.762207 0.000000 2365.275391 } + rotation={ -0.000000 -0.662800 -0.000000 0.748797 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33139,8 +33139,8 @@ } { id=5741 - position={ 3290.078369 0.000000 2510.842529 } - rotation={ -0.000000 -0.721605 -0.000000 0.692305 } + position={ 3277.318115 0.000000 2500.283447 } + rotation={ -0.000000 -0.535415 -0.000000 0.844589 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index 334046e16..106177bb1 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -2911,7 +2911,7 @@ } { id=486 - position={ 2487.517822 0.000000 2266.556641 } + position={ 2463.434570 0.000000 2274.360352 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -4027,7 +4027,7 @@ } { id=682 - position={ 3330.000000 0.000000 2365.000000 } + position={ 3336.868896 0.000000 2369.507080 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -27415,7 +27415,7 @@ } { id=4776 - position={ 3345.000000 0.000000 2295.000000 } + position={ 3251.954834 0.000000 2358.520020 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -27649,7 +27649,7 @@ } { id=4815 - position={ 3312.000000 0.000000 2321.000000 } + position={ 3360.206299 0.000000 2306.452637 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -27661,7 +27661,7 @@ } { id=4817 - position={ 3357.135254 0.000000 2328.203857 } + position={ 3367.231689 0.000000 2342.740479 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32983,31 +32983,31 @@ } { id=5715 - position={ 3218.000000 0.000000 2401.000000 } + position={ 3285.913818 0.000000 2394.425293 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5716 - position={ 3247.000000 0.000000 2376.000000 } + position={ 3240.679932 0.000000 2379.618652 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5717 - position={ 3268.000000 0.000000 2364.000000 } + position={ 3272.448730 0.000000 2364.495361 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5718 - position={ 3273.000000 0.000000 2392.000000 } + position={ 3265.184814 0.000000 2369.134766 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5719 - position={ 3329.274170 0.000000 2409.841553 } + position={ 3308.563965 0.000000 2398.959473 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33019,25 +33019,25 @@ } { id=5721 - position={ 3344.202148 0.000000 2395.919434 } + position={ 3345.320801 0.000000 2396.448486 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5722 - position={ 3377.000000 0.000000 2389.000000 } + position={ 3347.973389 0.000000 2418.539307 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5723 - position={ 3324.000000 0.000000 2342.000000 } + position={ 3334.980469 0.000000 2330.475098 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5724 - position={ 3368.000000 0.000000 2359.000000 } + position={ 3353.446289 0.000000 2377.533936 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33139,7 +33139,7 @@ } { id=5741 - position={ 3286.491699 0.000000 2518.148926 } + position={ 3289.304199 0.000000 2521.761963 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt index c23ff0402..0b2a7357a 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -2899,8 +2899,8 @@ } { id=486 - position={ 2483.843994 0.000000 2260.916504 } - rotation={ -0.000000 0.828730 -0.000000 -0.559649 } + position={ 2455.972656 0.000000 2258.355713 } + rotation={ -0.000000 0.983834 -0.000000 0.179084 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3847,8 +3847,8 @@ } { id=682 - position={ 3317.000000 0.000000 2358.000000 } - rotation={ 0.000000 0.707107 0.000000 0.707107 } + position={ 3335.445068 0.000000 2357.067139 } + rotation={ -0.000000 -0.886669 -0.000000 0.462406 } scale={ 1.000000 1.000000 1.000000 } } { @@ -25537,8 +25537,8 @@ } { id=4776 - position={ 3346.000000 0.000000 2290.000000 } - rotation={ 0.000000 0.767752 0.000000 -0.640747 } + position={ 3250.612793 0.000000 2352.727051 } + rotation={ -0.000000 0.675970 -0.000000 0.736929 } scale={ 1.000000 1.000000 1.000000 } } { @@ -25771,8 +25771,8 @@ } { id=4815 - position={ 3316.000000 0.000000 2316.000000 } - rotation={ 0.000000 0.773342 0.000000 -0.633989 } + position={ 3352.531006 0.000000 2290.247803 } + rotation={ -0.000000 0.996133 -0.000000 -0.087863 } scale={ 1.000000 1.000000 1.000000 } } { @@ -25783,8 +25783,8 @@ } { id=4817 - position={ 3340.000000 0.000000 2327.000000 } - rotation={ 0.000000 0.767752 0.000000 0.640747 } + position={ 3355.208252 0.000000 2323.277100 } + rotation={ -0.000000 0.986310 -0.000000 0.164899 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31093,8 +31093,8 @@ } { id=5715 - position={ 3223.000000 0.000000 2392.000000 } - rotation={ 0.000000 0.821926 0.000000 -0.569595 } + position={ 3270.615723 0.000000 2395.532471 } + rotation={ -0.000000 0.860513 -0.000000 0.509429 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31105,20 +31105,20 @@ } { id=5717 - position={ 3269.000000 0.000000 2355.000000 } + position={ 3279.352051 0.000000 2351.427246 } rotation={ 0.000000 0.898315 0.000000 -0.439351 } scale={ 1.000000 1.000000 1.000000 } } { id=5718 - position={ 3276.000000 0.000000 2383.000000 } - rotation={ 0.000000 0.838492 0.000000 -0.544914 } + position={ 3268.699219 0.000000 2376.472656 } + rotation={ -0.000000 -0.785800 -0.000000 -0.618481 } scale={ 1.000000 1.000000 1.000000 } } { id=5719 - position={ 3312.000000 0.000000 2407.000000 } - rotation={ 0.000000 0.738423 0.000000 0.674338 } + position={ 3316.925049 0.000000 2411.062256 } + rotation={ -0.000000 0.064905 -0.000000 0.997892 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31129,26 +31129,26 @@ } { id=5721 - position={ 3349.000000 0.000000 2388.000000 } + position={ 3344.924561 0.000000 2390.476318 } rotation={ 0.000000 0.802293 0.000000 -0.596931 } scale={ 1.000000 1.000000 1.000000 } } { id=5722 - position={ 3361.000000 0.000000 2376.000000 } - rotation={ 0.000000 0.874642 0.000000 0.484769 } + position={ 3345.034668 0.000000 2410.797363 } + rotation={ -0.000000 0.803418 -0.000000 0.595415 } scale={ 1.000000 1.000000 1.000000 } } { id=5723 - position={ 3326.000000 0.000000 2331.000000 } + position={ 3322.739502 0.000000 2340.238525 } rotation={ 0.000000 0.910633 0.000000 -0.413216 } scale={ 1.000000 1.000000 1.000000 } } { id=5724 - position={ 3349.000000 0.000000 2348.000000 } - rotation={ 0.000000 0.794707 0.000000 0.606994 } + position={ 3362.793213 0.000000 2382.649658 } + rotation={ -0.000000 -0.130511 -0.000000 0.991447 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31249,7 +31249,7 @@ } { id=5741 - position={ 3278.031494 0.000000 2511.845215 } + position={ 3284.614502 0.000000 2505.800781 } rotation={ -0.000000 0.986094 -0.000000 -0.166191 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/history/characters/NEOW_e_scandinavia.txt b/history/characters/NEOW_e_scandinavia.txt index 89e5ef4ee..ebe7609cf 100644 --- a/history/characters/NEOW_e_scandinavia.txt +++ b/history/characters/NEOW_e_scandinavia.txt @@ -864,4 +864,24 @@ norway_freya_frost_queen = { 2078.1.1 = { death = yes } +} + +norway_laamp_brand_henriksen = { + name = "Brand" + dynasty = henriksen_dynasty + dna=dna_brand_henriksen + religion = "lutheran" + culture = trondheimer + trait = beauty_good_2 + trait = education_learning_4 + trait = ambitious + trait = stubborn + trait = adventurer + trait = zealous + 2329.3.24 = { + birth = yes + } + 2578.1.1 = { + death = yes + } } \ No newline at end of file diff --git a/history/provinces/e_caucasia.txt b/history/provinces/e_caucasia.txt index 641f7d481..92f3cbd82 100644 --- a/history/provinces/e_caucasia.txt +++ b/history/provinces/e_caucasia.txt @@ -675,127 +675,6 @@ } -# 682 - Van -682 = { # 682 - Van - - # Misc - culture = kurd - religion = majlisi - - holding = castle_holding -} - -# 5715 - Varto -5715 = { # 5715 - Varto - - # Misc - culture = kurd - religion = alevi - - holding = castle_holding - - # History -} - -# 5716 - Musch -5716 = { # 5716 - Musch - - # Misc - culture = kurd - religion = majlisi - - holding = castle_holding - - # History -} - -# 5717 - Tatvan -5717 = { # 5717 - Tatvan - - # Misc - culture = kurd - religion = rahbari - - holding = none - - # History -} - -# 5718 - Khlat -5718 = { # 5718 - Khlat - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = church_holding - - # History -} - -# 5719 - Arjesh -5719 = { # 5719 - Arjesh - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = city_holding - - # History -} - -# 5721 - Berkri -5721 = { # 5721 - Berkri - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = city_holding - - # History -} - -# 5722 - Maku -5722 = { # 5722 - Maku - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none - - # History -} - -# 5723 - Akhtamar -5723 = { # 5723 - Akhtamar - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - #holding = none - - # History - 930.1.1 = { - holding = church_holding - } -} - -# 5724 - Hadamakert -5724 = { # 5724 - Hadamakert - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - #holding = castle_holding - - # History -} - # 5725 - Dlim 5725 = { # 5725 - Dlim diff --git a/history/provinces/e_mashriq.txt b/history/provinces/e_mashriq.txt index cee097e64..c8b5d0066 100644 --- a/history/provinces/e_mashriq.txt +++ b/history/provinces/e_mashriq.txt @@ -109,6 +109,57 @@ 4814 = { # Uludere holding = none } +##d_vaspurakan/Van ################################### +###c_vaspurakan/Van +682 = { # Van + culture = kurd + religion = majlisi + holding = castle_holding +} +4815 = { # Hakkâri + culture = kurd + religion = majlisi + holding = castle_holding +} +4817 = { # Başkale + holding = city_holding +} +5723 = { # Gevaş + holding = church_holding +} +###c_turuberan/Muş +5716 = { # Muş + culture = kurd + religion = majlisi + holding = castle_holding +} +5717 = { # Tatvan + holding = city_holding +} +4776 = { # Bitlis + holding = church_holding +} +5715 = { # Malazgirt + holding = none +} +5718 = { # Ahlat + holding = none +} +###c_apahunik/Erciş +5719 = { # Erciş + culture = kurd + religion = majlisi + holding = castle_holding +} +5724 = { # Özalp + holding = city_holding +} +5722 = { # Çaldıran + holding = church_holding +} +5721 = { # Muradiye + holding = none +} #custom # 4810 - BARTULLA @@ -135,27 +186,6 @@ religion = majlisi } -# 4815 - HAKKARI -4815 = { # Misc - culture = kurd - religion = yarsani - - # History - - -} - -# 4817 - JUZA -4817 = { # 4817 - Juza - - # Misc - culture = kurd - religion = armenian_apostolic - - # History - -} - # 4836 - AIN AL-QAYYARA 4836 = { # 4836 - Ain Al-Qayyara @@ -727,20 +757,6 @@ } } -# 4776 - BAMARDANI -4776 = { # 4776 - Bamardani - - #Misc - culture = kurd - religion = majlisi - - # History - 1200.1.1 = { - religion = yazidi - } - -} - # 4777 - IRBIL 4777 = { #Misc culture = kurd diff --git a/history/titles/NEOW_laamp_titles.txt b/history/titles/NEOW_laamp_titles.txt index f520583a1..0e2588df0 100644 --- a/history/titles/NEOW_laamp_titles.txt +++ b/history/titles/NEOW_laamp_titles.txt @@ -332,3 +332,16 @@ d_laamp_last_of_blood = { } } } +d_laamp_firebrands_of_the_ice = { + 2555.1.1 = { + liege = 0 + holder = norway_laamp_brand_henriksen + government = landless_adventurer_government + succession_laws = { landless_adventurer_succession_law } + effect = { + create_landless_adventurer_title_history_effect = yes + set_variable = { name = adventurer_creation_reason value = flag:voluntary } + destroy_landless_title_no_dlc_effect = { DATE = 2555.1.1 } + } + } +} diff --git a/localization/english/replace/NEOW_mottos_l_english.yml b/localization/english/replace/NEOW_mottos_l_english.yml index 42ee4a0da..39037aa0b 100644 --- a/localization/english/replace/NEOW_mottos_l_english.yml +++ b/localization/english/replace/NEOW_mottos_l_english.yml @@ -28,4 +28,5 @@ dynn_koroleveckiy_motto:0 "What is sublime in Caesar’s style is its carelessness." dynn_rosenkranz_motto:0 "The world is as eternal as God." dynn_pulya_motto:0 "Idleness — is a toy of Devil, so is." - dynn_eidelsteinn_motoo:0 "Enough bearing this!" \ No newline at end of file + dynn_eidelsteinn_motoo:0 "Enough bearing this!" + dynn_henriksen_motto:0 "All or nothing!" \ No newline at end of file diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index 145b2c0af..18b67bd11 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -6075,26 +6075,12 @@ cn_meyafarikin_adj:0 "Meyafarikîni" cn_np_rkert:0 "Np'rkert" cn_np_rkert_adj:0 "Np'rkerti" - cn_vasburagan:0 "Vasburagan" - cn_vasburagan_adj:0 "Vasburagani" - cn_mus:0 "Muş" - cn_mus_adj:0 "Muşi" cn_datvan:0 "Datvan" cn_datvan_adj:0 "Datvani" - cn_ahlat:0 "Ahlat" - cn_ahlat_adj:0 "Ahlatian" cn_malazgirt:0 "Malazgirt" cn_malazgirt_adj:0 "Malazgirti" - cn_ercis:0 "Erciş" - cn_ercis_adj:0 "Ercişi" cn_eua:0 "Eua" cn_eua_adj:0 "Euan" - cn_muradiye:0 "Muradiye" - cn_muradiye_adj:0 "Muradiyean" - cn_akdamar:0 "Akdamar" - cn_akdamar_adj:0 "Akdamari" - cn_baskale:0 "Başkale" - cn_baskale_adj:0 "Başkalean" cn_mets_hayk_:0 "Mets Hayk'" cn_mets_hayk__adj:0 "Mets Hayki" cn_anion:0 "Ánion" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 6018f2557..415033afa 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -7293,7 +7293,7 @@ b_habru:0 "Habru" b_habsburg:0 "Habsburg" b_hadaftimo:0 "Hadaftimo" - b_hadamakert:0 "Hadamakert" + b_hadamakert:0 "Özalp" b_haddej:0 "Haddej" b_haddraa:0 "Had Draa" b_haderslev:0 "Haderslev" @@ -9278,7 +9278,7 @@ b_makrana:0 "Makrana" b_maksatikha:0 "Maksatikha" b_maksi:0 "Maksi" - b_maku:0 "Maku" + b_maku:0 "Çaldıran" b_makushino:0 "Makushino" b_maladzyechna:0 "Maladzyechna" b_malagina:0 "Malaginan" @@ -9854,7 +9854,6 @@ b_musanagar:0 "Musanagar" b_musangi:0 "Musangi" b_musco:0 "Musco" - b_mush:0 "Mush" b_musmer:0 "Musmer" b_musso:0 "Musso" b_mustabiq:0 "Mustabiq" @@ -16163,8 +16162,8 @@ c_vas_adj:0 "Vasian" c_vaslui:0 "Vaslui" c_vaslui_adj:0 "Vasluian" - c_vaspurakan:0 "Vaspurakan" - c_vaspurakan_adj:0 "Vaspurakani" + c_vaspurakan:0 "Van" + c_vaspurakan_adj:0 "Vanlı" c_vasterbotten:0 "Vasterbotten" c_vasterbotten_adj:0 "Västerbottnian" c_vatapi:0 "Vatapi" @@ -18024,7 +18023,7 @@ b_tall_haftun:0 "Tall Haftun" b_khuftiyan:0 "Khuftiyan" b_shaqlabadh:0 "Shaqlabadh" - b_bamardani:0 "Bamardani" + b_bamardani:0 "Bitlis" c_irbil:0 "Irbil" c_irbil_adj:0 "Irbilian" b_irbil:0 "Irbil" @@ -18122,13 +18121,11 @@ c_tall_basma_adj:0 "Mardinli" b_tall_basma:0 "Çınar" b_hisn_kaifa:0 "Midyat" - c_hakkari:0 "Hakkari" - c_hakkari_adj:0 "Hakkari" - b_hakkari:0 "Hakkari" + b_hakkari:0 "Hakkâri" b_baqirda:0 "Şırnak" b_tamanin:0 "Uludere" b_saird:0 "Siirt" - b_juza:0 "Juza" + b_juza:0 "Başkale" b_erkne:0 "Dicle" d_euphrates:0 "Euphrates" d_euphrates_adj:0 "Euphratese" @@ -19101,8 +19098,8 @@ #Armenia & Georgia d_chaldia:0 "Chaldia" d_chaldia_adj:0 "Chaldian" - d_vaspurakan:0 "Vaspurakan" - d_vaspurakan_adj:0 "Vaspurakanian" + d_vaspurakan:0 "Van" + d_vaspurakan_adj:0 "Vanlı" d_greater_armenia:0 "Greater Armenia" d_greater_armenia_adj:0 "Armenian" d_greater_armenia_pre:0 "Armeno" @@ -19120,8 +19117,8 @@ c_colonea_adj:0 "Colonean" c_hark:0 "Hark" c_hark_adj:0 "Harkian" - c_apahunik:0 "Apahunik" - c_apahunik_adj:0 "Apahunikian" + c_apahunik:0 "Erciş" + c_apahunik_adj:0 "Ercişli" c_hayk:0 "Hayk" c_hayk_adj:0 "Haykian" c_bagrewand:0 "Iğdır" @@ -19148,8 +19145,6 @@ c_khachen_adj:0 "Khacheni" c_mugan:0 "Mugan" c_mugan_adj:0 "Muganian" - c_turuberan:0 "Turuberan" - c_turuberan_adj:0 "Turuberani" b_oinaion:0 "Oinaion" b_polemonium:0 "Polemonium" b_cerasus:0 "Cerasus" @@ -19163,14 +19158,13 @@ b_colonea:0 "Colonea" b_sinoria:0 "Sinoria" b_hypseie:0 "Hypseie" - b_varto:0 "Varto" - b_musch:0 "Musch" + b_musch:0 "Muş" b_tatvan:0 "Tatvan" - b_khlat:0 "Khlat" - b_arjesh:0 "Arjesh" + b_khlat:0 "Ahlat" + b_arjesh:0 "Erciş" b_bagavan:0 "Doğubayazıt" - b_berkri:0 "Berkri" - b_akhtamar:0 "Akhtamar" + b_berkri:0 "Muradiye" + b_akhtamar:0 "Gevaş" b_dlim:0 "Dlim" b_bagaran:0 "Bagaran" b_kumayri:0 "Kumayri" @@ -27314,8 +27308,8 @@ b_qulb:0 "Solhan" b_shimshat:0 "Baskil" c_turuberan:0 "Muş" - c_turuberan_adj:0 "Muş" - b_varto:0 "Varto" + c_turuberan_adj:0 "Muşlu" + b_varto:0 "Malazgirt" b_mardali:0 "Tercan" b_khinisi:0 "Hınıs" d_malatya:0 "Malatya" @@ -27546,4 +27540,6 @@ c_zhylyoi:0 "Zhylyoi" c_zhylyoi_adj:0 "Zhylyoian" c_karatobe:0 "Karatobe" - c_karatobe_adj:0 "Karatoban" \ No newline at end of file + c_karatobe_adj:0 "Karatoban" + d_laamp_firebrands_of_the_ice:0 "Firebrands of the Ice" + d_laamp_firebrands_of_the_ice_article:0 "$DEFAULT_TITLE_NAME_ARTICLE$" diff --git a/map_data/definition.csv b/map_data/definition.csv index ad65bdd53..0bd2198ad 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -4813,7 +4813,7 @@ 4812;88;165;6;FISHABUR;x 4813;130;168;134;BAQIRDA;x 4814;172;171;7;TAMANIN;x -4815;4;174;135;HAKKARI;x +4815;155;192;155;HAKKARI;x 4816;46;177;8;SA'IRD;x 4817;88;180;136;JUZA;x 4818;130;183;9;AS-SUS;x @@ -5722,14 +5722,14 @@ 5721;47;123;188;Berkri;x 5722;89;126;61;Maku;x 5723;131;129;189;Akhtamar;x -5724;173;132;62;Hadamakert;x +5724;115;83;28;Hadamakert;x 5725;5;135;190;Dlim;x 5726;47;138;63;Bagaran;x 5727;89;141;191;Kumayri;x 5728;131;144;64;Yerevan;x 5729;173;147;192;Garni;x 5730;5;150;65;Tsalakert;x -5731;47;153;193;Valashkert;x +5731;24;103;133;Valashkert;x 5732;89;156;66;Patnos;x 5733;131;159;194;Zariskat;x 5734;173;162;67;Kars;x diff --git a/map_data/provinces.png b/map_data/provinces.png index 7fcbfd56f..be222f456 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e49c2e085bb7f114615c9a1b4c2850f8db38a712dae61dd2f905b6f76c0c8d17 -size 3516543 +oid sha256:cc0b3aaff355ff69ae3d0da4c129601a8f9c6f9a19f1762b129e3f30f0de03f8 +size 2683277