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

ensure that charms use SpellAbilityView for choices

Browse Source 
- needed for Funeral Charm

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
This commit is contained in:
Jamin W. Collins
2018-08-11 12:42:26 -06:00
parent 2174672511
commit e236202ddb
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/PlayerControllerHuman.java
View File

@@ -1387,12 +1387,17 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override @Override
public List<AbilitySub> chooseModeForAbility(final SpellAbility sa, final int min, final int num, public List<AbilitySub> chooseModeForAbility(final SpellAbility sa, final int min, final int num,
boolean allowRepeat) { boolean allowRepeat) {
final List<AbilitySub> choices = CharmEffect.makePossibleOptions(sa); final List<AbilitySub> possible = CharmEffect.makePossibleOptions(sa);
HashMap<SpellAbilityView, AbilitySub> spellViewCache = new HashMap<>();
for (AbilitySub spellAbility : possible) {
spellViewCache.put(spellAbility.getView(), spellAbility);
}
final List<SpellAbilityView> choices = new ArrayList<>(spellViewCache.keySet());
final String modeTitle = TextUtil.concatNoSpace(sa.getActivatingPlayer().toString(), " activated ", final String modeTitle = TextUtil.concatNoSpace(sa.getActivatingPlayer().toString(), " activated ",
sa.getHostCard().toString(), " - Choose a mode"); sa.getHostCard().toString(), " - Choose a mode");
final List<AbilitySub> chosen = Lists.newArrayListWithCapacity(num); final List<AbilitySub> chosen = Lists.newArrayListWithCapacity(num);
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
AbilitySub a; SpellAbilityView a;
if (i < min) { if (i < min) {
a = getGui().one(modeTitle, choices); a = getGui().one(modeTitle, choices);
} else { } else {
@@ -1405,7 +1410,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
if (!allowRepeat) { if (!allowRepeat) {
choices.remove(a); choices.remove(a);
} }
chosen.add(a); chosen.add(spellViewCache.get(a));
} }
return chosen; return chosen;
} }