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

Merge branch 'coremaster' into historicLDA

Browse Source 
# Conflicts:
#	forge-gui/res/formats/Sanctioned/Historic.txt
This commit is contained in:
austinio7116
2021-04-14 19:09:01 +01:00
parent d7dfad1fe8 0fd2ec58be
commit 529fc42b72
64 changed files with 531 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/StaticEffect.java
View File

@@ -255,7 +255,7 @@ public class StaticEffect {
}
// remove abilities
if (hasParam("AddAbility") || hasParam("GainsAbilitiesOf") || hasParam("GainsAbilitiesDefined")
if (hasParam("AddAbility") || hasParam("GainsAbilitiesOf") || hasParam("GainsAbilitiesOfDefined")
|| hasParam("AddTrigger") || hasParam("AddStaticAbility") || hasParam("AddReplacementEffects")
|| hasParam("RemoveAllAbilities") || hasParam("RemoveLandTypes")) {
affectedCard.removeChangedCardTraits(getTimestamp());

4
forge-game/src/main/java/forge/game/cost/CostExile.java
View File

@@ -141,7 +141,9 @@ public class CostExile extends CostPartWithList {
return list.contains(source);
}
list = CardLists.getValidCards(list, type.split(";"), payer, source, ability);
if (!type.contains("X")) {
list = CardLists.getValidCards(list, type.split(";"), payer, source, ability);
}
final Integer amount = this.convertAmount();
if ((amount != null) && (list.size() < amount)) {

4
forge-game/src/main/java/forge/game/staticability/StaticAbility.java
View File

@@ -162,7 +162,7 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
layers.add(StaticAbilityLayer.COLOR);
}
if (hasParam("RemoveAllAbilities") || hasParam("GainsAbilitiesOf") || hasParam("GainsAbilitiesDefined")) {
if (hasParam("RemoveAllAbilities") || hasParam("GainsAbilitiesOf") || hasParam("GainsAbilitiesOfDefined")) {
layers.add(StaticAbilityLayer.ABILITIES);
}
@@ -514,7 +514,7 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
return false;
}
}
} else {
} else if (!hasParam("CharacteristicDefining")) {
if (!getHostCard().isInZone(ZoneType.Battlefield)) { // default
return false;
}

40
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -168,7 +168,7 @@ public final class StaticAbilityContinuous {
if (layer == StaticAbilityLayer.TEXT && params.containsKey("GainTextOf")) {
final String valid = params.get("GainTextOf");
CardCollection allValid = CardLists.getValidCards(game.getCardsInGame(), valid, hostCard.getController(), hostCard, null);
CardCollection allValid = CardLists.getValidCards(game.getCardsInGame(), valid, hostCard.getController(), hostCard, stAb);
if (allValid.size() > 1) {
// TODO: if ever necessary, support gaining text of multiple cards at the same time
System.err.println("Error: GainTextOf parameter was not defined as a unique card for " + hostCard);
@@ -271,7 +271,7 @@ public final class StaticAbilityContinuous {
String keywordDefined = params.get("KeywordDefined");
CardCollectionView definedCards = game.getCardsIn(ZoneType.Battlefield);
definedCards = CardLists.getValidCards(definedCards, keywordDefined, hostCard.getController(),
hostCard, null);
hostCard, stAb);
for (Card c : definedCards) {
final int cmc = c.getCMC();
String y = (input.replace(" from EachCMCAmongDefined", ":Card.cmcEQ"
@@ -504,7 +504,7 @@ public final class StaticAbilityContinuous {
if ("True".equals(look)) {
look = "You";
}
mayLookAt = AbilityUtils.getDefinedPlayers(hostCard, look, null);
mayLookAt = AbilityUtils.getDefinedPlayers(hostCard, look, stAb);
}
if (params.containsKey("MayPlay")) {
controllerMayPlay = true;
@@ -567,7 +567,7 @@ public final class StaticAbilityContinuous {
}
}
if (params.containsKey("ControlOpponentsSearchingLibrary")) {
Player cntl = Iterables.getFirst(AbilityUtils.getDefinedPlayers(hostCard, params.get("ControlOpponentsSearchingLibrary"), null), null);
Player cntl = Iterables.getFirst(AbilityUtils.getDefinedPlayers(hostCard, params.get("ControlOpponentsSearchingLibrary"), stAb), null);
p.addControlledWhileSearching(se.getTimestamp(), cntl);
}
@@ -941,7 +941,7 @@ public final class StaticAbilityContinuous {
final String[] strngs = params.get("Affected").split(",");
for (Player p : controller.getGame().getPlayersInTurnOrder()) {
if (p.isValid(strngs, controller, hostCard, null)) {
if (p.isValid(strngs, controller, hostCard, stAb)) {
players.add(p);
}
}
@@ -951,12 +951,11 @@ public final class StaticAbilityContinuous {
}
private static CardCollectionView getAffectedCards(final StaticAbility stAb, final CardCollectionView preList) {
final Map<String, String> params = stAb.getMapParams();
final Card hostCard = stAb.getHostCard();
final Game game = hostCard.getGame();
final Player controller = hostCard.getController();
if (params.containsKey("CharacteristicDefining")) {
if (stAb.hasParam("CharacteristicDefining")) {
return new CardCollection(hostCard); // will always be the card itself
}
@@ -966,37 +965,24 @@ public final class StaticAbilityContinuous {
// add preList in addition to the normal affected cards
// need to add before game cards to have preference over them
if (!preList.isEmpty()) {
if (params.containsKey("AffectedZone")) {
if (stAb.hasParam("AffectedZone")) {
affectedCards.addAll(CardLists.filter(preList, CardPredicates.inZone(
ZoneType.listValueOf(params.get("AffectedZone")))));
ZoneType.listValueOf(stAb.getParam("AffectedZone")))));
} else {
affectedCards.addAll(CardLists.filter(preList, CardPredicates.inZone(ZoneType.Battlefield)));
}
}
if (params.containsKey("AffectedZone")) {
affectedCards.addAll(game.getCardsIn(ZoneType.listValueOf(params.get("AffectedZone"))));
if (stAb.hasParam("AffectedZone")) {
affectedCards.addAll(game.getCardsIn(ZoneType.listValueOf(stAb.getParam("AffectedZone"))));
} else {
affectedCards.addAll(game.getCardsIn(ZoneType.Battlefield));
}
if (params.containsKey("Affected") && !params.get("Affected").contains(",")) {
if (params.get("Affected").contains("Self")) {
affectedCards = new CardCollection(hostCard);
} else if (params.get("Affected").contains("EnchantedBy")) {
affectedCards = new CardCollection(hostCard.getEnchantingCard());
} else if (params.get("Affected").contains("EquippedBy")) {
affectedCards = new CardCollection(hostCard.getEquipping());
} else if (params.get("Affected").equals("EffectSource")) {
affectedCards = new CardCollection(AbilityUtils.getDefinedCards(hostCard, params.get("Affected"), null));
return affectedCards;
}
if (stAb.hasParam("Affected")) {
affectedCards = CardLists.getValidCards(affectedCards, stAb.getParam("Affected").split(","), controller, hostCard, stAb);
}
if (params.containsKey("Affected")) {
affectedCards = CardLists.getValidCards(affectedCards, params.get("Affected").split(","), controller, hostCard, null);
}
affectedCards.removeAll((List<?>) stAb.getIgnoreEffectCards());
affectedCards.removeAll(stAb.getIgnoreEffectCards());
return affectedCards;
}
}