Finish removing mentions of the Sheragi

Author: TheGiraffe3

.gitattributes

@@ -5,6 +5,5 @@ README.md export-ignore
 
 jibaunispace export-ignore
 areajibtrav export-ignore
-sheragispace export-ignore
 allspace export-ignore
 dibaspace export-ignore

data/jibauni/jibauni 0 kanlanmo transport.txt

@@ -224,26 +224,18 @@ mission "Jibauni: Kanlanmo 1"
 	source Taltahard
 	destination Kahbani
 	on offer
-		log "Factions" "Jibauni" `The Jibauni are an alien race accessed by a strange anomaly in a system south of Men. They have been invaded by a species whose name they do not know, and who paint all their ships green. They were fought off, but they have been fighting a rebel faction of their own kind for the past seven hundred years.`
-		log "Factions" "Rebel Jibauni" `The Rebel Jibauni used to fight what were termed the "green invaders," but when those were driven off, they turned on their Jibauni friends, whom they call the Lazies. They have been fighting the normal Jibauni for the past seven hundred years.`
+		log "Factions" "Jibauni" `The Jibauni are an alien race accessed by a strange anomaly in a system south of Men. They have been fighting a rebel faction of their own kind for the past seven hundred years.`
+		log "Factions" "Rebel Jibauni" `The Rebel Jibauni turned on their Jibauni friends, whom they call the Lazies, for some unknown reason. They have been fighting the normal Jibauni for the past seven hundred years.`
 		conversation
 			`When Kanlanmo gets back from his meeting, he finds you already in the cafe. "How is it going, <first>?" he asks. "And how many questions do you have? I have a lot of free time at present, so ask anything you want. But before you do, can I tell you about the Rebel Jibauni?"`
 			choice
 				`	"Sure!"`
-					goto rebeljibauni
 			label rebeljibauni
-			`	He begins, "They have been attacking us for about seven hundred years.. In addition, the part that many of my people feel sorely, is the fact that they call us the Lazies. It all began a hundred years before then. Then an alien species whose name we have no idea of and whose ships are all a greenish color invaded. Do I bore you?"`
-			choice
-				`	"No, this is very interesting."`
-					goto continue
-				`	"I would rather ask my own questions."`
-					goto choice
-			label continue
-			`	"The green strangers built a staton in Kateaza, and made that their base. At first it seemed as if they had overwhelming numbers, but we finally managed to beat them back, and we conquered the Station of Power that they built. but everything there was too big for any Jibauni to ever use. However, the Rebel Jibauni loved fighting. With nothing else to do, they suddenly seceded and found themselves fighting us. The fighting has gone down quite a lot, but it is still bad."`
-			branch suspicion
-				has "joined the free worlds"
+			`	He begins, "They have been attacking us for about seven hundred years. In addition, the part that many of my people feel sorely, is the fact that they call us the Lazies. It all began a hundred years before then, when a leader suddenly declared independance and decided to rebel. Do you have any questions?"`
+				goto realchoice
 			label choice
 			`	After a suitable silence, Kanlanmo again asks, "Do you have any other questions?"`
+			label realchoice
 			choice
 				`	"Why did you want to come here?"`
 					to display
@@ -311,7 +303,7 @@ mission "Jibauni: Kanlanmo 1"
 			action
 				set "jibauni knowledge: dinosaur skulls"
 				log "Factions" "Jibauni" `There used to be other dinosaurs on the Jibauni home planet of Baitoon, which they used to hunt and eat. However, these dinosaurs were transplanted to Owiay, where they thrive on all the vegetation.`
