Checks: done?

Author: TheGiraffe3

data/Jibauni/jibauni jobs.txt

@@ -133,6 +133,7 @@ mission "Jibauni Rebel Bounty Small"
 	to offer
 		random < 30
 		"combat rating" > 100
+		not "event: jibauni rebel jibauni peace"
 	npc kill
 		government "Jibauni (Rebel)"
 		personality
@@ -171,6 +172,7 @@ mission "Jibauni Rebel Bounty Large"
 	to offer
 		random < 30
 		"combat rating" > 200
+		not "event: jibauni rebel jibauni peace"
 	deadline 10
 	npc kill
 		government "Jibauni (Rebel)"

data/Jibauni/jibauni ships.txt

@@ -528,8 +528,8 @@ ship "Quyan"
 		"heat dissipation" .3
 		"fuel capacity" 400
 		"cargo space" 40
-		"outfit space" 188
-		"weapon capacity" 10
+		"outfit space" 180
+		"weapon capacity" 18
 		"engine capacity" 70
 		"jibauni generator" 2
 		"fuel protection" .65

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

data/map.txt

@@ -43,7 +43,8 @@ system Jibtrav
 	minables copper 6 3.144
 	minables tungsten 18 2.629
 	fleet "Small Southern Pirates" 800
-	fleet "Jibauni Fighter Patrol" 30000
+	#fleet "Jibauni Fighter Patrol" 30000
+	fleet "Large Jibauni Military"
 	hazard "Jibauni Disabled Remover" 100
 	object
 		sprite star/f0
@@ -461,7 +462,7 @@ system Huyya
 	trade Plastic 299
 	fleet "Small Jibauni Military" 530
 	fleet "Large Jibauni Military" 940
-	fleet "Jibauni Fighter Patrol" 2000
+	#fleet "Jibauni Fighter Patrol" 2000
 	fleet "Jibauni Leaders" 3880
 	fleet "Large Rebel Jibauni Military" 5920
 	hazard "Jibauni Disabled Remover" 1