Twilight removal

changelog.txt

@@ -48,6 +48,7 @@
 ✢ Tweaked triggers for Barrad's assassination missions.
 ✢ Made fascist Francistria more sensible about when it can attack Wingbardy.
 ✢ Added a new Olenian admiral.
+✢ Fixed an edge case of Twilight being in Crystal Empire & ELF at the same time.
 ✢ Miscellaneous bugfixes and improvements.
 ✢ Miscellaneous localisation fixes.
 

common/ideas/zzz_CRY_ideas.txt

@@ -797,10 +797,7 @@ ideas = {
 				always = no
 			}
 			available = {
-				OR = {
-					is_subject = no
-					has_government = democratic
-				}
+				has_government = democratic
 			}
 			allowed_civil_war = {
 				has_government = democratic
@@ -823,10 +820,7 @@ ideas = {
 				has_government = democratic
 			}
 			available = {
-				OR = {
-					is_subject = no
-					has_government = democratic
-				}
+				has_government = democratic
 			}
 			removal_cost = -1
 			picture = royal_family
@@ -843,10 +837,7 @@ ideas = {
 				always = no
 			}
 			available = {
-				OR = {
-					is_subject = no
-					has_government = democratic
-				}
+				has_government = democratic
 			}
 			allowed_civil_war = {
 				has_government = democratic

common/on_actions/eaw_on_actions.txt

@@ -2313,6 +2313,11 @@ on_actions = {
 				NIM_load_focus_tree_on_puppet = yes
 			}
 
+			if = {
+				limit = { original_tag = CRY }
+				country_event = solarempiresparkles.102
+			}
+
 			FAT_add_puppet_ideas = yes
 
 			#JUN_handle_puppet = yes
@@ -2766,6 +2771,11 @@ on_actions = {
 				CHN_demilitarise = yes
 			}
 
+			if = {
+				limit = { original_tag = CRY }
+				country_event = solarempiresparkles.102
+			}
+
 			CRY_check_for_Sombra_when_released = yes
 
 			if = {
@@ -4149,6 +4159,7 @@ on_actions = {
 					original_tag = CRY
 				}
 				country_event = crysom.48
+				country_event = solarempiresparkles.102
 			}
 			FLO_load_ideology_focus = yes
 			WIT_load_ideology_focus = yes
@@ -8340,6 +8351,16 @@ on_actions = {
 					BAR_clear_mess_puppet = yes
 				}	
 			}
+			if = {
+				limit = {
+					ROOT = {
+						original_tag = CRY
+					}
+				}
+				ROOT = {
+					country_event = solarempiresparkles.102
+				}	
+			}
 		}
 	}
 

events/SolarEmpire.txt

