diff --git a/common/culture/cultures/NEOW_brythonic.txt b/common/culture/cultures/NEOW_brythonic.txt index 0d9019531..645b5f6c3 100644 --- a/common/culture/cultures/NEOW_brythonic.txt +++ b/common/culture/cultures/NEOW_brythonic.txt @@ -240,7 +240,7 @@ welsh = { #Cymry #tradition_concubines tradition_highland_warriors tradition_pastoralists - #tradition_longbow_competitions + tradition_longbow_competitions } dlc_tradition = { trait = tradition_staunch_traditionalists diff --git a/common/culture/innovations/00_cultural_maa_innovations.txt b/common/culture/innovations/00_cultural_maa_innovations.txt index 7057187a4..01f69bbf2 100644 --- a/common/culture/innovations/00_cultural_maa_innovations.txt +++ b/common/culture/innovations/00_cultural_maa_innovations.txt @@ -44,7 +44,6 @@ innovation_zweihanders = { has_cultural_pillar = heritage_central_germanic } - unlock_maa = landsknecht flag = global_regional flag = global_maa @@ -60,7 +59,6 @@ innovation_adaptive_militia = { has_cultural_parameter = unlock_adaptive_militia_innovation } - unlock_maa = goedendag flag = global_maa } @@ -75,7 +73,6 @@ innovation_valets = { has_cultural_parameter = unlock_valets_innovation } - unlock_maa = gendarme flag = global_maa } @@ -90,7 +87,6 @@ innovation_pike_columns = { has_cultural_parameter = unlock_innovation_pike_columns } - unlock_maa = picchieri flag = global_maa } @@ -111,7 +107,6 @@ innovation_legionnaires = { # } } - unlock_maa = praetorian flag = global_maa } @@ -128,7 +123,6 @@ innovation_desert_tactics = { } } - unlock_maa = chasseur flag = global_maa } @@ -140,7 +134,6 @@ innovation_caballeros = { region = world_europe_west_iberia icon = @caballeros - unlock_maa = caballero flag = global_regional flag = tribal_era_regional @@ -153,7 +146,6 @@ innovation_hobbies = { region = ghw_region_britannia icon = @special_maa_02 - unlock_maa = hobelar flag = global_regional flag = global_maa @@ -169,7 +161,6 @@ innovation_rectilinear_schiltron = { has_cultural_parameter = unlock_schiltron_innovation } - unlock_maa = schiltron flag = global_maa } @@ -181,7 +172,6 @@ innovation_bamboo_bows = { region = world_india icon = @special_maa_02 - unlock_maa = paiks flag = global_regional flag = global_maa @@ -195,7 +185,6 @@ innovation_sahel_horsemen = { region = custom_sahel_proper icon = @special_maa_01 - unlock_maa = sahel_horsemen flag = global_regional flag = tribal_era_regional @@ -211,7 +200,6 @@ innovation_sarawit = { has_cultural_parameter = unlock_sarawit_innovation } - unlock_maa = sarawit flag = global_maa } @@ -246,7 +234,6 @@ innovation_repeating_crossbow = { name = innovation_repeating_crossbow_chinese } - unlock_maa = shenbigong flag = global_maa } diff --git a/common/culture/innovations/N3OW_cultural_maa_innovations.txt b/common/culture/innovations/N3OW_cultural_maa_innovations.txt index c178082cc..b2f731e68 100644 --- a/common/culture/innovations/N3OW_cultural_maa_innovations.txt +++ b/common/culture/innovations/N3OW_cultural_maa_innovations.txt @@ -54,14 +54,13 @@ innovation_british_ironsides = { icon = @knight potential = { - NOT = { this = culture:angler } + NOT = { culture = culture:angler } OR = { has_cultural_pillar = heritage_brythonic has_cultural_pillar = heritage_anglo_frisian } } - unlock_maa = ironsides } @@ -79,7 +78,6 @@ innovation_celtic_columneers = { } } - unlock_maa = columneers flag = global_regional @@ -95,10 +93,9 @@ innovation_pioneers = { icon = @knighthood potential = { - this = culture:metropolitain + culture = culture:metropolitain } - unlock_maa = pioneers flag = global_regional @@ -117,7 +114,6 @@ innovation_cuirassiers = { has_cultural_pillar = heritage_french } - unlock_maa = cuirassiers flag = global_regional @@ -135,13 +131,12 @@ innovation_gardians = { potential = { OR = { - this = culture:provencal - this = culture:rottisch - this = culture:patoues + culture = culture:provencal + culture = culture:rottisch + culture = culture:patoues } } - unlock_maa = gardians flag = global_regional @@ -159,9 +154,9 @@ innovation_voltigeurs = { potential = { OR = { - this = culture:elsasse - this = culture:lorin - this = culture:gascon + culture = culture:elsasse + culture = culture:lorin + culture = culture:gascon } } @@ -186,7 +181,6 @@ innovation_spahis = { } } - unlock_maa = spahis flag = global_maa @@ -203,8 +197,8 @@ innovation_guides = { potential = { OR = { - this = culture:belge - this = culture:letzebuerge + culture = culture:belge + culture = culture:letzebuerge } } @@ -223,7 +217,7 @@ innovation_cacadores = { icon = @gunpowder potential = { - this = culture:portuguese + culture = culture:portuguese } unlock_maa = cacadores @@ -242,11 +236,11 @@ innovation_almogavares = { potential = { OR = { - this = culture:andorra - this = culture:aragonese - this = culture:asturleonese - this = culture:basque - this = culture:galician + culture = culture:andorra + culture = culture:aragonese + culture = culture:asturleonese + culture = culture:basque + culture = culture:galician } } @@ -263,9 +257,9 @@ innovation_tercos = { potential = { OR = { - this = culture:catalan - this = culture:balearic - this = culture:valencian + culture = culture:catalan + culture = culture:balearic + culture = culture:valencian } } @@ -281,9 +275,9 @@ innovation_lanceros = { potential = { OR = { - this = culture:castilian - this = culture:extremeno - this = culture:NEOW_andalusian + culture = culture:castilian + culture = culture:extremeno + culture = culture:NEOW_andalusian } } @@ -299,14 +293,14 @@ innovation_betyars = { potential = { OR = { - this = culture:hungarian - this = culture:szeklers - this = culture:translyvanian - this = culture:czech - this = culture:NEOW_moravian - this = culture:NEOW_slovak - this = culture:goral - this = culture:NEOW_carpathian + culture = culture:hungarian + culture = culture:szeklers + culture = culture:translyvanian + culture = culture:czech + culture = culture:NEOW_moravian + culture = culture:NEOW_slovak + culture = culture:goral + culture = culture:NEOW_carpathian } } unlock_maa = betyars @@ -321,11 +315,11 @@ innovation_peacekeepers = { potential = { OR = { - this = culture:wallachian - this = culture:banatian - this = culture:moldavian - this = culture:NEOW_gagauz - this = culture:NEOW_ucrainean + culture = culture:wallachian + culture = culture:banatian + culture = culture:moldavian + culture = culture:NEOW_gagauz + culture = culture:NEOW_ucrainean } } unlock_maa = peacekeepers @@ -340,12 +334,12 @@ innovation_tachanka { potential = { OR = { - this = culture:NEOW_kievan - this = culture:NEOW_cossack - this = culture:NEOW_crimean - this = culture:NEOW_nizhnevolzhan - this = culture:NEOW_povolzhan - this = culture:kalmyk + culture = culture:NEOW_kievan + culture = culture:NEOW_cossack + culture = culture:NEOW_crimean + culture = culture:NEOW_nizhnevolzhan + culture = culture:NEOW_povolzhan + culture = culture:kalmyk } } unlock_maa = tachanka @@ -360,20 +354,20 @@ innovation_uhlan = { potential = { OR = { - this = culture:NEOW_greater_polish - this = culture:NEOW_lesser_polish - this = culture:NEOW_mazovian_polish - this = culture:sorbian - this = culture:kashubian - this = culture:goral - this = culture:NEOW_silesian - this = culture:lipka - this = culture:NEOW_pribaltic - this = culture:NEOW_polessian - this = culture:NEOW_minskian - this = culture:NEOW_vohlynian - this = culture:lithuanian - this = culture:samogitian + culture = culture:NEOW_greater_polish + culture = culture:NEOW_lesser_polish + culture = culture:NEOW_mazovian_polish + culture = culture:sorbian + culture = culture:kashubian + culture = culture:goral + culture = culture:NEOW_silesian + culture = culture:lipka + culture = culture:NEOW_pribaltic + culture = culture:NEOW_polessian + culture = culture:NEOW_minskian + culture = culture:NEOW_vohlynian + culture = culture:lithuanian + culture = culture:samogitian } } unlock_maa = uhlan @@ -388,13 +382,13 @@ innovation_bike_cav = { potential = { OR = { - this = culture:latvian - this = culture:latgalian - this = culture:estonian - this = culture:livonian - this = culture:voroseto - this = culture:dansk - this = culture:slesvigsk + culture = culture:latvian + culture = culture:latgalian + culture = culture:estonian + culture = culture:livonian + culture = culture:voroseto + culture = culture:dansk + culture = culture:slesvigsk has_cultural_pillar = heritage_west_germanic } } diff --git a/common/governments/00_government_types.txt b/common/governments/00_government_types.txt index abefd3ca4..7e23460df 100644 --- a/common/governments/00_government_types.txt +++ b/common/governments/00_government_types.txt @@ -9,6 +9,7 @@ feudal_government = { dynasty_named_realms = no legitimacy = yes allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -35,6 +36,7 @@ feudal_government = { may_elevate_co_monarch government_uses_crown_authority government_uses_domain_limit + government_can_use_tributary_men_at_arms } mechanic_type = feudal @@ -169,6 +171,7 @@ clan_government = { government_is_settled government_uses_crown_authority government_uses_domain_limit + government_can_use_tributary_men_at_arms } mechanic_type = clan @@ -201,6 +204,7 @@ tribal_government = { always_use_patronym = yes affected_by_development = no allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -244,6 +248,7 @@ tribal_government = { may_elevate_co_monarch government_uses_domain_limit government_uses_tribal_authority + government_can_use_tributary_men_at_arms } # Grant candidate for nomads and herders who want to settle @@ -275,6 +280,7 @@ wanua_government = { # "Wanua" regiments_use_barter_goods_as_gold = yes barter = yes allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -324,6 +330,7 @@ wanua_government = { # "Wanua" government_enables_river_travel may_elevate_co_monarch government_uses_tribal_authority + government_can_use_tributary_men_at_arms } color = rgb{ 85 207 198 } @@ -481,6 +488,7 @@ administrative_government = { treasury_vassal_development = yes replace_gold_cost_by_treasury = yes allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -559,6 +567,7 @@ administrative_government = { government_uses_imperial_bureaucracy government_uses_salary_budget government_uses_military_budget + government_can_use_tributary_men_at_arms } ai = { @@ -903,6 +912,7 @@ celestial_government = { admin_allows_holding_multiple_primary_tier_titles = no disable_regnal_numbers = yes allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -988,6 +998,7 @@ celestial_government = { government_uses_salary_budget government_uses_military_budget government_uses_ministry_budget + government_can_use_tributary_men_at_arms } ai = { @@ -1029,6 +1040,7 @@ mandala_government = { count_tributaries_for_title_requirements = yes radiance = yes allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -1350,6 +1362,7 @@ meritocratic_government = { # e.g. Korea, Dai Viet deny_powerful_vassal = yes disable_regnal_numbers = yes allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -1433,6 +1446,7 @@ meritocratic_government = { # e.g. Korea, Dai Viet government_uses_meritocratic_bureaucracy government_uses_salary_budget government_uses_military_budget + government_can_use_tributary_men_at_arms } ai = { diff --git a/common/governments/01_japan_government_types.txt b/common/governments/01_japan_government_types.txt index 2c6ddcb2b..daaf0f229 100644 --- a/common/governments/01_japan_government_types.txt +++ b/common/governments/01_japan_government_types.txt @@ -14,6 +14,7 @@ deny_powerful_vassal = yes disable_regnal_numbers = yes allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -25,7 +26,7 @@ minimum_provincial_maa_tier = duchy primary_holding = castle_holding - primary_heritages = { heritage_japonic } + primary_heritages = { heritage_scottish heritage_brythonic heritage_anglo_frisian heritage_goidelic } valid_holdings = { city_holding temple_citadel_holding tribal_holding } required_county_holdings = { castle_holding city_holding church_holding } @@ -81,6 +82,7 @@ government_uses_japanese_family_aspirations government_has_house_blocs government_uses_japanese_bureaucracy + government_can_use_tributary_men_at_arms } possible_grant_vassal_governments = { theocracy_government ecclesiastical_government } @@ -108,6 +110,7 @@ japan_feudal_government = { # Soryo noble_families = yes disable_regnal_numbers = yes allow_accolades = yes + subject_men_at_arms = yes } royal_court = any @@ -132,7 +135,7 @@ japan_feudal_government = { # Soryo domicile_type = japanese_manor primary_holding = castle_holding - primary_heritages = { heritage_japonic } + primary_heritages = { heritage_scottish heritage_brythonic heritage_anglo_frisian heritage_goidelic } valid_holdings = { temple_citadel_holding tribal_holding } required_county_holdings = { castle_holding city_holding church_holding } @@ -165,6 +168,7 @@ japan_feudal_government = { # Soryo government_uses_japanese_family_aspirations government_has_house_blocs government_uses_japanese_bureaucracy + government_can_use_tributary_men_at_arms } possible_grant_vassal_governments = { theocracy_government ecclesiastical_government } diff --git a/common/governments/02_theocratic_government_types.txt b/common/governments/02_theocratic_government_types.txt index 7abf506ee..78501de41 100644 --- a/common/governments/02_theocratic_government_types.txt +++ b/common/governments/02_theocratic_government_types.txt @@ -8,6 +8,7 @@ theocracy_government = { inherit_from_dynastic_government = no disable_regnal_numbers = yes sticky_government = yes + subject_men_at_arms = yes } primary_holding = church_holding @@ -48,6 +49,7 @@ theocracy_government = { government_uses_domain_limit gov_uses_non_crown_coa government_is_basic_theocracy + government_can_use_tributary_men_at_arms } mechanic_type = theocracy @@ -91,6 +93,7 @@ ecclesiastical_government = { sticky_government = yes allow_accolades = yes landless_playable = yes + subject_men_at_arms = yes } royal_court = landed @@ -145,6 +148,7 @@ ecclesiastical_government = { government_has_treasury government_uses_cardinal_budget gov_uses_non_crown_coa + government_can_use_tributary_men_at_arms } mechanic_type = theocracy diff --git a/common/men_at_arms_types/00_cultural_maa_types.txt b/common/men_at_arms_types/00_cultural_maa_types.txt index 32b97b09a..0d4b21380 100644 --- a/common/men_at_arms_types/00_cultural_maa_types.txt +++ b/common/men_at_arms_types/00_cultural_maa_types.txt @@ -40,9 +40,19 @@ huscarl = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_huscarls } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_huscarls } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_huscarls } + } + government_allows = subject_men_at_arms + } } } @@ -82,6 +92,21 @@ landsknecht = { heavy_cavalry = 2 } + can_recruit = { + OR = { + culture ?= { + has_innovation = innovation_zweihanders + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_zweihanders + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = landsknecht_recruitment_cost } low_maintenance_cost = { gold = landsknecht_low_maint_cost } high_maintenance_cost = { gold = landsknecht_high_maint_cost } @@ -112,6 +137,17 @@ longbowmen = { heavy_cavalry = 1 } + can_recruit = { + OR = { + culture ?= { has_cultural_parameter = unlock_maa_longbowmen } + AND = { + any_vassal = { + culture ?= { has_cultural_parameter = unlock_maa_longbowmen } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = longbowmen_recruitment_cost } low_maintenance_cost = { gold = longbowmen_low_maint_cost } high_maintenance_cost = { gold = longbowmen_high_maint_cost } @@ -135,6 +171,21 @@ goedendag = { heavy_cavalry = 1 } + can_recruit = { + OR = { + culture ?= { + has_innovation = innovation_adaptive_militia + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_adaptive_militia + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = goedendag_recruitment_cost } low_maintenance_cost = { gold = goedendag_low_maint_cost } high_maintenance_cost = { gold = goedendag_high_maint_cost } @@ -173,6 +224,22 @@ gendarme = { harsh_winter = { damage = -30 toughness = -10 } } + can_recruit = { + OR = { + culture ?= { + has_innovation = innovation_valets + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_valets + } + } + government_allows = subject_men_at_arms + } + } + } + buy_cost = { gold = gendarme_recruitment_cost } low_maintenance_cost = { gold = gendarme_low_maint_cost } high_maintenance_cost = { gold = gendarme_high_maint_cost } @@ -210,6 +277,21 @@ chasseur = { harsh_winter = { damage = -5 toughness = -2 } } + can_recruit = { + OR = { + culture ?= { + has_innovation = innovation_desert_tactics + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_desert_tactics + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = chasseur_recruitment_cost } low_maintenance_cost = { gold = chasseur_low_maint_cost } high_maintenance_cost = { gold = chasseur_high_maint_cost } @@ -241,6 +323,21 @@ picchieri = { elephant_cavalry = 1 } + can_recruit = { + OR = { + culture ?= { + has_innovation = innovation_pike_columns + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_pike_columns + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = picchieri_recruitment_cost } low_maintenance_cost = { gold = picchieri_low_maint_cost } high_maintenance_cost = { gold = picchieri_high_maint_cost } @@ -300,6 +397,21 @@ caballero = { harsh_winter = { damage = -5 toughness = -2 } } + can_recruit = { + OR = { + culture ?= { + has_innovation = innovation_caballeros + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_caballeros + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = caballero_recruitment_cost } low_maintenance_cost = { gold = caballero_low_maint_cost } high_maintenance_cost = { gold = caballero_high_maint_cost } @@ -336,9 +448,19 @@ monaspa = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_monaspa } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_monaspa } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_monaspa } + } + government_allows = subject_men_at_arms + } } } @@ -420,6 +542,26 @@ hobelar = { winter_bonus = { harsh_winter = { damage = -5 } } + can_recruit = { + OR = { + AND = { + culture ?= { + has_innovation = innovation_hobbies + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_hobbies + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = hobelar_recruitment_cost } low_maintenance_cost = { gold = hobelar_low_maint_cost } @@ -450,6 +592,26 @@ schiltron = { light_cavalry = 1 heavy_cavalry = 1 } + can_recruit = { + OR = { + AND = { + culture ?= { + has_innovation = innovation_rectilinear_schiltron + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_rectilinear_schiltron + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = schiltron_recruitment_cost } low_maintenance_cost = { gold = schiltron_low_maint_cost } @@ -482,9 +644,22 @@ metsanvartija = { normal_winter = { toughness = 4 screen = 8 } harsh_winter = { toughness = 4 screen = 8 } } - can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_metsanvartija } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_metsanvartija } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_metsanvartija } + } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = metsanvartija_recruitment_cost } @@ -530,6 +705,12 @@ horse_archers = { } culture ?= { has_cultural_parameter = unlock_maa_horse_archers } mpo_can_recruit_nomad_maa_trigger = yes + AND = { + any_vassal = { + culture ?= { has_cultural_parameter = unlock_maa_horse_archers } + } + government_allows = subject_men_at_arms + } } } @@ -560,9 +741,23 @@ ayyar = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_ayyar } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_ayyar } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_ayyar } + } + } + government_allows = subject_men_at_arms + } } } @@ -591,9 +786,23 @@ mubarizun = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_mubarizun } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_mubarizun } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_mubarizun } + } + } + government_allows = subject_men_at_arms + } } } @@ -637,7 +846,24 @@ mulaththamun = { #Murabit Cavalry } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_mulaththamun } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_mulaththamun } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_mulaththamun } + } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = mulaththamun_recruitment_cost } @@ -670,9 +896,27 @@ archers_of_the_nile = { #Nile Archers } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_archers_of_the_nile } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_archers_of_the_nile } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_archers_of_the_nile } + } + } + government_allows = subject_men_at_arms + } + } } + buy_cost = { gold = archers_of_the_nile_recruitment_cost } low_maintenance_cost = { gold = archers_of_the_nile_low_maint_cost } high_maintenance_cost = { gold = archers_of_the_nile_high_maint_cost } @@ -701,6 +945,26 @@ paiks = { #Indian Footmen - carrying bows but also swords and spears. elephant_cavalry = 1 } + can_recruit = { + OR = { + AND = { + culture ?= { + has_innovation = innovation_bamboo_bows + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_bamboo_bows + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = paiks_recruitment_cost } low_maintenance_cost = { gold = paiks_low_maint_cost } high_maintenance_cost = { gold = paiks_high_maint_cost } @@ -724,11 +988,24 @@ druzhina = { pikemen = 1 peasant_militia = 2 } - can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_druzhina } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_druzhina } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_druzhina } + } + } + government_allows = subject_men_at_arms + } } } @@ -769,7 +1046,24 @@ hussar = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_hussar } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_hussar } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_hussar } + } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = hussar_recruitment_cost } @@ -801,7 +1095,24 @@ horn_warrior = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_horn_warrior } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_horn_warrior } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_horn_warrior } + } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = horn_warrior_recruitment_cost } @@ -832,8 +1143,26 @@ bush_hunter = { skirmishers = 1 } + can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_bush_hunter } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_bush_hunter } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_bush_hunter } + } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = bush_hunter_recruitment_cost } @@ -857,9 +1186,25 @@ shomer = { counters = { heavy_infantry = 1 } - can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_shomer } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_shomer } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_shomer } + } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = shomer_recruitment_cost } @@ -900,9 +1245,23 @@ garudas = { ai_quality = { value = @cultural_maa_extra_ai_score } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_garudas } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_garudas } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_garudas } + } + } + government_allows = subject_men_at_arms + } } } @@ -931,9 +1290,23 @@ khandayat = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_khandayat } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_khandayat } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_khandayat } + } + } + government_allows = subject_men_at_arms + } } } @@ -970,11 +1343,24 @@ mountaineer = { normal_winter = { damage = 5 } harsh_winter = { damage = 5 } } - can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_mountaineer } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_mountaineer } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_mountaineer } + } + } + government_allows = subject_men_at_arms + } } } @@ -1017,6 +1403,26 @@ sahel_horsemen = { winter_bonus = { harsh_winter = { damage = -5 toughness = -2 } } + can_recruit = { + OR = { + AND = { + culture ?= { + has_innovation = innovation_sahel_horsemen + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_sahel_horsemen + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = sahel_rider_recruitment_cost } low_maintenance_cost = { gold = sahel_rider_low_maint_cost } @@ -1045,9 +1451,25 @@ guinea_warrior = { #AKA Guinean uplander counters = { heavy_infantry = 1 } - can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_guinea_warrior } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_guinea_warrior } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_guinea_warrior } + } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = guinea_warrior_recruitment_cost } @@ -1079,6 +1501,26 @@ sarawit = { #AKA Ethiopian mountaineer counters = { light_cavalry = 1 } + can_recruit = { + OR = { + AND = { + culture ?= { + has_innovation = innovation_sarawit + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_sarawit + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = sarawit_recruitment_cost } low_maintenance_cost = { gold = sarawit_low_maint_cost } @@ -1111,7 +1553,24 @@ abudrar = { #AKA Jabali - Berber mountaineer } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_abudrar } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_abudrar } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_abudrar } + } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = abudrar_recruitment_cost } @@ -1144,11 +1603,24 @@ zbrojnosh = { peasant_militia = 2 archers = 1 } - can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_zbrojnosh } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_zbrojnosh } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_zbrojnosh } + } + } + government_allows = subject_men_at_arms + } } } @@ -1181,9 +1653,23 @@ palace_guards = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_palace_guards } - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + OR = { + AND = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_palace_guards } + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + valid_for_maa_trigger = { PARAMETER = unlock_maa_palace_guards } + } + } + government_allows = subject_men_at_arms + } } } @@ -1222,6 +1708,26 @@ shenbigong = { peasant_militia = 2 } + can_recruit = { + OR = { + AND = { + culture ?= { + has_innovation = innovation_repeating_crossbow + } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_repeating_crossbow + } + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = shenbigong_recruitment_cost } low_maintenance_cost = { gold = shenbigong_low_maint_cost } high_maintenance_cost = { gold = shenbigong_high_maint_cost } @@ -1290,18 +1796,19 @@ teulu = { } can_recruit = { - culture ?= { - OR = { - this = culture:welsh - this = culture:cumbrian - any_parent_culture_or_above = { - OR = { - this = culture:welsh - this = culture:cumbrian - } - has_cultural_pillar = heritage_brythonic + OR = { + AND = { + culture ?= {has_cultural_pillar = heritage_brythonic} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } + AND = { + any_vassal = { + culture ?= {has_cultural_pillar = heritage_brythonic} + } + government_allows = subject_men_at_arms + } } } diff --git a/common/men_at_arms_types/00_maa_types.txt b/common/men_at_arms_types/00_maa_types.txt index 38808d898..f0160e197 100644 --- a/common/men_at_arms_types/00_maa_types.txt +++ b/common/men_at_arms_types/00_maa_types.txt @@ -615,7 +615,15 @@ handgunners = { can_recruit = { gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings # one powder magazine must be owned to support three handgunner regiments, regardless of maa size - culture ?= { has_cultural_parameter = unlock_handgunners } + OR = { + culture ?= { has_cultural_parameter = unlock_handgunners } + AND = { + any_vassal = { + culture ?= { has_cultural_parameter = unlock_handgunners } + } + government_allows = subject_men_at_arms + } + } } terrain_bonus = { diff --git a/common/men_at_arms_types/N3OW_dlc_maa_types.txt b/common/men_at_arms_types/N3OW_dlc_maa_types.txt index d147af4b9..64f7769c2 100644 --- a/common/men_at_arms_types/N3OW_dlc_maa_types.txt +++ b/common/men_at_arms_types/N3OW_dlc_maa_types.txt @@ -41,7 +41,15 @@ emishi_horse_archers = { } can_recruit = { - culture ?= { has_cultural_parameter = unlock_emishi_horse_archers_units } + OR = { + culture ?= { has_cultural_parameter = unlock_emishi_horse_archers_units } + AND = { + any_vassal = { + culture ?= { has_cultural_parameter = unlock_emishi_horse_archers_units } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = light_cavalry_recruitment_cost } @@ -223,6 +231,12 @@ tarkhan = { location.culture ?= { has_cultural_parameter = unlock_maa_tarkhan } } culture ?= { has_cultural_parameter = unlock_maa_tarkhan } + AND = { + any_vassal = { + culture ?= { has_cultural_parameter = unlock_maa_tarkhan } + } + government_allows = subject_men_at_arms + } } NOT = { culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } @@ -256,6 +270,12 @@ zupin_warrior = { location.culture ?= { has_cultural_parameter = unlock_maa_zupin_warrior } } culture ?= { has_cultural_parameter = unlock_maa_zupin_warrior } + AND = { + any_vassal = { + culture ?= { has_cultural_parameter = unlock_maa_zupin_warrior } + } + government_allows = subject_men_at_arms + } } } @@ -317,6 +337,12 @@ tawashi = { location.culture ?= { has_cultural_parameter = unlock_maa_tawashi } } culture ?= { has_cultural_parameter = unlock_maa_tawashi } + AND = { + any_vassal = { + culture ?= { has_cultural_parameter = unlock_maa_tawashi } + } + government_allows = subject_men_at_arms + } } } diff --git a/common/men_at_arms_types/NEOW_maa_types.txt b/common/men_at_arms_types/NEOW_maa_types.txt index 075214c23..af962a50f 100644 --- a/common/men_at_arms_types/NEOW_maa_types.txt +++ b/common/men_at_arms_types/NEOW_maa_types.txt @@ -70,8 +70,19 @@ redcoats = { can_recruit = { gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings # one powder magazine must be owned to support three handgunner regiments, regardless of maa size - culture ?= { - has_innovation = innovation_redcoats + OR = { + AND = { + culture ?= {has_innovation = innovation_redcoats} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_redcoats} + } + government_allows = subject_men_at_arms + } } } @@ -134,6 +145,22 @@ ironsides = { harsh_winter = { damage = -30 toughness = -10 } } + can_recruit = { + OR = { + AND = { + culture ?= {has_innovation = innovation_british_ironsides} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_british_ironsides} + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = tiefutu_recruitment_cost } low_maintenance_cost = { gold = tiefutu_low_maint_cost } high_maintenance_cost = { gold = tiefutu_high_maint_cost } @@ -177,6 +204,22 @@ cuirassiers = { #Copy pasted Conrois, need to think of how to make them unique harsh_winter = { damage = -25 toughness = -10 } } + can_recruit = { + OR = { + AND = { + culture ?= {has_innovation = innovation_cuirassiers} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_cuirassiers} + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = conrois_recruitment_cost } low_maintenance_cost = { gold = conrois_low_maint_cost } high_maintenance_cost = { gold = conrois_high_maint_cost } @@ -210,6 +253,22 @@ columneers = { pikemen = 1 } + can_recruit = { + OR = { + AND = { + culture ?= {has_innovation = innovation_celtic_columneers} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_celtic_columneers} + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = longbowmen_recruitment_cost } low_maintenance_cost = { gold = longbowmen_low_maint_cost } high_maintenance_cost = { gold = longbowmen_high_maint_cost } @@ -242,6 +301,22 @@ pioneers = { archers = 1 } + can_recruit = { + OR = { + AND = { + culture ?= {has_innovation = innovation_pioneers} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_pioneers} + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = varangian_guards_recruitment_cost } low_maintenance_cost = { gold = varangian_guards_low_maint_cost } high_maintenance_cost = { gold = varangian_guards_high_maint_cost } @@ -278,6 +353,22 @@ gardians = { harsh_winter = { damage = -5 toughness = -2 } } + can_recruit = { + OR = { + AND = { + culture ?= {has_innovation = innovation_gardians} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_gardians} + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = hobelar_recruitment_cost } low_maintenance_cost = { gold = hobelar_low_maint_cost } high_maintenance_cost = { gold = hobelar_high_maint_cost } @@ -308,6 +399,22 @@ voltigeurs = { heavy_infantry = 1 } + can_recruit = { + OR = { + AND = { + culture ?= {has_innovation = innovation_voltigeurs} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_voltigeurs} + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = guanch_vaulter_recruitment_cost } low_maintenance_cost = { gold = guanch_vaulter_low_maint_cost } high_maintenance_cost = { gold = guanch_vaulter_high_maint_cost } @@ -342,6 +449,22 @@ spahis = { heavy_infantry = 1 } + can_recruit = { + OR = { + AND = { + culture ?= {has_innovation = innovation_spahis} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_spahis} + } + government_allows = subject_men_at_arms + } + } + } buy_cost = { gold = horse_archers_recruitment_cost } low_maintenance_cost = { gold = horse_archers_low_maint_cost } high_maintenance_cost = { gold = horse_archers_high_maint_cost } @@ -360,7 +483,7 @@ NEOW_militia = { damage = 14 toughness = 14 - pursuit = 10 + pursuit = 5 screen = 4 terrain_bonus = { @@ -392,12 +515,15 @@ NEOW_militia = { } } } + should_show_when_unavailable = { + government_allows = noble_families + } buy_cost = { gold = militia_recruitment_cost } low_maintenance_cost = { gold = militia_low_maint_cost } high_maintenance_cost = { gold = militia_high_maint_cost } provision_cost = @provisions_cost_infantry_cheap - stack = 100 + stack = 150 ai_quality = { value = culture_ai_weight_skirmishers } illustration = { @@ -446,12 +572,15 @@ NEOW_militia_archers = { } } } + should_show_when_unavailable = { + government_allows = noble_families + } buy_cost = { gold = militia_recruitment_cost } low_maintenance_cost = { gold = militia_low_maint_cost } high_maintenance_cost = { gold = militia_high_maint_cost } provision_cost = @provisions_cost_infantry_cheap - stack = 100 + stack = 150 ai_quality = { value = culture_ai_weight_skirmishers } illustration = { @@ -466,6 +595,60 @@ NEOW_militia_archers = { icon = NEOW_militia_archers } +NEOW_militia_skirmisher = { + type = peasant_militia + + damage = 8 + toughness = 12 + pursuit = 10 + screen = 12 + + terrain_bonus = { + forest = { damage = 4 toughness = 6 } + taiga = { damage = 4 toughness = 6 } + jungle = { damage = 4 toughness = 6 } + } + + counters = { + heavy_infantry = 0.5 + } + can_recruit = { + OR = { + militia_raise_limit_existing_militia_units < militia_raise_limit_existing_militia_buildings + + trigger_if = { + limit = { + government_has_flag = government_is_landless_minority + exists = domicile + } + domicile = { + has_domicile_parameter = can_recruit_militia + } + } + } + } + should_show_when_unavailable = { + government_allows = noble_families + } + + buy_cost = { gold = militia_recruitment_cost } + low_maintenance_cost = { gold = militia_low_maint_cost } + high_maintenance_cost = { gold = militia_high_maint_cost } + provision_cost = @provisions_cost_infantry_cheap + stack = 150 + ai_quality = { value = culture_ai_weight_skirmishers } + + illustration = { + trigger = { + should_use_asian_maa_graphics = yes + } + reference = skirmishers_asia + } + illustration = { + reference = peasant_militia_skirmisher + } + icon = NEOW_militia_skirmisher +} carabineers = { type = gun_cavalry @@ -493,13 +676,24 @@ carabineers = { can_recruit = { gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings # one powder magazine must be owned to support three handgunner regiments, regardless of maa size - culture ?= { has_cultural_parameter = unlock_late_medieval_gunpowder_units } + OR = { + AND = { + culture ?= {has_cultural_parameter = unlock_late_medieval_gunpowder_units} + } + AND = { + any_vassal = { + culture ?= {has_cultural_parameter = unlock_late_medieval_gunpowder_units} + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = horse_archers_recruitment_cost } low_maintenance_cost = { gold = horse_archers_low_maint_cost } high_maintenance_cost = { gold = horse_archers_high_maint_cost } provision_cost = @provisions_cost_cavalry_cheap + icon = horse_gunmen stack = 100 ai_quality = { @@ -536,15 +730,25 @@ cowboys = { } can_recruit = { - gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings # one powder magazine must be owned to support three handgunner regiments, regardless of maa size - culture ?= { has_cultural_parameter = unlock_maa_kuhjung } + gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings # one powder magazine must be owned to support three handgunner regiments, regardless of maa size + OR = { + AND = { + culture ?= {has_cultural_parameter = unlock_maa_kuhjung} + } + AND = { + any_vassal = { + culture ?= {has_cultural_parameter = unlock_maa_kuhjung} + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = horse_archers_recruitment_cost } low_maintenance_cost = { gold = horse_archers_low_maint_cost } high_maintenance_cost = { gold = horse_archers_high_maint_cost } provision_cost = @provisions_cost_cavalry_cheap - + icon = horse_gunmen stack = 100 ai_quality = { value = @cultural_maa_extra_ai_score @@ -571,8 +775,19 @@ full_plate_footmen = { } can_recruit = { - culture ?= { - has_innovation = innovation_plate_armor + OR = { + AND = { + culture ?= {has_innovation = innovation_plate_armor} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {has_innovation = innovation_plate_armor} + } + government_allows = subject_men_at_arms + } } NOR = { government_has_flag = government_is_nomadic @@ -595,7 +810,7 @@ full_plate_footmen = { low_maintenance_cost = { gold = super_heavy_infantry_low_maint_cost } high_maintenance_cost = { gold = super_heavy_infantry_high_maint_cost } provision_cost = @provisions_cost_infantry_moderate - + icon = super_heavy_infantry stack = 100 ai_quality = { @@ -646,7 +861,7 @@ toxic_gas_slingers = { low_maintenance_cost = { gold = chemical_weapons_low_maint_cost } high_maintenance_cost = { gold = chemical_weapons_high_maint_cost } provision_cost = @provisions_cost_infantry_cheap - + icon = chemical_weapons stack = 50 ai_quality = { value = culture_ai_weight_skirmishers } } @@ -683,6 +898,7 @@ airships = { can_recruit = { airships_raise_limit_existing_airships_units < airships_raise_limit_existing_airships_buildings } + icon = airship illustration = { reference = ill_airship @@ -738,7 +954,20 @@ tercos = { screen = 5 can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_tercos } + OR = { + AND = { + culture ?= {valid_for_maa_trigger = { PARAMETER = unlock_maa_tercos }} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + culture ?= {valid_for_maa_trigger = { PARAMETER = unlock_maa_tercos }} + } + government_allows = subject_men_at_arms + } + } } counters = { @@ -770,7 +999,21 @@ espadachin = { screen = 0 can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_espadachin } + + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_espadachin } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_espadachin } + } + government_allows = subject_men_at_arms + } + } } terrain_bonus = { @@ -825,7 +1068,20 @@ lanceros = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_lanceros} + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_lanceros} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_lanceros} + } + government_allows = subject_men_at_arms + } + } } winter_bonus = { @@ -870,7 +1126,20 @@ betyars = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_betyar } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_betyar} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_betyar} + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = light_cavalry_recruitment_cost } @@ -901,7 +1170,20 @@ peacekeepers = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_peacekeepers } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_peacekeepers} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_peacekeepers} + } + government_allows = subject_men_at_arms + } + } } @@ -942,7 +1224,20 @@ tachanka = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_tachanka } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_tachanka} + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_tachanka} + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = mangonel_recruitment_cost } @@ -977,7 +1272,17 @@ uhlan = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_uhlan } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_uhlan} + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_uhlan} + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = heavy_cavalry_recruitment_cost } @@ -1016,9 +1321,20 @@ bike_cav = { } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_bike_cav } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_bike_cav} + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_bike_cav} + } + government_allows = subject_men_at_arms + } + } } + buy_cost = { gold = light_cavalry_recruitment_cost } low_maintenance_cost = { gold = light_cavalry_low_maint_cost } high_maintenance_cost = { gold = light_cavalry_high_maint_cost } @@ -1040,7 +1356,17 @@ stadswacht = { screen = 0 can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_stadswacht } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_stadswacht} + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_stadswacht} + } + government_allows = subject_men_at_arms + } + } } counters = { @@ -1073,8 +1399,21 @@ blauwegarde = { can_recruit = { gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings # one powder magazine must be owned to support three handgunner regiments, regardless of maa size - culture ?= { - has_innovation = innovation_blauwegarde + + OR = { + AND = { + culture ?= { + has_innovation = innovation_blauwegarde + } + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_blauwegarde + } + } + government_allows = subject_men_at_arms + } } } @@ -1113,7 +1452,17 @@ rodelansier = { screen = 15 can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_rodelansier } + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_rodelansier } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_rodelansier } + } + government_allows = subject_men_at_arms + } + } } counters = { @@ -1158,7 +1507,18 @@ karabiniers = { can_recruit = { gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings # one powder magazine must be owned to support three handgunner regiments, regardless of maa size - culture ?= { has_cultural_parameter = unlock_maa_karabiniers } + + OR = { + AND = { + culture ?= { has_cultural_parameter = unlock_maa_karabiniers } + } + AND = { + any_vassal = { + culture ?= { has_cultural_parameter = unlock_maa_karabiniers } + } + government_allows = subject_men_at_arms + } + } } buy_cost = { gold = horse_archers_recruitment_cost } @@ -1193,7 +1553,18 @@ besterios = { steppe = { toughness = -8 } } can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_besterios } + + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_besterios } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_besterios } + } + government_allows = subject_men_at_arms + } + } } counters = { @@ -1224,8 +1595,19 @@ arbalests = { pursuit = 5 screen = 5 can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_arbalests } - } + + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_arbalests } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_arbalests } + } + government_allows = subject_men_at_arms + } + } + } terrain_bonus = { hills = { damage = 10 toughness = 4 } mountains = { damage = 8 toughness = 2 } @@ -1264,7 +1646,18 @@ ordinenca = { screen = 5 can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_ordinenca } + + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_ordinenca } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_ordinenca } + } + government_allows = subject_men_at_arms + } + } } counters = { @@ -1296,7 +1689,18 @@ dalkarl = { screen = 5 can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_dalkarl } + + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_dalkarl } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_dalkarl } + } + government_allows = subject_men_at_arms + } + } } counters = { @@ -1329,8 +1733,20 @@ legionarios = { can_recruit = { gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings # one powder magazine must be owned to support three handgunner regiments, regardless of maa size - culture ?= { - has_innovation = innovation_legionarios + OR = { + AND = { + culture ?= { + has_innovation = innovation_legionarios + } + } + AND = { + any_vassal = { + culture ?= { + has_innovation = innovation_legionarios + } + } + government_allows = subject_men_at_arms + } } } @@ -1369,7 +1785,18 @@ albardiaz = { screen = 0 can_recruit = { - valid_for_maa_trigger = { PARAMETER = unlock_maa_albardiaz } + + OR = { + AND = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_albardiaz } + } + AND = { + any_vassal = { + valid_for_maa_trigger = { PARAMETER = unlock_maa_albardiaz } + } + government_allows = subject_men_at_arms + } + } } counters = { diff --git a/common/religion/rite_types/NEOW_rites_novelist.txt b/common/religion/rite_types/NEOW_rites_novelist.txt index 4b415d4dd..7e2373c78 100644 --- a/common/religion/rite_types/NEOW_rites_novelist.txt +++ b/common/religion/rite_types/NEOW_rites_novelist.txt @@ -735,7 +735,7 @@ absurdist = { faith = novelist_faith color = { 50 168 82 } - icon = rocambolist + icon = absurdist localization = { @@ -840,7 +840,7 @@ absurdist = { ReligiousSymbol = novelist_religious_symbol } tenets = { - tenet_preservation + tenet_pastoral_isolation tenet_esotericism tenet_the_search_for_a_meaning } diff --git a/common/religion/tenet_types/00_NEOW_tenet_types.txt b/common/religion/tenet_types/00_NEOW_tenet_types.txt index 5afc1e800..8518d2769 100644 --- a/common/religion/tenet_types/00_NEOW_tenet_types.txt +++ b/common/religion/tenet_types/00_NEOW_tenet_types.txt @@ -1070,7 +1070,6 @@ tenet_the_search_for_a_meaning = { no_unfaithfulness_penalty_active unlock_voluntary_laampdom_faith torturing_prisoners_grants_piety - consolamentum_active } divergence_multiplier = 3 @@ -1085,6 +1084,7 @@ tenet_the_search_for_a_meaning = { personal_tenet_modifier = { monthly_learning_lifestyle_xp_gain_mult = 0.2 tyranny_gain_mult = 0.50 + stress_gain_mult = -0.15 } character_modifier = { monthly_learning_lifestyle_xp_gain_mult = 0.1 diff --git a/common/religion/tenet_types/00_tenet_types.txt b/common/religion/tenet_types/00_tenet_types.txt index 97366716c..194fdfe23 100644 --- a/common/religion/tenet_types/00_tenet_types.txt +++ b/common/religion/tenet_types/00_tenet_types.txt @@ -5200,7 +5200,7 @@ tenet_sacred_shadows = { tenet_unlocks_t4_bounties_for_whispers } - divergence_multiplier = 3 + divergence_multiplier = 2 personal_tenet_modifier = { owned_scheme_secrecy_add = 10 @@ -6047,44 +6047,17 @@ tenet_pursuit_of_knowledge = { has_tgp_dlc_trigger = yes } can_pick = { - OR = { - religion = religion:buddhism_religion - custom_description = { - text = requires_sinitic_family_trigger - religion = { is_in_family = rf_sinitic } - } - } } piety_cost = { if = { limit = { - religion = religion:confucianism_religion + always = no } value = faith_tenet_cost_low } - else_if = { - limit = { - religion = { - is_in_family = rf_sinitic - } - } - value = faith_tenet_cost_mid - } - else_if = { - limit = { - religion = religion:buddhism_religion - } - value = faith_tenet_cost_mid - } else = { - value = faith_tenet_cost_high - } - - # Multiplier for keeping same tenet - if = { - limit = { rite_has_tenet = tenet_pursuit_of_knowledge } - multiply = faith_unchanged_doctrine_cost_mult + value = faith_tenet_cost_mid } } @@ -6313,44 +6286,17 @@ tenet_harmonious_society = { } can_pick = { - OR = { - religion = religion:buddhism_religion - custom_description = { - text = requires_sinitic_family_trigger - religion = { is_in_family = rf_sinitic } - } - } } piety_cost = { if = { limit = { - religion = religion:confucianism_religion + always = no } value = faith_tenet_cost_low } - else_if = { - limit = { - religion = { - is_in_family = rf_sinitic - } - } - value = faith_tenet_cost_low - } - else_if = { - limit = { - religion = religion:buddhism_religion - } - value = faith_tenet_cost_mid - } else = { - value = faith_tenet_cost_massive - } - - # Multiplier for keeping same tenet - if = { - limit = { rite_has_tenet = tenet_harmonious_society } - multiply = faith_unchanged_doctrine_cost_mult + value = faith_tenet_cost_mid } } diff --git a/common/script_values/00_men_at_arms_values.txt b/common/script_values/00_men_at_arms_values.txt index ae086c7dc..643f493dd 100644 --- a/common/script_values/00_men_at_arms_values.txt +++ b/common/script_values/00_men_at_arms_values.txt @@ -1011,6 +1011,13 @@ militia_raise_limit_existing_militia_units = { } add = 1 } + every_maa_regiment = { + limit = { + is_personal_maa_regiment = yes + is_maa_type = NEOW_militia_skirmisher + } + add = 1 + } } militia_raise_limit_existing_militia_buildings = { diff --git a/gfx/interface/icons/regimenttypes/NEOW_militia_skirmisher.dds b/gfx/interface/icons/regimenttypes/NEOW_militia_skirmisher.dds new file mode 100644 index 000000000..bff9d68c9 --- /dev/null +++ b/gfx/interface/icons/regimenttypes/NEOW_militia_skirmisher.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39ab3a6677509a68c371307e8704cd1b1010b521b20eca830350a9b7f3fca3e9 +size 19504 diff --git a/gfx/interface/icons/regimenttypes/NEOW_militia_template.pdn b/gfx/interface/icons/regimenttypes/NEOW_militia_template.pdn new file mode 100644 index 000000000..5af96ba06 Binary files /dev/null and b/gfx/interface/icons/regimenttypes/NEOW_militia_template.pdn differ diff --git a/gfx/interface/illustrations/men_at_arms_big/peasant_militia_skirmisher.dds b/gfx/interface/illustrations/men_at_arms_big/peasant_militia_skirmisher.dds new file mode 100644 index 000000000..74d756b7d --- /dev/null +++ b/gfx/interface/illustrations/men_at_arms_big/peasant_militia_skirmisher.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c548aa9906b61c2f24091888af6e8d0577d2da91733ddd138a5767833025131 +size 363584 diff --git a/gfx/interface/illustrations/men_at_arms_small/peasant_militia_skirmisher.dds b/gfx/interface/illustrations/men_at_arms_small/peasant_militia_skirmisher.dds new file mode 100644 index 000000000..4966d8bea --- /dev/null +++ b/gfx/interface/illustrations/men_at_arms_small/peasant_militia_skirmisher.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70d53a0445ca712d11e246f1b15eb8b9f25c9452047770e380e6d250929276d9 +size 34368 diff --git a/gui/texticons.gui b/gui/texticons.gui index 44b4d5271..f819b0c92 100644 --- a/gui/texticons.gui +++ b/gui/texticons.gui @@ -494,6 +494,15 @@ texticon = { fontsize = 16 } } +texticon = { + icon = NEOW_militia_skirmisher_icon + iconsize = { + texture = "gfx/interface/icons/regimenttypes/NEOW_militia_skirmisher.dds" + size = { 25 25 } + offset = { 0 6 } + fontsize = 16 + } +} texticon = { icon = horse_gunmen_icon diff --git a/localization/english/replace/culture/zz_NEOW_cultural_maa_innovations_l_english.yml b/localization/english/replace/culture/zz_NEOW_cultural_maa_innovations_l_english.yml index 10f16a951..c9926b850 100644 --- a/localization/english/replace/culture/zz_NEOW_cultural_maa_innovations_l_english.yml +++ b/localization/english/replace/culture/zz_NEOW_cultural_maa_innovations_l_english.yml @@ -114,9 +114,11 @@ bike_cav:0 "Bicycle Cavalry" bike_cav_flavor:0 "#F The Bicycle Cavalry are a special form of cavalry, using the bicycles they ride in order to charge towards battle, or to harrass the enemy and retreat away." NEOW_militia:0 "Peasant Spear Militia" - NEOW_militia_flavor:1 "#F Trained to an above average level by a militarily Competent Noble these peasants will hold their own in the field#!\n#help Enabled by the [GetBuilding('city_01').GetName], [GetBuilding('castle_01').GetName], [GetBuilding('temple_01').GetName], and [GetBuilding('temple_citadel_01').GetName].#!" + NEOW_militia_flavor:1 "#F Trained to an above average level by a militarily Competent Noble these peasant spears will hold their own in the field.#!\n#help Enabled by the [GetBuilding('city_01').GetName], [GetBuilding('castle_01').GetName], [GetBuilding('temple_01').GetName], and [GetBuilding('temple_citadel_01').GetName].#!" NEOW_militia_archers:0 "Peasant Bow Militia" - NEOW_militia_archers_flavor:1 "#F Trained to an above average level by a militarily Competent Noble these peasants will hold their own in the field\n#help Enabled by the [GetBuilding('city_01').GetName], [GetBuilding('castle_01').GetName], [GetBuilding('temple_01').GetName], and [GetBuilding('temple_citadel_01').GetName].#!" + NEOW_militia_archers_flavor:1 "#F Trained to an above average level by a militarily Competent Noble these peasants will fire on their enemies from a distance.\n#help Enabled by the [GetBuilding('city_01').GetName], [GetBuilding('castle_01').GetName], [GetBuilding('temple_01').GetName], and [GetBuilding('temple_citadel_01').GetName].#!" + NEOW_militia_skirmisher:0 "Peasant Skirmisher Militia" + NEOW_militia_skirmisher_flavor:1 "#F Trained to an above average level by a militarily Competent Noble these peasants will harrass the enemy in the field.\n#help Enabled by the [GetBuilding('city_01').GetName], [GetBuilding('castle_01').GetName], [GetBuilding('temple_01').GetName], and [GetBuilding('temple_citadel_01').GetName].#!" carabineers:0 "Carabineers" carabineers_flavor:1 "#F These professional soldiers combine their skills in the art of firearms and horse riding to achieve devastating results on the battlefield.#!\n#help Enabled by the [GetBuilding('powder_magazine_01').GetName].#!" cowboys:0 "Sechsschüssere"