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

refactor: simplify DrawCardSourceControllerEffect text generation (#12621)

Browse source
This commit is contained in:
jimga150 2024-07-31 22:46:22 -04:00 • committed by GitHub
parent ee3cab84ef
commit f2d3850250
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
74 changed files with 88 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java
View file

@ -1,9 +1,7 @@
package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
@ -19,21 +17,21 @@ public class DrawCardSourceControllerEffect extends OneShotEffect {
protected DynamicValue amount;
public DrawCardSourceControllerEffect(int amount) {
this(amount, "");
this(amount, false);
}
public DrawCardSourceControllerEffect(int amount, String whoDrawCard) {
this(StaticValue.get(amount), whoDrawCard);
public DrawCardSourceControllerEffect(int amount, boolean youDraw) {
this(StaticValue.get(amount), youDraw);
}
public DrawCardSourceControllerEffect(DynamicValue amount) {
this(amount, "");
this(amount, false);
}
public DrawCardSourceControllerEffect(DynamicValue amount, String whoDrawCard) {
public DrawCardSourceControllerEffect(DynamicValue amount, boolean youDraw) {
super(Outcome.DrawCard);
this.amount = amount.copy();
createStaticText(whoDrawCard);
createStaticText(youDraw);
}
protected DrawCardSourceControllerEffect(final DrawCardSourceControllerEffect effect) {
@ -57,9 +55,13 @@ public class DrawCardSourceControllerEffect extends OneShotEffect {
return false;
}
private void createStaticText(String whoDrawCard) {
StringBuilder sb = new StringBuilder(whoDrawCard);
sb.append(whoDrawCard.isEmpty() ? "draw " : " draw ");
private void createStaticText(boolean youDraw) {
StringBuilder sb = new StringBuilder();
if (youDraw){
sb.append("you draw ");
} else {
sb.append("draw ");
}
String value = amount.toString();
sb.append(CardUtil.numberToText(value, "a"));
sb.append(value.equals("1") ? " card" : " cards");

2
Mage/src/main/java/mage/game/command/emblems/TyvarKellEmblem.java
View file

@ -33,7 +33,7 @@ public final class TyvarKellEmblem extends Emblem {
HasteAbility.getInstance(), Duration.EndOfTurn, null, true
).setText("it gains haste until end of turn"), filter, false, SetTargetPointer.CARD
);
ability.addEffect(new DrawCardSourceControllerEffect(2, "you").concatBy("and"));
ability.addEffect(new DrawCardSourceControllerEffect(2, true).concatBy("and"));
this.getAbilities().add(ability);
}