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

Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

Browse Source
This commit is contained in:
Michael Kamensky
2021-10-28 07:11:01 +03:00
parent 4af9cd9034 0892d6de4a
commit 218c9e4ea1
4 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-ai/src/main/java/forge/ai/ability/DigUntilAi.java
View File

@@ -51,8 +51,8 @@ public class DigUntilAi extends SpellAbilityAi {
// until opponent's end of turn phase! // until opponent's end of turn phase!
// But we still want more (and want to fill grave) if nothing better to do then // But we still want more (and want to fill grave) if nothing better to do then
// This is important for Replenish/Living Death type decks // This is important for Replenish/Living Death type decks
if (!((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)) if (!ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)
&& (!ai.getGame().getPhaseHandler().isPlayerTurn(ai)))) { && !ai.getGame().getPhaseHandler().isPlayerTurn(ai)) {
return false; return false;
} }
} }
@@ -75,7 +75,7 @@ public class DigUntilAi extends SpellAbilityAi {
} }
final String num = sa.getParam("Amount"); final String num = sa.getParam("Amount");
if ((num != null) && num.equals("X") && sa.getSVar(num).equals("Count$xPaid")) { if (num != null && num.equals("X") && sa.getSVar(num).equals("Count$xPaid")) {
// Set PayX here to maximum value. // Set PayX here to maximum value.
SpellAbility root = sa.getRootAbility(); SpellAbility root = sa.getRootAbility();
if (root.getXManaCostPaid() == null) { if (root.getXManaCostPaid() == null) {

67
forge-core/src/main/java/forge/StaticData.java
View File

@@ -165,11 +165,10 @@ public class StaticData {
return this.editions; return this.editions;
} }
public final CardEdition.Collection getCustomEditions(){ public final CardEdition.Collection getCustomEditions() {
return this.customEditions; return this.customEditions;
} }
private List<CardEdition> sortedEditions; private List<CardEdition> sortedEditions;
public final List<CardEdition> getSortedEditions() { public final List<CardEdition> getSortedEditions() {
if (sortedEditions == null) { if (sortedEditions == null) {
@@ -189,13 +188,13 @@ public class StaticData {
} }
private TreeMap<CardEdition.Type, List<CardEdition>> editionsTypeMap; private TreeMap<CardEdition.Type, List<CardEdition>> editionsTypeMap;
public final Map<CardEdition.Type, List<CardEdition>> getEditionsTypeMap(){ public final Map<CardEdition.Type, List<CardEdition>> getEditionsTypeMap() {
if (editionsTypeMap == null){ if (editionsTypeMap == null) {
editionsTypeMap = new TreeMap<>(); editionsTypeMap = new TreeMap<>();
for (CardEdition.Type editionType : CardEdition.Type.values()){ for (CardEdition.Type editionType : CardEdition.Type.values()) {
editionsTypeMap.put(editionType, new ArrayList<>()); editionsTypeMap.put(editionType, new ArrayList<>());
} }
for (CardEdition edition : this.getSortedEditions()){ for (CardEdition edition : this.getSortedEditions()) {
CardEdition.Type key = edition.getType(); CardEdition.Type key = edition.getType();
List<CardEdition> editionsOfType = editionsTypeMap.get(key); List<CardEdition> editionsOfType = editionsTypeMap.get(key);
editionsOfType.add(edition); editionsOfType.add(edition);
@@ -204,9 +203,9 @@ public class StaticData {
return editionsTypeMap; return editionsTypeMap;
} }
public CardEdition getCardEdition(String setCode){ public CardEdition getCardEdition(String setCode) {
CardEdition edition = this.editions.get(setCode); CardEdition edition = this.editions.get(setCode);
if (edition == null) // try custom editions if (edition == null) // try custom editions
edition = this.customEditions.get(setCode); edition = this.customEditions.get(setCode);
return edition; return edition;
} }
@@ -231,8 +230,7 @@ public class StaticData {
public void attemptToLoadCard(String cardName){ public void attemptToLoadCard(String cardName){
this.attemptToLoadCard(cardName, null); this.attemptToLoadCard(cardName, null);
} }
public void attemptToLoadCard(String cardName, String setCode) {
public void attemptToLoadCard(String cardName, String setCode){
CardRules rules = cardReader.attemptToLoadCard(cardName); CardRules rules = cardReader.attemptToLoadCard(cardName);
CardRules customRules = null; CardRules customRules = null;
if (customCardReader != null) { if (customCardReader != null) {
@@ -257,7 +255,7 @@ public class StaticData {
* @param collectorNumber Card's collector Number * @param collectorNumber Card's collector Number
* @return PaperCard instance found in one of the available CardDb databases, or <code>null</code> if not found. * @return PaperCard instance found in one of the available CardDb databases, or <code>null</code> if not found.
*/ */
public PaperCard fetchCard(final String cardName, final String setCode, final String collectorNumber){ public PaperCard fetchCard(final String cardName, final String setCode, final String collectorNumber) {
PaperCard card = null; PaperCard card = null;
for (CardDb db : this.getAvailableDatabases().values()) { for (CardDb db : this.getAvailableDatabases().values()) {
card = db.getCard(cardName, setCode, collectorNumber); card = db.getCard(cardName, setCode, collectorNumber);
@@ -345,7 +343,7 @@ public class StaticData {
return result; return result;
} }
private CardDb matchTargetCardDb(final String cardName){ private CardDb matchTargetCardDb(final String cardName) {
// NOTE: any foil request in cardName is NOT taken into account here. // NOTE: any foil request in cardName is NOT taken into account here.
// It's a private method, so it's a fair assumption. // It's a private method, so it's a fair assumption.
for (CardDb targetDb : this.getAvailableDatabases().values()){ for (CardDb targetDb : this.getAvailableDatabases().values()){
@@ -360,7 +358,7 @@ public class StaticData {
* @param cardName Name of the Card to verify (CASE SENSITIVE) * @param cardName Name of the Card to verify (CASE SENSITIVE)
* @return True if a card with the given input string can be found. False otherwise. * @return True if a card with the given input string can be found. False otherwise.
*/ */
public boolean isMTGCard(final String cardName){ public boolean isMTGCard(final String cardName) {
if (cardName == null || cardName.trim().length() == 0) if (cardName == null || cardName.trim().length() == 0)
return false; return false;
CardDb.CardRequest cr = CardDb.CardRequest.fromString(cardName); // accounts for any foil request ending with + CardDb.CardRequest cr = CardDb.CardRequest.fromString(cardName); // accounts for any foil request ending with +
@@ -450,10 +448,6 @@ public class StaticData {
public Predicate<PaperCard> getBrawlPredicate() { return brawlPredicate; } public Predicate<PaperCard> getBrawlPredicate() { return brawlPredicate; }
public void setFilteredHandsEnabled(boolean filteredHandsEnabled){
this.filteredHandsEnabled = filteredHandsEnabled;
}
/** /**
* Get an alternative card print for the given card wrt. the input setReleaseDate. * Get an alternative card print for the given card wrt. the input setReleaseDate.
* The reference release date will be used to retrieve the alternative art, according * The reference release date will be used to retrieve the alternative art, according
@@ -501,7 +495,7 @@ public class StaticData {
*/ */
public PaperCard getAlternativeCardPrint(PaperCard card, Date setReleaseDate, public PaperCard getAlternativeCardPrint(PaperCard card, Date setReleaseDate,
boolean isCardArtPreferenceLatestArt, boolean isCardArtPreferenceLatestArt,
boolean cardArtPreferenceHasFilter){ boolean cardArtPreferenceHasFilter) {
Date searchReferenceDate = getReferenceDate(setReleaseDate, isCardArtPreferenceLatestArt); Date searchReferenceDate = getReferenceDate(setReleaseDate, isCardArtPreferenceLatestArt);
CardDb.CardArtPreference searchCardArtStrategy = getSearchStrategyForAlternativeCardArt(isCardArtPreferenceLatestArt, CardDb.CardArtPreference searchCardArtStrategy = getSearchStrategyForAlternativeCardArt(isCardArtPreferenceLatestArt,
cardArtPreferenceHasFilter); cardArtPreferenceHasFilter);
@@ -537,7 +531,6 @@ public class StaticData {
public PaperCard getAlternativeCardPrint(PaperCard card, Date setReleaseDate, boolean isCardArtPreferenceLatestArt, public PaperCard getAlternativeCardPrint(PaperCard card, Date setReleaseDate, boolean isCardArtPreferenceLatestArt,
boolean cardArtPreferenceHasFilter, boolean cardArtPreferenceHasFilter,
boolean preferCandidatesFromExpansionSets, boolean preferModernFrame) { boolean preferCandidatesFromExpansionSets, boolean preferModernFrame) {
PaperCard altCard = this.getAlternativeCardPrint(card, setReleaseDate, isCardArtPreferenceLatestArt, PaperCard altCard = this.getAlternativeCardPrint(card, setReleaseDate, isCardArtPreferenceLatestArt,
cardArtPreferenceHasFilter); cardArtPreferenceHasFilter);
if (altCard == null) if (altCard == null)
@@ -618,7 +611,7 @@ public class StaticData {
private PaperCard tryToGetCardPrintFromExpansionSet(PaperCard altCard, private PaperCard tryToGetCardPrintFromExpansionSet(PaperCard altCard,
boolean isCardArtPreferenceLatestArt, boolean isCardArtPreferenceLatestArt,
boolean preferModernFrame){ boolean preferModernFrame) {
CardEdition altCardEdition = editions.get(altCard.getEdition()); CardEdition altCardEdition = editions.get(altCard.getEdition());
if (altCardEdition.getType() == CardEdition.Type.EXPANSION) if (altCardEdition.getType() == CardEdition.Type.EXPANSION)
return null; // Nothing to do here! return null; // Nothing to do here!
@@ -628,7 +621,7 @@ public class StaticData {
CardDb.CardArtPreference searchStrategy = getSearchStrategyForAlternativeCardArt(searchStrategyFlag, CardDb.CardArtPreference searchStrategy = getSearchStrategyForAlternativeCardArt(searchStrategyFlag,
true); true);
PaperCard altCandidate = altCard; PaperCard altCandidate = altCard;
while (altCandidate != null){ while (altCandidate != null) {
Date referenceDate = editions.get(altCandidate.getEdition()).getDate(); Date referenceDate = editions.get(altCandidate.getEdition()).getDate();
altCandidate = this.searchAlternativeCardCandidate(altCandidate, preferModernFrame, altCandidate = this.searchAlternativeCardCandidate(altCandidate, preferModernFrame,
referenceDate, searchStrategy); referenceDate, searchStrategy);
@@ -645,7 +638,7 @@ public class StaticData {
private PaperCard tryToGetCardPrintWithMatchingFrame(PaperCard altCard, private PaperCard tryToGetCardPrintWithMatchingFrame(PaperCard altCard,
boolean isCardArtPreferenceLatestArt, boolean isCardArtPreferenceLatestArt,
boolean cardArtHasFilter, boolean cardArtHasFilter,
boolean preferModernFrame){ boolean preferModernFrame) {
CardEdition altCardEdition = editions.get(altCard.getEdition()); CardEdition altCardEdition = editions.get(altCard.getEdition());
boolean frameIsCompliantAlready = (altCardEdition.isModern() == preferModernFrame); boolean frameIsCompliantAlready = (altCardEdition.isModern() == preferModernFrame);
if (frameIsCompliantAlready) if (frameIsCompliantAlready)
@@ -654,7 +647,7 @@ public class StaticData {
CardDb.CardArtPreference searchStrategy = getSearchStrategyForAlternativeCardArt(searchStrategyFlag, CardDb.CardArtPreference searchStrategy = getSearchStrategyForAlternativeCardArt(searchStrategyFlag,
cardArtHasFilter); cardArtHasFilter);
PaperCard altCandidate = altCard; PaperCard altCandidate = altCard;
while (altCandidate != null){ while (altCandidate != null) {
Date referenceDate = editions.get(altCandidate.getEdition()).getDate(); Date referenceDate = editions.get(altCandidate.getEdition()).getDate();
altCandidate = this.searchAlternativeCardCandidate(altCandidate, preferModernFrame, altCandidate = this.searchAlternativeCardCandidate(altCandidate, preferModernFrame,
referenceDate, searchStrategy); referenceDate, searchStrategy);
@@ -677,7 +670,7 @@ public class StaticData {
* @param card Instance of target <code>PaperCard</code> * @param card Instance of target <code>PaperCard</code>
* @return The number of available arts for the given card in the corresponding set, or 0 if not found. * @return The number of available arts for the given card in the corresponding set, or 0 if not found.
*/ */
public int getCardArtCount(PaperCard card){ public int getCardArtCount(PaperCard card) {
Collection<CardDb> databases = this.getAvailableDatabases().values(); Collection<CardDb> databases = this.getAvailableDatabases().values();
for (CardDb db: databases){ for (CardDb db: databases){
int artCount = db.getArtCount(card.getName(), card.getEdition()); int artCount = db.getArtCount(card.getName(), card.getEdition());
@@ -687,9 +680,12 @@ public class StaticData {
return 0; return 0;
} }
public boolean getFilteredHandsEnabled(){ public boolean getFilteredHandsEnabled() {
return filteredHandsEnabled; return filteredHandsEnabled;
} }
public void setFilteredHandsEnabled(boolean filteredHandsEnabled) {
this.filteredHandsEnabled = filteredHandsEnabled;
}
public void setMulliganRule(MulliganDefs.MulliganRule rule) { public void setMulliganRule(MulliganDefs.MulliganRule rule) {
mulliganRule = rule; mulliganRule = rule;
@@ -699,21 +695,21 @@ public class StaticData {
return mulliganRule; return mulliganRule;
} }
public void setCardArtPreference(boolean latestArt, boolean coreExpansionOnly){ public void setCardArtPreference(boolean latestArt, boolean coreExpansionOnly) {
this.commonCards.setCardArtPreference(latestArt, coreExpansionOnly); this.commonCards.setCardArtPreference(latestArt, coreExpansionOnly);
this.variantCards.setCardArtPreference(latestArt, coreExpansionOnly); this.variantCards.setCardArtPreference(latestArt, coreExpansionOnly);
this.customCards.setCardArtPreference(latestArt, coreExpansionOnly); this.customCards.setCardArtPreference(latestArt, coreExpansionOnly);
} }
public String getCardArtPreferenceName(){ public String getCardArtPreferenceName() {
return this.commonCards.getCardArtPreference().toString(); return this.commonCards.getCardArtPreference().toString();
} }
public CardDb.CardArtPreference getCardArtPreference(){ public CardDb.CardArtPreference getCardArtPreference() {
return this.commonCards.getCardArtPreference(); return this.commonCards.getCardArtPreference();
} }
public CardDb.CardArtPreference getCardArtPreference(boolean latestArt, boolean coreExpansionOnly){ public CardDb.CardArtPreference getCardArtPreference(boolean latestArt, boolean coreExpansionOnly) {
if (latestArt){ if (latestArt){
return coreExpansionOnly ? CardDb.CardArtPreference.LATEST_ART_CORE_EXPANSIONS_REPRINT_ONLY : CardDb.CardArtPreference.LATEST_ART_ALL_EDITIONS; return coreExpansionOnly ? CardDb.CardArtPreference.LATEST_ART_CORE_EXPANSIONS_REPRINT_ONLY : CardDb.CardArtPreference.LATEST_ART_ALL_EDITIONS;
} }
@@ -721,15 +717,15 @@ public class StaticData {
} }
public boolean isCoreExpansionOnlyFilterSet(){ return this.commonCards.getCardArtPreference().filterSets; } public boolean isCoreExpansionOnlyFilterSet() { return this.commonCards.getCardArtPreference().filterSets; }
public boolean cardArtPreferenceIsLatest(){ public boolean cardArtPreferenceIsLatest() {
return this.commonCards.getCardArtPreference().latestFirst; return this.commonCards.getCardArtPreference().latestFirst;
} }
// === MOBILE APP Alternative Methods (using String Labels, not yet localised!!) === // === MOBILE APP Alternative Methods (using String Labels, not yet localised!!) ===
// Note: only used in mobile // Note: only used in mobile
public String[] getCardArtAvailablePreferences(){ public String[] getCardArtAvailablePreferences() {
CardDb.CardArtPreference[] preferences = CardDb.CardArtPreference.values(); CardDb.CardArtPreference[] preferences = CardDb.CardArtPreference.values();
String[] preferences_avails = new String[preferences.length]; String[] preferences_avails = new String[preferences.length];
for (int i = 0; i < preferences.length; i++) for (int i = 0; i < preferences.length; i++)
@@ -745,17 +741,16 @@ public class StaticData {
return label.toString().trim(); return label.toString().trim();
} }
public void setCardArtPreference(String artPreference){ public void setCardArtPreference(String artPreference) {
this.commonCards.setCardArtPreference(artPreference); this.commonCards.setCardArtPreference(artPreference);
this.variantCards.setCardArtPreference(artPreference); this.variantCards.setCardArtPreference(artPreference);
this.customCards.setCardArtPreference(artPreference); this.customCards.setCardArtPreference(artPreference);
} }
// public boolean isEnabledCardArtSmartSelection() {
public boolean isEnabledCardArtSmartSelection(){
return this.enableSmartCardArtSelection; return this.enableSmartCardArtSelection;
} }
public void setEnableSmartCardArtSelection(boolean isEnabled){ public void setEnableSmartCardArtSelection(boolean isEnabled) {
this.enableSmartCardArtSelection = isEnabled; this.enableSmartCardArtSelection = isEnabled;
} }

2
forge-gui/res/cardsfolder/f/fury.txt
View File

@@ -5,5 +5,5 @@ PT:3/3
K:Double Strike K:Double Strike
K:Evoke:ExileFromHand<1/Card.Red+Other/red card> K:Evoke:ExileFromHand<1/Card.Red+Other/red card>
T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 4 damage divided as you choose among any number of target creatures and/or planeswalkers. T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 4 damage divided as you choose among any number of target creatures and/or planeswalkers.
SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker to distribute damage to | NumDmg$ 4 | TargetMin$ 1 | TargetMax$ 4 | DividedAsYouChoose$ 4 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker to distribute damage to | NumDmg$ 4 | TargetMin$ 0 | TargetMax$ 4 | DividedAsYouChoose$ 4
Oracle:Double strike\nWhen Fury enters the battlefield, it deals 4 damage divided as you choose among any number of target creatures and/or planeswalkers.\nEvoke—Exile a red card from your hand. Oracle:Double strike\nWhen Fury enters the battlefield, it deals 4 damage divided as you choose among any number of target creatures and/or planeswalkers.\nEvoke—Exile a red card from your hand.

2
forge-gui/res/cardsfolder/k/kolvori_god_of_kinship_the_ringhart_crest.txt
View File

@@ -14,5 +14,5 @@ ManaCost:1 G
Types:Legendary Artifact Types:Legendary Artifact
K:ETBReplacement:Other:ChooseCT K:ETBReplacement:Other:ChooseCT
SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
A:AB$ Mana | Cost$ T | Produced$ G | RestrictValid$ Creature.ChosenType,Creature.Legendary | SpellDescription$ {T}: Add {G}. Spend this mana only to cast a creature spell of the chosen type or a legendary creature spell. A:AB$ Mana | Cost$ T | Produced$ G | RestrictValid$ Creature.ChosenType,Creature.Legendary | SpellDescription$ Add {G}. Spend this mana only to cast a creature spell of the chosen type or a legendary creature spell.
Oracle:As The Ringhart Crest enters the battlefield, choose a creature type.\n{T}: Add {G}. Spend this mana only to cast a creature spell of the chosen type or a legendary creature spell. Oracle:As The Ringhart Crest enters the battlefield, choose a creature type.\n{T}: Add {G}. Spend this mana only to cast a creature spell of the chosen type or a legendary creature spell.