From df9f62d8ccbbf6ed03d4863bc58831546ad0e89c Mon Sep 17 00:00:00 2001 From: tool4ever Date: Tue, 27 Sep 2022 21:52:49 +0200 Subject: [PATCH] Fix CostAdjustment being run for Unless Costs (#1593) --- forge-gui/res/cardsfolder/t/turf_war.txt | 2 +- forge-gui/src/main/java/forge/player/HumanPlay.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/t/turf_war.txt b/forge-gui/res/cardsfolder/t/turf_war.txt index 348c54bb793..ef72f95d38e 100644 --- a/forge-gui/res/cardsfolder/t/turf_war.txt +++ b/forge-gui/res/cardsfolder/t/turf_war.txt @@ -5,5 +5,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S SVar:TrigPutCounter:DB$ PutCounter | CounterType$ CONTESTED | ValidTgts$ Land | TgtPrompt$ For each player, select a target land | TargetMin$ OneEach | TargetMax$ OneEach | TargetsWithDifferentControllers$ True SVar:OneEach:PlayerCountPlayers$Amount T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ Player.controlsLand.counters\_GE1\_CONTESTED | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever a creature deals combat damage to a player, if that player controls one or more lands with contested counters on them, that creature's controller gains control of one of those lands of their choice and untaps it. -SVar:TrigGainControl:DB$ GainControl | Choices$ Land.ControlledBy TriggeredTarget+counters_GE1_CONTESTED | Untap$ True | NewController$ TriggeredSourceController +SVar:TrigGainControl:DB$ GainControl | Choices$ Land.ControlledBy TriggeredTarget+counters_GE1_CONTESTED | Chooser$ TriggeredSourceController | Untap$ True | NewController$ TriggeredSourceController Oracle:When Turf War enters the battlefield, for each player, put a contested counter on target land that player controls.\nWhenever a creature deals combat damage to a player, if that player controls one or more lands with contested counters on them, that creature's controller gains control of one of those lands of their choice and untaps it. diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java index 4a324214593..2241d673799 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/player/HumanPlay.java @@ -232,7 +232,7 @@ public class HumanPlay { current = Iterables.getFirst(AbilityUtils.getDefinedCards(source, sourceAbility.getParam("ShowCurrentCard"), sourceAbility), null); } - final List parts = CostAdjustment.adjust(cost, sourceAbility).getCostParts(); + final List parts = cost.getCostParts(); final List remainingParts = new ArrayList<>(parts); CostPart costPart = null; if (!parts.isEmpty()) {