Skip to content

Improve the data in the first data block of the skylanders figures #11492

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

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Improve the data in the first data block of the skylanders figures #11492

merged 1 commit into from
Jan 31, 2023

Conversation

mandar1jn
Copy link
Contributor

The real Skylanders cards are Mifare 1K classic cards with a 4-byte NUID so this mimics the real cards. The calculation used before could cause duplicate NUIDs very easily.

Added an icon to the Skylanders portal window

@JMC47
Copy link
Contributor

JMC47 commented Jan 25, 2023

@dolphin-emu-bot rebuild

Copy link
Member

@delroth delroth left a comment

Choose a reason for hiding this comment

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

Overall LGTM, please address the linter issue and consider my comment.

@mandar1jn
Copy link
Contributor Author

@deReeperJosh

@deReeperJosh
Copy link
Contributor

@mandar1jn we probably don't want to include the unknown - if it's something like a copyright or a company specific identifier?

@mandar1jn mandar1jn marked this pull request as draft January 27, 2023 21:36
@mandar1jn mandar1jn changed the title Use a real NUID instead of a addition of ID's Improve the data in the first data block of the skylanders figures Jan 29, 2023
@mandar1jn mandar1jn marked this pull request as ready for review January 29, 2023 18:19
@JMC47
Copy link
Contributor

JMC47 commented Jan 30, 2023

@dolphin-emu-bot rebuild

@mandar1jn
Copy link
Contributor Author

@JMC47 it’s impossible that this is caused by my code right?

@delroth
Copy link
Member

delroth commented Jan 30, 2023

These should clear up if you rebase your PR onto latest master.

@mandar1jn
Copy link
Contributor Author

How do I do that?

@AdmiralCurtiss
Copy link
Contributor

Something along the lines of

git fetch upstream
git rebase upstream/master
git push --force-with-lease

* Added NUID
* Added BCC
* Added ATQA
* Added SAK
@mandar1jn
Copy link
Contributor Author

Okay. Should be good now

@@ -521,6 +522,7 @@ const std::map<const std::pair<const u16, const u16>, const char*> list_skylande
SkylanderPortalWindow::SkylanderPortalWindow(QWidget* parent) : QWidget(parent)
{
setWindowTitle(tr("Skylanders Manager"));
setWindowIcon(Resources::GetAppIcon());
Copy link
Member

Choose a reason for hiding this comment

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

In the future please be careful not to include random unrelated changes like this in your commits...

@delroth delroth merged commit 2843cd1 into dolphin-emu:master Jan 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants