common/culture/innovations/00_late_medieval_innovations.txt

@@ -55,14 +55,7 @@ innovation_gunpowder = {
 	group = culture_group_military
 	culture_era = culture_era_late_medieval
 	icon = @gunpowder_02
-	potential = {
-	NOT = {	
-			OR = {
-				has_cultural_pillar = heritage_brythonic
-				has_cultural_pillar = heritage_anglo_frisian	
-			}
-		}
-	}	
+
 	parameters = {
 		unlock_late_medieval_gunpowder_units = yes
 		unlock_powder_magazines = yes

common/culture/innovations/N3OW_cultural_maa_innovations.txt

@@ -42,8 +42,8 @@ innovation_british_arsenals = {
 	#}
 	
 	
+	unlock_maa = handgunners
 	parameters = {
-		unlock_late_medieval_gunpowder_units = yes	
 		unlock_powder_magazines = yes
 	}
 	#unlock_decision = 
@@ -59,7 +59,7 @@ innovation_redcoats = {
 	group = culture_group_military
 	culture_era = culture_era_late_medieval
 	#region = world_europe_west_britannia
-	icon = @gunpowder_02
+	icon = @gunpowder
 	
 	potential = {
 		OR = {
@@ -88,9 +88,9 @@ innovation_redcoats = {
 	#}
 	
 	
+	unlock_maa = redcoats
 	parameters = {
 		unlock_powder_magazines = yes
-		unlock_redcoats = yes 		
 	}
 	#unlock_decision = 
 	#unlock_law

common/flavorization/00_title_holders.txt

@@ -92,7 +92,7 @@ title_prince = {
 	gender = male
 	special = holder
 	priority = 60
-	titles = { k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria k_finland }
+	titles = { k_switzerland k_saxony k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria k_finland }
 	governments = { feudal_government tribal_government administrative_government }
 	#flavourization_rules = { 
 	#	top_liege = no
@@ -103,7 +103,7 @@ title_princess = {
 	gender = female
 	special = holder
 	priority = 60
-	titles = { k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria k_finland}
+	titles = { k_switzerland k_saxony k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria k_finland}
 	governments = { feudal_government tribal_government administrative_government }
 	#flavourization_rules = { 
 	#	top_liege = no
@@ -111,8 +111,8 @@ title_princess = {
 }
 title_principality = {
 	type = title
-	titles = { k_wales d_monaco d_lictenstein d_andorra k_dacia k_moldavia c_chios k_bulgaria k_finland }
-	priority = 160
+	titles = { k_saxony k_wales d_monaco d_lictenstein d_andorra k_dacia k_moldavia c_chios k_bulgaria k_finland }
+	priority = 60
 	governments = { feudal_government tribal_government administrative_government }
 	#flavourization_rules = { 
 	#	top_liege = no
@@ -3775,9 +3775,9 @@ king_feudal_male_grand_duke_independent = {
 	special = holder
 	tier = kingdom
 	priority = 47
-	governments = { feudal_government administrative_government tribal_government }
+	governments = { feudal_government administrative_government }
 	#name_lists = { name_list_lithuanian }
-	titles = { k_lotharingia k_brittany k_lithuania k_white_rus k_esthonia k_pribaltia k_latvia k_east_francia  }		
+	titles = { k_lotharingia k_brittany k_lithuania k_white_rus k_esthonia k_pribaltia k_latvia  }		
 	flavourization_rules = { 
 		#only_independent = yes
 	}
@@ -3788,9 +3788,9 @@ king_feudal_female_grand_duke_independent = {
 	special = holder
 	tier = kingdom
 	priority = 47
-	governments = { feudal_government administrative_government tribal_government }
+	governments = { feudal_government administrative_government }
 	#name_lists = { name_list_lithuanian }
-	titles = { k_lotharingia k_brittany k_lithuania k_white_rus k_esthonia k_pribaltia k_latvia k_east_francia }			
+	titles = { k_lotharingia k_brittany k_lithuania k_white_rus k_esthonia k_pribaltia k_latvia }			
 	flavourization_rules = { 
 		#only_independent = yes
 	}
@@ -3799,9 +3799,9 @@ kingdom_feudal_grand_duke_independent = {
 	type = title
 	tier = kingdom
 	priority = 47
-	governments = { feudal_government administrative_government tribal_government }
+	governments = { feudal_government administrative_government }
 	#name_lists = { name_list_lithuanian }
-	titles = { k_lotharingia k_brittany k_lithuania k_white_rus k_esthonia k_pribaltia k_latvia k_east_francia }		
+	titles = { k_lotharingia k_brittany k_lithuania k_white_rus k_esthonia k_pribaltia k_latvia  }		
 	flavourization_rules = { 
 		#only_independent = yes
 	}
@@ -10195,18 +10195,18 @@ king_administrative_female_brit = {
 	}
 }
 
-#kingdom_administrative_brit = {
-#	type = title
-#	tier = kingdom
-#	priority = 106
-#	governments = { administrative_government }
-#	heritages = { heritage_brythonic heritage_scottish heritage_anglo_frisian }
-#	flavourization_rules = {
-#		top_liege = yes
-##		ignore_top_liege_government = yes #In an administrative realm all governors vassals will use the titles of the top liege - this ensures it is only the governors that do, and not also feudal vassals, republican vassals, etc. 
-#		spouse_takes_title = no
-#	}	
-#}	
+kingdom_administrative_brit = {
+	type = title
+	tier = kingdom
+	priority = 106
+	governments = { administrative_government }
+	heritages = { heritage_brythonic heritage_scottish heritage_anglo_frisian }
+	flavourization_rules = {
+		top_liege = yes
+		ignore_top_liege_government = yes #In an administrative realm all governors vassals will use the titles of the top liege - this ensures it is only the governors that do, and not also feudal vassals, republican vassals, etc. 
+		spouse_takes_title = no
+	}	
+}	
 
 duchy_administrative_independent_brit = {
 	type = title

common/landed_titles/NEOW_numenorian_titles.txt

@@ -12,19 +12,8 @@ e_numenor_cosmetic = {
 
 d_novelist_high_king = {	
 	color = { 75 30 95 }
+
 	definite_form = yes
-	ruler_uses_title_name = no
-	landless = yes
 
 	capital = c_ile_de_france
-	can_create = { always = no }
-
-	ai_primary_priority = {
-		add = @always_primary_score
-	}
-
-	destroy_if_invalid_heir = yes
-	no_automatic_claims = yes
-	always_follows_primary_heir = yes
-	de_jure_drift_disabled = yes	
 }

common/landed_titles/noble_families.txt

@@ -391,48 +391,3 @@ d_nf_robecchi-bricchetti = { #Mountbatten
 
     ai_primary_priority = { add = @never_primary_score }
 }
-
-d_nf_kobzar = { #Mountbatten
-    color = { 100 100 100 }
-    capital = c_kyiv 
-
-    definite_form = yes
-    landless = yes
-    ruler_uses_title_name = no
-    always_follows_primary_heir = yes
-    no_automatic_claims = yes
-    noble_family = yes
-    destroy_if_invalid_heir = yes
-
-    ai_primary_priority = { add = @never_primary_score }
-}
-
-d_nf_dragos= { #Mountbatten
-    color = { 100 100 100 }
-    capital = c_soroca 
-	
-    definite_form = yes
-    landless = yes
-    ruler_uses_title_name = no
-    always_follows_primary_heir = yes
-    no_automatic_claims = yes
-    noble_family = yes
-    destroy_if_invalid_heir = yes
-
-    ai_primary_priority = { add = @never_primary_score }
-}
-
-d_nf_olteanu = { #Mountbatten
-    color = { 100 100 100 }
-    capital = c_bucuresti 
-	
-    definite_form = yes
-    landless = yes
-    ruler_uses_title_name = no
-    always_follows_primary_heir = yes
-    no_automatic_claims = yes
-    noble_family = yes
-    destroy_if_invalid_heir = yes
-
-    ai_primary_priority = { add = @never_primary_score }
-}

common/men_at_arms_types/NEOW_maa_types.txt

@@ -70,7 +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
-		culture = { has_cultural_parameter = unlock_redcoats }		
+		culture = { has_cultural_parameter = unlock_late_medieval_gunpowder_units }
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_redcoats }
 	}
 
 	terrain_bonus = {
@@ -132,6 +133,10 @@ ironsides = {
 		harsh_winter = { damage = -30 toughness = -10 }
 	}
 	
+	can_recruit = {
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_ironsides }
+	}
+
 	buy_cost = { gold = tiefutu_recruitment_cost }
 	low_maintenance_cost = { gold = tiefutu_low_maint_cost }
 	high_maintenance_cost = { gold = tiefutu_high_maint_cost }
@@ -170,6 +175,10 @@ cuirassiers  = { #Copy pasted Conrois, need to think of how to make them unique
 		chemical_weapons = 1
 	}
 
+	can_recruit = {
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_cuirassiers }
+	}
+
 	winter_bonus = {
 		normal_winter = { damage = -15 toughness = -5 }
 		harsh_winter = { damage = -25 toughness = -10 }
@@ -240,6 +249,10 @@ pioneers = {
 		archers = 1
 	}
 
+	can_recruit = {
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_pioneers }
+	}
+
 	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 }

history/cultures/heritage_anglo_frisian.txt

@@ -1,24 +1,24 @@
 # anglo cultures
 
 2300.1.1 = {
-	discover_innovation = innovation_bannus
-	discover_innovation = innovation_mustering_grounds
+	discover_innovation = innovation_motte
+	discover_innovation = innovation_catapult
 	discover_innovation = innovation_quilted_armor
 	#
-	discover_innovation = innovation_plenary_assemblies
+	discover_innovation = innovation_gavelkind
 	discover_innovation = innovation_currency_01
 	discover_innovation = innovation_crop_rotation
-	discover_innovation = innovation_motte
+	discover_innovation = innovation_bannus
 }
 
 2450.1.1 = {
 	discover_innovation = innovation_ledger
 	discover_innovation = innovation_barracks
-	discover_innovation = innovation_catapult
+	discover_innovation = innovation_mustering_grounds
 	#
 	discover_innovation = innovation_development_01
-	discover_innovation = innovation_gavelkind
 	discover_innovation = innovation_city_planning
+	discover_innovation = innovation_plenary_assemblies
 	discover_innovation = innovation_casus_belli
 	#
 	join_era = culture_era_early_medieval
@@ -33,6 +33,5 @@
 	discover_innovation = innovation_manorialism
 	discover_innovation = innovation_currency_02
 	discover_innovation = innovation_baliffs
-	discover_innovation = innovation_arched_saddle
-	discover_innovation = innovation_british_arsenals
+	#
 }

localization/english/replace/religion/zz_NEOW_religion_thelema_l_english.yml

@@ -102,18 +102,17 @@
  old_thelema_religious_head_title_name:0 "WIP"
  
 
- carcosan:0 "Carcosan Thelema"
- carcosan_adj:0 "Carcosan"
- carcosan_adherent:0 "Carcosan"
- carcosan_adherent_plural:0 "Carcosans"
- carcosan_desc:0 "Carcosan Thelemites worship not the light, but the abyss in which it dwells. They hold that all of creation — including the earth and the stars — is formed from that primordial darkness, guided by their abyssal god Choronzon, that has ruled over it since time immemorial. In praise of their shapeshifting gods, the Carcosans, or Choronzonites delve into what is considered 'dark magic' by other occultists, including summoning malevolent beings and harmful hexes, all in the hopes of bringing the mist of creation to earth, where it may be manipulated to their heart's desire - and the obliteration of the pretender Nuit."
+ carcosan:0 "Choronzonite Thelema"
+ carcosan_adj:0 "Choronzonite"
+ carcosan_adherent:0 "Choronzonite"
+ carcosan_adherent_plural:0 "Choronzonite"
+ carcosan_desc:0 "Choronzonite Thelemites worship not the light, but the abyss in which it dwells. They hold that all of creation — including the earth and the stars — is formed from that primordial darkness, guided by their abyssal god that has ruled over it since time immemorial. In praise of their shapeshifting god, the Choronzonites delve into what is considered 'dark magic' by other occultists, including summoning malevolent beings and harmful hexes, all in the hopes of bringing the mist of creation to earth, where it may be manipulated to their heart's desire - and the obliteration of the pretender Nuit."
  carcosan_religious_head_title:0 "WIP"
  carcosan_religious_head_title_name:0 "WIP"
  carcosan_high_god_name:0 "Choronzon"
  carcosan_high_god_name_possessive:0 "Choronzons'"
  carcosan_high_god_name_alternate:0 "The Dweller in the Abyss"
  carcosan_high_god_name_alternate_possessive:0 "The Dweller in the Abyss'"
- thelema_religious_symbol:0 "Crooked Spiral"  
  carcosan_devil_name:0 "Nuit"
  carcosan_devil_name_possessive:0 "Nuit's"
  carcosan_death_deity_name:0 "the Demon of Dispersion"
@@ -126,8 +125,8 @@
  carcosan_priest_alternate_plural:0 "priests"
  carcosan_bishop:0 "archmage"
  carcosan_bishop_plural:0 "archmages"
- carcosan_positive_afterlife:0 "Carcosa"
- carcosan_negative_afterlife:0 "Carcosa"
+ carcosan_positive_afterlife:0 "the Abyss"
+ carcosan_negative_afterlife:0 "the Abyss"
  carcosan_witch_god_name:0 "$carcosan_high_god_name$"
  carcosan_witch_god_name_possessive:0 $carcosan_high_god_name_possessive$"
  carcosan_creator_god_name:0 "$carcosan_high_god_name$"
@@ -146,8 +145,8 @@
  carcosan_knowledge_god_name_possessive:0 "$carcosan_high_god_name_possessive$
  carcosan_war_god_name:0 "$carcosan_high_god_name$" 
  carcosan_war_god_name_possessive:0 "$carcosan_high_god_name_possessive$
- carcosan_trickster_god_name:0 "$carcosan_devil_name$" 
- carcosan_trickster_god_name_possessive:0 "$carcosan_devil_name_possessive$
+ carcosan_trickster_god_name:0 "$carcosan_high_god_name$" 
+ carcosan_trickster_god_name_possessive:0 "$carcosan_high_god_name_possessive$
  carcosan_night_god_name:0 "$carcosan_high_god_name$" 
  carcosan_night_god_name_possessive:0 "$carcosan_high_god_name_possessive$" 
  carcosan_water_god_name:0 "$carcosan_war_god_name$" 

localization/english/replace/titles_l_english.yml

@@ -16,7 +16,7 @@
  e_gallia_cosmetic_adj:0 "Gallian"
  
  #### Britannia
- e_britannia:0 "Great Britain"
+ e_britannia:0 "Britannia"
  e_britannia_adj:0 "Britannic"
  e_britannia_pre:0 "Britanno"
  ### England/Anglia
@@ -25254,7 +25254,7 @@
  # Britannia
  d_nf_gibb: "$dynn_gibb$ Family"
  d_nf_gibb_article: "$DEFAULT_TITLE_NAME_ARTICLE$"
- d_nf_windsor: "$dynn_windsor$ Family"
+ d_nf_windsor: "The $dynn_windsor$ Family"
  d_nf_windsor_article: "$DEFAULT_TITLE_NAME_ARTICLE$"
  d_nf_solomonid: "$dynn_solomonid$ Family"
  d_nf_solomonid_article: "$DEFAULT_TITLE_NAME_ARTICLE$"