-			`	"Long ago we had petty wars and duels on our home planet of Baitoon. When we discovered how to make vessels capable of spaceflight, we agreed to create our ships in the shape of the skulls of fallen friends. When the green aliens invaded, we quickly discovered that they were excellent warriors. Therefore, our warships designed for nothing but combat are in the shape of dragon skulls, as a testament to our invaders' prowess.`
+			`	"Long ago we had petty wars and duels on our home planet of Baitoon. When we discovered how to make vessels capable of spaceflight, we agreed to create our ships in the shape of the skulls of fallen friends.`
 			`	"The smaller interceptors are the memorials, representing fallen friends. The appearances of non-combat ships are inspired by the skull shapes of dinosaurs we used to hunt."`
 			choice
 				`	"And what happened to those other dinosaurs? Where are they now?"`
@@ -321,13 +313,6 @@ mission "Jibauni: Kanlanmo 1"
 			label dinosaurskullsothers
 			`	"Once we discovered spaceflight, we found that we could no longer treat the other poor dinosaur types who were vegetarians so poorly. Therefore, we moved them all to Owiay, where they thrive to this day."`
 				goto choice
-			label suspicion
-			`	"And," he adds significantly, "your ship is approximately the same color as the other aliens who invaded us."`
-			choice
-				`	"That is because I have joined the Free Worlds, a human government who strives for equal rights."`
-				`	"I have never heard of them. The only green ships I have ever seen belonged to either the Free Worlds, or the Militia, both in my space."`
-			`	"If you say so," sighs Kanlanmo. "I suppose it doesn't really matter. Anyway, your questions?"`
-				goto choice
 			label done
 			`	"Okay. As you have no more questions, I need some help getting to <system>. <planet>, to be precise. Would you take me?"`
 			choice
@@ -528,7 +513,7 @@ mission "Jibauni: Kanlanmo 3"
 			`	"Good! Because do you know what? Every little bit counts, and your fleet is not insignificant."`
 				goto thanksoffer
 			label singleship
-			`	"Thanks. Even if <ship> could not hurt a fly, the Rebel Jibauni would not like the idea of an alien fighting on our side. They were formed, as you know, to stop the Greens."`
+			`	"Thanks. Even if <ship> could not hurt a fly, the Rebel Jibauni would not like the idea of an alien fighting on our side."`
 			label thanksoffer
 			`	"Anyway, thank you for offering to help fight the Rebels. It is very kind of you, a stranger, to fight in our internal conflicts. Now, one more thing. Can you take me back to <planet>? I need to report back to The Leaders."`
 				goto choicetake

data/jibauni/jibauni jobs.txt

@@ -284,13 +284,13 @@ mission "Jibauni Passengers [2]"
 #		"all wormholes"
 #	stopover
 #		distance 2 5
-#		government "Sheragi" "Pirate" "Independent" "Free Worlds" "Republic"
+#		government "Pirate" "Independent" "Free Worlds" "Republic"
 #	stopover
 #		distance 5 8
-#		government "Sheragi" "Pirate" "Independent" "Free Worlds" "Republic"
+#		government "Pirate" "Independent" "Free Worlds" "Republic"
 #	stopover
 #		distance 2 5
-#		government "Diba" "Sheragi" "Pirate" "Independent" "Free Worlds" "Republic"
+#		government "Diba" "Pirate" "Independent" "Free Worlds" "Republic"
 #	on stopover
 #		conversation
 #			`	As your <bunks> passengers get out to stretch their legs and enjoy the scenary, you hear a patrol coming by with inquiring and perhaps angry thoughts."

data/jibauni/jibauni missions.txt

@@ -24,21 +24,6 @@ event "label jibauni space"
 	galaxy "label jibauni"
 		sprite "label/jibauni"
 
-mission "Discovered Alrodel"
-	landing
-	invisible
-	to offer
-		has "event: label diba space"
-		has "event: label jibauni space"
-		has "event: label sheragi space"
-	on offer
-		event "label alrodel"
-		fail
-
-event "label alrodel"
-	galaxy "label alrodel"
-		sprite "label/alrodel"
-
 mission "Jibauni: Ru-win 0"
 	minor
 	name "Ru-win to <planet>"

