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

Added Blessed Wind and few refactors

Browse source
This commit is contained in:
Styxo 2016-09-20 00:17:56 +02:00
parent f431f75907
commit 8485df8cb7
10 changed files with 453 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.SetTargetPointer;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamagedPlayerEvent;
@ -41,7 +42,8 @@ import mage.target.targetpointer.FixedTarget;
*/
public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbilityImpl {
private boolean setTargetPointer;
protected boolean setTargetPointer;
protected String text;
public DealsCombatDamageToAPlayerTriggeredAbility(Effect effect, boolean optional) {
this(effect, optional, false);
@ -52,8 +54,15 @@ public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbility
this.setTargetPointer = setTargetPointer;
}
public DealsCombatDamageToAPlayerTriggeredAbility(Effect effect, boolean optional, String text, boolean setTargetPointer) {
super(Zone.BATTLEFIELD, effect, optional);
this.text = text;
this.setTargetPointer = setTargetPointer;
}
public DealsCombatDamageToAPlayerTriggeredAbility(final DealsCombatDamageToAPlayerTriggeredAbility ability) {
super(ability);
this.text = ability.text;
this.setTargetPointer = ability.setTargetPointer;
}
@ -84,7 +93,10 @@ public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbility
@Override
public String getRule() {
return "Whenever {this} deals combat damage to a player, " + super.getRule();
if (text == null || text.isEmpty()) {
return "Whenever {this} deals combat damage to a player, " + super.getRule();
}
return text;
}
}