@@ -4729,53 +4729,50 @@ country_event = {
 	fire_only_once = yes
 
 	trigger = {
-		has_country_flag = SOL_twilight_governor
-		any_country_with_original_tag = {
-			original_tag_to_check = CRY
-			has_country_flag = CRY_solar_governorship
-			OR = {
-				NOT = { is_subject_of = ROOT }
-				NOT = { has_government = fascism }
-				has_capitulated = yes
-				exists = no
-			}
+		original_tag = CRY
+		has_country_flag = CRY_solar_governorship
+		OR = {
+			NOT = { is_subject_of = event_target:solar_empire }
+			NOT = { has_government = fascism }
 		}
-
 	}
 
 	mean_time_to_happen = {
 		days = 1
 	}
 
 	immediate = {
-		clr_country_flag = SOL_twilight_unavailable
-		clr_country_flag = SOL_twilight_governor
-		every_country = {
-			limit = { has_country_flag = CRY_solar_governorship }
-			clr_country_flag = CRY_solar_governorship
-			if = {
-				limit = { has_unit_leader = 210 }
-				remove_unit_leader = 210
-			}
-			delete_unit_template_and_units = { division_template = "Order Militant" }
-			load_focus_tree = crystalempire
-			if = {
-				limit = { NOT = { has_country_flag = is_changeling_puppet } }
-				drop_cosmetic_tag = yes
-				set_party_name = { ideology = fascism long_name = CRY_fascism_party_long name = CRY_fascism_party }
-				if = {
-					limit = { has_country_leader = { ruling_only = yes name = "Grand Inquisitor Sunrise Sparkle" } }
-					retire_country_leader = yes
-				}
-				create_country_leader = {
-					name = "Radiant Hope"
-					expire = "1965.1.1"
-					ideology = nazism
-					desc = "POLITICS_RADIANTHOPE_DESC"
-					picture = "RadiantHope.tga"
-					female = yes
-					traits = {
-					}
+		event_target:solar_empire = {
+			clr_country_flag = SOL_twilight_unavailable
+			clr_country_flag = SOL_twilight_governor
+		}
+		EQS = {
+			clr_country_flag = SOL_twilight_unavailable
+			clr_country_flag = SOL_twilight_governor
+		}
+		clr_country_flag = CRY_solar_governorship
+		if = {
+			limit = { has_unit_leader = 210 }
+			remove_unit_leader = 210
+		}
+		delete_unit_template_and_units = { division_template = "Order Militant" }
+		load_focus_tree = crystalempire
+		if = {
+			limit = { NOT = { has_country_flag = is_changeling_puppet } }
+			drop_cosmetic_tag = yes
+			set_party_name = { ideology = fascism long_name = CRY_fascism_party_long name = CRY_fascism_party }
+		}
+		if = {
+			limit = { has_country_leader = { ruling_only = yes name = "Grand Inquisitor Sunrise Sparkle" } }
+			retire_country_leader = yes
+			create_country_leader = {
+				name = "Radiant Hope"
+				expire = "1965.1.1"
+				ideology = nazism
+				desc = "POLITICS_RADIANTHOPE_DESC"
+				picture = "RadiantHope.tga"
+				female = yes
+				traits = {
 				}
 			}
 		}

localisation/eaw_welcomescreen_l_english.yml

@@ -45,7 +45,7 @@
  EAW_WS_TAB_4_TXT_HEADER_5:0 "§Y'In the Shadow of Mountains' 1.8.0.1§!"
  #EAW_WS_TAB_4_TXT_HEADER_6:0 "§Y'In the Shadow of Mountains' 1.8§!"
  #EAW_WS_TAB_4_TXT_HEADER_7:0 "§Y'Pax Chrysalia: Redux' 1.7.7.1§!"
- EAW_WS_TAB_4_TXT:0 "\n\n+ Added some more flavour events for Wingbardy.\n+ Added a general for Skyfall.\n+ Added a news event picture for Longsword civil war.\n+ Added unique responses to the capitulation event depending on what country was capitulated.\n+ Added several new victory points in Stalliongrad.\n+ Added an event for lunarist New Mareland where the country can be renamed to Thestralia.\n+ Equestria now has claims on all Stalliongrad states, and can core them through integration occupation law.\n+ Reworked values for weather in land regions.\n+ "Finish the fight" focus for Wingbardy will now bypass if Falcoria doesn't exist.\n+ Fixed Wingbardy's National Health Bureau national spirit.\n+ A Wingbardy event should no longer be incorrectly triggered by a focus.\n+ Various improvements to Griffonian Empire's AI especially on historical. Most importantly, they will delay wars until they have cored all of Herzland.\n+ Changed some national spirits in communist Wingbardy into leader traits.\n+ "Rebuilt Aquila" state modifier's icon should now appear properly.\n+ Fascist Francistria's power struggle should end if Wingbardy no longer exist or isn't fascist.\n+ Griffonian Republic and Aquileia now instantly declare war on all Herzland nations instead of just getting wargoals.\n+ AI Wingbardy should be less suicidal.\n+ Changed the text for Barrad event where the country becomes harmonic, to clarify it's a dead end.\n+ Wingbardy's New Mareland protectorate has slightly adjusted borders and same color as Wingbardy.\n+ Supremacy Tarrin can no longer join factions.\n+ Fixed Flowena's Aquileian puppet color not appearing sometimes.\n+ Tarrin now goes harmonic on historical.\n+ Greatly reduced chance of countries accepting annexation ultimatums from Talouse.\n+ Fixed Wingbardy's communist uprising decisions not being available when they should be.\n+ Francistria no longer has a decision to ally a non-existent Griffonian Empire.\n+ More GFX dehumanization.\n+ Player Tarrin now gets fewer divisions.\n+ AI Aquileia is less likely to attack Tarrin if they are in a faction.\n+ Fixed April Fools' Dread League getting too high discounts for armor and artillery.\n+ Supremacy and communist Talouse can no longer form Karthinia, and supremacy Talouse cannot form Griffonian Empire.\n+ Fixed broken trait for a Talouse air chief.\n+ Fixed event for annexation of New Mareland speaking about Wingbardy even if Talouse is annexing it.\n+ Francis IX now gets an updated description in the "Allies, Not Subjects" path.\n+ Both operations and non-LaR decisions for Wingbardy's investigation should no longer be available at the same time.\n+ Sanity checks for Daybreaker spawning.\n+ Added race-specific unknown leader portraits and icons.\n+ Adjusted traits for various starting generals, so they don't have Adaptable or Improvisation Expert without their prerequisite traits.\n+ Fixed Othmar not having a description when he became country leader.\n+ Events where Grover VI dies now kill him properly.\n+ Talouse gets less infra damage from sabotage decisions.\n+ Fixed various issues with event triggers for Aquileia.\n+ Fixed harmonic Wingbardy's united against disharmony decision being spammable.\n+ Fixed Wingbardy's head of intelligence advisor.\n+ Various tweaks to Riverland country AIs, mostly to make them less suicidal.\n+ Fixed integration decisions not appearing for monarchist Wingbardy.\n+ Added a sanity check for Falcor's focus about allying Wingbardy.\n+ Tweaked triggers for Barrad's assassination missions.\n+ Made fascist Francistria more sensible about when it can attack Wingbardy.\n+ Added a new Olenian admiral.\n+ Miscellaneous bugfixes and improvements.\n+ Miscellaneous localisation fixes." 
+ EAW_WS_TAB_4_TXT:0 "\n\n+ Added some more flavour events for Wingbardy.\n+ Added a general for Skyfall.\n+ Added a news event picture for Longsword civil war.\n+ Added unique responses to the capitulation event depending on what country was capitulated.\n+ Added several new victory points in Stalliongrad.\n+ Added an event for lunarist New Mareland where the country can be renamed to Thestralia.\n+ Equestria now has claims on all Stalliongrad states, and can core them through integration occupation law.\n+ Reworked values for weather in land regions.\n+ "Finish the fight" focus for Wingbardy will now bypass if Falcoria doesn't exist.\n+ Fixed Wingbardy's National Health Bureau national spirit.\n+ A Wingbardy event should no longer be incorrectly triggered by a focus.\n+ Various improvements to Griffonian Empire's AI especially on historical. Most importantly, they will delay wars until they have cored all of Herzland.\n+ Changed some national spirits in communist Wingbardy into leader traits.\n+ "Rebuilt Aquila" state modifier's icon should now appear properly.\n+ Fascist Francistria's power struggle should end if Wingbardy no longer exist or isn't fascist.\n+ Griffonian Republic and Aquileia now instantly declare war on all Herzland nations instead of just getting wargoals.\n+ AI Wingbardy should be less suicidal.\n+ Changed the text for Barrad event where the country becomes harmonic, to clarify it's a dead end.\n+ Wingbardy's New Mareland protectorate has slightly adjusted borders and same color as Wingbardy.\n+ Supremacy Tarrin can no longer join factions.\n+ Fixed Flowena's Aquileian puppet color not appearing sometimes.\n+ Tarrin now goes harmonic on historical.\n+ Greatly reduced chance of countries accepting annexation ultimatums from Talouse.\n+ Fixed Wingbardy's communist uprising decisions not being available when they should be.\n+ Francistria no longer has a decision to ally a non-existent Griffonian Empire.\n+ More GFX dehumanization.\n+ Player Tarrin now gets fewer divisions.\n+ AI Aquileia is less likely to attack Tarrin if they are in a faction.\n+ Fixed April Fools' Dread League getting too high discounts for armor and artillery.\n+ Supremacy and communist Talouse can no longer form Karthinia, and supremacy Talouse cannot form Griffonian Empire.\n+ Fixed broken trait for a Talouse air chief.\n+ Fixed event for annexation of New Mareland speaking about Wingbardy even if Talouse is annexing it.\n+ Francis IX now gets an updated description in the "Allies, Not Subjects" path.\n+ Both operations and non-LaR decisions for Wingbardy's investigation should no longer be available at the same time.\n+ Sanity checks for Daybreaker spawning.\n+ Added race-specific unknown leader portraits and icons.\n+ Adjusted traits for various starting generals, so they don't have Adaptable or Improvisation Expert without their prerequisite traits.\n+ Fixed Othmar not having a description when he became country leader.\n+ Events where Grover VI dies now kill him properly.\n+ Talouse gets less infra damage from sabotage decisions.\n+ Fixed various issues with event triggers for Aquileia.\n+ Fixed harmonic Wingbardy's united against disharmony decision being spammable.\n+ Fixed Wingbardy's head of intelligence advisor.\n+ Various tweaks to Riverland country AIs, mostly to make them less suicidal.\n+ Fixed integration decisions not appearing for monarchist Wingbardy.\n+ Added a sanity check for Falcor's focus about allying Wingbardy.\n+ Tweaked triggers for Barrad's assassination missions.\n+ Made fascist Francistria more sensible about when it can attack Wingbardy.\n+ Added a new Olenian admiral.\n+ Fixed an edge case of Twilight being in Crystal Empire & ELF at the same time.\n+ Miscellaneous bugfixes and improvements.\n+ Miscellaneous localisation fixes." 
 
  # Regions
  EAW_WS_Northern_Equestria:0 "Northern Equus"