Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed wrong ability texts with duplicated card name (see #4335)

Browse source
This commit is contained in:
Oleg Agafonov 2018-01-04 20:48:41 +04:00
parent 3d53d28f5e
commit 56949414d1
5 changed files with 95 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java
View file

@ -45,11 +45,17 @@ public class DamageAllEffect extends OneShotEffect {
private FilterPermanent filter;
private DynamicValue amount;
private String sourceName = "{source}";
public DamageAllEffect(int amount, FilterPermanent filter) {
this(new StaticValue(amount), filter);
}
public DamageAllEffect(int amount, String whoDealDamageName, FilterPermanent filter) {
this(new StaticValue(amount), filter);
this.sourceName = whoDealDamageName;
}
public DamageAllEffect(DynamicValue amount, FilterPermanent filter) {
super(Outcome.Damage);
this.amount = amount;
@ -61,6 +67,7 @@ public class DamageAllEffect extends OneShotEffect {
super(effect);
this.amount = effect.amount;
this.filter = effect.filter.copy();
this.sourceName = effect.sourceName;
}
@Override
@ -79,7 +86,7 @@ public class DamageAllEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("{source} deals ").append(amount.toString()).append(" damage to each ").append(filter.getMessage());
sb.append(this.sourceName).append(" deals ").append(amount.toString()).append(" damage to each ").append(filter.getMessage());
String message = amount.getMessage();
if (!message.isEmpty()) {
if (amount.toString().equals("X")) {
@ -92,4 +99,11 @@ public class DamageAllEffect extends OneShotEffect {
staticText = sb.toString();
}
public String getSourceName() {
return sourceName;
}
public void setSourceName(String sourceName) {
this.sourceName = sourceName;
}
}