external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

display locked room, fix nonrotated card panels

Browse Source
This commit is contained in:
Anthony Calosa
2024-10-22 21:38:23 +08:00
parent c5a01eb5d1
commit 1b3e3f7f7c
5 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -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,

2
forge-gui-mobile/src/forge/assets/FSkinImage.java
View File

@@ -220,6 +220,8 @@ public enum FSkinImage implements FSkinImageInterface {
UNKNOWN (FSkinProp.ICO_UNKNOWN),
LOGO (FSkinProp.ICO_LOGO),
CARDART (FSkinProp.ICO_CARDART),
LEFTLOCK (FSkinProp.ICO_LEFTLOCK),
RIGHTLOCK (FSkinProp.ICO_RIGHTLOCK),
FLIPCARD (FSkinProp.ICO_FLIPCARD),
HDFLIPCARD (FSkinProp.ICO_HDFLIPCARD),

34
forge-gui-mobile/src/forge/card/CardRenderer.java
View File

@@ -37,6 +37,7 @@ import forge.assets.FRotatedImage;
import forge.assets.FSkin;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.assets.FSkinImageInterface;
import forge.assets.FTextureRegionImage;
import forge.assets.ImageCache;
@@ -62,6 +63,7 @@ import forge.toolbox.FList;
import static forge.assets.FSkin.getDefaultSkinFile;
public class CardRenderer {
static boolean drawSpiral = false;
public enum CardStackPosition {
Top,
BehindHorz,
@@ -742,6 +744,16 @@ public class CardRenderer {
return;
} //remaining rendering not needed if card is behind another card in a vertical stack
boolean onTop = (pos == CardStackPosition.Top);
if (canShow && ZoneType.Battlefield.equals(card.getZone())) {
//locked room
if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && !CardStateName.Original.equals(details.getState())) {
if (CardStateName.RightSplit.equals(details.getState())) {
g.drawImage(FSkinImage.RIGHTLOCK, cx, cy, cw, ch);
} else if (CardStateName.LeftSplit.equals(details.getState())) {
g.drawImage(FSkinImage.LEFTLOCK, cx, cy, cw, ch);
}
}
}
if (canShow && showCardIdOverlay(card)) {
FSkinFont idFont = FSkinFont.forHeight(h * 0.11f);
@@ -818,7 +830,9 @@ public class CardRenderer {
if (unselectable) {
g.setAlphaComposite(0.6f);
}
boolean drawIcons = false;
if (ZoneType.Battlefield.equals(card.getZone()) && onTop) {
drawIcons = true;
drawAbilityIcons(g, card, cx, cy, cw, ch, cx + ((cw * 2) / 2.3f), cy, cw / 5.5f, cw / 5.7f, showAbilityIcons(card));
} else if (canShow && !ZoneType.Battlefield.equals(card.getZone()) && showAbilityIcons(card)) {
//draw indicator for flash or can be cast at instant speed, enabled if show ability icons is enabled
@@ -870,6 +884,16 @@ public class CardRenderer {
}
}
}
//TODO animate rotation inside shader
Texture spiral = Forge.getAssets().getTexture(getDefaultSkinFile("spiral.png"), false);
if (spiral != null && drawIcons) {
drawSpiral = true;
float newX = card.isTapped() ? cx + cw / 4.5f : cx;
float newY = card.isTapped() ? cy + cw / 4.75f : cy;
g.startRotateTransform(newX + cw / 2f, newY + ch / 2, -(Forge.deltaTime * 16f));
g.drawImage(spiral, newX, newY, cw, ch);
g.endTransform();
}
//reset alpha
g.setAlphaComposite(oldAlpha);
}
@@ -883,15 +907,7 @@ public class CardRenderer {
abiCount += 1;
}
if (card.isSick()) {
Texture spiral = Forge.getAssets().getTexture(getDefaultSkinFile("spiral.png"), false);
if (spiral != null) {
float newX = card.isTapped() ? cx + cw / 4.5f : cx;
float newY = card.isTapped() ? cy + cw / 4.75f : cy;
g.startRotateTransform(newX + cw / 2f, newY + ch / 2, -(Forge.deltaTime * 16f));
g.drawImage(spiral, newX, newY, cw, ch);
g.endTransform();
} else {
//old indicator
if (!drawSpiral) {
CardFaceSymbols.drawSymbol("summonsick", g, abiX, abiY, cw / 4.7f, cw / 4.7f);
abiY += abiSpace + 1.7f;
abiCount += 1;

BIN
forge-gui/res/skins/default/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 574 KiB

After

Width:  |  Height:  |  Size: 581 KiB

2
forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java
View File

@@ -360,6 +360,8 @@ public enum FSkinProp {
ICO_UNKNOWN (new int[] {0, 720, 80, 80}, PropType.ICON),
ICO_LOGO (new int[] {480, 0, 200, 200}, PropType.ICON),
ICO_CARDART (new int[] {0, 1600, 200, 200}, PropType.ICON),
ICO_LEFTLOCK (new int[] {200, 1600, 143, 200}, PropType.ICON),
ICO_RIGHTLOCK (new int[] {343, 1600, 143, 200}, PropType.ICON),
ICO_FLIPCARD (new int[] {400, 0, 80, 120}, PropType.ICON),
ICO_HDFLIPCARD (new int[] {2, 1268, 387, 500}, PropType.BUTTONS),