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

Merge branch 'master' into code-cleanup

Browse Source 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiAttackController.java
#	forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
#	forge-core/src/main/java/forge/item/IPaperCard.java
#	forge-game/src/main/java/forge/game/ForgeScript.java
#	forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
#	forge-game/src/main/java/forge/game/card/CardState.java
#	forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
#	forge-game/src/main/java/forge/game/trigger/Trigger.java
This commit is contained in:
Jetz
2024-09-15 18:11:24 -04:00
parent 1644e7427e b85b6cac6e
commit 8189f134eb
1066 changed files with 6295 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckSetFilter.java
View File

@@ -25,7 +25,9 @@ public class DeckSetFilter extends DeckFormatFilter {
public DeckSetFilter(ItemManager<? super DeckProxy> itemManager0, Collection<String> sets0,
Collection<String> limitedSets0, boolean allowReprints0) {
this(itemManager0, sets0, allowReprints0);
this.limitedSets.addAll(limitedSets0);
if (limitedSets0 != null) {
this.limitedSets.addAll(limitedSets0);
}
}
@Override

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

@@ -203,9 +203,9 @@ public class FCardImageRenderer {
if (card.isSplitCard()) {
boolean needTranslation = !"en-US".equals(FModel.getPreferences().getPref(FPref.UI_LANGUAGE));
final CardStateView leftState = card.getLeftSplitState();
final String leftText = needTranslation ? CardTranslation.getTranslatedOracle(leftState.getName()) : leftState.getOracleText();
final String leftText = needTranslation ? CardTranslation.getTranslatedOracle(leftState) : leftState.getOracleText();
final CardStateView rightState = card.getRightSplitState();
String rightText = needTranslation ? CardTranslation.getTranslatedOracle(rightState.getName()) : rightState.getOracleText();
String rightText = needTranslation ? CardTranslation.getTranslatedOracle(rightState) : rightState.getOracleText();
boolean isAftermath = (rightState.getKeywordKey().contains("Aftermath"));
BufferedImage leftArt = null;
BufferedImage rightArt = null;
@@ -247,9 +247,9 @@ public class FCardImageRenderer {
} else if (card.isFlipCard()) {
boolean needTranslation = !card.isToken() || !(card.getCloneOrigin() == null);
final CardStateView state = card.getState(false);
final String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state.getName(), "") : null);
final String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state) : null);
final CardStateView flipState = card.getState(true);
final String flipText = card.getText(flipState, needTranslation ? CardTranslation.getTranslationTexts(flipState.getName(), "") : null);
final String flipText = card.getText(flipState, needTranslation ? CardTranslation.getTranslationTexts(flipState) : null);
CARD_ART_RATIO = 1.728f;
updateAreaSizes(ratio, ratio);
int heightAdjust = OUTER_BORDER_THICKNESS + PT_SIZE / 2;
@@ -261,16 +261,16 @@ public class FCardImageRenderer {
} else if (card.isAdventureCard()) {
boolean needTranslation = !card.isToken() || !(card.getCloneOrigin() == null);
final CardStateView state = card.getState(false);
final String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state.getName(), "") : null);
final String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state) : null);
final CardStateView advState = card.getState(true);
final String advText = card.getText(advState, needTranslation ? CardTranslation.getTranslationTexts(advState.getName(), "") : null);
final String advText = card.getText(advState, needTranslation ? CardTranslation.getTranslationTexts(advState) : null);
CARD_ART_RATIO = 1.37f;
updateAreaSizes(ratio, ratio);
drawAdvCardImage(g, state, text, advState, advText, width, height, art);
} else {
boolean needTranslation = !card.isToken() || !(card.getCloneOrigin() == null);
final CardStateView state = card.getState(altState);
final String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state.getName(), "") : null);
final String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state) : null);
CARD_ART_RATIO = 1.37f;
if (art != null && Math.abs((float)art.getWidth() / (float)art.getHeight() - CARD_ART_RATIO) > 0.1f) {
CARD_ART_RATIO = (float)art.getWidth() / (float)art.getHeight();

4
forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java
View File

@@ -1268,7 +1268,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
tokenCard = cardToken.getCard();
assertEquals(cardToken.getQuantity(), 2);
assertEquals(tokenCard.getName(), "Counterspell");
assertEquals(tokenCard.getEdition(), "MB2");
assertEquals(tokenCard.getEdition(), "DSC");
assertTrue(cardToken.cardRequestHasNoCode());
}
@@ -1593,7 +1593,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
//assertEquals(cardToken.getTokenSection(), DeckSection.Main); //fix test since signature spell is allowed on commander section
PaperCard tc = cardToken.getCard();
assertEquals(tc.getName(), "Counterspell");
assertEquals(tc.getEdition(), "MB2");
assertEquals(tc.getEdition(), "DSC");
assertTrue(cardToken.cardRequestHasNoCode());
// Setting Original Core