External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: added more strictly checks for choice commands order, fixed wrong commands in old tests (related to #12044);

Browse source
This commit is contained in:
Oleg Agafonov 2025-01-16 08:13:36 +04:00
parent 5d4112c45d
commit c82511f96f
11 changed files with 219 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java
View file

@ -78,8 +78,9 @@ public class RemoveCounterCost extends CostImpl {
Outcome outcome;
if (target instanceof TargetPermanent) {
outcome = Outcome.UnboostCreature;
} else if (target instanceof TargetCard) { // For Mari, the Killing Quill
outcome = Outcome.AIDontUseIt;
} else if (target instanceof TargetCard) {
// Mari, the Killing Quill - AI can safely use it all the time
outcome = Outcome.Neutral;
} else {
throw new IllegalArgumentException(
@ -123,7 +124,7 @@ public class RemoveCounterCost extends CostImpl {
}
choice.setChoices(choices);
choice.setMessage("Choose a counter to remove from " + targetObject.getLogName());
if (!controller.choose(Outcome.UnboostCreature, choice, game)) {
if (!controller.choose(outcome, choice, game)) {
return false;
}
counterName = choice.getChoice();
@ -135,7 +136,7 @@ public class RemoveCounterCost extends CostImpl {
int numberOfCountersSelected = 1;
if (countersLeft > 1 && countersOnPermanent > 1) {
numberOfCountersSelected = controller.getAmount(1, Math.min(countersLeft, countersOnPermanent),
"Remove how many counters from " + targetObject.getIdName(), game);
"Choose how many counters (" + counterName + ") to remove from " + targetObject.getLogName() + " as payment", game);
}
targetObject.removeCounters(counterName, numberOfCountersSelected, source, game);
countersRemoved += numberOfCountersSelected;