More fleets, and alphabetize personalities

Author: TheGiraffe3

data/Jibauni/jibauni fleets.txt

@@ -17,8 +17,8 @@ fleet "Jibauni Pilgrim Transport"
 	cargo 4
 	personality
 		confusion 35
-		timid
 		appeasing
+		timid
 	variant 5
 		Quyan 5
 		Saghir 3
@@ -50,9 +50,9 @@ fleet "Hajay Pilgrim Transport"
 	names "Jibauni Civilian"
 	cargo 1
 	personality
-		timid
-		appeasing
 		confusion 0 # no weapons on any ships, so doesn't really matter
+		appeasing
+		timid
 	variant 10
 		"Quyan (Inter-system)"
 	variant 4
@@ -65,9 +65,9 @@ fleet "Jibauni Fighter Patrol"
 	names "Jibauni Fighters"
 	cargo 0
 	personality
-		heroic
-		disables
 		confusion 10
+		disables
+		heroic
 	variant 20
 		Larajal 20
 	variant 20
@@ -88,11 +88,11 @@ fleet "Large Jibauni Military"
 	cargo 3
 	personality
 		confusion 10
-		heroic
 		disables
-		plunders
-		opportunistic
+		heroic
 		merciful
+		opportunistic
+		plunders
 	variant 20
 		Nathar
 		Larajal 2
@@ -137,11 +137,11 @@ fleet "Small Jibauni Military"
 	cargo 2
 	personality
 		confusion 12
-		opportunistic
-		merciful
 		disables
-		plunders
 		heroic
+		merciful
+		opportunistic
+		plunders
 	variant 40
 		Yiyharsi
 	variant 30
@@ -203,11 +203,11 @@ fleet "Large Rebel Jibauni Military"
 	cargo 3
 	personality
 		confusion 10
-		heroic
 		disables
-		plunders
-		opportunistic
+		heroic
 		merciful
+		opportunistic
+		plunders
 	variant 20
 		Nathar
 		Larajal
@@ -255,11 +255,11 @@ fleet "Small Rebel Jibauni Military"
 	cargo 2
 	personality
 		confusion 12
-		opportunistic
-		merciful
 		disables
-		plunders
 		heroic
+		merciful
+		opportunistic
+		plunders
 	variant 40
 		Yiyharsi
 	variant 30
@@ -286,3 +286,79 @@ fleet "Small Rebel Jibauni Military"
 	variant 40
 		Yiyharsi
 		Saghir
+
+fleet "Small Rebel Jibauni Civilian"
+	government "Jibauni (Rebel)"
+	names "Rebel Jibauni Civilian"
+	cargo 2
+	personality
+		confusion 20
+		merciful
+		opportunistic
+		timid
+	variant 10
+		"Yankul"
+	variant 9
+		"Saghir"
+	variant 6
+		"Furus"
+	variant 5
+		"Yankul" 2
+	variant 2
+		"Nathas"
+	variant 2
+		"Nathas" 2
+	variant
+		"Nathas"
+		"Furus"
+	variant 8
+		"Quyan"
+	variant 4
+		"Yiyharsi"
+	variant 2
+		"Quyan"
+		"Yiyharsi"
+	variant
+		"Yiyharsi"
+		"Furus"
+	variant 2
+		"Yiyharsi"
+		"Saghir"
+
+fleet "Small Jibauni Civilian"
+	government "Jibauni"
+	names "Jibauni Civilian"
+	cargo 2
+	personality
+		confusion 20
+		merciful
+		opportunistic
+		timid
+	variant 10
+		"Yankul"
+	variant 9
+		"Saghir"
+	variant 6
+		"Furus"
+	variant 5
+		"Yankul" 2
+	variant 2
+		"Nathas"
+	variant 2
+		"Nathas" 2
+	variant
+		"Nathas"
+		"Furus"
+	variant 8
+		"Quyan"
+	variant 4
+		"Yiyharsi"
+	variant 2
+		"Quyan"
+		"Yiyharsi"
+	variant
+		"Yiyharsi"
+		"Furus"
+	variant 2
+		"Yiyharsi"
+		"Saghir"

data/Jibauni/jibauni phrases.txt

@@ -24,6 +24,12 @@ phrase "Jibauni Civilian"
 	phrase
 		"Jibauni"
 
+phrase "Rebel Jibauni Civilian"
+	word
+		"R. S. "
+	phrase
+		"Jibauni"
+
 phrase "Rebel Jibauni Military"
 	word
 		"T. N. S. "

