chore: update events

vasyl-pahut · vasyl-pahut · commit c451da88f253 · 2025-07-12T16:18:31.000+03:00
diff --git a/events/vanilla_events/agitators_events/land_ownership_law_events.txt b/events/vanilla_events/agitators_events/land_ownership_law_events.txt
@@ -1763,7 +1763,7 @@ land_ownership_law_events.15 = {
 			is_subject = yes
 		}
 		NOT = {
-			has_law = law_type:law_isolationism
+			has_law_or_variant = law_type:law_isolationism
 		}
 		any_neighbouring_state = {
 			NOT = {
diff --git a/events/vanilla_events/famine_political_events.txt b/events/vanilla_events/famine_political_events.txt
@@ -103,7 +103,7 @@ famine_political.2 = {
 	icon = "gfx/interface/icons/event_icons/event_protest.dds"
 
 	trigger = {
-		has_law = law_type:law_isolationism
+		has_law_or_variant = law_type:law_isolationism
 		NOT = { has_modifier = made_economic_concessions }
 		NOT = {
 			any_interest_group = {
diff --git a/events/vanilla_events/law_events/economy_laws.txt b/events/vanilla_events/law_events/economy_laws.txt
@@ -292,6 +292,14 @@ economy_laws.4 = {
 				save_scope_as = standing_law_scope
 			}
 		}
+		else_if = { # Refactor all of this before it gets out of hand
+			limit = {
+				has_law = law_type:law_canton_system
+			}
+			law_type:law_canton_system = {
+				save_scope_as = standing_law_scope
+			}
+		}
 
 		random_interest_group = {
 			limit = {
diff --git a/events/vanilla_events/law_events/isolationism_law.txt b/events/vanilla_events/law_events/isolationism_law.txt
@@ -25,7 +25,7 @@ isolation.1 = {
 
 	trigger = {
 		OR = {
-			has_law = law_type:law_isolationism
+			has_law_or_variant = law_type:law_isolationism
 			has_law = law_type:law_traditionalism
 		}
 		OR = {
@@ -41,7 +41,7 @@ isolation.1 = {
 				is_country_type = colonial
 			}
 			NOR = {
-				has_law = law_type:law_isolationism
+				has_law_or_variant = law_type:law_isolationism
 				has_law = law_type:law_traditionalism
 			}
 		}
@@ -62,7 +62,7 @@ isolation.1 = {
 					is_country_type = colonial
 				}
 				NOR = {
-					has_law = law_type:law_isolationism
+					has_law_or_variant = law_type:law_isolationism
 					has_law = law_type:law_traditionalism
 				}
 			}
@@ -139,7 +139,7 @@ isolation.2 = {
 
 	trigger = {
 		OR = {
-			has_law = law_type:law_isolationism
+			has_law_or_variant = law_type:law_isolationism
 			has_law = law_type:law_traditionalism
 		}
 		OR = {
@@ -156,7 +156,7 @@ isolation.2 = {
 				is_country_type = colonial
 			}
 			NOR = {
-				has_law = law_type:law_isolationism
+				has_law_or_variant = law_type:law_isolationism
 				has_law = law_type:law_traditionalism
 			}
 		}
@@ -181,7 +181,7 @@ isolation.2 = {
 					is_country_type = colonial
 				}
 				NOR = {
-					has_law = law_type:law_isolationism
+					has_law_or_variant = law_type:law_isolationism
 					has_law = law_type:law_traditionalism
 				}
 			}
diff --git a/events/vanilla_events/soi_events/00_lobbies_events_04.txt b/events/vanilla_events/soi_events/00_lobbies_events_04.txt
@@ -3636,7 +3636,7 @@ lobby_events.14 = {
 							who = root
 							type = embargo
 						}
-						has_law = law_type:law_isolationism
+						has_law_or_variant = law_type:law_isolationism
 						has_law = law_type:law_command_economy
 						has_law = law_type:law_cooperative_ownership
 					}
@@ -3649,7 +3649,7 @@ lobby_events.14 = {
 						who = root
 						type = embargo
 					}
-					has_law = law_type:law_isolationism
+					has_law_or_variant = law_type:law_isolationism
 					has_law = law_type:law_command_economy
 					has_law = law_type:law_cooperative_ownership
 				}
@@ -3752,7 +3752,7 @@ lobby_events.14 = {
 								who = root
 								type = embargo
 							}
-							has_law = law_type:law_isolationism
+							has_law_or_variant = law_type:law_isolationism
 							has_law = law_type:law_command_economy
 							has_law = law_type:law_cooperative_ownership
 						}
@@ -3768,7 +3768,7 @@ lobby_events.14 = {
 								who = root
 								type = embargo
 							}
-							has_law = law_type:law_isolationism
+							has_law_or_variant = law_type:law_isolationism
 							has_law = law_type:law_command_economy
 							has_law = law_type:law_cooperative_ownership
 						}
@@ -3789,7 +3789,7 @@ lobby_events.14 = {
 							who = root
 							type = embargo
 						}
-						has_law = law_type:law_isolationism
+						has_law_or_variant = law_type:law_isolationism
 						has_law = law_type:law_command_economy
 						has_law = law_type:law_cooperative_ownership
 					}
@@ -3912,6 +3912,7 @@ lobby_events.15 = {
 							binds = ROOT
 							any_scope_article = {
 								has_type = foreign_investment_rights
+								source_country = root
 							}
 						}
 				}
@@ -3922,6 +3923,7 @@ lobby_events.15 = {
 					binds = ROOT
 					any_scope_article = {
 						has_type = foreign_investment_rights
+						source_country = root
 					}
 				}
 			}
@@ -3938,6 +3940,7 @@ lobby_events.15 = {
 							binds = ROOT
 							any_scope_article = {
 								has_type = foreign_investment_rights
+								source_country = root
 							}
 						}
 					}
@@ -3951,6 +3954,7 @@ lobby_events.15 = {
 							binds = ROOT
 							any_scope_article = {
 								has_type = foreign_investment_rights
+								source_country = root
 							}
 						}
 					}
