Checks?

TheGiraffe3 · Jul 9, 2024 · 3c1d4da · 3c1d4da
1 parent fd6abad
commit 3c1d4da
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 56 deletions.
diff --git a/data/Jibauni/Jibauni 0 Rebel Jibauni.txt b/data/Jibauni/Jibauni 0 Rebel Jibauni.txt
@@ -511,7 +511,7 @@ mission "Jibauni Escorts Begin"
     name "Go to <planet>"
     description "Kanlanmo has contacted you and asked you to pick up some Jibauni ships on <planet>, then report to him on Baitoon."
     source
-        government "Jibauni" "Rebel Jibauni"
+        government "Jibauni" "Jibauni (Rebel)"
     destination Taltahard
     to offer
         and
@@ -591,7 +591,7 @@ mission "Jibauni Escorts 0"
         ship "Furus" "Minmin"
         ship "Furus" "Linlin"
     npc
-        government "Rebel Jibauni"
+        government "Jibauni (Rebel)"
         system destination
         personality
             confusion 10

diff --git a/data/Jibauni/jibauni jobs.txt b/data/Jibauni/jibauni jobs.txt
@@ -20,7 +20,7 @@ mission "Jibauni Pilgrims [0]"
 	cargo "pilgrimage supplies" 10 30
 	passengers 2 20
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	destination
 		government "Jibauni"
 		attributes religious
@@ -45,7 +45,7 @@ mission "Jibauni Kasim Cargo (pre-war)"
 	repeat
 	cargo "Aboagye Shipyards Parts" 1 30
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	destination
 		government "Jibauni"
 		not planet Baitoon
@@ -66,7 +66,7 @@ mission "Jibauni Kasim Cargo (post-war)"
 	repeat
 	cargo "Aboagye Shipyards Parts" 1 30
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	destination
 		government "Jibauni"
 		not planet Baitoon
@@ -87,7 +87,7 @@ mission "Jibauni Res-redi Cargo (pre-war)"
 	repeat
 	cargo "Res-redi Shipyards Parts" 1 30
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	destination
 		system Huyya
 		system Hajay
@@ -107,7 +107,7 @@ mission "Jibauni Res-redi Cargo (post-war)"
 	repeat
 	cargo "Res-redi Shipyards Parts" 1 30
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	destination
 		system Huyya
 		system Hajay
@@ -134,7 +134,7 @@ mission "Jibauni Rebel Bounty Small"
 		random < 30
 		"combat rating" > 100
 	npc kill
-		government "Rebel Jibauni"
+		government "Jibauni (Rebel)"
 		personality
 			confusion 10
 			heroic
@@ -173,7 +173,7 @@ mission "Jibauni Rebel Bounty Large"
 		"combat rating" > 200
 	deadline 10
 	npc kill
-		government "Rebel Jibauni"
+		government "Jibauni (Rebel)"
 		personality
 			confusion 10
 			heroic
@@ -222,7 +222,7 @@ mission "Jibauni Passengers [0]"
 	repeat
 	passengers 2 15
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	to offer
 		random < 60
 	destination
@@ -238,7 +238,7 @@ mission "Jibauni Passengers [1]"
 	repeat
 	passengers 2 15
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	to offer
 		random < 60
 	destination
@@ -254,12 +254,12 @@ mission "Jibauni Passengers [2]"
 	repeat
 	passengers 20 120
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	to offer
 		random < 45
 	destination
 		distance 1 4
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	on complete
 		payment
 		payment 2000
@@ -273,7 +273,7 @@ mission "Jibauni Passengers [2]"
 #	passengers 2 20
 #	clearance "You find coordinates to land where there are no inhabitants."
 #	source
-#		government "Jibauni" "Rebel Jibauni"
+#		government "Jibauni" "Jibauni (Rebel)"
 #	to offer
 #		random < 10
 #	"distance calculation settings"
