Government changes, add the 'Jibauni: Heliarch Patrol' mission

For example, the Civilians and Leaders have display names.

Author: TheGiraffe3

data/governments.txt

@@ -20,9 +20,8 @@ government Jibauni
 	"crew attack" 3
 	"crew defense" 0.5
 	"attitude toward"
-		"Jibauni (Rebel)" -1
-		"Jibauni (Fueler)" 0.01
 		"Jibauni (Civilian)" 1
+		"Jibauni (Rebel)" -1
 		"Jibauni (Ruler)" 1
 		"Pirate" -1
 	"penalty for"
@@ -32,31 +31,6 @@ government Jibauni
 		capture 5
 		destroy 10
 	"bribe" 0.01
-#	"travel restrictions" 
-#		system "Somitaw"
-#		system "Haqal"
-#		system "Holo"
-#		system "Yinkin"
-	"friendly hail" "jibauni untranslated"
-	"friendly disabled hail" "jibauni untranslated"
-	"hostile hail" "jibauni untranslated"
-	"hostile disabled hail" "jibauni untranslated"
-
-government "Jibauni (Ruler)"
-	color "governments: Jibauni"
-	swizzle 19
-	"display name" "Jibauni Leader"
-	"player reputation" 0
-	"crew attack" 3
-	"crew defense" 0.5
-	"attitude toward"
-		"Jibauni (Rebel)" -1
-		"Jibauni (Fueler)" 0.01
-		"Jibauni (Civilian)" 1
-		"Jibauni" 1
-	"penalty for"
-		assist 0
-	"bribe" 0.05 # for daring to attack them
 	"friendly hail" "jibauni untranslated"
 	"friendly disabled hail" "jibauni untranslated"
 	"hostile hail" "jibauni untranslated"
@@ -65,7 +39,7 @@ government "Jibauni (Ruler)"
 government "Jibauni (Civilian)"
 	color "governments: Jibauni"
 	swizzle 20
-	"display name" "Jibauni (Civilian)"
+	"display name" "Madaniun" # Civilian
 	"player reputation" 10
 	"crew attack" 3
 	"crew defense" 0.5
@@ -85,7 +59,6 @@ government "Jibauni (Civilian)"
 	"hostile hail" "jibauni untranslated"
 	"hostile disabled hail" "jibauni untranslated"
 
-
 government "Jibauni (Rebel)"
 	swizzle 18
 	color 0 0.196 0.196
@@ -96,35 +69,37 @@ government "Jibauni (Rebel)"
 	"attitude toward"
 		Jibauni -1
 		"Jibauni (Civilian)" -1
-		"Jibauni (Fueler)" 0.01
 	"penalty for"
 		assist -2
 		disable 1
 		board 0
 		capture 1
 		destroy 1000
 	"bribe" 0.07 # not worthy
-#	"travel restrictions"
-#		system Huyya
-#		system "Somitaw"
-#		system "Sabibal"
-#		system "Hajay"
 	"friendly hail" "jibauni untranslated"
 	"friendly disabled hail" "jibauni untranslated"
 	"hostile hail" "jibauni untranslated"
 	"hostile disabled hail" "jibauni untranslated"
 
-government "Jibauni (Fueler)"
-	color 0.196 0.392 0.118
-	"display name" "Jibauni"
-	"player reputation" -1000
-	"crew attack" 0.01
-	"crew defense" 400
+government "Jibauni (Ruler)"
+	color "governments: Jibauni"
+	swizzle 19
+	"display name" "Hakim" # Leader
+	"player reputation" 0
+	"crew attack" 3
+	"crew defense" 0.5
 	"attitude toward"
