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

Backport Goob/EE playing card fixes (Goob#1215 and #1311 via EE#1451) #2861

Merged

Conversation

whatston3
Copy link
Contributor

About the PR

Backports Goob#1215 and Goob#1311 via EE#1451.

Many thanks to @RadsammyT and @VMSolidus for the work in improving and cleaning up this feature.

Brings over definitions for Nanotrasen and Syndicate branded cards, decks and boxes, along with an uplink listing. If these are deemed bloat, they can be removed.

Cards in a user's inventory are hidden from the strip menu. The component for this, StripMenuHiddenComponent, seems interesting - it's been namespaced appropriately, and changes to the strip menu have been commented.

Still think that the use key should flip a hand of cards when in-hand as it does for a single one.

Why / Balance

It's nice to backport fixes.

How to test

Very carefully. Play some cards, try to cheat, fail miserably.

Media

The picture below shows the three deck boxes in-game, the fronts and backs of the first few cards of unshuffled decks.
image

Requirements

Breaking changes

Changelog

🆑 RadsammyT and VMSolidus

  • fix: Cards no longer show their face in the strip menu.
  • add: Nanotrasen and Syndicate card decks are available in-game.

@whatston3
Copy link
Contributor Author

Initial testing seems fine, more would be useful.

@whatston3 whatston3 added S: Needs Review This PR is awaiting reviews and removed S: Untriaged labels Feb 5, 2025
@dvir001
Copy link
Contributor

dvir001 commented Feb 5, 2025

Thank you for doing the change log correct and making sure people get credited.

Copy link
Contributor

github-actions bot commented Feb 5, 2025

RSI Diff Bot; head commit 5064204 merging into 9e2cc70
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi

State Old New Status
black_box Modified
black_box_open Modified
nanotrasen_box Modified
nanotrasen_box_open Modified
syndicate_box Modified
syndicate_box_open Modified

Edit: diff updated after 5064204

@dvir001 dvir001 self-requested a review February 5, 2025 18:54
Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

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

The heart of the cards Yogi my boi
image

@dvir001 dvir001 merged commit 2029bd1 into new-frontiers-14:master Feb 5, 2025
15 checks passed
FrontierATC added a commit that referenced this pull request Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants