Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reclassify many ships based on their characteristics relative to other similar ships, rather than based on their size. #95

Open
wants to merge 33 commits into
base: experimental
Choose a base branch
from
Open

Reclassify many ships based on their characteristics relative to other similar ships, rather than based on their size. #95

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
576da85
Human light, medium and heavy warships
Quantumshark Apr 30, 2023
4ad8b94
Update ships.txt
Quantumshark Apr 30, 2023
9c69f68
Korath L, M, H
Quantumshark Apr 30, 2023
5203916
Quarg
Quantumshark Apr 30, 2023
0130676
Wanderers
Quantumshark Apr 30, 2023
1e26902
Hai
Quantumshark Apr 30, 2023
f4277a8
Remnant
Quantumshark Apr 30, 2023
e9b7f5d
Merge branch 'endless-sky:master' into ship-reclassify
Quantumshark May 15, 2023
7d77ba6
Merge branch 'endless-sky:master' into ship-reclassify
Quantumshark Jun 25, 2023
0339909
Merge branch 'endless-sky:master' into ship-reclassify
Quantumshark Jul 17, 2023
0cba22d
Merge branch 'endless-sky:master' into ship-reclassify
Quantumshark Aug 17, 2024
809ade2
Derecho isn't that fast
Quantumshark Aug 17, 2024
80f1c23
Merge branch 'endless-sky:master' into thermal-scanner
TheGiraffe3 Oct 1, 2024
12d5836
Initial draft
TheGiraffe3 Oct 1, 2024
becbe05
Update governments.txt
TheGiraffe3 Oct 1, 2024
25c36ca
Merge branch 'experimental' into thermal-scanner
TheGiraffe3 Oct 1, 2024
30212a8
Add the new Fury
TheGiraffe3 Oct 1, 2024
1a655a8
Merge branch 'experimental' into thermal-scanner
TheGiraffe3 Oct 2, 2024
f39563b
Update campaign events.txt
TheGiraffe3 Oct 2, 2024
63544ce
Update free worlds side plots.txt
TheGiraffe3 Oct 2, 2024
eaf6f0d
I forgot the `on complete` conversation...
TheGiraffe3 Oct 2, 2024
aff7797
Oops
TheGiraffe3 Oct 2, 2024
dc70eec
Remove a quotation mark
TheGiraffe3 Oct 2, 2024
2f941dd
Merge branch 'experimental' into thermal-scanner
TheGiraffe3 Oct 3, 2024
68e7e2b
Merge branch 'endless-sky:master' into ship-reclassify
Quantumshark Oct 3, 2024
46804b4
Probably no need to change the beetle.
Quantumshark Oct 4, 2024
0f1e254
Merge branch 'experimental' into thermal-scanner
Zitchas Oct 5, 2024
6d8262e
Merge branch 'experimental' into thermal-scanner
Zitchas Oct 5, 2024
e3e3950
Merge branch 'experimental' into thermal-scanner
Zitchas Oct 6, 2024
c058009
Oops
TheGiraffe3 Oct 6, 2024
99e2511
feat(data): Add a thermal scanner mission (#90)
Zitchas Oct 6, 2024
b546655
Merge branch 'experimental' into ship-reclassify
Quantumshark Oct 6, 2024
f2d584a
Merge branch 'experimental' into ship-reclassify
Quantumshark Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/hai/hai ships.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ ship "Lightning Bug"
sprite "ship/hai lightning bug"
thumbnail "thumbnail/hai lightning bug"
attributes
category "Light Warship"
category "Medium Warship"
"cost" 3200000
"shields" 6700
"hull" 1700
Expand Down Expand Up @@ -1053,7 +1053,7 @@ ship "Shield Beetle"
sprite "ship/hai shield beetle"
thumbnail "thumbnail/hai shield beetle"
attributes
category "Heavy Warship"
category "Medium Warship"
Quantumshark marked this conversation as resolved.
Show resolved Hide resolved
"cost" 17900000
"shields" 32000
"hull" 9800
Expand Down
16 changes: 8 additions & 8 deletions data/human/ships.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ ship "Bastion"
sprite "ship/bastion"
thumbnail "thumbnail/bastion"
attributes
category "Medium Warship"
category "Heavy Warship"
"cost" 3860000
"shields" 7500
"hull" 4700
Expand Down Expand Up @@ -806,7 +806,7 @@ ship "Bulwark"
sprite "ship/pirate bulwark"
thumbnail "thumbnail/pirate bulwark"
attributes
category "Medium Warship"
category "Heavy Warship"
"cost" 4360000
"shields" 7000
"hull" 5600
Expand Down Expand Up @@ -1208,7 +1208,7 @@ ship "Corvette"
sprite "ship/corvette"
thumbnail "thumbnail/corvette"
attributes
category "Medium Warship"
category "Light Warship"
"cost" 4400000
"shields" 6800
"hull" 800
Expand Down Expand Up @@ -1621,7 +1621,7 @@ ship "Falcon"
sprite "ship/falcon"
thumbnail "thumbnail/falcon"
attributes
category "Heavy Warship"
category "Light Warship"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A Falcon has got a lot of durability for LW.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's relatively fragile compared to similarly sized ships. The decisions made in its design seems to be deliberately leaning towards speed at the expense of toughness, which makes it a 'light warship' in the terms in this PR.

"cost" 10900000
"shields" 12800
"hull" 3700
Expand Down Expand Up @@ -2010,7 +2010,7 @@ ship "Gunboat"
sprite "ship/gunboat"
thumbnail "thumbnail/gunboat"
attributes
category "Light Warship"
category "Medium Warship"
licenses
Navy
"cost" 3200000
Expand Down Expand Up @@ -2629,7 +2629,7 @@ ship "Manta"
sprite "ship/manta"
thumbnail "thumbnail/manta"
attributes
category "Medium Warship"
category "Light Warship"
"cost" 3400000
"shields" 5900
"hull" 1500
Expand Down Expand Up @@ -2722,7 +2722,7 @@ ship "Modified Argosy"
sprite "ship/modified argosy"
thumbnail "thumbnail/modified argosy"
attributes
category "Light Warship"
category "Heavy Warship"
"cost" 1960000
"shields" 4800
"hull" 1900
Expand Down Expand Up @@ -3968,7 +3968,7 @@ ship "Vanguard"
sprite "ship/vanguard"
thumbnail "thumbnail/vanguard"
attributes
category "Heavy Warship"
category "Medium Warship"
"cost" 7200000
"shields" 9800
"hull" 6000
Expand Down
4 changes: 2 additions & 2 deletions data/korath/korath ships.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ ship "'nra'ret"
sprite "ship/-nra-ret"
thumbnail "thumbnail/-nra-ret"
attributes
category "Heavy Warship"
category "Medium Warship"
"cost" 24760000
"shields" 32700
"hull" 9850
Expand Down Expand Up @@ -1800,7 +1800,7 @@ ship "Met Par Tek 53"
sprite "ship/met par tek 53"
thumbnail "thumbnail/met par tek 53"
attributes
category "Light Warship"
category "Medium Warship"
"cost" 14480000
"shields" 15100
"hull" 22200
Expand Down
4 changes: 2 additions & 2 deletions data/quarg/quarg ships.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ship "Quarg Skylark"
sprite "ship/skylark"
thumbnail "thumbnail/skylark"
attributes
category "Heavy Warship"
category "Utility"
"cost" 5900000
"shields" 120000
"hull" 70000
Expand Down Expand Up @@ -69,7 +69,7 @@ ship "Quarg Wardragon"
sprite "ship/wardragon"
thumbnail "thumbnail/wardragon"
attributes
category "Heavy Warship"
category "Light Warship"
"cost" 5900000
"shields" 160000
"hull" 50000
Expand Down
4 changes: 2 additions & 2 deletions data/remnant/remnant ships.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ship "Albatross"
sprite "ship/albatross"
thumbnail "thumbnail/albatross"
attributes
category "Heavy Warship"
category "Medium Warship"
licenses
"Remnant Capital"
cost 20250000
Expand Down Expand Up @@ -1192,7 +1192,7 @@ ship "Peregrine"
"rewind"
thumbnail "thumbnail/peregrine"
attributes
category "Medium Warship"
category "Light Warship"
licenses
"Remnant Capital"
"cost" 41627000
Expand Down
4 changes: 2 additions & 2 deletions data/wanderer/wanderer ships.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ ship "Derecho"
sprite "ship/derecho"
thumbnail "thumbnail/derecho"
attributes
category "Heavy Warship"
category "Medium Warship"
licenses
"Wanderer Military"
"cost" 30500000
Expand Down Expand Up @@ -713,7 +713,7 @@ ship "Winter Gale"
sprite "ship/winter gale"
thumbnail "thumbnail/winter gale"
attributes
category "Light Warship"
category "Medium Warship"
licenses
"Wanderer Military"
"cost" 14100000
Expand Down
Loading