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

Merge branch 'fixflash' into 'master'

Browse Source 
[Desktop] Fix flash icon being shown from opponents hidden hand

See merge request core-developers/forge!3875
This commit is contained in:
Michael Kamensky
2021-02-17 04:10:47 +00:00
parent 7445374841 4b25332a9d
commit e28df0a723
1 changed files with 172 additions and 170 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

@@ -518,7 +518,8 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
int abiSpace = (cardWidth / 7);
int abiY = cardWidth < 200 ? cardYOffset + 25 : cardYOffset + 50;
hasFlash = false;
if (ZoneType.Battlefield.equals(card.getZone()) && showAbilityIcons()){
if (showAbilityIcons()) {
if (ZoneType.Battlefield.equals(card.getZone())) {
if (card.isCommander()) {
CardFaceSymbols.drawAbilitySymbol("commander", g, abiX, abiY, abiScale, abiScale);
abiY += abiSpace;
@@ -695,14 +696,15 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
abiY += abiSpace;
}
}
} else if (!ZoneType.Battlefield.equals(card.getZone()) && showAbilityIcons()){
}
else {
String keywordKey = card.getCurrentState().getKeywordKey();
String abilityText = card.getCurrentState().getAbilityText();
if ((keywordKey.indexOf("Flash") != -1)
if (((keywordKey.indexOf("Flashback") == -1)
&& (keywordKey.indexOf("Flash") != -1))
|| ((abilityText.indexOf("May be played by") != -1)
&& (abilityText.indexOf("and as though it has flash") != -1))){
if (keywordKey.indexOf("Flashback") == -1) {
hasFlash = !card.isFaceDown() && (!ZoneType.Library.equals(card.getZone()) || matchUI.mayView(card));
&& (abilityText.indexOf("and as though it has flash") != -1))) {
hasFlash = !card.isFaceDown() && ((!ZoneType.Library.equals(card.getZone()) && !ZoneType.Hand.equals(card.getZone())) || matchUI.mayView(card));
if (hasFlash) {
CardFaceSymbols.drawAbilitySymbol("flash", g, cardXOffset + (cardWidth / 2) + (cardWidth / 3), cardWidth < 200 ? cardYOffset + 25 : cardYOffset + 50, cardWidth / 7, cardWidth / 7);
}