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

Jump to bottom

feat(data): Creating Unclassified and Unclassified Minor Categories #9986

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

feat(data): Creating Unclassified and Unclassified Minor Categories #9986

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c315e45
Creating Unclassified and Unclassified Minor Categories
Zitchas Apr 11, 2024
b20076b
Correcting the Ayym's bays
Zitchas Apr 11, 2024
e225068
Shooting Star
Zitchas Apr 11, 2024
510ad80
Merge branch 'master' into f(d)-UnclassifiedShips
Zitchas Apr 12, 2024
1d120cd
Revert "Shooting Star"
Zitchas Apr 12, 2024
01d7360
Merge branch 'f(d)-UnclassifiedShips' of github.com:Zitchas/endless-s…
Zitchas Apr 12, 2024
a771ccc
Removing an extra space
Zitchas Apr 12, 2024
c253193
Adding a few missing ships
Zitchas Apr 12, 2024
01be3c0
Creating "Game Mechanics" category
Zitchas Apr 14, 2024
4f586b8
Merge branch 'master' into f(d)-UnclassifiedShips
Zitchas Apr 17, 2024
8df6f5d
Commit suggestion by Quantumshark
Zitchas May 5, 2024
209f0ac
Merge branch 'master' into f(d)-UnclassifiedShips
Zitchas May 6, 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
3 changes: 3 additions & 0 deletions data/categories.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ category "ship"
"Superheavy"
"Fighter"
"Drone"
"Unclassified"
"Unclassified Minor"


# Ships of these types can be carried by other ships.
category "bay type"
"Drone"
"Fighter"
"Unclassified Minor"
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
"Unclassified Minor"
"Unclassified "



# Outfits of these types can be bought and sold via the outfitter.
Expand Down
2 changes: 1 addition & 1 deletion data/drak/drak ships.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ship "Archon"
thumbnail "thumbnail/archon"
"never disabled"
attributes
category "Heavy Warship"
category "Unclassified"
"cost" 1000000000
"shields" 4000000
"hull" 1000000
Expand Down
12 changes: 6 additions & 6 deletions data/drak/indigenous.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ship "Subsidurial"
thumbnail "thumbnail/subsidurial"
"never disabled"
attributes
category "Light Freighter"
category "Unclassified"
"hull" 11600
"automaton" 1
"mass" 700
Expand Down Expand Up @@ -68,7 +68,7 @@ ship "Void Sprite"
thumbnail "thumbnail/void sprite adult"
"never disabled"
attributes
category "Medium Warship"
category "Unclassified"
"hull" 9600
"required crew" 4
"bunks" 4
Expand Down Expand Up @@ -125,7 +125,7 @@ ship "Void Sprite" "Void Sprite (Infant)"
thumbnail "thumbnail/void sprite infant"
"never disabled"
attributes
category "Light Warship"
category "Unclassified Minor"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This isn't a carried unit, so should probably be unclassified rather than unclassified minor.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's an infant, which is to say minor, void sprite. Even if there's currently no void sprites that carry it, it still felt appropriate in terms of lore to name it as such.

Copy link
Collaborator

@Saugia Saugia May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Categories are meant to be mechanical terms of a ship's purpose - i.e., utility, heavy warship, etc., - they aren't necessarily a reference to a ship's lore, but to its functionality from a statistical/defined perspective. So in this case, for mechanical consistency, if we are to have a minor tag for unclassified, it makes sense that it should be tied to a difference in function, not lore, which would be the ability to be carried in this case.

In its own example, Unclassified would refer to a lack of ability to properly determine the purpose of the ship or where it falls under, rather than an inability to identify genetic make up, etc..

Copy link
Collaborator

Choose a reason for hiding this comment

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

If unclassified minor is meant to be specifically relative to a ships' (or species') size or growth compared to others, it would make more sense that there is an overall notable amount of lifeforms like this, though I don't think there are enough to warrant that distinction, and ultimately, the minor is necessary because the carriable Jje need to be a separate category anyways.

Otherwise, it makes sense that any non "-ship" would just be Unclassified. It seems odd to have multiple types of "Unclassification" for something that is a result of ambiguity - if we saw to different aliens in real life, say, one large. "old" and large in numbers, and one small and "young", I'd imagine we just call them "aliens", not "alien minor" and "alien"; the minor designation is more a result of a necessary functionality.

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
category "Unclassified Minor"
category "Unclassified"

