@@ -459,67 +459,67 @@ private PaymentDecision exileFromTop(final CostExile cost, final int nNeeded) {
459459 return PaymentDecision .card (list );
460460 }
461461
462- private PaymentDecision exileFromMiscZone (final CostExile cost , final int nNeeded , final CardCollection typeList , final boolean sharedType ) {
463- // when it's always a single triggered card getting exiled don't act like it might be different by offering the zone for choice
464- if (cost .zoneRestriction == -1 && ability .isTrigger () && nNeeded == 1 && typeList .size () == 1 ) {
465- if (confirmAction (cost , Localizer .getInstance ().getMessage ("lblExileConfirm" , typeList .getFirst ().getTranslatedName ()))) {
466- return PaymentDecision .card (typeList .getFirst ());
462+ private PaymentDecision exileFromMiscZone (final CostExile cost , final int nNeeded , final CardCollection typeList , final boolean sharedType ) {
463+ // when it's always a single triggered card getting exiled don't act like it might be different by offering the zone for choice
464+ if (cost .zoneRestriction == -1 && ability .isTrigger () && nNeeded == 1 && typeList .size () == 1 ) {
465+ if (confirmAction (cost , Localizer .getInstance ().getMessage ("lblExileConfirm" , typeList .getFirst ().getTranslatedName ()))) {
466+ return PaymentDecision .card (typeList .getFirst ());
467+ }
468+ return null ;
467469 }
468- return null ;
469- }
470470
471- if (!sharedType ) {
472- final List <ZoneType > origin = Lists .newArrayList (cost .from );
473- final List <Card > chosen = controller .chooseCardsForZoneChange (
474- ZoneType .Exile ,
475- origin ,
476- ability ,
477- typeList ,
478- mandatory ? nNeeded : 0 ,
479- nNeeded ,
480- null ,
481- cost .toString (nNeeded ),
482- null
483- );
471+ if (!sharedType ) {
472+ final List <ZoneType > origin = Lists .newArrayList (cost .from );
473+ final List <Card > chosen = controller .chooseCardsForZoneChange (
474+ ZoneType .Exile ,
475+ origin ,
476+ ability ,
477+ typeList ,
478+ mandatory ? nNeeded : 0 ,
479+ nNeeded ,
480+ null ,
481+ cost .toString (nNeeded ),
482+ null
483+ );
484+
485+ if (chosen .size () < nNeeded ) {
486+ return null ;
487+ }
488+ return PaymentDecision .card (chosen );
489+ }
484490
485- if (chosen .size () < nNeeded ) {
491+ if (typeList .size () < nNeeded ) {
486492 return null ;
487493 }
488- return PaymentDecision .card (chosen );
489- }
490494
491- if (typeList .size () < nNeeded ) {
492- return null ;
493- }
495+ final InputSelectCardsFromList inp = new InputSelectCardsFromList (controller , mandatory ? nNeeded : 0 , nNeeded , typeList , ability ) {
496+ private static final long serialVersionUID = 1L ;
494497
495- final InputSelectCardsFromList inp = new InputSelectCardsFromList (controller , mandatory ? nNeeded : 0 , nNeeded , typeList , ability ) {
496- private static final long serialVersionUID = 1L ;
497-
498- @ Override
499- protected boolean onCardSelected (final Card c , final List <Card > otherCardsToSelect , final ITriggerEvent triggerEvent ) {
500- final Card firstSelected = Iterables .getFirst (this .selected , null );
501- if (firstSelected != null && !firstSelected .sharesCardTypeWith (c )) {
502- return false ;
498+ @ Override
499+ protected boolean onCardSelected (final Card c , final List <Card > otherCardsToSelect , final ITriggerEvent triggerEvent ) {
500+ final Card firstSelected = Iterables .getFirst (this .selected , null );
501+ if (firstSelected != null && !firstSelected .sharesCardTypeWith (c )) {
502+ return false ;
503+ }
504+ return super .onCardSelected (c , otherCardsToSelect , triggerEvent );
503505 }
504- return super .onCardSelected (c , otherCardsToSelect , triggerEvent );
505- }
506- };
506+ };
507507
508- inp .setMessage (cost .toString (nNeeded ) + " (must share a card type)" );
509- inp .setCancelAllowed (!mandatory );
510- inp .showAndWait ();
508+ inp .setMessage (cost .toString (nNeeded ) + " (must share a card type)" );
509+ inp .setCancelAllowed (!mandatory );
510+ inp .showAndWait ();
511511
512- if (inp .hasCancelled ()) {
513- return null ;
514- }
512+ if (inp .hasCancelled ()) {
513+ return null ;
514+ }
515515
516- final CardCollection chosen = new CardCollection (inp .getSelected ());
517- if (chosen .size () < nNeeded ) {
518- return null ;
519- }
516+ final CardCollection chosen = new CardCollection (inp .getSelected ());
517+ if (chosen .size () < nNeeded ) {
518+ return null ;
519+ }
520520
521- return PaymentDecision .card (chosen );
522- }
521+ return PaymentDecision .card (chosen );
522+ }
523523
524524 private PaymentDecision exileFromTopGraveType (final int nNeeded , final CardCollection typeList ) {
525525 Collections .reverse (typeList );
0 commit comments