More fixes

Author: TheGiraffe3

data/jibauni/jibauni jobs.txt

@@ -133,7 +133,7 @@ mission "Jibauni Res-redi Cargo (post-war)"
 
 mission "Jibauni Rebel Bounty Small"
 	name "Kill the <npc>"
-	description "The <npc>, a small Rebel Jibauni ship, is marauding near the <origin> system. You will receive <payment> for destroying it, if you do so by <day>."
+	description "The <npc>, a small Rebel Jibauni ship, is marauding near the <origin> system. You will receive <payment> for destroying it, if you do so by the <day>."
 	job
 	repeat
 	"apparent payment" 40000

data/jibauni/jibauni missions.txt

@@ -56,13 +56,15 @@ mission "Jibauni: Government License 1"
 	description "Go to <planet> to talk with Kanlanmo."
 	source
 		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"
+		not "kanlanmo in mission"
+		"reputation: Jibauni" > 30
 	on offer
 		conversation
 			# scene "outfit/jibauni government license"
@@ -79,9 +81,10 @@ mission "Jibauni: Government License 2"
 	to offer
 		has "Jibauni: Government License 1: done"
 	on offer
+		set "laqualk landable"
 		set "license: Jibauni Government"
 		conversation
-			`Kanlanmo is outside your ship as the <model> touches down. He comes aboard as soon as the hatch is opened. "<name>, I am charged to tell you that you are now a member of the most trusted circles in the Jibauni government. Here is a license to buy our largest warship, the Nathar. You have various other advantages, including the ability to land on the capital world."`
+			`Kanlanmo is outside your ship as the <model> touches down. He comes aboard as soon as the hatch is opened. "<first> <last>, I am charged to tell you that you are now a member of the most trusted circles in the Jibauni government. Here is a license to buy our largest warship, the Nathar. You have various other advantages, including the ability to land on the capital world."`
 			choice
 				`	"Wait what?"`
 				`	"I thought <origin> was the capital."`
@@ -109,7 +112,7 @@ mission "Jibauni: Government License 3"
 	on offer
 		conversation
 			`Kanlanmo is in the cockpit as you land. "Well, what did I tell you, <first>?" he asks. "It's wonderful, isn't it?" You both look at the planet in awe, before Kanlanmo heads towards the exit. "Come on," he says. "We've got to get you registered. At the moment, you're only allowed to be here because I'm with you."`
-			`	He leads you to a small office, and signs a paper authorizing you to land at will. "Well, that's dealt with," he says. "Please take me back to <planet>. I was only told I could be gone for a short while.`
+			`	He leads you to a small office, and signs a paper authorizing you to land at will. "Well, that's dealt with," he says. "Please take me back to <planet>. I was only told I could be gone for a short while."`
 			choice
 				`	"Sure."`
 					accept

data/jibauni/jibauni news.txt

@@ -262,6 +262,19 @@ news "jibauni shipyard captain"
 		word
 			`"`
 
+phrase "1-10"
+	word
+		"1"
+		"2"
+		"3"
+		"4"
+		"5"
+		"6"
+		"7"
+		"8"
+		"9"
+		"10"
+
 news "jibauni shipyard captain"
 	name
 		word
@@ -276,7 +289,7 @@ news "jibauni shipyard captain"
 			`"`
 		word
 			"The Military has been selling me captured alien ships. Can you buy me some?"
-			"There have been many red alien ships invading in the past ${digit} years. Do you know who they are allied with?"
+			"There have been many red alien ships invading in the past ${1-10} years. Do you know who they are allied with?"
 			"How many Sparrows can destroy an, umm, Argosy in your space?"
 		word
 			`"`
@@ -296,7 +309,7 @@ phrase "aboagye shipyards advertising"
 	word
 		"Aboagye Shipyards!"
 
-news "aboagye nathaq"
+news "aboagye advertising"
 	name
 		word
 			"Spaceport "
@@ -333,18 +346,6 @@ news "aboagye nathaq"
 			"mover "
 		phrase
 			"aboagye shipyards advertising"
-
-news "aboagye nathas"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
 	message
 		word
 			"Buy "
@@ -371,18 +372,6 @@ news "aboagye nathas"
 			"mover "
 		phrase
 			"aboagye shipyards advertising"
-
-news "aboagye furus"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
 	message
 		word
 			"Buy "
@@ -407,18 +396,6 @@ news "aboagye furus"
 			"annihilator "
 		phrase
 			"aboagye shipyards advertising"
-
-news "aboagye nathar"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
 	message
 		word
 			"Buy "
@@ -445,18 +422,6 @@ news "aboagye nathar"
 			"annihilator "
 		phrase
 			"aboagye shipyards advertising"
-
-news "aboagye duntay"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
 	message
 		word
 			"Buy "
@@ -488,19 +453,7 @@ news "aboagye duntay"
 			"the universe"
 			"space"
 		word
-			.
-
-news "aboagye larajal"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
+			"."
 	message
 		word
 			"Buy "
@@ -524,18 +477,6 @@ news "aboagye larajal"
 			"blower up of hostiles "
 		phrase
 			"aboagye shipyards advertising"
-
-news "aboagye latbaliday"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
 	message
 		word
 			"Buy "
@@ -590,9 +531,10 @@ phrase "resredi shipyards advertising"
 		"galaxy"
 		"cosmos"
 	word
-		.
+		"."
+		"!"
 
-news "resredi yiyharsi"
+news "resredi advertising"
 	name
 		word
 			"Spaceport "
@@ -628,18 +570,6 @@ news "resredi yiyharsi"
 			"the Yiyharsi! "
 		phrase
 			"resredi shipyards advertising"
-
-news "resredi saghir"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
 	message
 		word
 			"Have you ever "
@@ -665,18 +595,6 @@ news "resredi saghir"
 			"the Saghir! "
 		phrase
 			"resredi shipyards advertising"
-
-news "resredi muraw"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
 	message
 		word
 			"Have you ever "
@@ -701,18 +619,6 @@ news "resredi muraw"
 			"the Muraw! "
 		phrase
 			"resredi shipyards advertising"
-
-news "resredi daybal"
-	name
-		word
-			"Spaceport "
-			"Large "
-			"Small "
-			"Advertising "
-		word
-			"Billboard"
-	location
-		government "Jibauni"
 	message
 		word
 			"Have you ever "

data/map planets.txt

@@ -136,12 +136,12 @@ planet Laqualk
 	description `This is the Jibauni seat of government. There are projectors and other strange technology in an order that looks randomly strewn about, but this electronic equipment is really the high-tech apparatus that makes this planet look like the gas giant it isn't. There is one store, and no trading buildings or job buildings. The single job board is in the store in a conspicuous position.`
 	spaceport `There are only a few buildings here, only the amount required to house the government representatives as well as fueling, repairing, and cleaning the few ships that are authorized to land as well as the knowledge. There are almost no spaceport workers, and only a few landing pads, which, however, are in the best of condition.`
 	government Jibauni
-	#"required reputation" 30
-	#security 1
-	#tribute 5600
-	#	threshold 3100
-	#	fleet "Large Jibauni Military" 6
-	#	fleet "Small Jibauni Military" 20
+	"required reputation" 30
+	security 1
+	tribute 5600
+		threshold 3100
+		fleet "Large Jibauni Military" 6
+		fleet "Small Jibauni Military" 20
 
 planet "Mahata Station"
 	attributes diba robot station