feat(content): Add more high-end passenger transport missions to huma…

…n space (endless-sky#9252)
warp-core · Sep 24, 2023 · 96a20e0 · 96a20e0
1 parent f52da65
commit 96a20e0
Show file tree

Hide file tree

Showing 7 changed files with 457 additions and 31 deletions.
diff --git a/data/human/deep jobs.txt b/data/human/deep jobs.txt
@@ -326,8 +326,9 @@ mission "Transport scientists"
 		attributes "deep"
 	stopover
 		attributes "research"
+		not attributes "uninhabited"
 		distance 2 50
-	passengers 5 16
+	passengers 3 4 .43
 	to offer
 		random < 15
 	on stopover
@@ -340,6 +341,28 @@ mission "Transport scientists"
 		payment 30000
 
 
+mission "Transport science department"
+	job
+	repeat
+	description "A department of <bunks> scientists needs some research notes analyzed at the facility on <stopovers>. Take the scientists there and then return them to <planet> for <payment>."
+	source
+		attributes "deep"
+	stopover
+		attributes "research"
+		not attributes "uninhabited"
+		distance 2 50
+	passengers 20 4 .1
+	to offer
+		random < "passenger space" - 30
+	on stopover
+		dialog "The scientists have been giddily sharing and discussing the results of each of their research teams during the entire trip. You're happy for a bit of peace and quiet as they make tracks for a prominent research lab to have the results analyzed. You prepare for the return journey to <planet>."
+	on visit
+		dialog phrase "generic missing stopover or passengers"
+	on complete
+		dialog "You bid goodbye to the scientists and accept your payment of <payment>."
+		payment 180000 100
+
+
 mission "Escort science vessel"
 	job
 	repeat

diff --git a/data/human/dirt belt jobs.txt b/data/human/dirt belt jobs.txt
@@ -55,8 +55,7 @@ mission "To Remembrance Day celebration [0]"
 				month == 2
 				day < 19
 	to fail
-		month == 2
-		day == 19
+		month * 100 + day >= 219
 	source
 		attributes "dirt belt"
 	destination
@@ -90,8 +89,7 @@ mission "To Remembrance Day celebration [1]"
 				month == 2
 				day < 19
 	to fail
-		month == 2
-		day == 19
+		month * 100 + day >= 219
 	source
 		attributes "dirt belt"
 	destination
@@ -124,8 +122,7 @@ mission "To Remembrance Day celebration [2]"
 				month == 2
 				day < 19
 	to fail
-		month == 2
-		day == 19
+		month * 100 + day >= 219
 	source
 		attributes "dirt belt"
 	destination
@@ -138,6 +135,41 @@ mission "To Remembrance Day celebration [2]"
 		dialog `Spaceport workers already festively dressed for Remembrance Day remove the cargo of <commodity> from your ship and hand you your payment of <payment>.`
 
 
+mission "To Remembrance Day celebration [3]"
+	name `Remembrance Day celebration`
+	job
+	repeat
+	description `Bring <fare> to <destination> by <date> for the Remembrance Day celebration on February 19th. Payment is <payment>.`
+	passengers 20 4 .15
+	deadline
+	to offer
+		random < ( "passenger space" - 30 ) * 2
+		or
+			and
+				random < 20
+				month == 12
+				day >= 21
+			and
+				random < 90
+				month == 1
+			and
+				random < 30
+				month == 2
+				day < 19
+	to fail
+		month * 100 + day >= 219
+	source
+		attributes "dirt belt"
+	destination
+		distance 3 15
+		attributes "dirt belt"
+	on visit
+		dialog phrase "generic passenger on visit"
+	on complete
+		payment 200000 120
+		dialog "You wish your <passengers> the best of luck on <planet>. The children run off your ship in green face paint, and the parents pay you <payment>."
+
+
 mission "From Remembrance Day celebration [0]"
 	name `Return from Remembrance Day`
 	job
@@ -202,6 +234,38 @@ mission "From Remembrance Day celebration [1]"
 		dialog `Your passengers thank you for returning them to <planet>, and you collect your payment of <payment>.`
 
 
+mission "From Remembrance Day celebration [2]"
+	name `Return from Remembrance Day`
+	job
+	repeat
+	description `Bring <fare> home to <destination> after the Remembrance Day celebration. Payment is <payment>.`
+	passengers 20 4 .15
+	to offer
+		random < ( "passenger space" - 30 ) * 2
+		or
+			and
+				random < 60
+				month == 2
+				day > 19
+			and
+				random < 30
+				month == 3
+			and
+				random < 15
+				month == 4
+				day < 20
+	source
+		attributes "dirt belt"
+	destination
+		distance 3 15
+		attributes "dirt belt"
+	on visit
+		dialog phrase "generic passenger on visit"
+	on complete
+		payment 120000 100
+		dialog `Your passengers thank you for returning them to <planet>, and you collect your payment of <payment>.`
+
+
 mission "Food Convoy [0]"
 	name `Food convoy to <planet>`
 	job