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.

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

feat(content): Separate the Kestrel from "Tarazed Advanced" shipyard #10063

Merged
merged 5 commits into from
May 18, 2024

Conversation

Saugia
Copy link
Collaborator

@Saugia Saugia commented May 14, 2024

Content (Artwork / Missions / Jobs)

Summary

In #7719, the "Tarazed Advanced" shipyard was added to Zug through an event to implicate the FW's acquisition of more advanced ships for their fleets during the war. However, the Kestrel Easter Egg ship is also found in this shipyard. From my understanding, "Tarazed Advanced" was originally meant to be only found on Tarazed. Now that it is on Zug, the Kestrel can be sold there too.

As an easter egg, the encounter and mission series the player has with the Kestrel is intended to be directed at the player as a player (specifically through this individual on Tarazed), not necessarily the player as a "special" pilot within the universe of ES. The Kestrel being sold at Zug can be confusing and seem odd as it implies the FW has means of production for it.

This PR gives the Kestrel its own unique shipyard on Tarazed, separating it from Tarazed Advanced so it isn't randomly sold on Zug. I haven't included a patch for this for saves with the events already established, but I could.

Testing Done

None yet, will do soon.

Save File

This save file can be used to test these changes:
Soon.

@Saugia Saugia added the content A suggestion for new content that doesn't require code changes label May 14, 2024
@Saugia Saugia changed the title feat(content): Separate the Kestrel from Tarazed Advanced feat(content): Separate the Kestrel from "Tarazed Advanced" shipyard May 14, 2024
@bene-dictator
Copy link
Member

bene-dictator commented May 14, 2024

I haven't included a patch for this for saves with the events already established, but I could.

You should, because I think shipyards don't keep ship that have been removed from their sales (i.e. they update to whatever they find in the data files), and on old saves Wayfarer won't be able to sell Kestrels because they've been removed from Tarazed Advanced but planets haven't been updated to include Kestrel.

Something like this (typing on phone so there are no tabulations and there may be some mistakes):

mission "Kestrel Sales Patch"
  invisible
  landing
  to offer
    has "kestrel available"

  on offer
    event "kestrel sales patch"
    fail


event "kestrel sales patch"
  planet Wayfarer
    add shipyard "Kestrel"

@Amazinite
Copy link
Collaborator

I don't believe this removes the Kestrel from Tarazed Advanced for existing save files. The save file will still contain the event that added the Kestrel to Tarazed Advanced in the first place.

@bene-dictator
Copy link
Member

Ah, okay.

@Quantumshark
Copy link
Collaborator

event "kestrel sales patch"
  planet Wayfarer
    add shipyard "Kestrel"
  shipyard "Tarazed Advanced"
    remove "Kestrel (More Weapons)"
    remove "Kestrel (More Enginess)"
    remove "Kestrel (More Shields)"
    remove "Kestrel (More Bays)"

Would fix that, if implemented alongside the rest of Bene's suggestion.

@Saugia
Copy link
Collaborator Author

Saugia commented May 15, 2024

Added the above suggestions from bene/doom. Still haven't tested yet though.

Comment on lines 280 to 298
# Remove the Kestrel from Tarazed Advanced for saves that obtained it prior to 0.10.7.

mission "Kestrel Sales Patch'
invisible
landing
to offer
has "kestrel available"
on offer
event "kestrel sales patch"
fail

event "kestrel sales patch"
planet Wayfarer
add shipyard "Kestrel"
shipyard "Tarazed Advanced"
remove "Kestrel (More Weapons)"
remove "Kestrel (More Enginess)"
remove "Kestrel (More Shields)"
remove "Kestrel (More Bays)"
Copy link
Contributor

Choose a reason for hiding this comment

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

On an older save file, the shipyard "Kestrel" is going to be empty, so this removes it from the shipyard that it was present in and then adds an empty shipyard to Wayfarer, so the Kestrel is now not available.

I'm not sure it's really a huge problem if older save files have the Kestrel available at Zug, but if that is something you want to change, you're going to need four missions and four events: one to add each variant to the "Kestrel" shipyard based on which variant was previously unlcoked.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I say just let old saves have the extra Kestrel.

See PR comments.
@Amazinite
Copy link
Collaborator

So what we waiting on? 👀

@Saugia
Copy link
Collaborator Author

Saugia commented May 18, 2024

Testing. If you think it works it works. /shrug

@Saugia Saugia marked this pull request as ready for review May 18, 2024 01:29
data/human/kestrel.txt Outdated Show resolved Hide resolved
data/human/kestrel.txt Outdated Show resolved Hide resolved
data/human/kestrel.txt Outdated Show resolved Hide resolved
Co-authored-by: Quantumshark <thedup.adg@gmail.com>
@Quantumshark Quantumshark merged commit 7667f76 into endless-sky:master May 18, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
content A suggestion for new content that doesn't require code changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants