fix(content): Fix various Hai-Reveal-related offer condition and loca…

…tion bugs (#7889)

data/hai/hai jobs.txt

@@ -324,6 +324,7 @@ mission "Unfettered Aid [0]"
 		has "Ask the Hai about the Unfettered: offered"
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		distance 3 4
 		attributes "unfettered"
@@ -353,6 +354,7 @@ mission "Unfettered Aid [1]"
 		has "Ask the Hai about the Unfettered: offered"
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		distance 4 5
 		attributes "unfettered"
@@ -382,6 +384,7 @@ mission "Unfettered Aid [2]"
 		has "Ask the Hai about the Unfettered: offered"
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		distance 5 6
 		attributes "unfettered"
@@ -483,6 +486,7 @@ mission "Hai Retrieve Human Luxury Goods"
 	source
 		government "Hai"
 		near "Heia Due" 2
+		not attributes "station"
 	stopover
 		attributes "north"
 	on stopover
@@ -842,9 +846,11 @@ mission "Hai Family [0]"
 		"passenger space" >= 5
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		distance 4 16
 		government "Hai"
+		not attributes "station"
 	on visit
 		dialog phrase "generic passenger on visit"
 	on complete
@@ -868,9 +874,11 @@ mission "Hai Family [1]"
 		"passenger space" >= 5
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		distance 5 20
 		government "Hai"
+		not attributes "station"
 	on visit
 		dialog phrase "generic passenger on visit"
 	on complete
@@ -892,6 +900,7 @@ mission "Transport Hai miners to <planet>"
 		random < 40
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		attributes "mining"
 		distance 3 12
@@ -917,6 +926,7 @@ mission "Transport Hai farmers to <planet>"
 		random < 40
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		attributes "farming"
 		distance 3 12
@@ -942,6 +952,7 @@ mission "Transport Hai mill workers to <planet>"
 		random < 40
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		attributes "textiles"
 		distance 3 12
@@ -967,6 +978,7 @@ mission "Transport Hai workers to <planet>"
 		random < 70
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		attributes "factory"
 		distance 3 12
@@ -1465,9 +1477,11 @@ mission "Hai Prisoner Roleplay"
 		not "Hai Rescue [A09] Slaver Ships: offered"
 	source
 		government "Hai"
+		not attributes "station"
 	destination
 		distance 3 7
 		government "Hai"
+		not attributes "station"
 	on offer
 		require "Brig"
 	on visit

data/hai/hai missions.txt

@@ -188,6 +188,7 @@ mission "Returning Home"
 	source
 		government "Hai"
 		not planet "Allhome"
+		not attributes "station"
 	destination
 		attributes "dirt belt"
 		attributes "farming"
@@ -271,6 +272,7 @@ mission "Unwanted Cargo Trigger"
 	to offer
 		random < 1
 		"cargo space" > 0
+		not "event: hai secret leaks"
 	on offer
 		event "hai in cargo" 14
 		fail
@@ -287,6 +289,7 @@ mission "Unwanted Cargo"
 	destination "Allhome"
 	to offer
 		has "event: hai in cargo"
+		not "event: hai secret leaks"
 	on offer
 		conversation
 			`The "Check Cargo" light for your ship begins blinking when you land, meaning that a cargo crate may have come loose in flight. You shut off the ship's engines and walk to the cargo hold.`
@@ -727,14 +730,15 @@ mission "Hiding in Plain Sight"
 	minor
 	source
 		government "Hai"
+		not attributes "station"
 	destination "Vinci"
 	passengers 2
 	deadline 30
 	to offer
 		random < 30
 		has "First Contact: Hai: offered"
 		or
-			not "event: pirates respond to leaks"
+			not "event: hai secret leaks"
 			has "event: hai-human resolution announced"
 	on offer
 		conversation
@@ -1127,7 +1131,7 @@ mission "Strider Alt Start"
 	source
 		government "Hai"
 		not planet "Hai-home"
-		not attributes "uninhabited"
+		not attributes "uninhabited" "station"
 	destination "Hai-home"
 	clearance
 	to offer

data/hai/hai reveal 5 philosophers.txt

@@ -361,27 +361,37 @@ event "reveal devil-run"
 
 # This mission exists to set a condition about whether or not you already knew about keystones going through red wormholes. (It doesn't care how you know.)
 # This is used to send you on a side-quest to Tarazed if it's your first encounter with them.
+# This can trigger anywhere and should trigger when you're sent to find the system with the wormhole so it's active before you reach the split.
 mission "Hai Reveal [B04-A] The Road Not Taken"
 	landing
 	invisible
-	source "Canyon"
 	to offer
 		has "Hai Reveal [B03] Contact Giti: done"
 		not "event: knows about keystones and wormholes"
 		or
+			# These check criteria from the Deep missions
 			has "deep: knew of stones before scientists"
-			has "Deep: Remnant: Keystone Research"
+			has "Deep: Remnant: Keystone Research: offered"
+			# These check criteria from Remnant missions - Remnant First Contact doesn't actually explain them.
+			has "Remnant: Key Stones: offered"
+			has "Remnant: Key Stones (Pre-Hai) 1: offered"
+			has "Remnant: Key Stones (Hai): offered"
+			has "Remnant: Lost in Ember Waste: offered"
 	on offer
 		event "knows about keystones and wormholes"
 
 event "knows about keystones and wormholes"
 
 # Relevant conditions origins:
-#	from: mission "First Contact: Remnant"
-#		has "First Contact: Remnant: offered"
+#	from: various "Remnant: Key Stones" missions
+#		has "Remnant: Key Stones: offered"
+#		has "Remnant: Key Stones (Pre-Hai) 1: offered"
+#		has "Remnant: Key Stones (Hai): offered"
+#	from: mission "Remnant: Lost in Ember Waste"
+#		has "Remnant: Lost in Ember Waste: offered"
 #	from: mission "Deep: Remnant 0"
-#		has "Deep: Remnant: Keystone Research"
-#		has "deep: knew of stones before scientists" (redundant with remnant first contact for knowledge, may be useful for conversation branches)
+#		has "Deep: Remnant: Keystone Research: offered"
+#		has "deep: knew of stones before scientists" (redundant with remnant explanations for knowledge, may be useful for conversation branches)
 #		has "deep: did reveal remnant" (may be useful for conversation branches)
 #		has "deep: did not reveal remnant" (may be useful for conversation branches)
 

data/hai/hai reveal 6 end.txt

@@ -405,7 +405,6 @@ mission "Hai Reveal [C05] Cleanup"
 				accept
 	on complete
 		event "hai-human resolution announced"
-		event "Vara K'chrai is accessible"
 		event "wandering nightmare map" 11
 		fail "Hai Reveal [A11-A] Permanent Fleets"
 		fail "Hai Reveal [B02-A] The Blockade Goes Up"
@@ -416,11 +415,6 @@ mission "Hai Reveal [C05] Cleanup"
 			`	At last, it really is over, and you can get back to your own life.`
 			`	Maybe you'll have to find out who the Unfettered were stealing their other technologies from. They mentioned another group: the "Wanderers."`
 
-event "Vara K'chrai is accessible"
-	# You can now begin the Wanderer campaign.
-	planet "Vara K'chrai"
-		"required reputation" 0
-
 event "wandering nightmare map"
 
 # TODO: delete this mission and event before next steam build - just to fix up saves running on continuous.

data/map.txt

@@ -32009,7 +32009,7 @@ planet "Vara K'chrai"
 	spaceport `The streets in the Wanderer capital city seem to be mostly reserved for cargo vehicles; the Wanderers themselves fly from one building to another instead, and the skyscrapers have balconies dozens of stories above the ground where visitors can land or take off. The air traffic seems utterly chaotic, but somehow they avoid colliding with each other in midair, and certain columns of airspace have been reserved for ships taking off and landing so that flying Wanderers will not get caught in the backwash from the ship engines.`
 	shipyard "Wanderer Advanced"
 	outfitter "Wanderer Advanced"
-	"required reputation" 25
+	"required reputation" 0
 	bribe 0
 
 planet "Vara Ke'sok"

data/wanderer/wanderers start.txt

@@ -36,8 +36,8 @@ mission "First Contact: Wanderer (Before Hai)"
 	source
 		attributes "wanderer"
 	to offer
-		not "First Contact: Hai: offered"
-		not "First Contact: Unfettered: offered"
+		not "First Contact: Wanderer: offered"
+		not "event: hai-human resolution announced"
 	on offer
 		fail "Wandering Nightmares"
 		conversation
@@ -48,7 +48,7 @@ mission "First Contact: Wanderer (Before Hai)"
 				`	"Hello. I come in peace."`
 				`	"My name is <first>. I am glad to meet you."`
 			`	The alien leans forward as you speak, as if trying to decipher your words. "Iyik'ka'ak kareek elik, ek karu karai kavet," it says. You shake your head to indicate that you do not understand, and again try to speak to it in your own language. Again it leans forward as if deeply focused on what you are saying.`
-			`	The other aliens standing beside it are inspecting you with equal curiosity. Finally, one of them says to the leader, "Ek kalek kiro suk i'hai, sek speru siyek ka'hai esek'ru fer'ek." The leader gestures in response, turning up open palms, and the second alien steps forward and addresses you in an entirely different language, one that does not sound like birdsong at all. In fact, you suspect that it is the language of a different species entirely, but unfortunately it is no more comprehensible to you than the bird's own language.`
+			`	The other aliens standing beside it are inspecting you with equal curiosity. Finally, one of them says to the leader, "Ek kalek kiro suk i'hai, sek speru siyek ka'hai esek'ru fer'ek." The leader gestures in response, turning up open palms, and the second alien steps forward and addresses you in an entirely different language, one that does not sound like birdsong at all. In fact, judging by the difficulty it seems to be having in trying to speak it, you suspect that it is the language of a different species entirely. Unfortunately, it is no more comprehensible to you than the bird's own language.`
 			`	They make some further attempts to communicate with you, but without success. Eventually they give up and all but the leader leaves. The leader makes a sweeping gesture to the rest of the spaceport, apparently inviting you to explore.`
 				decline
 
@@ -61,9 +61,7 @@ mission "First Contact: Wanderer"
 	source
 		attributes "wanderer"
 	to offer
-		or
-			has "First Contact: Hai: offered"
-			has "First Contact: Unfettered: offered"
+		has "event: hai-human resolution announced"
 	to complete
 		has "Wanderers: Diplomacy: offered"
 	on offer
@@ -85,7 +83,7 @@ mission "First Contact: Wanderer"
 			`As before, you are ushered to the ground by a flock of the small alien ships, and a few of them fly over to your ship and wait for your to come out and try to talk to them. Also as before, you do not recognize their language and they do not understand yours, although their leader seems to be focused intently on trying to understand you.`
 
 			label hai
-			`	The other aliens standing beside it are inspecting you with equal curiosity. Finally, one of them says to the leader, "Ek kalek kiro suk i'hai, sek speru siyek ka'hai esek'ru fer'ek." The leader gestures in response, turning up open palms, and the second alien steps forward and begins speaking in an entirely different language. After a moment, you are startled to realize that it is speaking the language of the Hai.`
+			`	The other aliens standing beside it are inspecting you with equal curiosity. Finally, one of them says to the leader, "Ek kalek kiro suk i'hai, sek speru siyek ka'hai esek'ru fer'ek." The leader gestures in response, turning up open palms, and the second alien steps forward and begins speaking in an entirely different language. After a moment, you are startled to realize that it is speaking the language of the Hai. The difficulty it has producing the sounds lends it a rather coarse accent, but it is almost certainly Hai.`
 			`	"Hai, you speak the Hai language?" you ask. You cup your hands above your ears to mimic the large, rodent-like ears of the Hai.`
 			`	"Iy, ka'hai!" says the alien, rustling its wings in what you take as a gesture of excitement, "Speru ek ka'hai?" At the same time, though, one of the other aliens takes a step back and flexes its talons at you. It occurs to you that the Hai may or may not be viewed favorably here.`
 			choice