Merge branch 'dev' into Tudhaliya-Branch

common/coat_of_arms/coat_of_arms/00_iberian_countries.txt

@@ -629,6 +629,19 @@ GREATER_AQUITANIA_FLAG = {
 	}
 }
 
+EBRO_CONFEDERATION_FLAG = {
+	pattern = "pattern_solid.tga"
+	color1 = "ebro_color"
+	color2 = "pitch_black"
+
+	colored_emblem = {
+		texture = "ce_9.dds"
+		color1 = "pitch_black"
+		color2 = "ebro_color"
+	}
+}
+
+
 #Vardulia
 VAD = {
 	pattern = "pattern_solid.tga"

common/coat_of_arms/coat_of_arms/01_invictus_countries.txt

@@ -1814,13 +1814,14 @@ PATAVNOS_FLAG = {
 		color2 = deep_patavnos_blue
 	}
 }
+
 #Korkyra
 KRK = {
 	pattern = "pattern_solid.tga"
 	color1 = "ck2_blue"
-	color2 = "ck2_blue"
+	color2 = "roman_gold"
 	colored_emblem = {
-		texture = "ce_mesembria_corinthian_helmet.dds"
+		texture = "ce_corinthian_helmet.dds"
 		color1 = "ck2_black"
 		color2 = "roman_gold"		
 	}
@@ -1830,13 +1831,15 @@ KRK = {
 SPARTAN_KORKYRA = {
 	pattern = "pattern_solid.tga"
 	color1 = "light_yellow"
-	color2 = "light_yellow"
+	color2 = "ck2_black"
 	colored_emblem = {
-		texture = "ce_mesembria_corinthian_helmet.dds"
-		color1 = "roman_red"
+		texture = "ce_corinthian_helmet.dds"
+		color1 = "ck2_black"
+		color2 = "roman_red"		
 	}
 }
 
+
 LESBOS_FLAG = {
 	pattern = "pattern_solid.tga"
 	color1 = rgb { 110 106 204 }

common/coat_of_arms/coat_of_arms/zz_alternate_scripted_countries.txt

@@ -2172,6 +2172,31 @@ LHY = {
 	}
 }
 
+#Tylos
+
+TYO = {
+	pattern = "pattern_solid.tga"
+	color1 = "etruscan_blue"
+	color2 = "etruscan_blue"
+
+	colored_emblem = {
+		texture = "ce_three_flamingos_matte.dds"
+		color1 = "bone_white"
+		color2 = "bone_white"
+		instance = {
+			position= { 0.50 0.50 }
+		}
+	}
+
+	colored_emblem = {
+      texture = "ce_border_leaves_02.dds"
+      color1 = "etruscan_blue"
+      color2 = "bone_white"
+
+      instance = { scale = { 1.0 1.0 } position= { 0.50 0.58 } rotation = 0 }
+      instance = { scale = { 1.0 1.0 } position= { 0.50 0.42 } rotation = 180 }
+    }
+}
 
 
 #######################################

common/defines/00_defines_invictus.txt

@@ -8,12 +8,16 @@ NCountry = {
 }
 
 NCombat = {
-	ASSAULT_ATTACKER_LOSS = 1.25
+	ASSAULT_ATTACKER_LOSS = 1.25 #Increased from 1.0
+
+	EXPERIENCE_GAIN = 60 #Increased from 40
+	NAVAL_EXPERIENCE_DAMAGE_REDUCTION = 0.25 #Decreased from 0.3
+	LAND_EXPERIENCE_DAMAGE_REDUCTION = 0.25 #Decreased from 0.3
 }
 
 NUnit = {
 	OUTSIDE_OF_NAVAL_RANGE_ATTRITION = 5.0 #Raised attrition and Chance
-	NAVAL_ATTRITION_CHANCE = 0.5
+	NAVAL_ATTRITION_CHANCE = 0.5 #Increased from 0.4
 }
 
 NPolitics = {
@@ -33,7 +37,9 @@ NAI = {
 	MAX_AREA_INNER_DEPTH = 11 # This value denotes the maximum depth needed to go from any one province to another within the same area. It is used for the optimization of certain pathfinding. If your mod changes the map, do make sure to change this value. It can be obtained by running `Map.CalcAreaInnerDepth` in the console
 	MAX_AREA_INNER_PATH = 15 # This value denotes the longest distance from any one province to another within the same area. It is used for the optimization of certain pathfinding. If your mod changes the map, do make sure to change this value. It can be obtained by running `Map.CalcAreaInnerPath` in the console
 
-	MAX_RECON_DISTANCE_NAVY = 600 #I don't really have time to test this, vanilla has it 400, someone suggested 400000, let's just take a safe 600 for now
+	DESTROY_THRESHOLD = -0.001						# If the AI weight of any building is less than or equal to this the AI might destroy it
+
+	MAX_RECON_DISTANCE_NAVY = 800 #I don't really have time to test this, vanilla has it 400, someone suggested 400000, let's just take a safe 600 for now
 
 	NAVY_BUDGET = 35 #Max fixed cost per month in percent.
 
@@ -63,5 +69,6 @@ NAI = {
 }
 
 NLevy = {
-	SIZE_MULTIPLIER_MAX = 1.4 # that the max value for the raise levy size multiplier is. 
+	SIZE_MULTIPLIER_MAX = 1.4 # that the max value for the raise levy size multiplier is.
+	EXPERIENCE_GAIN_THRESHOLD = 12 # months that the levy has to be raised before disbanding it will give any military experience - increased from 8
 }

common/governments/00_default.txt

@@ -333,10 +333,6 @@ tribal_chiefdom = {
 	base = {
 		global_tribesmen_happyness = happiness_large_svalue
 		levy_size_multiplier = 0.125
-		global_manpower_modifier = 0.15   
-		manpower_recovery_speed = 0.2
-		land_morale_recovery = 0.05
-		land_morale = 0.15
 	}
 
 	election_delay = 0
@@ -355,10 +351,6 @@ tribal_kingdom = {
 	base = {
 		country_civilization_value = 5
 		levy_size_multiplier = 0.075
-		global_manpower_modifier = 0.15   
-		manpower_recovery_speed = 0.2
-		land_morale_recovery = 0.05
-		land_morale = 0.15
 	}
 
 	election_delay = 0
@@ -381,10 +373,6 @@ tribal_federation = {
 	base = {
 		country_civilization_value = 12
 		levy_size_multiplier = 0.125
-		global_manpower_modifier = 0.15   
-		manpower_recovery_speed = 0.2
-		land_morale_recovery = 0.05
-		land_morale = 0.15
 	}
 
 	election_delay = 0

common/governments/01_inv_governments.txt

@@ -120,10 +120,6 @@ steppe_horde = {
         research_points_modifier = 0.5 # +50%
         global_tribesmen_desired_pop_ratio = 0.12
         global_nobles_desired_pop_ratio = 0.07
-        global_manpower_modifier = 0.2
-        manpower_recovery_speed = 0.2
-        land_morale_recovery = 0.05
-        land_morale = 0.15
 		monthly_centralization = 1	#Prevents stacking of levy size to insane amounts
 #		custom_tooltip = steppe_horde.tt #the reduced move capital cost
 	}

common/great_work_templates/01_great_work_templates_modded.txt

@@ -591,4 +591,26 @@ kition_kothon = {
 			great_work_effect_tier = "gw_effect_tier_4"
 		}
 	}
+}
+
+cyr_museion_of_cyrene = {
+	can_build = no
+	localization_key = "cyr_wonder_library_of_cyrene"
+	great_work_category="building"
+	great_work_components={
+		{
+			great_work_module="wonder_library_of_alexandria"
+		}
+	}
+	great_work_effect_selections={
+		{
+			great_work_effect="gw_effect_oratory_science_doctrine"
+			great_work_effect_tier = "gw_effect_tier_4"
+		}
+
+		{
+			great_work_effect="gw_effect_finesse_education"
+			great_work_effect_tier = "gw_effect_tier_4"
+		}
+	}	
 }

common/ideas/00_ideas.txt

@@ -5,6 +5,12 @@
 idea_martial_ethos = {
 	trigger = {
 		military_tech >= idea_tier_1
+		trigger_if = {
+			limit = { is_ai = yes }
+			NOT = {
+				military_tech >= idea_tier_3
+			}
+		}
 	}
 	land_morale_modifier = 0.05
 	group = military_ideas
@@ -39,7 +45,7 @@ idea_permanent_shipyards  = {
 		military_tech >= idea_tier_1
 		trigger_if = {
 			limit = { is_ai = yes }
-			num_of_ports > 5
+			num_of_ports > 10
 		}
 	}
 	ship_cost = -0.25
@@ -92,7 +98,7 @@ idea_triumph = {
 	trigger = {
 		military_tech >= idea_tier_3
 	}
-	experience_decay = -0.02
+	experience_decay = -0.015
 	group = military_ideas
 	soundeffect = "event:/SFX/UI/Actions/sfx_ui_action_select_idea_military"
 }
@@ -143,6 +149,10 @@ idea_complex_tariffs = {
 idea_trading_posts = {
 	trigger = {
 		civic_tech >= idea_tier_2
+		trigger_if = {
+			limit = { is_ai = yes }
+			rank <= major_power
+		}
 	}
 	global_capital_trade_routes = 3
 	group = civic_ideas