github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-28 03:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

SearchLibraryPutInPlayEffect: remove forceshuffle parameter

Browse source
This commit is contained in:
xenohedron 2023-05-13 23:18:21 -04:00
parent 1aba94c8a8
commit 4c787423bc
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java
View file

@ -18,7 +18,6 @@ import java.util.UUID;
public class SearchLibraryPutInPlayEffect extends SearchEffect { public class SearchLibraryPutInPlayEffect extends SearchEffect {
protected boolean tapped; protected boolean tapped;
protected boolean forceShuffle;
protected boolean optional; protected boolean optional;
public SearchLibraryPutInPlayEffect(TargetCardInLibrary target) { public SearchLibraryPutInPlayEffect(TargetCardInLibrary target) {
@ -30,13 +29,12 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect {
} }
public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle) { public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle) {
this(target, tapped, forceShuffle, false); this(target, tapped, true, false);
} }
public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle, boolean optional) { public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle, boolean optional) {
super(target, Outcome.PutCardInPlay); super(target, Outcome.PutCardInPlay);
this.tapped = tapped; this.tapped = tapped;
this.forceShuffle = forceShuffle;
this.optional = optional; this.optional = optional;
if (target.getDescription().contains("land")) { if (target.getDescription().contains("land")) {
this.outcome = Outcome.PutLandInPlay; this.outcome = Outcome.PutLandInPlay;
@ -46,16 +44,15 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect {
staticText = (optional ? "you may " : "") staticText = (optional ? "you may " : "")
+ "search your library for " + "search your library for "
+ target.getDescription() + target.getDescription()
+ (forceShuffle ? ", " : " and ") + ", "
+ (target.getMaxNumberOfTargets() > 1 ? "put them onto the battlefield" : "put it onto the battlefield") + (target.getMaxNumberOfTargets() > 1 ? "put them onto the battlefield" : "put it onto the battlefield")
+ (tapped ? " tapped" : "") + (tapped ? " tapped" : "")
+ (forceShuffle ? ", then shuffle" : ". If you do, shuffle"); + ", then shuffle";
} }
public SearchLibraryPutInPlayEffect(final SearchLibraryPutInPlayEffect effect) { public SearchLibraryPutInPlayEffect(final SearchLibraryPutInPlayEffect effect) {
super(effect); super(effect);
this.tapped = effect.tapped; this.tapped = effect.tapped;
this.forceShuffle = effect.forceShuffle;
this.optional = effect.optional; this.optional = effect.optional;
} }
@ -81,10 +78,8 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect {
player.shuffleLibrary(source, game); player.shuffleLibrary(source, game);
return true; return true;
} }
if (forceShuffle) { player.shuffleLibrary(source, game);
player.shuffleLibrary(source, game); return false;
}
return true;
} }
public List<UUID> getTargets() { public List<UUID> getTargets() {