From 83fef9f04d6705fdce8e012093ac0492e597f497 Mon Sep 17 00:00:00 2001
From: emprahtheodosius <emprah.theodosius@gmail.com>
Date: Fri, 14 Apr 2023 11:23:32 +0200
Subject: [PATCH] .

---
 TGC/decisions/FranceExtra.txt          | 27 +++++---------------------
 TGC/decisions/Italy-Unification.txt    |  2 ++
 TGC/events/FRAFlavourExtra.txt         | 15 +++++++-------
 TGC/localisation/00_events_0010000.csv |  3 +++
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/TGC/decisions/FranceExtra.txt b/TGC/decisions/FranceExtra.txt
index 4430e83c4..da85dafec 100644
--- a/TGC/decisions/FranceExtra.txt
+++ b/TGC/decisions/FranceExtra.txt
@@ -1066,27 +1066,10 @@ political_decisions = {
 			#add_accepted_culture = romanian
 			#add_accepted_culture = sardinian
 			government = prussian_constitutionalism
-			random_country = {
-				limit = {
-					tag = SPA
-					exists = yes
-				}
-				country_event = 10427 #If Either of these three are not puppets, France will have to militarily overthrow their countries to take over
-			}
-			random_country = {
-				limit = {
-					tag = POR
-					exists = yes
-				}
-				country_event = 10427
-			}
-			random_country = {
-				limit = {
-					tag = ITA
-					exists = yes
-				}
-				country_event = 10427
-			}
+			#If Either of these three are not puppets, France will have to militarily overthrow their countries to take over
+			SPA = { country_event = { id = 10427 days = 1 } }
+			ITA = { country_event = { id = 10427 days = 3 } }
+			POR = { country_event = { id = 10427 days = 5 } }
 			random_country = {
 				limit = {
 					tag = CAT
@@ -1198,7 +1181,7 @@ political_decisions = {
 				militancy = -4
 			}
 			set_global_flag = 8th_coalition_assembles #Europe Reacts
-			add_country_modifier = { name = no_more_war duration = 90 }
+			add_country_modifier = { name = no_more_war duration = 150 }
 		}
 		ai_will_do = { factor = 0 }
 	}
diff --git a/TGC/decisions/Italy-Unification.txt b/TGC/decisions/Italy-Unification.txt
index 389c236ea..671e9135f 100644
--- a/TGC/decisions/Italy-Unification.txt
+++ b/TGC/decisions/Italy-Unification.txt
@@ -1212,6 +1212,7 @@ political_decisions = {
 			MOD = { all_core = { add_core = SAR } }
 			RMG = { all_core = { add_core = SAR } }
 			VEN = { all_core = { add_core = SAR } }
+			AUS_726 = { add_core = SAR }
 			TUS_744 = { add_core = TUS remove_core = SAR }
 			751 = { add_core = TUS }
 			752 = { add_core = TUS }
@@ -1220,6 +1221,7 @@ political_decisions = {
 			749 = { add_core = PAP }
 			3374 = { add_core = PAP }
 			3375 = { add_core = PAP }
+			3479 = { add_core = SAR remove_core = TUS }
 			release_vassal = PAP
 			release_vassal = SIC
 			release_vassal = TUS
diff --git a/TGC/events/FRAFlavourExtra.txt b/TGC/events/FRAFlavourExtra.txt
index 39c41ebed..2fe2a5219 100644
--- a/TGC/events/FRAFlavourExtra.txt
+++ b/TGC/events/FRAFlavourExtra.txt
@@ -1083,7 +1083,7 @@ country_event = {
 			SPA = {
 				OR = {
 					national_provinces_occupied = 0.5
-					truce_with = FRA
+					truce_with = LTU
 				}
 			}
 			OR = {
@@ -1449,8 +1449,7 @@ country_event = {
 				factor = 50
 				modifier = {
 					factor = 0
-					is_greater_power = yes
-					NOT = { has_country_flag = wants_to_unify }
+					NOT = { vassal_of = FROM }
 				}
 			}
 		}
@@ -1552,8 +1551,8 @@ country_event = {
 	#Portugal
 	country_event = {
 		id = 10429
-		title = "EVTNAME10420"
-		desc = "EVTDESC10420"
+		title = "EVTNAME10429"
+		desc = "EVTDESC10429"
 		picture = "nationalists"
 
 		trigger = {
@@ -1564,11 +1563,11 @@ country_event = {
 			POR = {
 				OR = {
 					national_provinces_occupied = 0.5
-					truce_with = FRA
+					truce_with = LTU
 				}
 			}
 			OR = {
-			521 = { #Madrid
+			521 = { #Lisabon
 					OR = {
 						controlled_by = LTU
 						controller = { alliance_with = LTU }
@@ -1584,7 +1583,7 @@ country_event = {
 		mean_time_to_happen = { days = 3 }
 
 		option = {
-			name = "EVTOPTA10420"
+			name = "EVTOPTA10429"
 			end_war = POR
 			inherit = POR
 		}
diff --git a/TGC/localisation/00_events_0010000.csv b/TGC/localisation/00_events_0010000.csv
index 28caf44db..80e8607ab 100644
--- a/TGC/localisation/00_events_0010000.csv
+++ b/TGC/localisation/00_events_0010000.csv
@@ -211,6 +211,9 @@ EVTOPTA10426;Integrate Romandie and Ticino, reconstitute neutral Switzerland in
 EVTOPTB10426;Integrate Romandie and Ticino, annex Bern and Brig;;;;;;;;;;;;;;x
 EVTOPTC10426;Integrate Romandie and Ticino, annex Bern, Brig, Luzern, Basel;;;;;;;;;;;;;;x
 EVTOPTD10426;Annex entirety of Switzerland;;;;;;;;;;;;;;x
+EVTDESC10429;A provisional government has been set up in Lisboa and several Portuguese regular army units have switched to our side, while Portuguese Royal Family flee the country. It is time to end hostilities and restore order in Iberia.;;;;;;;;;;;;;x
+EVTNAME10429;Portugal is Ours!;;;;;;;;;;;;;x
+EVTOPTA10429;We are one people!;;;;;;;;;;;;;x
 EVTDESC11000;Sometimes the monarch just isn't there. Dying without a suitable or old enough heir, becoming incapable or senile while the government enters a deadlock. Sometimes the monarch is so ill that the government doesn't work and sometimes he's just away and someone incompetent was left to take care of things in his stead. Regardless of the reason, the $COUNTRY_ADJ$ government is currently going through a regency. We can expect some instability in the years ahead.;;;;;;;;;;;;;x
 EVTNAME11000;Regency;;;;;;;;;;;;;x
 EVTOPTA11000;Terrible news.;;;;;;;;;;;;;x