mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 18:58:00 +00:00
display locked room, fix nonrotated card panels
This commit is contained in:
@@ -48,6 +48,7 @@ import javax.swing.SwingUtilities;
|
||||
import forge.CachedCardImage;
|
||||
import forge.StaticData;
|
||||
import forge.card.CardEdition;
|
||||
import forge.card.CardStateName;
|
||||
import forge.card.mana.ManaCost;
|
||||
import forge.game.card.Card;
|
||||
import forge.game.card.CardView;
|
||||
@@ -62,9 +63,11 @@ import forge.item.PaperCard;
|
||||
import forge.localinstance.properties.ForgeConstants;
|
||||
import forge.localinstance.properties.ForgeConstants.CounterDisplayType;
|
||||
import forge.localinstance.properties.ForgePreferences.FPref;
|
||||
import forge.localinstance.skin.FSkinProp;
|
||||
import forge.model.FModel;
|
||||
import forge.screens.match.CMatchUI;
|
||||
import forge.toolbox.CardFaceSymbols;
|
||||
import forge.toolbox.FSkin;
|
||||
import forge.toolbox.FSkin.SkinnedPanel;
|
||||
import forge.toolbox.IDisposable;
|
||||
import forge.util.CardTranslation;
|
||||
@@ -365,6 +368,17 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
|
||||
}
|
||||
|
||||
final boolean canShow = matchUI.mayView(card);
|
||||
if (canShow && ZoneType.Battlefield.equals(card.getZone())) {
|
||||
CardStateView cardStateView = card.getCurrentState();
|
||||
if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && !CardStateName.Original.equals(cardStateView.getState())) {
|
||||
if (CardStateName.RightSplit.equals(cardStateView.getState())) {
|
||||
FSkin.drawImage(g, FSkin.getIcon(FSkinProp.ICO_RIGHTLOCK), cardXOffset, cardYOffset, cardWidth, cardHeight);
|
||||
} else if (CardStateName.LeftSplit.equals(cardStateView.getState())) {
|
||||
FSkin.drawImage(g, FSkin.getIcon(FSkinProp.ICO_LEFTLOCK), cardXOffset, cardYOffset, cardWidth, cardHeight);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
displayIconOverlay(g, canShow);
|
||||
if (canShow) {
|
||||
drawFoilEffect(g, card, cardXOffset, cardYOffset,
|
||||
|
||||
Reference in New Issue
Block a user