version="2.4.1"

Fix not getting L-Gate event chain... if AI fires it first

mod/common/armies/zzz_wg_event_gray_armies.txt

@@ -72,29 +72,19 @@ nanite_giga_guardian = {
 				has_country_flag = goo_slayer
 				has_country_flag = lcluster_opener
 				AND = { exists = event_target:graygoo_country is_same_empire = event_target:graygoo_country }
-
-				OR = { # is_robot_empire = yes scripted triggers not allowed
-					owner_species = { has_trait = trait_mechanical }
-					has_country_flag = synthetic_empire
-					has_authority = auth_machine_intelligence
-				}
+				is_robot_empire = yes
 				# has_civic = civic_machine_assimilator # Hack for non machine?
-				NOR = { # is_valid_pop_for_PLANET_KILLER_NANOBOTS = no
-					has_trait = trait_hive_mind
-					has_trait = trait_mechanical
-					has_trait = trait_machine_unit
-				}
-				owner_species = { has_trait = trait_cybernetic } # is_cyborg_empire = yes
+				is_valid_pop_for_PLANET_KILLER_NANOBOTS = no
+				is_cyborg_empire = yes
 			}
 		}
 	}
 	allow = {
 		owner = {
-			OR = { # is_mechanical_empire = no
-				owner_species = { has_trait = trait_mechanical }
-				has_country_flag = synthetic_empire
+			OR = {
+				is_mechanical_empire = yes
+				NOT = { has_policy_flag = robots_outlawed }
 			}
-			NOT = { has_policy_flag = robots_outlawed }
 		}
 	}
 }
@@ -190,13 +180,11 @@ nanite_giga_warform = {
 			}
 		}
 		owner = {
-			# has_country_flag =
 			check_variable = { which = "nanite_warform_count" value < 4 }
-			OR = { # is_mechanical_empire = no
-				owner_species = { has_trait = trait_mechanical }
-				has_country_flag = synthetic_empire
+			OR = {
+				is_mechanical_empire = yes
+				NOT = { has_policy_flag = robots_outlawed }
 			}
-			NOT = { has_policy_flag = robots_outlawed }
 		}
 	}
 

mod/common/pop_jobs/nanite_worker_jobs.txt

