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

add ManaCostShard Map and cleanup Desktop and Mobile #5215

Merged
merged 7 commits into from
May 18, 2024

Conversation

Hanmac
Copy link
Contributor

@Hanmac Hanmac commented May 8, 2024

Closes #5207

First Step in cleaning up the code

This Part is for Desktop

For Mobile, the problem is the extra Enum FSkinImage in between, i need to think about that can be removed/refactored too

@Hanmac Hanmac requested review from Agetian and Northmoc May 9, 2024 15:54
@Hanmac Hanmac changed the title add ManaCostShard Map and cleanup Desktop add ManaCostShard Map and cleanup Desktop and Mobile May 16, 2024
@Agetian
Copy link
Contributor

Agetian commented May 17, 2024

Looks good so far! :)

@Hanmac Hanmac marked this pull request as ready for review May 17, 2024 05:43
Copy link
Contributor

@tool4ever tool4ever left a comment

Choose a reason for hiding this comment

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

I tried to select Ayara, Widow of the Realm in deck editor:

EDT > java.lang.NullPointerException: Cannot invoke "forge.toolbox.FSkin$SkinImage.resize(int, int)" because the return value of "java.util.Map.get(Object)" is null
	at forge.toolbox.CardFaceSymbols.drawSymbol(CardFaceSymbols.java:274)
	at forge.toolbox.imaging.FCardImageRenderer$SymbolPiece.drawCurrent(FCardImageRenderer.java:977)
	at forge.toolbox.imaging.FCardImageRenderer$Paragraph.drawPieces(FCardImageRenderer.java:1086)
	at forge.toolbox.imaging.FCardImageRenderer.drawTextBoxText(FCardImageRenderer.java:1156)
	at forge.toolbox.imaging.FCardImageRenderer.drawTextBox(FCardImageRenderer.java:822)
	at forge.toolbox.imaging.FCardImageRenderer.drawCardStateImage(FCardImageRenderer.java:425)
	at forge.toolbox.imaging.FCardImageRenderer.drawCardImage(FCardImageRenderer.java:279)
	at forge.ImageCache.getOriginalImageInternal(ImageCache.java:310)
	at forge.ImageCache.getOriginalImage(ImageCache.java:158)
	at forge.toolbox.imaging.FImageUtil.getImage(FImageUtil.java:59)
	at forge.gui.CardPicturePanel.getImage(CardPicturePanel.java:136)
	at forge.gui.CardPicturePanel.setImage(CardPicturePanel.java:92)
	at forge.gui.CardPicturePanel.setCard(CardPicturePanel.java:85)
	at forge.screens.match.controllers.CPicture.showCard(CPicture.java:75)
	at forge.screens.match.controllers.CDetailPicture.update(CDetailPicture.java:97)
	at forge.screens.match.controllers.CDetailPicture.showCard(CDetailPicture.java:52)
	at forge.screens.match.controllers.CDetailPicture.showItem(CDetailPicture.java:72)
	at forge.screens.deckeditor.CDeckEditorUI.setCard(CDeckEditorUI.java:100)
	at forge.screens.deckeditor.CDeckEditorUI$7.valueChanged(CDeckEditorUI.java:279)
	at forge.itemmanager.views.ItemView.onSelectionChange(ItemView.java:311)
	at forge.itemmanager.views.ItemListView$ItemTableModel$2.focusGained(ItemListView.java:611)

@Hanmac Hanmac requested a review from tool4ever May 18, 2024 07:25
@Hanmac Hanmac merged commit d384da9 into master May 18, 2024
4 checks passed
@Hanmac Hanmac deleted the manaCostShardIconRework branch May 18, 2024 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ManaCostShard to Image Mapping Rework
3 participants