version="2.5.1"

Sync with CM Replace L-Cluster Access tech requirements
F1r3Pr1nc3 · Feb 9, 2023 · 1252542 · 1252542
1 parent 2478538
commit 1252542
Show file tree

Hide file tree

Showing 17 changed files with 702 additions and 497 deletions.
diff --git a/mod/common/scripted_effects/z_Cmt300_MidGameMenu_scripted_effects.txt b/mod/common/scripted_effects/z_Cmt300_MidGameMenu_scripted_effects.txt
@@ -25,7 +25,7 @@ CmtEffectDetectMidGameEdition = {
 CmtEffectTriggerMarauderManually = {
 	if = {
 		limit = {
-			count_owned_ship = {
+			count_owned_fleet = {
 				limit = { is_ship_size = marauder_void_dwelling }
 				count > 1
 			}

diff --git a/mod/common/scripted_triggers/zz_03_scripted_triggers_patch.txt b/mod/common/scripted_triggers/zz_03_scripted_triggers_patch.txt
@@ -65,6 +65,7 @@ is_subject_of_khan = {
 		is_same_empire = event_target:raider_khanate
 		# is_country_type = awakened_marauders
 	}
+	merg_is_default_empire = yes
 	# has_modifier = "satrapy_of_horde"
 	# OR = { # Only to be sure
 	# 	any_agreement = { agreement_preset = preset_machinesmith_satrapy }

diff --git a/mod/common/technology/l-cluster_access_phys_tech.txt b/mod/common/technology/l-cluster_access_phys_tech.txt
@@ -22,15 +22,15 @@ tech_lcluster_access = {
 	}
 	potential = {
 		has_global_flag = l_cluster_opened
-		NOT = { has_global_flag = active_gray_goo }
+		NOT = { has_global_flag = gray_goo_crisis_active }
 		has_country_resource = { type = nanites amount > 0 }
-		OR = {
-			NOR = {
-				has_global_flag = distar_overhaul_mod_active
-				has_country_flag = distar_overhaul_insight_started_flag
-			}
-			has_country_flag = completed_nanite_technology_mastery_chain
-		}
+		# OR = {
+		# 	NOR = {
+		# 		has_global_flag = distar_overhaul_mod_active
+		# 		has_country_flag = distar_overhaul_insight_started_flag
+		# 	}
+		# 	has_country_flag = completed_nanite_technology_mastery_chain
+		# }
 		has_distar = yes
 	}
 	weight_modifier = {

diff --git a/mod/descriptor.mod b/mod/descriptor.mod
@@ -1,4 +1,4 @@
-version="2.5.0"
+version="2.5.1"
 name="A Deadly Tempest [3.6.☠]"
 tags={
 	"Events"
@@ -16,4 +16,4 @@ dependencies={
 }
 picture="thumbnail.png"
 supported_version="3.6.*"
-remote_file_id="2028826064"
+remote_file_id="2028826064"
diff --git a/mod/events/!000_adt_distar_events_3_patch.txt b/mod/events/!000_adt_distar_events_3_patch.txt
@@ -1248,7 +1248,7 @@ country_event = {
 		is_country_type_with_subjects = yes
 		NOR = {
 			has_country_flag = encountered_first_lgate
-			has_event_chain = "l_cluster_chain"
+			has_event_chain = l_cluster_chain
 		}
 		from = {
 			has_star_flag = lgate
@@ -1261,6 +1261,14 @@ country_event = {
 	}
 	option = {
 		name = INTRIGUING
-		start_lcluster_chain = yes
+		if = {
+			limit = {
+				NOR = {
+					has_event_chain = l_cluster_chain
+					has_completed_event_chain_counter = { event_chain = l_cluster_chain counter = clues }
+				}
+			}
+			start_lcluster_chain = yes
+		}
 	}
 }