diff --git a/common/culture/cultures/NEOW_brythonic.txt b/common/culture/cultures/NEOW_brythonic.txt index 645b5f6c3..0d9019531 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 01f69bbf2..7057187a4 100644 --- a/common/culture/innovations/00_cultural_maa_innovations.txt +++ b/common/culture/innovations/00_cultural_maa_innovations.txt @@ -44,6 +44,7 @@ innovation_zweihanders = { has_cultural_pillar = heritage_central_germanic } + unlock_maa = landsknecht flag = global_regional flag = global_maa @@ -59,6 +60,7 @@ innovation_adaptive_militia = { has_cultural_parameter = unlock_adaptive_militia_innovation } + unlock_maa = goedendag flag = global_maa } @@ -73,6 +75,7 @@ innovation_valets = { has_cultural_parameter = unlock_valets_innovation } + unlock_maa = gendarme flag = global_maa } @@ -87,6 +90,7 @@ innovation_pike_columns = { has_cultural_parameter = unlock_innovation_pike_columns } + unlock_maa = picchieri flag = global_maa } @@ -107,6 +111,7 @@ innovation_legionnaires = { # } } + unlock_maa = praetorian flag = global_maa } @@ -123,6 +128,7 @@ innovation_desert_tactics = { } } + unlock_maa = chasseur flag = global_maa } @@ -134,6 +140,7 @@ innovation_caballeros = { region = world_europe_west_iberia icon = @caballeros + unlock_maa = caballero flag = global_regional flag = tribal_era_regional @@ -146,6 +153,7 @@ innovation_hobbies = { region = ghw_region_britannia icon = @special_maa_02 + unlock_maa = hobelar flag = global_regional flag = global_maa @@ -161,6 +169,7 @@ innovation_rectilinear_schiltron = { has_cultural_parameter = unlock_schiltron_innovation } + unlock_maa = schiltron flag = global_maa } @@ -172,6 +181,7 @@ innovation_bamboo_bows = { region = world_india icon = @special_maa_02 + unlock_maa = paiks flag = global_regional flag = global_maa @@ -185,6 +195,7 @@ innovation_sahel_horsemen = { region = custom_sahel_proper icon = @special_maa_01 + unlock_maa = sahel_horsemen flag = global_regional flag = tribal_era_regional @@ -200,6 +211,7 @@ innovation_sarawit = { has_cultural_parameter = unlock_sarawit_innovation } + unlock_maa = sarawit flag = global_maa } @@ -234,6 +246,7 @@ 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 b2f731e68..c178082cc 100644 --- a/common/culture/innovations/N3OW_cultural_maa_innovations.txt +++ b/common/culture/innovations/N3OW_cultural_maa_innovations.txt @@ -54,13 +54,14 @@ innovation_british_ironsides = { icon = @knight potential = { - NOT = { culture = culture:angler } + NOT = { this = culture:angler } OR = { has_cultural_pillar = heritage_brythonic has_cultural_pillar = heritage_anglo_frisian } } + unlock_maa = ironsides } @@ -78,6 +79,7 @@ innovation_celtic_columneers = { } } + unlock_maa = columneers flag = global_regional @@ -93,9 +95,10 @@ innovation_pioneers = { icon = @knighthood potential = { - culture = culture:metropolitain + this = culture:metropolitain } + unlock_maa = pioneers flag = global_regional @@ -114,6 +117,7 @@ innovation_cuirassiers = { has_cultural_pillar = heritage_french } + unlock_maa = cuirassiers flag = global_regional @@ -131,12 +135,13 @@ innovation_gardians = { potential = { OR = { - culture = culture:provencal - culture = culture:rottisch - culture = culture:patoues + this = culture:provencal + this = culture:rottisch + this = culture:patoues } } + unlock_maa = gardians flag = global_regional @@ -154,9 +159,9 @@ innovation_voltigeurs = { potential = { OR = { - culture = culture:elsasse - culture = culture:lorin - culture = culture:gascon + this = culture:elsasse + this = culture:lorin + this = culture:gascon } } @@ -181,6 +186,7 @@ innovation_spahis = { } } + unlock_maa = spahis flag = global_maa @@ -197,8 +203,8 @@ innovation_guides = { potential = { OR = { - culture = culture:belge - culture = culture:letzebuerge + this = culture:belge + this = culture:letzebuerge } } @@ -217,7 +223,7 @@ innovation_cacadores = { icon = @gunpowder potential = { - culture = culture:portuguese + this = culture:portuguese } unlock_maa = cacadores @@ -236,11 +242,11 @@ innovation_almogavares = { potential = { OR = { - culture = culture:andorra - culture = culture:aragonese - culture = culture:asturleonese - culture = culture:basque - culture = culture:galician + this = culture:andorra + this = culture:aragonese + this = culture:asturleonese + this = culture:basque + this = culture:galician } } @@ -257,9 +263,9 @@ innovation_tercos = { potential = { OR = { - culture = culture:catalan - culture = culture:balearic - culture = culture:valencian + this = culture:catalan + this = culture:balearic + this = culture:valencian } } @@ -275,9 +281,9 @@ innovation_lanceros = { potential = { OR = { - culture = culture:castilian - culture = culture:extremeno - culture = culture:NEOW_andalusian + this = culture:castilian + this = culture:extremeno + this = culture:NEOW_andalusian } } @@ -293,14 +299,14 @@ innovation_betyars = { potential = { OR = { - 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 + 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 } } unlock_maa = betyars @@ -315,11 +321,11 @@ innovation_peacekeepers = { potential = { OR = { - culture = culture:wallachian - culture = culture:banatian - culture = culture:moldavian - culture = culture:NEOW_gagauz - culture = culture:NEOW_ucrainean + this = culture:wallachian + this = culture:banatian + this = culture:moldavian + this = culture:NEOW_gagauz + this = culture:NEOW_ucrainean } } unlock_maa = peacekeepers @@ -334,12 +340,12 @@ innovation_tachanka { potential = { OR = { - culture = culture:NEOW_kievan - culture = culture:NEOW_cossack - culture = culture:NEOW_crimean - culture = culture:NEOW_nizhnevolzhan - culture = culture:NEOW_povolzhan - culture = culture:kalmyk + this = culture:NEOW_kievan + this = culture:NEOW_cossack + this = culture:NEOW_crimean + this = culture:NEOW_nizhnevolzhan + this = culture:NEOW_povolzhan + this = culture:kalmyk } } unlock_maa = tachanka @@ -354,20 +360,20 @@ innovation_uhlan = { potential = { OR = { - 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 + 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 } } unlock_maa = uhlan @@ -382,13 +388,13 @@ innovation_bike_cav = { potential = { OR = { - culture = culture:latvian - culture = culture:latgalian - culture = culture:estonian - culture = culture:livonian - culture = culture:voroseto - culture = culture:dansk - culture = culture:slesvigsk + this = culture:latvian + this = culture:latgalian + this = culture:estonian + this = culture:livonian + this = culture:voroseto + this = culture:dansk + this = 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 7e23460df..abefd3ca4 100644 --- a/common/governments/00_government_types.txt +++ b/common/governments/00_government_types.txt @@ -9,7 +9,6 @@ feudal_government = { dynasty_named_realms = no legitimacy = yes allow_accolades = yes - subject_men_at_arms = yes } royal_court = any @@ -36,7 +35,6 @@ feudal_government = { may_elevate_co_monarch government_uses_crown_authority government_uses_domain_limit - government_can_use_tributary_men_at_arms } mechanic_type = feudal @@ -171,7 +169,6 @@ clan_government = { government_is_settled government_uses_crown_authority government_uses_domain_limit - government_can_use_tributary_men_at_arms } mechanic_type = clan @@ -204,7 +201,6 @@ tribal_government = { always_use_patronym = yes affected_by_development = no allow_accolades = yes - subject_men_at_arms = yes } royal_court = any @@ -248,7 +244,6 @@ 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 @@ -280,7 +275,6 @@ wanua_government = { # "Wanua" regiments_use_barter_goods_as_gold = yes barter = yes allow_accolades = yes - subject_men_at_arms = yes } royal_court = any @@ -330,7 +324,6 @@ 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 } @@ -488,7 +481,6 @@ administrative_government = { treasury_vassal_development = yes replace_gold_cost_by_treasury = yes allow_accolades = yes - subject_men_at_arms = yes } royal_court = any @@ -567,7 +559,6 @@ administrative_government = { government_uses_imperial_bureaucracy government_uses_salary_budget government_uses_military_budget - government_can_use_tributary_men_at_arms } ai = { @@ -912,7 +903,6 @@ 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 @@ -998,7 +988,6 @@ celestial_government = { government_uses_salary_budget government_uses_military_budget government_uses_ministry_budget - government_can_use_tributary_men_at_arms } ai = { @@ -1040,7 +1029,6 @@ mandala_government = { count_tributaries_for_title_requirements = yes radiance = yes allow_accolades = yes - subject_men_at_arms = yes } royal_court = any @@ -1362,7 +1350,6 @@ 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 @@ -1446,7 +1433,6 @@ 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 daaf0f229..2c6ddcb2b 100644 --- a/common/governments/01_japan_government_types.txt +++ b/common/governments/01_japan_government_types.txt @@ -14,7 +14,6 @@ deny_powerful_vassal = yes disable_regnal_numbers = yes allow_accolades = yes - subject_men_at_arms = yes } royal_court = any @@ -26,7 +25,7 @@ minimum_provincial_maa_tier = duchy primary_holding = castle_holding - primary_heritages = { heritage_scottish heritage_brythonic heritage_anglo_frisian heritage_goidelic } + primary_heritages = { heritage_japonic } valid_holdings = { city_holding temple_citadel_holding tribal_holding } required_county_holdings = { castle_holding city_holding church_holding } @@ -82,7 +81,6 @@ 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 } @@ -110,7 +108,6 @@ japan_feudal_government = { # Soryo noble_families = yes disable_regnal_numbers = yes allow_accolades = yes - subject_men_at_arms = yes } royal_court = any @@ -135,7 +132,7 @@ japan_feudal_government = { # Soryo domicile_type = japanese_manor primary_holding = castle_holding - primary_heritages = { heritage_scottish heritage_brythonic heritage_anglo_frisian heritage_goidelic } + primary_heritages = { heritage_japonic } valid_holdings = { temple_citadel_holding tribal_holding } required_county_holdings = { castle_holding city_holding church_holding } @@ -168,7 +165,6 @@ 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 78501de41..7abf506ee 100644 --- a/common/governments/02_theocratic_government_types.txt +++ b/common/governments/02_theocratic_government_types.txt @@ -8,7 +8,6 @@ theocracy_government = { inherit_from_dynastic_government = no disable_regnal_numbers = yes sticky_government = yes - subject_men_at_arms = yes } primary_holding = church_holding @@ -49,7 +48,6 @@ 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 @@ -93,7 +91,6 @@ ecclesiastical_government = { sticky_government = yes allow_accolades = yes landless_playable = yes - subject_men_at_arms = yes } royal_court = landed @@ -148,7 +145,6 @@ 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 0d4b21380..32b97b09a 100644 --- a/common/men_at_arms_types/00_cultural_maa_types.txt +++ b/common/men_at_arms_types/00_cultural_maa_types.txt @@ -40,19 +40,9 @@ huscarl = { } can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_huscarls } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -92,21 +82,6 @@ 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 } @@ -137,17 +112,6 @@ 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 } @@ -171,21 +135,6 @@ 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 } @@ -224,22 +173,6 @@ 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 } @@ -277,21 +210,6 @@ 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 } @@ -323,21 +241,6 @@ 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 } @@ -397,21 +300,6 @@ 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 } @@ -448,19 +336,9 @@ monaspa = { } can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_monaspa } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -542,26 +420,6 @@ 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 } @@ -592,26 +450,6 @@ 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 } @@ -644,22 +482,9 @@ metsanvartija = { normal_winter = { toughness = 4 screen = 8 } harsh_winter = { toughness = 4 screen = 8 } } + can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_metsanvartija } } buy_cost = { gold = metsanvartija_recruitment_cost } @@ -705,12 +530,6 @@ 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 - } } } @@ -741,23 +560,9 @@ ayyar = { } can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_ayyar } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -786,23 +591,9 @@ mubarizun = { } can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_mubarizun } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -846,24 +637,7 @@ mulaththamun = { #Murabit Cavalry } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_mulaththamun } } buy_cost = { gold = mulaththamun_recruitment_cost } @@ -896,27 +670,9 @@ archers_of_the_nile = { #Nile Archers } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_archers_of_the_nile } } - 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 } @@ -945,26 +701,6 @@ 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 } @@ -988,24 +724,11 @@ druzhina = { pikemen = 1 peasant_militia = 2 } + can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_druzhina } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -1046,24 +769,7 @@ hussar = { } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_hussar } } buy_cost = { gold = hussar_recruitment_cost } @@ -1095,24 +801,7 @@ horn_warrior = { } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_horn_warrior } } buy_cost = { gold = horn_warrior_recruitment_cost } @@ -1143,26 +832,8 @@ bush_hunter = { skirmishers = 1 } - can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_bush_hunter } } buy_cost = { gold = bush_hunter_recruitment_cost } @@ -1186,25 +857,9 @@ shomer = { counters = { heavy_infantry = 1 } + can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_shomer } } buy_cost = { gold = shomer_recruitment_cost } @@ -1245,23 +900,9 @@ garudas = { ai_quality = { value = @cultural_maa_extra_ai_score } can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_garudas } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -1290,23 +931,9 @@ khandayat = { } can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_khandayat } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -1343,24 +970,11 @@ mountaineer = { normal_winter = { damage = 5 } harsh_winter = { damage = 5 } } + can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_mountaineer } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -1403,26 +1017,6 @@ 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 } @@ -1451,25 +1045,9 @@ guinea_warrior = { #AKA Guinean uplander counters = { heavy_infantry = 1 } + can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_guinea_warrior } } buy_cost = { gold = guinea_warrior_recruitment_cost } @@ -1501,26 +1079,6 @@ 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 } @@ -1553,24 +1111,7 @@ abudrar = { #AKA Jabali - Berber mountaineer } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_abudrar } } buy_cost = { gold = abudrar_recruitment_cost } @@ -1603,24 +1144,11 @@ zbrojnosh = { peasant_militia = 2 archers = 1 } + can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_zbrojnosh } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -1653,23 +1181,9 @@ palace_guards = { } can_recruit = { - 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 - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_palace_guards } + NOT = { + culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } } } @@ -1708,26 +1222,6 @@ 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 } @@ -1796,19 +1290,18 @@ teulu = { } can_recruit = { - OR = { - AND = { - culture ?= {has_cultural_pillar = heritage_brythonic} - NOT = { - culture ?= { has_cultural_parameter = strength_in_numbers_heavy_maa_ban } + 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 } } - 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 f0160e197..38808d898 100644 --- a/common/men_at_arms_types/00_maa_types.txt +++ b/common/men_at_arms_types/00_maa_types.txt @@ -615,15 +615,7 @@ 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 - OR = { - culture ?= { has_cultural_parameter = unlock_handgunners } - AND = { - any_vassal = { - culture ?= { has_cultural_parameter = unlock_handgunners } - } - government_allows = subject_men_at_arms - } - } + culture ?= { has_cultural_parameter = unlock_handgunners } } 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 64f7769c2..d147af4b9 100644 --- a/common/men_at_arms_types/N3OW_dlc_maa_types.txt +++ b/common/men_at_arms_types/N3OW_dlc_maa_types.txt @@ -41,15 +41,7 @@ emishi_horse_archers = { } can_recruit = { - 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 - } - } + culture ?= { has_cultural_parameter = unlock_emishi_horse_archers_units } } buy_cost = { gold = light_cavalry_recruitment_cost } @@ -231,12 +223,6 @@ 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 } @@ -270,12 +256,6 @@ 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 - } } } @@ -337,12 +317,6 @@ 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 af962a50f..075214c23 100644 --- a/common/men_at_arms_types/NEOW_maa_types.txt +++ b/common/men_at_arms_types/NEOW_maa_types.txt @@ -70,19 +70,8 @@ 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 - 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 - } + culture ?= { + has_innovation = innovation_redcoats } } @@ -145,22 +134,6 @@ 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 } @@ -204,22 +177,6 @@ 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 } @@ -253,22 +210,6 @@ 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 } @@ -301,22 +242,6 @@ 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 } @@ -353,22 +278,6 @@ 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 } @@ -399,22 +308,6 @@ 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 } @@ -449,22 +342,6 @@ 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 } @@ -483,7 +360,7 @@ NEOW_militia = { damage = 14 toughness = 14 - pursuit = 5 + pursuit = 10 screen = 4 terrain_bonus = { @@ -515,15 +392,12 @@ 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 = 150 + stack = 100 ai_quality = { value = culture_ai_weight_skirmishers } illustration = { @@ -572,15 +446,12 @@ 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 = 150 + stack = 100 ai_quality = { value = culture_ai_weight_skirmishers } illustration = { @@ -595,60 +466,6 @@ 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 @@ -676,24 +493,13 @@ 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 - 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 - } - } + culture ?= { has_cultural_parameter = unlock_late_medieval_gunpowder_units } } 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 = { @@ -730,25 +536,15 @@ 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 - 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 - } - } + 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 } } 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 @@ -775,19 +571,8 @@ full_plate_footmen = { } can_recruit = { - 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 - } + culture ?= { + has_innovation = innovation_plate_armor } NOR = { government_has_flag = government_is_nomadic @@ -810,7 +595,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 = { @@ -861,7 +646,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 } } @@ -898,7 +683,6 @@ airships = { can_recruit = { airships_raise_limit_existing_airships_units < airships_raise_limit_existing_airships_buildings } - icon = airship illustration = { reference = ill_airship @@ -954,20 +738,7 @@ tercos = { screen = 5 can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_tercos } } counters = { @@ -999,21 +770,7 @@ espadachin = { screen = 0 can_recruit = { - - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_espadachin } } terrain_bonus = { @@ -1068,20 +825,7 @@ lanceros = { } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_lanceros} } winter_bonus = { @@ -1126,20 +870,7 @@ betyars = { } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_betyar } } buy_cost = { gold = light_cavalry_recruitment_cost } @@ -1170,20 +901,7 @@ peacekeepers = { } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_peacekeepers } } @@ -1224,20 +942,7 @@ tachanka = { } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_tachanka } } buy_cost = { gold = mangonel_recruitment_cost } @@ -1272,17 +977,7 @@ uhlan = { } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_uhlan } } buy_cost = { gold = heavy_cavalry_recruitment_cost } @@ -1321,20 +1016,9 @@ bike_cav = { } can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_bike_cav } } - 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 } @@ -1356,17 +1040,7 @@ stadswacht = { screen = 0 can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_stadswacht } } counters = { @@ -1399,21 +1073,8 @@ 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 - - OR = { - AND = { - culture ?= { - has_innovation = innovation_blauwegarde - } - } - AND = { - any_vassal = { - culture ?= { - has_innovation = innovation_blauwegarde - } - } - government_allows = subject_men_at_arms - } + culture ?= { + has_innovation = innovation_blauwegarde } } @@ -1452,17 +1113,7 @@ rodelansier = { screen = 15 can_recruit = { - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_rodelansier } } counters = { @@ -1507,18 +1158,7 @@ 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 - - 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 - } - } + culture ?= { has_cultural_parameter = unlock_maa_karabiniers } } buy_cost = { gold = horse_archers_recruitment_cost } @@ -1553,18 +1193,7 @@ besterios = { steppe = { toughness = -8 } } can_recruit = { - - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_besterios } } counters = { @@ -1595,19 +1224,8 @@ arbalests = { pursuit = 5 screen = 5 can_recruit = { - - 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 - } - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_arbalests } + } terrain_bonus = { hills = { damage = 10 toughness = 4 } mountains = { damage = 8 toughness = 2 } @@ -1646,18 +1264,7 @@ ordinenca = { screen = 5 can_recruit = { - - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_ordinenca } } counters = { @@ -1689,18 +1296,7 @@ dalkarl = { screen = 5 can_recruit = { - - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_dalkarl } } counters = { @@ -1733,20 +1329,8 @@ 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 - OR = { - AND = { - culture ?= { - has_innovation = innovation_legionarios - } - } - AND = { - any_vassal = { - culture ?= { - has_innovation = innovation_legionarios - } - } - government_allows = subject_men_at_arms - } + culture ?= { + has_innovation = innovation_legionarios } } @@ -1785,18 +1369,7 @@ albardiaz = { screen = 0 can_recruit = { - - 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 - } - } + valid_for_maa_trigger = { PARAMETER = unlock_maa_albardiaz } } counters = { diff --git a/common/religion/rite_types/NEOW_rites_novelist.txt b/common/religion/rite_types/NEOW_rites_novelist.txt index 7e2373c78..4b415d4dd 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 = absurdist + icon = rocambolist localization = { @@ -840,7 +840,7 @@ absurdist = { ReligiousSymbol = novelist_religious_symbol } tenets = { - tenet_pastoral_isolation + tenet_preservation 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 8518d2769..5afc1e800 100644 --- a/common/religion/tenet_types/00_NEOW_tenet_types.txt +++ b/common/religion/tenet_types/00_NEOW_tenet_types.txt @@ -1070,6 +1070,7 @@ tenet_the_search_for_a_meaning = { no_unfaithfulness_penalty_active unlock_voluntary_laampdom_faith torturing_prisoners_grants_piety + consolamentum_active } divergence_multiplier = 3 @@ -1084,7 +1085,6 @@ 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 194fdfe23..97366716c 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 = 2 + divergence_multiplier = 3 personal_tenet_modifier = { owned_scheme_secrecy_add = 10 @@ -6047,18 +6047,45 @@ 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 = { - always = no + religion = religion:confucianism_religion } value = faith_tenet_cost_low } - else = { + 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 + } } traits = { @@ -6286,18 +6313,45 @@ 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 = { - always = no + religion = religion:confucianism_religion } value = faith_tenet_cost_low } - else = { + 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 + } } parameters = { diff --git a/common/script_values/00_men_at_arms_values.txt b/common/script_values/00_men_at_arms_values.txt index 643f493dd..ae086c7dc 100644 --- a/common/script_values/00_men_at_arms_values.txt +++ b/common/script_values/00_men_at_arms_values.txt @@ -1011,13 +1011,6 @@ 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 deleted file mode 100644 index bff9d68c9..000000000 --- a/gfx/interface/icons/regimenttypes/NEOW_militia_skirmisher.dds +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 5af96ba06..000000000 Binary files a/gfx/interface/icons/regimenttypes/NEOW_militia_template.pdn and /dev/null differ diff --git a/gfx/interface/illustrations/men_at_arms_big/levies.dds b/gfx/interface/illustrations/men_at_arms_big/levies.dds deleted file mode 100644 index ab819889d..000000000 --- a/gfx/interface/illustrations/men_at_arms_big/levies.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8b7e6ee6c6ebf30bbd66d1fcef53281c5fe3a57704fd0934f1fcc2842e031d7 -size 363584 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 deleted file mode 100644 index 74d756b7d..000000000 --- a/gfx/interface/illustrations/men_at_arms_big/peasant_militia_skirmisher.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c548aa9906b61c2f24091888af6e8d0577d2da91733ddd138a5767833025131 -size 363584 diff --git a/gfx/interface/illustrations/men_at_arms_small/levies.dds b/gfx/interface/illustrations/men_at_arms_small/levies.dds deleted file mode 100644 index 4fd99a3df..000000000 --- a/gfx/interface/illustrations/men_at_arms_small/levies.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08a886ea5ef27bf5e5d5fd44dfdeaa58df3c81946ef28cc7a4cfb7362df9900c -size 34368 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 deleted file mode 100644 index 4966d8bea..000000000 --- a/gfx/interface/illustrations/men_at_arms_small/peasant_militia_skirmisher.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70d53a0445ca712d11e246f1b15eb8b9f25c9452047770e380e6d250929276d9 -size 34368 diff --git a/gui/texticons.gui b/gui/texticons.gui index f819b0c92..44b4d5271 100644 --- a/gui/texticons.gui +++ b/gui/texticons.gui @@ -494,15 +494,6 @@ 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 c9926b850..10f16a951 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,11 +114,9 @@ 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 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_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:0 "Peasant Bow Militia" - 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].#!" + 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].#!" 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"