data/map.txt

@@ -599,11 +599,6 @@ system Kateaza
 			sprite planet/dust3
 			distance 369
 			period 267.942
-	object "Station of Power"
-		sprite planet/sheragistation
-			scale 2
-		distance 3373.643
-		period 450
 
 system Almanhaq
 	pos -1390 535
@@ -1382,19 +1377,11 @@ system Yinkin
 		distance 10239.744
 		period 1970
 
-planet "Station of Power"
-	attributes jibauni "old sheragi"
-	landscape land/sheragistation
-	description `This station is uninhabited, but there is an eerie feeling about it, as if there was a reason it was abandoned. But it seems to be in fully functional condition and apparently only needs a few hard workers to put it right and make it livable.`
-	description `	It was built by the Sheragi long ago, before the Jibauni drove them out of Lalin. The Sheragi presence is still evident, however, because of the hugeness of the station. It is rather spooky.`
-	port
-		description `Not many people or Jibauni are here. Just a sad stillness and a huge emptiness. However, a few Rebels and Normals roam the passageways in peace, because this is important to them.`
-
 planet Kanlil
 	attributes jibauni station tourism
 	landscape land/station13
 	description `As the station for the popular destination of Lamalmuq, this place is quite busy, also selling things that are illegal on that planet, such as Luxury Goods. In fact this is where the main trading of the system happens-in the place where all the passengers have layovers.`
-	description `	This station was built fairly recently, only one hundred years ago. The company which built it, though, Dertoy Enterprises, has gone out of business, and most Jibauni think that the station has been there since the beginning-the same way the Station of Power has been.`
+	description `	This station was built fairly recently, only one hundred years ago. The company which built it, though, Dertoy Enterprises, has gone out of business, and most Jibauni think that the station has been there since the beginning.`
 	spaceport `Quite a few Jibauni are walking around, many with black robes. There also many of the Jibauni who wear the uniforms which here are the mark of being a spaceport employee. There are many ships nearby, and many Jibauni unloading and reloading all aspects of them.`
 	government Jibauni
 	shipyard "Aboagye Basics"
@@ -1499,7 +1486,7 @@ planet Andwerfen
 	attributes capital jibauni "rebel jibauni" "seat of government"
 	landscape land/rocks1
 	description `That this is the place where the Rebels have their government is easy to see, because there are many fortified buildings and bunkers in readiness to shoot any invaders, and the many planetary defenses are very powerful.`
-	description `	The credit for discovering this planet goes to Wahlkin, a Jibauni who had been a peaceful planet-dweller until the Sheragi came. When the war was over, he started exploring, and subsequently started the colony of Andwerfen, which grew into the planet it is today.`
+	description `	The credit for discovering this planet goes to Wahlkin, a Jibauni who had once been a peaceful planet-dweller. Eventually, however, he started exploring, and subsequently started the colony of Andwerfen, which grew into the planet it is today.`
 	description `	Many Jibauni wish that Andwerfen had never been founded.`
 	spaceport `Little is here except for the many armed patrols the Rebel Jibauni keep patrolling the neighborhoods, looking for disruptors of the peace. The Jibauni around you all look frightened, and the number here that must wish to get back to normal Jibauni space must be large.`
 

plugin.txt

@@ -1,8 +1,8 @@
 name "Adding the Jibauni"
-about "This is a plugin that adds an alien species called the Jibauni in the space west of the Coalition. They have the Heliarch coming in to mine asteroids in one of their systems."
-about "During the currently incomplete storyline, they will be invaded by a remake of the Sheragi, and by a robotic faction called the Diba."
+about "This is a plugin that adds an alien species called the Jibauni west of the Coalition."
+about "During the currently incomplete storyline they will be invaded by a robotic faction called the Diba."
 about "Any help would be greatly appreciated!"
-version 0.7
+version 0.8
 authors
 	TheGiraffe3
 dependencies