@@ -313,12 +313,12 @@ mission "Jibauni Rush Delivery [0]"
 	cargo random 2 10
 	deadline
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	to offer
 		random < 45
 	destination
 		distance 1 4
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	on complete
 		payment
 		payment 100
@@ -332,12 +332,12 @@ mission "Jibauni Rush Delivery [1]"
 	cargo random 5 40
 	deadline
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	to offer
 		random < 45
 	destination
 		distance 1 4
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	on complete
 		payment
 		dialog "The cargo is unloaded from your ship and carted away."
@@ -350,12 +350,12 @@ mission "Jibauni Rush Delivery [2]"
 	cargo random 5 40
 	deadline
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	to offer
 		random < 45
 	destination
 		distance 1 4
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	on complete
 		payment
 		dialog "The cargo is unloaded from your ship and carted away."
@@ -368,12 +368,12 @@ mission "Jibauni Bulk Delivery [0]"
 	cargo random 30 100
 	deadline
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	to offer
 		random < 80
 	destination
 		distance 1 4
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	on complete
 		payment
 		payment 1000
@@ -387,12 +387,12 @@ mission "Jibauni Bulk Delivery [1]"
 	cargo random 30 100
 	deadline
 	source
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	to offer
 		random < 80
 	destination
 		distance 1 4
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	on complete
 		payment
 		payment 3000

diff --git a/data/Jibauni/jibauni phrases.txt b/data/Jibauni/jibauni phrases.txt
@@ -239,7 +239,7 @@ phrase "friendly jibauni civilian 4"
 		"labeled "
 		"titled "
 	phrase
-		"adjective"
+		"adjectives"
 	word
 		" "
 	phrase
@@ -583,7 +583,7 @@ news "hired jibauni assassin male"
 			"Assassin"
 			"Killer"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"Have you heard of "
@@ -602,7 +602,7 @@ news "hired jibauni assassin female"
 			"Assassin"
 			"Killer"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"Have you heard of "
@@ -620,7 +620,7 @@ news "jibauni thief"
 			"Jibauni"
 			"Character" 3
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"Can I borrow your ship? I'll give it back!" 3
@@ -634,7 +634,7 @@ news "jibauni chef"
 			"Chef"
 			"Cook"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"Know how to cook sealinet? It's terribly hard!"
@@ -651,7 +651,7 @@ news "jibauni military captain"
 			"Leader"
 			"Captain"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"Ever fought an alien ship? They are so powerful!"
@@ -662,7 +662,7 @@ news "jibauni mechanic"
 		word
 			"Mechanic"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"Any clue on the way the Yiyharsi's engines work?"
@@ -678,7 +678,7 @@ news "jibauni merchant"
 			"Captain"
 			"Pilot"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"I was flying through Kateaza when suddenly some Rebels jumped me. How do their Furuses go so fast?"
@@ -691,7 +691,7 @@ news "unemployed jibauni"
 		word
 			"Unemployed Youth"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"Get me off this dump. No, why do you think I can pay you?"
@@ -708,7 +708,7 @@ news "jibauni shipyard captain"
 			"Worker"
 			"Builder"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"Wow those alien, umm, "
@@ -727,7 +727,7 @@ news "jibauni shipyard captain"
 			"Worker"
 			"Builder"
 	location
-		government "Jibauni" "Rebel Jibauni"
+		government "Jibauni" "Jibauni (Rebel)"
 	message
 		word
 			"The Military has been selling me captured alien ships. Can you buy me some?"

diff --git a/data/Jibauni/jibauni ships.txt b/data/Jibauni/jibauni ships.txt
@@ -528,7 +528,7 @@ ship "Quyan"
 		"heat dissipation" .3
 		"fuel capacity" 400
 		"cargo space" 40
-		"outfit space" 180
+		"outfit space" 188
 		"weapon capacity" 10
 		"engine capacity" 70
 		"jibauni generator" 2

