Skip to content

Commit 19b2116

Browse files
TheGiraffe3TheGiraffe3
committed
Massive expansion
1 parent 525cbf7 commit 19b2116

25 files changed

+1067
-333
lines changed

‎.github/workflows/codespell.exclude

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
description "While swords are seen today as being old curios and commemorative objects, rendered useless when gunpowder became dominant on the battlefield thousands of years ago, this sword is unlike any you have seen before. Despite how heavy it looks, it is remarkably light, and there are inscriptions on the blade itself that don't appear to be like any human language."

‎.github/workflows/error-check.yml

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Error Check
22

33
on: [push, pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
7+
cancel-in-progress: true
8+
59
jobs:
610
test-parse:
711
name: Data Files

‎.github/workflows/spellcheck.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Spellcheck
2+
3+
on: [push, pull_request]
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
spellcheck:
11+
name: Spelling
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
ref: ${{ github.event.pull_request.head.sha }}
17+
show-progress: true
18+
- uses: codespell-project/actions-codespell@master
19+
with:
20+
exclude_file: .github/workflows/codespell.exclude

‎README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
# Rumskib
22

3-
Adds more ships for [Endless Sky](https://github.com/endless-sky/endless-sky): the Cleaver, the Cutlass, and the Tanager.
4-
5-
The Tanager is a better version of the Shuttle, with the sprite made by bene-dictator, while the Cutlass is a piratified Gunboat, made by 1010todd.
6-
7-
I made the Cleaver as a more powerful Sunder made by a different company.
8-
9-
There is cross-plugin compatibility with both [Blended Ships](https://github.com/mOctave/blended-ships) and [DAIS](https://github.com/Daeridanii1/DAIS).
3+
Expansion for Endless Sky.
104

115
Assets can be found [here](https://github.com/TheGiraffe3/homula-rumskib-assets).

‎copyright

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Files:
22
images/ship/cutlass*
3+
images/ship/marauder?behemoth*
34
images/thumbnail/cutlass*
5+
images/thumbnail/marauder?behemoth*
46
Copyright: 1010todd (https://github.com/1010todd)
57
License: CC-BY-SA-4.0
68
Comment: Derived from works by Michael Zahniser (under the same license).
@@ -16,3 +18,9 @@ Files:
1618
images/thumbnail/cleaver*
1719
Copyright: Loymdayddaud (https://github.com/TheGiraffe3)
1820
License: CC-BY-SA-4.0
21+
22+
Files:
23+
images/outfit/sword*
24+
images/star/thorne-zytkow*
25+
Copyright: RisingLeaf
26+
License: CC-BY-SA-4.0

‎data/DAIS-compatibility.txt

-66
This file was deleted.

‎data/cleaver.txt

-96
This file was deleted.

‎data/blended-ships-compatibility.txt ‎data/compatibility missions.txt

+77-25
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# Copyright (c) 2024 by Loymdayddaud
2+
#
3+
# Rumskib is free software: you can redistribute it and/or modify it under the
4+
# terms of the GNU General Public License as published by the Free Software
5+
# Foundation, either version 3 of the License, or (at your option) any later version.
6+
#
7+
# Rumskib is distributed in the hope that it will be useful, but WITHOUT ANY
8+
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
9+
# PARTICULAR PURPOSE. See the GNU General Public License for more details.
10+
111
mission "Rumskib: Blended Ships installed"
212
landing
313
invisible
@@ -98,31 +108,6 @@ event "rumskib: blended ships uninstalled"
98108
"Hare (Pirate)" 2
99109

100110

101-
# Patch for when the Hauler IV and Eyrie were taken out.
102-
mission "Rumskib: Eyrie and Hauler IV Removal"
103-
landing
104-
invisible
105-
non-blocking
106-
on offer
107-
event "rumskib: remove hauler IV and Eyrie"
108-
109-
event "rumskib: remove hauler IV and Eyrie"
110-
fleet "Large Free Worlds"
111-
remove variant
112-
"Eagle"
113-
"Eyrie"
114-
fleet "Large Southern Merchants"
115-
remove variant
116-
"Hauler IV"
117-
"Rawalpindi"
118-
remove variant
119-
"Eagle"
120-
"Hauler IV"
121-
fleet "Large Core Merchants"
122-
remove variant
123-
"Caterpillar"
124-
"Hauler IV"
125-
126111
# This is the bare minimum to cause no errors when Blended Ships is not installed.
127112
ship "Hare"
128113
attributes
@@ -159,3 +144,70 @@ ship "Hare" "Hare (Pirate)"
159144
turret "Anti-Missile Turret"
160145
turret "Laser Turret"
161146
turret "Laser Turret"
147+
148+
mission "Rumskib: DAIS installed"
149+
landing
150+
invisible
151+
non-blocking
152+
repeat
153+
to offer
154+
has "installed plugin: DAIS"
155+
not "event: rumskib: DAIS installed"
156+
on offer
157+
event "rumskib: DAIS installed"
158+
clear "event: rumskib: DAIS uninstalled"
159+
fail
160+
161+
event "rumskib: DAIS installed"
162+
fleet "Small Core Merchants"
163+
add variant
164+
"Hydrargyrum"
165+
"Tanager"
166+
fleet "Large Northern Pirates"
167+
add variant
168+
"Cutlass"
169+
"Lindwurm"
170+
add variant
171+
"Cutlass"
172+
"Lindwurm (Laser)"
173+
add variant
174+
"Cutlass"
175+
"Lindwurm (Missile)"
176+
fleet "Large CCOR"
177+
add variant
178+
"Cutlass"
179+
"Moonbeam"
180+
181+
182+
mission "Rumskib: DAIS uninstalled"
183+
landing
184+
invisible
185+
non-blocking
186+
repeat
187+
to offer
188+
not "installed plugin: DAIS"
189+
has "event: rumskib: DAIS installed"
190+
on offer
191+
event "rumskib: DAIS uninstalled"
192+
clear "event: rumskib: DAIS installed"
193+
fail
194+
195+
event "rumskib: DAIS uninstalled"
196+
fleet "Small Core Merchants"
197+
remove variant
198+
"Hydrargyrum"
199+
"Tanager"
200+
fleet "Large Northern Pirates"
201+
remove variant
202+
"Cutlass"
203+
"Lindwurm"
204+
remove variant
205+
"Cutlass"
206+
"Lindwurm (Laser)"
207+
remove variant
208+
"Cutlass"
209+
"Lindwurm (Missile)"
210+
fleet "Large CCOR"
211+
remove variant
212+
"Cutlass"
213+
"Moonbeam"

0 commit comments

Comments
 (0)