github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 03:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix various issues with OrCost (fixes #9424)

Browse source
This commit is contained in:
Evan Kranzler 2022-09-20 09:22:55 -04:00
parent 12a20d07f4
commit a09c14083e
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/abilities/costs/OrCost.java
View file

@ -8,6 +8,7 @@ import mage.constants.Outcome;
import mage.game.Game; import mage.game.Game;
import mage.players.Player; import mage.players.Player;
import mage.target.Targets; import mage.target.Targets;
import mage.util.CardUtil;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
@ -78,14 +79,18 @@ public class OrCost implements Cost {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (usable.get(0) instanceof ManaCost) { if (usable.get(0) instanceof ManaCost) {
sb.append("Pay "); sb.append("Pay ");
sb.append(usable.get(0).getText());
} else {
sb.append(CardUtil.getTextWithFirstCharUpperCase(usable.get(0).getText()));
} }
sb.append(usable.get(0).getText());
sb.append(" or "); sb.append(" or ");
sb.append(usable.get(1)); sb.append(usable.get(1).getText());
sb.append('?'); sb.append('?');
if (controller.chooseUse( if (controller.chooseUse(
Outcome.Detriment, sb.toString(), null, Outcome.Detriment, sb.toString(), null,
usable.get(0).getText(), usable.get(1).getText(), ability, game CardUtil.getTextWithFirstCharUpperCase(usable.get(0).getText()),
CardUtil.getTextWithFirstCharUpperCase(usable.get(1).getText()),
ability, game
)) { )) {
selectedCost = usable.get(0); selectedCost = usable.get(0);
} else { } else {
@ -98,15 +103,20 @@ public class OrCost implements Cost {
.collect(Collectors.toMap(Cost::getText, Function.identity())); .collect(Collectors.toMap(Cost::getText, Function.identity()));
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
choice.setMessage("Choose a cost to pay"); choice.setMessage("Choose a cost to pay");
choice.setChoices(costMap.keySet()); choice.setChoices(costMap
.keySet()
.stream()
.map(CardUtil::getTextWithFirstCharUpperCase)
.collect(Collectors.toSet()));
controller.choose(Outcome.Neutral, choice, game); controller.choose(Outcome.Neutral, choice, game);
selectedCost = costMap.getOrDefault(choice.getChoice(), null); selectedCost = costMap.getOrDefault(
CardUtil.getTextWithFirstCharLowerCase(choice.getChoice()), null
);
} }
if (selectedCost == null) { if (selectedCost == null) {
return false; return false;
} }
return selectedCost.pay(ability, game, source, controllerId, noMana, costToPay); return selectedCost.pay(ability, game, source, controllerId, noMana, costToPay);
} }
@Override @Override