diff --git a/events/vanilla_events/trade_route_events.txt b/events/vanilla_events/trade_route_events.txt
@@ -60,9 +60,6 @@ trade_route_events.1 = {
 				days = normal_modifier_time
 			}
 		}
-		scope:arms_seller_threat = {
-			change_infamy = -5
-		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1763,7 +1763,7 @@ land_ownership_law_events.15 = {`
`1763`	`1763`	`is_subject = yes`
`1764`	`1764`	`}`
`1765`	`1765`	`NOT = {`
`1766`		`- has_law = law_type:law_isolationism`
	`1766`	`+ has_law_or_variant = law_type:law_isolationism`
`1767`	`1767`	`}`
`1768`	`1768`	`any_neighbouring_state = {`
`1769`	`1769`	`NOT = {`
Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,14 @@ economy_laws.4 = {`
`292`	`292`	`save_scope_as = standing_law_scope`
`293`	`293`	`}`
`294`	`294`	`}`
	`295`	`+ else_if = { # Refactor all of this before it gets out of hand`
	`296`	`+ limit = {`
	`297`	`+ has_law = law_type:law_canton_system`
	`298`	`+ }`
	`299`	`+ law_type:law_canton_system = {`
	`300`	`+ save_scope_as = standing_law_scope`
	`301`	`+ }`
	`302`	`+ }`
`295`	`303`
`296`	`304`	`random_interest_group = {`
`297`	`305`	`limit = {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ isolation.1 = {`
`25`	`25`
`26`	`26`	`trigger = {`
`27`	`27`	`OR = {`
`28`		`- has_law = law_type:law_isolationism`
	`28`	`+ has_law_or_variant = law_type:law_isolationism`
`29`	`29`	`has_law = law_type:law_traditionalism`
`30`	`30`	`}`
`31`	`31`	`OR = {`
`@@ -41,7 +41,7 @@ isolation.1 = {`
`41`	`41`	`is_country_type = colonial`
`42`	`42`	`}`
`43`	`43`	`NOR = {`
`44`		`- has_law = law_type:law_isolationism`
	`44`	`+ has_law_or_variant = law_type:law_isolationism`
`45`	`45`	`has_law = law_type:law_traditionalism`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -62,7 +62,7 @@ isolation.1 = {`
`62`	`62`	`is_country_type = colonial`
`63`	`63`	`}`
`64`	`64`	`NOR = {`
`65`		`- has_law = law_type:law_isolationism`
	`65`	`+ has_law_or_variant = law_type:law_isolationism`
`66`	`66`	`has_law = law_type:law_traditionalism`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -139,7 +139,7 @@ isolation.2 = {`
`139`	`139`
`140`	`140`	`trigger = {`
`141`	`141`	`OR = {`
`142`		`- has_law = law_type:law_isolationism`
	`142`	`+ has_law_or_variant = law_type:law_isolationism`
`143`	`143`	`has_law = law_type:law_traditionalism`
`144`	`144`	`}`
`145`	`145`	`OR = {`
`@@ -156,7 +156,7 @@ isolation.2 = {`
`156`	`156`	`is_country_type = colonial`
`157`	`157`	`}`
`158`	`158`	`NOR = {`
`159`		`- has_law = law_type:law_isolationism`
	`159`	`+ has_law_or_variant = law_type:law_isolationism`
`160`	`160`	`has_law = law_type:law_traditionalism`
`161`	`161`	`}`
`162`	`162`	`}`
`@@ -181,7 +181,7 @@ isolation.2 = {`
`181`	`181`	`is_country_type = colonial`
`182`	`182`	`}`
`183`	`183`	`NOR = {`
`184`		`- has_law = law_type:law_isolationism`
	`184`	`+ has_law_or_variant = law_type:law_isolationism`
`185`	`185`	`has_law = law_type:law_traditionalism`
`186`	`186`	`}`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3636,7 +3636,7 @@ lobby_events.14 = {`
`3636`	`3636`	`who = root`
`3637`	`3637`	`type = embargo`
`3638`	`3638`	`}`
`3639`		`- has_law = law_type:law_isolationism`
	`3639`	`+ has_law_or_variant = law_type:law_isolationism`
`3640`	`3640`	`has_law = law_type:law_command_economy`
`3641`	`3641`	`has_law = law_type:law_cooperative_ownership`
`3642`	`3642`	`}`
`@@ -3649,7 +3649,7 @@ lobby_events.14 = {`
`3649`	`3649`	`who = root`
`3650`	`3650`	`type = embargo`
`3651`	`3651`	`}`
`3652`		`- has_law = law_type:law_isolationism`
	`3652`	`+ has_law_or_variant = law_type:law_isolationism`
`3653`	`3653`	`has_law = law_type:law_command_economy`
`3654`	`3654`	`has_law = law_type:law_cooperative_ownership`
`3655`	`3655`	`}`
`@@ -3752,7 +3752,7 @@ lobby_events.14 = {`
`3752`	`3752`	`who = root`
`3753`	`3753`	`type = embargo`
`3754`	`3754`	`}`
`3755`		`- has_law = law_type:law_isolationism`
	`3755`	`+ has_law_or_variant = law_type:law_isolationism`
`3756`	`3756`	`has_law = law_type:law_command_economy`
`3757`	`3757`	`has_law = law_type:law_cooperative_ownership`
`3758`	`3758`	`}`
`@@ -3768,7 +3768,7 @@ lobby_events.14 = {`
`3768`	`3768`	`who = root`
`3769`	`3769`	`type = embargo`
`3770`	`3770`	`}`
`3771`		`- has_law = law_type:law_isolationism`
	`3771`	`+ has_law_or_variant = law_type:law_isolationism`
`3772`	`3772`	`has_law = law_type:law_command_economy`
`3773`	`3773`	`has_law = law_type:law_cooperative_ownership`
`3774`	`3774`	`}`
`@@ -3789,7 +3789,7 @@ lobby_events.14 = {`
`3789`	`3789`	`who = root`
`3790`	`3790`	`type = embargo`
`3791`	`3791`	`}`
`3792`		`- has_law = law_type:law_isolationism`
	`3792`	`+ has_law_or_variant = law_type:law_isolationism`
`3793`	`3793`	`has_law = law_type:law_command_economy`
`3794`	`3794`	`has_law = law_type:law_cooperative_ownership`
`3795`	`3795`	`}`
`@@ -3912,6 +3912,7 @@ lobby_events.15 = {`
`3912`	`3912`	`binds = ROOT`
`3913`	`3913`	`any_scope_article = {`
`3914`	`3914`	`has_type = foreign_investment_rights`
	`3915`	`+ source_country = root`
`3915`	`3916`	`}`
`3916`	`3917`	`}`
`3917`	`3918`	`}`
`@@ -3922,6 +3923,7 @@ lobby_events.15 = {`
`3922`	`3923`	`binds = ROOT`
`3923`	`3924`	`any_scope_article = {`
`3924`	`3925`	`has_type = foreign_investment_rights`
	`3926`	`+ source_country = root`
`3925`	`3927`	`}`
`3926`	`3928`	`}`
`3927`	`3929`	`}`
`@@ -3938,6 +3940,7 @@ lobby_events.15 = {`
`3938`	`3940`	`binds = ROOT`
`3939`	`3941`	`any_scope_article = {`
`3940`	`3942`	`has_type = foreign_investment_rights`
	`3943`	`+ source_country = root`
`3941`	`3944`	`}`
`3942`	`3945`	`}`
`3943`	`3946`	`}`
`@@ -3951,6 +3954,7 @@ lobby_events.15 = {`
`3951`	`3954`	`binds = ROOT`
`3952`	`3955`	`any_scope_article = {`
`3953`	`3956`	`has_type = foreign_investment_rights`
	`3957`	`+ source_country = root`
`3954`	`3958`	`}`
`3955`	`3959`	`}`
`3956`	`3960`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,6 @@ trade_route_events.1 = {`
`60`	`60`	`days = normal_modifier_time`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`- scope:arms_seller_threat = {`
`64`		`- change_infamy = -5`
`65`		`- }`
`66`	`63`	`}`
`67`	`64`	`}`
`68`	`65`