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

Cards: use CharacteristicDefining for Alternative Cost for now

Browse Source
This commit is contained in:
Hans Mackowiak
2021-04-13 10:32:16 +02:00
parent c49b4c45c8
commit 29d260db9d
21 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

10
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);
}
}