External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 13:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WOE][WOC] Fixed card texts, fixed Free the Fae (#11098)

Browse source 
* fix name compare when both full and small name are used
* fix Free the Fae, it is mandatory
This commit is contained in:
Susucre 2023-09-02 13:40:40 +02:00 • committed by GitHub
parent 24315460fe
commit 344ff81a37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Mage/src/main/java/mage/abilities/effects/common/MillThenPutInHandEffect.java
View file

@ -21,6 +21,7 @@ import mage.util.CardUtil;
public class MillThenPutInHandEffect extends OneShotEffect {
private final int amount;
private final boolean mandatory; // If true, putting a card in hand is mandatory if possible.
private final FilterCard filter;
private final Effect otherwiseEffect;
@ -28,16 +29,26 @@ public class MillThenPutInHandEffect extends OneShotEffect {
this(amount, filter, null);
}
public MillThenPutInHandEffect(int amount, FilterCard filter, boolean mandatory) {
this(amount, filter, null, mandatory);
}
public MillThenPutInHandEffect(int amount, FilterCard filter, Effect otherwiseEffect) {
this(amount, filter, otherwiseEffect, false);
}
public MillThenPutInHandEffect(int amount, FilterCard filter, Effect otherwiseEffect, boolean mandatory) {
super(Outcome.Benefit);
this.amount = amount;
this.filter = filter;
this.mandatory = mandatory;
this.otherwiseEffect = otherwiseEffect;
}
private MillThenPutInHandEffect(final MillThenPutInHandEffect effect) {
super(effect);
this.amount = effect.amount;
this.mandatory = effect.mandatory;
this.filter = effect.filter;
this.otherwiseEffect = effect.otherwiseEffect;
}
@ -57,7 +68,7 @@ public class MillThenPutInHandEffect extends OneShotEffect {
if (cards.isEmpty()) {
return applyOtherwiseEffect(game, source);
}
TargetCard target = new TargetCard(0, 1, Zone.ALL, filter);
TargetCard target = new TargetCard(this.mandatory ? 1 : 0, 1, Zone.ALL, filter);
player.choose(Outcome.DrawCard, cards, target, source, game);
Card card = game.getCard(target.getFirstTarget());
if (card == null) {
@ -82,15 +93,12 @@ public class MillThenPutInHandEffect extends OneShotEffect {
if (staticText == null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder("mill ");
sb.append(CardUtil.numberToText(amount));
sb.append(" cards. You may put ");
sb.append(filter.getMessage());
sb.append(" from among the milled cards into your hand");
String text = "mill " + CardUtil.numberToText(amount) + " cards. ";
text += this.mandatory ? "Then " : "You may ";
text += "put " + filter.getMessage() + " from among the milled cards into your hand";
if (otherwiseEffect != null) {
sb.append(". If you don't, ");
sb.append(otherwiseEffect.getText(mode));
text += ". If you don't, " + otherwiseEffect.getText(mode);
}
return sb.toString();
return text;
}
}