Various fixes, changes, and additions

Including the fact that Diba turret placements are now finalized.

Author: TheGiraffe3

data/diba/diba ships.txt

@@ -30,7 +30,7 @@ ship "Llama"
 		"thrust" 10
 		"turn" 60
 		"shield generation" .05
-		"cargo space" 100 # maybe should be lowered?
+		"cargo space" 100
 		licenses
 			Diba
 		weapon
@@ -48,7 +48,7 @@ ship "Llama"
 	leak "flame" 50 80
 	explode "tiny explosion" 15
 	explode "small explosion" 5
-	description "The Diba fighter. It is not very powerful for its size, but it has a goodly amount of shields and hull, plus a large amount of cargo space."
+	description "The Diba fighter. It is not very powerful for its size, but it has a nice amount of shields and hull, plus a large amount of cargo space."
 
 ship "Llama" "Llama (Anti-Missile)"
 	outfits
@@ -94,11 +94,10 @@ ship "Ithquaya"
 			"hit force" 1200
 	outfits
 		"Diba Laser Turret" 2
-	engine 0 0
-	turret 0 -110 "Diba Laser Turret" # top
+	turret 0 -97 "Diba Laser Turret" # top
 		angle 0
 		arc -30 30
-	turret 0 100 "Diba Laser Turret" # bottom
+	turret 0 90 "Diba Laser Turret" # bottom
 		angle 180
 		arc -30 30
 	leak "leak" 50 50
@@ -109,7 +108,7 @@ ship "Ithquaya"
 	explode "medium explosion" 25
 	explode "large explosion" 10
 	"final explode" "final explosion medium"
-	description "The smallest Diba ship."
+	description "The Ithquaya is the smallest ship the Diba produce, and the most common. In terms of power, the Ithquaya has the least of all Diba ships. However, it is the fastest."
 
 ship "Ithquaya" "Ithquaya (Sprite Two)"
 	sprite "ship/ithquaya two"
@@ -156,16 +155,16 @@ ship "Arbquaya"
 	engine 0 0
 	bay Fighter 0 -13.5
 		over
-	turret 0 -86.5 "Diba Laser Turret" # top
+	turret 0 -128 "Diba Laser Turret" # top
 		angle 0
 		arc -30 30
-	turret 0 123.5 "Diba Laser Turret" # bottom
+	turret 0 65 "Diba Laser Turret" # bottom
 		angle 180
 		arc -30 30
-	turret -43.5 28.5 "Diba Laser Turret" # left
+	turret -62.5 -11.5 "Diba Laser Turret" # left
 		angle 270
 		arc -30 30
-	turret 43.5 28.5 "Diba Laser Turret" # right
+	turret 75 -25 "Diba Laser Turret" # right
 		angle 90
 		arc -30 30
 	leak "leak" 50 50
@@ -176,7 +175,7 @@ ship "Arbquaya"
 	explode "medium explosion" 25
 	explode "large explosion" 10
 	"final explode" "final explosion medium"
-	description "A medium Diba ship."
+	description "The Arbquaya is an all-rounder. Carrying four turrets and a fighter, while still being fairly mobile, the Arbquaya is one of the best flagships of small Diba fleets."
 
 ship "Arbquaya" "Arbquaya (Sprite Two)"
 	sprite "ship/arbquaya two"
@@ -226,16 +225,16 @@ ship "Tamquaya"
 		over
 	bay Fighter 0 137.5
 		over
-	turret 0 -96 "Diba Anti-Missile" # top
+	turret 0 -103 "Diba Anti-Missile" # top
 		angle 0
 		arc -30 30
-	turret 0 96 "Diba Anti-Missile" # bottom
+	turret 0 103 "Diba Anti-Missile" # bottom
 		angle 180
 		arc -30 30
-	turret -67.5 24.5 "Diba Laser Turret" # left
+	turret 101.5 2.5 "Diba Laser Turret" # right
 		angle 270
 		arc -30 30
-	turret 67.5 24.5 "Diba Laser Turret" # right
+	turret -101.5 2.5 "Diba Laser Turret" # left
 		angle 90
 		arc -30 30
 	turret -55 -55 "Diba Laser Turret" # top left
@@ -311,63 +310,54 @@ ship "Tahquaya"
 		over
 	bay Fighter 0 251.5
 		over
-	turret 0 -139 # top
+	turret 0 -96 # top
 		angle 0
 		arc -30 30
-	turret 0 139 # bottom
+	turret 0 89 # bottom
 		angle 180
 		arc -30 30
-	turret -126 0 # left
+	turret -111 0 # left
 		angle 270
 		arc -30 30
-	turret 126 0 # right
+	turret 111 0 # right
 		angle 90
 		arc -30 30
-	turret -90 -90 # top left
+	turret -69.5 -64 # top left
 		angle 315
 		arc -30 30
-	turret 90 90 # bottom right
+	turret 69 82 # bottom right
 		angle 135
 		arc -30 30
-	turret -90 90 # bottom left
+	turret -70.5 79 # bottom left
 		angle 225
 		arc -30 30
-	turret 90 -90 # top right
+	turret 68 -68 # top right
 		angle 45
 		arc -30 30
-	turret -52 -117.5 # top and top left
+	turret -30.5 -97 # top and top left
 		angle 337.5
 		arc -30 30
-	turret 48 -121 # top and top right
+	turret 31.5 -99.5 # top and top right
 		angle 22.5
 		arc -30 30
-	turret -120 -44.5 # left and top left
+	turret -97.5 -32.5 # left and top left
 		angle 292.5
 		arc -30 30
