diff --git a/common/culture/name_lists/NEOW_west_russian.txt b/common/culture/name_lists/NEOW_west_russian.txt index b0f4e9f1..03db11b1 100644 --- a/common/culture/name_lists/NEOW_west_russian.txt +++ b/common/culture/name_lists/NEOW_west_russian.txt @@ -10,6 +10,9 @@ name_list_NEOW_pribaltiyskiy = { #falsanix personal touch dynasty_names = { "dynn_Koroleveckiy" "dynn_Romanov" + "dynn_Baltiyskiy" + "dynn_Pilavskiy" + "dynn_Tilsitskiy" } male_names = { @@ -18,27 +21,27 @@ name_list_NEOW_pribaltiyskiy = { #falsanix personal touch Daniil Dmithriy Evgeniy Emiliy F_e_uml_dor F_e_uml_oderik Fevroniy Fillipp - Gavriil Gleb Grigoriy - Iakov Igor Il_pst_iya Ingvar Ivan Iziaslav - Kirill Konstantin - L_e_uml_va Leon + Gavriyl Georgiy Gleb Grigoriy + Iakov Igor Iliya Ivan + Karl Karol Kirill Konstantin + L_e_uml_va Leonid Mathvey Mikhayl Nikita Nikolay Nikolas Pavel P_e_uml_ter Roman Rostislav Ruslan - Simeon Stanislav Stefan Sviatoslav + Simeon Stanislav Stefan Sviatopolk Sviatoslav Thoma - Vasiliy Viacheslav Vladimir Vladislav Vsevolod Vysheslav + Vadim Vasiliy Viacheslav Vladimir Vladislav Vsevolod Vysheslav Yaropolk Yaroslav Yelisey Yufimiy Yuliy Yuriy } female_names = { Adelina Alexandra Alenia Amalia Ameli Anastasia Anna Alisia - B_e_act_atrissa + B_e_act_atrissa Belaya Ekatherina Elizavetha Evgenia Emilia Feodora Fevronia Fillippa Gorislava Gradislava Gremislava Holga - Ir_e_act_na + Ir_e_act_na Iunna Katherina Karenina Liubava Liudmila Lizavetha Margaritta Mari Marina @@ -46,7 +49,7 @@ name_list_NEOW_pribaltiyskiy = { #falsanix personal touch Sharlotta Sofia Sviatoslava Tatyana Ulita Ulyana - Vasilisa Verkhoslava Viacheslava Vysheslava + Vasilisa Viacheslava Vysheslava Yuditta Yufimia Yuliya Yuria Yanna } dynasty_of_location_prefix = "dynnp_fon" @@ -65,7 +68,9 @@ name_list_NEOW_pribaltiyskiy = { #falsanix personal touch mother_name_chance = 1 mercenary_names = { - { name = "mercenary_company_free_batallion_of_insterburg" } #Insterburgskiy Volniy Batalion + { name = "mercenary_company_free_batallion_of_insterburg" # Volniy Batalion + name = "mercenary_company_rota_of_rus" + } } } diff --git a/common/dna_data/zz_NEOW_dna.txt b/common/dna_data/zz_NEOW_dna.txt new file mode 100644 index 00000000..ed229a3f --- /dev/null +++ b/common/dna_data/zz_NEOW_dna.txt @@ -0,0 +1,362 @@ +dna_zapadoslavia0031 = { + portrait_info={ + type=male + genes={ hair_color={ 128 53 128 53 } + skin_color={ 43 77 43 77 } + eye_color={ 169 156 169 156 } + gene_chin_forward={ "chin_forward_pos" 140 "chin_forward_pos" 140 } + gene_chin_height={ "chin_height_neg" 94 "chin_height_neg" 94 } + gene_chin_width={ "chin_width_neg" 118 "chin_width_neg" 118 } + gene_eye_angle={ "eye_angle_neg" 121 "eye_angle_neg" 121 } + gene_eye_depth={ "eye_depth_neg" 122 "eye_depth_neg" 122 } + gene_eye_height={ "eye_height_pos" 135 "eye_height_pos" 135 } + gene_eye_distance={ "eye_distance_neg" 66 "eye_distance_neg" 66 } + gene_eye_shut={ "eye_shut_pos" 167 "eye_shut_pos" 167 } + gene_forehead_angle={ "forehead_angle_neg" 106 "forehead_angle_neg" 106 } + gene_forehead_brow_height={ "forehead_brow_height_neg" 110 "forehead_brow_height_neg" 110 } + gene_forehead_roundness={ "forehead_roundness_pos" 201 "forehead_roundness_pos" 201 } + gene_forehead_width={ "forehead_width_neg" 110 "forehead_width_neg" 110 } + gene_forehead_height={ "forehead_height_pos" 176 "forehead_height_pos" 176 } + gene_head_height={ "head_height_neg" 119 "head_height_neg" 119 } + gene_head_width={ "head_width_pos" 174 "head_width_pos" 174 } + gene_head_profile={ "head_profile_neg" 112 "head_profile_neg" 112 } + gene_head_top_height={ "head_top_height_pos" 127 "head_top_height_pos" 127 } + gene_head_top_width={ "head_top_width_pos" 130 "head_top_width_pos" 130 } + gene_jaw_angle={ "jaw_angle_neg" 115 "jaw_angle_neg" 115 } + gene_jaw_forward={ "jaw_forward_pos" 140 "jaw_forward_pos" 140 } + gene_jaw_height={ "jaw_height_pos" 130 "jaw_height_pos" 130 } + gene_jaw_width={ "jaw_width_neg" 104 "jaw_width_neg" 104 } + gene_mouth_corner_depth={ "mouth_corner_depth_neg" 126 "mouth_corner_depth_neg" 126 } + gene_mouth_corner_height={ "mouth_corner_height_neg" 125 "mouth_corner_height_neg" 125 } + gene_mouth_forward={ "mouth_forward_neg" 115 "mouth_forward_neg" 115 } + gene_mouth_height={ "mouth_height_neg" 116 "mouth_height_neg" 116 } + gene_mouth_width={ "mouth_width_neg" 92 "mouth_width_neg" 92 } + gene_mouth_upper_lip_size={ "mouth_upper_lip_size_neg" 101 "mouth_upper_lip_size_neg" 101 } + gene_mouth_lower_lip_size={ "mouth_lower_lip_size_neg" 93 "mouth_lower_lip_size_neg" 93 } + gene_mouth_open={ "mouth_open_pos" 176 "mouth_open_pos" 176 } + gene_neck_length={ "neck_length_neg" 110 "neck_length_neg" 110 } + gene_neck_width={ "neck_width_pos" 129 "neck_width_pos" 129 } + gene_bs_cheek_forward={ "cheek_forward_pos" 24 "cheek_forward_pos" 24 } + gene_bs_cheek_height={ "cheek_height_neg" 38 "cheek_height_neg" 38 } + gene_bs_cheek_width={ "cheek_width_pos" 60 "cheek_width_pos" 60 } + gene_bs_ear_angle={ "ear_angle_pos" 50 "ear_angle_pos" 50 } + gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 117 "ear_inner_shape_pos" 117 } + gene_bs_ear_bend={ "ear_lower_bend_pos" 44 "ear_lower_bend_pos" 44 } + gene_bs_ear_outward={ "ear_outward_pos" 19 "ear_outward_pos" 19 } + gene_bs_ear_size={ "ear_size_neg" 20 "ear_size_neg" 20 } + gene_bs_eye_corner_depth={ "eye_corner_depth_pos" 36 "eye_corner_depth_pos" 36 } + gene_bs_eye_fold_shape={ "eye_fold_shape_pos" 126 "eye_fold_shape_pos" 126 } + gene_bs_eye_size={ "eye_size_pos" 96 "eye_size_pos" 96 } + gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_pos" 18 "eye_upper_lid_size_pos" 18 } + gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 59 "forehead_brow_curve_neg" 59 } + gene_bs_forehead_brow_forward={ "forehead_brow_forward_pos" 2 "forehead_brow_forward_pos" 2 } + gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_neg" 24 "forehead_brow_inner_height_neg" 24 } + gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_pos" 26 "forehead_brow_outer_height_pos" 26 } + gene_bs_forehead_brow_width={ "forehead_brow_width_pos" 1 "forehead_brow_width_pos" 1 } + gene_bs_jaw_def={ "jaw_def_neg" 3 "jaw_def_neg" 3 } + gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 16 "mouth_lower_lip_def_pos" 16 } + gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_pos" 36 "mouth_lower_lip_full_pos" 36 } + gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_pos" 38 "mouth_lower_lip_pad_pos" 38 } + gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_neg" 36 "mouth_lower_lip_width_neg" 36 } + gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 3 "mouth_philtrum_def_pos" 3 } + gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_pos" 50 "mouth_philtrum_shape_pos" 50 } + gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_neg" 25 "mouth_philtrum_width_neg" 25 } + gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 5 "mouth_upper_lip_def_pos" 5 } + gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_neg" 1 "mouth_upper_lip_full_neg" 1 } + gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_pos" 10 "mouth_upper_lip_profile_pos" 10 } + gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_neg" 69 "mouth_upper_lip_width_neg" 69 } + gene_bs_nose_forward={ "nose_forward_neg" 37 "nose_forward_neg" 37 } + gene_bs_nose_height={ "nose_height_neg" 156 "nose_height_neg" 156 } + gene_bs_nose_length={ "nose_length_pos" 107 "nose_length_pos" 107 } + gene_bs_nose_nostril_height={ "nose_nostril_height_neg" 82 "nose_nostril_height_neg" 82 } + gene_bs_nose_nostril_width={ "nose_nostril_width_neg" 19 "nose_nostril_width_neg" 19 } + gene_bs_nose_profile={ "nose_profile_hawk" 20 "nose_profile_hawk" 20 } + gene_bs_nose_ridge_angle={ "nose_ridge_angle_pos" 25 "nose_ridge_angle_pos" 25 } + gene_bs_nose_ridge_width={ "nose_ridge_width_neg" 41 "nose_ridge_width_neg" 41 } + gene_bs_nose_size={ "nose_size_pos" 44 "nose_size_pos" 44 } + gene_bs_nose_tip_angle={ "nose_tip_angle_neg" 5 "nose_tip_angle_neg" 5 } + gene_bs_nose_tip_forward={ "nose_tip_forward_pos" 31 "nose_tip_forward_pos" 31 } + gene_bs_nose_tip_width={ "nose_tip_width_pos" 20 "nose_tip_width_pos" 20 } + face_detail_cheek_def={ "cheek_def_01" 10 "cheek_def_01" 10 } + face_detail_cheek_fat={ "cheek_fat_01_neg" 25 "cheek_fat_01_neg" 25 } + face_detail_chin_cleft={ "chin_dimple" 5 "chin_dimple" 5 } + face_detail_chin_def={ "chin_def" 12 "chin_def" 12 } + face_detail_eye_lower_lid_def={ "eye_lower_lid_def_02" 185 "eye_lower_lid_def_02" 185 } + face_detail_eye_socket={ "eye_socket_color_01" 246 "eye_socket_color_01" 246 } + face_detail_nasolabial={ "nasolabial_02" 112 "nasolabial_02" 112 } + face_detail_nose_ridge_def={ "nose_ridge_def_neg" 3 "nose_ridge_def_neg" 3 } + face_detail_nose_tip_def={ "nose_tip_def" 126 "nose_tip_def" 126 } + face_detail_temple_def={ "temple_def" 188 "temple_def" 188 } + expression_brow_wrinkles={ "brow_wrinkles_03" 255 "brow_wrinkles_03" 255 } + expression_eye_wrinkles={ "eye_wrinkles_01" 23 "eye_wrinkles_01" 23 } + expression_forehead_wrinkles={ "forehead_wrinkles_02" 255 "forehead_wrinkles_02" 199 } + expression_other={ "cheek_wrinkles_both_01" 0 "cheek_wrinkles_both_01" 0 } + complexion={ "complexion_6" 51 "complexion_6" 51 } + gene_height={ "normal_height" 126 "normal_height" 126 } + gene_bs_body_type={ "body_fat_head_fat_full" 146 "body_fat_head_fat_full" 152 } + gene_bs_body_shape={ "body_shape_triangle_half" 69 "body_shape_triangle_half" 49 } + gene_bs_bust={ "bust_clothes" 133 "bust_shape_4_full" 167 } + gene_age={ "old_1" 235 "old_1" 235 } + gene_eyebrows_shape={ "avg_spacing_avg_thickness" 102 "avg_spacing_avg_thickness" 102 } + gene_eyebrows_fullness={ "layer_2_avg_thickness" 90 "layer_2_avg_thickness" 90 } + gene_body_hair={ "body_hair_sparse" 160 "body_hair_sparse" 160 } + gene_hair_type={ "hair_straight" 147 "hair_straight" 147 } + gene_baldness={ "male_pattern_baldness" 169 "male_pattern_baldness" 169 } + eye_accessory={ "normal_eyes" 162 "normal_eyes" 162 } + teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 } + eyelashes_accessory={ "normal_eyelashes" 158 "normal_eyelashes" 158 } + beards={ "ep2_beards" 63 "no_beard" 0 } + cloaks={ "ep2_cloak_western_era1_low_nobility" 206 "no_cloak" 0 } + hairstyles={ "northern_hairstyles_straight" 251 "all_hairstyles" 0 } + legwear={ "pol_common_legwear" 13 "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 } + clothes={ "pol_high_nobility_clothes" 149 "most_clothes" 0 } + headgear={ "northern_high_nobility" 24 "no_headgear" 0 } + gene_balding_hair_effect={ "no_baldness" 255 "no_baldness" 0 } + } + } +} +dna_zapadoslavia0078 = { + type=female + portrait_info = { + genes = { hair_color={ 142 71 142 71 } + skin_color={ 111 39 58 87 } + eye_color={ 145 192 106 169 } + gene_chin_forward={ "chin_forward_neg" 129 "chin_forward_neg" 120 } + gene_chin_height={ "chin_height_pos" 90 "chin_height_pos" 128 } + gene_chin_width={ "chin_width_pos" 131 "chin_width_pos" 131 } + gene_eye_angle={ "eye_angle_pos" 136 "eye_angle_pos" 136 } + gene_eye_depth={ "eye_depth_neg" 123 "eye_depth_neg" 123 } + gene_eye_height={ "eye_height_pos" 134 "eye_height_pos" 134 } + gene_eye_distance={ "eye_distance_neg" 125 "eye_distance_neg" 125 } + gene_eye_shut={ "eye_shut_neg" 117 "eye_shut_neg" 117 } + gene_forehead_angle={ "forehead_angle_pos" 157 "forehead_angle_pos" 157 } + gene_forehead_brow_height={ "forehead_brow_height_neg" 112 "forehead_brow_height_neg" 112 } + gene_forehead_roundness={ "forehead_roundness_pos" 178 "forehead_roundness_pos" 178 } + gene_forehead_width={ "forehead_width_pos" 138 "forehead_width_pos" 138 } + gene_forehead_height={ "forehead_height_pos" 176 "forehead_height_pos" 176 } + gene_head_height={ "head_height_pos" 170 "head_height_pos" 130 } + gene_head_width={ "head_width_pos" 163 "head_width_pos" 186 } + gene_head_profile={ "head_profile_neg" 139 "head_profile_neg" 91 } + gene_head_top_height={ "head_top_height_neg" 135 "head_top_height_neg" 114 } + gene_head_top_width={ "head_top_width_pos" 153 "head_top_width_pos" 160 } + gene_jaw_angle={ "jaw_angle_neg" 180 "jaw_angle_neg" 116 } + gene_jaw_forward={ "jaw_forward_neg" 106 "jaw_forward_neg" 118 } + gene_jaw_height={ "jaw_height_pos" 142 "jaw_height_pos" 134 } + gene_jaw_width={ "jaw_width_pos" 115 "jaw_width_pos" 131 } + gene_mouth_corner_depth={ "mouth_corner_depth_neg" 116 "mouth_corner_depth_neg" 116 } + gene_mouth_corner_height={ "mouth_corner_height_neg" 104 "mouth_corner_height_neg" 104 } + gene_mouth_forward={ "mouth_forward_neg" 57 "mouth_forward_neg" 125 } + gene_mouth_height={ "mouth_height_pos" 105 "mouth_height_pos" 139 } + gene_mouth_width={ "mouth_width_neg" 73 "mouth_width_neg" 73 } + gene_mouth_upper_lip_size={ "mouth_upper_lip_size_pos" 128 "mouth_upper_lip_size_pos" 129 } + gene_mouth_lower_lip_size={ "mouth_lower_lip_size_pos" 145 "mouth_lower_lip_size_pos" 140 } + gene_mouth_open={ "mouth_open_pos" 166 "mouth_open_pos" 226 } + gene_neck_length={ "neck_length_pos" 174 "neck_length_pos" 149 } + gene_neck_width={ "neck_width_pos" 112 "neck_width_pos" 165 } + gene_bs_cheek_forward={ "cheek_forward_neg" 11 "cheek_forward_pos" 47 } + gene_bs_cheek_height={ "cheek_height_pos" 89 "cheek_height_pos" 33 } + gene_bs_cheek_width={ "cheek_width_neg" 207 "cheek_width_pos" 38 } + gene_bs_ear_angle={ "ear_angle_neg" 35 "ear_angle_neg" 35 } + gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 138 "ear_inner_shape_pos" 138 } + gene_bs_ear_bend={ "ear_upper_bend_pos" 35 "ear_upper_bend_pos" 35 } + gene_bs_ear_outward={ "ear_outward_pos" 4 "ear_outward_pos" 4 } + gene_bs_ear_size={ "ear_size_pos" 105 "ear_size_pos" 105 } + gene_bs_eye_corner_depth={ "eye_corner_depth_neg" 17 "eye_corner_depth_neg" 17 } + gene_bs_eye_fold_shape={ "eye_fold_shape_pos" 13 "eye_fold_shape_pos" 13 } + gene_bs_eye_size={ "eye_size_pos" 70 "eye_size_pos" 70 } + gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_pos" 14 "eye_upper_lid_size_pos" 14 } + gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 95 "forehead_brow_curve_neg" 95 } + gene_bs_forehead_brow_forward={ "forehead_brow_forward_neg" 23 "forehead_brow_forward_pos" 27 } + gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_pos" 102 "forehead_brow_inner_height_pos" 115 } + gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_neg" 60 "forehead_brow_outer_height_neg" 60 } + gene_bs_forehead_brow_width={ "forehead_brow_width_pos" 125 "forehead_brow_width_pos" 125 } + gene_bs_jaw_def={ "jaw_def_neg" 91 "jaw_def_neg" 91 } + gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 121 "mouth_lower_lip_def_pos" 47 } + gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_neg" 41 "mouth_lower_lip_full_neg" 72 } + gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_neg" 89 "mouth_lower_lip_pad_pos" 145 } + gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_neg" 26 "mouth_lower_lip_width_neg" 26 } + gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 14 "mouth_philtrum_def_pos" 14 } + gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_pos" 13 "mouth_philtrum_shape_pos" 13 } + gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_neg" 57 "mouth_philtrum_width_pos" 38 } + gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 50 "mouth_upper_lip_def_pos" 10 } + gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_neg" 6 "mouth_upper_lip_full_neg" 6 } + gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_pos" 63 "mouth_upper_lip_profile_neg" 1 } + gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_neg" 61 "mouth_upper_lip_width_neg" 61 } + gene_bs_nose_forward={ "nose_forward_neg" 29 "nose_forward_neg" 29 } + gene_bs_nose_height={ "nose_height_neg" 121 "nose_height_pos" 36 } + gene_bs_nose_length={ "nose_length_neg" 13 "nose_length_neg" 13 } + gene_bs_nose_nostril_height={ "nose_nostril_height_pos" 97 "nose_nostril_height_pos" 114 } + gene_bs_nose_nostril_width={ "nose_nostril_width_pos" 43 "nose_nostril_width_pos" 124 } + gene_bs_nose_profile={ "nose_profile_neg" 25 "nose_profile_neg" 21 } + gene_bs_nose_ridge_angle={ "nose_ridge_angle_pos" 89 "nose_ridge_angle_neg" 9 } + gene_bs_nose_ridge_width={ "nose_ridge_width_pos" 15 "nose_ridge_width_pos" 15 } + gene_bs_nose_size={ "nose_size_pos" 3 "nose_size_pos" 59 } + gene_bs_nose_tip_angle={ "nose_tip_angle_pos" 173 "nose_tip_angle_pos" 65 } + gene_bs_nose_tip_forward={ "nose_tip_forward_neg" 71 "nose_tip_forward_neg" 41 } + gene_bs_nose_tip_width={ "nose_tip_width_neg" 26 "nose_tip_width_neg" 26 } + face_detail_cheek_def={ "cheek_def_02" 19 "cheek_def_01" 12 } + face_detail_cheek_fat={ "cheek_fat_01_neg" 16 "cheek_fat_01_neg" 15 } + face_detail_chin_cleft={ "chin_dimple" 11 "chin_dimple" 11 } + face_detail_chin_def={ "chin_def" 32 "chin_def" 9 } + face_detail_eye_lower_lid_def={ "eye_lower_lid_def" 145 "eye_lower_lid_def" 145 } + face_detail_eye_socket={ "eye_socket_03" 6 "eye_socket_03" 6 } + face_detail_nasolabial={ "nasolabial_02" 152 "nasolabial_02" 152 } + face_detail_nose_ridge_def={ "nose_ridge_def_neg" 39 "nose_ridge_def_neg" 8 } + face_detail_nose_tip_def={ "nose_tip_def" 95 "nose_tip_def" 24 } + face_detail_temple_def={ "temple_def" 215 "temple_def" 213 } + expression_brow_wrinkles={ "brow_wrinkles_03" 206 "brow_wrinkles_02" 57 } + expression_eye_wrinkles={ "eye_wrinkles_02" 215 "eye_wrinkles_02" 214 } + expression_forehead_wrinkles={ "forehead_wrinkles_01" 76 "forehead_wrinkles_01" 76 } + expression_other={ "cheek_wrinkles_both_01" 36 "cheek_wrinkles_both_01" 0 } + complexion={ "complexion_smooth_1" 215 "complexion_1" 215 } + gene_height={ "normal_height" 132 "normal_height" 114 } + gene_bs_body_type={ "body_fat_head_fat_low" 124 "body_fat_head_fat_medium" 124 } + gene_bs_body_shape={ "body_shape_hourglass_full" 25 "body_shape_hourglass_full" 42 } + gene_bs_bust={ "bust_clothes" 60 "bust_shape_1_half" 94 } + gene_age={ "old_1" 113 "old_1" 113 } + gene_eyebrows_shape={ "avg_spacing_low_thickness" 146 "avg_spacing_low_thickness" 146 } + gene_eyebrows_fullness={ "layer_2_low_thickness" 77 "layer_2_low_thickness" 77 } + gene_body_hair={ "body_hair_dense_lower_stubble" 37 "body_hair_dense" 182 } + gene_hair_type={ "hair_wavy" 95 "hair_wavy" 95 } + gene_baldness={ "male_pattern_baldness" 92 "male_pattern_baldness" 92 } + eye_accessory={ "normal_eyes" 158 "normal_eyes" 158 } + teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 } + eyelashes_accessory={ "normal_eyelashes" 239 "normal_eyelashes" 239 } + hairstyles={ "fp2_hairstyles_iberian_christian_straight" 255 "all_hairstyles" 0 } + clothes={ "western_bedchamber" 79 "most_clothes" 0 } + } + } + enabled = yes +} +dna_zapadoslavia0081 = { +portrait_info={ + type=female + genes={ hair_color={ 134 65 134 65 } + skin_color={ 90 83 90 83 } + eye_color={ 161 172 161 172 } + gene_chin_forward={ "chin_forward_pos" 143 "chin_forward_pos" 143 } + gene_chin_height={ "chin_height_neg" 118 "chin_height_neg" 118 } + gene_chin_width={ "chin_width_neg" 123 "chin_width_neg" 123 } + gene_eye_angle={ "eye_angle_neg" 118 "eye_angle_neg" 118 } + gene_eye_depth={ "eye_depth_pos" 128 "eye_depth_pos" 128 } + gene_eye_height={ "eye_height_pos" 132 "eye_height_pos" 132 } + gene_eye_distance={ "eye_distance_pos" 131 "eye_distance_pos" 131 } + gene_eye_shut={ "eye_shut_pos" 142 "eye_shut_pos" 142 } + gene_forehead_angle={ "forehead_angle_neg" 111 "forehead_angle_neg" 111 } + gene_forehead_brow_height={ "forehead_brow_height_pos" 127 "forehead_brow_height_pos" 127 } + gene_forehead_roundness={ "forehead_roundness_pos" 220 "forehead_roundness_pos" 220 } + gene_forehead_width={ "forehead_width_pos" 147 "forehead_width_pos" 147 } + gene_forehead_height={ "forehead_height_neg" 125 "forehead_height_neg" 125 } + gene_head_height={ "head_height_neg" 97 "head_height_neg" 97 } + gene_head_width={ "head_width_neg" 99 "head_width_neg" 99 } + gene_head_profile={ "head_profile_neg" 123 "head_profile_neg" 123 } + gene_head_top_height={ "head_top_height_neg" 117 "head_top_height_neg" 117 } + gene_head_top_width={ "head_top_width_pos" 133 "head_top_width_pos" 133 } + gene_jaw_angle={ "jaw_angle_pos" 145 "jaw_angle_pos" 145 } + gene_jaw_forward={ "jaw_forward_pos" 140 "jaw_forward_pos" 140 } + gene_jaw_height={ "jaw_height_neg" 114 "jaw_height_neg" 114 } + gene_jaw_width={ "jaw_width_pos" 147 "jaw_width_pos" 147 } + gene_mouth_corner_depth={ "mouth_corner_depth_neg" 118 "mouth_corner_depth_neg" 118 } + gene_mouth_corner_height={ "mouth_corner_height_neg" 123 "mouth_corner_height_neg" 123 } + gene_mouth_forward={ "mouth_forward_neg" 127 "mouth_forward_neg" 127 } + gene_mouth_height={ "mouth_height_pos" 163 "mouth_height_pos" 163 } + gene_mouth_width={ "mouth_width_pos" 139 "mouth_width_pos" 139 } + gene_mouth_upper_lip_size={ "mouth_upper_lip_size_neg" 120 "mouth_upper_lip_size_neg" 120 } + gene_mouth_lower_lip_size={ "mouth_lower_lip_size_neg" 102 "mouth_lower_lip_size_neg" 102 } + gene_mouth_open={ "mouth_open_neg" 59 "mouth_open_neg" 59 } + gene_neck_length={ "neck_length_pos" 152 "neck_length_pos" 152 } + gene_neck_width={ "neck_width_neg" 118 "neck_width_neg" 118 } + gene_bs_cheek_forward={ "cheek_forward_neg" 16 "cheek_forward_neg" 16 } + gene_bs_cheek_height={ "cheek_height_pos" 45 "cheek_height_pos" 45 } + gene_bs_cheek_width={ "cheek_width_neg" 40 "cheek_width_neg" 40 } + gene_bs_ear_angle={ "ear_angle_neg" 1 "ear_angle_neg" 1 } + gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 85 "ear_inner_shape_pos" 85 } + gene_bs_ear_bend={ "ear_both_bend_pos" 21 "ear_both_bend_pos" 21 } + gene_bs_ear_outward={ "ear_outward_pos" 33 "ear_outward_pos" 33 } + gene_bs_ear_size={ "ear_size_pos" 79 "ear_size_pos" 79 } + gene_bs_eye_corner_depth={ "eye_corner_depth_neg" 41 "eye_corner_depth_neg" 41 } + gene_bs_eye_fold_shape={ "eye_fold_shape_neg" 50 "eye_fold_shape_neg" 50 } + gene_bs_eye_size={ "eye_size_pos" 13 "eye_size_pos" 13 } + gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_neg" 180 "eye_upper_lid_size_neg" 180 } + gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 142 "forehead_brow_curve_neg" 142 } + gene_bs_forehead_brow_forward={ "forehead_brow_forward_pos" 38 "forehead_brow_forward_pos" 38 } + gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_pos" 91 "forehead_brow_inner_height_pos" 91 } + gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_pos" 12 "forehead_brow_outer_height_pos" 12 } + gene_bs_forehead_brow_width={ "forehead_brow_width_pos" 50 "forehead_brow_width_pos" 50 } + gene_bs_jaw_def={ "jaw_def_neg" 112 "jaw_def_neg" 112 } + gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 187 "mouth_lower_lip_def_pos" 187 } + gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_neg" 25 "mouth_lower_lip_full_neg" 25 } + gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_neg" 26 "mouth_lower_lip_pad_neg" 26 } + gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_neg" 78 "mouth_lower_lip_width_neg" 78 } + gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 24 "mouth_philtrum_def_pos" 24 } + gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_neg" 202 "mouth_philtrum_shape_neg" 202 } + gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_neg" 5 "mouth_philtrum_width_neg" 5 } + gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 40 "mouth_upper_lip_def_pos" 40 } + gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_pos" 112 "mouth_upper_lip_full_pos" 112 } + gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_neg" 27 "mouth_upper_lip_profile_neg" 27 } + gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_neg" 88 "mouth_upper_lip_width_neg" 88 } + gene_bs_nose_forward={ "nose_forward_pos" 34 "nose_forward_pos" 34 } + gene_bs_nose_height={ "nose_height_neg" 15 "nose_height_neg" 15 } + gene_bs_nose_length={ "nose_length_pos" 46 "nose_length_pos" 46 } + gene_bs_nose_nostril_height={ "nose_nostril_height_pos" 102 "nose_nostril_height_pos" 102 } + gene_bs_nose_nostril_width={ "nose_nostril_width_neg" 82 "nose_nostril_width_neg" 82 } + gene_bs_nose_profile={ "nose_profile_neg" 2 "nose_profile_neg" 2 } + gene_bs_nose_ridge_angle={ "nose_ridge_angle_neg" 3 "nose_ridge_angle_neg" 3 } + gene_bs_nose_ridge_width={ "nose_ridge_width_neg" 1 "nose_ridge_width_neg" 1 } + gene_bs_nose_size={ "nose_size_pos" 55 "nose_size_pos" 55 } + gene_bs_nose_tip_angle={ "nose_tip_angle_pos" 27 "nose_tip_angle_pos" 27 } + gene_bs_nose_tip_forward={ "nose_tip_forward_neg" 34 "nose_tip_forward_neg" 34 } + gene_bs_nose_tip_width={ "nose_tip_width_neg" 73 "nose_tip_width_neg" 73 } + face_detail_cheek_def={ "cheek_def_02" 2 "cheek_def_02" 2 } + face_detail_cheek_fat={ "cheek_fat_04_pos" 79 "cheek_fat_04_pos" 79 } + face_detail_chin_cleft={ "chin_cleft" 0 "chin_cleft" 0 } + face_detail_chin_def={ "chin_def" 249 "chin_def" 249 } + face_detail_eye_lower_lid_def={ "eye_lower_lid_def_02" 104 "eye_lower_lid_def_02" 104 } + face_detail_eye_socket={ "eye_socket_03" 40 "eye_socket_03" 40 } + face_detail_nasolabial={ "nasolabial_03" 3 "nasolabial_03" 3 } + face_detail_nose_ridge_def={ "nose_ridge_def_pos" 138 "nose_ridge_def_pos" 138 } + face_detail_nose_tip_def={ "nose_tip_def" 151 "nose_tip_def" 151 } + face_detail_temple_def={ "temple_def" 211 "temple_def" 211 } + expression_brow_wrinkles={ "brow_wrinkles_03" 0 "brow_wrinkles_03" 135 } + expression_eye_wrinkles={ "eye_wrinkles_01" 23 "eye_wrinkles_01" 23 } + expression_forehead_wrinkles={ "forehead_wrinkles_01" 24 "forehead_wrinkles_01" 24 } + expression_other={ "cheek_wrinkles_both_01" 51 "cheek_wrinkles_both_01" 0 } + complexion={ "complexion_1" 187 "complexion_1" 187 } + gene_height={ "normal_height" 131 "normal_height" 131 } + gene_bs_body_type={ "body_fat_head_fat_low" 91 "body_fat_head_fat_low" 122 } + gene_bs_body_shape={ "body_shape_pear_half" 123 "body_shape_pear_half" 62 } + gene_bs_bust={ "bust_clothes" 75 "bust_default" 94 } + gene_age={ "old_2" 122 "old_2" 122 } + gene_eyebrows_shape={ "avg_spacing_avg_thickness" 100 "avg_spacing_avg_thickness" 100 } + gene_eyebrows_fullness={ "layer_2_lower_thickness" 190 "layer_2_lower_thickness" 190 } + gene_body_hair={ "body_hair_sparse" 184 "body_hair_sparse" 184 } + gene_hair_type={ "hair_straight" 166 "hair_straight" 166 } + gene_baldness={ "male_pattern_baldness" 169 "male_pattern_baldness" 169 } + eye_accessory={ "normal_eyes" 54 "normal_eyes" 54 } + teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 } + eyelashes_accessory={ "normal_eyelashes" 48 "normal_eyelashes" 48 } + beards={ "ep2_beards" 26 "no_beard" 0 } + cloaks={ "no_cloak" 43 "no_cloak" 0 } + hairstyles={ "northern_hairstyles_straight" 250 "all_hairstyles" 0 } + legwear={ "pol_common_legwear" 252 "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 } + clothes={ "pol_commoner_clothes" 191 "most_clothes" 0 } + headgear={ "pol_low_nobility" 253 "no_headgear" 0 } + gene_balding_hair_effect={ "no_baldness" 255 "no_baldness" 0 } + } + } + enabled = yes +} + + diff --git a/common/domiciles/types/NEOW_domicile_types.txt b/common/domiciles/types/NEOW_domicile_types.txt index 4f1a9cdb..04a7cfdc 100644 --- a/common/domiciles/types/NEOW_domicile_types.txt +++ b/common/domiciles/types/NEOW_domicile_types.txt @@ -936,7 +936,7 @@ minority_community = { move_cost = { gold = { value = { - value = 20 + value = 300 format = "BASE_VALUE_FORMAT" desc = "BASE_VALUE" } @@ -944,25 +944,25 @@ minority_community = { limit = { domicile ?= { has_domicile_building_or_higher = minority_community_05 } } - add = 80 + add = 800 } else_if = { limit = { domicile ?= { has_domicile_building_or_higher = minority_community_04 } } - add = 60 + add = 600 } else_if = { limit = { domicile ?= { has_domicile_building_or_higher = minority_community_03 } } - add = 40 + add = 400 } else_if = { limit = { domicile ?= { has_domicile_building_or_higher = minority_community_02 } } - add = 20 + add = 200 } } } diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index 361f5dc5..5a87e328 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -1942,13 +1942,19 @@ koroleveckiy_dynasty = { culture = NEOW_pribaltic } -tserlona_dynasty = { - name = dynn_tserlona +tilsit_dynasty = { + name = dynn_tilsit + prefix = "dynnp_fon" culture = NEOW_pribaltic } -dyatlova_dynasty = { - name = dynn_dyatlova +velovskiy_dynasty = { + name = dynn_velovskiy + culture = NEOW_pribaltic +} + +rosenkranz_dynasty = { + name = dynn_rosenkranz culture = NEOW_pribaltic } diff --git a/common/landed_titles/baltics.txt b/common/landed_titles/baltics.txt index c6b96d43..c4ff956c 100644 --- a/common/landed_titles/baltics.txt +++ b/common/landed_titles/baltics.txt @@ -8,7 +8,7 @@ e_baltic = { color = { 90 10 0 } - capital = c_konigsberg + capital = c_riga k_lithuania = { color = { 90 10 0 } @@ -24,7 +24,7 @@ e_baltic = { } } - d_lithuanians = { + d_vilnius = { color = { 81 0 0 } capital = c_kernave # Kernave @@ -32,40 +32,65 @@ e_baltic = { c_kernave = { color = { 140 28 28 } - b_kernave = { - province = 154 - - color = { 140 28 28 } - } b_vilnius = { province = 155 color = { 140 28 28 } } + b_kernave = { + province = 154 + + color = { 140 28 28 } + } b_vilkmerge = { province = 149 color = { 140 28 28 } } + b_pabrade = { + province = 13637 + + color = { 90 10 10 } + } + } + c_utena = { + color = { 90 10 10 } + b_utena = { province = 151 color = { 90 10 10 } } - } - c_trakai = { - color = { 100 28 28 } + b_rokiskis = { + province = 13635 - b_trakai = { - province = 153 - - color = { 100 28 28 } + color = { 90 10 10 } } + b_ignalina = { + province = 13636 + + color = { 90 10 10 } + } + } + } + d_kaunas = { + color = { 100 28 28 } + + capital = c_kaunas + + c_kaunas = { + color = { 100 28 28 } + b_kaunas = { province = 130 color = { 100 28 28 } } + b_trakai = { + province = 153 + + color = { 100 28 28 } + } b_merkine = { province = 160 @@ -84,7 +109,12 @@ e_baltic = { } c_yatvyagi = { color = { 115 45 45 } + + b_marjiampole = { + province = 13633 + color = { 115 45 45 } + } b_panemune = { province = 156 @@ -93,16 +123,85 @@ e_baltic = { b_vilkaviskis = { province = 158 + color = { 115 45 45 } + } + b_garliava = { + province = 13634 + color = { 115 45 45 } } } } + d_klaipeda = { + color = { 166 85 85 } + + capital = c_memel + + c_memel = { + color = { 166 85 85 } + b_memel = { + province = 118 + + color = { 166 85 85 } + } + b_taurage = { + province = 125 + + color = { 166 85 85 } + } + b_jurbarkas = { + province = 123 + + color = { 166 81 81 } + + cultural_names = { + name_list_franconian = cn_georgenburg + name_list_saxon = cn_georgenburg + name_list_swabian = cn_georgenburg + name_list_bavarian = cn_georgenburg + name_list_swedish = cn_georgsborg + name_list_norse = cn_georgsborg + name_list_danish = cn_georgsborg + name_list_norwegian = cn_georgsborg + } + } + } + } d_samogitia = { color = { 150 70 70 } - capital = c_raseiniai # Samogitia + capital = c_palanga # Samogitia + + c_palanga = { + color = { 150 95 95 } + b_palanga = { + province = 115 + + color = { 150 95 95 } + } + b_medeniken = { + province = 126 + + color = { 150 95 95 } + } + b_telsiai = { + province = 128 + + color = { 150 95 95 } + } + b_duvzare = { + province = 116 + + color = { 160 35 35 } + } + b_ceklis = { + province = 111 + + color = { 160 35 35 } + } + } c_raseiniai = { # Samogitia color = { 166 81 81 } @@ -122,22 +221,7 @@ e_baltic = { name_list_norwegian = cn_raseinen } } - b_jurbarkas = { - province = 123 - - color = { 166 81 81 } - - cultural_names = { - name_list_franconian = cn_georgenburg - name_list_saxon = cn_georgenburg - name_list_swabian = cn_georgenburg - name_list_bavarian = cn_georgenburg - name_list_swedish = cn_georgsborg - name_list_norse = cn_georgsborg - name_list_danish = cn_georgsborg - name_list_norwegian = cn_georgsborg - } - } + b_veliuona = { province = 129 @@ -148,38 +232,10 @@ e_baltic = { color = { 166 81 81 } } - } - c_memel = { - color = { 166 85 85 } + b_upyte = { + province = 132 - b_memel = { - province = 118 - - color = { 166 85 85 } - } - b_taurage = { - province = 125 - - color = { 166 85 85 } - } - } - c_palanga = { - color = { 150 95 95 } - - b_palanga = { - province = 115 - - color = { 150 95 95 } - } - b_medeniken = { - province = 126 - - color = { 150 95 95 } - } - b_telsiai = { - province = 128 - - color = { 150 95 95 } + color = { 165 105 105 } } } c_siauliai = { @@ -190,13 +246,19 @@ e_baltic = { color = { 165 105 105 } } - b_upyte = { - province = 132 + + b_birzai = { + province = 152 color = { 165 105 105 } } - b_birzai = { - province = 152 + b_joniskis = { + province = 13629 + + color = { 165 105 105 } + } + b_zagares = { + province = 13630 color = { 165 105 105 } } @@ -207,11 +269,28 @@ e_baltic = { k_latvia = { color = { 110 35 35 } - capital = c_vidzeme + capital = c_riga + + d_riga = { + color = { 175 12 12 } + + capital = c_riga + + c_riga = { + color = { 200 40 40 } + b_riga = { + province = 108 + + color = { 200 40 40 } + } + } + + } + d_courland = { color = { 182 16 16 } - capital = c_zemigalians # Kurzeme + capital = c_vanemane # Kurzeme cultural_names = { name_list_prussian = cn_curonia @@ -228,6 +307,69 @@ e_baltic = { name_list_norwegian = cn_kurland } + + c_vanemane = { + color = { 182 24 24 } + + b_piltene = { + province = 110 + + color = { 182 24 24 } + } + b_dundaga = { + province = 117 + + color = { 182 24 24 } + } + + b_kuldiga = { + province = 13627 + + color = { 182 24 24 } + } + } + c_grobin = { + color = { 160 35 35 } + + b_grobin = { + province = 114 + + color = { 160 35 35 } + } + b_bandava = { + province = 113 + + color = { 160 35 35 } + } + b_skrunda = { + province = 13628 + + color = { 160 35 35 } + } + } + c_tukuma = { + color = { 170 25 25 } + + b_kandava = { + province = 112 + + color = { 170 25 25 } + } + b_tukums = { + province = 13631 + + color = { 170 25 25 } + } + b_neuenburg = { + province = 121 + + color = { 200 40 40 } + } + } + } + d_zemgales = { + capital = c_zemigalians + color = { 192 16 16 } c_zemigalians = { color = { 200 40 40 } @@ -239,23 +381,7 @@ e_baltic = { name_list_swabian = cn_semgallen name_list_bavarian = cn_semgallen } - - #b_riga = { - #} - #b_bauska = { - #} - #b_skaistkalne = { - #} - #b_mezotne = { - #} - #b_cruczeborch = { - #} - #b_selpils = { - #} - #b_remigala = { - #} - #b_jelgava = { - #} + b_uxkull = { # actually Jurmala b_jurmala province = 104 @@ -283,54 +409,7 @@ e_baltic = { color = { 200 40 40 } } - b_neuenburg = { - province = 121 - - color = { 200 40 40 } - } - } - c_vanemane = { - color = { 182 24 24 } - - b_piltene = { - province = 110 - - color = { 182 24 24 } - } - b_dundaga = { - province = 117 - - color = { 182 24 24 } - } - b_kandava = { - province = 112 - - color = { 182 24 24 } - } - } - c_grobin = { - color = { 160 35 35 } - - b_grobin = { - province = 114 - - color = { 160 35 35 } - } - b_bandava = { - province = 113 - - color = { 160 35 35 } - } - b_duvzare = { - province = 116 - - color = { 160 35 35 } - } - b_ceklis = { - province = 111 - - color = { 160 35 35 } - } + } c_selpils = { color = { 192 14 14 } @@ -343,6 +422,11 @@ e_baltic = { b_oknist = { province = 150 + color = { 192 14 14 } + } + b_demene = { + province = 13638 + color = { 192 14 14 } } } @@ -354,11 +438,7 @@ e_baltic = { c_vidzeme = { color = { 125 50 50 } - b_riga = { - province = 108 - - color = { 200 40 40 } - } + b_lemisele = { province = 101 @@ -388,10 +468,6 @@ e_baltic = { name_list_bavarian = cn_salismunde } } - } - c_talava = { - color = { 100 30 40 } - b_valmiera = { province = 102 @@ -404,6 +480,14 @@ e_baltic = { name_list_bavarian = cn_wolmar } } + b_rujiena = { + province = 147 + color = { 100 35 40 } + } + } + c_talava = { + color = { 100 30 40 } + b_venden = { province = 109 @@ -427,7 +511,7 @@ e_baltic = { name_list_swabian = cn_ronneburg name_list_bavarian = cn_ronneburg } - } + } } c_kokenois = { color = { 100 50 50 } @@ -485,6 +569,18 @@ e_baltic = { name_list_bavarian = cn_gerzika } + b_daugavpils = { + province = 137 + + color = { 90 35 35 } + + cultural_names = { + name_list_franconian = cn_dunaburg + name_list_saxon = cn_dunaburg + name_list_swabian = cn_dunaburg + name_list_bavarian = cn_dunaburg + } + } b_jersika = { province = 136 @@ -509,18 +605,6 @@ e_baltic = { name_list_bavarian = cn_jakobstadt } } - b_daugavpils = { - province = 137 - - color = { 90 35 35 } - - cultural_names = { - name_list_franconian = cn_dunaburg - name_list_saxon = cn_dunaburg - name_list_swabian = cn_dunaburg - name_list_bavarian = cn_dunaburg - } - } b_rezekne = { province = 138 @@ -593,7 +677,7 @@ e_baltic = { capital = c_reval # Kalevan - c_reval = { + c_harjumaa = { color = { 160 85 85 } cultural_names = { @@ -623,6 +707,14 @@ e_baltic = { name_list_bavarian = cn_reval } } + b_kiiu = { + province = 13622 + color = { 160 85 85 } + } + b_loksa = { + province = 13623 + color = { 160 85 85 } + } b_harjumaa = { province = 95 @@ -634,10 +726,127 @@ e_baltic = { color = { 160 85 85 } } } - c_narva = { - color = { 175 55 55 } + + c_wiek = { + color = { 140 55 55 } cultural_names = { + name_list_estonian = cn_laanemaa + } + + b_hapsal = { + province = 92 + + color = { 140 55 55 } + } + + } + } + d_parnu = { + color = { 160 60 60 } + capital = c_parnu + cultural_names = { + name_list_franconian = cn_pernau + name_list_saxon = cn_pernau + name_list_swabian = cn_pernau + name_list_bavarian = cn_pernau + name_list_polish = cn_parnawa + name_list_lithuanian = cn_pernu + } + c_parnu = { + color = { 160 60 60 } + cultural_names = { + name_list_franconian = cn_pernau + name_list_saxon = cn_pernau + name_list_swabian = cn_pernau + name_list_bavarian = cn_pernau + name_list_polish = cn_parnawa + name_list_lithuanian = cn_pernu + } + b_parnu = { + province = 99 + + color = { 160 60 60 } + + cultural_names = { + name_list_franconian = cn_pernau + name_list_saxon = cn_pernau + name_list_swabian = cn_pernau + name_list_bavarian = cn_pernau + name_list_polish = cn_parnawa + name_list_lithuanian = cn_pernu + } + } + + b_leal = { + province = 93 + + color = { 160 60 60 } + } + b_testama = { + province = 13625 + + color = { 160 60 60 } + } + } + c_livs = { + color = { 170 50 50 } + + b_viljandi = { + province = 100 + + color = { 170 50 50 } + + cultural_names = { + name_list_franconian = cn_fellin + name_list_saxon = cn_fellin + name_list_swabian = cn_fellin + name_list_bavarian = cn_fellin + } + } + b_karksi_nuia = { + province = 13626 + + color = { 170 50 50 } + + cultural_names = { + name_list_franconian = cn_karkus + name_list_saxon = cn_karkus + name_list_swabian = cn_karkus + name_list_bavarian = cn_karkus + } + } + b_vandra = { + province = 13621 + + + color = { 170 50 50 } + } + } + + } + d_narva = { + color = { 175 55 55 } + capital = c_narva + + cultural_names = { + name_list_swedish = cn_narva + name_list_danish = cn_narva + name_list_norwegian = cn_narva + name_list_norse = cn_narva + name_list_franconian = cn_narva + name_list_saxon = cn_narva + name_list_swabian = cn_narva + name_list_bavarian = cn_narva + } + + c_ida_viru = { + color = { 175 55 55 } + + b_narva = { + province = 98 + + cultural_names = { name_list_swedish = cn_narva name_list_danish = cn_narva name_list_norwegian = cn_narva @@ -648,15 +857,25 @@ e_baltic = { name_list_bavarian = cn_narva } - b_narva = { - province = 98 - color = { 175 55 55 } } + b_avinurme = { + province = 13618 + color = { 175 55 55 } + } + b_kohtla-jarve = { + province = 13619 + color = { 175 55 55 } + } + + } + c_laane_viru = { + color = { 125 25 15 } + b_wesenburg = { province = 97 - color = { 175 55 55 } + color = { 115 5 5 } cultural_names = { name_list_franconian = cn_wesenburg @@ -665,6 +884,11 @@ e_baltic = { name_list_bavarian = cn_wesenburg } } + b_vaike_marja = { + province = 13620 + + color = { 115 5 5 } + } b_poltsamaa = { province = 146 @@ -675,7 +899,72 @@ e_baltic = { } } } - c_osel = { + } + d_tartu = { + capital = c_tartu + color = { 115 5 5 } + + cultural_names = { + name_list_norse = cn_dorpat + name_list_swedish = cn_dorpat + name_list_danish = cn_dorpat + name_list_norwegian = cn_dorpat + name_list_franconian = cn_dorpat + name_list_saxon = cn_dorpat + name_list_swabian = cn_dorpat + name_list_bavarian = cn_dorpat + } + + c_tartu = { + color = { 115 5 5 } + + cultural_names = { + name_list_norse = cn_dorpat + name_list_swedish = cn_dorpat + name_list_danish = cn_dorpat + name_list_norwegian = cn_dorpat + name_list_franconian = cn_dorpat + name_list_saxon = cn_dorpat + name_list_swabian = cn_dorpat + name_list_bavarian = cn_dorpat + } + + b_tartu = { + province = 145 + + color = { 115 5 5 } + + cultural_names = { + name_list_norse = cn_dorpat + name_list_swedish = cn_dorpat + name_list_danish = cn_dorpat + name_list_norwegian = cn_dorpat + name_list_franconian = cn_dorpat + name_list_saxon = cn_dorpat + name_list_swabian = cn_dorpat + name_list_bavarian = cn_dorpat + } + } + b_vastseliina = { + province = 143 + + color = { 115 5 5 } + + cultural_names = { + name_list_estonian = cn_voro + } + } + b_valga = { + province = 144 + + color = { 115 5 5 } + } + } + } + d_moonsund = { + color = { 101 48 48 } + capital = c_saaremaa + c_saaremaa = { color = { 101 48 48 } cultural_names = { @@ -730,118 +1019,21 @@ e_baltic = { name_list_bavarian = cn_moon } } - b_hiiumaa = { + } + c_hiiumaa = { + color = { 121 48 48 } + b_kaina = { province = 91 color = { 101 48 48 } } - } - c_wiek = { - color = { 140 55 55 } + b_korgessaare = { + province = 13624 - cultural_names = { - name_list_estonian = cn_laanemaa - } - - b_hapsal = { - province = 92 - - color = { 140 55 55 } - } - b_leal = { - province = 93 - - color = { 140 55 55 } + color = { 101 48 48 } } } - c_livs = { - color = { 170 50 50 } - - b_parnu = { - province = 99 - - color = { 170 50 50 } - - cultural_names = { - name_list_franconian = cn_pernau - name_list_saxon = cn_pernau - name_list_swabian = cn_pernau - name_list_bavarian = cn_pernau - name_list_polish = cn_parnawa - name_list_lithuanian = cn_pernu - } - } - b_viljandi = { - province = 100 - - color = { 170 50 50 } - - cultural_names = { - name_list_franconian = cn_fellin - name_list_saxon = cn_fellin - name_list_swabian = cn_fellin - name_list_bavarian = cn_fellin - } - } - b_alistegunde = { - province = 147 - - color = { 170 50 50 } - - cultural_names = { - name_list_franconian = cn_karkus - name_list_saxon = cn_karkus - name_list_swabian = cn_karkus - name_list_bavarian = cn_karkus - } - } } - c_dorpat = { - color = { 115 5 5 } - - cultural_names = { - name_list_norse = cn_dorpat - name_list_swedish = cn_dorpat - name_list_danish = cn_dorpat - name_list_norwegian = cn_dorpat - name_list_franconian = cn_dorpat - name_list_saxon = cn_dorpat - name_list_swabian = cn_dorpat - name_list_bavarian = cn_dorpat - } - - b_tartu = { - province = 145 - - color = { 115 5 5 } - - cultural_names = { - name_list_norse = cn_dorpat - name_list_swedish = cn_dorpat - name_list_danish = cn_dorpat - name_list_norwegian = cn_dorpat - name_list_franconian = cn_dorpat - name_list_saxon = cn_dorpat - name_list_swabian = cn_dorpat - name_list_bavarian = cn_dorpat - } - } - b_vastseliina = { - province = 143 - - color = { 115 5 5 } - - cultural_names = { - name_list_estonian = cn_voro - } - } - b_valga = { - province = 144 - - color = { 115 5 5 } - } - } - } #d_livonia = { # color = { 110 50 50 } diff --git a/common/landed_titles/zapadoslavia.txt b/common/landed_titles/zapadoslavia.txt index 21cd3646..c71ed496 100644 --- a/common/landed_titles/zapadoslavia.txt +++ b/common/landed_titles/zapadoslavia.txt @@ -657,9 +657,9 @@ e_zapadoslavia = { province = 3198 color = { 150 85 95 } } - b_michalowo = { # Rypin - province = 4923 - color = { 200 60 20 } + b_graudenz = { # Kwidzyn + province = 3197 + color = { 205 105 105 } } } c_kujawy = { # Włocławek @@ -771,9 +771,9 @@ e_zapadoslavia = { b_wyszkow = { # Wyszków province = 4948 color = { 122 6 50 } - } - b_zawkrze = { # Przasnysz - province = 4934 + } + b_ciechanow = { # Ciechanów + province = 4935 color = { 127 30 2 } } b_rozan = { # Maków Mazowiecki @@ -788,8 +788,8 @@ e_zapadoslavia = { province = 529 color = { 127 30 2 } } - b_ciechanow = { # Ciechanów - province = 4935 + b_zawkrze = { # Przasnysz + province = 4934 color = { 127 30 2 } } b_wyszgorod = { # Mława @@ -1117,9 +1117,9 @@ e_zapadoslavia = { province = 2835 color = { 205 105 105 } } - b_graudenz = { # Kwidzyn - province = 3197 - color = { 205 105 105 } + b_michalowo = { # Rypin + province = 4923 + color = { 200 60 20 } } b_mohrungen = { # Iława province = 3201 @@ -1203,8 +1203,8 @@ e_zapadoslavia = { c_natangia = { # Znamensk color = { 225 125 125 } - b_wehlau = { # Znamensk - province = 13617 + b_insterburg = { # Chernyakhovsk + province = 3206 color = { 230 165 165 } } b_ostlandsberg = { # Kętrzyn @@ -1220,7 +1220,7 @@ e_zapadoslavia = { color = { 230 165 165 } } } - c_wormditt = { # Sovetsk + c_tilsit = { # Sovetsk color = { 255 110 155 } b_tilsit = { # Sovetsk @@ -1235,10 +1235,10 @@ e_zapadoslavia = { province = 120 color = { 190 85 85 } } - b_insterburg = { # Chernyakhovsk - province = 3206 + b_talpaki = { # Talpaki + province = 13617 color = { 230 165 165 } - } + } } } } diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 3a5f4c86..597d6723 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -94,7 +94,7 @@ default_coastal_sea=coastal_sea 91=plains 92=plains 93=taiga -94=plains +94=tells 95=taiga 96=taiga 97=taiga @@ -104,11 +104,11 @@ default_coastal_sea=coastal_sea 101=taiga 102=taiga 103=taiga -104=plains +104=forest 105=forest 106=forest 107=plains -108=farmlands +108=tells 109=wetlands 110=plains 111=wetlands @@ -130,7 +130,7 @@ default_coastal_sea=coastal_sea 127=forest 128=forest 129=wetlands -130=forest +130=tells 131=wetlands 132=forest 133=forest @@ -155,7 +155,7 @@ default_coastal_sea=coastal_sea 152=forest 153=forest 154=forest -155=forest +155=tells 156=forest 157=hills 158=forest @@ -482,7 +482,7 @@ default_coastal_sea=coastal_sea 479=hills 480=hills 481=mountains -482=hills +482=tells 483=hills 484=hills 485=hills @@ -490,13 +490,13 @@ default_coastal_sea=coastal_sea 487=hills 488=mountains 489=plains -490=farmlands +490=tells 491=mountains 492=plains 493=plains 494=plains 495=hills -496=farmlands +496=tells 497=hills 498=mountains 499=mountains @@ -505,7 +505,7 @@ default_coastal_sea=coastal_sea 502=mountains 503=mountains 504=mountains -505=plains +505=tells 506=plains 507=plains 508=plains @@ -559,7 +559,7 @@ default_coastal_sea=coastal_sea 556=steppe 557=steppe 558=steppe -559=wetlands +559=farmlands 560=mountains 561=mountains 562=plains @@ -4857,7 +4857,7 @@ default_coastal_sea=coastal_sea 5273=steppe 5274=steppe 5275=steppe -5276=steppe +5276=farmlands 5277=wetlands 5278=steppe 5279=steppe @@ -4911,7 +4911,7 @@ default_coastal_sea=coastal_sea 5327=steppe 5328=steppe 5329=steppe -5330=steppe +5330=farmlands 5331=wetlands 5332=steppe 5333=steppe @@ -11981,4 +11981,25 @@ default_coastal_sea=coastal_sea 13428=wasteland 13615=forest 13616=hills -13617=forest \ No newline at end of file +13617=forest +13618=taiga +13619=taiga +13620=taiga +13621=taiga +13622=taiga +13623=taiga +13624=taiga +13625=taiga +13626=taiga +13627=forest +13628=forest +13629=forest +13630=forest +13631=forest +13632=mountains +13633=forest +13634=forest +13635=forest +13636=forest +13637=forest +13638=forest \ No newline at end of file diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index d224782b..c6ed347c 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -529,13 +529,13 @@ } { id=88 - position={ 2076.248779 0.000000 3750.216309 } + position={ 2077.499756 0.000000 3727.964844 } rotation={ -0.000000 0.332851 -0.000000 0.942980 } scale={ 1.000000 1.000000 1.000000 } } { id=89 - position={ 2102.445801 0.000000 3757.077148 } + position={ 2089.135498 0.000000 3764.023682 } rotation={ -0.000000 0.254907 -0.000000 0.966966 } scale={ 1.000000 1.000000 1.000000 } } @@ -547,98 +547,98 @@ } { id=91 - position={ 2095.466797 0.000000 3785.184082 } + position={ 2089.749268 0.000000 3776.384277 } rotation={ -0.000000 -0.313386 -0.000000 0.949626 } scale={ 1.000000 1.000000 1.000000 } } { id=92 - position={ 2128.582031 0.000000 3792.562500 } + position={ 2114.396729 0.000000 3792.675049 } rotation={ -0.000000 0.418223 -0.000000 0.908344 } scale={ 1.000000 1.000000 1.000000 } } { id=93 - position={ 2133.631348 0.000000 3768.880859 } + position={ 2143.784180 0.000000 3759.432617 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=94 - position={ 2165.664307 0.000000 3804.479736 } + position={ 2152.549805 0.000000 3807.650391 } rotation={ -0.000000 0.321431 -0.000000 0.946933 } scale={ 1.000000 1.000000 1.000000 } } { id=95 - position={ 2157.850830 0.000000 3785.886719 } + position={ 2154.808838 0.000000 3787.124512 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=96 - position={ 2184.699219 0.000000 3775.260498 } + position={ 2188.098389 0.000000 3794.783936 } rotation={ -0.000000 0.239027 -0.000000 0.971013 } scale={ 1.000000 1.000000 1.000000 } } { id=97 - position={ 2223.598145 0.000000 3808.516602 } + position={ 2216.974609 0.000000 3812.076904 } rotation={ -0.000000 -0.279257 -0.000000 0.960216 } scale={ 1.000000 1.000000 1.000000 } } { id=98 - position={ 2238.933594 0.000000 3802.634277 } + position={ 2262.220459 0.000000 3782.941162 } rotation={ -0.000000 0.490634 -0.000000 0.871366 } scale={ 1.000000 1.000000 1.000000 } } { id=99 - position={ 2171.443848 0.000000 3757.954102 } + position={ 2180.123047 0.000000 3731.072998 } rotation={ -0.000000 0.323395 -0.000000 0.946264 } scale={ 1.000000 1.000000 1.000000 } } { id=100 - position={ 2195.876465 0.000000 3754.406738 } + position={ 2199.464355 0.000000 3757.204102 } rotation={ -0.000000 0.280927 -0.000000 0.959729 } scale={ 1.000000 1.000000 1.000000 } } { id=101 - position={ 2190.551758 0.000000 3688.442627 } + position={ 2187.221436 0.000000 3665.340332 } rotation={ -0.000000 -0.346570 -0.000000 0.938024 } scale={ 1.000000 1.000000 1.000000 } } { id=102 - position={ 2202.873047 0.000000 3688.967285 } - rotation={ -0.000000 0.284410 -0.000000 0.958703 } + position={ 2203.919434 0.000000 3690.793945 } + rotation={ -0.000000 0.435306 -0.000000 0.900283 } scale={ 1.000000 1.000000 1.000000 } } { id=103 - position={ 2222.242920 0.000000 3626.757080 } + position={ 2216.017578 0.000000 3632.965332 } rotation={ -0.000000 -0.592522 -0.000000 0.805554 } scale={ 1.000000 1.000000 1.000000 } } { id=104 - position={ 2146.405273 0.000000 3645.154785 } + position={ 2164.128174 0.000000 3638.756836 } rotation={ -0.000000 0.264132 -0.000000 0.964487 } scale={ 1.000000 1.000000 1.000000 } } { id=105 - position={ 2158.507568 0.000000 3606.290039 } + position={ 2162.379395 0.000000 3605.343750 } rotation={ -0.000000 0.502448 -0.000000 0.864607 } scale={ 1.000000 1.000000 1.000000 } } { id=106 - position={ 2149.187988 0.000000 3615.360107 } - rotation={ -0.000000 -0.453051 -0.000000 0.891485 } + position={ 2146.972900 0.000000 3616.458252 } + rotation={ -0.000000 -0.779050 -0.000000 -0.626962 } scale={ 1.000000 1.000000 1.000000 } } { @@ -655,37 +655,37 @@ } { id=109 - position={ 2205.197266 0.000000 3656.610840 } + position={ 2201.449951 0.000000 3657.105469 } rotation={ -0.000000 0.259566 -0.000000 0.965725 } scale={ 1.000000 1.000000 1.000000 } } { id=110 - position={ 2058.696289 0.000000 3678.662598 } + position={ 2058.111572 0.000000 3674.441895 } rotation={ -0.000000 0.210481 -0.000000 0.977598 } scale={ 1.000000 1.000000 1.000000 } } { id=111 - position={ 2081.219971 0.000000 3600.531738 } + position={ 2081.512695 0.000000 3598.334473 } rotation={ -0.000000 0.359419 -0.000000 0.933176 } scale={ 1.000000 1.000000 1.000000 } } { id=112 - position={ 2097.514160 0.000000 3659.853516 } + position={ 2114.539795 0.000000 3675.802734 } rotation={ -0.000000 0.295829 -0.000000 0.955241 } scale={ 1.000000 1.000000 1.000000 } } { id=113 - position={ 2081.917236 0.000000 3648.308105 } + position={ 2069.208252 0.000000 3648.629395 } rotation={ -0.000000 -0.281600 -0.000000 0.959532 } scale={ 1.000000 1.000000 1.000000 } } { id=114 - position={ 2047.792969 0.000000 3633.873779 } + position={ 2062.991699 0.000000 3627.023926 } rotation={ -0.000000 0.271923 -0.000000 0.962319 } scale={ 1.000000 1.000000 1.000000 } } @@ -697,19 +697,19 @@ } { id=116 - position={ 2070.032471 0.000000 3609.361328 } + position={ 2068.713623 0.000000 3614.308838 } rotation={ -0.000000 -0.217933 -0.000000 0.975964 } scale={ 1.000000 1.000000 1.000000 } } { id=117 - position={ 2098.322266 0.000000 3686.906982 } + position={ 2104.392334 0.000000 3690.959473 } rotation={ -0.000000 -0.283825 -0.000000 0.958876 } scale={ 1.000000 1.000000 1.000000 } } { id=118 - position={ 2073.915527 0.000000 3551.305908 } + position={ 2063.400146 0.000000 3544.778320 } rotation={ -0.000000 -0.242522 -0.000000 0.970146 } scale={ 1.000000 1.000000 1.000000 } } @@ -727,7 +727,7 @@ } { id=121 - position={ 2113.275879 0.000000 3615.978516 } + position={ 2115.119629 0.000000 3619.592529 } rotation={ -0.000000 0.170579 -0.000000 0.985344 } scale={ 1.000000 1.000000 1.000000 } } @@ -739,7 +739,7 @@ } { id=123 - position={ 2144.402832 0.000000 3526.108398 } + position={ 2137.532959 0.000000 3528.463379 } rotation={ -0.000000 -0.292913 -0.000000 0.956139 } scale={ 1.000000 1.000000 1.000000 } } @@ -751,7 +751,7 @@ } { id=125 - position={ 2088.351562 0.000000 3532.388916 } + position={ 2089.264404 0.000000 3532.121582 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -775,19 +775,19 @@ } { id=129 - position={ 2160.119385 0.000000 3528.417236 } + position={ 2151.082764 0.000000 3527.994629 } rotation={ -0.000000 0.246724 -0.000000 0.969086 } scale={ 1.000000 1.000000 1.000000 } } { id=130 - position={ 2217.442627 0.000000 3506.468750 } - rotation={ -0.000000 -0.353374 -0.000000 0.935482 } + position={ 2204.463379 0.000000 3514.909912 } + rotation={ -0.000000 -0.869369 -0.000000 0.494163 } scale={ 1.000000 1.000000 1.000000 } } { id=131 - position={ 2200.939209 0.000000 3524.991699 } + position={ 2202.622070 0.000000 3523.431152 } rotation={ -0.000000 -0.392418 -0.000000 0.919787 } scale={ 1.000000 1.000000 1.000000 } } @@ -799,25 +799,25 @@ } { id=133 - position={ 2204.082031 0.000000 3613.306641 } + position={ 2216.350098 0.000000 3613.370605 } rotation={ -0.000000 -0.579092 -0.000000 0.815262 } scale={ 1.000000 1.000000 1.000000 } } { id=134 - position={ 2198.655273 0.000000 3644.653809 } + position={ 2212.892822 0.000000 3647.813721 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=135 - position={ 2240.428467 0.000000 3627.064209 } + position={ 2239.723145 0.000000 3628.231934 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=136 - position={ 2261.947021 0.000000 3604.712891 } + position={ 2262.665283 0.000000 3606.414551 } rotation={ -0.000000 -0.294780 -0.000000 0.955565 } scale={ 1.000000 1.000000 1.000000 } } @@ -847,7 +847,7 @@ } { id=141 - position={ 2253.558594 0.000000 3677.047852 } + position={ 2264.512695 0.000000 3683.424805 } rotation={ -0.000000 0.401941 -0.000000 0.915666 } scale={ 1.000000 1.000000 1.000000 } } @@ -859,13 +859,13 @@ } { id=143 - position={ 2263.800049 0.000000 3720.651367 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + position={ 2268.275879 0.000000 3699.543213 } + rotation={ -0.000000 -0.594634 -0.000000 0.803997 } scale={ 1.000000 1.000000 1.000000 } } { id=144 - position={ 2245.506836 0.000000 3705.139160 } + position={ 2233.470703 0.000000 3710.166748 } rotation={ -0.000000 -0.388682 -0.000000 0.921372 } scale={ 1.000000 1.000000 1.000000 } } @@ -877,19 +877,19 @@ } { id=146 - position={ 2214.289062 0.000000 3752.001465 } + position={ 2234.503174 0.000000 3767.283203 } rotation={ -0.000000 0.332275 -0.000000 0.943183 } scale={ 1.000000 1.000000 1.000000 } } { id=147 - position={ 2203.819336 0.000000 3720.493408 } + position={ 2225.787354 0.000000 3695.555420 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=148 - position={ 2189.957520 0.000000 3723.279785 } + position={ 2190.963379 0.000000 3713.559570 } rotation={ -0.000000 -0.414894 -0.000000 0.909870 } scale={ 1.000000 1.000000 1.000000 } } @@ -901,43 +901,43 @@ } { id=150 - position={ 2243.290771 0.000000 3590.998535 } - rotation={ -0.000000 -0.112008 -0.000000 0.993707 } + position={ 2238.196045 0.000000 3588.361328 } + rotation={ -0.000000 0.268221 -0.000000 0.963357 } scale={ 1.000000 1.000000 1.000000 } } { id=151 - position={ 2251.476074 0.000000 3557.194336 } + position={ 2249.560059 0.000000 3558.939209 } rotation={ -0.000000 -0.491325 -0.000000 0.870976 } scale={ 1.000000 1.000000 1.000000 } } { id=152 - position={ 2211.747070 0.000000 3574.020752 } + position={ 2193.416992 0.000000 3594.409912 } rotation={ -0.000000 -0.344938 -0.000000 0.938625 } scale={ 1.000000 1.000000 1.000000 } } { id=153 - position={ 2231.384277 0.000000 3480.483398 } + position={ 2227.715332 0.000000 3486.878906 } rotation={ -0.000000 -0.320217 -0.000000 0.947344 } scale={ 1.000000 1.000000 1.000000 } } { id=154 - position={ 2242.396240 0.000000 3506.744629 } + position={ 2244.804688 0.000000 3512.852051 } rotation={ -0.000000 0.245126 -0.000000 0.969491 } scale={ 1.000000 1.000000 1.000000 } } { id=155 - position={ 2249.225586 0.000000 3467.519531 } + position={ 2241.423828 0.000000 3485.661133 } rotation={ -0.000000 -0.437887 -0.000000 0.899030 } scale={ 1.000000 1.000000 1.000000 } } { id=156 - position={ 2157.402832 0.000000 3516.812256 } + position={ 2147.825928 0.000000 3518.436035 } rotation={ -0.000000 0.304533 -0.000000 0.952502 } scale={ 1.000000 1.000000 1.000000 } } @@ -949,19 +949,19 @@ } { id=158 - position={ 2156.291992 0.000000 3473.027832 } + position={ 2147.421631 0.000000 3483.400146 } rotation={ -0.000000 -0.249798 -0.000000 0.968298 } scale={ 1.000000 1.000000 1.000000 } } { id=159 - position={ 2248.822021 0.000000 3446.470459 } + position={ 2233.654785 0.000000 3465.744385 } rotation={ -0.000000 -0.782564 -0.000000 0.622571 } scale={ 1.000000 1.000000 1.000000 } } { id=160 - position={ 2219.243652 0.000000 3457.308838 } + position={ 2214.746582 0.000000 3471.461182 } rotation={ -0.000000 -0.167782 -0.000000 0.985824 } scale={ 1.000000 1.000000 1.000000 } } @@ -973,7 +973,7 @@ } { id=162 - position={ 2162.712891 0.000000 3453.443848 } + position={ 2204.473633 0.000000 3452.999023 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -3151,13 +3151,13 @@ } { id=529 - position={ 2010.577881 0.000000 3346.332275 } + position={ 2015.536255 0.000000 3336.430908 } rotation={ -0.000000 0.353545 -0.000000 0.935417 } scale={ 1.000000 1.000000 1.000000 } } { id=530 - position={ 2062.292236 0.000000 3276.276367 } + position={ 2060.683105 0.000000 3269.572998 } rotation={ -0.000000 0.572530 -0.000000 0.819884 } scale={ 1.000000 1.000000 1.000000 } } @@ -14443,7 +14443,7 @@ } { id=2830 - position={ 1946.654541 0.000000 3466.478516 } + position={ 1949.614136 0.000000 3462.954346 } rotation={ -0.000000 -0.415532 -0.000000 0.909578 } scale={ 1.000000 1.000000 1.000000 } } @@ -14455,25 +14455,25 @@ } { id=2832 - position={ 1924.170532 0.000000 3497.690430 } + position={ 1926.099243 0.000000 3503.413574 } rotation={ -0.000000 0.526509 -0.000000 0.850170 } scale={ 1.000000 1.000000 1.000000 } } { id=2833 - position={ 1925.730469 0.000000 3486.025879 } + position={ 1906.982788 0.000000 3471.126221 } rotation={ -0.000000 -0.322500 -0.000000 0.946570 } scale={ 1.000000 1.000000 1.000000 } } { id=2834 - position={ 1973.197510 0.000000 3449.614502 } + position={ 1980.138672 0.000000 3456.284424 } rotation={ -0.000000 -0.307206 -0.000000 0.951643 } scale={ 1.000000 1.000000 1.000000 } } { id=2835 - position={ 1994.593994 0.000000 3454.207031 } + position={ 1995.310059 0.000000 3451.789062 } rotation={ -0.000000 -0.444815 -0.000000 0.895622 } scale={ 1.000000 1.000000 1.000000 } } @@ -16501,7 +16501,7 @@ } { id=3194 - position={ 1938.462524 0.000000 3437.745361 } + position={ 1948.410767 0.000000 3428.738770 } rotation={ -0.000000 0.064530 -0.000000 0.997916 } scale={ 1.000000 1.000000 1.000000 } } @@ -16513,25 +16513,25 @@ } { id=3196 - position={ 1926.472412 0.000000 3397.994873 } + position={ 1919.604370 0.000000 3421.152100 } rotation={ -0.000000 -0.294050 -0.000000 0.955790 } scale={ 1.000000 1.000000 1.000000 } } { id=3197 - position={ 1963.469849 0.000000 3424.222168 } + position={ 1965.107666 0.000000 3415.179199 } rotation={ -0.000000 0.658169 -0.000000 0.752870 } scale={ 1.000000 1.000000 1.000000 } } { id=3198 - position={ 1938.962036 0.000000 3392.385010 } + position={ 1965.901978 0.000000 3393.215088 } rotation={ -0.000000 0.353089 -0.000000 0.935590 } scale={ 1.000000 1.000000 1.000000 } } { id=3199 - position={ 1955.091187 0.000000 3383.883301 } + position={ 1941.901001 0.000000 3380.743164 } rotation={ -0.000000 0.414310 -0.000000 0.910136 } scale={ 1.000000 1.000000 1.000000 } } @@ -16573,13 +16573,13 @@ } { id=3206 - position={ 2102.805908 0.000000 3503.521240 } + position={ 2090.506592 0.000000 3486.864990 } rotation={ -0.000000 0.270807 -0.000000 0.962634 } scale={ 1.000000 1.000000 1.000000 } } { id=3207 - position={ 2085.544434 0.000000 3432.377197 } + position={ 2085.127930 0.000000 3414.706055 } rotation={ -0.000000 -0.440820 -0.000000 0.897595 } scale={ 1.000000 1.000000 1.000000 } } @@ -16591,7 +16591,7 @@ } { id=3209 - position={ 2105.000000 0.000000 3445.000000 } + position={ 2116.350586 0.000000 3411.374756 } rotation={ -0.000000 0.314313 -0.000000 0.949319 } scale={ 1.000000 1.000000 1.000000 } } @@ -16609,7 +16609,7 @@ } { id=3212 - position={ 2041.263672 0.000000 3423.192871 } + position={ 2044.082397 0.000000 3444.876465 } rotation={ -0.000000 0.232977 -0.000000 0.972482 } scale={ 1.000000 1.000000 1.000000 } } @@ -26311,7 +26311,7 @@ } { id=4908 - position={ 1927.640991 0.000000 3320.602295 } + position={ 1933.402588 0.000000 3320.936768 } rotation={ -0.000000 -0.278905 -0.000000 0.960319 } scale={ 1.000000 1.000000 1.000000 } } @@ -26371,43 +26371,43 @@ } { id=4918 - position={ 1940.083252 0.000000 3331.660645 } + position={ 1917.329834 0.000000 3313.414551 } rotation={ -0.000000 -0.393681 -0.000000 0.919247 } scale={ 1.000000 1.000000 1.000000 } } { id=4919 - position={ 1963.443481 0.000000 3335.046631 } + position={ 1960.448975 0.000000 3339.925537 } rotation={ -0.000000 -0.369791 -0.000000 0.929115 } scale={ 1.000000 1.000000 1.000000 } } { id=4920 - position={ 1931.996582 0.000000 3361.603760 } + position={ 1932.591187 0.000000 3363.123291 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=4921 - position={ 1921.325928 0.000000 3392.428955 } + position={ 1920.313232 0.000000 3396.316650 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=4922 - position={ 1976.816772 0.000000 3361.750488 } + position={ 1990.787476 0.000000 3361.089111 } rotation={ -0.000000 0.243558 -0.000000 0.969886 } scale={ 1.000000 1.000000 1.000000 } } { id=4923 - position={ 1966.759277 0.000000 3372.412354 } + position={ 1971.729858 0.000000 3424.119141 } rotation={ -0.000000 0.573206 -0.000000 0.819412 } scale={ 1.000000 1.000000 1.000000 } } { id=4924 - position={ 1967.004395 0.000000 3292.686035 } + position={ 1969.990112 0.000000 3287.245605 } rotation={ -0.000000 0.311240 -0.000000 0.950331 } scale={ 1.000000 1.000000 1.000000 } } @@ -26479,7 +26479,7 @@ } { id=4936 - position={ 2058.226807 0.000000 3299.916992 } + position={ 2046.498291 0.000000 3312.215820 } rotation={ -0.000000 0.279696 -0.000000 0.960089 } scale={ 1.000000 1.000000 1.000000 } } @@ -26515,7 +26515,7 @@ } { id=4942 - position={ 2037.833130 0.000000 3301.261719 } + position={ 2036.213135 0.000000 3310.547607 } rotation={ -0.000000 -0.551047 -0.000000 0.834474 } scale={ 1.000000 1.000000 1.000000 } } @@ -26533,7 +26533,7 @@ } { id=4945 - position={ 2088.559326 0.000000 3398.483887 } + position={ 2136.397461 0.000000 3403.476562 } rotation={ -0.000000 0.171842 -0.000000 0.985125 } scale={ 1.000000 1.000000 1.000000 } } @@ -26569,19 +26569,19 @@ } { id=4951 - position={ 2120.262695 0.000000 3267.182617 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + position={ 2115.943115 0.000000 3268.395508 } + rotation={ -0.000000 -0.862331 -0.000000 0.506344 } scale={ 1.000000 1.000000 1.000000 } } { id=4952 - position={ 2153.969727 0.000000 3291.896240 } + position={ 2123.437256 0.000000 3286.568115 } rotation={ -0.000000 -0.329539 -0.000000 0.944142 } scale={ 1.000000 1.000000 1.000000 } } { id=4953 - position={ 2092.041260 0.000000 3251.736572 } + position={ 2092.434814 0.000000 3232.472900 } rotation={ -0.000000 0.433905 -0.000000 0.900959 } scale={ 1.000000 1.000000 1.000000 } } @@ -26593,19 +26593,19 @@ } { id=4955 - position={ 2080.421875 0.000000 3225.510742 } + position={ 2102.800781 0.000000 3238.670654 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=4956 - position={ 2070.651611 0.000000 3254.657715 } + position={ 2095.729492 0.000000 3258.953369 } rotation={ -0.000000 -0.190959 -0.000000 0.981598 } scale={ 1.000000 1.000000 1.000000 } } { id=4957 - position={ 2158.000000 0.000000 3224.000000 } + position={ 2133.750000 0.000000 3223.588867 } rotation={ -0.000000 0.336474 -0.000000 0.941693 } scale={ 1.000000 1.000000 1.000000 } } @@ -26623,7 +26623,7 @@ } { id=4960 - position={ 2135.000000 0.000000 3237.000000 } + position={ 2148.786865 0.000000 3253.793701 } rotation={ -0.000000 0.402751 -0.000000 0.915310 } scale={ 1.000000 1.000000 1.000000 } } @@ -27205,7 +27205,7 @@ } { id=5057 - position={ 2144.247314 0.000000 3318.174561 } + position={ 2108.273682 0.000000 3330.741699 } rotation={ -0.000000 -0.444542 -0.000000 0.895758 } scale={ 1.000000 1.000000 1.000000 } } @@ -47575,7 +47575,7 @@ } { id=8815 - position={ 2139.000000 0.000000 3306.000000 } + position={ 2139.514160 0.000000 3312.459961 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -69973,7 +69973,133 @@ } { id=13617 - position={ 2093.062012 0.000000 3487.018799 } + position={ 2097.827148 0.000000 3503.711426 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13618 + position={ 2250.830566 0.000000 3783.794678 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13619 + position={ 2231.125000 0.000000 3805.564697 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13620 + position={ 2217.158936 0.000000 3777.220947 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13621 + position={ 2175.840332 0.000000 3762.213623 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13622 + position={ 2168.764648 0.000000 3807.296387 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13623 + position={ 2189.055420 0.000000 3818.295898 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13624 + position={ 2090.336914 0.000000 3793.171387 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13625 + position={ 2161.614990 0.000000 3743.169922 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13626 + position={ 2202.947510 0.000000 3725.456055 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13627 + position={ 2098.076416 0.000000 3657.568359 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13628 + position={ 2084.697021 0.000000 3625.815674 } + rotation={ -0.000000 -0.894849 -0.000000 0.446369 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13629 + position={ 2173.247559 0.000000 3596.356201 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13630 + position={ 2120.780029 0.000000 3605.222900 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13631 + position={ 2124.379883 0.000000 3652.015381 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13632 + position={ 2097.827148 0.000000 3503.711426 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13633 + position={ 2158.028320 0.000000 3473.057373 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13634 + position={ 2191.271484 0.000000 3491.639404 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13635 + position={ 2212.604004 0.000000 3571.469482 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13636 + position={ 2266.406982 0.000000 3551.473877 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13637 + position={ 2262.233398 0.000000 3531.351562 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13638 + position={ 2247.787598 0.000000 3576.373535 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } 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 5ed89181..47616ad8 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -529,13 +529,13 @@ } { id=88 - position={ 2078.077637 0.000000 3742.085449 } + position={ 2086.588867 0.000000 3744.111572 } rotation={ -0.000000 -0.999030 -0.000000 0.044042 } scale={ 1.000000 1.000000 1.000000 } } { id=89 - position={ 2114.077637 0.000000 3755.085449 } + position={ 2108.237793 0.000000 3761.639893 } rotation={ -0.000000 -0.849137 -0.000000 -0.528173 } scale={ 1.000000 1.000000 1.000000 } } @@ -547,61 +547,61 @@ } { id=91 - position={ 2088.077637 0.000000 3778.085449 } + position={ 2097.638184 0.000000 3781.805420 } rotation={ -0.000000 -0.329863 -0.000000 -0.944029 } scale={ 1.000000 1.000000 1.000000 } } { id=92 - position={ 2131.077637 0.000000 3781.085449 } + position={ 2128.030762 0.000000 3786.277832 } rotation={ -0.000000 -0.990832 -0.000000 -0.135103 } scale={ 1.000000 1.000000 1.000000 } } { id=93 - position={ 2147.077637 0.000000 3758.085449 } + position={ 2140.364014 0.000000 3771.753906 } rotation={ -0.000000 -0.999948 -0.000000 -0.010217 } scale={ 1.000000 1.000000 1.000000 } } { id=94 - position={ 2157.077637 0.000000 3806.085449 } + position={ 2145.360352 0.000000 3804.912598 } rotation={ -0.000000 -0.423987 -0.000000 -0.905668 } scale={ 1.000000 1.000000 1.000000 } } { id=95 - position={ 2157.826660 0.000000 3779.546875 } + position={ 2160.218018 0.000000 3779.338379 } rotation={ -0.000000 -0.624241 -0.000000 0.781232 } scale={ 1.000000 1.000000 1.000000 } } { id=96 - position={ 2186.077637 0.000000 3783.085449 } + position={ 2183.770020 0.000000 3779.096924 } rotation={ -0.000000 0.156465 -0.000000 0.987684 } scale={ 1.000000 1.000000 1.000000 } } { id=97 - position={ 2204.108398 0.000000 3799.182617 } + position={ 2211.371338 0.000000 3799.103271 } rotation={ -0.000000 -0.911051 -0.000000 0.412294 } scale={ 1.000000 1.000000 1.000000 } } { id=98 - position={ 2245.461426 0.000000 3804.913086 } + position={ 2257.968018 0.000000 3804.597656 } rotation={ -0.000000 -0.987645 -0.000000 0.156705 } scale={ 1.000000 1.000000 1.000000 } } { id=99 - position={ 2174.343506 0.000000 3751.039551 } + position={ 2176.692871 0.000000 3747.767578 } rotation={ -0.000000 -0.704535 -0.000000 -0.709670 } scale={ 1.000000 1.000000 1.000000 } } { id=100 - position={ 2198.077637 0.000000 3737.085449 } + position={ 2202.799805 0.000000 3740.642578 } rotation={ -0.000000 -0.472121 -0.000000 -0.881534 } scale={ 1.000000 1.000000 1.000000 } } @@ -613,37 +613,37 @@ } { id=102 - position={ 2208.077637 0.000000 3684.085449 } + position={ 2213.587891 0.000000 3680.100098 } rotation={ -0.000000 -0.884137 -0.000000 -0.467228 } scale={ 1.000000 1.000000 1.000000 } } { id=103 - position={ 2215.662842 0.000000 3630.182129 } + position={ 2223.312500 0.000000 3626.875000 } rotation={ -0.000000 -0.491067 -0.000000 -0.871122 } scale={ 1.000000 1.000000 1.000000 } } { id=104 - position={ 2149.077637 0.000000 3638.085449 } + position={ 2152.145508 0.000000 3648.306885 } rotation={ -0.000000 -0.272638 -0.000000 0.962117 } scale={ 1.000000 1.000000 1.000000 } } { id=105 - position={ 2163.000488 0.000000 3599.137207 } + position={ 2164.632080 0.000000 3610.720215 } rotation={ -0.000000 -0.509692 -0.000000 0.860357 } scale={ 1.000000 1.000000 1.000000 } } { id=106 - position={ 2145.109863 0.000000 3606.925293 } + position={ 2145.780762 0.000000 3622.198242 } rotation={ -0.000000 0.205804 -0.000000 -0.978593 } scale={ 1.000000 1.000000 1.000000 } } { id=107 - position={ 2166.077637 0.000000 3626.085449 } + position={ 2177.794434 0.000000 3627.513672 } rotation={ -0.000000 -0.829084 -0.000000 0.559123 } scale={ 1.000000 1.000000 1.000000 } } @@ -655,61 +655,61 @@ } { id=109 - position={ 2211.077637 0.000000 3661.085449 } + position={ 2210.197510 0.000000 3664.541504 } rotation={ -0.000000 -0.680678 -0.000000 -0.732582 } scale={ 1.000000 1.000000 1.000000 } } { id=110 - position={ 2061.829346 0.000000 3685.552246 } + position={ 2061.001221 0.000000 3686.279541 } rotation={ -0.000000 -0.818855 -0.000000 0.574000 } scale={ 1.000000 1.000000 1.000000 } } { id=111 - position={ 2089.077637 0.000000 3603.085449 } + position={ 2093.183350 0.000000 3610.354492 } rotation={ -0.000000 -0.963468 -0.000000 0.267823 } scale={ 1.000000 1.000000 1.000000 } } { id=112 - position={ 2105.001953 0.000000 3662.841797 } + position={ 2127.649902 0.000000 3674.663574 } rotation={ -0.000000 0.005820 -0.000000 0.999983 } scale={ 1.000000 1.000000 1.000000 } } { id=113 - position={ 2062.446289 0.000000 3650.167969 } + position={ 2057.590820 0.000000 3662.978516 } rotation={ -0.000000 -0.870695 -0.000000 0.491824 } scale={ 1.000000 1.000000 1.000000 } } { id=114 - position={ 2047.077637 0.000000 3627.085449 } + position={ 2044.212524 0.000000 3636.263428 } rotation={ -0.000000 -0.870086 -0.000000 0.492900 } scale={ 1.000000 1.000000 1.000000 } } { id=115 - position={ 2063.077637 0.000000 3577.085449 } + position={ 2053.676025 0.000000 3577.197998 } rotation={ -0.000000 -0.765280 -0.000000 -0.643697 } scale={ 1.000000 1.000000 1.000000 } } { id=116 - position={ 2060.077637 0.000000 3595.085449 } + position={ 2056.021484 0.000000 3607.224854 } rotation={ -0.000000 -0.507287 -0.000000 -0.861777 } scale={ 1.000000 1.000000 1.000000 } } { id=117 - position={ 2090.722412 0.000000 3688.614258 } + position={ 2094.879883 0.000000 3699.807617 } rotation={ -0.000000 -0.988285 -0.000000 0.152616 } scale={ 1.000000 1.000000 1.000000 } } { id=118 - position={ 2064.755615 0.000000 3551.602051 } + position={ 2059.447510 0.000000 3564.492920 } rotation={ -0.000000 -0.643615 -0.000000 -0.765349 } scale={ 1.000000 1.000000 1.000000 } } @@ -727,7 +727,7 @@ } { id=121 - position={ 2110.077637 0.000000 3628.085449 } + position={ 2129.157471 0.000000 3639.681152 } rotation={ -0.000000 -0.934379 -0.000000 0.356281 } scale={ 1.000000 1.000000 1.000000 } } @@ -751,7 +751,7 @@ } { id=125 - position={ 2095.129395 0.000000 3533.604492 } + position={ 2095.823975 0.000000 3535.679688 } rotation={ -0.000000 -0.050290 -0.000000 0.998735 } scale={ 1.000000 1.000000 1.000000 } } @@ -775,19 +775,19 @@ } { id=129 - position={ 2167.077637 0.000000 3529.085449 } + position={ 2161.701416 0.000000 3525.366943 } rotation={ -0.000000 -0.971910 -0.000000 0.235351 } scale={ 1.000000 1.000000 1.000000 } } { id=130 - position={ 2205.991699 0.000000 3495.114258 } + position={ 2201.498779 0.000000 3509.255127 } rotation={ -0.000000 -0.645439 -0.000000 -0.763812 } scale={ 1.000000 1.000000 1.000000 } } { id=131 - position={ 2185.369141 0.000000 3522.667969 } + position={ 2197.614258 0.000000 3532.889648 } rotation={ -0.000000 -0.596545 -0.000000 -0.802580 } scale={ 1.000000 1.000000 1.000000 } } @@ -805,25 +805,25 @@ } { id=134 - position={ 2203.077637 0.000000 3637.085449 } + position={ 2195.708252 0.000000 3634.702881 } rotation={ -0.000000 -0.789373 -0.000000 -0.613914 } scale={ 1.000000 1.000000 1.000000 } } { id=135 - position={ 2236.111084 0.000000 3622.469238 } + position={ 2243.093506 0.000000 3614.967285 } rotation={ -0.000000 0.369139 -0.000000 0.929374 } scale={ 1.000000 1.000000 1.000000 } } { id=136 - position={ 2257.489990 0.000000 3610.522949 } + position={ 2253.739746 0.000000 3603.615234 } rotation={ -0.000000 -0.038312 -0.000000 0.999266 } scale={ 1.000000 1.000000 1.000000 } } { id=137 - position={ 2270.095947 0.000000 3593.625977 } + position={ 2260.267578 0.000000 3582.881836 } rotation={ -0.000000 -0.995559 -0.000000 0.094137 } scale={ 1.000000 1.000000 1.000000 } } @@ -847,7 +847,7 @@ } { id=141 - position={ 2260.580322 0.000000 3675.142578 } + position={ 2264.672363 0.000000 3670.034912 } rotation={ -0.000000 -0.992665 -0.000000 -0.120898 } scale={ 1.000000 1.000000 1.000000 } } @@ -859,13 +859,13 @@ } { id=143 - position={ 2262.454346 0.000000 3711.170410 } + position={ 2269.577393 0.000000 3693.926270 } rotation={ -0.000000 -0.273588 -0.000000 0.961847 } scale={ 1.000000 1.000000 1.000000 } } { id=144 - position={ 2233.789795 0.000000 3700.910156 } + position={ 2246.479980 0.000000 3695.776123 } rotation={ -0.000000 -0.979716 -0.000000 -0.200391 } scale={ 1.000000 1.000000 1.000000 } } @@ -877,67 +877,67 @@ } { id=146 - position={ 2216.776855 0.000000 3759.877441 } + position={ 2215.602539 0.000000 3753.079346 } rotation={ -0.000000 -0.316475 -0.000000 0.948601 } scale={ 1.000000 1.000000 1.000000 } } { id=147 - position={ 2210.660645 0.000000 3720.484375 } + position={ 2211.923828 0.000000 3709.827148 } rotation={ -0.000000 -0.328419 -0.000000 -0.944532 } scale={ 1.000000 1.000000 1.000000 } } { id=148 - position={ 2180.260010 0.000000 3713.247559 } + position={ 2179.290039 0.000000 3710.463623 } rotation={ -0.000000 -0.703460 -0.000000 0.710735 } scale={ 1.000000 1.000000 1.000000 } } { id=149 - position={ 2221.130127 0.000000 3520.682129 } + position={ 2225.376953 0.000000 3512.612061 } rotation={ -0.000000 -0.108943 -0.000000 -0.994048 } scale={ 1.000000 1.000000 1.000000 } } { id=150 - position={ 2238.077637 0.000000 3587.085449 } + position={ 2243.544189 0.000000 3590.971680 } rotation={ -0.000000 -0.763125 -0.000000 0.646251 } scale={ 1.000000 1.000000 1.000000 } } { id=151 - position={ 2236.218506 0.000000 3533.927734 } + position={ 2235.635742 0.000000 3541.118164 } rotation={ -0.000000 -0.716240 -0.000000 -0.697855 } scale={ 1.000000 1.000000 1.000000 } } { id=152 - position={ 2185.977539 0.000000 3578.429688 } + position={ 2188.166504 0.000000 3580.790527 } rotation={ -0.000000 -0.657972 -0.000000 0.753042 } scale={ 1.000000 1.000000 1.000000 } } { id=153 - position={ 2224.077637 0.000000 3485.085449 } + position={ 2221.107422 0.000000 3486.871338 } rotation={ -0.000000 -0.999502 -0.000000 -0.031570 } scale={ 1.000000 1.000000 1.000000 } } { id=154 - position={ 2249.167725 0.000000 3504.466797 } + position={ 2240.278809 0.000000 3503.348877 } rotation={ -0.000000 -0.051570 -0.000000 0.998669 } scale={ 1.000000 1.000000 1.000000 } } { id=155 - position={ 2265.467529 0.000000 3498.522461 } + position={ 2250.420654 0.000000 3484.528320 } rotation={ -0.000000 -0.826062 -0.000000 0.563579 } scale={ 1.000000 1.000000 1.000000 } } { id=156 - position={ 2152.386230 0.000000 3517.877197 } + position={ 2167.156250 0.000000 3515.089844 } rotation={ -0.000000 -0.503268 -0.000000 -0.864130 } scale={ 1.000000 1.000000 1.000000 } } @@ -949,19 +949,19 @@ } { id=158 - position={ 2185.906006 0.000000 3495.121094 } + position={ 2155.882080 0.000000 3487.469482 } rotation={ -0.000000 -0.997320 -0.000000 -0.073159 } scale={ 1.000000 1.000000 1.000000 } } { id=159 - position={ 2240.077637 0.000000 3448.085449 } + position={ 2231.573975 0.000000 3473.315186 } rotation={ -0.000000 -0.485752 -0.000000 0.874097 } scale={ 1.000000 1.000000 1.000000 } } { id=160 - position={ 2211.333740 0.000000 3458.311523 } + position={ 2202.346924 0.000000 3483.156982 } rotation={ -0.000000 -0.408968 -0.000000 0.912549 } scale={ 1.000000 1.000000 1.000000 } } @@ -973,7 +973,7 @@ } { id=162 - position={ 2165.177490 0.000000 3446.827637 } + position={ 2196.029297 0.000000 3473.194824 } rotation={ -0.000000 -0.961005 -0.000000 -0.276532 } scale={ 1.000000 1.000000 1.000000 } } @@ -3151,13 +3151,13 @@ } { id=529 - position={ 2007.077637 0.000000 3353.085449 } + position={ 2009.182617 0.000000 3339.831543 } rotation={ -0.000000 -0.999329 -0.000000 -0.036617 } scale={ 1.000000 1.000000 1.000000 } } { id=530 - position={ 2065.077637 0.000000 3269.085449 } + position={ 2079.428711 0.000000 3287.226562 } rotation={ -0.000000 -0.891858 -0.000000 -0.452316 } scale={ 1.000000 1.000000 1.000000 } } @@ -14455,25 +14455,25 @@ } { id=2832 - position={ 1926.077637 0.000000 3504.085449 } + position={ 1933.330566 0.000000 3488.841064 } rotation={ -0.000000 -0.031800 -0.000000 0.999494 } scale={ 1.000000 1.000000 1.000000 } } { id=2833 - position={ 1931.237427 0.000000 3481.319336 } - rotation={ -0.000000 -0.786850 -0.000000 -0.617145 } + position={ 1937.511353 0.000000 3478.775391 } + rotation={ -0.000000 -0.297624 -0.000000 -0.954684 } scale={ 1.000000 1.000000 1.000000 } } { id=2834 - position={ 1973.847046 0.000000 3443.050293 } + position={ 1969.989136 0.000000 3448.771973 } rotation={ -0.000000 -0.670728 -0.000000 -0.741704 } scale={ 1.000000 1.000000 1.000000 } } { id=2835 - position={ 1987.060791 0.000000 3457.198242 } + position={ 1985.616699 0.000000 3463.619873 } rotation={ -0.000000 -0.480909 -0.000000 0.876771 } scale={ 1.000000 1.000000 1.000000 } } @@ -16513,25 +16513,25 @@ } { id=3196 - position={ 1919.097168 0.000000 3399.993652 } + position={ 1939.905396 0.000000 3409.493408 } rotation={ -0.000000 -0.540238 -0.000000 0.841512 } scale={ 1.000000 1.000000 1.000000 } } { id=3197 - position={ 1966.472778 0.000000 3416.966309 } + position={ 1954.298218 0.000000 3404.659912 } rotation={ -0.000000 -0.996100 -0.000000 0.088231 } scale={ 1.000000 1.000000 1.000000 } } { id=3198 - position={ 1939.077637 0.000000 3385.085449 } + position={ 1944.420898 0.000000 3397.431396 } rotation={ -0.000000 -0.809737 -0.000000 -0.586793 } scale={ 1.000000 1.000000 1.000000 } } { id=3199 - position={ 1964.077637 0.000000 3385.085449 } + position={ 1952.390991 0.000000 3376.876709 } rotation={ -0.000000 -0.973779 -0.000000 -0.227494 } scale={ 1.000000 1.000000 1.000000 } } @@ -16573,13 +16573,13 @@ } { id=3206 - position={ 2102.702881 0.000000 3491.964355 } + position={ 2102.855713 0.000000 3483.313721 } rotation={ -0.000000 -0.606623 -0.000000 -0.794990 } scale={ 1.000000 1.000000 1.000000 } } { id=3207 - position={ 2084.053711 0.000000 3443.154785 } + position={ 2085.391113 0.000000 3431.839844 } rotation={ -0.000000 -0.606778 -0.000000 0.794871 } scale={ 1.000000 1.000000 1.000000 } } @@ -16591,7 +16591,7 @@ } { id=3209 - position={ 2109.077637 0.000000 3438.085449 } + position={ 2104.596436 0.000000 3416.930420 } rotation={ -0.000000 -0.059949 -0.000000 -0.998201 } scale={ 1.000000 1.000000 1.000000 } } @@ -16609,7 +16609,7 @@ } { id=3212 - position={ 2042.894287 0.000000 3415.187012 } + position={ 2040.484131 0.000000 3417.495361 } rotation={ -0.000000 -0.979865 -0.000000 0.199662 } scale={ 1.000000 1.000000 1.000000 } } @@ -26311,7 +26311,7 @@ } { id=4908 - position={ 1922.077637 0.000000 3315.085449 } + position={ 1938.289673 0.000000 3314.651855 } rotation={ -0.000000 -0.171594 -0.000000 -0.985168 } scale={ 1.000000 1.000000 1.000000 } } @@ -26371,43 +26371,43 @@ } { id=4918 - position={ 1932.023560 0.000000 3334.502441 } + position={ 1902.636841 0.000000 3304.212158 } rotation={ -0.000000 -0.992119 -0.000000 0.125302 } scale={ 1.000000 1.000000 1.000000 } } { id=4919 - position={ 1961.077637 0.000000 3329.085449 } + position={ 1973.759277 0.000000 3339.045898 } rotation={ -0.000000 -0.787319 -0.000000 0.616546 } scale={ 1.000000 1.000000 1.000000 } } { id=4920 - position={ 1939.194580 0.000000 3358.337402 } - rotation={ -0.000000 -0.781395 -0.000000 -0.624037 } + position={ 1942.626465 0.000000 3353.017822 } + rotation={ -0.000000 -0.999808 -0.000000 -0.019585 } scale={ 1.000000 1.000000 1.000000 } } { id=4921 - position={ 1915.812622 0.000000 3379.395508 } + position={ 1918.750488 0.000000 3380.667236 } rotation={ -0.000000 -0.993765 -0.000000 0.111496 } scale={ 1.000000 1.000000 1.000000 } } { id=4922 - position={ 1980.077637 0.000000 3356.085449 } + position={ 1991.406250 0.000000 3348.414307 } rotation={ -0.000000 -0.042864 -0.000000 0.999081 } scale={ 1.000000 1.000000 1.000000 } } { id=4923 - position={ 1974.077637 0.000000 3372.085449 } + position={ 1961.159912 0.000000 3423.526367 } rotation={ -0.000000 -0.935402 -0.000000 -0.353587 } scale={ 1.000000 1.000000 1.000000 } } { id=4924 - position={ 1969.077637 0.000000 3284.085449 } + position={ 1965.618774 0.000000 3293.662109 } rotation={ -0.000000 -0.948895 -0.000000 0.315591 } scale={ 1.000000 1.000000 1.000000 } } @@ -26479,25 +26479,25 @@ } { id=4936 - position={ 2057.077637 0.000000 3292.085449 } + position={ 2063.444824 0.000000 3312.044678 } rotation={ -0.000000 -0.972378 -0.000000 0.233412 } scale={ 1.000000 1.000000 1.000000 } } { id=4937 - position={ 2115.077637 0.000000 3321.085449 } + position={ 2103.675537 0.000000 3310.318604 } rotation={ -0.000000 -0.954539 -0.000000 -0.298087 } scale={ 1.000000 1.000000 1.000000 } } { id=4938 - position={ 2079.532471 0.000000 3315.737793 } + position={ 2077.413818 0.000000 3329.596191 } rotation={ -0.000000 -0.761457 -0.000000 0.648215 } scale={ 1.000000 1.000000 1.000000 } } { id=4939 - position={ 2114.924805 0.000000 3294.869629 } + position={ 2090.201416 0.000000 3292.488770 } rotation={ -0.000000 -0.239417 -0.000000 -0.970917 } scale={ 1.000000 1.000000 1.000000 } } @@ -26515,7 +26515,7 @@ } { id=4942 - position={ 2039.077637 0.000000 3294.085449 } + position={ 2030.903320 0.000000 3306.114014 } rotation={ -0.000000 -0.720496 -0.000000 0.693460 } scale={ 1.000000 1.000000 1.000000 } } @@ -26533,7 +26533,7 @@ } { id=4945 - position={ 2100.158691 0.000000 3396.020508 } + position={ 2106.717529 0.000000 3399.457275 } rotation={ -0.000000 -0.926991 -0.000000 -0.375084 } scale={ 1.000000 1.000000 1.000000 } } @@ -26569,7 +26569,7 @@ } { id=4951 - position={ 2126.795654 0.000000 3269.200195 } + position={ 2112.258789 0.000000 3263.765625 } rotation={ -0.000000 -0.871584 -0.000000 0.490247 } scale={ 1.000000 1.000000 1.000000 } } @@ -26581,7 +26581,7 @@ } { id=4953 - position={ 2095.077637 0.000000 3244.085449 } + position={ 2080.436523 0.000000 3246.660889 } rotation={ -0.000000 -0.624226 -0.000000 -0.781244 } scale={ 1.000000 1.000000 1.000000 } } @@ -26593,19 +26593,19 @@ } { id=4955 - position={ 2091.077637 0.000000 3226.085449 } + position={ 2118.211670 0.000000 3244.349365 } rotation={ -0.000000 -0.896730 -0.000000 0.442578 } scale={ 1.000000 1.000000 1.000000 } } { id=4956 - position={ 2059.955566 0.000000 3234.716309 } + position={ 2088.310059 0.000000 3272.061523 } rotation={ -0.000000 -0.738325 -0.000000 -0.674446 } scale={ 1.000000 1.000000 1.000000 } } { id=4957 - position={ 2157.077637 0.000000 3214.085449 } + position={ 2123.552246 0.000000 3228.497803 } rotation={ -0.000000 -0.480706 -0.000000 -0.876882 } scale={ 1.000000 1.000000 1.000000 } } @@ -26623,7 +26623,7 @@ } { id=4960 - position={ 2139.077637 0.000000 3230.085449 } + position={ 2133.626709 0.000000 3251.218750 } rotation={ -0.000000 -0.928662 -0.000000 0.370926 } scale={ 1.000000 1.000000 1.000000 } } @@ -27205,7 +27205,7 @@ } { id=5057 - position={ 2136.011719 0.000000 3321.800781 } + position={ 2126.662842 0.000000 3335.873535 } rotation={ -0.000000 -0.997305 -0.000000 -0.073360 } scale={ 1.000000 1.000000 1.000000 } } @@ -47575,8 +47575,8 @@ } { id=8815 - position={ 2142.000000 0.000000 3306.000000 } - rotation={ -0.000000 -0.695041 -0.000000 -0.718970 } + position={ 2148.596924 0.000000 3315.634521 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -69961,7 +69961,7 @@ } { id=13615 - position={ 2063.800781 0.000000 3487.210938 } + position={ 2062.261475 0.000000 3485.961426 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -69973,7 +69973,133 @@ } { id=13617 - position={ 2071.702881 0.000000 3487.880615 } + position={ 2080.592285 0.000000 3494.835449 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13618 + position={ 2236.838379 0.000000 3777.477783 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13619 + position={ 2238.615234 0.000000 3805.238770 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13620 + position={ 2214.612061 0.000000 3784.437012 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13621 + position={ 2185.083008 0.000000 3767.094482 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13622 + position={ 2161.082520 0.000000 3810.251953 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13623 + position={ 2181.402588 0.000000 3816.642578 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13624 + position={ 2083.088135 0.000000 3792.243896 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13625 + position={ 2147.897461 0.000000 3748.285889 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13626 + position={ 2218.023438 0.000000 3728.074463 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13627 + position={ 2084.510254 0.000000 3658.867188 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13628 + position={ 2092.918213 0.000000 3629.110352 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13629 + position={ 2161.714111 0.000000 3597.488525 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13630 + position={ 2134.349609 0.000000 3600.990723 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13631 + position={ 2108.298828 0.000000 3665.081787 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13632 + position={ 2097.827148 0.000000 3503.711426 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13633 + position={ 2170.041992 0.000000 3474.593262 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13634 + position={ 2194.277832 0.000000 3497.274170 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13635 + position={ 2227.153809 0.000000 3571.119385 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13636 + position={ 2270.424316 0.000000 3546.934326 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13637 + position={ 2249.705811 0.000000 3529.461914 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13638 + position={ 2267.011719 0.000000 3568.583740 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } 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 c66cc757..8e24a3bd 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -535,13 +535,13 @@ } { id=88 - position={ 2067.437744 0.000000 3751.465332 } - rotation={ -0.000000 -0.573387 -0.000000 0.819284 } + position={ 2076.501709 0.000000 3746.306152 } + rotation={ -0.000000 -0.881324 -0.000000 -0.472512 } scale={ 1.000000 1.000000 1.000000 } } { id=89 - position={ 2095.000000 0.000000 3759.000000 } + position={ 2096.741455 0.000000 3760.480957 } rotation={ -0.000000 -0.894147 -0.000000 0.447774 } scale={ 1.000000 1.000000 1.000000 } } @@ -553,8 +553,8 @@ } { id=91 - position={ 2101.000000 0.000000 3786.000000 } - rotation={ -0.000000 -0.243890 -0.000000 0.969803 } + position={ 2097.102051 0.000000 3782.767090 } + rotation={ -0.000000 0.261033 -0.000000 0.965330 } scale={ 1.000000 1.000000 1.000000 } } { @@ -566,49 +566,49 @@ { id=93 position={ 2145.344727 0.000000 3768.153809 } - rotation={ -0.000000 -0.318186 -0.000000 0.948028 } + rotation={ -0.000000 -0.922470 -0.000000 0.386067 } scale={ 1.000000 1.000000 1.000000 } } { id=94 - position={ 2174.000000 0.000000 3806.000000 } + position={ 2152.594482 0.000000 3802.806396 } rotation={ -0.000000 -0.555784 -0.000000 0.831327 } scale={ 1.000000 1.000000 1.000000 } } { id=95 - position={ 2171.377930 0.000000 3785.988281 } - rotation={ -0.000000 -0.416035 -0.000000 0.909348 } + position={ 2168.166260 0.000000 3781.211914 } + rotation={ -0.000000 -0.803456 -0.000000 0.595363 } scale={ 1.000000 1.000000 1.000000 } } { id=96 - position={ 2201.000000 0.000000 3786.000000 } + position={ 2194.150146 0.000000 3780.622070 } rotation={ -0.000000 -0.588478 -0.000000 0.808513 } scale={ 1.000000 1.000000 1.000000 } } { id=97 - position={ 2218.972900 0.000000 3802.912598 } + position={ 2205.688721 0.000000 3805.335205 } rotation={ -0.000000 -0.629284 -0.000000 0.777175 } scale={ 1.000000 1.000000 1.000000 } } { id=98 - position={ 2258.493896 0.000000 3794.857178 } + position={ 2259.959717 0.000000 3792.404053 } rotation={ -0.000000 -0.770790 -0.000000 0.637090 } scale={ 1.000000 1.000000 1.000000 } } { id=99 - position={ 2180.066162 0.000000 3759.509521 } - rotation={ -0.000000 -0.360232 -0.000000 0.932863 } + position={ 2182.604248 0.000000 3732.980713 } + rotation={ -0.000000 -0.729140 -0.000000 0.684365 } scale={ 1.000000 1.000000 1.000000 } } { id=100 - position={ 2199.643066 0.000000 3756.829590 } - rotation={ -0.000000 -0.363048 -0.000000 0.931770 } + position={ 2196.612549 0.000000 3739.613525 } + rotation={ -0.000000 -0.775089 -0.000000 0.631851 } scale={ 1.000000 1.000000 1.000000 } } { @@ -619,38 +619,38 @@ } { id=102 - position={ 2205.317139 0.000000 3696.925049 } - rotation={ -0.000000 -0.997159 -0.000000 0.075332 } + position={ 2207.327393 0.000000 3689.222656 } + rotation={ -0.000000 -0.782653 -0.000000 -0.622459 } scale={ 1.000000 1.000000 1.000000 } } { id=103 - position={ 2223.236572 0.000000 3638.246094 } + position={ 2224.656738 0.000000 3635.509521 } rotation={ -0.000000 -0.138953 -0.000000 0.990299 } scale={ 1.000000 1.000000 1.000000 } } { id=104 - position={ 2163.513672 0.000000 3641.940430 } - rotation={ -0.000000 -0.524711 -0.000000 0.851280 } + position={ 2161.778320 0.000000 3642.589111 } + rotation={ -0.000000 -0.419865 -0.000000 0.907586 } scale={ 1.000000 1.000000 1.000000 } } { id=105 - position={ 2176.805420 0.000000 3610.417480 } + position={ 2181.598877 0.000000 3609.480225 } rotation={ -0.000000 -0.960401 -0.000000 0.278622 } scale={ 1.000000 1.000000 1.000000 } } { id=106 - position={ 2133.786133 0.000000 3620.963623 } - rotation={ -0.000000 -0.980126 -0.000000 0.198375 } + position={ 2136.312256 0.000000 3622.485107 } + rotation={ -0.000000 -0.944044 -0.000000 0.329820 } scale={ 1.000000 1.000000 1.000000 } } { id=107 - position={ 2180.067871 0.000000 3624.544189 } - rotation={ -0.000000 -0.913233 -0.000000 0.407438 } + position={ 2178.812256 0.000000 3624.169189 } + rotation={ -0.000000 -0.996030 -0.000000 0.089023 } scale={ 1.000000 1.000000 1.000000 } } { @@ -661,49 +661,49 @@ } { id=109 - position={ 2213.448730 0.000000 3670.564209 } + position={ 2210.776123 0.000000 3664.061523 } rotation={ -0.000000 0.231879 -0.000000 0.972745 } scale={ 1.000000 1.000000 1.000000 } } { id=110 - position={ 2078.644531 0.000000 3675.123779 } + position={ 2068.962646 0.000000 3680.586914 } rotation={ -0.000000 -0.831228 -0.000000 0.555932 } scale={ 1.000000 1.000000 1.000000 } } { id=111 - position={ 2081.356445 0.000000 3612.668945 } + position={ 2083.882568 0.000000 3614.359863 } rotation={ -0.000000 -0.937315 -0.000000 0.348482 } scale={ 1.000000 1.000000 1.000000 } } { id=112 - position={ 2123.693848 0.000000 3660.662354 } - rotation={ -0.000000 -0.946616 -0.000000 0.322363 } + position={ 2133.565186 0.000000 3660.158447 } + rotation={ -0.000000 -0.437738 -0.000000 0.899102 } scale={ 1.000000 1.000000 1.000000 } } { id=113 - position={ 2080.633545 0.000000 3654.034424 } + position={ 2070.760986 0.000000 3650.318359 } rotation={ -0.000000 -0.999898 -0.000000 0.014306 } scale={ 1.000000 1.000000 1.000000 } } { id=114 - position={ 2056.000000 0.000000 3642.000000 } + position={ 2057.820312 0.000000 3636.670166 } rotation={ -0.000000 -0.996002 -0.000000 0.089332 } scale={ 1.000000 1.000000 1.000000 } } { id=115 - position={ 2079.000000 0.000000 3577.000000 } - rotation={ -0.000000 -0.365557 -0.000000 0.930789 } + position={ 2076.376953 0.000000 3580.554688 } + rotation={ -0.000000 0.129645 -0.000000 0.991561 } scale={ 1.000000 1.000000 1.000000 } } { id=116 - position={ 2063.515625 0.000000 3612.523193 } + position={ 2060.372559 0.000000 3599.561279 } rotation={ -0.000000 -0.952177 -0.000000 0.305547 } scale={ 1.000000 1.000000 1.000000 } } @@ -733,7 +733,7 @@ } { id=121 - position={ 2126.000000 0.000000 3638.000000 } + position={ 2112.820801 0.000000 3629.528076 } rotation={ -0.000000 -0.663831 -0.000000 0.747882 } scale={ 1.000000 1.000000 1.000000 } } @@ -757,8 +757,8 @@ } { id=125 - position={ 2080.361572 0.000000 3537.592773 } - rotation={ -0.000000 -0.867939 -0.000000 0.496672 } + position={ 2092.237061 0.000000 3530.778076 } + rotation={ -0.000000 -0.124322 -0.000000 0.992242 } scale={ 1.000000 1.000000 1.000000 } } { @@ -775,25 +775,25 @@ } { id=128 - position={ 2117.407959 0.000000 3595.343994 } + position={ 2109.469238 0.000000 3587.885254 } rotation={ -0.000000 -0.982825 -0.000000 0.184541 } scale={ 1.000000 1.000000 1.000000 } } { id=129 - position={ 2155.000000 0.000000 3529.000000 } + position={ 2165.478027 0.000000 3528.064209 } rotation={ -0.000000 -0.626150 -0.000000 0.779702 } scale={ 1.000000 1.000000 1.000000 } } { id=130 - position={ 2203.683350 0.000000 3511.922607 } - rotation={ -0.000000 -0.961340 -0.000000 0.275365 } + position={ 2208.526855 0.000000 3504.392334 } + rotation={ -0.000000 0.674256 -0.000000 -0.738498 } scale={ 1.000000 1.000000 1.000000 } } { id=131 - position={ 2196.135254 0.000000 3537.486084 } + position={ 2184.932617 0.000000 3528.728271 } rotation={ -0.000000 -0.927900 -0.000000 0.372830 } scale={ 1.000000 1.000000 1.000000 } } @@ -805,32 +805,32 @@ } { id=133 - position={ 2196.000000 0.000000 3616.000000 } + position={ 2204.338379 0.000000 3613.514648 } rotation={ -0.000000 -0.959787 -0.000000 0.280728 } scale={ 1.000000 1.000000 1.000000 } } { id=134 - position={ 2214.000000 0.000000 3650.000000 } - rotation={ -0.000000 -0.689249 -0.000000 0.724524 } + position={ 2205.233643 0.000000 3636.670166 } + rotation={ -0.000000 0.534966 -0.000000 0.844873 } scale={ 1.000000 1.000000 1.000000 } } { id=135 - position={ 2241.446289 0.000000 3632.314697 } + position={ 2244.540283 0.000000 3624.045654 } rotation={ -0.000000 0.119435 -0.000000 0.992842 } scale={ 1.000000 1.000000 1.000000 } } { id=136 - position={ 2258.132324 0.000000 3621.689941 } - rotation={ -0.000000 -0.972881 -0.000000 0.231306 } + position={ 2256.916748 0.000000 3613.288818 } + rotation={ -0.000000 -0.224170 -0.000000 -0.974550 } scale={ 1.000000 1.000000 1.000000 } } { id=137 - position={ 2275.678223 0.000000 3587.416748 } - rotation={ -0.000000 -0.922634 -0.000000 0.385677 } + position={ 2265.658447 0.000000 3589.797607 } + rotation={ -0.000000 -0.999996 -0.000000 -0.002923 } scale={ 1.000000 1.000000 1.000000 } } { @@ -841,8 +841,8 @@ } { id=139 - position={ 2225.000000 0.000000 3653.000000 } - rotation={ -0.000000 -0.724438 -0.000000 0.689340 } + position={ 2245.454834 0.000000 3648.401123 } + rotation={ -0.000000 -0.764630 -0.000000 -0.644470 } scale={ 1.000000 1.000000 1.000000 } } { @@ -853,7 +853,7 @@ } { id=141 - position={ 2256.000000 0.000000 3687.000000 } + position={ 2253.934814 0.000000 3685.075928 } rotation={ -0.000000 -0.976619 -0.000000 0.214977 } scale={ 1.000000 1.000000 1.000000 } } @@ -865,13 +865,13 @@ } { id=143 - position={ 2269.325439 0.000000 3702.915771 } - rotation={ -0.000000 -0.935315 -0.000000 0.353817 } + position={ 2274.489502 0.000000 3704.469238 } + rotation={ -0.000000 0.559464 -0.000000 -0.828855 } scale={ 1.000000 1.000000 1.000000 } } { id=144 - position={ 2237.197754 0.000000 3715.135498 } + position={ 2238.710938 0.000000 3708.178955 } rotation={ -0.000000 -0.101570 -0.000000 0.994828 } scale={ 1.000000 1.000000 1.000000 } } @@ -883,37 +883,37 @@ } { id=146 - position={ 2214.338623 0.000000 3776.051270 } - rotation={ -0.000000 -0.928224 -0.000000 0.372022 } + position={ 2220.190186 0.000000 3757.400146 } + rotation={ -0.000000 -0.923981 -0.000000 -0.382439 } scale={ 1.000000 1.000000 1.000000 } } { id=147 - position={ 2220.000000 0.000000 3730.000000 } + position={ 2220.740234 0.000000 3704.101318 } rotation={ -0.000000 -0.550258 -0.000000 0.834995 } scale={ 1.000000 1.000000 1.000000 } } { id=148 - position={ 2190.125000 0.000000 3721.929443 } - rotation={ -0.000000 -0.417879 -0.000000 0.908503 } + position={ 2185.041504 0.000000 3708.755859 } + rotation={ -0.000000 -0.669706 -0.000000 0.742626 } scale={ 1.000000 1.000000 1.000000 } } { id=149 - position={ 2215.046875 0.000000 3535.101074 } + position={ 2219.948975 0.000000 3527.953613 } rotation={ -0.000000 -0.939320 -0.000000 0.343042 } scale={ 1.000000 1.000000 1.000000 } } { id=150 - position={ 2225.000000 0.000000 3595.000000 } + position={ 2236.788818 0.000000 3589.136475 } rotation={ -0.000000 -0.749129 -0.000000 0.662424 } scale={ 1.000000 1.000000 1.000000 } } { id=151 - position={ 2234.501953 0.000000 3554.403809 } + position={ 2244.519287 0.000000 3554.756348 } rotation={ -0.000000 -0.972152 -0.000000 0.234351 } scale={ 1.000000 1.000000 1.000000 } } @@ -931,19 +931,19 @@ } { id=154 - position={ 2245.147949 0.000000 3512.593262 } - rotation={ -0.000000 -0.929358 -0.000000 0.369180 } + position={ 2251.788574 0.000000 3510.341064 } + rotation={ -0.000000 -0.984476 -0.000000 0.175522 } scale={ 1.000000 1.000000 1.000000 } } { id=155 - position={ 2244.932861 0.000000 3477.766357 } - rotation={ -0.000000 -0.555680 -0.000000 0.831397 } + position={ 2249.430908 0.000000 3478.813965 } + rotation={ -0.000000 -0.052748 -0.000000 0.998608 } scale={ 1.000000 1.000000 1.000000 } } { id=156 - position={ 2149.294189 0.000000 3511.013916 } + position={ 2154.315186 0.000000 3511.299072 } rotation={ -0.000000 -0.908392 -0.000000 0.418119 } scale={ 1.000000 1.000000 1.000000 } } @@ -961,13 +961,13 @@ } { id=159 - position={ 2232.785889 0.000000 3461.964844 } + position={ 2238.188721 0.000000 3464.651855 } rotation={ -0.000000 -0.991947 -0.000000 0.126654 } scale={ 1.000000 1.000000 1.000000 } } { id=160 - position={ 2207.819824 0.000000 3477.365967 } + position={ 2210.277832 0.000000 3469.565430 } rotation={ -0.000000 -0.941360 -0.000000 0.337405 } scale={ 1.000000 1.000000 1.000000 } } @@ -979,8 +979,8 @@ } { id=162 - position={ 2168.169678 0.000000 3459.453613 } - rotation={ -0.000000 -0.829260 -0.000000 0.558863 } + position={ 2185.270752 0.000000 3462.619629 } + rotation={ -0.000000 -0.879331 -0.000000 -0.476212 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3169,14 +3169,14 @@ } { id=529 - position={ 2022.895996 0.000000 3349.268311 } - rotation={ -0.000000 -0.953368 -0.000000 0.301809 } + position={ 2014.478149 0.000000 3344.798828 } + rotation={ -0.000000 -0.955212 -0.000000 -0.295922 } scale={ 1.000000 1.000000 1.000000 } } { id=530 - position={ 2073.000000 0.000000 3284.000000 } - rotation={ -0.000000 -0.937294 -0.000000 0.348539 } + position={ 2073.241699 0.000000 3274.184082 } + rotation={ -0.000000 -0.984910 -0.000000 0.173068 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16129,8 +16129,8 @@ } { id=2830 - position={ 1952.000000 0.000000 3467.000000 } - rotation={ -0.000000 -0.696006 -0.000000 0.718036 } + position={ 1948.474976 0.000000 3469.781494 } + rotation={ -0.000000 -0.320302 -0.000000 0.947315 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16147,20 +16147,20 @@ } { id=2833 - position={ 1927.546021 0.000000 3491.647949 } - rotation={ -0.000000 0.161310 -0.000000 0.986904 } + position={ 1928.049316 0.000000 3474.256836 } + rotation={ -0.000000 0.995931 -0.000000 -0.090123 } scale={ 1.000000 1.000000 1.000000 } } { id=2834 - position={ 1972.340454 0.000000 3451.635010 } + position={ 1976.171509 0.000000 3448.943848 } rotation={ -0.000000 0.258623 -0.000000 0.965978 } scale={ 1.000000 1.000000 1.000000 } } { id=2835 - position={ 1981.411743 0.000000 3461.213867 } - rotation={ -0.000000 -0.839429 -0.000000 0.543469 } + position={ 1997.882446 0.000000 3458.482666 } + rotation={ -0.000000 -0.988421 -0.000000 0.151735 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18187,8 +18187,8 @@ } { id=3194 - position={ 1925.000000 0.000000 3456.000000 } - rotation={ -0.000000 -0.999954 -0.000000 -0.009643 } + position={ 1946.650024 0.000000 3432.043945 } + rotation={ -0.000000 -0.812274 -0.000000 0.583277 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18199,25 +18199,25 @@ } { id=3196 - position={ 1939.679077 0.000000 3410.392578 } - rotation={ -0.000000 0.070931 -0.000000 0.997482 } + position={ 1930.135132 0.000000 3405.277588 } + rotation={ -0.000000 -0.973038 -0.000000 0.230649 } scale={ 1.000000 1.000000 1.000000 } } { id=3197 - position={ 1972.112793 0.000000 3432.959229 } + position={ 1966.014893 0.000000 3410.170654 } rotation={ -0.000000 -0.997022 -0.000000 0.077121 } scale={ 1.000000 1.000000 1.000000 } } { id=3198 - position={ 1955.000000 0.000000 3396.000000 } - rotation={ -0.000000 -0.751238 -0.000000 0.660031 } + position={ 1950.722412 0.000000 3394.956299 } + rotation={ -0.000000 -0.279541 -0.000000 0.960133 } scale={ 1.000000 1.000000 1.000000 } } { id=3199 - position={ 1970.393799 0.000000 3394.928223 } + position={ 1942.619141 0.000000 3380.471191 } rotation={ -0.000000 -0.991110 -0.000000 -0.133048 } scale={ 1.000000 1.000000 1.000000 } } @@ -18259,13 +18259,13 @@ } { id=3206 - position={ 2085.345215 0.000000 3505.178223 } + position={ 2076.903809 0.000000 3481.594238 } rotation={ -0.000000 -0.952715 -0.000000 0.303866 } scale={ 1.000000 1.000000 1.000000 } } { id=3207 - position={ 2075.703857 0.000000 3444.308838 } + position={ 2071.322021 0.000000 3429.645508 } rotation={ -0.000000 -0.829528 -0.000000 0.558464 } scale={ 1.000000 1.000000 1.000000 } } @@ -18277,7 +18277,7 @@ } { id=3209 - position={ 2101.813232 0.000000 3457.267334 } + position={ 2114.873291 0.000000 3417.831787 } rotation={ -0.000000 -0.886472 -0.000000 0.462783 } scale={ 1.000000 1.000000 1.000000 } } @@ -18295,7 +18295,7 @@ } { id=3212 - position={ 2042.469238 0.000000 3429.656738 } + position={ 2044.829712 0.000000 3435.612793 } rotation={ -0.000000 -0.959455 -0.000000 0.281860 } scale={ 1.000000 1.000000 1.000000 } } @@ -28255,43 +28255,43 @@ } { id=4918 - position={ 1933.131836 0.000000 3344.275391 } + position={ 1910.339111 0.000000 3318.025879 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=4919 - position={ 1978.000000 0.000000 3329.000000 } + position={ 1978.794922 0.000000 3331.203125 } rotation={ -0.000000 -0.734800 -0.000000 0.678284 } scale={ 1.000000 1.000000 1.000000 } } { id=4920 - position={ 1953.761353 0.000000 3355.123535 } - rotation={ -0.000000 -0.439869 -0.000000 0.898062 } + position={ 1947.409302 0.000000 3352.549805 } + rotation={ -0.000000 -0.877076 -0.000000 0.480351 } scale={ 1.000000 1.000000 1.000000 } } { id=4921 - position={ 1923.668091 0.000000 3366.968750 } - rotation={ -0.000000 0.305274 -0.000000 0.952264 } + position={ 1915.737915 0.000000 3387.269043 } + rotation={ -0.000000 0.997954 -0.000000 0.063932 } scale={ 1.000000 1.000000 1.000000 } } { id=4922 - position={ 1993.000000 0.000000 3366.000000 } - rotation={ -0.000000 -0.996869 -0.000000 0.079067 } + position={ 1982.240356 0.000000 3355.936523 } + rotation={ -0.000000 0.912188 -0.000000 -0.409772 } scale={ 1.000000 1.000000 1.000000 } } { id=4923 - position={ 1991.000000 0.000000 3375.000000 } + position={ 1969.583496 0.000000 3425.845947 } rotation={ -0.000000 -0.982605 -0.000000 0.185708 } scale={ 1.000000 1.000000 1.000000 } } { id=4924 - position={ 1990.522217 0.000000 3272.301758 } + position={ 1989.940552 0.000000 3291.557861 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -28363,25 +28363,25 @@ } { id=4936 - position={ 2058.000000 0.000000 3310.000000 } + position={ 2053.817139 0.000000 3314.474121 } rotation={ -0.000000 -0.953306 -0.000000 0.302006 } scale={ 1.000000 1.000000 1.000000 } } { id=4937 - position={ 2111.581787 0.000000 3325.654541 } + position={ 2104.302246 0.000000 3306.559326 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=4938 - position={ 2068.706543 0.000000 3321.798828 } + position={ 2073.361084 0.000000 3319.721680 } rotation={ -0.000000 -0.461015 -0.000000 0.887392 } scale={ 1.000000 1.000000 1.000000 } } { id=4939 - position={ 2096.093018 0.000000 3301.307617 } + position={ 2106.289795 0.000000 3281.283936 } rotation={ -0.000000 -0.957385 -0.000000 0.288814 } scale={ 1.000000 1.000000 1.000000 } } @@ -28399,7 +28399,7 @@ } { id=4942 - position={ 2036.000000 0.000000 3309.000000 } + position={ 2046.067383 0.000000 3296.603516 } rotation={ -0.000000 -0.972961 -0.000000 0.230968 } scale={ 1.000000 1.000000 1.000000 } } @@ -28417,7 +28417,7 @@ } { id=4945 - position={ 2089.283691 0.000000 3393.975098 } + position={ 2128.525146 0.000000 3392.453857 } rotation={ -0.000000 -0.831851 -0.000000 0.555000 } scale={ 1.000000 1.000000 1.000000 } } @@ -28453,19 +28453,19 @@ } { id=4951 - position={ 2114.109131 0.000000 3273.219238 } + position={ 2130.546631 0.000000 3265.175293 } rotation={ -0.000000 -0.922878 -0.000000 0.385092 } scale={ 1.000000 1.000000 1.000000 } } { id=4952 - position={ 2144.659912 0.000000 3303.868164 } + position={ 2135.347168 0.000000 3281.622070 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=4953 - position={ 2113.000000 0.000000 3244.000000 } + position={ 2071.778076 0.000000 3242.929443 } rotation={ -0.000000 -0.792290 -0.000000 0.610144 } scale={ 1.000000 1.000000 1.000000 } } @@ -28477,25 +28477,25 @@ } { id=4955 - position={ 2077.000000 0.000000 3235.000000 } + position={ 2106.541992 0.000000 3235.184570 } rotation={ -0.000000 -0.917661 -0.000000 0.397363 } scale={ 1.000000 1.000000 1.000000 } } { id=4956 - position={ 2047.331299 0.000000 3239.891846 } - rotation={ -0.000000 -0.862916 -0.000000 0.505347 } + position={ 2088.347168 0.000000 3259.982666 } + rotation={ -0.000000 -0.999688 -0.000000 -0.024962 } scale={ 1.000000 1.000000 1.000000 } } { id=4957 - position={ 2161.000000 0.000000 3231.000000 } + position={ 2142.104980 0.000000 3233.019531 } rotation={ -0.000000 -0.984684 -0.000000 0.174346 } scale={ 1.000000 1.000000 1.000000 } } { id=4958 - position={ 2163.602295 0.000000 3269.373047 } + position={ 2170.291260 0.000000 3250.490723 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -29089,7 +29089,7 @@ } { id=5057 - position={ 2147.453125 0.000000 3315.548584 } + position={ 2132.153564 0.000000 3323.341309 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -50557,7 +50557,7 @@ } { id=8815 - position={ 7234.000000 0.000000 2216.000000 } + position={ 2136.912354 0.000000 3305.786621 } rotation={ 0.000000 -0.968028 0.000000 0.250841 } scale={ 1.000000 1.000000 1.000000 } } @@ -78361,9 +78361,135 @@ } { id=13617 - position={ 2085.225098 0.000000 3481.108398 } + position={ 2093.928467 0.000000 3497.386963 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13618 + position={ 2243.778076 0.000000 3785.860840 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13619 + position={ 2238.194824 0.000000 3804.696777 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13620 + position={ 2217.381592 0.000000 3780.989746 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13621 + position={ 2181.615479 0.000000 3764.443359 } + rotation={ -0.000000 -0.793813 -0.000000 0.608162 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13622 + position={ 2168.721191 0.000000 3798.278320 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13623 + position={ 2181.902344 0.000000 3809.456787 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13624 + position={ 2076.850342 0.000000 3788.535156 } + rotation={ -0.000000 -0.999946 -0.000000 -0.010350 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13625 + position={ 2156.528564 0.000000 3754.575439 } + rotation={ -0.000000 -0.164712 -0.000000 0.986342 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13626 + position={ 2214.611084 0.000000 3727.160400 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13627 + position={ 2092.216309 0.000000 3671.756592 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13628 + position={ 2088.329590 0.000000 3639.294189 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13629 + position={ 2172.476562 0.000000 3596.383545 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13630 + position={ 2132.834961 0.000000 3604.641846 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13631 + position={ 2115.446777 0.000000 3651.018555 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13632 + position={ 2097.827148 0.000000 3503.711426 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13633 + position={ 2171.850586 0.000000 3485.573975 } + rotation={ -0.000000 -0.755639 -0.000000 0.654989 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13634 + position={ 2183.484619 0.000000 3503.234131 } + rotation={ -0.000000 -0.999972 -0.000000 -0.007537 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13635 + position={ 2211.248779 0.000000 3556.532227 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13636 + position={ 2268.346680 0.000000 3554.301270 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13637 + position={ 2251.069336 0.000000 3530.903564 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13638 + position={ 2250.677002 0.000000 3570.598145 } + rotation={ -0.000000 -0.140102 -0.000000 0.990137 } + 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 0e33b03b..4086e6d1 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -535,14 +535,14 @@ } { id=88 - position={ 2082.000000 0.000000 3748.000000 } + position={ 2095.194580 0.000000 3744.550537 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=89 - position={ 2107.511963 0.000000 3759.640869 } - rotation={ -0.000000 0.656052 -0.000000 0.754715 } + position={ 2114.778320 0.000000 3757.482910 } + rotation={ -0.000000 0.142669 -0.000000 0.989770 } scale={ 1.000000 1.000000 1.000000 } } { @@ -553,37 +553,37 @@ } { id=91 - position={ 2091.000000 0.000000 3786.000000 } + position={ 2109.713623 0.000000 3781.822754 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=92 - position={ 2132.000000 0.000000 3788.000000 } + position={ 2135.718018 0.000000 3789.054199 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=93 - position={ 2156.000000 0.000000 3762.000000 } + position={ 2136.335938 0.000000 3767.381104 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=94 - position={ 2165.000000 0.000000 3810.000000 } + position={ 2138.579590 0.000000 3804.376221 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=95 - position={ 2164.498291 0.000000 3784.609375 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2161.356201 0.000000 3787.084229 } + rotation={ -0.000000 0.022402 -0.000000 0.999749 } scale={ 1.000000 1.000000 1.000000 } } { id=96 - position={ 2193.382324 0.000000 3786.476562 } + position={ 2189.636963 0.000000 3774.727783 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -595,62 +595,62 @@ } { id=98 - position={ 2251.119629 0.000000 3798.692383 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2252.871582 0.000000 3797.760010 } + rotation={ -0.000000 0.115256 -0.000000 0.993336 } scale={ 1.000000 1.000000 1.000000 } } { id=99 - position={ 2181.183594 0.000000 3751.051270 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2171.541504 0.000000 3753.031738 } + rotation={ -0.000000 0.197788 -0.000000 0.980245 } scale={ 1.000000 1.000000 1.000000 } } { id=100 - position={ 2202.000000 0.000000 3744.000000 } + position={ 2201.486084 0.000000 3734.397949 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=101 - position={ 2193.049805 0.000000 3683.269775 } + position={ 2194.153320 0.000000 3686.900146 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=102 - position={ 2215.000000 0.000000 3691.000000 } + position={ 2205.877686 0.000000 3675.231201 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=103 - position={ 2221.786133 0.000000 3632.261230 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2215.878906 0.000000 3628.368896 } + rotation={ -0.000000 0.206634 -0.000000 0.978418 } scale={ 1.000000 1.000000 1.000000 } } { id=104 - position={ 2154.056152 0.000000 3643.298584 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2145.419434 0.000000 3646.129639 } + rotation={ -0.000000 0.277648 -0.000000 0.960683 } scale={ 1.000000 1.000000 1.000000 } } { id=105 - position={ 2165.422852 0.000000 3605.253662 } + position={ 2169.421143 0.000000 3604.639160 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=106 - position={ 2142.271240 0.000000 3613.913574 } + position={ 2147.559082 0.000000 3615.982422 } rotation={ -0.000000 0.032042 -0.000000 0.999487 } scale={ 1.000000 1.000000 1.000000 } } { id=107 - position={ 2175.000000 0.000000 3630.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2172.485107 0.000000 3633.296875 } + rotation={ -0.000000 0.202930 -0.000000 0.979193 } scale={ 1.000000 1.000000 1.000000 } } { @@ -661,43 +661,43 @@ } { id=109 - position={ 2214.976074 0.000000 3664.498535 } + position={ 2217.467285 0.000000 3660.864258 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=110 - position={ 2072.950928 0.000000 3687.446533 } + position={ 2066.838379 0.000000 3691.596680 } rotation={ -0.000000 -0.373272 -0.000000 0.927722 } scale={ 1.000000 1.000000 1.000000 } } { id=111 - position={ 2094.476807 0.000000 3608.901367 } + position={ 2097.354248 0.000000 3617.657227 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=112 - position={ 2111.182129 0.000000 3664.967285 } + position={ 2132.564697 0.000000 3663.153564 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=113 - position={ 2065.226318 0.000000 3655.366943 } + position={ 2058.053955 0.000000 3652.375732 } rotation={ -0.000000 -0.041518 -0.000000 0.999138 } scale={ 1.000000 1.000000 1.000000 } } { id=114 - position={ 2056.000000 0.000000 3631.000000 } + position={ 2048.073242 0.000000 3643.230957 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=115 - position={ 2069.000000 0.000000 3581.000000 } + position={ 2068.604492 0.000000 3582.460693 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -709,14 +709,14 @@ } { id=117 - position={ 2098.000000 0.000000 3694.000000 } + position={ 2101.395508 0.000000 3697.299316 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=118 - position={ 2067.720703 0.000000 3556.816406 } - rotation={ -0.000000 0.163090 -0.000000 0.986611 } + position={ 2067.367920 0.000000 3562.697021 } + rotation={ -0.000000 0.041953 -0.000000 0.999119 } scale={ 1.000000 1.000000 1.000000 } } { @@ -733,7 +733,7 @@ } { id=121 - position={ 2116.000000 0.000000 3635.000000 } + position={ 2135.506592 0.000000 3642.234619 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -757,7 +757,7 @@ } { id=125 - position={ 2102.000000 0.000000 3534.000000 } + position={ 2104.327637 0.000000 3534.159424 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -781,19 +781,19 @@ } { id=129 - position={ 2173.000000 0.000000 3531.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2157.855713 0.000000 3532.560059 } + rotation={ -0.000000 0.327467 -0.000000 0.944863 } scale={ 1.000000 1.000000 1.000000 } } { id=130 - position={ 2211.854492 0.000000 3500.134277 } + position={ 2210.024658 0.000000 3509.887939 } rotation={ -0.000000 -0.304587 -0.000000 0.952484 } scale={ 1.000000 1.000000 1.000000 } } { id=131 - position={ 2192.017578 0.000000 3527.179688 } + position={ 2202.898926 0.000000 3524.900391 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -811,25 +811,25 @@ } { id=134 - position={ 2208.000000 0.000000 3643.000000 } + position={ 2198.753906 0.000000 3641.098877 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=135 - position={ 2245.483398 0.000000 3625.674316 } + position={ 2248.145508 0.000000 3617.656738 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=136 - position={ 2262.194092 0.000000 3612.681885 } + position={ 2260.802246 0.000000 3601.494141 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=137 - position={ 2274.852539 0.000000 3597.729004 } + position={ 2275.298340 0.000000 3594.134033 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -853,7 +853,7 @@ } { id=141 - position={ 2265.000000 0.000000 3681.000000 } + position={ 2272.963623 0.000000 3668.923584 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -865,13 +865,13 @@ } { id=143 - position={ 2270.322754 0.000000 3713.105225 } + position={ 2266.291748 0.000000 3711.847412 } rotation={ -0.000000 0.187037 -0.000000 0.982353 } scale={ 1.000000 1.000000 1.000000 } } { id=144 - position={ 2237.805908 0.000000 3705.824463 } + position={ 2246.408447 0.000000 3701.963379 } rotation={ -0.000000 -0.093275 -0.000000 0.995640 } scale={ 1.000000 1.000000 1.000000 } } @@ -883,37 +883,37 @@ } { id=146 - position={ 2223.699219 0.000000 3766.791748 } + position={ 2223.411621 0.000000 3764.188232 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=147 - position={ 2212.000000 0.000000 3727.000000 } + position={ 2207.417480 0.000000 3714.661133 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=148 - position={ 2186.000000 0.000000 3716.000000 } + position={ 2196.590820 0.000000 3709.101318 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=149 - position={ 2226.013672 0.000000 3524.846924 } + position={ 2234.893066 0.000000 3514.351807 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=150 - position={ 2243.000000 0.000000 3595.000000 } + position={ 2230.455811 0.000000 3590.996826 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=151 - position={ 2242.251709 0.000000 3541.968506 } + position={ 2247.614258 0.000000 3544.887451 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -925,19 +925,19 @@ } { id=153 - position={ 2230.014893 0.000000 3488.052002 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2218.322021 0.000000 3493.196289 } + rotation={ -0.000000 0.169680 -0.000000 0.985499 } scale={ 1.000000 1.000000 1.000000 } } { id=154 - position={ 2255.000000 0.000000 3506.000000 } + position={ 2245.245361 0.000000 3494.938477 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=155 - position={ 2259.008301 0.000000 3481.791260 } + position={ 2259.155029 0.000000 3483.673828 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -955,19 +955,19 @@ } { id=158 - position={ 2183.186279 0.000000 3501.211670 } - rotation={ -0.000000 0.530567 -0.000000 0.847643 } + position={ 2155.907227 0.000000 3484.198730 } + rotation={ -0.000000 -0.064373 0.000000 -0.997926 } scale={ 1.000000 1.000000 1.000000 } } { id=159 - position={ 2245.636230 0.000000 3452.222900 } + position={ 2247.288574 0.000000 3470.795166 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=160 - position={ 2217.033936 0.000000 3464.041504 } + position={ 2210.786133 0.000000 3482.335449 } rotation={ -0.000000 -0.066353 -0.000000 0.997796 } scale={ 1.000000 1.000000 1.000000 } } @@ -979,8 +979,8 @@ } { id=162 - position={ 2178.918213 0.000000 3447.159180 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2185.249756 0.000000 3472.271484 } + rotation={ -0.000000 0.311592 -0.000000 0.950216 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3169,14 +3169,14 @@ } { id=529 - position={ 2013.000000 0.000000 3360.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2000.982300 0.000000 3344.761475 } + rotation={ -0.000000 0.363918 -0.000000 0.931431 } scale={ 1.000000 1.000000 1.000000 } } { id=530 - position={ 2074.000000 0.000000 3274.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2077.359131 0.000000 3280.194336 } + rotation={ -0.000000 0.303025 -0.000000 0.952983 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16129,8 +16129,8 @@ } { id=2830 - position={ 1948.284424 0.000000 3470.785400 } - rotation={ -0.000000 -0.165085 -0.000000 0.986279 } + position={ 1946.010742 0.000000 3466.311523 } + rotation={ -0.000000 0.394259 -0.000000 0.918999 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16141,25 +16141,25 @@ } { id=2832 - position={ 1930.823608 0.000000 3498.190918 } - rotation={ 0.000000 0.000000 0.000000 1.000000 } + position={ 1926.237549 0.000000 3486.464111 } + rotation={ -0.000000 0.242300 -0.000000 0.970201 } scale={ 1.000000 1.000000 1.000000 } } { id=2833 - position={ 1934.065308 0.000000 3487.084229 } - rotation={ -0.000000 -0.426725 -0.000000 0.904382 } + position={ 1929.163696 0.000000 3470.363281 } + rotation={ -0.000000 0.025682 -0.000000 0.999671 } scale={ 1.000000 1.000000 1.000000 } } { id=2834 - position={ 1978.276611 0.000000 3446.135986 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1976.059570 0.000000 3446.604736 } + rotation={ -0.000000 0.036113 -0.000000 0.999348 } scale={ 1.000000 1.000000 1.000000 } } { id=2835 - position={ 1993.000000 0.000000 3463.000000 } + position={ 1989.901001 0.000000 3456.211914 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -18187,8 +18187,8 @@ } { id=3194 - position={ 1941.161011 0.000000 3451.853516 } - rotation={ -0.000000 0.588843 -0.000000 0.808247 } + position={ 1950.891235 0.000000 3438.031738 } + rotation={ -0.000000 0.011279 -0.000000 0.999936 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18199,25 +18199,25 @@ } { id=3196 - position={ 1925.062134 0.000000 3406.725342 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1935.386108 0.000000 3417.727051 } + rotation={ -0.000000 0.216968 -0.000000 0.976179 } scale={ 1.000000 1.000000 1.000000 } } { id=3197 - position={ 1972.994263 0.000000 3425.570801 } + position={ 1965.859009 0.000000 3401.985840 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3198 position={ 1947.000000 0.000000 3392.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + rotation={ -0.000000 0.155664 -0.000000 0.987810 } scale={ 1.000000 1.000000 1.000000 } } { id=3199 - position={ 1969.679932 0.000000 3387.573486 } + position={ 1953.313599 0.000000 3384.186279 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -18259,13 +18259,13 @@ } { id=3206 - position={ 2087.427002 0.000000 3499.675049 } + position={ 2099.193848 0.000000 3475.233643 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3207 - position={ 2089.405762 0.000000 3447.106445 } + position={ 2094.624268 0.000000 3417.991211 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -18277,7 +18277,7 @@ } { id=3209 - position={ 2111.000000 0.000000 3445.000000 } + position={ 2107.840332 0.000000 3423.415527 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -18295,8 +18295,8 @@ } { id=3212 - position={ 2048.027588 0.000000 3419.970459 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2040.083252 0.000000 3425.265381 } + rotation={ -0.000000 0.309938 -0.000000 0.950757 } scale={ 1.000000 1.000000 1.000000 } } { @@ -28195,7 +28195,7 @@ } { id=4908 - position={ 1932.000000 0.000000 3315.000000 } + position={ 1945.558228 0.000000 3321.354004 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28255,43 +28255,43 @@ } { id=4918 - position={ 1940.945923 0.000000 3338.416748 } + position={ 1921.304199 0.000000 3322.929443 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4919 - position={ 1970.000000 0.000000 3335.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1965.867920 0.000000 3336.895264 } + rotation={ -0.000000 0.091976 -0.000000 0.995761 } scale={ 1.000000 1.000000 1.000000 } } { id=4920 - position={ 1940.116943 0.000000 3364.251709 } + position={ 1945.095947 0.000000 3359.445557 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4921 - position={ 1919.000000 0.000000 3388.000000 } + position={ 1923.865601 0.000000 3374.949951 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4922 - position={ 1986.000000 0.000000 3360.000000 } + position={ 1986.574097 0.000000 3355.833740 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4923 - position={ 1980.000000 0.000000 3377.000000 } + position={ 1969.681152 0.000000 3422.652100 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4924 - position={ 1974.000000 0.000000 3289.000000 } + position={ 1977.221924 0.000000 3297.160889 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28363,25 +28363,25 @@ } { id=4936 - position={ 2067.000000 0.000000 3300.000000 } + position={ 2060.286377 0.000000 3305.550049 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4937 - position={ 2121.851562 0.000000 3313.544434 } + position={ 2115.652100 0.000000 3315.423340 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=4938 - position={ 2085.454834 0.000000 3320.652100 } + position={ 2085.699463 0.000000 3327.600342 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4939 - position={ 2110.928711 0.000000 3299.424561 } + position={ 2096.250732 0.000000 3294.054443 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28399,7 +28399,7 @@ } { id=4942 - position={ 2044.000000 0.000000 3299.000000 } + position={ 2036.605957 0.000000 3310.529541 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28417,7 +28417,7 @@ } { id=4945 - position={ 2108.720703 0.000000 3398.264648 } + position={ 2126.572998 0.000000 3393.139648 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28453,19 +28453,19 @@ } { id=4951 - position={ 2134.249512 0.000000 3273.432373 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2122.900879 0.000000 3270.994873 } + rotation={ -0.000000 0.300435 -0.000000 0.953802 } scale={ 1.000000 1.000000 1.000000 } } { id=4952 - position={ 2148.253662 0.000000 3296.213867 } + position={ 2142.850830 0.000000 3293.525879 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4953 - position={ 2105.000000 0.000000 3250.000000 } + position={ 2089.685547 0.000000 3246.116699 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28477,19 +28477,19 @@ } { id=4955 - position={ 2098.000000 0.000000 3232.000000 } + position={ 2107.149414 0.000000 3242.523193 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4956 - position={ 2069.792480 0.000000 3245.133789 } + position={ 2091.402588 0.000000 3264.239990 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4957 - position={ 2166.000000 0.000000 3221.000000 } + position={ 2147.848389 0.000000 3225.694824 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28507,7 +28507,7 @@ } { id=4960 - position={ 2146.000000 0.000000 3238.000000 } + position={ 2140.998779 0.000000 3253.132568 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -29089,7 +29089,7 @@ } { id=5057 - position={ 2136.113037 0.000000 3328.536133 } + position={ 2129.282959 0.000000 3320.929688 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -50557,8 +50557,8 @@ } { id=8815 - position={ 7211.000000 0.000000 2237.000000 } - rotation={ 0.000000 0.934992 0.000000 -0.354669 } + position={ 2159.527588 0.000000 3311.296875 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -78361,7 +78361,133 @@ } { id=13617 - position={ 2095.386230 0.000000 3480.365723 } + position={ 2079.919434 0.000000 3503.221680 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13618 + position={ 2243.773438 0.000000 3781.316895 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13619 + position={ 2243.729980 0.000000 3799.395996 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13620 + position={ 2226.000000 0.000000 3781.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13621 + position={ 2178.136963 0.000000 3769.749756 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13622 + position={ 2171.253418 0.000000 3800.739746 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13623 + position={ 2176.684814 0.000000 3814.794922 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13624 + position={ 2091.484375 0.000000 3791.021484 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13625 + position={ 2155.557373 0.000000 3744.576660 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13626 + position={ 2213.490967 0.000000 3737.687256 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13627 + position={ 2081.027588 0.000000 3669.064697 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13628 + position={ 2098.755127 0.000000 3635.604004 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13629 + position={ 2154.646484 0.000000 3600.623535 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13630 + position={ 2145.000000 0.000000 3603.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13631 + position={ 2116.925781 0.000000 3661.452393 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13632 + position={ 2097.827148 0.000000 3503.711426 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13633 + position={ 2177.189453 0.000000 3480.832764 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13634 + position={ 2187.611816 0.000000 3486.623291 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13635 + position={ 2223.447998 0.000000 3578.861572 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13636 + position={ 2270.000000 0.000000 3540.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13637 + position={ 2251.874756 0.000000 3523.608643 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13638 + position={ 2275.000000 0.000000 3564.000000 } 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 8282703c..c79d31f1 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -529,14 +529,14 @@ } { id=88 - position={ 2089.000000 0.000000 3744.000000 } - rotation={ -0.000000 -0.640747 -0.000000 0.767752 } + position={ 2080.040527 0.000000 3751.740967 } + rotation={ -0.000000 0.330686 -0.000000 0.943741 } scale={ 1.000000 1.000000 1.000000 } } { id=89 - position={ 2104.000000 0.000000 3751.000000 } - rotation={ 0.000000 0.828067 0.000000 0.560629 } + position={ 2101.251221 0.000000 3756.013428 } + rotation={ -0.000000 0.927985 -0.000000 0.372617 } scale={ 1.000000 1.000000 1.000000 } } { @@ -547,32 +547,32 @@ } { id=91 - position={ 2096.000000 0.000000 3781.000000 } - rotation={ -0.000000 -0.569595 -0.000000 0.821926 } + position={ 2089.811768 0.000000 3778.780029 } + rotation={ -0.000000 -0.882094 -0.000000 -0.471074 } scale={ 1.000000 1.000000 1.000000 } } { id=92 - position={ 2139.000000 0.000000 3784.000000 } - rotation={ -0.000000 -0.569595 -0.000000 0.821926 } + position={ 2138.306152 0.000000 3783.125000 } + rotation={ -0.000000 -0.811694 -0.000000 0.584083 } scale={ 1.000000 1.000000 1.000000 } } { id=93 - position={ 2156.000000 0.000000 3753.000000 } - rotation={ 0.000000 0.861871 0.000000 -0.507128 } + position={ 2150.562012 0.000000 3769.863525 } + rotation={ -0.000000 0.813054 -0.000000 -0.582189 } scale={ 1.000000 1.000000 1.000000 } } { id=94 - position={ 2146.000000 0.000000 3806.000000 } - rotation={ 0.000000 0.707107 0.000000 0.707107 } + position={ 2145.382568 0.000000 3797.559814 } + rotation={ -0.000000 0.998484 -0.000000 0.055054 } scale={ 1.000000 1.000000 1.000000 } } { id=95 - position={ 2168.394287 0.000000 3777.238281 } - rotation={ -0.000000 0.777847 -0.000000 -0.628454 } + position={ 2168.731445 0.000000 3782.587402 } + rotation={ -0.000000 0.573803 -0.000000 -0.818993 } scale={ 1.000000 1.000000 1.000000 } } { @@ -583,26 +583,26 @@ } { id=97 - position={ 2195.030762 0.000000 3801.097168 } + position={ 2201.040771 0.000000 3801.662842 } rotation={ 0.000000 0.625727 0.000000 0.780042 } scale={ 1.000000 1.000000 1.000000 } } { id=98 - position={ 2244.823730 0.000000 3796.078857 } - rotation={ -0.000000 0.998153 -0.000000 0.060743 } + position={ 2258.718750 0.000000 3793.697754 } + rotation={ -0.000000 0.998018 -0.000000 -0.062927 } scale={ 1.000000 1.000000 1.000000 } } { id=99 - position={ 2182.229004 0.000000 3745.062012 } + position={ 2184.222900 0.000000 3741.681641 } rotation={ -0.000000 0.896609 -0.000000 -0.442824 } scale={ 1.000000 1.000000 1.000000 } } { id=100 - position={ 2190.000000 0.000000 3736.000000 } - rotation={ 0.000000 0.749678 0.000000 0.661803 } + position={ 2204.984863 0.000000 3752.483154 } + rotation={ -0.000000 -0.100376 -0.000000 0.994950 } scale={ 1.000000 1.000000 1.000000 } } { @@ -613,38 +613,38 @@ } { id=102 - position={ 2203.000000 0.000000 3676.000000 } - rotation={ 0.000000 0.961249 0.000000 0.275682 } + position={ 2209.947266 0.000000 3687.604980 } + rotation={ -0.000000 0.104235 -0.000000 0.994553 } scale={ 1.000000 1.000000 1.000000 } } { id=103 - position={ 2227.002197 0.000000 3631.473389 } - rotation={ -0.000000 0.670292 -0.000000 -0.742097 } + position={ 2225.551270 0.000000 3634.417236 } + rotation={ -0.000000 0.112598 -0.000000 -0.993640 } scale={ 1.000000 1.000000 1.000000 } } { id=104 - position={ 2158.000000 0.000000 3634.000000 } - rotation={ 0.000000 0.838492 0.000000 -0.544914 } + position={ 2150.605225 0.000000 3638.394287 } + rotation={ -0.000000 0.992859 -0.000000 0.119291 } scale={ 1.000000 1.000000 1.000000 } } { id=105 - position={ 2173.922852 0.000000 3601.051758 } + position={ 2178.538818 0.000000 3612.172363 } rotation={ -0.000000 -0.640747 -0.000000 0.767752 } scale={ 1.000000 1.000000 1.000000 } } { id=106 - position={ 2137.762207 0.000000 3600.612549 } - rotation={ -0.000000 0.914422 -0.000000 0.404763 } + position={ 2136.268066 0.000000 3621.913086 } + rotation={ -0.000000 0.673510 -0.000000 0.739179 } scale={ 1.000000 1.000000 1.000000 } } { id=107 - position={ 2161.000000 0.000000 3619.000000 } - rotation={ 0.000000 0.952296 0.000000 0.305177 } + position={ 2166.347412 0.000000 3625.314697 } + rotation={ -0.000000 0.775055 -0.000000 0.631895 } scale={ 1.000000 1.000000 1.000000 } } { @@ -655,62 +655,62 @@ } { id=109 - position={ 2201.000000 0.000000 3656.000000 } - rotation={ 0.000000 0.850651 0.000000 0.525731 } + position={ 2205.112549 0.000000 3656.844482 } + rotation={ -0.000000 0.964273 -0.000000 0.264912 } scale={ 1.000000 1.000000 1.000000 } } { id=110 - position={ 2071.677002 0.000000 3680.186035 } + position={ 2070.027832 0.000000 3680.540771 } rotation={ -0.000000 0.862249 -0.000000 -0.506485 } scale={ 1.000000 1.000000 1.000000 } } { id=111 - position={ 2084.000000 0.000000 3595.000000 } + position={ 2087.618652 0.000000 3604.882568 } rotation={ 0.000000 0.961249 0.000000 0.275682 } scale={ 1.000000 1.000000 1.000000 } } { id=112 - position={ 2100.895020 0.000000 3653.142334 } - rotation={ -0.000000 0.976169 -0.000000 0.217011 } + position={ 2116.783447 0.000000 3677.056396 } + rotation={ -0.000000 0.631389 -0.000000 0.775466 } scale={ 1.000000 1.000000 1.000000 } } { id=113 - position={ 2072.529297 0.000000 3649.025879 } + position={ 2066.609131 0.000000 3659.123779 } rotation={ -0.000000 0.756754 -0.000000 -0.653699 } scale={ 1.000000 1.000000 1.000000 } } { id=114 - position={ 2049.000000 0.000000 3618.000000 } + position={ 2047.369629 0.000000 3626.901611 } rotation={ 0.000000 0.994029 0.000000 -0.109117 } scale={ 1.000000 1.000000 1.000000 } } { id=115 - position={ 2054.000000 0.000000 3572.000000 } - rotation={ 0.000000 0.861871 0.000000 0.507128 } + position={ 2061.726562 0.000000 3576.936279 } + rotation={ -0.000000 0.644028 -0.000000 -0.765002 } scale={ 1.000000 1.000000 1.000000 } } { id=116 - position={ 2051.000000 0.000000 3594.000000 } - rotation={ 0.000000 0.745128 0.000000 0.666921 } + position={ 2055.767334 0.000000 3596.435547 } + rotation={ -0.000000 0.995304 -0.000000 0.096800 } scale={ 1.000000 1.000000 1.000000 } } { id=117 - position={ 2093.000000 0.000000 3680.000000 } + position={ 2096.694336 0.000000 3690.383545 } rotation={ 0.000000 0.992508 0.000000 -0.122183 } scale={ 1.000000 1.000000 1.000000 } } { id=118 - position={ 2070.677979 0.000000 3545.516602 } - rotation={ 0.000000 0.923880 0.000000 -0.382684 } + position={ 2064.814453 0.000000 3556.820312 } + rotation={ -0.000000 0.960862 -0.000000 -0.277028 } scale={ 1.000000 1.000000 1.000000 } } { @@ -727,8 +727,8 @@ } { id=121 - position={ 2119.000000 0.000000 3624.000000 } - rotation={ 0.000000 0.838492 0.000000 -0.544914 } + position={ 2122.375000 0.000000 3634.069824 } + rotation={ -0.000000 0.931774 -0.000000 0.363040 } scale={ 1.000000 1.000000 1.000000 } } { @@ -751,8 +751,8 @@ } { id=125 - position={ 2104.000000 0.000000 3528.000000 } - rotation={ 0.000000 0.861871 0.000000 -0.507128 } + position={ 2102.205811 0.000000 3529.614746 } + rotation={ -0.000000 0.927873 -0.000000 -0.372898 } scale={ 1.000000 1.000000 1.000000 } } { @@ -775,20 +775,20 @@ } { id=129 - position={ 2174.000000 0.000000 3522.000000 } - rotation={ 0.000000 0.923880 0.000000 -0.382684 } + position={ 2168.746826 0.000000 3526.787598 } + rotation={ -0.000000 0.707861 -0.000000 -0.706353 } scale={ 1.000000 1.000000 1.000000 } } { id=130 - position={ 2199.306641 0.000000 3487.124268 } - rotation={ -0.000000 0.941113 -0.000000 0.338092 } + position={ 2206.900635 0.000000 3502.346680 } + rotation={ -0.000000 0.940260 -0.000000 -0.340457 } scale={ 1.000000 1.000000 1.000000 } } { id=131 - position={ 2194.291504 0.000000 3516.582275 } - rotation={ 0.000000 0.881675 0.000000 -0.471858 } + position={ 2193.300537 0.000000 3522.839600 } + rotation={ -0.000000 0.984873 -0.000000 0.173282 } scale={ 1.000000 1.000000 1.000000 } } { @@ -799,32 +799,32 @@ } { id=133 - position={ 2194.790039 0.000000 3605.583252 } - rotation={ 0.000000 0.633989 0.000000 0.773342 } + position={ 2200.339355 0.000000 3613.037842 } + rotation={ -0.000000 0.264862 -0.000000 0.964286 } scale={ 1.000000 1.000000 1.000000 } } { id=134 - position={ 2195.000000 0.000000 3636.000000 } - rotation={ 0.000000 0.749678 0.000000 0.661803 } + position={ 2203.769531 0.000000 3635.954346 } + rotation={ -0.000000 0.686500 -0.000000 -0.727130 } scale={ 1.000000 1.000000 1.000000 } } { id=135 - position={ 2242.625244 0.000000 3614.531250 } - rotation={ -0.000000 0.951635 -0.000000 -0.307230 } + position={ 2237.253174 0.000000 3621.624023 } + rotation={ -0.000000 0.438015 -0.000000 0.898967 } scale={ 1.000000 1.000000 1.000000 } } { id=136 - position={ 2254.412354 0.000000 3601.437500 } - rotation={ 0.000000 0.987087 0.000000 0.160182 } + position={ 2258.301025 0.000000 3611.955322 } + rotation={ -0.000000 0.259402 -0.000000 -0.965769 } scale={ 1.000000 1.000000 1.000000 } } { id=137 - position={ 2263.186523 0.000000 3588.031250 } - rotation={ -0.000000 0.913424 -0.000000 0.407009 } + position={ 2272.831055 0.000000 3584.465088 } + rotation={ -0.000000 0.696772 -0.000000 -0.717292 } scale={ 1.000000 1.000000 1.000000 } } { @@ -835,7 +835,7 @@ } { id=139 - position={ 2248.473389 0.000000 3645.783447 } + position={ 2246.770020 0.000000 3644.471436 } rotation={ -0.000000 -0.518313 -0.000000 0.855191 } scale={ 1.000000 1.000000 1.000000 } } @@ -847,8 +847,8 @@ } { id=141 - position={ 2269.502686 0.000000 3673.057129 } - rotation={ 0.000000 0.780042 0.000000 -0.625727 } + position={ 2260.838379 0.000000 3676.870850 } + rotation={ -0.000000 0.206365 -0.000000 0.978475 } scale={ 1.000000 1.000000 1.000000 } } { @@ -859,14 +859,14 @@ } { id=143 - position={ 2255.376709 0.000000 3705.084961 } - rotation={ 0.000000 0.908513 0.000000 0.417857 } + position={ 2260.526855 0.000000 3701.896973 } + rotation={ -0.000000 0.459461 -0.000000 0.888198 } scale={ 1.000000 1.000000 1.000000 } } { id=144 - position={ 2243.734131 0.000000 3698.355469 } - rotation={ -0.000000 0.792069 -0.000000 -0.610431 } + position={ 2238.408936 0.000000 3700.591064 } + rotation={ 0.000000 0.520737 -0.000000 0.853717 } scale={ 1.000000 1.000000 1.000000 } } { @@ -877,37 +877,37 @@ } { id=146 - position={ 2226.699219 0.000000 3760.791748 } - rotation={ -0.000000 -0.671005 -0.000000 0.741453 } + position={ 2223.988037 0.000000 3756.919434 } + rotation={ -0.000000 -0.452015 -0.000000 0.892011 } scale={ 1.000000 1.000000 1.000000 } } { id=147 - position={ 2217.462402 0.000000 3714.331543 } + position={ 2218.942871 0.000000 3703.554199 } rotation={ 0.000000 0.894427 0.000000 -0.447214 } scale={ 1.000000 1.000000 1.000000 } } { id=148 - position={ 2189.265137 0.000000 3709.709961 } + position={ 2188.157471 0.000000 3706.400391 } rotation={ -0.000000 0.827462 -0.000000 -0.561522 } scale={ 1.000000 1.000000 1.000000 } } { id=149 - position={ 2230.962402 0.000000 3518.855713 } - rotation={ -0.000000 -0.763242 -0.000000 0.646113 } + position={ 2226.142822 0.000000 3522.658936 } + rotation={ -0.000000 0.005799 -0.000000 0.999983 } scale={ 1.000000 1.000000 1.000000 } } { id=150 - position={ 2247.000000 0.000000 3581.000000 } - rotation={ 0.000000 0.881675 0.000000 -0.471858 } + position={ 2237.625488 0.000000 3601.172119 } + rotation={ -0.000000 0.269013 -0.000000 0.963137 } scale={ 1.000000 1.000000 1.000000 } } { id=151 - position={ 2228.252441 0.000000 3540.699463 } + position={ 2229.943115 0.000000 3547.271240 } rotation={ -0.000000 0.437037 -0.000000 0.899443 } scale={ 1.000000 1.000000 1.000000 } } @@ -919,26 +919,26 @@ } { id=153 - position={ 2227.000000 0.000000 3475.000000 } - rotation={ 0.000000 0.989400 0.000000 -0.145213 } + position={ 2228.810791 0.000000 3492.076416 } + rotation={ -0.000000 0.471253 -0.000000 -0.881998 } scale={ 1.000000 1.000000 1.000000 } } { id=154 - position={ 2240.090088 0.000000 3499.381104 } - rotation={ 0.000000 0.861871 0.000000 0.507128 } + position={ 2250.723633 0.000000 3502.796387 } + rotation={ -0.000000 0.709940 -0.000000 -0.704262 } scale={ 1.000000 1.000000 1.000000 } } { id=155 - position={ 2260.571289 0.000000 3490.730957 } - rotation={ -0.000000 0.963161 -0.000000 0.268926 } + position={ 2259.553955 0.000000 3491.490723 } + rotation={ -0.000000 -0.448751 -0.000000 0.893657 } scale={ 1.000000 1.000000 1.000000 } } { id=156 position={ 2151.427734 0.000000 3511.381104 } - rotation={ -0.000000 0.986652 -0.000000 -0.162845 } + rotation={ -0.000000 0.814041 -0.000000 0.580809 } scale={ 1.000000 1.000000 1.000000 } } { @@ -949,19 +949,19 @@ } { id=158 - position={ 2176.828369 0.000000 3495.035400 } - rotation={ 0.000000 0.707107 0.000000 0.707107 } + position={ 2153.326172 0.000000 3496.422607 } + rotation={ -0.000000 0.380002 -0.000000 0.924986 } scale={ 1.000000 1.000000 1.000000 } } { id=159 - position={ 2230.000000 0.000000 3444.000000 } - rotation={ 0.000000 0.828067 0.000000 0.560629 } + position={ 2226.331055 0.000000 3476.602539 } + rotation={ -0.000000 0.599973 -0.000000 0.800020 } scale={ 1.000000 1.000000 1.000000 } } { id=160 - position={ 2212.429932 0.000000 3448.079590 } + position={ 2205.792725 0.000000 3475.397217 } rotation={ -0.000000 0.998592 -0.000000 -0.053041 } scale={ 1.000000 1.000000 1.000000 } } @@ -973,8 +973,8 @@ } { id=162 - position={ 2170.099854 0.000000 3438.742188 } - rotation={ 0.000000 0.961249 0.000000 -0.275683 } + position={ 2192.566895 0.000000 3465.923096 } + rotation={ -0.000000 0.990172 -0.000000 0.139857 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3151,14 +3151,14 @@ } { id=529 - position={ 2016.000000 0.000000 3355.000000 } - rotation={ -0.000000 -0.625727 -0.000000 0.780042 } + position={ 2009.394531 0.000000 3349.151611 } + rotation={ -0.000000 0.060457 -0.000000 0.998171 } scale={ 1.000000 1.000000 1.000000 } } { id=530 - position={ 2074.000000 0.000000 3262.000000 } - rotation={ 0.000000 0.898315 0.000000 -0.439351 } + position={ 2066.181152 0.000000 3287.800049 } + rotation={ -0.000000 0.664651 -0.000000 0.747153 } scale={ 1.000000 1.000000 1.000000 } } { @@ -14443,38 +14443,38 @@ } { id=2830 - position={ 1943.104980 0.000000 3462.454102 } - rotation={ -0.000000 0.999276 -0.000000 -0.038027 } + position={ 1937.648315 0.000000 3467.452881 } + rotation={ -0.000000 0.957340 -0.000000 0.288960 } scale={ 1.000000 1.000000 1.000000 } } { id=2831 - position={ 1967.715332 0.000000 3457.327148 } + position={ 1966.901123 0.000000 3461.185059 } rotation={ -0.000000 0.985563 -0.000000 -0.169312 } scale={ 1.000000 1.000000 1.000000 } } { id=2832 - position={ 1922.000000 0.000000 3496.000000 } - rotation={ 0.000000 0.973249 0.000000 0.229753 } + position={ 1927.959473 0.000000 3497.221191 } + rotation={ -0.000000 0.382161 -0.000000 0.924096 } scale={ 1.000000 1.000000 1.000000 } } { id=2833 - position={ 1926.122314 0.000000 3473.627197 } - rotation={ -0.000000 0.961598 -0.000000 0.274462 } + position={ 1930.559937 0.000000 3476.778564 } + rotation={ -0.000000 0.852938 -0.000000 0.522013 } scale={ 1.000000 1.000000 1.000000 } } { id=2834 - position={ 1964.969971 0.000000 3440.022949 } - rotation={ -0.000000 0.817041 -0.000000 0.576580 } + position={ 1979.425049 0.000000 3449.870605 } + rotation={ -0.000000 0.612408 -0.000000 -0.790542 } scale={ 1.000000 1.000000 1.000000 } } { id=2835 - position={ 1997.000000 0.000000 3459.000000 } - rotation={ -0.000000 -0.625727 -0.000000 0.780042 } + position={ 1995.001709 0.000000 3461.991455 } + rotation={ -0.000000 -0.735409 -0.000000 0.677623 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16501,8 +16501,8 @@ } { id=3194 - position={ 1941.023315 0.000000 3439.348389 } - rotation={ -0.000000 0.918033 -0.000000 0.396504 } + position={ 1943.824951 0.000000 3438.312256 } + rotation={ -0.000000 0.975762 -0.000000 0.218832 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16513,26 +16513,26 @@ } { id=3196 - position={ 1928.086792 0.000000 3404.467041 } - rotation={ -0.000000 -0.486619 -0.000000 0.873614 } + position={ 1926.923828 0.000000 3409.104248 } + rotation={ -0.000000 0.776558 -0.000000 0.630046 } scale={ 1.000000 1.000000 1.000000 } } { id=3197 - position={ 1958.994263 0.000000 3411.570801 } - rotation={ 0.000000 0.908513 0.000000 0.417857 } + position={ 1964.448608 0.000000 3407.231201 } + rotation={ -0.000000 0.626165 -0.000000 -0.779691 } scale={ 1.000000 1.000000 1.000000 } } { id=3198 - position={ 1944.000000 0.000000 3378.000000 } - rotation={ 0.000000 0.952295 0.000000 -0.305177 } + position={ 1949.684448 0.000000 3395.652344 } + rotation={ -0.000000 0.867496 -0.000000 -0.497444 } scale={ 1.000000 1.000000 1.000000 } } { id=3199 - position={ 1958.000000 0.000000 3378.000000 } - rotation={ 0.000000 0.937885 0.000000 0.346946 } + position={ 1961.362671 0.000000 3380.562012 } + rotation={ -0.000000 0.579253 -0.000000 -0.815147 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16573,13 +16573,13 @@ } { id=3206 - position={ 2097.512207 0.000000 3498.572021 } - rotation={ -0.000000 0.337542 -0.000000 0.941311 } + position={ 2093.279297 0.000000 3482.567139 } + rotation={ -0.000000 0.773364 -0.000000 0.633963 } scale={ 1.000000 1.000000 1.000000 } } { id=3207 - position={ 2079.976074 0.000000 3434.069092 } + position={ 2083.211914 0.000000 3422.390381 } rotation={ 0.000000 0.978216 0.000000 0.207591 } scale={ 1.000000 1.000000 1.000000 } } @@ -16591,7 +16591,7 @@ } { id=3209 - position={ 2117.000000 0.000000 3432.000000 } + position={ 2111.811279 0.000000 3412.639648 } rotation={ 0.000000 0.894427 0.000000 -0.447214 } scale={ 1.000000 1.000000 1.000000 } } @@ -16609,8 +16609,8 @@ } { id=3212 - position={ 2051.816650 0.000000 3414.101318 } - rotation={ 0.000000 0.745128 0.000000 -0.666921 } + position={ 2047.557617 0.000000 3425.641357 } + rotation={ -0.000000 0.246545 -0.000000 -0.969131 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26311,7 +26311,7 @@ } { id=4908 - position={ 1913.000000 0.000000 3314.000000 } + position={ 1930.341431 0.000000 3312.608398 } rotation={ 0.000000 0.745128 0.000000 0.666921 } scale={ 1.000000 1.000000 1.000000 } } @@ -26371,44 +26371,44 @@ } { id=4918 - position={ 1936.945923 0.000000 3325.416748 } - rotation={ 0.000000 0.968028 0.000000 -0.250841 } + position={ 1905.644531 0.000000 3313.050293 } + rotation={ -0.000000 -0.068804 -0.000000 0.997630 } scale={ 1.000000 1.000000 1.000000 } } { id=4919 - position={ 1969.000000 0.000000 3321.000000 } - rotation={ 0.000000 0.923880 0.000000 -0.382684 } + position={ 1971.797729 0.000000 3330.828613 } + rotation={ -0.000000 0.994820 -0.000000 0.101662 } scale={ 1.000000 1.000000 1.000000 } } { id=4920 - position={ 1943.116943 0.000000 3349.251709 } - rotation={ 0.000000 0.978216 0.000000 -0.207591 } + position={ 1936.337280 0.000000 3357.553711 } + rotation={ -0.000000 -0.432538 -0.000000 -0.901616 } scale={ 1.000000 1.000000 1.000000 } } { id=4921 - position={ 1907.181030 0.000000 3382.154297 } - rotation={ -0.000000 0.589258 -0.000000 0.807945 } + position={ 1914.805298 0.000000 3390.838867 } + rotation={ -0.000000 0.198440 -0.000000 0.980113 } scale={ 1.000000 1.000000 1.000000 } } { id=4922 - position={ 1971.000000 0.000000 3357.000000 } + position={ 1982.505127 0.000000 3351.989014 } rotation={ 0.000000 0.666921 0.000000 0.745128 } scale={ 1.000000 1.000000 1.000000 } } { id=4923 - position={ 1966.000000 0.000000 3366.000000 } - rotation={ 0.000000 0.894427 0.000000 0.447214 } + position={ 1968.095581 0.000000 3429.241943 } + rotation={ -0.000000 0.323487 -0.000000 -0.946233 } scale={ 1.000000 1.000000 1.000000 } } { id=4924 - position={ 1976.000000 0.000000 3276.000000 } - rotation={ 0.000000 0.936103 0.000000 -0.351727 } + position={ 1977.884766 0.000000 3288.116943 } + rotation={ -0.000000 0.768717 -0.000000 -0.639590 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26479,26 +26479,26 @@ } { id=4936 - position={ 2065.000000 0.000000 3295.000000 } - rotation={ -0.000000 -0.569595 -0.000000 0.821926 } + position={ 2069.907471 0.000000 3304.804199 } + rotation={ -0.000000 -0.941559 -0.000000 0.336849 } scale={ 1.000000 1.000000 1.000000 } } { id=4937 position={ 2106.000000 0.000000 3318.000000 } - rotation={ 0.000000 0.811242 0.000000 0.584710 } + rotation={ -0.000000 -0.192531 -0.000000 0.981290 } scale={ 1.000000 1.000000 1.000000 } } { id=4938 - position={ 2090.454834 0.000000 3318.652100 } - rotation={ -0.000000 -0.606994 -0.000000 0.794707 } + position={ 2082.200195 0.000000 3322.174561 } + rotation={ -0.000000 -0.978820 -0.000000 0.204725 } scale={ 1.000000 1.000000 1.000000 } } { id=4939 - position={ 2105.395264 0.000000 3288.867920 } - rotation={ -0.000000 -0.877599 -0.000000 -0.479395 } + position={ 2099.709473 0.000000 3288.414062 } + rotation={ -0.000000 -0.877097 -0.000000 0.480313 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26515,8 +26515,8 @@ } { id=4942 - position={ 2030.000000 0.000000 3295.000000 } - rotation={ 0.000000 0.666921 0.000000 0.745128 } + position={ 2037.386597 0.000000 3299.861572 } + rotation={ -0.000000 0.930635 -0.000000 -0.365947 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26533,7 +26533,7 @@ } { id=4945 - position={ 2108.626221 0.000000 3390.869141 } + position={ 2115.551758 0.000000 3395.013428 } rotation={ -0.000000 0.873748 -0.000000 -0.486379 } scale={ 1.000000 1.000000 1.000000 } } @@ -26569,8 +26569,8 @@ } { id=4951 - position={ 2132.859375 0.000000 3263.550537 } - rotation={ -0.000000 0.918757 -0.000000 -0.394823 } + position={ 2127.346924 0.000000 3262.893799 } + rotation={ -0.000000 0.664923 -0.000000 -0.746912 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26581,8 +26581,8 @@ } { id=4953 - position={ 2086.000000 0.000000 3243.000000 } - rotation={ 0.000000 0.745128 0.000000 0.666921 } + position={ 2087.068359 0.000000 3240.880371 } + rotation={ -0.000000 0.925943 -0.000000 -0.377663 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26593,20 +26593,20 @@ } { id=4955 - position={ 2086.000000 0.000000 3218.000000 } + position={ 2111.169189 0.000000 3237.278564 } rotation={ 0.000000 0.961249 0.000000 0.275682 } scale={ 1.000000 1.000000 1.000000 } } { id=4956 - position={ 2050.859863 0.000000 3230.400635 } + position={ 2081.077393 0.000000 3266.346436 } rotation={ -0.000000 0.843615 -0.000000 0.536948 } scale={ 1.000000 1.000000 1.000000 } } { id=4957 - position={ 2148.000000 0.000000 3214.000000 } - rotation={ 0.000000 0.707107 0.000000 0.707107 } + position={ 2137.500488 0.000000 3230.475098 } + rotation={ -0.000000 -0.686005 -0.000000 0.727597 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26623,8 +26623,8 @@ } { id=4960 - position={ 2147.000000 0.000000 3233.000000 } - rotation={ -0.000000 -0.569595 -0.000000 0.821926 } + position={ 2130.577637 0.000000 3244.187256 } + rotation={ -0.000000 -0.978001 -0.000000 -0.208600 } scale={ 1.000000 1.000000 1.000000 } } { @@ -27205,7 +27205,7 @@ } { id=5057 - position={ 2126.262939 0.000000 3319.980957 } + position={ 2117.305176 0.000000 3331.200928 } rotation={ -0.000000 0.784276 -0.000000 0.620412 } scale={ 1.000000 1.000000 1.000000 } } @@ -47581,8 +47581,8 @@ } { id=8815 - position={ 7221.000000 0.000000 2231.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } + position={ 2148.807129 0.000000 3304.658691 } + rotation={ -0.000000 0.999611 -0.000000 0.027891 } scale={ 1.000000 1.000000 1.000000 } } { @@ -73735,8 +73735,134 @@ } { id=13617 - position={ 2081.781738 0.000000 3482.300537 } - rotation={ -0.000000 -0.846171 -0.000000 0.532912 } + position={ 2088.671631 0.000000 3502.207520 } + rotation={ -0.000000 -0.449946 -0.000000 0.893056 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13618 + position={ 2243.864014 0.000000 3787.568359 } + rotation={ -0.000000 -0.275856 -0.000000 0.961199 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13619 + position={ 2236.239502 0.000000 3798.428711 } + rotation={ -0.000000 -0.987808 -0.000000 -0.155680 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13620 + position={ 2216.636963 0.000000 3778.296875 } + rotation={ -0.000000 -0.999720 -0.000000 0.023644 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13621 + position={ 2186.238770 0.000000 3760.159180 } + rotation={ -0.000000 -0.999479 -0.000000 0.032278 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13622 + position={ 2166.749268 0.000000 3800.416992 } + rotation={ -0.000000 -0.933123 -0.000000 0.359557 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13623 + position={ 2181.922607 0.000000 3809.797119 } + rotation={ -0.000000 -0.999230 -0.000000 0.039231 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13624 + position={ 2083.296387 0.000000 3786.503418 } + rotation={ -0.000000 -0.995247 -0.000000 -0.097384 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13625 + position={ 2156.505615 0.000000 3753.517578 } + rotation={ -0.000000 -0.445225 -0.000000 0.895419 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13626 + position={ 2213.759277 0.000000 3723.938721 } + rotation={ -0.000000 -0.971288 -0.000000 -0.237905 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13627 + position={ 2093.610352 0.000000 3664.554443 } + rotation={ -0.000000 -0.446400 -0.000000 0.894834 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13628 + position={ 2087.545166 0.000000 3637.459229 } + rotation={ -0.000000 0.348631 -0.000000 0.937260 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13629 + position={ 2160.957520 0.000000 3588.994873 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13630 + position={ 2125.706787 0.000000 3601.946777 } + rotation={ -0.000000 0.793943 -0.000000 0.607992 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13631 + position={ 2113.205078 0.000000 3654.460205 } + rotation={ -0.000000 -0.995787 -0.000000 0.091694 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13632 + position={ 2097.827148 0.000000 3503.711426 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13633 + position={ 2159.892578 0.000000 3474.411377 } + rotation={ -0.000000 0.798136 -0.000000 0.602478 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13634 + position={ 2185.928711 0.000000 3497.877686 } + rotation={ -0.000000 0.694592 -0.000000 0.719404 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13635 + position={ 2218.985596 0.000000 3564.613281 } + rotation={ -0.000000 -0.897862 -0.000000 -0.440276 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13636 + position={ 2260.955811 0.000000 3542.601074 } + rotation={ -0.000000 -0.591809 -0.000000 0.806079 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13637 + position={ 2241.959473 0.000000 3530.118652 } + rotation={ -0.000000 0.757455 -0.000000 0.652888 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13638 + position={ 2258.572021 0.000000 3569.013672 } + rotation={ -0.000000 0.667082 -0.000000 0.744984 } scale={ 1.000000 1.000000 1.000000 } } } diff --git a/gfx/map/map_object_data/special_building_locators.txt b/gfx/map/map_object_data/special_building_locators.txt index 1d28bf9a..8f41b28e 100644 --- a/gfx/map/map_object_data/special_building_locators.txt +++ b/gfx/map/map_object_data/special_building_locators.txt @@ -1,4 +1,4 @@ -game_object_locator={ +game_object_locator={ name="special_building" render_pass=Map clamp_to_water_level=yes @@ -26407,8 +26407,8 @@ game_object_locator={ } { id=4924 - position={ 1977.000000 0.000000 3281.000000 } - rotation={ -0.000000 -0.256890 -0.000000 0.966440 } + position={ 1971.718994 0.000000 3296.209717 } + rotation={ -0.000000 -0.822723 -0.000000 -0.568441 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/history/characters/NEOW_e_baltic.txt b/history/characters/NEOW_e_baltic.txt index 4d9b4df4..b17b7d40 100644 --- a/history/characters/NEOW_e_baltic.txt +++ b/history/characters/NEOW_e_baltic.txt @@ -34,4 +34,23 @@ baltic0002 = { #King of Estonia 2600.1.1 = { death = yes } +} + +baltic0003 = { #placeholder narva urbanrepublic ruler + name = "Vasiliy" + dynasty = temp_dynasty + religion = "third_covenant" + culture = NEOW_novgorodian + trait = education_stewardship_3 + trait = chaste + trait = brave + trait = deceitful + sexuality = heterosexual + trait = beauty_good_2 + 2522.7.11 = { + birth = yes + } + 2600.1.1 = { + death = yes + } } \ No newline at end of file diff --git a/history/characters/NEOW_e_zapadoslavia.txt b/history/characters/NEOW_e_zapadoslavia.txt index 8a503291..dac1c4c9 100644 --- a/history/characters/NEOW_e_zapadoslavia.txt +++ b/history/characters/NEOW_e_zapadoslavia.txt @@ -660,19 +660,38 @@ zapadoslavia0030 = { } zapadoslavia0031 = { - name = "Andrey" + dna = dna_zapadoslavia0031 + name = "Yuriy" dynasty = koroleveckiy_dynasty religion = mariavite culture = NEOW_pribaltic - trait = impatient + trait = calm trait = callous - trait = arrogant - trait = education_martial_4 - trait = gallant - trait = rough_terrain_expert - 2512.3.2 = { + trait = gregarious + trait = honest + trait = education_stewardship_3 + trait = administrator + learning = 13 + 2520.12.12 = { birth = yes } + 2537.6.1 = { + add_spouse = zapadoslavia0078 + effect = { + set_relation_friend = character:zapadoslavia0077 + } + effect = { + make_character_crypto_religionist_effect = { CRYPTO_RELIGION = faith:rosenkreuzer } + } + } + 2554.1.1 = { + add_character_flag = do_not_generate_starting_family + create_maa_regiment = { + type = bowmen + check_can_recruit = no + size = 2 + } + } 2600.1.1 = { death = yes } @@ -680,8 +699,8 @@ zapadoslavia0031 = { zapadoslavia0032 = { - name = "Konstantin" - dynasty = tserlona_dynasty + name = "Fëoderik" + dynasty = tilsit_dynasty religion = mariavite culture = NEOW_pribaltic trait = vengeful @@ -691,20 +710,26 @@ zapadoslavia0032 = { 2520.11.23 = { birth = yes } + 2538.3.12 = { + add_spouse = zapadoslavia0081 + effect = { + set_relation_friend = character:zapadoslavia0031 + } + } 2600.1.1 = { death = yes } } zapadoslavia0033 = { - name = "Thoma" - dynasty = dyatlova_dynasty + name = "Vsevolod" + dynasty = velovskiy_dynasty religion = mariavite culture = NEOW_pribaltic trait = generous trait = calm trait = diligent - trait = education_martial_1 + trait = education_martial_3 trait = gallant trait = cautious_leader trait = tourney_participant @@ -1598,4 +1623,121 @@ zapadoslavia0076 = { #Daughter of Count of Walzbrych 2600.1.1 = { death = yes } +} + +zapadoslavia0077 = { + name = "Karl-Fёoderik" + dynasty = rosenkranz_dynasty + religion = rosenkreuzer + culture = low_saxon + trait = calm + trait = temperate + trait = brave + trait = education_learning_4 + trait = scholar + diplomacy = 7 + stewardship = 15 + 2520.5.25 = { + birth = yes + } + 2554.1.1 = { + employer = zapadoslavia0031 + effect = { + set_relation_ward = character:zapadoslavia0079 + set_relation_ward = character:zapadoslavia0080 + } + } + 2600.1.1 = { + death = yes + } +} + +zapadoslavia0078 = { + female = yes + dna = dna_zapadoslavia0078 + name = "Katherina" + dynasty = temp_dynasty + religion = "mariavite" + culture = NEOW_pribaltic + trait = humble + trait = arbitrary + trait = patient + trait = education_learning_3 + trait = loyal + sexuality = heterosexual + 2521.1.30 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +zapadoslavia0079 = { + name = "Nikolay" + dynasty = koroleveckiy_dynasty + religion = "mariavite" + culture = NEOW_pribaltic + trait = temperate + trait = arbitrary + trait = diligent + trait = bossy + trait = intellect_good_1 + learning = 9 + disallow_random_traits = yes + father = zapadoslavia0031 + mother = zapadoslavia0078 + sexuality = heterosexual + 2539.6.2 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +zapadoslavia0080 = { + female = yes + name = "Sharlotta" + dynasty = koroleveckiy_dynasty + religion = "mariavite" + culture = NEOW_pribaltic + trait = pensive + trait = humble + trait = temperate + trait = shy + trait = education_learning_3 + trait = shrewd + trait = physique_bad_1 + disallow_random_traits = yes + father = zapadoslavia0031 + mother = zapadoslavia0078 + sexuality = heterosexual + 2541.11.25 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +zapadoslavia0081 = { + female = yes + dna = dna_zapadoslavia0081 + name = "Ameli" + dynasty = temp_dynasty + religion = "mariavite" + culture = NEOW_pribaltic + trait = stubborn + trait = compassionate + trait = generous + trait = education_diplomacy_2 + trait = gardener + sexuality = heterosexual + 2521.4.30 = { + birth = yes + } + 2600.1.1 = { + death = yes + } } \ No newline at end of file diff --git a/history/cultures/heritage_east_slavic.txt b/history/cultures/heritage_east_slavic.txt index 55bdd441..882ff315 100644 --- a/history/cultures/heritage_east_slavic.txt +++ b/history/cultures/heritage_east_slavic.txt @@ -21,4 +21,5 @@ discover_innovation = innovation_plenary_assemblies discover_innovation = innovation_casus_belli # + join_era = culture_era_early_medieval } diff --git a/history/provinces/e_baltic.txt b/history/provinces/e_baltic.txt index 64639135..022a2636 100644 --- a/history/provinces/e_baltic.txt +++ b/history/provinces/e_baltic.txt @@ -1,25 +1,41 @@ #k_lithuania -##d_lithuanians ################################### +##d_vilnius ################################### ###c_kernave -154 = { #KERNAVE +155 = { #VILNIUS culture = lithuanian religion = mariavite - holding = tribal_holding + holding = castle_holding } -155 = { #VILNIUS +154 = { #KERNAVE holding = none } 149 = { #VILKMERGE holding = none } -165 = { #KREVA +13637 = { #Pabrade + holding = none +} +###c_utena +151 = { #UTENA + culture = lithuanian + religion = mariavite + holding = tribal_holding +} +13636 = { #Ignalina + holding = none +} +13635 = { #Rokiskis holding = none } -###c_trakai -153 = { #TRAKAI +##d_kaunas##################################### +###c_kaunas +130 = { #KAUNAS culture = lithuanian religion = mariavite + holding = castle_holding +} +153 = { #TRAKAI holding = tribal_holding 1066.1.1 = { buildings = { @@ -27,9 +43,6 @@ } } } -130 = { #KAUNAS - holding = none -} 160 = { #MERKINE holding = none } @@ -41,69 +54,123 @@ } ###c_yatvyagi -156 = { #PANEMUNE +13633 = { #Mrijampole culture = lithuanian religion = mariavite holding = tribal_holding } +156 = { #PANEMUNE + holding = tribal_holding +} 158 = { #VILKAVISKIS holding = none } +13634 = { #Garliava + holding = none +} -###c_braslau -166 = { #BRASLAU +##d_klaipeda#################################### +###c_memel +118 = { #MEMEL + culture = lithuanian + religion = mariavite + holding = castle_holding +} +125 = { #TAURAGE + holding = none +} +123 = { #JURBARKAS + holding = none +} + +##d_samogitia ################################### +###c_palanga +115 = { #PALANGA culture = lithuanian religion = mariavite holding = tribal_holding } -151 = { #UTENA +126 = { #MEDENIKEN holding = none } +128 = { #TELSIAI + holding = none +} +116 = { #DUVZARE + holding = none +} +111 = { #CEKLIS + holding = none +} + +###c_raseiniai +124 = { #RASEINIAI + culture = lithuanian + religion = mariavite + holding = tribal_holding +} +129 = { #VELIUONA + holding = none +} +131 = { #KEDAINIAI + holding = none +} +132 = { #UPYTE + holding = none +} + +###c_siauliai +127 = { #SIAULIAI + culture = lithuanian + religion = mariavite + holding = tribal_holding +} +152 = { #BIRZAI + holding = none +} +13629 = { #Joniskis + holding = none +} +13630 = { #Zagares + holding = none +} + +#k_latvia##################################################################################################################################################################### +##d_riga######################################## +###c_riga +108 = { #RIGA + + culture = latgalian + religion = lutheran + + holding = city_holding + +} ##d_courland ################################### -###c_zemigalians - -104 = { # 104 - JURMALA - - # Misc - culture = latgalian - religion = mariavite - holding = tribal_holding - 1199.1.1 = { - religion = lutheran - } -} -106 = { #DOBELE - holding = none - culture = latgalian - religion = mariavite - 1199.1.1 = { - religion = lutheran - } -} -107 = { #MITAU - holding = none -} -105 = { #BAUSKA - holding = none -} -121 = { #NEUENBURG - holding = none -} - ###c_vanemane 110 = { #PILTENE - culture = estonian - religion = finnish_pagan + culture = latgalian + religion = lutheran holding = tribal_holding - 1290.1.1 = { - religion = lutheran - } } 117 = { #DUNDAGA holding = none } +13627 = { #Kuldiga + holding = none +} + +###c_tukuma 112 = { #KANDAVA + culture = latgalian + religion = lutheran + holding = tribal_holding +} +13631 = { #Tukums + holding = none +} +121 = { #NEUENBURG holding = none } @@ -119,431 +186,78 @@ 113 = { #BANDAVA holding = none } -116 = { #DUVZARE +13628 = { #Skrunda holding = none } -111 = { #CEKLIS + +##d_zemgales################################### +###c_zemigalians +104 = { # 104 - JURMALA + + culture = latgalian + religion = lutheran + holding = tribal_holding + +} +106 = { #DOBELE + holding = none +} +107 = { #MITAU + holding = none +} +105 = { #BAUSKA holding = none } ###c_selpils 133 = { #SELPILS culture = latgalian - religion = mariavite + religion = lutheran holding = tribal_holding - 1199.1.1 = { - religion = lutheran - } } 150 = { #OKNIST holding = none } - -##d_samogitia ################################### -###c_raseiniai -124 = { #RASEINIAI - culture = lithuanian - religion = mariavite - holding = tribal_holding -} -123 = { #JURBARKAS - holding = none -} -129 = { #VELIUONA - holding = none -} -131 = { #KEDAINIAI +13638 = { #Demene holding = none } -###c_memel -118 = { #MEMEL - culture = lithuanian - religion = mariavite - holding = tribal_holding -} -125 = { #TAURAGE - holding = none -} - -###c_palanga -115 = { #PALANGA - culture = lithuanian - religion = mariavite - holding = tribal_holding -} -126 = { #MEDENIKEN - holding = none -} -128 = { #TELSIAI - holding = none -} - -###c_siauliai -127 = { #SIAULIAI - culture = lithuanian - religion = mariavite - holding = tribal_holding -} -132 = { #UPYTE - holding = none -} -152 = { #BIRZAI - holding = none -} - - -# 88 - ARENSBURG -88 = { # 88 - Arensburg - - # Misc - culture = estonian - religion = finnish_pagan - - holding = tribal_holding - - # History - 1228.1.1 = { - religion = lutheran - } - -} - -# 89 - SONEBURG -89 = { # 89 - SONEBURG - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1228.1.1 = { - religion = lutheran - } - -} - -# 90 - MUHU -90 = { # 90 - MUHU - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1228.1.1 = { - religion = lutheran - } - -} - -# 91 - DAGO -91 = { # 91 - DAGO - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1228.1.1 = { - religion = lutheran - } - -} - -# 92 - HAPSAL -92 = { # 92 - HAPSAL - - # Misc - culture = estonian - religion = finnish_pagan - - holding = tribal_holding - - # History - 1290.1.1 = { - religion = lutheran - } -} - -# 93 - LEAL -93 = { # 93 - LEAL - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1290.1.1 = { - religion = lutheran - } -} - -# 94 - REVAL -94 = { # 97 - REVAL - - # Misc - culture = estonian - religion = finnish_pagan - - holding = tribal_holding - - # History - 1066.1.1 = { - buildings = { - palisades_01 - market_villages_01 - } - } - 1279.1.1 = { - religion = lutheran - } - -} - -# 95 - HARJUMAA -95 = { # 95 - HARJUMAA - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1279.1.1 = { - religion = lutheran - } -} - -# 96 - JARVA -96 = { # 96 - JARVA - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1279.1.1 = { - religion = lutheran - } -} - -# 97 - WESENBURG -97 = { # 97 - WESENBURG - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1220.1.1 = { - religion = lutheran - } - -} - -# 98 - NARVA -98 = { # 98 - NARVA - - # Misc - culture = estonian - religion = finnish_pagan - - holding = tribal_holding - - # History - 1066.1.1 = { - buildings = { - palisades_01 - } - } - 1220.1.1 = { - religion = lutheran - } - -} - -# 99 - PARNU -99 = { # 99 - PARNU - - # Misc - culture = estonian - religion = finnish_pagan - - holding = tribal_holding - - # History - 1290.1.1 = { - religion = lutheran - } - -} - -# 100 - VILJANDI -100 = { # 100 - VILJANDI - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1290.1.1 = { - religion = lutheran - } - -} - -# 101 - LEMISELE -101 = { # 101 - LEMISELE - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1290.1.1 = { - religion = lutheran - } - -} - -# 108 - RIGA -108 = { # 108 - RIGA - - # Misc - culture = estonian - religion = finnish_pagan - - holding = tribal_holding - 1066.1.1 = { - buildings = { - market_villages_01 - longhouses_01 - } - } - - # History - 1290.1.1 = { - religion = lutheran - } -} - -# 143 - VASTSELIINA -143 = { # 143 - VASTSELIINA - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1224.1.1 = { - religion = lutheran - } -} - -# 144 - VALGA -144 = { # 144 - VALGA - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1224.1.1 = { - religion = lutheran - } -} - -# 145 - TARTU -145 = { # 145 - TARTU/DORPAT - - # Misc - culture = estonian - religion = finnish_pagan - - holding = tribal_holding - - # History - 1066.1.1 = { - buildings = { - longhouses_01 - } - } - 1224.1.1 = { - religion = lutheran - } - -} - -# 146 - POLTSAMAA -146 = { # 146 - POLTSAMAA - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1224.1.1 = { - religion = lutheran - } -} - -# 147 - ALISTEGUNDE -147 = { # 147 - ALISTEGUNDE - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1290.1.1 = { - religion = lutheran - } - -} - -# 148 - SALACGRIVA -148 = { # 148 - SALACGRIVA - - # Misc - culture = estonian - religion = finnish_pagan - - # History - 1290.1.1 = { - religion = lutheran - } - -} ##d_latgalians ################################### -###c_talava -102 = { #VALMIERA - culture = estonian - religion = finnish_pagan +###c_vidzeme +# 101 - LEMISELE +101 = { # 101 - LEMISELE + + culture = latgalian + religion = lutheran + holding = tribal_holding - 1290.1.1 = { - religion = lutheran - } + } -109 = { #VENDEN +102 = { #VALMIERA + holding = tribal_holding +} +147 = { #Rujiena / ALISTEGUNDE holding = none } +148 = { #SALACGRIVA + holding = none +} +###c_talava +109 = { #VENDEN + culture = latgalian + religion = lutheran + holding = tribal_holding +} 142 = { #RAUNA holding = none } ###c_kokenois 103 = { #KOKENOIS - culture = estonian - religion = finnish_pagan - 1050.1.1 = { - culture = latgalian - religion = mariavite - } + culture = latgalian + religion = lutheran holding = tribal_holding - 1290.1.1 = { - religion = lutheran - } } 139 = { #CESVAINE holding = none @@ -553,18 +267,15 @@ } ###c_jersika -136 = { #JERSIKA +137 = { #DAUGAVPILS culture = latgalian - religion = mariavite + religion = lutheran holding = tribal_holding - 1290.1.1 = { - religion = lutheran - } } 135 = { #JEKABPILS holding = none } -137 = { #DAUGAVPILS +136 = { #JERSIKA holding = none } 138 = { #REZEKNE @@ -574,12 +285,173 @@ ###c_aluksne 141 = { #ALUKSNE culture = latgalian - religion = mariavite + religion = lutheran holding = tribal_holding - 1290.1.1 = { - religion = lutheran - } } 140 = { #GULBENE holding = none } + + + +#k_esthonia######################################################################################################################################## +##d_esthonia############################################# +###c_harjumaaa +94 = { # tallin / REVAL + + culture = estonian + religion = lutheran + + holding = castle_holding + +} +95 = { # marjamaa + holding = tribal_holding +} + +96 = { # jarvakandi + holding = none +} +13622 = { # kiiu + holding = none +} +13623 = { # loksa + holding = city_holding +} + +###c_wiek +92 = { # HAPSAL + + culture = estonian + religion = lutheran + + holding = tribal_holding + +} + +#d_narva######################## +#c_ida_viru +98 = { # 98 - NARVA + + # Misc + culture = NEOW_novgorodian + religion = third_covenant + + holding = city_holding + +} +13618 = { + holding = none +} +13619 = { + holding = monotown_holding +} + +#c_laane_viru +97 = { # 97 - WESENBURG + culture = estonian + religion = lutheran + holding = castle_holding +} +13620 = { + holding = none +} +146 = { #POLTSAMAA + holding = none +} + +##d_moonsund +###c_saaremaa +88 = { # kuressaare + + culture = estonian + religion = lutheran + + holding = castle_holding + +} + +89 = { # poide + + culture = estonian + religion = lutheran + + holding = tribal_holding +} + +90 = { # muhu + + culture = estonian + religion = lutheran + + holding = city_holding +} + +###c_hiiuma +91 = { # kaina / dago + + culture = estonian + religion = lutheran + + holding = tribal_holding +} + +13624 = { # korgessaare + + holding = none +} + +##d_parnu +###c_parnu +99 = { # 99 - PARNU + + culture = estonian + religion = lutheran + + holding = castle_holding +} +93 = { # 93 - LEAL + + culture = estonian + religion = lutheran + + holding = tribal_holding +} +13625 = { #testama + holding = none +} + +###c_livs +100 = { # 100 - VILJANDI + + culture = estonian + religion = lutheran + + holding = tribal_holding +} +13621 = { #vandra + holding = none +} +13626 = { #karksi nuia + holding = none +} + +##d_tartu######################################## +###c_tartu +145 = { #TARTU/DORPAT Yuriev + + culture = estonian + religion = lutheran + + holding = tribal_holding + buildings = { + longhouses_01 + } +} +143 = { #VASTSELIINA + holding = none +} +144 = { #VALGA + holding = none +} + diff --git a/history/provinces/e_nistrenia.txt b/history/provinces/e_nistrenia.txt index ff317e01..9c5e2175 100644 --- a/history/provinces/e_nistrenia.txt +++ b/history/provinces/e_nistrenia.txt @@ -2414,6 +2414,10 @@ religion = orthodox } } +165 = { #KREVA + holding = none +} + 5123 = { #Lahoysk holding = none 1078.1.1 = { @@ -2462,6 +2466,12 @@ 5131 = { #Myory holding = none } +###c_braslau +166 = { #BRASLAU + culture = lithuanian + religion = mariavite + holding = tribal_holding +} ###c_lukoml 934 = { #Lukoml diff --git a/history/provinces/e_zapadoslavia.txt b/history/provinces/e_zapadoslavia.txt index 7589777a..03b63531 100644 --- a/history/provinces/e_zapadoslavia.txt +++ b/history/provinces/e_zapadoslavia.txt @@ -611,7 +611,7 @@ holding = none } -###c_balga (Kaliningrad) +###c_balga (Gvardeisk) 13615 = { # Gvardeisk culture = NEOW_pribaltic religion = mariavite @@ -624,13 +624,13 @@ holding = none } 3203 = { # Mamonovo - holding = none + holding = city_holding } ###c_natangia (Znamensk) -13617 = { # Znamensk +3206 = { # Chernyakhovsk culture = NEOW_pribaltic religion = mariavite - holding = castle_holding + holding = city_holding } 3219 = { # Kętrzyn holding = city_holding @@ -648,13 +648,13 @@ holding = castle_holding } 3220 = { # Gusev - holding = none + holding = city_holding } 120 = { # Neman holding = none } -3206 = { # Chernyakhovsk - holding = church_holding +13617 = { # Talpaki + holding = none } #k_goralia diff --git a/history/titles/k_bosnia.txt b/history/titles/k_bosnia.txt index 8b137891..96e2365c 100644 --- a/history/titles/k_bosnia.txt +++ b/history/titles/k_bosnia.txt @@ -1 +1,5 @@ - +k_bosnia = { + 2547.1.1 = { + change_development_level = 6 + } +} diff --git a/history/titles/k_bulgaria.txt b/history/titles/k_bulgaria.txt index 3376df04..9e480fb8 100644 --- a/history/titles/k_bulgaria.txt +++ b/history/titles/k_bulgaria.txt @@ -1,6 +1,7 @@ k_bulgaria = { 2530.1.1 = { holder = yugoslavia0003 + change_development_level = 7 } } diff --git a/history/titles/k_croatia.txt b/history/titles/k_croatia.txt index e69de29b..4fba0a9d 100644 --- a/history/titles/k_croatia.txt +++ b/history/titles/k_croatia.txt @@ -0,0 +1,5 @@ +k_croatia = { + 2547.1.1 = { + change_development_level = 7 + } +} \ No newline at end of file diff --git a/history/titles/k_cyprus.txt b/history/titles/k_cyprus.txt new file mode 100644 index 00000000..157db537 --- /dev/null +++ b/history/titles/k_cyprus.txt @@ -0,0 +1,5 @@ +k_cyprus = { + 2547.1.1 = { + change_development_level = 10 + } +} \ No newline at end of file diff --git a/history/titles/k_dacia.txt b/history/titles/k_dacia.txt new file mode 100644 index 00000000..0e9fb07d --- /dev/null +++ b/history/titles/k_dacia.txt @@ -0,0 +1,6 @@ +k_dacia = { + 2553.1.1 = { + holder = nistria0005 + change_development_level = 6 + } +} \ No newline at end of file diff --git a/history/titles/k_epirus.txt b/history/titles/k_epirus.txt new file mode 100644 index 00000000..60175365 --- /dev/null +++ b/history/titles/k_epirus.txt @@ -0,0 +1,5 @@ +k_epirus = { + 2547.1.1 = { + change_development_level = 6 + } +} \ No newline at end of file diff --git a/history/titles/k_estonia.txt b/history/titles/k_estonia.txt new file mode 100644 index 00000000..79a25a63 --- /dev/null +++ b/history/titles/k_estonia.txt @@ -0,0 +1,19 @@ +k_esthonia= { + 2554.1.1 = { + holder = baltic0002 + change_development_level = 7 + } +} +d_narva = { + 2554.1.1 = { + holder = baltic0003 + change_development_level = 9 + liege = k_esthonia + } +} +c_laane_viru = { + 2554.1.1 = { + holder = baltic0002 + change_development_level = 7 + } +} \ No newline at end of file diff --git a/history/titles/k_finland.txt b/history/titles/k_finland.txt new file mode 100644 index 00000000..08da8633 --- /dev/null +++ b/history/titles/k_finland.txt @@ -0,0 +1,5 @@ +k_finland= { + 2547.1.1 = { + change_development_level = 5 + } +} \ No newline at end of file diff --git a/history/titles/k_goralia.txt b/history/titles/k_goralia.txt new file mode 100644 index 00000000..9799adb8 --- /dev/null +++ b/history/titles/k_goralia.txt @@ -0,0 +1,5 @@ +k_goralia = { + 2554.1.1 = { + change_development_level = 6 + } +} \ No newline at end of file diff --git a/history/titles/k_hellas.txt b/history/titles/k_hellas.txt new file mode 100644 index 00000000..e1b20cf2 --- /dev/null +++ b/history/titles/k_hellas.txt @@ -0,0 +1,5 @@ +k_hellas = { + 2554.1.1 = { + change_development_level = 7 + } +} \ No newline at end of file diff --git a/history/titles/k_hungary.txt b/history/titles/k_hungary.txt new file mode 100644 index 00000000..efda75b4 --- /dev/null +++ b/history/titles/k_hungary.txt @@ -0,0 +1,5 @@ +k_hungary = { + 2554.1.1 = { + change_development_level = 7 + } +} \ No newline at end of file diff --git a/history/titles/k_karelia.txt b/history/titles/k_karelia.txt new file mode 100644 index 00000000..294ecba8 --- /dev/null +++ b/history/titles/k_karelia.txt @@ -0,0 +1,5 @@ +k_karelia = { + 2547.1.1 = { + change_development_level = 5 + } +} \ No newline at end of file diff --git a/history/titles/k_krete.txt b/history/titles/k_krete.txt index 4da113cc..b4720c0f 100644 --- a/history/titles/k_krete.txt +++ b/history/titles/k_krete.txt @@ -1,3 +1,8 @@ +k_krete = { + 2554.1.1 = { + change_development_level = 7 + } +} c_lesbos = { 2554.1.1 = { holder = greece0020 diff --git a/history/titles/k_latvia.txt b/history/titles/k_latvia.txt new file mode 100644 index 00000000..950ee638 --- /dev/null +++ b/history/titles/k_latvia.txt @@ -0,0 +1,6 @@ +k_latvia = { + 2547.1.1 = { + holder = baltic0001 + change_development_level = 6 + } +} diff --git a/history/titles/k_lithuania.txt b/history/titles/k_lithuania.txt index 9c1f5506..d86d53e7 100644 --- a/history/titles/k_lithuania.txt +++ b/history/titles/k_lithuania.txt @@ -1,19 +1,6 @@ - - k_lithuania = { 2547.1.1 = { holder = baltic0001 + change_development_level = 6 } } - -k_latvia = { - 2547.1.1 = { - holder = baltic0001 - } -} - -k_esthonia= { - 2540.1.1 = { - holder = baltic0002 - } -} \ No newline at end of file diff --git a/history/titles/k_macedonia.txt b/history/titles/k_macedonia.txt index e69de29b..fd4ebe79 100644 --- a/history/titles/k_macedonia.txt +++ b/history/titles/k_macedonia.txt @@ -0,0 +1,5 @@ +k_macedonia = { + 2547.1.1 = { + change_development_level = 6 + } +} \ No newline at end of file diff --git a/history/titles/k_montenegro.txt b/history/titles/k_montenegro.txt index e69de29b..b961eeb3 100644 --- a/history/titles/k_montenegro.txt +++ b/history/titles/k_montenegro.txt @@ -0,0 +1,5 @@ +k_montenegro = { + 2554.1.1 = { + change_development_level = 7 + } +} \ No newline at end of file diff --git a/history/titles/k_poland.txt b/history/titles/k_poland.txt index 36a7b474..cd683177 100644 --- a/history/titles/k_poland.txt +++ b/history/titles/k_poland.txt @@ -1,6 +1,14 @@ k_poland = { 2554.1.1 = { holder = zapadoslavia0005 #polandking + change_development_level = 7 + } +} + +c_czerska = { + 2554.1.1 = { + holder = zapadoslavia0005 #polandking + change_development_level = 10 } } @@ -8,6 +16,15 @@ d_lesser_poland = { 2554.1.1 = { holder = zapadoslavia0019 liege = k_poland + change_development_level = 6 + } +} + +c_krakowska = { + 2554.1.1 = { + holder = zapadoslavia0019 + liege = k_poland + change_development_level = 9 } } @@ -92,13 +109,21 @@ d_prussia = { 2554.1.1 = { holder = zapadoslavia0031 liege = k_poland + change_development_level = 9 + } +} + +c_tilsit = { + 2554.1.1 = { + holder = zapadoslavia0032 + liege = d_prussia + change_development_level = 7 } } c_balga = { 2554.1.1 = { - holder = zapadoslavia0032 - liege = d_prussia + change_development_level = 8 } } @@ -106,6 +131,7 @@ c_natangia = { 2554.1.1 = { holder = zapadoslavia0033 liege = d_prussia + change_development_level = 6 } } @@ -169,6 +195,7 @@ c_ostroleka = { 2554.1.1 = { holder = zapadoslavia0046 liege = k_poland + change_development_level = 9 } } @@ -202,6 +229,7 @@ d_pommerania = { c_danzig = { 2554.1.1 = { holder = zapadoslavia0040 + change_development_level = 8 } } diff --git a/history/titles/k_sapmi.txt b/history/titles/k_sapmi.txt new file mode 100644 index 00000000..2e83165e --- /dev/null +++ b/history/titles/k_sapmi.txt @@ -0,0 +1,5 @@ +k_sapmi = { + 2547.1.1 = { + change_development_level = 2 + } +} \ No newline at end of file diff --git a/history/titles/k_serbia.txt b/history/titles/k_serbia.txt index beb5f3b3..9d0c2541 100644 --- a/history/titles/k_serbia.txt +++ b/history/titles/k_serbia.txt @@ -1,4 +1,8 @@ - +k_serbia = { + 2554.1.1 = { + change_development_level = 7 + } +} d_macva = { 2554.1.1 = { diff --git a/history/titles/k_slovakia.txt b/history/titles/k_slovakia.txt index 5aa795e3..07405ae3 100644 --- a/history/titles/k_slovakia.txt +++ b/history/titles/k_slovakia.txt @@ -1,7 +1,6 @@ - - k_slovakia = { 2547.1.1 = { holder = zapadoslavia0007 + change_development_level = 6 } } \ No newline at end of file diff --git a/history/titles/k_slovenia.txt b/history/titles/k_slovenia.txt index 8699d31c..749e090a 100644 --- a/history/titles/k_slovenia.txt +++ b/history/titles/k_slovenia.txt @@ -1,8 +1,7 @@ - - k_slovenia = { 2554.1.1 = { holder = yugoslavia0004 + change_development_level = 7 } } diff --git a/history/titles/k_thrace.txt b/history/titles/k_thrace.txt index edd2cb34..1093d1d3 100644 --- a/history/titles/k_thrace.txt +++ b/history/titles/k_thrace.txt @@ -1,3 +1,8 @@ +k_thrace = { + 2554.1.1 = { + change_development_level = 8 + } +} c_kalliopolis = { 2554.1.1 = { diff --git a/history/titles/k_transyvania.txt b/history/titles/k_transyvania.txt index 3aa85117..c695ec17 100644 --- a/history/titles/k_transyvania.txt +++ b/history/titles/k_transyvania.txt @@ -4,6 +4,7 @@ e_nistrenia = { 2554.1.1 = { holder = nistria0002 + change_development_level = 6 } } @@ -13,12 +14,6 @@ k_transylvania = { } } -k_dacia = { - 2553.1.1 = { - holder = nistria0005 - } -} - k_moldavia = { 2554.1.1 = { diff --git a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml index 87d537e8..58d258ef 100644 --- a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml @@ -301,8 +301,9 @@ dynn_swinka:0 "Świnka" dynn_elk:0 "Ełk" dynn_koroleveckiy:0 "Koroleveckiy" - dynn_tserlona:0 "Tserlona" - dynn_dyatlova:0 "Dyatlova" + dynn_tilsit:0 "Tilsit" + dynn_velovskiy:0 "Velovskiy" + dynn_rosenkranz:0 "Rosenkranz" dynn_choszczno:0 "Choszczno" dynn_hrabisid:0 "Hrabišid" dynn_gamrat:0 "Gamrat" diff --git a/localization/english/replace/mercenaries_l_english.yml b/localization/english/replace/mercenaries_l_english.yml new file mode 100644 index 00000000..fecefc2e --- /dev/null +++ b/localization/english/replace/mercenaries_l_english.yml @@ -0,0 +1,507 @@ +l_english: + mercenary_company_bitter_winter_band:0 "Bitter-Winter Band" + mercenary_company_knE_z_evi_of_the_road:0 "Knéževi of the Road" + mercenary_company_forest_wolves:0 "Forest Wolves" + mercenary_company_allemannic_guard:0 "Allemannic Guard" + mercenary_company_allemannic_guard_article:0 "the " + mercenary_company_almogavars_1:0 "Almogavars of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_almogavars_1_article:0 "the " + mercenary_company_almogavars_2:0 "Almogavars of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_almogavars_2_article:0 "the " + mercenary_company_almogavars_andalusian_1:0 "Almogavars of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_almogavars_andalusian_1_article:0 "the " + mercenary_company_altaic_riders_of_place:0 "Riders of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_altaic_riders_of_place_article:0 "the " + mercenary_company_andalusian_treasurers_1:0 "Treasurers of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_andalusian_treasurers_1_article:0 "the " + mercenary_company_apabhransa_band:0 "Apabhranśa Band" + mercenary_company_apabhransa_band_article:0 "the " + mercenary_company_army_of_kylfingar:0 "Army of Kylfingar" + mercenary_company_army_of_kylfingar_article:0 "the " + mercenary_company_army_of_the_crossing:0 "Army of the Crossing" + mercenary_company_army_of_the_crossing_article:0 "the " + mercenary_company_army_of_the_ore:0 "Army of the Ore" + mercenary_company_army_of_the_ore_article:0 "the " + mercenary_company_army_of_the_senator:0 "Army of the Senator" + mercenary_company_army_of_the_senator_article:0 "the " + mercenary_company_army_under_the_sky:0 "Army Under the Sky" + mercenary_company_army_under_the_sky_article:0 "the " + mercenary_company_badami_companions:0 "Badami Companions" + mercenary_company_badami_companions_article:0 "the " + mercenary_company_baltic_band:0 "Baltic Band" + mercenary_company_baltic_band_article:0 "the " + mercenary_company_band_of_firesmoke:0 "Band of Firesmoke" + mercenary_company_band_of_firesmoke_article:0 "the " + mercenary_company_band_of_horned_welshmen:0 "Band of the Horn" + mercenary_company_band_of_horned_welshmen_article:0 "the " + mercenary_company_band_of_kerns:0 "Band of Kerns" + mercenary_company_band_of_kerns_article:0 "the " + mercenary_company_band_of_medes:0 "Band of Medes" + mercenary_company_band_of_medes_article:0 "the " + mercenary_company_band_of_sermaj:0 "Band of Sermaj" + mercenary_company_band_of_sermaj_article:0 "the " + mercenary_company_band_of_the_arrow_rain:0 "Band of the Arrow Rain" + mercenary_company_band_of_the_arrow_rain_article:0 "the " + mercenary_company_band_of_the_bay:0 "Band of the Bay" + mercenary_company_band_of_the_bay_article:0 "the " + mercenary_company_band_of_the_black_monk:0 "Band of the Black Monk" + mercenary_company_band_of_the_black_monk_article:0 "the " + mercenary_company_band_of_the_brigand_emperor:0 "Band of the Brigand Emperor" + mercenary_company_band_of_the_brigand_emperor_article:0 "the " + mercenary_company_band_of_the_egg:0 "Band of the Egg" + mercenary_company_band_of_the_egg_article:0 "the " + mercenary_company_band_of_the_fallen_knez:0 "Band of the Fallen Knez" + mercenary_company_band_of_the_fallen_knez_article:0 "the " + mercenary_company_band_of_the_father:0 "Band of the Father" + mercenary_company_band_of_the_father_article:0 "the " + mercenary_company_band_of_the_fields:0 "Band of the Fields" + mercenary_company_band_of_the_fields_article:0 "the " + mercenary_company_band_of_the_nilgai:0 "Band of the Nilgai" + mercenary_company_band_of_the_nilgai_article:0 "the " + mercenary_company_band_of_the_seas:0 "Band of the Seas" + mercenary_company_band_of_the_seas_article:0 "the " + mercenary_company_band_of_tocharoi:0 "Band of Tókharoi" + mercenary_company_band_of_tocharoi_article:0 "the " + mercenary_company_baranis_company_of_place:0 "Company of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_baranis_company_of_place_article:0 "the " + mercenary_company_bedouin_company_of_place:0 "Company of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_bedouin_company_of_place_article:0 "the " + mercenary_company_bengal_host:0 "Bengal Host" + mercenary_company_bengal_host_article:0 "the " + mercenary_company_birchers_of_place:0 "Birchers of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_birchers_of_place_article:0 "the " + mercenary_company_black_band:0 "Black Band" + mercenary_company_black_band_article:0 "the " + mercenary_company_bodyguards_of_gwendolen:0 "Bodyguards of Gwendolen" + mercenary_company_bodyguards_of_gwendolen_article:0 "the " + mercenary_company_border_reavers_band:0 "Border Reaver's Band" + mercenary_company_border_reavers_band_article:0 "the " + mercenary_company_border_reivers:0 "Border Reivers" + mercenary_company_border_reivers_article:0 "the " + mercenary_company_brothers_of_bayan:0 "Brothers of Bayan" + mercenary_company_brothers_of_bayan_article:0 "the " + mercenary_company_bull:0 "Company of the Bull" + mercenary_company_bull_article:0 "the " + mercenary_company_butr_place_band:0 "[TITLE.GetNameNoTierNoTooltip] Band" + mercenary_company_butr_place_band_article:0 "the " + mercenary_company_chastisement_of_place:0 "Chastisement of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_chastisement_of_place_article:0 "the " + mercenary_company_compagnia_del_cappalletto:0 "Company of the Hat" + mercenary_company_compagnia_del_cappalletto_article:0 "the " + mercenary_company_compagnia_della_rosa:0 "Company of the Rose" + mercenary_company_compagnia_della_rosa_article:0 "the " + mercenary_company_compagnia_della_stella:0 "Company of the Star" + mercenary_company_compagnia_della_stella_article:0 "the " + mercenary_company_compagnia_di_san_giorgio:0 "Company of Saint George" + mercenary_company_compagnia_di_san_giorgio_article:0 "the " + mercenary_company_companions_of_the_woods:0 "Companions of the Woods" + mercenary_company_companions_of_the_woods_article:0 "the " + mercenary_company_company_of_bretons:0 "Company of Bretons" + mercenary_company_company_of_bretons_article:0 "the " + mercenary_company_company_of_four_kings:0 "Company of Four Kings" + mercenary_company_company_of_four_kings_article:0 "the " + mercenary_company_company_of_jarl_landless:0 "Company of Jarl Landless" + mercenary_company_company_of_jarl_landless_article:0 "the " + mercenary_company_company_of_khantys:0 "Company of Khanty" + mercenary_company_company_of_kashmir:0 "Company of Kashmir" + mercenary_company_company_of_khantys_article:0 "the " + mercenary_company_company_of_kvens:0 "Company of Kvens" + mercenary_company_company_of_kvens_article:0 "the " + mercenary_company_company_of_makran:0 "Company of Makran" + mercenary_company_company_of_makran_article:0 "the " + mercenary_company_company_of_many_colours:0 "Company of Many Colors" + mercenary_company_company_of_many_colours_article:0 "the " + mercenary_company_company_of_meroe:0 "Company of Meroe" + mercenary_company_company_of_meroe_article:0 "the " + mercenary_company_company_of_odisha:0 "Company of Odisha" + mercenary_company_company_of_odisha_article:0 "the " + mercenary_company_company_of_oleg:0 "Followers of Oleg" + mercenary_company_company_of_oleg_article:0 "the " + mercenary_company_company_of_rus:0 "Company of Rus" + mercenary_company_company_of_rus_article:0 "the " + mercenary_company_company_of_sea_crossers:0 "Company of Sea Crossers" + mercenary_company_company_of_sea_crossers_article:0 "the " + mercenary_company_company_of_shahids:0 "Company of Shahids" + mercenary_company_company_of_shahids_article:0 "the " + mercenary_company_company_of_shield_and_scian:0 "Company of Shield and Scian" + mercenary_company_company_of_shield_and_scian_article:0 "the " + mercenary_company_company_of_sogdiana:0 "Company of Sogdiana" + mercenary_company_company_of_sogdiana_article:0 "the " + mercenary_company_company_of_the_cannibal:0 "Company of the Cannibal" + mercenary_company_company_of_the_cannibal_article:0 "the " + mercenary_company_company_of_the_cruel_hand:0 "Company of the Cruel Hand" + mercenary_company_company_of_the_cruel_hand_article:0 "the " + mercenary_company_company_of_the_dead_men:0 "Company of the Dead Men" + mercenary_company_company_of_the_dead_men_article:0 "the " + mercenary_company_company_of_the_deeplands:0 "Company of the Deeplands" + mercenary_company_company_of_the_deeplands_article:0 "the " + mercenary_company_company_of_the_delta:0 "Company of the Delta" + mercenary_company_company_of_the_delta_article:0 "the " + mercenary_company_company_of_the_dog:0 "Company of the Dog" + mercenary_company_company_of_the_dog_article:0 "the " + mercenary_company_company_of_the_exile:0 "Company of the Exile" + mercenary_company_company_of_the_exile_article:0 "the " + mercenary_company_company_of_the_gambia:0 "Company of the Gambra" + mercenary_company_company_of_the_gambia_article:0 "the " + mercenary_company_company_of_the_ganges:0 "Company of the Ganges" + mercenary_company_company_of_the_ganges_article:0 "the " + mercenary_company_company_of_the_ghats:0 "Company of the Ghats" + mercenary_company_company_of_the_ghats_article:0 "the " + mercenary_company_company_of_the_goad:0 "Company of the Goad" + mercenary_company_company_of_the_goad_article:0 "the " + mercenary_company_company_of_the_great_rann:0 "Company of the Great Rann" + mercenary_company_company_of_the_great_rann_article:0 "the " + mercenary_company_company_of_the_kings_son:0 "Company of the King's Son" + mercenary_company_company_of_the_kings_son_article:0 "the " + mercenary_company_company_of_the_koyil:0 "Company of the Koyil" + mercenary_company_company_of_the_koyil_article:0 "the " + mercenary_company_company_of_the_leopard:0 "Company of the Leopard" + mercenary_company_company_of_the_leopard_article:0 "the " + mercenary_company_company_of_the_oasis:0 "Company of the Oasis" + mercenary_company_company_of_the_oasis_article:0 "the " + mercenary_company_company_of_the_punjab:0 "Company of the Punjab" + mercenary_company_company_of_the_punjab_article:0 "the " + mercenary_company_company_of_the_saint:0 "Company of the Saint" + mercenary_company_company_of_the_saint_article:0 "the " + mercenary_company_company_of_the_skull_cup:0 "Company of the Skull Cup" + mercenary_company_company_of_the_skull_cup_article:0 "the " + mercenary_company_company_of_the_staff:0 "Company of the Staff" + mercenary_company_company_of_the_staff_article:0 "the " + mercenary_company_company_of_the_stalo:0 "Company of the Stalo" + mercenary_company_company_of_the_stalo_article:0 "the " + mercenary_company_company_of_the_stone_anchor:0 "Company of the Stone Anchor" + mercenary_company_company_of_the_stone_anchor_article:0 "the " + mercenary_company_company_of_the_stout_horse:0 "Company of the Stout Horse" + mercenary_company_company_of_the_stout_horse_article:0 "the " + mercenary_company_company_of_the_tiger:0 "Company of the Tiger" + mercenary_company_company_of_the_tiger_article:0 "the " + mercenary_company_company_of_the_yurt:0 "Company of the Yurt" + mercenary_company_company_of_the_yurt_article:0 "the " + mercenary_company_counts_exiles:0 "Count's Exiles" + mercenary_company_counts_exiles_article:0 "the " + mercenary_company_daylamite_company:0 "Daylamite Company" + mercenary_company_daylamite_company_article:0 "the " + mercenary_company_default:0 "[CULTURE.GetNameNoTooltip] Band of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_desert_brethren:0 "Desert Brethren" + mercenary_company_desert_brethren_article:0 "the " + mercenary_company_dreamers_of_the_jog:0 "Dreamers of the Jog" + mercenary_company_dreamers_of_the_jog_article:0 "the " + mercenary_company_druzynan_host:0 "Drużynan Host" + mercenary_company_druzynan_host_article:0 "the " + mercenary_company_finnish_band:0 "Finnish Band" + mercenary_company_finnish_band_article:0 "the " + mercenary_company_flemish_band:0 "Flemish Band" + mercenary_company_flemish_band_article:0 "the " + mercenary_company_followers_of_sundiata:0 "Followers of Sundiata" + mercenary_company_followers_of_sundiata_article:0 "the " + mercenary_company_followers_of_the_priest_king:0 "Followers of the Priest King" + mercenary_company_followers_of_the_priest_king_article:0 "the " + mercenary_company_free_company_of_the_pospolite:0 "Free Company of the Pospolite" + mercenary_company_free_company_of_the_pospolite_article:0 "the " + mercenary_company_freelances_of_brandys:0 "Free Lances of Brandýs" + mercenary_company_freelances_of_brandys_article:0 "the " + mercenary_company_french:0 "Company of the Rooster" + mercenary_company_french_article:0 "the " + mercenary_company_french_band_1:0 "Band of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_french_band_1_article:0 "the " + mercenary_company_french_band_2:0 "[TITLE.GetNameNoTierNoTooltip] Band" + mercenary_company_french_band_2_article:0 "the " + mercenary_company_gallowglasses:0 "Gallowglasses" + mercenary_company_gallowglasses_article:0 "the " + mercenary_company_geezan_company:0 "Ge'ezan Company" + mercenary_company_geezan_company_article:0 "the " + mercenary_company_ghilman:0 "Ghilman" + mercenary_company_ghilman_article:0 "the " + mercenary_company_gondershe_band:0 "Gondershe Band" + mercenary_company_gondershe_band_article:0 "the " + mercenary_company_gota_band:0 "Göta Band" + mercenary_company_gota_band_article:0 "the " + mercenary_company_gran_companyia_catalana:0 "Great Catalan Company" + mercenary_company_gran_companyia_catalana_article:0 "the " + mercenary_company_great_company:0 "Great Company" + mercenary_company_great_company_article:0 "the " + mercenary_company_guardians_of_almnara:0 "Guardians of Almnara" + mercenary_company_guardians_of_almnara_article:0 "the " + mercenary_company_guards_of_rama_setu:0 "Guards of Rama Setu" + mercenary_company_guards_of_rama_setu_article:0 "the " + mercenary_company_harappan_band:0 "Harappan Band" + mercenary_company_harappan_band_article:0 "the " + mercenary_company_hawkwoods_band:0 "Hawkwood's Band" + mercenary_company_hengist_retinue:0 "Retinue of Hengist" + mercenary_company_hengist_retinue_article:0 "the " + mercenary_company_herder_company:0 "Herder Company" + mercenary_company_herder_company_article:0 "the " + mercenary_company_heruli:0 "Herules" + mercenary_company_heruli_article:0 "the " + mercenary_company_hindustani_band:1 "Kannauji Band" + mercenary_company_hindustani_band_article:0 "the " + mercenary_company_hoplites_of_place:0 "Hoplites of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_hoplites_of_place_article:0 "the " + mercenary_company_horsas_band:0 "Band of Horsa" + mercenary_company_horsas_band_article:0 "the " + mercenary_company_host_of_komi:0 "Host of Komi" + mercenary_company_host_of_komi_article:0 "the " + mercenary_company_host_of_sangala:0 "Host of Sangala" + mercenary_company_host_of_sangala_article:0 "the " + mercenary_company_host_of_the_nile:0 "Host of the Nile" + mercenary_company_host_of_the_nile_article:0 "the " + mercenary_company_host_of_the_viscount:0 "Host of the Viscount" + mercenary_company_host_of_the_viscount_article:0 "the " + mercenary_company_host_of_varangians:0 "Varangian Host" + mercenary_company_host_of_varangians_article:0 "the " + mercenary_company_huscarls_of_the_sea:0 "Huscarls of the Sea" + mercenary_company_huscarls_of_the_sea_article:0 "the " + mercenary_company_immortals_of_place:0 "Immortals of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_immortals_of_place_article:0 "the " + mercenary_company_iron_arms_company:0 "Iron Arm's Company" + mercenary_company_iron_arms_company_article:0 "the " + mercenary_company_karjala_company:0 "Karjala Company" + mercenary_company_karjala_company_article:0 "the " + mercenary_company_keepers_of_the_lighthouse:0 "Keepers of the Lighthouse" + mercenary_company_keepers_of_the_lighthouse_article:0 "the " + mercenary_company_khanty_host:0 "Khanty Host" + mercenary_company_khanty_host_article:0 "the " + mercenary_company_khorasan_band:0 "Khorasani Band" + mercenary_company_khorasan_band_article:0 "the " + mercenary_company_kievan_band:1 "Kyivan Band" + mercenary_company_kievan_band_article:0 "the " + mercenary_company_kushite_band:0 "Kushite Band" + mercenary_company_kushite_band_article:0 "the " + mercenary_company_lawgochs_followers:0 "Lawgoch's Followers" + mercenary_company_madhmanns_company:0 "Madhmann's Company" + mercenary_company_mamluks:0 "Mamluks" + mercenary_company_mamluks_article:0 "the " + mercenary_company_manglabites:0 "Manglabites" + mercenary_company_manglabites_article:0 "the " + mercenary_company_marchers_of_wasconia:0 "Marchers of Wasconia" + mercenary_company_marchers_of_wasconia_article:0 "the " + mercenary_company_mawali_band:0 "Mawali Band" + mercenary_company_mawali_band_article:0 "the " + mercenary_company_moksha_archer_company:0 "Moksha Archer Company" + mercenary_company_moksha_archer_company_article:0 "the " + mercenary_company_nafarroako_konpainia:0 "Navarrese Company" + mercenary_company_nafarroako_konpainia_article:0 "the " + mercenary_company_nenet_band:0 "Nenet Band" + mercenary_company_nenet_band_article:0 "the " + mercenary_company_noba_company:0 "Noba Company" + mercenary_company_noba_company_article:0 "the " + mercenary_company_normans_of_drengot:0 "Normans of Drengot" + mercenary_company_normans_of_drengot_article:0 "the " + mercenary_company_north_sea_reavers:0 "North Sea Reavers" + mercenary_company_north_sea_reavers_article:0 "the " + mercenary_company_oder_band:0 "Oder Free Company" + mercenary_company_oder_band_article:0 "the " + mercenary_company_of_the_brabancon_wolf:0 "Company of the Brabançon Wolf" + mercenary_company_of_the_brabancon_wolf_article:0 "the " + mercenary_company_oriya_band:0 "Oryia Band" + mercenary_company_oriya_band_article:0 "the " + mercenary_company_place_cataphracts:0 "[TITLE.GetNameNoTierNoTooltip] Cataphracts" + mercenary_company_place_cataphracts_article:0 "the " + mercenary_company_place_horde:0 "[TITLE.GetNameNoTierNoTooltip] Horde" + mercenary_company_place_horde_article:0 "the " + mercenary_company_queens_hird:0 "Queen's Hird" + mercenary_company_queens_hird_article:0 "the " + mercenary_company_raiders_of_caspia:0 "Raiders of Caspia" + mercenary_company_raiders_of_caspia_article:0 "the " + mercenary_company_rajaputra_band:0 "Rajaputra Band" + mercenary_company_rajaputra_band_article:0 "the " + mercenary_company_redshanks:0 "Redshanks" + mercenary_company_redshanks_article:0 "the " + mercenary_company_rice_grain_band:0 "Rice Grain Band" + mercenary_company_rice_grain_band_article:0 "the " + mercenary_company_riders_of_the_coast:0 "Riders of the Coast" + mercenary_company_riders_of_the_coast_article:0 "the " + mercenary_company_riders_of_the_mountains:0 "Riders of the Mountains" + mercenary_company_riders_of_the_mountains_article:0 "the " + mercenary_company_routiers_1:0 "Routiers of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_routiers_1_article:0 "the " + mercenary_company_routiers_of_the_archpriest:0 "Routiers of the Archpriest" + mercenary_company_routiers_of_the_archpriest_article:0 "the " + mercenary_company_sahelian_band:0 "Sahelian Band" + mercenary_company_sahelian_band_article:0 "the " + mercenary_company_sarkans_of_place:0 "Sarkans of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_sarkans_of_place_article:0 "the " + mercenary_company_servants_of_the_vatandar:0 "Servants of the Vatandar" + mercenary_company_servants_of_the_vatandar_article:0 "the " + mercenary_company_sheperds_of_the_romans:0 "Shepherds of the Romans" + mercenary_company_sheperds_of_the_romans_article:0 "the " + mercenary_company_slaughterers:0 "Slaughterers" + mercenary_company_slaughterers_article:0 "the " + mercenary_company_sogdian_warriors:0 "Sogdian Warriors" + mercenary_company_sogdian_warriors_article:0 "the " + mercenary_company_steppe_dancers_band:0 "Steppe Dancer's Band" + mercenary_company_steppe_dancers_band_article:0 "the " + mercenary_company_stratioti_of_place_1:0 "Stratioti of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_stratioti_of_place_1_article:0 "the " + mercenary_company_stratioti_of_place_2:0 "Band of [TITLE.GetNameNoTierNoTooltip] Stratioti" + mercenary_company_stratioti_of_place_2_article:0 "the " + mercenary_company_swiss_guard:0 "Swiss Guard" + mercenary_company_swiss_guard_article:0 "the " + mercenary_company_tard_venus_1:0 "Tard-Venus de [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_tard_venus_1_article:0 "the " + mercenary_company_terrors_of_tamilakam:0 "Terrors of Tamilakam" + mercenary_company_terrors_of_tamilakam_article:0 "the " + mercenary_company_the_followers_from_place:0 "Followers from [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_the_followers_from_place_article:0 "the " + mercenary_company_the_longbeard_band:0 "Longbeard Band" + mercenary_company_the_longbeard_band_article:0 "the " + mercenary_company_the_ten_thousand:0 "Ten Thousand" + mercenary_company_the_ten_thousand_article:0 "the " + mercenary_company_the_wanderers:0 "Wanderers" + mercenary_company_the_wanderers_article:0 "the " + mercenary_company_thinglith:0 "Thinglith" + mercenary_company_thinglith_article:0 "the " + mercenary_company_tigers_of_place:0 "Tigers of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_tigers_of_place_article:0 "the " + mercenary_company_tigrayit_band:0 "Tigrayit Band" + mercenary_company_tigrayit_band_article:0 "the " + mercenary_company_true_khans_faithful:0 "True Khan's Faithful" + mercenary_company_true_khans_faithful_article:0 "the " + mercenary_company_mongolic_riders_of_place:0 "Riders of Mongol [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_turkic_riders_of_place:0 "Turkic Riders of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_mongolic_riders_of_place_article:0 "the " + mercenary_company_tungabhadra_band:0 "Tungabhadra Gang" + mercenary_company_tungabhadra_band_article:0 "the " + mercenary_company_union_of_swords:0 "Union of Swords" + mercenary_company_union_of_swords_article:0 "the " + mercenary_company_velaikkarar_of_place:0 "Velaikkarar of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_velaikkarar_of_place_article:0 "the " + mercenary_company_veterans_of_chaldia:0 "Veterans of Chaldia" + mercenary_company_veterans_of_chaldia_article:0 "the " + mercenary_company_veterans_of_the_marches:0 "Veterans of the Marches" + mercenary_company_veterans_of_the_marches_article:0 "the " + mercenary_company_wakes_guard:0 "Wake's Guard" + mercenary_company_warband_of_the_great_hall:0 "Warband of the Great Hall" + mercenary_company_warband_of_the_great_hall_article:0 "the " + mercenary_company_warriors_of_zaranj:0 "Warriors of Zaranj" + mercenary_company_warriors_of_zaranj_article:0 "the " + mercenary_company_wayfarers_of_place:0 "Wayfarers of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_wayfarers_of_place_article:0 "the " + mercenary_company_westwards_band:0 "Westwards Band" + mercenary_company_westwards_band_article:0 "the " + mercenary_company_white_company:0 "White Company" + mercenary_company_white_company_article:0 "the " + mercenary_false_earls_company:0 "Company of the False-Earl" + mercenary_false_earls_company_article:0 "the " + mercenary_company_burmese_host:0 "Burmese Host" + mercenary_company_company_of_the_irrawaddy:0 "Company of the Irrawaddy" + mercenary_company_company_of_the_irrawaddy_article:0 "the " + mercenary_company_host_of_kashmir:0 "Host of Kashmir" + mercenary_company_host_of_kashmir_article:0 "the " + mercenary_company_beja_place_band:0 "Beja Place Band" + mercenary_company_company_of_the_chad:0 "Company of the Chad" + mercenary_company_company_of_the_chad_article:0 "the " + mercenary_company_followers_of_bayajida:0 "Followers of Bayajida" + mercenary_company_mon_host:0 "Mon Host" + mercenary_sadhuim_company:0 "Sadhuim Company" + mercenary_sadhuim_company_article:0 "the " + mercenary_company_of_the_valley:0 "Company of the Valley" + mercenary_company_of_the_valley_article:0 "the " + mercenary_company_arakan_band:0 "Arakan Band" + mercenary_company_sardinian_band:0 "Sardinian Band" + mercenary_company_sardinian_band_article:0 "the " + mercenary_company_condottiere_band:1 "[CULTURE.GetNameNoTooltip] Condottiere Band" + mercenary_company_condottiere_band_article:0 "the " + mercenary_company_sicilian_band:0 "Sicilian Band" + mercenary_company_sicilian_band_article:0 "the " + mercenary_company_freelances_of_velehrad:0 "Freelances of Velehrad" + mercenary_company_freelances_of_velehrad_article:0 "the " + mercenary_company_army_of_morava_bend:0 "Army of Morava Bend" + mercenary_company_army_of_morava_bend_article:0 "the " + mercenary_company_company_of_the_faithbearers:0 "Company of the Faithbearers" + mercenary_company_company_of_the_faithbearers_article:0 "the " + mercenary_company_company_of_bukhara:0 "Company of Bukhara" + mercenary_company_company_of_bukhara_article:0 "the " + mercenary_company_dehqan_warriors:0 "Dehqan Warriors" + mercenary_company_dehqan_warriors_article:0 "the " + mercenary_company_company_of_khwarezm:0 "Company of Khwarezm" + mercenary_company_company_of_khwarezm_article:0 "the " + mercenary_company_khwarezmian_warriors:0 "Khwarezmian Warriors" + mercenary_company_khwarezmian_warriors_article:0 "the " + mercenary_company_teutonic_brotherhood:0 "Teutonic Brotherhood" + mercenary_company_teutonic_brotherhood_article:0 "the " + mercenary_company_saxon_steelbearers:0 "Saxon Steelbearers" + mercenary_company_saxon_steelbearers_article:0 "the " + mercenary_company_hansa_guard:0 "Hansa Guard" + mercenary_company_hansa_guard_article:0 "the " + mercenary_company_sons_of_widukind:0 "Sons of Widukind" + mercenary_company_sons_of_widukind_article:0 "the " + mercenary_company_franconian_company:0 "Franconian Company" + mercenary_company_franconian_company_article:0 "the " + mercenary_company_thuringian_blades:0 "Thuringian Blades" + mercenary_company_thuringian_blades_article:0 "the " + mercenary_company_rhenish_band:0 "Rhenish Band" + mercenary_company_rhenish_band_article:0 "the " + mercenary_company_new_franks:0 "New Franks" + mercenary_company_new_franks_article:0 "the " + mercenary_company_swabian_band:0 "Swabian Band" + mercenary_company_swabian_band_article:0 "the " + mercenary_company_alsace_fighters:0 "Alsace Fighters" + mercenary_company_alsace_fighters_article:0 "the " + mercenary_company_alemannic_sellswords:0 "Alemannic Sellswords" + mercenary_company_alemannic_sellswords_article:0 "the " + mercenary_company_helvetic_guard:0 "Helvetic Guard" + mercenary_company_helvetic_guard_article:0 "the " + mercenary_company_bavarian_band:0 "Bavarian Band" + mercenary_company_bavarian_band_article:0 "the " + mercenary_company_austrian_company:0 "Austrian Company" + mercenary_company_austrian_company_article:0 "the " + mercenary_company_tyrol_warriors:0 "Tyrol Warriors" + mercenary_company_tyrol_warriors_article:0 "the " + mercenary_company_styrian_panthers:0 "Styrian Panthers" + mercenary_company_styrian_panthers_article:0 "the " + mercenary_company_woad_raiders:0 "Woad Raiders" + mercenary_company_woad_raiders_article:0 "the " + mercenary_company_ashanti_band:0 "Ashanti Band" + mercenary_company_ashanti_band_article:0 "the " + mercenary_company_company_of_the_volta:0 "Company of the Volta" + mercenary_company_company_of_the_volta_article:0 "the " + mercenary_company_followers_of_akwei:0 "Followers of Akwei" + mercenary_company_followers_of_akwei_article:0 "the " + mercenary_company_company_of_awkar:0 "Company of Awkar" + mercenary_company_company_of_awkar_article:0 "the " + mercenary_company_followers_of_kayamagha:0 "Followers of Kayamagha" + mercenary_company_followers_of_kayamagha_article:0 "the " + mercenary_company_yoruba_band:0 "Yoruba Band" + mercenary_company_yoruba_band_article:0 "the " + mercenary_company_company_of_the_niger:0 "Company of the Niger" + mercenary_company_company_of_the_niger_article:0 "the " + mercenary_company_followers_of_oduduwa:0 "Followers of Oduduwa" + mercenary_company_followers_of_oduduwa_article:0 "the " + mercenary_company_band_of_the_panther:0 "Band of the Panther" + mercenary_company_band_of_the_panther_article:0 "the" + mercenary_company_hammerbearers:0 "Hammer bearers" + mercenary_company_hammerbearers_article:0 "the" + mercenary_company_carantanian_white_cloaks:0 "Carantanian White Cloaks" + mercenary_company_carantanian_white_cloaks_article:0 "the" + mercenary_company_barge_raiders: "Barge Raiders" + mercenary_company_barge_raiders_article: "the" + mercenary_company_bloody_reeds: "Bloody Reeds" + mercenary_company_bloody_reeds_article: "the" + mercenary_company_trampling_gazelles: "Trampling Gazelles" + mercenary_company_trampling_gazelles_article: "the" + mercenary_company_cretans: "Cretans" + mercenary_company_cretans_article: "the " + mercenary_company_vanguard_of_kilwa: "Vanguard of Kilwa" + mercenary_company_vanguard_of_kilwa_article: "the " + mercenary_company_sofala_guardians: "Sofala Guardians" + mercenary_company_sofala_guardians_article: "the " + mercenary_company_league_of_gods_house: "League of God's House" + mercenary_company_league_of_gods_house_article: "the " + mercenary_company_gray_league: "Gray League" + mercenary_company_gray_league_article: "the " + mercenary_company_rhaetian_column: "Rhaetian Column" + mercenary_company_rhaetian_column_article: "the " + + hireable_ruler_is_mercenary_company_captain_blocker: "@warning_icon! #X [CHARACTER.GetShortUINameNoTooltip] is the captain of a [mercenary_company|e]#!" + hireable_ruler_no_mercenary_government_rule_blocker: "@warning_icon! #X [CHARACTER.GetNamePossessiveOrMy] [government|e] is #bold not#! allow contracted mercenary work.#!" + hireable_ruler_you_are_not_at_war_blocker: "@warning_icon! #X $NOT_I_AM_AT_WAR_TRIGGER$#!" + + + ###### NEOW ###### + mercenary_company_free_batallion_of_place:0 "Free Batallion of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_free_batallion_of_place_article:0 "the " + mercenary_company_free_batallion_of_place:0 "Free Guard's Batallion of Insterburg" + mercenary_company_free_batallion_of_place_article:0 "the " + mercenary_company_rota_of_rus:0 "Russkaya Rota" + mercenary_company_rota_of_rus_article:0 "the " diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 542f1575..8e5ae4b9 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -24413,7 +24413,6 @@ b_graudenz:1 "Kwidzyn" b_braunsberg:1 "Braniewo" b_ostlandsberg:1 "Kętrzyn" - b_wormditt:1 "Gusev" b_mohrungen:1 "Iława" b_bartenstein:1 "Bartoszyce" b_rastenburg:1 "Mrągowo" @@ -25002,6 +25001,8 @@ k_karelia_adj:1 "Karelian" k_slovakia:0 "Slovakia" k_slovakia_adj:1 "Slovakian" + k_slovenia:0 "Slovenia" + k_slovenia_adj:1 "Slovenian" k_silesia:0 "Silesia" k_silesia_adj:1 "Silesian" k_goralia:0 "Goralia" @@ -25604,23 +25605,25 @@ b_starachowice:0 "Starachowice" ## Prussia d_prussia:0 "Korolevecgrad" - d_prussia_adj:0 "Korolevgradets" + d_prussia_adj:0 "Korolevgradskiy" d_prussia_pre:0 "Korolevecgradsko" c_konigsberg:0 "Korolevecgrad" - c_konigsberg_adj:0 "Korolevgradets" + c_konigsberg_adj:0 "Korolevgradskiy" b_konigsberg:0 "Korolevecgrad" b_cranz:0 "Zelenograd" b_laukitten:0 "Baltiysk" - b_tapiau:0 "Gvardeysk" - c_natangia:0 "Welawa" - c_natangia_adj:0 "Welawski" - b_wehlau:0 "Znamensk" - c_balga:0 "Gvardeysk" - c_balga_adj:0 "Gvardeyskiy" + b_tapiau:0 "Tapiau" + c_natangia:0 "Instruchgrad" + c_natangia_adj:0 "Instruchgradskiy" + b_insterburg:0 "Instruchgrad" + b_wormditt:0 "Gumbin" + b_talpaki:0 "Talpaki" + c_balga:0 "Tapiau" + c_balga_adj:0 "Tapiavskiy" c_tilsit:0 "Tilsit" c_tilsit_adj:0 "Tilsitskiy" b_tilsit:0 "Tilsit" - b_insterburg:0 "Chernyakhovsk" + b_talpaki:0 "Talpaki" b_ragnit:0 "Ragnit" ### Czechia @@ -25682,6 +25685,7 @@ d_laamp_turkisch_simurghi:0 "$turkisch$ Community of the $dynn_Avc_i_dot_$'s" d_laamp_turkisch_simurghi_adj:0 "Turkisch" d_laamp_turkisch_simurghi_article:0 "The " + ### Caucasus b_makhachkala:0 "Makhachkala" diff --git a/map_data/definition.csv b/map_data/definition.csv index bcc5da0e..f7473a27 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -12946,7 +12946,7 @@ 12945;234;86;120;;x 12946;140;84;84;;x 12947;107;161;159;b_qianzhou_qianhua;x -12948;255;216;0;xx +12948;255;216;0;x 12949;143;205;49;b_zhangzhou_zhangpu_southwest;x 12950;180;79;227;b_zhangzhou_zhangpu_west;x 12951;126;81;15;b_zhangzhou_longxi_west;x @@ -13615,4 +13615,27 @@ 13614;70;65;149;;x 13615;129;209;9;TAPIAU;x 13616;129;19;9;CRANZ;x -13617;129;109;9;WEHLAU;x +13617;129;109;9;TAPLACKEN;x +13618;126;41;49;Avinurme;x +13619;126;144;49;Kohtla-Jarve;x +13620;84;172;176;Vaike-Maarja;x +13621;84;172;32;Vandra;x +13622;168;119;47;Kiiu;x +13623;168;32;47;Loksa;x +13624;42;147;173;Korgessaare;x +13625;126;10;174;Testama;x +13626;84;15;112;Karksi-Nuia;x +13627;126;126;75;Kuldiga;x +13628;126;126;44;Skrunda;x +13629;42;105;103;Joniskis;x +13630;126;171;255;Zagares;x +13631;168;53;52;Tukums;x +13632;0;117;112;unused;x +13633;126;48;44;Marijampole;x +13634;126;48;172;Garliava;x +13635;84;30;147;Rokiskis;x +13636;42;27;116;Ignalina;x +13637;94;27;116;Pabrade;x +13638;0;24;187;Demene;x + + diff --git a/map_data/provinces.png b/map_data/provinces.png index 88aa31db..2c550522 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:89bcdc864a50101cef711750dfcd81673577fc45e6c63b463b119f704914c9fc -size 2623671 +oid sha256:f69d1dbedb0e4363341a2961f88a9a78b74fe9041ca046a7882882b8cf00f982 +size 2501537