Merge branch 'Zebrica' into Empire-of-griffons

common/characters/GFF.txt

@@ -176,10 +176,10 @@ characters={
 		name = red
 		portraits = {
 			civilian = {
-				small = "GFX_portrait_griffon_generic_operative_4"
+				small = "GFX_portrait_griffon_generic_operative_male_4_small"
 			}
 		}
-		
+
 		advisor = {
 			slot = political_advisor
 			idea_token = red

common/characters/MNC.txt

@@ -310,11 +310,12 @@ characters={
 		advisor={
 			slot = army_chief
 			idea_token = MNC_advisor_10
+			cost = 100
 			allowed = {
 				original_tag = MNC
 			}
 			traits = {
-				army_chief_organizational_2 army_chief_old_guard
+				army_chief_organizational_2 alt_army_chief_old_guard
 			}
 			ai_will_do = {
 				factor = 1

common/characters/RCT.txt

@@ -34,6 +34,10 @@ characters={
 		}
 	}
 	RCT_arclight={
+		instance = {
+			allowed = {
+				has_dlc = "La Resistance"
+			}
 		name=RCT_arclight
 		portraits={
 			civilian={
@@ -67,9 +71,50 @@ characters={
 					has_government = neutrality
 				}
 			}
-			traits = { head_of_ohs }
+				traits = { head_of_ohs_lar }
 		}
-	}
+		}
+		instance = {
+			allowed = {
+				NOT = {	has_dlc = "La Resistance" }
+			}
+		name=RCT_arclight
+		portraits={
+			civilian={
+				small="GFX_idea_RCT_arclight"
+				large="gfx/leaders/RCT/Arclight.tga"
+			}
+		}
+		advisor={
+			slot = political_advisor
+			idea_token = RCT_arclight
+			allowed = {
+				can_form_river_fed = yes
+				NOT = { has_dlc = "La Resistance" }
+			}
+			visible = {
+				OR = {
+					original_tag = RCT
+					has_country_flag = RIV_annexed_RCT
+				}
+			}
+			available = {
+				hidden_trigger = {
+					OR = {
+						original_tag = RCT
+						has_country_flag = RIV_annexed_RCT
+					}
+				}
+				OR = {
+					has_government = democratic
+					has_government = neutrality
+				}
+			}
+				traits = { head_of_ohs }
+		}
+		}
+}		
+
 	RCT_hector_lipizzan={
 		name=RCT_old_guard_guy
 		portraits={

common/country_leader/eaw_traits.txt

@@ -327,6 +327,19 @@ leader_traits = {
 	}
 
 	head_of_ohs = {
+		random = no
+		encryption_factor = 0.10
+		decryption_factor = 0.10
+		drift_defence_factor = 0.15
+		subversive_activites_upkeep = -0.30
+		political_power_factor = 0.1
+
+		ai_will_do = {
+			factor = 0.5
+		}
+	}
+
+	head_of_ohs_lar = {
 		random = no
 		operative_slot = 1
 		agency_upgrade_time = -0.15
@@ -1005,8 +1018,8 @@ leader_traits = {
 	}
 	agent_of_smile = {
 		random = no
-		enemy_operative_detection_chance_factor = 0.10
-		own_operative_detection_chance_factor = -0.10
+		encryption = 0.50
+		decryption = 0.50
 		subversive_activites_upkeep = -0.15
 		foreign_subversive_activites = -0.15
 		drift_defence_factor = 0.20
@@ -1375,7 +1388,7 @@ leader_traits = {
 	secret_police_chief = {
 		random = no
 		encryption = 0.5
-		enemy_operative_detection_chance_factor = 0.15
+		resistance_activity = -0.10
 		political_power_factor = -0.05
 		drift_defence_factor = 0.15
 
@@ -3221,7 +3234,7 @@ apn_time_queen= {
 
 		decryption_factor = 0.025
 		encryption_factor = 0.025
-		enemy_operative_detection_chance_factor = 0.15
+		resistance_activity = -0.05
 		non_core_manpower = 0.025
 		stability_factor = 0.025
 		drift_defence_factor = 0.025
@@ -3766,8 +3779,8 @@ apn_time_queen= {
 
 	GRI_iron_lady = {
 		random = no
-		enemy_operative_detection_chance_factor = 0.10
-		own_operative_detection_chance_factor = -0.10
+		encryption = 0.50
+		decryption = 0.50
 		subversive_activites_upkeep = -0.15
 		foreign_subversive_activites = -0.15
 		drift_defence_factor = 0.20
@@ -3976,10 +3989,9 @@ apn_time_queen= {
 	BAR_north1_sci = {
 		random = no
 		encryption = 2
-		enemy_operative_capture_chance_factor = 0.15
-		civilian_intel_to_others = -10
-		navy_intel_to_others = -10
-		airforce_intel_to_others = -10
+		industry_air_damage_factor = -0.15
+		min_export = = -0.10
+		trade_opinion_factor = -0.10
 	}
 	BAR_north1_sci_lar = {
 		random = no
@@ -4587,19 +4599,6 @@ apn_time_queen= {
 		industrial_capacity_dockyard = 0.1
 	}
 
-	JER_kindly_enigma = {
-		random = no
-		enemy_operative_detection_chance_factor = 0.10
-		own_operative_detection_chance_factor = -0.10
-		subversive_activites_upkeep = -0.15
-		foreign_subversive_activites = -0.15
-		drift_defence_factor = 0.20
-
-		ai_will_do = {
-			factor = 1
-		}
-	}
-
 	CVA_going_cold_turkey = {
 		random = no
 	    stability_factor = -0.10
@@ -4621,6 +4620,20 @@ apn_time_queen= {
 			factor = 1
 		}
 	}
+
+	JER_kindly_enigma = {
+		random = no
+		encryption = 0.50
+		decryption = 0.50
+		subversive_activites_upkeep = -0.15
+		foreign_subversive_activites = -0.15
+		drift_defence_factor = 0.20
+
+		ai_will_do = {
+			factor = 1
+		}
+	}
+
 	JER_kindly_enigma_lar = {
 		random = no
 		enemy_operative_detection_chance_factor = 0.10

common/decisions/FEA_decisions.txt

@@ -188,20 +188,16 @@ foreign_politics = {
 			OR = {
 				has_country_flag = FEA_FHP_led_coalition
 				has_country_flag = FEA_LDP_led_coalition
-			}
-			OR = {
-				has_government = neutrality
-				has_government = democratic
+				has_country_flag = FEA_PvdA_led_coalition
+				has_country_flag = FEA_FNV_led_coalition
 			}
 		}
 		visible = {
 			OR = {
 				has_country_flag = FEA_FHP_led_coalition
 				has_country_flag = FEA_LDP_led_coalition
-			}
-			OR = {
-				has_government = neutrality
-				has_government = democratic
+				has_country_flag = FEA_PvdA_led_coalition
+				has_country_flag = FEA_FNV_led_coalition
 			}
 			FROM = {
 				has_country_leader = { ruling_only = yes character = STW_gabriela_eagleclaw }

common/decisions/HIP_decisions.txt

@@ -11617,9 +11617,7 @@ foreign_politics = {
 		}
 		fire_only_once = yes
 		complete_effect = {
-			log = "[GetDateText]: [Root.GetName]: Decision HIP_SIR_send_the_elements"
-			custom_effect_tooltip = EQS_HIP_sending_the_elements_tt
-			set_country_flag = EQS_HIP_elements_sent
+			log = "[GetDateText]: [Root.GetName]: Decision HIP_puppet_wingbardy"
 			if = {
 				limit = {
 					has_country_leader = {

common/ideas/_race_pointers.txt

@@ -94,9 +94,7 @@ ideas = {
 			}
 
 			research_bonus = {
-                light_fighter = -0.20
-                cas_bomber = -0.20
-                naval_bomber = -0.20
+                light_air = -0.20
                 para_tech = -0.20
             } 
 			equipment_bonus = {

common/unit_leader/00_traits.txt

@@ -350,6 +350,28 @@ leader_traits = {
 		type = land
 		trait_type = personality_trait
 
+		unit_trigger = {
+			OR = {
+				division_has_majority_template = infantry
+				division_has_majority_template = bicycle_battalion
+				division_has_majority_template = marine
+				division_has_majority_template = mountaineers
+				division_has_majority_template = paratrooper
+				division_has_majority_template = penal_battalion
+
+				owner = {
+					has_idea = mass_assault_academy_spirit
+				}
+			}
+			owner = {
+				NOT = {
+					OR = {
+						has_idea = best_of_the_best_spirit
+						has_idea = academy_scholarships_spirit
+					}
+				}
+			}
+		}
 		trait_xp_factor = {
 			infantry_leader = 1     #+100%
 		}
@@ -378,7 +400,25 @@ leader_traits = {
 	cavalry_officer = {
 		type = land
 		trait_type = personality_trait
-
+		unit_type = {
+			type = motorized
+			type = mechanized
+		}
+
+		unit_trigger = {
+			OR = {
+				division_has_majority_template = motorized
+				division_has_majority_template = mechanized
+			}
+			owner = {
+				NOT = {
+					OR = {
+						has_idea = best_of_the_best_spirit
+						has_idea = academy_scholarships_spirit
+					}
+				}
+			}
+		}
 		trait_xp_factor = {
 			cavalry_leader = 1     #+100%
 		}
@@ -402,7 +442,28 @@ leader_traits = {
 	armor_officer = { 
 		type = land
 		trait_type = personality_trait
-
+		unit_trigger = {
+			OR = {
+				division_has_majority_template = light_armor
+				division_has_majority_template = medium_armor
+				division_has_majority_template = heavy_armor
+				division_has_majority_template = super_heavy_armor
+				division_has_majority_template = modern_armor
+
+				owner = {
+					has_idea = mobile_warfare_academy_spirit
+				}
+
+			}
+			owner = {
+				NOT = {
+					OR = {
+						has_idea = best_of_the_best_spirit
+						has_idea = academy_scholarships_spirit
+					}
+				}
+			}
+		}
 		trait_xp_factor = {
 			panzer_leader = 1     #+100%
 		}
@@ -434,6 +495,27 @@ leader_traits = {
 		trait_xp_factor = {
 			trait_engineer = 1     #+100%
 		}
+		unit_trigger = {
+			OR = {
+				division_has_battalion_in_template = engineer
+				division_has_battalion_in_template = light_flame_tank
+				division_has_battalion_in_template = medium_flame_tank
+				division_has_battalion_in_template = heavy_flame_tank
+				division_has_battalion_in_template = modern_flame_tank
+				division_has_battalion_in_template = super_heavy_flame_tank
+				owner = {
+					has_idea = superior_firepower_academy_spirit
+				}
+			}
+			owner = {
+				NOT = {
+					OR = {
+						has_idea = best_of_the_best_spirit
+						has_idea = academy_scholarships_spirit
+					}
+				}
+			}
+		}
 		new_commander_weight = {
 			factor = 1
 
@@ -466,6 +548,14 @@ leader_traits = {
 
 		unit_trigger = {
 			division_has_majority_template = irregular_infantry
+			owner = {
+				NOT = {
+					OR = {
+						has_idea = best_of_the_best_spirit
+						has_idea = academy_scholarships_spirit
+					}
+				}
+			}
 		}
 
 		modifier = {
@@ -493,6 +583,14 @@ leader_traits = {
 
 		unit_trigger = {
 			division_has_majority_template = infantry
+			owner = {
+				NOT = {
+					OR = {
+						has_idea = best_of_the_best_spirit
+						has_idea = academy_scholarships_spirit
+					}
+				}
+			}
 		}
 
 		modifier = {