"hull" 2800
"required crew" 2
"bunks" 2
Expand Down Expand Up @@ -171,7 +171,7 @@ ship "Ember Waste Node"
thumbnail "thumbnail/ember waste node"
"never disabled"
attributes
category "Heavy Warship"
category "Unclassified"
"hull" 19600
"shields" 5000
"required crew" 5
Expand Down Expand Up @@ -229,7 +229,7 @@ ship "Embershade"
rewind
"never disabled"
attributes
category "Light Warship"
category "Unclassified"
"hull" 9600
"required crew" 1
"bunks" 1
Expand Down Expand Up @@ -269,7 +269,7 @@ ship "Embersylph"
"random start frame"
"never disabled"
attributes
category "Light Warship"
category "Unclassified"
"shields" 4400
"hull" 900
"required crew" 1
Expand Down
22 changes: 11 additions & 11 deletions data/iije/iije.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ship "Jje"
swizzle 0
"never disabled"
attributes
category "Fighter"
category "Unclassified Minor"
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
category "Unclassified Minor"
category "Unclassified "

"cost" 0
"hull" 4000
"required crew" 2
Expand Down Expand Up @@ -73,7 +73,7 @@ ship "Ayym"
swizzle 0
"never disabled"
attributes
category "Utility"
category "Unclassified"
"cost" 0
"hull" 6000
"required crew" 4
Expand Down Expand Up @@ -123,31 +123,31 @@ ship "Ayym"
"hit force" 4500
engine 0 0
"steering engine" 0 0
bay "Fighter" -36 40
bay "Unclassified Minor" -36 40
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" -36 40
bay "Unclassified " -36 40

over
angle 60
bay "Fighter" 36 20
bay "Unclassified Minor" 36 20
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" 36 20
bay "Unclassified " 36 20

over
angle -70
bay "Fighter" -16 104
bay "Unclassified Minor" -16 104
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" -16 104
bay "Unclassified " -16 104

over
angle 162
bay "Fighter" -28 66
bay "Unclassified Minor" -28 66
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" -28 66
bay "Unclassified " -28 66

over
angle 68
bay "Fighter" -18 14
bay "Unclassified Minor" -18 14
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" -18 14
bay "Unclassified " -18 14

over
angle 127
bay "Fighter" 35 25
bay "Unclassified Minor" 35 25
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" 35 25
bay "Unclassified " 35 25

over
angle 25
bay "Fighter" 25 70
bay "Unclassified Minor" 25 70
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" 25 70
bay "Unclassified " 25 70

over
angle -120
bay "Fighter" 11 110
bay "Unclassified Minor" 11 110
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" 11 110
bay "Unclassified " 11 110

over
angle 38
bay "Fighter" -36 40
bay "Unclassified Minor" -36 40
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
bay "Unclassified Minor" -36 40
bay "Unclassified " -36 40

over
angle -53
"final explode" "ayym boom"
Expand Down
2 changes: 1 addition & 1 deletion data/persons.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ ship "Ursa Polaris"
plural "Ursa Polaris"
sprite "ship/localworldship"
attributes
category "Heavy Warship"
category "Unclassified"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
category "Unclassified"
category "Utility"

Copy link
Collaborator

Choose a reason for hiding this comment

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

I do agree with this though - the Ursa Polaris isn't the same thing as Becca's asteroid - it is still a ship with a constructed body, even if that's partly with an asteroid. It makes sense it either keeps "Heavy Warship, as it is a ship that battles, or "Utility", if we are considering an Asteroid being a base. It's still a "-ship" either way", so I wouldn't say it's "unclassified".

cost 142857
shields 39000
hull 27000
Expand Down
8 changes: 4 additions & 4 deletions data/vyrmeid/vyrmeid.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ship "Vyrmeid"
swizzle 0
"never disabled"
attributes
"category" "Fighter"
"category" "Unclassified Minor"
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
"category" "Unclassified Minor"
"category" "Unclassified "

"cost" 0
"shields" 0
"hull" 400
Expand Down Expand Up @@ -77,7 +77,7 @@ ship "Vyrmeid" "Vyrmeid (B)"
swizzle 0
"never disabled"
attributes
"category" "Fighter"
"category" "Unclassified Minor"
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
"category" "Unclassified Minor"
"category" "Unclassified "

"cost" 0
"shields" 0
"hull" 1420
Expand Down Expand Up @@ -128,7 +128,7 @@ ship "Vyrmeid" "Vyrmeid (C)"
swizzle 0
"never disabled"
attributes
category "Fighter"
category "Unclassified Minor"
Copy link
Contributor

@ziproot ziproot May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
category "Unclassified Minor"
category "Unclassified "

"cost" 0
"shields" 0
"hull" 860
Expand Down Expand Up @@ -182,7 +182,7 @@ ship "Astral Cetacean"
swizzle 0
"never disabled"
attributes
category "Transport"
category "Unclassified"
"cost" 0
"shields" 0
"hull" 11000
Expand Down
Loading