-	turret 127 -47.5 # right and top right
+	turret 89 -37.5 # right and top right
 		angle 67.5
 		arc -30 30
-	turret -123.5 47 # left and bottom left
+	turret -97.5 29 # left and bottom left
 		angle 247.5
 		arc -30 30
-	turret 127 41.5 # right and bottom right
+	turret 96.5 32 # right and bottom right
 		angle 112.5
 		arc -30 30
-	turret -53 132.5 # bottom left and bottom
+	turret -26.5 80 # bottom left and bottom
 		angle 202.5
 		arc -30 30
-	turret 73.5 134.5 # bottom right and bottom
+	turret 39 83 # bottom right and bottom
 		angle 157.5
 		arc -30 30
-	turret 0 -118
-		angle 180
-		arc -50 50
-	turret -64.5 106.5
-		angle 45
-		arc -50 50
-	turret 64.5 106.5
-		angle 315
-		arc -50 50
 	leak "leak" 50 50
 	leak "flame" 50 80
 	leak "big leak" 90 30

data/diba/diba.txt

@@ -11,11 +11,11 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <https://www.gnu.org/licenses/>.
 
-mission "Discovered Diba Space" # TODO: make this not be a placeholder "to offer" condition, and move it to the fork (this means finishing the storyline).
+mission "Discovered Diba Space"
 	landing
 	invisible
-	to offer
-		has "event: label jibauni space"
+	source
+		attributes "diba" "near diba"
 	on offer
 		event "label diba space"
 		fail
@@ -297,7 +297,7 @@ phrase "hostile diba 3"
 phrase "hostile disabled diba"
 	word
 		"Self destructing in ${digit} seconds."
-		"Self destructing in ${digit} ${digit} ${digit} nanoseconds."
+		"Self destructing in ${digit}${digit}${digit} nanoseconds."
 		"We come from Diba Station, so do not blow us up."
 
 phrase "hostile disabled diba"

data/hazards.txt

@@ -11,16 +11,6 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <https://www.gnu.org/licenses/>.
 
-hazard "Jibauni Disabled Remover"
-	"duration" 1 100
-	"period" 100
-	"system-wide"
-	"constant strength"
-	weapon
-		"disabled damage" 100000
-		"piercing" 1
-#		"target effect" "blaster impact"
-
 hazard "Jibauni Slowing"
 	"duration" 1 100
 	"period" 100

data/jibauni/jibauni hazards.txt

@@ -24,6 +24,7 @@ event "label jibauni space"
 	galaxy "label jibauni"
 		sprite "label/jibauni"
 
+
 mission "Jibauni: Jibauni Rebel Fighter License"
 	landing
 	name "Rebel Fighter License"
@@ -357,7 +358,7 @@ mission "Jibauni: Ru-win: Merchant reputation back to normal"
 mission "Jibauni: Ji-wi"
 	minor
 	name "Take Ji-wi to <stopovers>"
-	description "Ji-wi the Jibauni would like you to take it to <stopovers> and then back to <planet>."
+	description "Ji-wi the Jibauni would like you to take them to <stopovers> and then back to <planet>."
 	source Kahbani
 	stopover Baitoon
 	destination Kahbani

data/jibauni/jibauni missions.txt

@@ -145,7 +145,7 @@ phrase "generic jibauni shipyard delivery"
 		" cargo "
 		" freight "
 	word
-		is
+		"is"
 	word
 		" speedily "
 		" quickly "
@@ -156,7 +156,7 @@ phrase "generic jibauni shipyard delivery"
 		"your ship, "
 		"the <ship>, "
 	word
-		and
+		"and"
 	word
 		" a sullen worker "
 		" a friendly worker "
@@ -184,13 +184,17 @@ phrase "jibauni got rid of bounty"
 	word
 		", and the "
 	word
-		government
-		governor
-		ruler
+		"government"
+		"governor"
+		"ruler"
 	word
 		" of <origin> "
+		" on <origin> "
 	word
 		"happily"
 		"gladly"
 	word
-		" pays you <payment>."
+		" pays"
+		" gives"
+	word
+		" you <payment>."

data/jibauni/jibauni.txt

@@ -164,7 +164,7 @@ planet Minmanmun
 	government "Jibauni (Rebel)"
 
 planet Monwon
-	attributes diba uninhabited
+	attributes "near diba" uninhabited
 	landscape land/fields28
 	description `An uninhabited planet, Monwon seems very interesting for its bunches of foliage. And curiously, the grass is flat, as it would be on any human world that had professional mowers.`
 	description ``

data/map planets.txt

@@ -147,7 +147,6 @@ system Almanhaq
 	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
 	object
 		sprite star/a-supergiant
@@ -669,7 +668,6 @@ system Huyya
 	fleet "Small Jibauni Civilian" 310
 	fleet "Jibauni Leaders" 3880
 	fleet "Large Rebel Jibauni Military" 5920
-	hazard "Jibauni Disabled Remover" 1
 	hazard "Jibauni Slowing" 200
 	object
 		sprite star/g0-old
@@ -719,7 +717,6 @@ system Jibtrav
 	minables tungsten 18 2.629
 	fleet "Small Southern Pirates" 800
 	fleet "Large Jibauni Military" 50000
-	hazard "Jibauni Disabled Remover" 100
 	object
 		sprite star/f0
 		distance 84.576
@@ -982,7 +979,6 @@ system Kateaza
 	fleet "Jibauni Leaders" 50000
 	fleet "Small Rebel Jibauni Military" 300
 	fleet "Large Rebel Jibauni Military" 1200
-	hazard "Jibauni Disabled Remover" 50
 	hazard "Jibauni Slowing" 200
 	object
 		sprite star/o-giant