diff --git a/data/Jibauni/jibauni variants.txt b/data/Jibauni/jibauni variants.txt
@@ -100,14 +100,14 @@ ship "Nathaq" "Nathaq (Bunks)"
 		"Large Bunk Room" 7
 		"Small Bunk Room"
 
-ship "Safinat (Bunks Only)"
-	outfits
-		"Outfits Expansion" 17
-		"Eimlaq Engines" 2
-		"Hyperdrive"
-		"Daltaq Energy Generator" 2
-		"Large Bunk Room" 14
-		"Small Bunk Room"
+#ship "Safinat (Bunks Only)"
+#	outfits
+#		"Outfits Expansion" 17
+#		"Eimlaq Engines" 2
+#		"Hyperdrive"
+#		"Daltaq Energy Generator" 2
+#		"Large Bunk Room" 14
+#		"Small Bunk Room"
 
 ship "Qudaw" "Qudaw (Normal)"
 	sprite ship/mule

diff --git a/data/governments.txt b/data/governments.txt
@@ -20,7 +20,7 @@ government Jibauni
 	"crew attack" 3
 	"crew defense" 0.5
 	"attitude toward"
-		"Rebel Jibauni" -1
+		"Jibauni (Rebel)" -1
 		"Jibauni (Fueler)" 0.01
 		"Jibauni (Civilian)" 1
 		"Jibauni (Ruler)" 1
@@ -50,7 +50,7 @@ government "Jibauni (Ruler)"
 	"crew attack" 3
 	"crew defense" 0.5
 	"attitude toward"
-		"Rebel Jibauni" -1
+		"Jibauni (Rebel)" -1
 		"Jibauni (Fueler)" 0.01
 		"Jibauni (Civilian)" 1
 		"Jibauni" 1
@@ -71,7 +71,7 @@ government "Jibauni (Civilian)"
 	"crew defense" 0.5
 	"attitude toward"
 		Jibauni 1
-		"Rebel Jibauni" -1
+		"Jibauni (Rebel)" -1
 		"Jibauni (Fueler)" 0.01
 	"penalty for"
 		assist -10
@@ -122,7 +122,7 @@ government "Jibauni (Fueler)"
 	"crew defense" 400
 	"attitude toward"
 		Jibauni -0.01
-		"Rebel Jibauni" -0.01
+		"Jibauni (Rebel)" -0.01
 		"Sheragi (Jibauni)" 0.01
 		"Diba" 0.01
 	"bribe" 10000
@@ -138,7 +138,7 @@ government "Sheragi (Jibauni)"
 		Jibauni -0.01
 		"Jibauni (Civilian)" -0.01
 		"Jibauni (Fueler)" 0.01
-		"Rebel Jibauni" -0.01
+		"Jibauni (Rebel)" -0.01
 		Diba -0.01
 		"Sheragi (Pirate)" -0.1
 #	"travel restrictions" 
@@ -163,7 +163,7 @@ government "Sheragi Civilian (Jibauni)"
 		Jibauni -0.01
 		"Jibauni (Civilian)" -0.01
 		"Jibauni (Fueler)" 0.01
-		"Rebel Jibauni" -0.01
+		"Jibauni (Rebel)" -0.01
 		Diba -0.01
 		"Sheragi (Pirate)" -0.1
 	"bribe" 0.02 # wasting their time
@@ -219,7 +219,7 @@ government "Heliarch (Jibauni)"
 		"Coalition" 1
 		"Heliarch" 1
 		Jibauni -1
-		"Rebel Jibauni" -1
+		"Jibauni (Rebel)" -1
 		Diba -1
 		"Sheragi (Jibauni)" -1
 		"Sheragi Civilian (Jibauni)" -1
@@ -236,5 +236,5 @@ government "Sheragi (Pirate)"
 		Sheragi -0.1
 		"Sheragi Civilian (Jibauni)" -0.1
 		"Jibauni (Civilian)" -0.1
-		"Rebel Jibauni" -0.1
+		"Jibauni (Rebel)" -0.1
 	"bribe" 0.05 # unworthy