Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

common/buildings/00_castle_buildings.txt

@@ -444,9 +444,7 @@ castle_01 = {
 		defender_holding_advantage = 5
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	character_culture_modifier = {
 		parameter = castle_grant_prestige
 		monthly_prestige = 0.02
@@ -993,9 +991,7 @@ castle_02 = {
 		county_fertility_decline_add = -2
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	flag = castle
 
 	on_complete = {
@@ -1490,9 +1486,7 @@ castle_03 = {
 		county_fertility_decline_add = -3
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	flag = castle
 
 	on_complete = {
@@ -1978,9 +1972,7 @@ castle_04 = {
 		county_fertility_decline_add = -4
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	flag = castle
 
 	on_complete = {

common/buildings/00_city_buildings.txt

@@ -497,9 +497,7 @@ city_01 = {
 		tax_mult = maritime_mercantilism_coastal_holdings_value
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = city_buildings_more_powerful
 		development_growth_factor = 0.05
@@ -531,9 +529,7 @@ city_01 = {
 		county_fertility_decline_add = -1
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	flag = city
 	next_building = city_02
 
@@ -1127,9 +1123,7 @@ city_02 = {
 		development_growth_factor = fp2_urbanism_legacy_1_bonus_value
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -2
@@ -1692,9 +1686,7 @@ city_03 = {
 		development_growth_factor = fp2_urbanism_legacy_1_bonus_value
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -4
@@ -2246,9 +2238,7 @@ city_04 = {
 		development_growth_factor = fp2_urbanism_legacy_1_bonus_value
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -4

common/buildings/00_monotown_buildings.txt

@@ -416,9 +416,7 @@ monotown_01 = {
 		tax_mult = maritime_mercantilism_coastal_holdings_value
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 
 	province_terrain_modifier = {
 		parameter = coastal_holding_bonuses
@@ -430,9 +428,7 @@ monotown_01 = {
 		county_holder_dynasty_perk = fp2_urbanism_legacy_1 # check if the dynasty of the county holder has a specific perk
 		development_growth_factor = fp2_urbanism_legacy_1_bonus_value
 	}
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -1
@@ -936,9 +932,7 @@ monotown_02 = {
 		development_growth_factor = fp2_urbanism_legacy_1_bonus_value
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -2
@@ -1424,9 +1418,7 @@ monotown_03 = {
 		development_growth_factor = fp2_urbanism_legacy_1_bonus_value
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -3
@@ -1897,9 +1889,7 @@ monotown_04 = {
 		development_growth_factor = fp2_urbanism_legacy_1_bonus_value
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -4

common/buildings/temple_citadel_buildings.txt

@@ -722,9 +722,7 @@ temple_citadel_01 = {
 		defender_holding_advantage = 2
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -1
@@ -1644,9 +1642,7 @@ temple_citadel_02 = {
 		defender_holding_advantage = 3
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -2
@@ -2479,9 +2475,7 @@ temple_citadel_03 = {
 		defender_holding_advantage = 4
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -3
@@ -3292,9 +3286,7 @@ temple_citadel_04 = {
 		defender_holding_advantage = 5
 	}
 
-	character_modifier = {
+	
-		men_at_arms_cap = 1
-	}
 	county_culture_modifier = {
 		parameter = use_farmer_republics
 		county_fertility_decline_add = -4

common/culture/name_equivalency/00_NEOW_male_names.txt

@@ -58,7 +58,7 @@ algernon_male = { _AE_ldernon Algernon Aljern_o_hat_n Aljurnin Aljurnon Arjuhnun
 ali_male = { _AE_li Ale_e_hat_ Alee Ali Aly }
 aliriza_male = { Ali_spc_R_i_dot_za }
 alparslan_male = { Alparslan Alpaslan }
-alvar_male = { _A_act_lvaro _A_grv_lvar Alvaro }
+alvar_male = { _A_act_lvaro _A_grv_lvar Ahlvar Alvaro }
 alwin_male = { Alvin Alwin Alwyn }
 amabilus_male = { Amable }
 amadeus_male = { Am_e_act_d_e_act_e Amadeo Amadeu Amadi_e_act_u Amedeo Bohachwa_l_stk_ Bohuchwa_l_stk_ Gottlieb Gottlob }
@@ -243,7 +243,7 @@ denethor_male = { Denafor Denethor Denethuh Denuhthaw Dwn_pst_thar }
 denis_male = { D_e_act_nis Danis Ddennis Ddynnys Denez Denis Dennis Denys Dinis Dion_i_act_s Dion_i_act_sio Dionisio Dionys }
 dermot_male = { Dermod }
 desiderius_male = { Deidi_e_act_ Didier }
-detlev_male = { Delf Detlef Detleff Detlev Ditlev D_z_act_etlaf }
+detlev_male = { Delf Detlef Detleff Detlev Detlof Detlov Ditlev D_z_act_etlaf }
 devansh_male = { D_a_hat_yyvensh Dahvensh Devansh Duhvahnsh }
 dhruvan_male = { Dhruvan Dru_e_brv_van Druvun }
 dietmar_male = { Detmar Dietmar D_z_act_itomar }
@@ -266,14 +266,15 @@ edwin_male = { Au_eth_unn Eddwyn Edvin Edwin Edwyn }
 egbert_male = { Egbert }
 ehrenfried_male = { _C_crn_es_c_act_im_e_hat_r Ehrenfried }
 ehregott_male = { Boha_c_crn_es_c_act_ Ehregott }
-ekkehard_male = { Eckehard Eckhard Eckart Eicke Eike Ekkehard Eyke  }
+ekkehard_male = { Echard Eckehard Eckhard Eckart Eicke Eike Ekkehard Eyke  }
 eleutherius_male = { Eleut_e_act_rio Lefter }
 eligius_male = { Aloi El_o_act_i Eloi Eloy }
 elijah_male = { _I_dot_lyas Eelis El_i_act_as El_i_grv_o Eli_a_act__s_crn_ Elies Elia Elias Eliaz Il_pst_iya Ilaz Ilja Iljas Iljaz Ilyes Lyes }
 elio_male = { _E_act_lio Elio }
 eliseus_male = { El_i_act_sio Eliseo Yelisey }
-elliot_male = { Elliot Elliott Ellyot Elywt }
+elliot_male = { Elliot Ellioth Elliott Ellyot Elywt }
 elros_male = { Elrhos Elros }
+elof_male = { Elof Elov Elow }
 elouan_male = { Elouan Elouann }
 emeric_male = { Aimery Am_e_act_rico Eimeri Emerich Emich Imre }
 emil_male = { _E_act_mile Eemeli Eemil Em_i_act_lio Emil Emile Emili Emilio Emiliy Milio }
@@ -295,6 +296,7 @@ eustace_male = { Eustace Eustache }
 evangelus_male = { Vangjel }
 evaristus_male = { Evarist Evaristo }
 ewald_male = { Evald Ewald }
+eyjolfur_male = { Ejolf Eyj_o_act_lfur  }
 eystein_male = { _O_stk_ystein Eysteinn }
 eyvind_male = { _O_stk_yvind Even Eyvind }
 ezra_male = { Ezra }

common/culture/name_lists/NEOW_swedish.txt

@@ -150,7 +150,11 @@
 		"dynn_Rausing"
 		"dynn_Farberger"
 		"dynn_Falkengren"
-		"dynn_Lind_e_act_n"		
+		"dynn_Lind_e_act_n"
+		"dynn_Abdul_o_uml_v"
+		"dynn_M_o_uml_ham_e_act_dt"
+		"dynn_M_a_rng_fkerin"
+		"dynn_B_a_rng_geri"
 	}
 	
 	dynasty_names = {
@@ -304,16 +308,21 @@
 		"dynn_Farberger"
 		"dynn_Falkengren"
 		"dynn_Lind_e_act_n"
+		"dynn_Abdul_o_uml_v"
+		"dynn_M_o_uml_ham_e_act_dt"
+		"dynn_M_a_rng_fkerin"
+		"dynn_B_a_rng_geri"
 	}
 	
 	male_names = {
 		3 = {
-			_A_rng_ke 
+			_A_rng_ke
+			_O_uml_julf
 			Adam Alexander Alf Ali Anders Andreas Anton Arne Axel 
 			Bengt Bernt Bertil Bj_o_uml_rn Bo Bror 
 			Carl Christer Christian Claes 
 			Dan Daniel David Dennis 
-			Emil Eric Erik 
+			Emil Eric Erik Elov Elow
 			Fredrik 
 			G_o_uml_ran Gert Gunnar Gustaf Gustav 
 			H_a_rng_kan Hans Henrik 
@@ -331,10 +340,10 @@
 			Viktor 
 		}
 		2 = {
-			Adrian Ahmad Ahmed Albert Albin Alex Alfred Amir Andr_e_act_ Arvid August 
+			Adrian Ahmad Ahmed Albert Albin Alex Alfred Amir Andr_e_act_ Arvid August Ahlvar
 			B_o_uml_rje Benjamin Benny Berndt Bert Bill Birger 
 			Charles Charlie Chris Christoffer Christopher Conny 
-			Ebbe Edvin Egon Einar Elias Emanuel Erland Ernst Eskil Evert 
+			Ebbe Edvin Egon Einar Elias Emanuel Erland Ernst Eskil Evert Ejolf Elof
 			Felix Filip Folke Frank Frans Fritz 
 			G_o_uml_sta G_o_uml_te Georg Gabriel Glenn 
 			Hampus Hannes Harald Harry Hasse Helge Henning Henric Henry Herman Holger Hugo 
@@ -358,7 +367,7 @@
 			Aage Alarik Algot Alvin Arnold 
 			Bengt-Urban Bernhard Brayan Brivio Bure 
 			Carl-Axel Carl-Edvard Carl-Einar Carl-Johan Casper Claes-Anders Claes-Bertil 
-			Edmund Edvard Edward Elliot Elver Evald Eyvor 
+			Edmund Edvard Edward Elliot Elver Evald Eyvor Echard 
 			Fillip Frankie 
 			Gehn_a_uml_ll_name Gideon Gordon Gunde Gustav-Adolf Guttorm 
 			Herbert Hilding Hjalmar 

common/defines/00_defines.txt

@@ -639,7 +639,7 @@ NArmy = {
 	MINIMUM_COUNTY_MOVEMENT_ATTRITION = 100
 	REGIMENT_DEFAULT_STACK_SIZE = 100
 	REGIMENT_DEFAULT_MAX_SIZE = 3					# Number of regiment chunks
-	REGIMENT_MAA_CAP_BY_TIER = { 0 2 2 2 2 2 2 }
+	REGIMENT_MAA_CAP_BY_TIER = { 0 2 3 4 5 6 7 }
 	REGIMENT_MAA_EXTRA_BY_CAP = 0.2					# Percentage [0-1] applied to each MAA regiment by each regiment above the cap
 	REGIMENT_MAA_SHOW_INFO_PERCENTAGE = 0.3
 	REGIMENT_MAA_STARTING_COUNT = 5

localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml

@@ -3613,3 +3613,7 @@
  dynn_Farberger:0 "Farberger"
  dynn_Falkengren:0 "Falkengren"
  dynn_Lind_e_act_n:0 "Lindén"
+ dynn_Abdul_o_uml_v:0 "Abdulöv"
+ dynn_M_o_uml_ham_e_act_dt:0 "Möhamédt"
+ dynn_M_a_rng_fkerin:0 "Måfkerin"
+ dynn_B_a_rng_geri:0 "Bågeri"

localization/english/replace/names/NEOW_character_names_l_english.yml

@@ -144,7 +144,8 @@
  _O_tld_nne:0 "Õnne"
  _O_tld_nneleid:0 "Õnneleid"
  _O_uml_gmundur:0 "Ögmundur"
- _O_uml_mer:0 "Ömer"
+ _O_uml_gmundur:0 "Ögmundur"
+ _O_uml_julf:0 "Öjulf"
  _O_uml_rjan:0 "Örjan"
  _O_uml_rn:0 "Örn"
  _O_uml_zcan:0 "Özcan"
@@ -438,6 +439,7 @@
  Ahkhenuhten:0 "Ahkhenuhten"
  Ahkihnayten:0 "Ahkihnayten"
  Ahl_i_hat_x:0 "Ahlîx"
+ Ahlvar:0 "Ahlvar"
  Ahmadd:0 "Ahmadd"
  Ahmahnhotep:0 "Ahmahnhotep"
  Ahmed:0 "Ahmed"
@@ -2736,6 +2738,8 @@
  Detlef:0 "Detlef"
  Detleff:0 "Detleff"
  Detlev:0 "Detlev"
+ Detlof:0 "Detlof"
+ Detlov:0 "Detlov"
  Deunoro:0 "Deunoro"
  Devansh:0 "Devansh"
  Devlet:0 "Devlet"
@@ -2929,6 +2933,7 @@
  Ebru:0 "Ebru"
  Ebubekir:0 "Ebubekir"
  Ecgtheow:0 "Ecgtheow" 
+ Echard:0 "Echard" 
  Eckart:0 "Eckart"
  Eckehard:0 "Eckehard"
  Eckhard:0 "Eckhard"
@@ -3053,6 +3058,7 @@
  Eisabello:0 "Eisabello"
  Eitor:0 "Eitor"
  Eize:0 "Eize"
+ Ejolf:0 "Ejolf"
  Ejup:0 "Ejup"
  Ekain:0 "Ekain"
  Ekaitz:0 "Ekaitz"
@@ -3161,11 +3167,14 @@
  Elmas:0 "Elmas"
  Elmi:0 "Elmi"
  Elmo:0 "Elmo"
+ Elof:0 "Elof"
  Eloi:0 "Eloi"
  Elorri:0 "Elorri"
  Elouan:0 "Elouan"
  Elouann:0 "Elouann"
  Eloud_i_grv_o:0 "Eloudìo"
+ Elov:0 "Elov"
+ Elow:0 "Elow"
  Elowan:0 "Elowan"
  Elowen:0 "Elowen"
  Eloy:0 "Eloy"