From 51ad574f36759a0c6726de60c6d378e13a6e8c42 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Sun, 1 Nov 2026 14:17:28 +0000 Subject: [PATCH] maa stuff + gov stuff --- common/culture/cultures/NEOW_brythonic.txt | 2 +- .../00_cultural_maa_innovations.txt | 13 - .../N3OW_cultural_maa_innovations.txt | 130 ++-- common/governments/00_government_types.txt | 14 + .../governments/01_japan_government_types.txt | 8 +- .../02_theocratic_government_types.txt | 4 + .../00_cultural_maa_types.txt | 617 ++++++++++++++++-- common/men_at_arms_types/00_maa_types.txt | 10 +- .../men_at_arms_types/N3OW_dlc_maa_types.txt | 28 +- common/men_at_arms_types/NEOW_maa_types.txt | 495 +++++++++++++- .../rite_types/NEOW_rites_novelist.txt | 4 +- .../tenet_types/00_NEOW_tenet_types.txt | 2 +- .../religion/tenet_types/00_tenet_types.txt | 64 +- .../script_values/00_men_at_arms_values.txt | 7 + .../regimenttypes/NEOW_militia_skirmisher.dds | 3 + .../regimenttypes/NEOW_militia_template.pdn | Bin 0 -> 27603 bytes .../peasant_militia_skirmisher.dds | 3 + .../peasant_militia_skirmisher.dds | 3 + gui/texticons.gui | 9 + ...EOW_cultural_maa_innovations_l_english.yml | 6 +- 20 files changed, 1183 insertions(+), 239 deletions(-) create mode 100644 gfx/interface/icons/regimenttypes/NEOW_militia_skirmisher.dds create mode 100644 gfx/interface/icons/regimenttypes/NEOW_militia_template.pdn create mode 100644 gfx/interface/illustrations/men_at_arms_big/peasant_militia_skirmisher.dds create mode 100644 gfx/interface/illustrations/men_at_arms_small/peasant_militia_skirmisher.dds 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 0000000000000000000000000000000000000000..5af96ba06423302b34b2772ec8032efa85023326 GIT binary patch literal 27603 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 ZZmx2bt6b$OS8Q?D{{y&mZPNhZ006ede+&Qs literal 0 HcmV?d00001 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"