Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Updated modes to handle selection of modes multiple times (not working yet if targets included).

Browse source
This commit is contained in:
LevelX2 2015-11-08 20:07:02 +01:00
parent 9b29cd042f
commit 431d0005f2
4 changed files with 60 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/mage/abilities/AbilityImpl.java
View file

@ -902,6 +902,9 @@ public abstract class AbilityImpl implements Ability {
for (Mode mode : modes.values()) {
if (mode.getTargets().canChoose(sourceId, controllerId, game)) {
found++;
if (modes.isEachModeMoreThanOnce()) {
return true;
}
if (found >= getModes().getMinModes()) {
return true;
}
@ -1103,13 +1106,16 @@ public abstract class AbilityImpl implements Ability {
}
} else if (object instanceof Spell && ((Spell) object).getSpellAbility().getModes().size() > 1) {
Modes spellModes = ((Spell) object).getSpellAbility().getModes();
int item = 0;
for (Mode mode : spellModes.values()) {
item++;
if (spellModes.getSelectedModes().contains(mode.getId())) {
spellModes.setActiveMode(mode.getId());
sb.append(" (mode ").append(item).append(")");
sb.append(getTargetDescriptionForLog(getTargets(), game));
for (UUID modeId : spellModes.getSelectedModes()) {
int item = 0;
for (Mode mode : spellModes.values()) {
item++;
if (mode.getId().equals(modeId)) {
spellModes.setActiveMode(mode.getId());
sb.append(" (mode ").append(item).append(")");
sb.append(getTargetDescriptionForLog(getTargets(), game));
break;
}
}
}
} else {