@@ -55,7 +55,7 @@ nanite_worker = {
 		}
 		modifier = {
 			factor = 2
-			species = { has_species_flag = racket_species_flag }
+			species = { exists = event_target:racket_species is_same_species = event_target:racket_species }
 		}
 		modifier = {
 			factor = 1.2
@@ -124,7 +124,7 @@ nanite_drone = {
 		}
 		modifier = {
 			factor = 2
-			species = { has_species_flag = racket_species_flag }
+			species = { exists = event_target:racket_species is_same_species = event_target:racket_species }
 		}
 		modifier = {
 			factor = 1.2
@@ -435,7 +435,7 @@ nanite_forger = {
 		}
 		modifier = {
 			factor = 2
-			species = { has_species_flag = racket_species_flag }
+			species = { exists = event_target:racket_species is_same_species = event_target:racket_species }
 		}
 		modifier = {
 			factor = 1.5
@@ -486,7 +486,7 @@ nanite_forger_drone = {
 		# modifier = {
 		# 	factor = 2
 		# 	species = {
-		# 		has_species_flag = racket_species_flag
+		# 		is_same_species = event_target:racket_species
 		# 	}
 		# }
 		modifier = {

mod/common/scripted_effects/z_Cmt312_Lgate_scripted_effects.txt

@@ -27,8 +27,10 @@ start_lcluster_chain = {
 	hidden_effect = {
 		if = {
 			limit = {
+				# has_country_flag = encountered_first_lgate
 				NOR = {
-					has_global_flag = CmtFlagLgatePreludeTriggered
+					has_country_flag = completed_lcluster_chain
+					has_global_flag = l_cluster_opened
 					has_global_flag = lgates_activated_globally
 				}
 				NAND = { is_ai = yes has_global_flag = CmtFlagLgateReqPlayer }
@@ -75,6 +77,7 @@ start_lcluster_chain = {
 			}
 		}
 		set_global_flag = CmtFlagLgatePreludeTriggered
+		set_country_flag = encountered_first_lgate
 	}
 }
 

mod/common/scripted_triggers/Cmt00_Common_scripted_triggers.txt

@@ -249,7 +249,6 @@ CmtTriggerIsOrganicSleeper = {
 
 ### Mid-Game Crises ###
 CmtTriggerIsMarauder = {
-	optimize_memory
 	OR = {
 		is_country_type = dormant_marauders
 		is_country_type = ruined_marauders
@@ -358,10 +357,9 @@ CmtTriggerNowSleeperStayup = {
 	}
 }
 
-CmtTriggerNowInKhanCrisis = {
-	optimize_memory
-	any_country = { is_country_type = awakened_marauders }
-}
+# CmtTriggerNowInKhanCrisis = {
+# 	any_country = { is_country_type = awakened_marauders }
+# }
 
 #################################
 ###- Trigger Check of Events -###
@@ -396,14 +394,15 @@ CmtTriggerSleepersAwakingTriggered = {
 # 	}
 # }
 
-CmtTriggerLgateEventTriggered = {
-	optimize_memory
-	OR = {
-		has_global_flag = l_cluster_opened
-		has_global_flag = lgates_activated_globally
-		has_global_flag = CmtFlagLgatePreludeTriggered
-	}
-}
+# DEPRECATED (2 times usage)
+# CmtTriggerLgateEventTriggered = {
+# 	optimize_memory
+# 	OR = {
+# 		has_global_flag = l_cluster_opened
+# 		has_global_flag = lgates_activated_globally
+# 		has_global_flag = CmtFlagLgatePreludeTriggered
+# 	}
+# }
 
 CmtTriggerUprisingTriggered = {
 	optimize_memory
@@ -440,10 +439,15 @@ CmtTriggerAnyManagedEventTriggered = {
 		AND = {
 			has_global_flag = CmtFlagMidGameEdition
 			# OR = {
-			CmtTriggerLgateEventTriggered = yes
-			has_global_flag = marauder_crisis_started
-			# CmtTriggerKhanTriggered = yes
+			# 	CmtTriggerLgateEventTriggered = yes
+			# 	CmtTriggerKhanTriggered = yes
 			# }
+			OR = {
+				has_global_flag = l_cluster_opened
+				has_global_flag = lgates_activated_globally
+				has_global_flag = CmtFlagLgatePreludeTriggered
+				has_global_flag = marauder_crisis_started
+			}
 		}
 	}
 }
@@ -562,11 +566,16 @@ CmtTriggerKhanConfig = {
 
 CmtTriggerLgateConfig = {
 	optimize_memory
+	has_global_flag = CmtFlagMidGameEdition
 	OR = {
-		CmtTriggerLgateEventTriggered = no
+		# CmtTriggerLgateEventTriggered = no
+		NOR = {
+			has_global_flag = l_cluster_opened
+			has_global_flag = lgates_activated_globally
+			has_global_flag = CmtFlagLgatePreludeTriggered
+		}
 		has_global_flag = CmtFlagDebugMode
 	}
-	has_global_flag = CmtFlagMidGameEdition
 }
 
 CmtTriggerUprisingConfig = {

mod/common/scripted_triggers/Cmt30_MidCrisis_scripted_triggers.txt

@@ -24,7 +24,7 @@ CmtTriggerKhanAwakingMultipleCheck = {
 			NOT = { has_global_flag = marauder_crisis_started } # NOT = { has_global_flag = CmtFlagKhanTriggered
 			AND = {
 				check_variable = { which = CmtVarKhanMultiple value = 3 }
-				CmtTriggerNowInKhanCrisis = no
+				NOT = { any_country = { is_country_type = awakened_marauders } } # CmtTriggerNowInKhanCrisis = no
 			}
 		}
 		any_country = { CmtTriggerHasPotentialKhanAwaking = yes }

mod/common/scripted_triggers/zz_03_scripted_triggers_patch.txt

@@ -75,15 +75,16 @@ is_subject_of_khan = {
 	# }
 }
 
+# DEPRECATED since 3.4
 # As is_pirate is bugged (still 3.3)
-is_pirate_country = {
-	OR = {
-		is_pirate = yes # is_country_type = pirate
-		is_country_type = pirate_waves_country # Mod Realistic Pirates
-		is_country_type = dormant_marauders
-		is_country_type = ruined_marauders
-	}
-}
+# is_pirate_country = {
+# 	OR = {
+# 		is_pirate = yes # is_country_type = pirate
+# 		is_country_type = pirate_waves_country # Mod Realistic Pirates
+# 		is_country_type = dormant_marauders
+# 		is_country_type = ruined_marauders
+# 	}
+# }
 
 # this: system
 # root: great khan's horde (country)

mod/common/scripted_variables/Cmt-001_PrimacyTemplate_scripted_variables.txt

@@ -274,10 +274,10 @@
 		### Prefer to Empire Owing Larger Territory = 3 (Default)
 		### Prefer to Empire with Many POPs = 4
 
-### Term of Convenant End of Cycle.
+### Term of Covenant End of Cycle.
 	@CmtT001_ConstForcedEocCrisisTerm = no
-		### yes: Term of the convenant conforms to ''Progress Speed of Opening Event Chain''
-		### no:		Term of the convenant is 50 years (Default)
+		### yes: Term of the covenant conforms to ''Progress Speed of Opening Event Chain''
+		### no:		Term of the covenant is 50 years (Default)
 
 ### * Don't forget ''Guardians of Galaxy'' and/or ''Crisis Power''
 
@@ -414,7 +414,7 @@
 	@CmtT001_ConstDoubleGurdian = 1
 		### Forbidden = 1 (Default), Low Probability = 2, High Probability = 3, Forced = 4
 		### Only Materialist Can Awaken = 1.1, Only Xenophile Can Awaken = 1.1
-		### * Fallen Machine Empire Igore This Configuration
+		### * Fallen Machine Empire ignore this Configuration
 
 ### Worn-Out Guardians
 	@CmtT001_ConstGuardianWornOut = 1

mod/common/scripted_variables/Cmt-101_Template-01_scripted_variables.txt

@@ -274,10 +274,10 @@
 		### Prefer to Empire Owing Larger Territory = 3 (Default)
 		### Prefer to Empire with Many POPs = 4
 
-### Term of Convenant End of Cycle.
+### Term of Covenant End of Cycle.
 	@CmtT101_ConstForcedEocCrisisTerm = no
-		### yes: Term of the convenant conforms to ''Progress Speed of Opening Event Chain''
-		### no:	Term of the convenant is 50 years (Default)
+		### yes: Term of the covenant conforms to ''Progress Speed of Opening Event Chain''
+		### no:	Term of the covenant is 50 years (Default)
 
 ### * Don't forget ''Guardians of Galaxy'' and/or ''Crisis Power''
 
@@ -414,7 +414,7 @@
 	@CmtT101_ConstDoubleGurdian = 1
 		### Forbidden = 1 (Default), Low Probability = 2, High Probability = 3, Forced = 4
 		### Only Materialist Can Awaken = 1.1, Only Xenophile Can Awaken = 1.1
-		### * Fallen Machine Empire Igore This Configuration
+		### * Fallen Machine Empire Ignore This Configuration
 
 ### Worn-Out Guardians
 	@CmtT101_ConstGuardianWornOut = 1

mod/descriptor.mod

@@ -1,4 +1,4 @@
-version="2.4.0"
+version="2.4.1"
 name="A Deadly Tempest [3.4.☠]"
 tags={
 	"Events"
@@ -16,4 +16,4 @@ dependencies={
 }
 picture="thumbnail.png"
 supported_version="3.4.*"
-remote_file_id="2028826064"
+remote_file_id="2028826064"

mod/events/!000_adt_distar_events_3_patch.txt

@@ -387,6 +387,9 @@ country_event = {
 		}
 		set_global_flag = l_cluster_opened
 		set_global_flag = lgates_activated_globally
+		if = { limit = { has_global_flag = CmtFlagLgatePreludeTriggered }
+			remove_global_flag = CmtFlagLgatePreludeTriggered
+		}
 
 		## Make dragons friendly (sometimes not working so call it twice)
 		country_event = { id = a_deadly_tempest.13006 days = 3 }

mod/events/01_lcluster_+_event_override.txt

@@ -89,5 +89,8 @@ country_event = {
 			}
 			country_event = { id = lclusterplus.10 }
 		} else = { country_event = { id = distar.10950 } }
+		if = { limit = { has_global_flag = CmtFlagLgatePreludeTriggered }
+			remove_global_flag = CmtFlagLgatePreludeTriggered
+		}
 	}
 }

mod/events/1_crisis_events_3_override.txt

@@ -108,23 +108,23 @@ country_event = {
 			if = {
 				limit = {
 					NOR = {
-						has_authority = auth_hive_mind
-						has_authority = auth_machine_intelligence
+						is_hive_empire = yes
+						is_machine_empire = yes
 						owner_species = { has_trait = trait_psionic }
 					}
 				}
 				country_event = { id = crisis.2085 days = 260 random = 20 }
 			}
 			if = {
-				limit = { has_authority = auth_hive_mind }
+				limit = { is_hive_empire = yes }
 				country_event = { id = crisis.2086 days = 260 random = 20 }
 			}
 			if = {
 				limit = { owner_species = { has_trait = trait_psionic } }
 				country_event = { id = crisis.2087 days = 260 random = 20 }
 			}
 			if = {
-				limit = { has_authority = auth_machine_intelligence }
+				limit = { is_machine_empire = yes }
 				country_event = { id = crisis.2313 days = 260 random = 20 }
 			}
 		}