data/map.txt

@@ -163,6 +163,7 @@ system Rabalin
 	trade Plastic 256
 	fleet "Small Jibauni Military" 370
 	fleet "Large Jibauni Military" 1450
+	fleet "Small Jibauni Civilian" 280
 	fleet "Jibauni Leaders" 5000
 	fleet "Large Jibauni Military" 1000
 	fleet "Jibauni Leaders" 8800
@@ -238,6 +239,7 @@ system Hajay
 	fleet "Jibauni Pilgrim Transport" 900
 	fleet "Small Jibauni Military" 900
 	fleet "Large Jibauni Military" 700
+	fleet "Small Jibauni Civilian" 180
 	fleet "Jibauni Leaders" 8000
 	hazard "Jibauni Slowing" 200
 	object
@@ -334,6 +336,7 @@ system Sabibal
 	trade Plastic 276
 	fleet "Small Jibauni Military" 800
 	fleet "Large Jibauni Military" 700
+	fleet "Small Jibauni Civilian" 320
 	fleet "Jibauni Leaders" 7350
 	hazard "Jibauni Slowing" 200
 	object
@@ -414,6 +417,7 @@ system Kanalsa
 	trade Plastic 275
 	fleet "Small Jibauni Military" 430
 	fleet "Large Jibauni Military" 900
+	fleet "Small Jibauni Civilian" 400
 	fleet "Jibauni Leaders" 4920
 	hazard "Jibauni Slowing" 200
 	object
@@ -490,6 +494,7 @@ system Huyya
 	trade Plastic 299
 	fleet "Small Jibauni Military" 530
 	fleet "Large Jibauni Military" 940
+	fleet "Small Jibauni Civilian" 310
 	#fleet "Jibauni Fighter Patrol" 2000
 	fleet "Jibauni Leaders" 3880
 	fleet "Large Rebel Jibauni Military" 5920
@@ -544,6 +549,7 @@ system Kateaza
 	minables lead 2 7.433
 	fleet "Small Jibauni Military" 500
 	fleet "Large Jibauni Military" 860
+	fleet "Small Jibauni Civilian" 1090
 	fleet "Jibauni Leaders" 50000
 	fleet "Small Rebel Jibauni Military" 300
 	fleet "Large Rebel Jibauni Military" 1200
@@ -637,6 +643,7 @@ system Almanhaq
 	trade Plastic 477
 	fleet "Small Rebel Jibauni Military" 460
 	fleet "Large Rebel Jibauni Military" 880
+	fleet "Small Rebel Jibauni Civilian" 230
 	fleet "Large Jibauni Military" 5200
 	hazard "Jibauni Disabled Remover" 100
 	hazard "Jibauni Slowing" 200
@@ -1263,6 +1270,7 @@ system Haqal
 	trade Plastic 465
 	fleet "Small Rebel Jibauni Military" 300
 	fleet "Large Rebel Jibauni Military" 600
+	fleet "Small Rebel Jibauni Civilian" 250
 	hazard "Jibauni Slowing" 200
 	object
 		sprite star/b0
@@ -1346,6 +1354,7 @@ system Holo
 	trade Plastic 470
 	fleet "Small Rebel Jibauni Military" 305
 	fleet "Large Rebel Jibauni Military" 730
+	fleet "Small Rebel Jibauni Civilian" 300
 	hazard "Jibauni Slowing" 200
 	object
 		sprite planet/browndwarf-l-rogue
@@ -1418,6 +1427,7 @@ system Yinkin
 	trade Plastic 477
 	fleet "Small Rebel Jibauni Military" 460
 	fleet "Large Rebel Jibauni Military" 700
+	fleet "Small Rebel Jibauni Civilian" 390
 	hazard "Jibauni Slowing" 200
 	object
 		sprite star/b5
@@ -2697,8 +2707,10 @@ system Quinlo
 	minables silver 60 5
 	fleet "Small Jibauni Military" 700
 	fleet "Large Jibauni Military" 1000
+	fleet "Small Jibauni Civilian" 1590
 	fleet "Small Rebel Jibauni Military" 500
 	fleet "Large Rebel Jibauni Military" 1500
+	fleet "Small Rebel Jibauni Civilian" 1600
 	fleet "Heliarch (Jibauni)" 600
 	object
 		sprite star/a0