More Checks

Author: TheGiraffe3

copyright.txt

@@ -25,7 +25,7 @@ Scythe
 Ferociousfiend on GitHub 
 Jahgir Generator
 Tawasitaq Generator 
-Watsaq Generator 
+Watsaq Energy Generator 
 
 Petersupes on GitHub
 Platinum Spear

data/Jibauni/Jibauni 0 Rebel Jibauni.txt

@@ -58,10 +58,10 @@ mission "Kanlanmo 0"
 						has "event: liberation of Poisonwood"
 					goto knownalphas
 				`	"No, I've never seen one matching the description."`
-					goto notseen
+					goto notseenl
 				`	"Of course. The person who pilots it is an Alpha. Should I tell you what the story behind them is?"`
 					to display
-						has "remembrance day: declined"
+						has "event: liberation of Poisonwood"
 					goto alphas
 			label knownalphas
 			`	"Great. But, let me ask you one question. Did you meet them on friendly terms? Or did you try to destroy their ships?"`
@@ -121,8 +121,8 @@ mission "Kanlanmo 0"
 			`	You pull your sidearm from its holster, but before you can fire it, the anti-ship weaponry of this planet trains fire on your ship. Caught in crossfire, the <ship> immediately explodes, blowing you and everything in it sky high.`
 				die
 			label friendlyalpha
-#			action
-#				set "reputation: Jibauni" -1000
+			action
+				"reputation: Jibauni" = -1000
 			`	"Really? In that case, we must ask you to leave our planet immediately and never come back. Goodbye, and don't let us see your face ever again!"`
 				flee
 	on complete

data/Jibauni/jibauni outfits.txt

@@ -161,7 +161,7 @@ outfit "Jibauni Small Laser"
 		sprite "projectile/jibauni small laser"
 			"frame rate" 1
 		sound "jibauni small laser"
-		"hit effect" "beam laser impact"
+		"hit effect" "beam heavy laser impact"
 		"inaccuracy" .5
 		"velocity" 425
 		"lifetime" 1
@@ -185,7 +185,7 @@ outfit "Jibauni Medium Laser"
 	"gun ports" -1
 	weapon
 		sprite "projectile/jibauni medium laser"
-		"hit effect" "beam laser impact"
+		"hit effect" "beam heavy laser impact"
 		sound "jibauni medium laser"
 		"parallel"
 		"velocity" 650
@@ -245,7 +245,7 @@ outfit "Jibauni Hyperdrive"
 #	description "This cargo expansion is slightly better than the one in human space."
 #	description "	Unfortunately, rearranging the interior of your ship in such a fundamental way tends to interfere with its cooling systems."
 
-outfit "Fuel-leak 10"
+outfit "Fuel-Leak 10"
 	category "Turrets"
 	cost 15000
 	"mass" 8
@@ -254,7 +254,7 @@ outfit "Fuel-leak 10"
 	"outfit space" -8
 	"weapon capacity" -8
 
-outfit "Fuel-leak 25"
+outfit "Fuel-Leak 25"
 	category "Turrets"
 	cost 30000
 	"mass" 20
@@ -263,7 +263,7 @@ outfit "Fuel-leak 25"
 	"outfit space" -20
 	"weapon capacity" -20
 
-outfit "Fuel-leak 50"
+outfit "Fuel-Leak 50"
 	category "Turrets"
 	cost 55000
 	"mass" 45
@@ -276,7 +276,7 @@ outfit "Fuel-leak 50"
 	licenses
 		"Jibauni Rebel Fighter"
 
-outfit "Fuel-leak 100"
+outfit "Fuel-Leak 100"
 	category "Turrets"
 	cost 110000
 	"mass" 70
@@ -290,7 +290,7 @@ outfit "Fuel-leak 100"
 	licenses
 		"Jibauni Rebel Fighter"
 
-outfit "Fuel-leak All"
+outfit "Fuel-Leak All"
 	category "Guns"
 	cost 990000
 	"mass" 130
@@ -481,7 +481,7 @@ outfit "Zarhal Laser Turret"
 		sound "zarhal turret"
 		sprite "projectile/jibauni medium laser"
 		"inaccuracy" 2
-		"hit effect" "laser impact"
+		"hit effect" "heavy laser impact"
 		"turret turn" 2
 		"reload" 1
 		"firing energy" 1
