ChooseTypeEffect.resolve refactor Deck -> Zone

This commit is contained in:
Northmoc
2022-09-05 09:47:39 -04:00
parent c5fe581e38
commit 1aabf6d336

View File

@@ -14,6 +14,7 @@ import forge.game.card.CardFactoryUtil;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.spellability.TargetRestrictions; import forge.game.spellability.TargetRestrictions;
import forge.game.zone.ZoneType;
import forge.util.Aggregates; import forge.util.Aggregates;
public class ChooseTypeEffect extends SpellAbilityEffect { public class ChooseTypeEffect extends SpellAbilityEffect {
@@ -60,11 +61,12 @@ public class ChooseTypeEffect extends SpellAbilityEffect {
} }
} }
} }
} else if (sa.hasParam("MostPrevalentInDefinedDeck")) { } else if (sa.hasParam("MostPrevalentInDefinedZone")) {
Player definedP = AbilityUtils.getDefinedPlayers( final String[] info = sa.getParam("MostPrevalentInDefinedZone").split("_");
sa.getHostCard(), sa.getParam("MostPrevalentInDefinedDeck"), sa).get(0); final Player definedP = AbilityUtils.getDefinedPlayers(sa.getHostCard(), info[0], sa).get(0);
CardCollectionView deck = definedP.getAllCards(); final ZoneType z = info.length > 1 ? ZoneType.smartValueOf(info[1]) : ZoneType.Battlefield;
for (String s : CardFactoryUtil.getMostProminentCreatureType(deck)) { CardCollectionView zoneCards = definedP.getCardsIn(z);
for (String s : CardFactoryUtil.getMostProminentCreatureType(zoneCards)) {
validTypes.add(s); validTypes.add(s);
} }