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

SpellAbility: fix MaxTotalTargetCMC

Browse Source
This commit is contained in:
Hans Mackowiak
2020-04-13 11:57:43 +00:00
committed by Michael Kamensky
parent fdd009908d
commit f3729d0059
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -32,6 +32,7 @@ import forge.game.card.CardCollection;
import forge.game.card.CardCollectionView; import forge.game.card.CardCollectionView;
import forge.game.card.CardDamageMap; import forge.game.card.CardDamageMap;
import forge.game.card.CardFactory; import forge.game.card.CardFactory;
import forge.game.card.CardPredicates;
import forge.game.card.CardZoneTable; import forge.game.card.CardZoneTable;
import forge.game.cost.Cost; import forge.game.cost.Cost;
import forge.game.cost.CostPart; import forge.game.cost.CostPart;
@@ -46,6 +47,7 @@ import forge.game.trigger.Trigger;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.trigger.WrappedAbility; import forge.game.trigger.WrappedAbility;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.Aggregates;
import forge.util.Expressions; import forge.util.Expressions;
import forge.util.TextUtil; import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -1099,8 +1101,14 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
} }
if (hasParam("MaxTotalTargetCMC") && entity instanceof Card) { if (hasParam("MaxTotalTargetCMC") && entity instanceof Card) {
final Card c = (Card) entity; int soFar = Aggregates.sum(getTargets().getTargetCards(), CardPredicates.Accessors.fnGetCmc);
if (c.getCMC() > tr.getMaxTotalCMC(c, this)) { // only add if it isn't already targeting
if (!isTargeting(entity)) {
final Card c = (Card) entity;
soFar += c.getCMC();
}
if (soFar > tr.getMaxTotalCMC(getHostCard(), this)) {
return false; return false;
} }
} }

26
forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
View File

@@ -6,6 +6,7 @@ import forge.game.GameEntity;
import forge.game.GameObject; import forge.game.GameObject;
import forge.game.ability.ApiType; import forge.game.ability.ApiType;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CardPredicates;
import forge.game.card.CardView; import forge.game.card.CardView;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
@@ -16,6 +17,7 @@ import forge.player.PlayerZoneUpdate;
import forge.player.PlayerZoneUpdates; import forge.player.PlayerZoneUpdates;
import forge.properties.ForgeConstants; import forge.properties.ForgeConstants;
import forge.properties.ForgePreferences; import forge.properties.ForgePreferences;
import forge.util.Aggregates;
import forge.util.ITriggerEvent; import forge.util.ITriggerEvent;
import forge.util.TextUtil; import forge.util.TextUtil;
@@ -148,6 +150,9 @@ public final class InputSelectTargets extends InputSyncronizedBase {
return false; return false;
} }
// TODO should use sa.canTarget(card) instead?
// it doesn't have messages
//If the card is not a valid target //If the card is not a valid target
if (!card.canBeTargetedBy(sa)) { if (!card.canBeTargetedBy(sa)) {
showMessage(sa.getHostCard() + " - Cannot target this card (Shroud? Protection? Restrictions)."); showMessage(sa.getHostCard() + " - Cannot target this card (Shroud? Protection? Restrictions).");
@@ -170,6 +175,20 @@ public final class InputSelectTargets extends InputSyncronizedBase {
return false; return false;
} }
if (sa.hasParam("MaxTotalTargetCMC")) {
int maxTotalCMC = tgt.getMaxTotalCMC(sa.getHostCard(), sa);
if (maxTotalCMC > 0) {
int soFar = Aggregates.sum(sa.getTargets().getTargetCards(), CardPredicates.Accessors.fnGetCmc);
if (!sa.isTargeting(card)) {
soFar += card.getCMC();
}
if (soFar > maxTotalCMC) {
showMessage(sa.getHostCard() + " - Cannot target this card (CMC limit exceeded)");
return false;
}
}
}
// If all cards must have different controllers // If all cards must have different controllers
if (tgt.isDifferentControllers()) { if (tgt.isDifferentControllers()) {
final List<Player> targetedControllers = new ArrayList<>(); final List<Player> targetedControllers = new ArrayList<>();
@@ -186,12 +205,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
} }
if (!choices.contains(card)) { if (!choices.contains(card)) {
if (card.isPlaneswalker() && sa.getApi() == ApiType.DealDamage) { showMessage(sa.getHostCard() + " - The selected card is not a valid choice to be targeted.");
showMessage(sa.getHostCard() + " - To deal an opposing Planeswalker direct damage, target its controller and then redirect the damage on resolution.");
}
else {
showMessage(sa.getHostCard() + " - The selected card is not a valid choice to be targeted.");
}
return false; return false;
} }