From 5b53fca279119c4a64058373d1f65f448a62f68e Mon Sep 17 00:00:00 2001
From: bene_dictator <benstaples8068@gmail.com>
Date: Mon, 18 Mar 2024 09:52:38 +1300
Subject: [PATCH] refactor(content): Refactor the Argosy Hijacking mission
 (#9901)

---
 data/governments.txt          | 20 ----------------
 data/human/human missions.txt | 44 ++++-------------------------------
 2 files changed, 4 insertions(+), 60 deletions(-)

diff --git a/data/governments.txt b/data/governments.txt
index c4473f9c9839..901e8a52a5da 100644
--- a/data/governments.txt
+++ b/data/governments.txt
@@ -953,26 +953,6 @@ government "Merchant"
 	"hostile hail" "hostile civilian"
 	"hostile disabled hail" "hostile disabled"
 
-government "Merchant (Hijacked)"
-	"display name" "Merchant"
-	swizzle 5
-	"attitude toward"
-		"Republic" -.01
-		"Syndicate" -.01
-	"player reputation" 1
-	"fine" 0
-	"friendly hail" "friendly civilian"
-	"friendly disabled hail" "friendly disabled"
-	"hostile hail" "hostile pirate"
-	"hostile disabled hail" "hostile disabled"
-	"penalty for"
-		assist 0
-		disable 0
-		board 0
-		capture 0
-		destroy 0
-		atrocity 0
-
 government "Militia"
 	swizzle 2
 	color "governments: Free"
diff --git a/data/human/human missions.txt b/data/human/human missions.txt
index 93fbc3d68beb..7dfc79f9ee30 100644
--- a/data/human/human missions.txt	
+++ b/data/human/human missions.txt	
@@ -5866,19 +5866,8 @@ mission "Quicksilver Mixup 3"
 
 
 
-
-mission "Argosy Hijacking (Trigger)"
-	landing
-	invisible
-	source
-		government "Syndicate"
-	to offer
-		"combat rating" > 200
-		random < 5
-	on offer
-		fail
-
 mission "Argosy Hijacking"
+	minor
 	landing
 	name "Stop Ship Hijacking"
 	description "The <npc> was hijacked on <origin>; disable it and return to <origin>. Do not board, capture, or destroy it; Syndicated Security will deal with the hijackers in space after you have disabled it."
@@ -5887,7 +5876,8 @@ mission "Argosy Hijacking"
 		not attributes "station"
 		not near "Sol" 3
 	to offer
-		has "Argosy Hijacking (Trigger): offered"
+		"combat rating" > 200
+		random < 5
 	on offer
 		conversation
 			`You're signing the standard Syndicate landing papers with an officer on <origin>. "Everything seems to be in order. And of course, we'll have your ship refueled promptly. Have a good day, Captain <last>." He nods his head at you and starts to move off towards the next ship.`
@@ -5944,7 +5934,7 @@ mission "Argosy Hijacking"
 			fail
 		on kill
 			set "destroyed hijacked argosy"
-			dialog `You have destroyed the Moonshake Express. Its captain won't be impressed.`
+			dialog `You have destroyed the Moonshake Express. The ship's captain won't be impressed.`
 
 	on fail
 		conversation
@@ -6025,32 +6015,6 @@ mission "Argosy Hijacking"
 			`	The hijackers, just a raucous group of young kids, are hauled out of the <npc model> by Syndicated Security personnel towards an armored van. Multiple times the kids try to run away, but after a few minutes they're finally detained; the van drives off towards the spaceport terminal.`
 			`	After the incident is wrapped up, the captain of the <npc> sends you <payment>, and a message thanking you for helping him recover his ship.`
 
-mission "Argosy Hijacking (Declined)"
-	invisible
-	landing
-	source
-		government "Syndicate"
-		not attributes "station"
-		not near "Sol" 3
-	deadline 1
-	to offer
-		has "Argosy Hijacking (Trigger): offered"
-	to complete
-		never
-	npc
-		personality launching daring uninterested
-			confusion 40
-		government "Merchant (Hijacked)"
-		ship "Argosy (Blaster)" "Moonshake Express"
-		to spawn
-			has "Argosy Hijacking: declined"
-	npc
-		personality launching disables uninterested
-		government "Syndicate"
-		fleet "Small Syndicate"
-		to spawn
-			has "Argosy Hijacking: declined"
-
 
 
 mission "Blind Man from Martini"