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

22
Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java
View file

@ -45,11 +45,23 @@ public class DamageControllerEffect extends OneShotEffect {
protected DynamicValue amount;
protected boolean preventable;
private String sourceName = "{source}";
public DamageControllerEffect(int amount, String whoDealDamageName) {
this(amount, true, whoDealDamageName);
}
public DamageControllerEffect(int amount) {
this(amount, true);
}
public DamageControllerEffect(int amount, boolean preventable, String whoDealDamageName) {
super(Outcome.Damage);
this.amount = new StaticValue(amount);
this.preventable = preventable;
this.sourceName = whoDealDamageName;
}
public DamageControllerEffect(int amount, boolean preventable) {
super(Outcome.Damage);
this.amount = new StaticValue(amount);
@ -74,6 +86,7 @@ public class DamageControllerEffect extends OneShotEffect {
super(effect);
this.amount = effect.amount;
this.preventable = effect.preventable;
this.sourceName = effect.sourceName;
}
@Override
@ -98,7 +111,7 @@ public class DamageControllerEffect extends OneShotEffect {
}
StringBuilder sb = new StringBuilder();
String message = amount.getMessage();
sb.append("{source} deals ");
sb.append(this.sourceName).append(" deals ");
if (message.isEmpty() || !message.equals("1")) {
sb.append(amount);
}
@ -121,4 +134,11 @@ public class DamageControllerEffect extends OneShotEffect {
return sb.toString();
}
public String getSourceName() {
return sourceName;
}
public void setSourceName(String sourceName) {
this.sourceName = sourceName;
}
}