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

TargetSelection > chooseCardFromList do some CARDNAME replacements

Browse Source
This commit is contained in:
Northmoc
2022-05-23 13:46:26 -04:00
parent e5773a5e24
commit 18733e046f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui/src/main/java/forge/player/TargetSelection.java
View File

@@ -47,6 +47,7 @@ import forge.game.zone.Zone;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gamemodes.match.input.InputSelectTargets; import forge.gamemodes.match.input.InputSelectTargets;
import forge.util.Aggregates; import forge.util.Aggregates;
import forge.util.TextUtil;
/** /**
* <p> * <p>
@@ -265,10 +266,13 @@ public class TargetSelection {
} }
Object chosen = null; Object chosen = null;
String message = TextUtil.fastReplace(getTgt().getVTSelection(),
"CARDNAME", ability.getHostCard().toString());
if (!choices.isEmpty() && mandatory) { if (!choices.isEmpty() && mandatory) {
chosen = controller.getGui().one(getTgt().getVTSelection(), choicesFiltered); chosen = controller.getGui().one(message, choicesFiltered);
} else { } else {
chosen = controller.getGui().oneOrNone(getTgt().getVTSelection(), choicesFiltered); chosen = controller.getGui().oneOrNone(message, choicesFiltered);
} }
if (chosen == null) { if (chosen == null) {
return false; return false;
@@ -303,7 +307,8 @@ public class TargetSelection {
private final boolean chooseCardFromStack(final boolean mandatory) { private final boolean chooseCardFromStack(final boolean mandatory) {
final TargetRestrictions tgt = this.getTgt(); final TargetRestrictions tgt = this.getTgt();
final String message = tgt.getVTSelection(); final String message = TextUtil.fastReplace(tgt.getVTSelection(),
"CARDNAME", ability.getHostCard().toString());
// Find what's targetable, then allow human to choose // Find what's targetable, then allow human to choose
final List<Object> selectOptions = new ArrayList<>(); final List<Object> selectOptions = new ArrayList<>();
HashMap<StackItemView, SpellAbilityStackInstance> stackItemViewCache = new HashMap<>(); HashMap<StackItemView, SpellAbilityStackInstance> stackItemViewCache = new HashMap<>();