@@ -504,7 +504,7 @@ outfit "Zarwal Laser Turret"
 	weapon
 		sound "zarwal turret"
 		sprite "projectile/jibauni small laser"
-		"hit effect" "laser impact"
+		"hit effect" "heavy laser impact"
 		"inaccuracy" 2
 		"turret turn" 2.5
 		"reload" 1

data/Jibauni/jibauni phrases.txt

@@ -438,7 +438,6 @@ phrase "friendly disabled jibauni military"
 phrase "hostile jibauni military"
 	phrase
 		"hostile jibauni"
-		"hostile jibauni military"
 
 phrase "hostile jibauni"
 	word

data/Jibauni/jibauni ships.txt

@@ -151,7 +151,7 @@ ship "Latbaliday"
 	explode "tiny explosion" 1
 	explode "small explosion" 1
 	explode "medium explosion" 50
-	"final explode" "final explosion tiny"
+	"final explode" "final explosion small"
 	description "Made to hammer away at enemies without a distraction, the Latbaliday has high shields and hull, but only minimum potential as a weapon bearer."
 	description "	Fighters do not come equipped with a hyperdrive. You cannot carry a fighter unless you have a ship in your fleet with a fighter bay."
 
@@ -830,7 +830,7 @@ ship "Safinat"
 		"jibauni generator" 12
 		"fuel protection" .65
 		licenses
-			"Jibauni Government"
+			"Jibauni Government Helper"
 		weapon
 			"blast radius" 300
 			"shield damage" 3000
@@ -916,4 +916,4 @@ ship "Osra"
 	leak "flame" 50 80
 	leak "big leak" 90 30
 	explode "tiny explosion" 30
-	"final explode" "final explosion tiny"
+	"final explode" "final explosion small"

data/Jibauni/jibauni variants.txt

@@ -65,7 +65,7 @@ ship "Nathaq" "Nathaq (More Fuel)"
 
 ship "Quyan" "Quyan (Inter-system)"
 	outfits
-		"Watsaq Generator"
+		"Watsaq Energy Generator"
 		"Eimlaq Engines"
 		"Large Bunk Room"
 		"Small Bunk Room"

data/governments.txt

@@ -57,15 +57,15 @@ government "Jibauni (Ruler)"
 	"penalty for"
 		assist 0
 	"bribe" 0.05 # for daring to attack them
-	"friendly hail" "friendly jibauni civilian"
-	"friendly disabled hail" "friendly disabled jibauni civilian"
+	"friendly hail" "friendly Jibauni (Civilian)"
+	"friendly disabled hail" "friendly disabled Jibauni (Civilian)"
 	"hostile hail" "hostile jibauni"
 	"hostile disabled hail" "hostile disabled jibauni"
 
 government "Jibauni (Civilian)"
 	color "governments: Jibauni" 0 0.353 0
 	swizzle 20
-	"display name" "Jibauni Civilian"
+	"display name" "Jibauni (Civilian)"
 	"player reputation" 10
 	"crew attack" 3
 	"crew defense" 0.5
@@ -80,8 +80,8 @@ government "Jibauni (Civilian)"
 		capture 5
 		destroy 10
 	"bribe" 0.02
-	"friendly hail" "friendly jibauni civilian"
-	"friendly disabled hail" "friendly disabled jibauni civilian"
+	"friendly hail" "friendly Jibauni (Civilian)"
+	"friendly disabled hail" "friendly disabled Jibauni (Civilian)"
 	"hostile hail" "hostile jibauni"
 	"hostile disabled hail" "hostile disabled jibauni"
 
@@ -222,8 +222,8 @@ government "Heliarch (Jibauni)"
 		"Rebel Jibauni" -1
 		Diba -1
 		"Sheragi (Jibauni)" -1
-		"Sheragi Civilians (Jibauni)" -1
-		"Jibauni Civilians" -1
+		"Sheragi Civilian (Jibauni)" -1
+		"Jibauni (Civilian)" -1
 
 government "Sheragi (Pirate)"
 	swizzle 19
@@ -235,6 +235,6 @@ government "Sheragi (Pirate)"
 		Jibauni -0.1
 		Sheragi -0.1
 		"Sheragi Civilian (Jibauni)" -0.1
-		"Jibauni Civilian" -0.1
+		"Jibauni (Civilian)" -0.1
 		"Rebel Jibauni" -0.1
 	"bribe" 0.05 # unworthy