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

Merge branch 'master' into master2

Browse Source
This commit is contained in:
Anthony Calosa
2024-10-07 06:06:05 +08:00
parent 4bb902dc31 4b2640d412
commit eada2c6d4f
303 changed files with 966 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
View File

@@ -198,7 +198,7 @@ public class CardDetailPanel extends SkinnedPanel {
nameCost = name;
} else {
final String manaCost;
if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && card.getZone() != ZoneType.Stack) { //only display current state's mana cost when on stack
if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && card.getZone() != ZoneType.Stack && card.getZone() != ZoneType.Battlefield) { //only display current state's mana cost when on stack
manaCost = card.getLeftSplitState().getManaCost() + " // " + card.getAlternateState().getManaCost();
} else {
manaCost = state.getManaCost().toString();

8
forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java
View File

@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import forge.card.CardRarity;
import forge.card.CardStateName;
import forge.card.mana.ManaCost;
import forge.game.card.CardView;
import forge.game.card.CardView.CardStateView;
@@ -749,8 +750,11 @@ public class FCardImageRenderer {
//draw type
x += padding;
w -= padding;
String typeLine = CardDetailUtil.formatCardType(state, true).replace(" - ", " — ");
drawVerticallyCenteredString(g, typeLine, new Rectangle(x, y, w, h), TYPE_FONT, TYPE_SIZE);
// check for shared type line
if (!state.getType().hasStringType("Room") || state.getState() != CardStateName.RightSplit) {
String typeLine = CardDetailUtil.formatCardType(state, true).replace(" - ", " — ");
drawVerticallyCenteredString(g, typeLine, new Rectangle(x, y, w, h), TYPE_FONT, TYPE_SIZE);
}
}
/**

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

@@ -479,12 +479,15 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
private void displayIconOverlay(final Graphics g, final boolean canShow) {
if (canShow && showCardManaCostOverlay() && cardWidth < 200) {
final boolean showSplitMana = card.isSplitCard();
final boolean showSplitMana = card.isSplitCard() && card.getZone() != ZoneType.Battlefield;
if (!showSplitMana) {
drawManaCost(g, card.getCurrentState().getManaCost(), 0);
} else {
if (!card.isFaceDown()) { // no need to draw mana symbols on face down split cards (e.g. manifested)
PaperCard pc = StaticData.instance().getCommonCards().getCard(card.getName());
PaperCard pc = null;
if (!card.getName().isEmpty()) {
pc = StaticData.instance().getCommonCards().getCard(card.getName());
}
int ofs = pc != null && Card.getCardForUi(pc).hasKeyword(Keyword.AFTERMATH) ? -12 : 12;
drawManaCost(g, card.getLeftSplitState().getManaCost(), ofs);

12
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -727,6 +727,18 @@ public class PlayerControllerForTests extends PlayerController {
return null;
}
@Override
public ICardFace chooseSingleCardFace(SpellAbility sa, List<ICardFace> faces, String message) {
// TODO Auto-generated method stub
return null;
}
@Override
public CardState chooseSingleCardState(SpellAbility sa, List<CardState> states, String message, Map<String, Object> params) {
// TODO Auto-generated method stub
return null;
}
@Override
public Card chooseDungeon(Player player, List<PaperCard> dungeonCards, String message) {
// TODO Auto-generated method stub