diff --git a/common/culture/cultures/NEOW_greek.txt b/common/culture/cultures/NEOW_greek.txt index de7df772..2cdc9d87 100644 --- a/common/culture/cultures/NEOW_greek.txt +++ b/common/culture/cultures/NEOW_greek.txt @@ -188,7 +188,6 @@ NEOW_peloponnesian = { tradition_fp1_the_right_to_prove tradition_stand_and_fight tradition_mountain_homes - tradition_romanticised_banditry } name_list = name_list_greek diff --git a/common/culture/cultures/NEOW_west_slavic.txt b/common/culture/cultures/NEOW_west_slavic.txt index 4b1e05c4..db796e39 100644 --- a/common/culture/cultures/NEOW_west_slavic.txt +++ b/common/culture/cultures/NEOW_west_slavic.txt @@ -135,7 +135,6 @@ NEOW_slovak = { tradition_equitable tradition_loyal_soldiers tradition_wine_culture - tradition_romanticised_banditry } name_list = name_list_slovien @@ -259,7 +258,6 @@ goral = { traditions = { tradition_mountaineer_ruralism tradition_zealous_people - tradition_romanticised_banditry } dlc_tradition = { trait = tradition_fp2_malleable_subjects diff --git a/common/culture/traditions/NEOW_traditions.txt b/common/culture/traditions/NEOW_traditions.txt index c3bbe507..b4760676 100644 --- a/common/culture/traditions/NEOW_traditions.txt +++ b/common/culture/traditions/NEOW_traditions.txt @@ -1026,7 +1026,7 @@ tradition_midnight_herders = { layers = { 0 = steward - 1 = western + 2 = western 4 = horses.dds } @@ -1132,61 +1132,3 @@ tradition_midnight_herders = { } } } - - -tradition_romanticised_banditry = { # romanticized banditry - category = societal - - layers = { - 0 = martial - 1 = mediterranean - 4 = fierce_independence.dds - } - - is_shown = { - OR = { - has_cultural_pillar = heritage_greek - this = culture:goral - any_parent_culture_or_above = { - OR = { - this = culture:goral - } - } - } - } - - parameters = { - banditry_gives_bonuses = yes - more_likely_to_leave_court = yes - unlocks_contract_assistance = yes - unlock_voluntary_laampdom = yes - more_likely_to_be_laamps = yes - } - - character_modifier = { - } - - county_modifier = { - development_growth_factor = -0.1 - monthly_county_control_growth_factor = -0.1 - } - - province_modifier = { - travel_danger = 5 - } - - cost = { - prestige = { - add = { - value = tradition_base_cost - desc = BASE - format = "BASE_VALUE_FORMAT" - } - multiply = tradition_replacement_cost_if_relevant - } - } - - ai_will_do = { - value = 0 - } -} \ No newline at end of file diff --git a/common/decisions/dlc_decisions/03_fp2_decisions.txt b/common/decisions/dlc_decisions/03_fp2_decisions.txt index a703bfdd..0ea7c268 100644 --- a/common/decisions/dlc_decisions/03_fp2_decisions.txt +++ b/common/decisions/dlc_decisions/03_fp2_decisions.txt @@ -537,186 +537,186 @@ struggle_iberia_ending_conciliation_decision = { ai_will_do = { base = 100 } } -#################################### -## Secure the Mediterranean -## By Hugo Cortell -#################################### -#### Secure The Mediterranean ### -#secure_mediterranean_decision = { -# title = fp2_secure_mediterranean.t -# picture = { -# reference = "gfx/interface/illustrations/event_scenes/fp1_ocean.dds" -# } -# desc = fp2_secure_mediterranean.desc -# decision_group_type = major -# -# selection_tooltip = fp2_secure_mediterranean.tip -# sort_order = 50 -# -# is_shown = { -# # DLC check -# has_fp2_dlc_trigger = yes -# # Standard checks -# is_playable_character = yes -# exists = dynasty -# NOT = { -# is_target_in_global_variable_list = { -# name = unavailable_unique_decisions -# target = flag:flag_secured_the_mediterranean -# } -# } -# -# OR = { -# completely_controls = title:d_sardinia -# completely_controls = title:d_sicily -# AND = { -# completely_controls = title:d_mallorca -# completely_controls = title:d_corsica -# } -# } -# } -# -# is_valid = { -# completely_controls = title:d_mallorca -# completely_controls = title:d_sardinia -# completely_controls = title:d_corsica -# completely_controls = title:d_sicily -# } -# -# is_valid_showing_failures_only = { -# is_landed = yes -# } -# -# effect = { -# add_to_global_variable_list = { -# name = unavailable_unique_decisions -# target = flag:flag_secured_the_mediterranean -# } -# -# # LOC -# root = { -# save_scope_as = mediterranean_conqueror -# house = { save_scope_as = mediterranean_house } -# } -# title:d_mallorca = { save_scope_as = mallorca } -# title:d_sardinia = { save_scope_as = sardinas } -# title:d_sicily = { save_scope_as = sicily } -# title:k_mediterranean_sea = { save_scope_as = mediterranean_title } -# -# every_player = { -# limit = { -# this != ROOT -# any_held_title = { title_province = { geographical_region = dlc_fp2_mediterranean_shoreline } } -# } -# send_interface_message = { -# type = event_generic_bad_with_text -# title = secure_mediterranean_decision.involved_notif -# desc = secure_mediterranean_decision.involved_notif_desc # Players who get this: "why do I hear boss music?" (It is meant to sound vaguely threatening) -# left_icon = scope:mediterranean_conqueror -# -# show_as_tooltip = { -# scope:mediterranean_conqueror = { -# house = { -# add_house_modifier = { -# modifier = fp2_controls_the_mediterranean_house_modifier -# years = 100 -# } -# } -# dynasty = { add_dynasty_prestige = major_prestige_gain } -# } -# } -# } -# } -# -# house = { -# add_house_modifier = { -# modifier = fp2_controls_the_mediterranean_house_modifier -# years = 100 -# } -# } -# dynasty = { add_dynasty_prestige = major_prestige_gain } # You used to get +25% prestiege, but that caused UI issues -# custom_tooltip = secure_mediterranean_decision.a -# -# create_title_and_vassal_change = { -# type = created -# save_scope_as = title_change -# add_claim_on_loss = yes -# } -# title:k_mediterranean_sea = { -# change_title_holder = { -# holder = root -# change = scope:title_change -# } -# } -# resolve_title_and_vassal_change = scope:title_change -# title:d_mallorca = { set_de_jure_liege_title = title:k_mediterranean_sea } -# title:d_sardinia = { set_de_jure_liege_title = title:k_mediterranean_sea } -# title:d_corsica = { set_de_jure_liege_title = title:k_mediterranean_sea } -# title:d_sicily = { set_de_jure_liege_title = title:k_mediterranean_sea } -# -# hidden_effect = { -# title:k_mediterranean_sea = { set_de_jure_liege_title = title:e_italy } # Straying closer to remaking the roman empire -# trigger_event = iberia_north_africa.2105 -# } -# } -# -# cost = { -# gold = { -# value = 0 -# if = { -# limit = { -# has_treasury = no -# } -# add = major_gold_value -# multiply = 1.5 -# round = yes -# } -# } -# treasury = { -# value = 0 -# if = { -# limit = { -# has_treasury = yes -# } -# add = major_gold_value -# multiply = 1.5 -# round = yes -# } -# } -# prestige = { -# value = major_prestige_gain -# multiply = 3 -# round = yes -# } -# } -# -# ai_check_interval_by_tier = { -# barony = 0 -# county = 0 -# duchy = 0 -# kingdom = 730 -# empire = 730 -# hegemony = 730 -# } -# -# ai_potential = { -# is_ruler = yes -# short_term_gold >= { -# value = major_gold_value -# multiply = 1.5 -# round = yes -# } -# prestige >= { -# value = major_prestige_gain -# multiply = 3 -# round = yes -# } -# } -# -# ai_will_do = { -# base = 80 -# } -#} +################################### +# Secure the Mediterranean +# By Hugo Cortell +################################### +### Secure The Mediterranean ### +secure_mediterranean_decision = { + title = fp2_secure_mediterranean.t + picture = { + reference = "gfx/interface/illustrations/event_scenes/fp1_ocean.dds" + } + desc = fp2_secure_mediterranean.desc + decision_group_type = major + + selection_tooltip = fp2_secure_mediterranean.tip + sort_order = 50 + + is_shown = { + # DLC check + has_fp2_dlc_trigger = yes + # Standard checks + is_playable_character = yes + exists = dynasty + NOT = { + is_target_in_global_variable_list = { + name = unavailable_unique_decisions + target = flag:flag_secured_the_mediterranean + } + } + + OR = { + completely_controls = title:d_sardinia + completely_controls = title:d_sicily + AND = { + completely_controls = title:d_mallorca + completely_controls = title:d_corsica + } + } + } + + is_valid = { + completely_controls = title:d_mallorca + completely_controls = title:d_sardinia + completely_controls = title:d_corsica + completely_controls = title:d_sicily + } + + is_valid_showing_failures_only = { + is_landed = yes + } + + effect = { + add_to_global_variable_list = { + name = unavailable_unique_decisions + target = flag:flag_secured_the_mediterranean + } + + # LOC + root = { + save_scope_as = mediterranean_conqueror + house = { save_scope_as = mediterranean_house } + } + title:d_mallorca = { save_scope_as = mallorca } + title:d_sardinia = { save_scope_as = sardinas } + title:d_sicily = { save_scope_as = sicily } + title:k_mediterranean_sea = { save_scope_as = mediterranean_title } + + every_player = { + limit = { + this != ROOT + any_held_title = { title_province = { geographical_region = dlc_fp2_mediterranean_shoreline } } + } + send_interface_message = { + type = event_generic_bad_with_text + title = secure_mediterranean_decision.involved_notif + desc = secure_mediterranean_decision.involved_notif_desc # Players who get this: "why do I hear boss music?" (It is meant to sound vaguely threatening) + left_icon = scope:mediterranean_conqueror + + show_as_tooltip = { + scope:mediterranean_conqueror = { + house = { + add_house_modifier = { + modifier = fp2_controls_the_mediterranean_house_modifier + years = 100 + } + } + dynasty = { add_dynasty_prestige = major_prestige_gain } + } + } + } + } + + house = { + add_house_modifier = { + modifier = fp2_controls_the_mediterranean_house_modifier + years = 100 + } + } + dynasty = { add_dynasty_prestige = major_prestige_gain } # You used to get +25% prestiege, but that caused UI issues + custom_tooltip = secure_mediterranean_decision.a + + create_title_and_vassal_change = { + type = created + save_scope_as = title_change + add_claim_on_loss = yes + } + title:k_mediterranean_sea = { + change_title_holder = { + holder = root + change = scope:title_change + } + } + resolve_title_and_vassal_change = scope:title_change + title:d_mallorca = { set_de_jure_liege_title = title:k_mediterranean_sea } + title:d_sardinia = { set_de_jure_liege_title = title:k_mediterranean_sea } + title:d_corsica = { set_de_jure_liege_title = title:k_mediterranean_sea } + title:d_sicily = { set_de_jure_liege_title = title:k_mediterranean_sea } + + hidden_effect = { + title:k_mediterranean_sea = { set_de_jure_liege_title = title:e_italy } # Straying closer to remaking the roman empire + trigger_event = iberia_north_africa.2105 + } + } + + cost = { + gold = { + value = 0 + if = { + limit = { + has_treasury = no + } + add = major_gold_value + multiply = 1.5 + round = yes + } + } + treasury = { + value = 0 + if = { + limit = { + has_treasury = yes + } + add = major_gold_value + multiply = 1.5 + round = yes + } + } + prestige = { + value = major_prestige_gain + multiply = 3 + round = yes + } + } + + ai_check_interval_by_tier = { + barony = 0 + county = 0 + duchy = 0 + kingdom = 730 + empire = 730 + hegemony = 730 + } + + ai_potential = { + is_ruler = yes + short_term_gold >= { + value = major_gold_value + multiply = 1.5 + round = yes + } + prestige >= { + value = major_prestige_gain + multiply = 3 + round = yes + } + } + + ai_will_do = { + base = 80 + } +} ############################################# # Eat a Cheese diff --git a/common/landed_titles/greece.txt b/common/landed_titles/greece.txt index ee3fd5e4..5d85da2f 100644 --- a/common/landed_titles/greece.txt +++ b/common/landed_titles/greece.txt @@ -840,7 +840,7 @@ e_greece = { color = { 0 118 224 } #capital = 3728 # Levadia - b_livadeia = { + b_levadia = { province = 3728 color = { 0 118 224 } @@ -872,25 +872,27 @@ e_greece = { color = { 0 128 244 } } } - c_phthiotis = { + c_neopatras = { color = { 0 138 254 } - b_lamia = { - province = 3794 + #capital = 3795 # Neopatras - color = { 0 138 254 } - } - b_ypati = { + b_neopatras = { province = 3793 color = { 0 138 254 } } - b_atalanti = { + b_zetouni = { + province = 3794 + + color = { 0 138 254 } + } + b_boudounitsa = { province = 3727 color = { 0 138 254 } } - b_pelasgia = { + b_gardikia = { province = 3792 color = { 0 138 254 } @@ -968,7 +970,7 @@ e_greece = { capital = c_epeiros # Arta - c_epirus = { + c_epeiros = { color = { 0 138 204 } #capital = 3708 # Ioaninna @@ -983,28 +985,24 @@ e_greece = { color = { 0 138 204 } } - b_igoumenitsa = { + b_grava = { # Modern Igoumenitsa province = 3709 color = { 0 138 204 } } - b_tzoumerka = { - province = 3704 - - color = { 185 130 150 } - } } - c_metsovo = { + c_metzovo = { color = { 185 130 150 } - b_metsovo = { - province = 12326 + #capital = 3702 # Metzovo + + b_metzovo = { + province = 3702 color = { 185 130 150 } } - - b_konitsa = { - province = 12327 + b_vrestenitsa = { + province = 3704 color = { 185 130 150 } } @@ -1016,15 +1014,15 @@ e_greece = { name_list_albanian = cn_epiri_i_veriut } - b_sarande = { # Sarandë + b_buthrotum = { # Sarandë province = 472 color = { 190 90 70 } } - b_dropull = { # Dropull + b_vella = { # Dropull province = 3707 color = { 140 70 75 } } - b_erseke = { # Ersekë + b_konitsa = { # Ersekë province = 3706 color = { 140 70 75 } } @@ -1208,33 +1206,33 @@ e_greece = { color = { 0 158 204 } } } - c_magnesia = { - color = { 0 148 194 } + c_demetrias = { + color = { 205 35 165 } #capital = 488 # Demetrias - b_volos = { + b_demetrias = { province = 488 - color = { 0 148 194 } + color = { 205 35 165 } } b_velestino = { province = 3789 - color = { 0 148 194 } + color = { 205 35 165 } } - b_almyros = { + b_halmyros = { province = 3790 - color = { 0 148 194 } + color = { 205 35 165 } } b_skopelos = { province = 3725 - color = { 0 148 194 } + color = { 195 40 135 } } } - c_trikala = { + c_thessaliotis = { # Megalo Vlachia color = { 155 30 210 } #capital = 3797 # Trikala @@ -1244,17 +1242,17 @@ e_greece = { color = { 155 30 210 } } - b_kalabaka = { + b_stagoi = { province = 3796 color = { 155 30 210 } } - b_farsala = { + b_pharsalos = { province = 3570 color = { 155 30 210 } } - b_pyli = { + b_gardiki = { # Pindus Gardiki, ancient Pelinna province = 3703 color = { 185 130 150 } @@ -1268,7 +1266,7 @@ e_greece = { capital = c_thessalonika d_macedonia = { - color = { 248 233 46 } + color = { 204 40 51 } capital = c_skopje @@ -1387,64 +1385,64 @@ e_greece = { } } d_thessalonika = { - color = { 248 163 66 } + color = { 189 19 130 } capital = c_thessalonika # Thessaloniki c_thessalonika = { - color = { 248 163 66 } + color = { 189 19 130 } #capital = 490 # Thessaloniki b_thessaloniki = { province = 490 - color = { 248 163 66 } + color = { 189 19 130 } } - b_lagkadas = { + b_langades = { province = 3779 - color = { 248 163 66 } + color = { 189 19 130 } } - b_profitis = { + b_mavrouda = { province = 3780 - color = { 248 163 66 } + color = { 189 19 130 } } - b_asprovalta = { + b_chrysopolis = { province = 3774 - color = { 248 163 66 } + color = { 70 35 130 } } } c_chalkidike = { - color = { 198 123 46 } + color = { 165 30 170 } #capital = 491 # Polygyros b_polygyros= { province = 491 - color = { 198 123 46 } + color = { 165 30 170 } } - b_stavros = { + b_rendina = { province = 3775 - color = { 198 123 46 } + color = { 165 30 170 } } - b_nea_moudania = { + b_kassandreia = { province = 3777 - color = { 198 123 46 } + color = { 165 30 170 } } } c_athos = { - color = { 178 103 26 } + color = { 165 30 170 } b_ierrisos = { province = 3776 - color = { 178 103 26 } + color = { 165 30 170 } } } c_west_macedonia = { @@ -1454,18 +1452,8 @@ e_greece = { color = { 220 50 170 } } - b_florina = { - province = 3640 - - color = { 135 90 110 } - } - b_grevena = { - province = 3702 - - color = { 135 90 110 } - } b_kastoria = { - province = 12325 + province = 3640 color = { 135 90 110 } } @@ -1477,7 +1465,7 @@ e_greece = { color = { 170 30 165 } } - b_kozani = { + b_grevena = { province = 3795 color = { 155 30 210 } diff --git a/common/traits/00_traits.txt b/common/traits/00_traits.txt index 15c6ee94..8e21184d 100644 --- a/common/traits/00_traits.txt +++ b/common/traits/00_traits.txt @@ -11685,13 +11685,6 @@ gallowsbait = { same_opinion = 50 - culture_modifier = { - parameter = banditry_gives_bonuses - same_culture_opinion = 10 - legitimacy_gain_mult = 0.25 - legitimacy_loss_mult = -0.25 - } - desc = { first_valid = { triggered_desc = { @@ -11712,66 +11705,29 @@ gallowsbait = { general_opinion = -2 courtier_and_guest_opinion = 2 martial = 1 - culture_modifier = { - parameter = banditry_gives_bonuses - same_culture_opinion = 2 - prowess = 1 - hills_advantage = 1 - mountains_advantage = 1 - monthly_prestige_gain_mult = 0.01 - } } 40 = { barons_and_minor_landholders_opinion = -5 general_opinion = -2 courtier_and_guest_opinion = 2 - culture_modifier = { - parameter = banditry_gives_bonuses - same_culture_opinion = 2 - hills_advantage = 1 - mountains_advantage = 1 - monthly_prestige_gain_mult = 0.01 - } } 60 = { barons_and_minor_landholders_opinion = -5 general_opinion = -2 courtier_and_guest_opinion = 2 martial = 1 - culture_modifier = { - parameter = banditry_gives_bonuses - same_culture_opinion = 2 - hills_advantage = 1 - mountains_advantage = 1 - monthly_prestige_gain_mult = 0.01 - } } 80 = { barons_and_minor_landholders_opinion = -5 general_opinion = -5 courtier_and_guest_opinion = 5 monthly_prestige_gain_per_dread_add = 0.01 - culture_modifier = { - parameter = banditry_gives_bonuses - same_culture_opinion = 2 - hills_advantage = 1 - mountains_advantage = 1 - monthly_prestige_gain_mult = 0.01 - } } 100 = { barons_and_minor_landholders_opinion = -10 general_opinion = -10 courtier_and_guest_opinion = 10 monthly_prestige_gain_per_dread_add = 0.01 - culture_modifier = { - parameter = banditry_gives_bonuses - same_culture_opinion = 2 - prowess = 1 - hills_advantage = 1 - mountains_advantage = 1 - monthly_prestige_gain_mult = 0.01 - } } } # Con artistry, huckstering, etc. diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index d3029aee..b4254d70 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -1,4 +1,4 @@ -game_object_locator={ +game_object_locator={ name="activities" render_pass=Map clamp_to_water_level=no @@ -64973,72 +64973,6 @@ game_object_locator={ rotation={ 0.000000 0.999645 0.000000 0.026627 } scale={ 1.000000 1.000000 1.000000 } } - { - id=12325 - position={ 2160.000000 0.000000 2390.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12326 - position={ 2168.000000 0.000000 2362.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12327 - position={ 2154.000000 0.000000 2357.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12328 - position={ 2216.000000 0.000000 2271.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12329 - position={ 2301.000000 0.000000 2191.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12330 - position={ 2210.000000 0.000000 2212.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12331 - position={ 2258.000000 0.000000 2223.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12332 - position={ 2081.000000 0.000000 2713.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12333 - position={ 2099.000000 0.000000 2741.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12334 - position={ 2057.000000 0.000000 2796.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12335 - position={ 2046.000000 0.000000 2816.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } { id=12336 position={ 2858.542969 0.000000 2797.503174 } @@ -69809,6 +69743,12 @@ game_object_locator={ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13518 + position={ 6694.000000 0.000000 2577.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } { id=13519 position={ 6756.000000 0.000000 2930.000000 } diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index 71ae401a..b418de2f 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -64973,72 +64973,6 @@ rotation={ 0.000000 0.999645 0.000000 0.026627 } scale={ 1.000000 1.000000 1.000000 } } - { - id=12325 - position={ 2156.000000 0.000000 2391.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12326 - position={ 2175.000000 0.000000 2363.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12327 - position={ 2157.000000 0.000000 2362.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12328 - position={ 2215.000000 0.000000 2265.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12329 - position={ 2305.000000 0.000000 2190.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12330 - position={ 2210.000000 0.000000 2209.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12331 - position={ 2265.000000 0.000000 2221.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12332 - position={ 2081.000000 0.000000 2715.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12333 - position={ 2109.000000 0.000000 2737.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12334 - position={ 2048.000000 0.000000 2793.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12335 - position={ 2041.000000 0.000000 2803.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } { id=12336 position={ 2861.000000 0.000000 2787.000000 } @@ -69809,6 +69743,12 @@ rotation={ -0.000000 -0.484081 -0.000000 0.875023 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13518 + position={ 6554.859375 0.000000 2392.671387 } + rotation={ -0.000000 -0.532166 -0.000000 0.846640 } + scale={ 1.000000 1.000000 1.000000 } + } { id=13519 position={ 6616.859375 0.000000 2745.671387 } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index 31523420..ee5609cd 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -71455,67 +71455,67 @@ } { id=12325 - position={ 2161.810547 0.000000 2387.536865 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12326 - position={ 2173.604736 0.000000 2368.819092 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12327 - position={ 2155.591553 0.000000 2363.696533 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12328 - position={ 2217.759521 0.000000 2268.970703 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12329 - position={ 2306.675781 0.000000 2190.453613 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12330 - position={ 2214.391357 0.000000 2210.428223 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12331 - position={ 2264.911133 0.000000 2227.046631 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12332 - position={ 2085.442139 0.000000 2709.518066 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12333 - position={ 2103.264404 0.000000 2740.061279 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12334 - position={ 2065.857422 0.000000 2800.399902 } + position={ 0.000000 0.000000 -3.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12335 - position={ 2047.561523 0.000000 2814.025146 } + position={ 0.000000 0.000000 -3.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/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index 52cf2499..79696bb2 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -71455,67 +71455,67 @@ } { id=12325 - position={ 2166.000000 0.000000 2389.000000 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12326 - position={ 2184.000000 0.000000 2357.000000 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12327 - position={ 2167.000000 0.000000 2355.000000 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12328 - position={ 2225.000000 0.000000 2263.000000 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12329 - position={ 2306.675781 0.000000 2193.453613 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12330 - position={ 2214.391357 0.000000 2213.428223 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12331 - position={ 2264.911133 0.000000 2230.046631 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12332 - position={ 2085.442139 0.000000 2712.518066 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12333 - position={ 2103.264404 0.000000 2743.061279 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12334 - position={ 2058.000000 0.000000 2792.000000 } + position={ 0.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12335 - position={ 2047.561523 0.000000 2817.025146 } + position={ 0.000000 0.000000 0.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 11ab6df9..20516e5c 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -68221,67 +68221,67 @@ } { id=12325 - position={ 2164.810547 0.000000 2390.536865 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12326 - position={ 2167.037598 0.000000 2370.273438 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12327 - position={ 2151.433838 0.000000 2362.516846 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12328 - position={ 2220.759521 0.000000 2271.970703 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12329 - position={ 2309.675781 0.000000 2193.453613 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12330 - position={ 2217.391357 0.000000 2213.428223 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12331 - position={ 2267.911133 0.000000 2230.046631 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12332 - position={ 2088.442139 0.000000 2712.518066 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12333 - position={ 2106.264404 0.000000 2743.061279 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12334 - position={ 2068.857422 0.000000 2803.399902 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=12335 - position={ 2050.561523 0.000000 2817.025146 } + position={ 3.000000 0.000000 0.000000 } rotation={ -0.000000 -0.000025 -0.000000 1.000000 } 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 a0b1dd02..af94835b 100644 --- a/gfx/map/map_object_data/special_building_locators.txt +++ b/gfx/map/map_object_data/special_building_locators.txt @@ -64973,72 +64973,6 @@ game_object_locator={ rotation={ -0.000000 -0.134782 -0.000000 -0.990875 } scale={ 1.000000 1.000000 1.000000 } } - { - id=12325 - position={ 2163.000000 0.000000 2390.000000 } - rotation={ -0.000000 -0.987597 -0.000000 0.157013 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12326 - position={ 2171.000000 0.000000 2362.000000 } - rotation={ -0.000000 -0.110778 -0.000000 -0.993845 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12327 - position={ 2157.000000 0.000000 2357.000000 } - rotation={ -0.000000 -0.908579 -0.000000 0.417712 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12328 - position={ 2219.000000 0.000000 2271.000000 } - rotation={ -0.000000 -0.688511 -0.000000 -0.725226 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12329 - position={ 2304.000000 0.000000 2191.000000 } - rotation={ -0.000000 -0.281626 -0.000000 0.959524 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12330 - position={ 2213.000000 0.000000 2212.000000 } - rotation={ -0.000000 -0.715077 -0.000000 -0.699046 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12331 - position={ 2261.000000 0.000000 2223.000000 } - rotation={ -0.000000 -0.754782 -0.000000 0.655975 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12332 - position={ 2084.000000 0.000000 2713.000000 } - rotation={ -0.000000 -0.940512 -0.000000 0.339759 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12333 - position={ 2102.000000 0.000000 2741.000000 } - rotation={ -0.000000 -0.988946 -0.000000 0.148275 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12334 - position={ 2060.000000 0.000000 2796.000000 } - rotation={ -0.000000 -0.593636 -0.000000 -0.804734 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=12335 - position={ 2049.000000 0.000000 2816.000000 } - rotation={ -0.000000 -0.237407 -0.000000 0.971410 } - scale={ 1.000000 1.000000 1.000000 } - } { id=12336 position={ 2861.000000 0.000000 2787.000000 } @@ -69809,6 +69743,12 @@ game_object_locator={ rotation={ -0.000000 -0.939101 -0.000000 0.343642 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13518 + position={ 6697.000000 0.000000 2577.000000 } + rotation={ -0.000000 -0.024746 -0.000000 0.999694 } + scale={ 1.000000 1.000000 1.000000 } + } { id=13519 position={ 6759.000000 0.000000 2930.000000 } diff --git a/history/provinces/e_makedon.txt b/history/provinces/e_makedon.txt index 3c464ac7..ce029c99 100644 --- a/history/provinces/e_makedon.txt +++ b/history/provinces/e_makedon.txt @@ -500,14 +500,11 @@ 3790 = { #Halmyros tied to the ancient city of Alos holding = city_holding } -3794 = { #Zetouni aka Lamia - culture = NEOW_pindusian - religion = megalocratic - holding = city_holding -} ###c_neopatras 3793 = { #Neopatras + culture = NEOW_pindusian + religion = megalocratic holding = castle_holding } 3791 = { #Domokos @@ -516,6 +513,9 @@ 3792 = { #Gardikia holding = none } +3794 = { #Zetouni aka Lamia + holding = city_holding +} ###c_thessaliotis 3797 = { #Trikala @@ -566,12 +566,9 @@ } } } -3728 = { #Levadia +3730 = { #Thebes culture = NEOW_arvantika religion = megalocratic - holding = castle_holding -} -3730 = { #Thebes holding = city_holding } 3731 = { #Megara @@ -580,6 +577,11 @@ } ###c_boeotia +3728 = { #Levadia + culture = NEOW_peloponnesian + religion = megalocratic + holding = castle_holding +} 3727 = { #Boudounitsa AKA Mendenitsa holding = none } @@ -762,7 +764,7 @@ } ###c_metzovo -12326 = { #Metzovo +3702 = { #Metzovo culture = aromanian religion = orthodox holding = castle_holding diff --git a/history/titles/k_greece.txt b/history/titles/k_greece.txt index 062ca409..a98477b1 100644 --- a/history/titles/k_greece.txt +++ b/history/titles/k_greece.txt @@ -36,7 +36,7 @@ c_phocis= { } } -c_phthiotis= { +c_neopatras= { 2554.1.1 = { holder = greece0004 } diff --git a/localization/english/replace/culture/traditions/zz_NEOW_cultural_traditions_l_english.yml b/localization/english/replace/culture/traditions/zz_NEOW_cultural_traditions_l_english.yml index 088dc381..e152dc6d 100644 --- a/localization/english/replace/culture/traditions/zz_NEOW_cultural_traditions_l_english.yml +++ b/localization/english/replace/culture/traditions/zz_NEOW_cultural_traditions_l_english.yml @@ -48,9 +48,4 @@ tradition_midnight_herders_name:0 "Midnight Herders" tradition_midnight_herders_desc:1 "This culture has made their home in the far north, raising great herds of reindeer on the frozen tundra." culture_in_taiga_desc:0 "The [culture|E] does not have #V 40%#! of its [counties|E] in Taiga[terrain|E]" - culture_parameter_taiga_wetland_pastures_allowed:0 "The [GetBuilding('pastures_01').GetTypeName|V] line of [buildings|E] may be built in [GetTerrain( 'taiga' ).GetName] and [GetTerrain( 'wetlands' ).GetName]" - - # - tradition_romanticised_banditry_name:0 "Romanticised Banditry" - tradition_romanticised_banditry_desc:1 "This culture celebrates the exploits of mountain outlaws and rebel bands who thrive beyond the reach of kings. Their songs glorify daring raids, hidden strongholds, and lives spent resisting foreign masters and oppressive rulers alike. To many here, a clever brigand is worth more than a dutiful noble." - culture_parameter_banditry_gives_bonuses:0 "The #EMP Bandit# $game_concept_trait_level_track$ of the [GetTrait('gallowsbait').GetName( GetNullCharacter )] [fame_trait|E] gives bonuses." \ No newline at end of file + culture_parameter_taiga_wetland_pastures_allowed:0 "The [GetBuilding('pastures_01').GetTypeName|V] line of [buildings|E] may be built in [GetTerrain( 'taiga' ).GetName] and [GetTerrain( 'wetlands' ).GetName]" \ No newline at end of file diff --git a/map_data/definition.csv b/map_data/definition.csv index 4e669534..d6fb7f62 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -12323,10 +12323,10 @@ 12322;53;31;44;;x 12323;107;73;104;;x 12324;113;23;248;;x -12325;122;49;25;Nestorio;x -12326;78;9;135;Metsovo;x -12327;127;117;110;Konitsa;x -12328;104;79;92;Naupaktos;x +12325;122;49;25;;x +12326;78;9;135;;x +12327;127;117;110;;x +12328;104;79;92;;x 12329;49;47;66;Ermioni;x 12330;232;128;88;Olympia;x 12331;66;59;27;Xylokastro;x diff --git a/map_data/geographical_regions/geographical_region.txt b/map_data/geographical_regions/geographical_region.txt index b4eae792..f671d96a 100644 --- a/map_data/geographical_regions/geographical_region.txt +++ b/map_data/geographical_regions/geographical_region.txt @@ -829,11 +829,10 @@ material_woods_pine_and_fir = { world_siberia world_asia_north_east } - kingdoms = { - k_austria k_bavaria k_tirol - } + duchies = { d_western_isles d_galloway + d_bavaria d_nordgau d_salzburg d_augsburg d_steyermark d_lower_austria d_upper_austria d_tyrol d_carinthia d_bohemia d_krusnohori d_severovychodni_cechy d_moravia } } @@ -931,7 +930,6 @@ material_woods_cherry = { world_burma world_india world_tibet - world_europe_west } } @@ -1717,10 +1715,6 @@ custom_northern_england = { } custom_slavia = { - empires = { - e_visegrad - e_yugoslavia - } duchies = { #Poland d_lubusz d_lesser_poland d_podlachia d_lubelia d_wielkopolska d_mazovia d_upper_silesia d_lower_silesia d_imperial_silesia d_kuyavia diff --git a/map_data/heightmap.png b/map_data/heightmap.png index 8b1dc0d0..72908cd9 100644 --- a/map_data/heightmap.png +++ b/map_data/heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27e6b3a1728870596c7da916518024d72679820bbacc1ed3811f5657d3e5567a -size 122616512 +oid sha256:cb298245c1222e2107539020896867a987fb4e601f91e0169769140bcf51b8dd +size 122616321 diff --git a/map_data/nodes.dat b/map_data/nodes.dat index 95afb0e3..b03f120a 100644 Binary files a/map_data/nodes.dat and b/map_data/nodes.dat differ diff --git a/map_data/packed_heightmap.png b/map_data/packed_heightmap.png index b9ae9095..d30540ab 100644 --- a/map_data/packed_heightmap.png +++ b/map_data/packed_heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cf9a06080160647e097ca694228fdbbbd13e11b08803a08dd883b26a523b6fb -size 16513231 +oid sha256:624c43a167a87f3ab6967ae7320618fd963f392eeb07ccafb1a9db62aae9f4c6 +size 16513172 diff --git a/map_data/provinces.png b/map_data/provinces.png index 1ac66861..b8859e28 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:9e74abbd40b6e76e9c366e7f3ee60f505003b9403a501861520c11cf1f7e4de2 -size 3478592 +oid sha256:f9cdb8a10fd2d55efc9b0b0c6259026ff570c66c6443b11657fee8e96d7cc2aa +size 2637933 diff --git a/map_data/rivers.png b/map_data/rivers.png index 0eb5c663..7bc8e74b 100644 --- a/map_data/rivers.png +++ b/map_data/rivers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c07ba187a0e2ebb27b092af311067069d8f2d8327cac9c1c628159b93538d9f -size 590741 +oid sha256:c764567280e9b221aa10415fb08c525a31e0b3059b49c3531be5c9e1f046dcc2 +size 42540837