-		Jibauni -0.01
-		"Jibauni (Rebel)" -0.01
-		"Diba" 0.01
-	"bribe" 10000
+		"Jibauni (Rebel)" -1
+		"Jibauni (Fueler)" 0.01
+		"Jibauni (Civilian)" 1
+		"Jibauni" 1
+	"penalty for"
+		assist 0
+	"bribe" 0.05 # for daring to attack them
+	"friendly hail" "jibauni untranslated"
+	"friendly disabled hail" "jibauni untranslated"
+	"hostile hail" "jibauni untranslated"
+	"hostile disabled hail" "jibauni untranslated"
 
 government Diba
 	swizzle 22
@@ -135,12 +110,6 @@ government Diba
 	"attitude toward"
 		"Alpha" 1000
 	"default attitude" -0.01
-#	"travel restrictions" 
-#		system "Somitaw"
-#		system "Huyya"
-#		system "Almanhaq"
-#		system "Sabibal"
-#		system "Hajay"
 	atrocities
 		"Scram Drive"
 		ship Llama
@@ -152,26 +121,4 @@ government Diba
 	"friendly hail" "friendly diba"
 	"friendly disabled hail" "friendly disabled diba"
 	"hostile hail" "hostile diba"
-	"hostile disabled hail" "hostile disabled diba"
-
-government "Heliarch (Jibauni)"
-	swizzle 22
-	color 1 .8 .5
-	"crew attack" 1.3
-	"crew defense" 2.8
-	"player reputation" -1
-	"display name" "Heliarch"
-	"friendly hail" "friendly heliarch"
-	"friendly disabled hail" "friendly disabled heliarch"
-	"hostile hail" "hostile heliarch"
-	"hostile disabled hail" "hostile disabled heliarch"
-	"attitude toward"
-		"Quarg" -.01
-		"Quarg (Hai)" -.01
-		"Quarg (Kor Efret)" -.01
-		"Quarg (Gegno)" -.01
-		"Coalition" 1
-		"Heliarch" 1
-		Jibauni -1
-		"Jibauni (Rebel)" -1
-		Diba -1
+	"hostile disabled hail" "hostile disabled diba"

data/jibauni/jibauni missions.txt

@@ -25,6 +25,44 @@ event "label jibauni space"
 		sprite "label/jibauni"
 
 
+mission "Jibauni: Heliarch Patrol"
+	landing
+	invisible
+	repeat
+	source "Baitoon"
+	to offer
+		day == 1
+		month == 1
+	on enter
+		fail
+	npc
+		government "Heliarch"
+		personality launching quiet secretive uninterested
+		ship "Heliarch Punisher (Jump Defense)" "Gentle Guardian"
+
+
+ship "Heliarch Punisher" "Heliarch Punisher (Jump Defense)"
+	outfits
+		"Ion Rain Gun" 6
+		"Heliarch Repulsor" 4
+
+		"Large Reactor Module" 2
+		"Large Battery Module"
+		"Overcharged Shield Module" 2
+		"Overclocked Repair Module" 2
+		"Cooling Module" 4
+		"Enforcer Riot Staff" 78
+		"Enforcer Confrontation Gear" 44
+		"Outfits Expansion" 2
+		
+		"Large Thrust Module" 2
+		"Small Thrust Module" 2
+		"Large Steering Module" 2
+		"Small Steering Module" 3
+		"Hyperdrive"
+		"Jump Drive"
+
+
 mission "Jibauni: Jibauni Rebel Fighter License"
 	landing
 	name "Rebel Fighter License"
@@ -59,13 +97,8 @@ mission "Jibauni: Government License 1"
 		government "Jibauni"
 		not planet Baitoon
 	destination Baitoon
-	to offer
-		or
-			has "Jibauni: Kanlanmo 0: done"
-			has "Jibauni: Kanlanmo (0 declined): done"
-		has "license: Jibauni Rebel Fighter"
-		not "kanlanmo in mission"
-		"reputation: Jibauni" > 30
+	to offer # Requirements should be set to halfway through the storyline when that point is reached.
+		never
 	on offer
 		conversation
 			# scene "outfit/jibauni government license"