Skip to content

Commit a9cd1cc

Browse files
committed
First step of removing the Sheragi
1 parent db97ea9 commit a9cd1cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+5
-3242
lines changed

.github/workflows/ignore-words.txt

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
Diba
22
Hav
33
Jibauni
4-
Nin
5-
Rin
6-
Sheragi
74
fro
85
ore

README.md

+3-13
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
This is a plugin for the free, open-source game Endless Sky (endless-sky.github.io).
44

55
## General Information
6-
This plugin re-adds the Sheragi, and also adds a robotic faction called the Diba and a species named the Jibauni.
7-
8-
I am currently focusing on the Jibauni most, so the Sheragi and Diba are quite lacking in many respects.
6+
This plugin adds a robotic faction called the Diba and a species named the Jibauni.
97

108
The Jibauni mostly use human ship sprites, which I am hoping will change soon (see [Contributing](#Contributing)).
119

1210
You can find the fork of Endless Sky with the Jibauni integrated [here](https://github.com/Alrodel/endless-sky/tree/Jibauni).
1311

1412
## Jibauni
1513

16-
The Jibauni are the only ones to have a resemblance of a storyline right now. They and their non-weapon outfits are mainly based around fuel. They also have slowing damage in their systems.
14+
The Jibauni and their non-weapon outfits are mainly based around fuel. They also have slowing damage in their systems.
1715
I am aiming to make the Jibauni about T1.
1816

1917

@@ -25,15 +23,7 @@ I am aiming for the Diba to be slightly more powerful then humans, but only a bi
2523

2624

2725

28-
## Sheragi
29-
30-
This plugin also re-adds the Sheragi, and uses outfits and ship sprites taken from Petersupes' [Sheragi Rebirth](https://github.com/Petersupes/sheragi-rebirth) plugin (with permission). These Sheragi do not use the Emerald Sword, though they have a less powerful version of it called the Platinum Spear, which does not have a Dragonflame Cannon.
31-
The Sheragi are closer to T1.3, because they focus on _massive_ ships.
32-
33-
34-
3526
## Contributing
3627

3728
I would welcome any help making this plugin. If possible, the things I need most help on are making ship and outfit sprites, preferably with .blend and .gimp files to go along.
38-
I have sprites for the Diba/Sheragi, but not the Jibauni.
39-
It would be nice if they followed a more uniform pattern than they do now.
29+
I have sprites for the Diba but not the Jibauni.

copyright.txt

+1-45
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,3 @@
1-
Files:
2-
images/hardpoint/pulsebeamturrethp*
3-
images/icon/kinetic?spear*
4-
images/icon/sheragibeam*
5-
images/outfit/fissioncore*
6-
images/outfit/fusion?afterburner*
7-
images/outfit/fusion?power?converter*
8-
images/outfit/fusioncore*
9-
images/outfit/kinetic?spear?launcher*
10-
images/outfit/kinetic?spear?rack*
11-
images/outfit/kinetic?spear*
12-
images/outfit/large?fission?drive*
13-
images/outfit/medium?embattery*
14-
images/outfit/medium?sheragi?cooling*
15-
images/outfit/pulsebeam?turret*
16-
images/outfit/pulsebeam*
17-
images/outfit/pwave?cannon*
18-
images/outfit/sheragi?capital*
19-
images/outfit/sheragi?license*
20-
images/outfit/small?fusion?drive*
21-
images/outfit/solar?intake*
22-
images/projectile/kinetic?spear*
23-
images/projectile/pulsebeam*
24-
images/ship/bronzeedge*
25-
images/ship/goldshield*
26-
images/ship/llama*
27-
images/ship/platinumspear*
28-
images/ship/rubyhammer*
29-
images/ship/whitebrand*
30-
images/thumbnail/bronzeedge*
31-
images/thumbnail/goldshield*
32-
images/thumbnail/llama*
33-
images/thumbnail/platinumspear*
34-
images/thumbnail/rubyhammer*
35-
images/thumbnail/whitebrand*
36-
Copyright: Petersupes (https://github.com/Petersupes)
37-
License: CC-BY-SA-4.0
38-
391
Files:
402
images/ship/yankul*
413
images/thumbnail/yankul*
@@ -102,10 +64,4 @@ License: Pixabay Copyright License
10264
Files:
10365
images/land/fields29*
10466
Copyright: photoangel (https://www.freepik.com/author/photoangel)
105-
License: CC0
106-
107-
Files:
108-
sounds/fissiondrive*
109-
sounds/kspear*
110-
Copyright: Optic Delusion
111-
License: CC-BY-SA-3.0
67+
License: CC0

data/for testing.txt

-3
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,8 @@ outfitter "Cheat"
8888
"Rebel Jibauni License"
8989
"Rebel Jibauni Capital License"
9090
"Jihtah Steering"
91-
"Sheragi License"
92-
"Sheragi Capital License"
9391
"Diba License"
9492
"Jump Drive"
95-
"Sheragi Pirate License"
9693
"Hyperdrive"
9794

9895
outfit "Diba License"

data/governments.txt

+1-64
Original file line numberDiff line numberDiff line change
@@ -123,55 +123,9 @@ government "Jibauni (Fueler)"
123123
"attitude toward"
124124
Jibauni -0.01
125125
"Jibauni (Rebel)" -0.01
126-
"Sheragi (Jibauni)" 0.01
127126
"Diba" 0.01
128127
"bribe" 10000
129128

130-
government "Sheragi (Jibauni)"
131-
swizzle 19
132-
"display name" "Sheragi"
133-
color 0.196 0.588 1
134-
"player reputation" 1
135-
"crew attack" 0.5
136-
"crew defense" 3
137-
"attitude toward"
138-
Jibauni -0.01
139-
"Jibauni (Civilian)" -0.01
140-
"Jibauni (Fueler)" 0.01
141-
"Jibauni (Rebel)" -0.01
142-
Diba -0.01
143-
"Sheragi (Pirate)" -0.1
144-
# "travel restrictions"
145-
# system "Sabibal"
146-
# system "Hajay"
147-
# system "Huyya"
148-
# system "Almanhaq"
149-
"bribe" 0.01
150-
"friendly hail" "friendly sheragi military"
151-
"friendly disabled hail" "friendly disabled sheragi military"
152-
"hostile hail" "hostile sheragi military"
153-
"hostile disabled hail" "hostile disabled sheragi military"
154-
155-
government "Sheragi Civilian (Jibauni)"
156-
swizzle 19
157-
"display name" "Sheragi (Civilian)"
158-
color 0.196 0.588 1
159-
"player reputation" 1
160-
"crew attack" 0.5
161-
"crew defense" 3
162-
"attitude toward"
163-
Jibauni -0.01
164-
"Jibauni (Civilian)" -0.01
165-
"Jibauni (Fueler)" 0.01
166-
"Jibauni (Rebel)" -0.01
167-
Diba -0.01
168-
"Sheragi (Pirate)" -0.1
169-
"bribe" 0.02 # wasting their time
170-
"friendly hail" "friendly sheragi civilian"
171-
"friendly disabled hail" "friendly disabled sheragi civilian"
172-
"hostile hail" "hostile sheragi civilian"
173-
"hostile disabled hail" "hostile disabled sheragi civilian"
174-
175129
government Diba
176130
swizzle 22
177131
color 0.882 0.686 0.294
@@ -220,21 +174,4 @@ government "Heliarch (Jibauni)"
220174
"Heliarch" 1
221175
Jibauni -1
222176
"Jibauni (Rebel)" -1
223-
Diba -1
224-
"Sheragi (Jibauni)" -1
225-
"Sheragi Civilian (Jibauni)" -1
226-
"Jibauni (Civilian)" -1
227-
228-
government "Sheragi (Pirate)"
229-
swizzle 19
230-
color 0.275 0.667 0.784
231-
"player reputation" -1000
232-
"crew attack" 0.5
233-
"crew defense" 3
234-
"attitude toward"
235-
Jibauni -0.1
236-
Sheragi -0.1
237-
"Sheragi Civilian (Jibauni)" -0.1
238-
"Jibauni (Civilian)" -0.1
239-
"Jibauni (Rebel)" -0.1
240-
"bribe" 0.05 # unworthy
177+
Diba -1

data/hazards.txt

-8
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,3 @@ hazard "Jibauni Slowing"
2727
"strength" 0.50 0.99
2828
weapon
2929
"slowing damage" 50
30-
31-
hazard "Sheragi Ion"
32-
"duration" 1 100
33-
"strength" 25 99
34-
"system-wide"
35-
# "environmental effect" "ion hazard" 20
36-
weapon
37-
"ion damage" 0.05
File renamed without changes.

0 commit comments

Comments
 (0)