Merge pull request #197 from SnowletTV/dev

1.7.1

common/ambitions/01_schemes_inv.txt

@@ -135,7 +135,7 @@ scheme_convert_pops_in_holding = {
 			is_alive = no
 			prisoner = yes
 			has_character_modifier = indisposed_charmod
-			scope:converting_holding = {
+			scope:ongoing_scheme_target = {
 				any_pops_in_province = {
 					count < 15
 					NOT = { pop_religion = root.religion }
@@ -341,7 +341,7 @@ scheme_invest_in_port = {
 			is_alive = no
 			prisoner = yes
 			has_character_modifier = indisposed_charmod
-			scope:ports_holding = {
+			scope:ongoing_scheme_target = {
 				OR = {
 					has_construction = yes
 					num_of_port_building >= 1
@@ -423,7 +423,7 @@ scheme_exploit_populous = {
 			is_alive = no
 			prisoner = yes
 			has_character_modifier = indisposed_charmod
-			scope:exploiting_holding = {
+			scope:ongoing_scheme_target = {
 				total_population < 10
 				has_variable = holding_has_been_exploited
 			}
@@ -641,7 +641,7 @@ scheme_promote_nobility = {
 			is_alive = no
 			prisoner = yes
 			has_character_modifier = indisposed_charmod
-			scope:nobles_holding = {
+			scope:ongoing_scheme_target = {
 				OR = {
 					free_building_slots = 0
 					has_construction = yes
@@ -721,7 +721,7 @@ scheme_exploit_slaves = {
 			is_alive = no
 			prisoner = yes
 			has_character_modifier = indisposed_charmod
-			scope:slaves_holding = {
+			scope:ongoing_scheme_target = {
 				num_of_slaves < 5
 			}
 		}

common/character_interactions/bit_establish_city.txt

@@ -37,9 +37,6 @@
 				can_pay_price = establish_bithynian_city_price
 			}
 			trigger_else = {
-				limit = {
-					has_variable = no_more_cooldown_on_cities
-				}
 				trigger_if ={
 					limit = { has_variable = recently_established_city }
 					custom_tooltip = {

common/character_interactions/force_divorce.txt

@@ -74,13 +74,6 @@
 				}
 			}
 			trigger_else = {
-				limit = {
-					scope:target = {
-						NOT = {
-							has_same_family = scope:actor.current_ruler
-						}
-					}
-				}
 				custom_tooltip = {
 					text = force_divorce_invention_needed
 					always = no
@@ -89,11 +82,6 @@
 		}
 		#Can be done on all in country with invention
 		trigger_else = {
-			limit = {
-				scope:actor = {
-					invention = monthly_character_loyalty_inv_2
-				}
-			}
 			scope:target = {
 				is_married = yes
 				is_adult = yes

common/character_interactions/merc_buyoff.txt

@@ -0,0 +1,80 @@
+merc_buyoff = { ### Any changes here need to be replicated in the Scripted GUI version of Bribe Mercenary
+
+	on_other_nation = yes
+	on_own_nation = no
+	message = no
+
+	sound = "event:/SFX/UI/Character/Generic/sfx_ui_character_economy"
+
+	potential_trigger = {
+		hidden:scope:target = {
+			is_mercenary = yes
+			is_general = yes
+			any_character_unit = {
+				unit_size > 0
+			}
+		}
+	}
+
+	allowed_trigger = {
+		scope:target = {
+			any_character_unit = { in_combat = no }
+			custom_tooltip = {
+				text = merc_employed_tt
+				NOT = {
+					employer = {
+						tag = MER
+					}
+				}
+			}
+		}
+		hidden:scope:actor = {
+			war_with = scope:target.employer
+			treasury >= army_size_merc_estimation
+		}
+		scope:actor.current_ruler = {
+			can_get_rivals = yes
+		}
+		scope:target.employer = {
+			NOT = {
+				invention = recruit_mercenary_inv
+			}
+		}
+		custom_tooltip = {
+			text = merc_1_year_buyoff_tt
+			NOT = {
+				scope:target = {
+					has_variable = merc_buyoff_cooldown
+				}
+			}
+		}
+	}
+
+	effect = {
+		scope:actor = {
+			add_treasury = {
+				value = 0
+				subtract = army_size_merc_estimation
+			}
+		}
+		custom_tooltip = merc_buyoff_effect_tooltip
+		scope:target = {
+			set_variable = {
+				name = merc_buyoff_cooldown
+				days = 365
+			}
+		}
+		hidden_effect = {
+			scope:target.employer = {
+				set_local_variable = {
+					name = merc_payoff_value
+					value = army_size_merc_estimation
+				}
+				trigger_event = {
+					id = warfare.3
+				}
+			}
+		}
+	}
+
+}

common/character_interactions/sogdian_emporium.txt

@@ -37,9 +37,6 @@
 				can_pay_price = establish_sogdian_emporium_price
 			}
 			trigger_else = {
-				limit = {
-					has_variable = no_more_cooldown_on_cities
-				}
 				trigger_if ={
 					limit = { has_variable = recently_established_city }
 					custom_tooltip = {

common/coat_of_arms/coat_of_arms/00_iberian_countries.txt

@@ -424,4 +424,42 @@ VAD = {
 		color1 = rgb {130 163 184}
 		color2 = "pitch_black"
 	}
+}
+
+#Edetania 
+EDT = {
+	pattern="pattern_solid.tga"
+	color1 = rgb { 255 135 183 }
+	color2 = rgb { 255 135 183 }
+	colored_emblem={
+		texture = "ce_border_palm_fronds_01.dds"
+		color1 = "senones_cafe"
+		color2 = "senones_cafe"	
+	}
+	colored_emblem={
+		texture = "ce_edetania.dds"
+		color1 = rgb { 64 36 36 }
+		color2 = "offwhite"
+	}
+}
+
+#Edetanian Arseka 
+EDT_ARSEKA = {
+	pattern = "pattern_solid.tga"
+	color1 = rgb { 255 135 183 }
+	color2 = rgb { 255 135 183 }
+
+	colored_emblem = {
+		texture = "ce_arse.dds"
+		color1 = "senones_cafe"
+		instance = { scale = { 0.85 0.85 } }
+	}
+	colored_emblem = {
+		texture = "ce_border_waves_02.dds"
+		color1 = "senones_cafe"
+		instance = { rotation = 180 }
+        instance={
+            scale={ 1.000000 1.000000 }
+        }
+    }
 }

common/coat_of_arms/coat_of_arms/01_cr_celtic_countries.txt

@@ -1,16 +1,5 @@
 ###### Belgic ######
 
-ABM = { #Ambarria
-	color1 = "ambiania_green"
-	color2 = "ambiania_white"
-
-	colored_emblem = {
-		texture = "cr_belgic_ambarria_01.dds"
-		color1 = "ambiania_white"
-		color2 = "ambiania_green"
-	}
-}
-
 MDM = { #Mediomatrici
 	color1 = "mediomatrici_green"
 	color2 = "mediomatrici_brown"