Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge the rules for 'deals damge' and 'deals combat damage'

master
melvinzhang 2017-08-15 11:40:52 +08:00
parent 326617fa03
commit 4b1bcc4a17
1 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/magic/model/MagicAbility.java
View File

@ -1191,65 +1191,34 @@ public enum MagicAbility {
));
}
},
DamageToYou("When(ever)? " + ARG.WORDRUN + " deals damage to you, " + ARG.EFFECT, 10) {
DamageToYou("When(ever)? " + ARG.WORDRUN + " deals(?<combat> combat)? damage to you, " + ARG.EFFECT, 10) {
@Override
protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
card.add(DamageIsDealtTrigger.DamageToYou(
MagicTargetFilterFactory.Permanent(ARG.wordrun(arg)),
MagicRuleEventAction.create(ARG.effect(arg)),
MagicDamage.Any
arg.group("combat") != null ? MagicDamage.Combat : MagicDamage.Any
));
}
},
CombatDamageToYou("When(ever)? " + ARG.WORDRUN + " deals combat damage to you, " + ARG.EFFECT, 10) {
@Override
protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
card.add(DamageIsDealtTrigger.DamageToYou(
MagicTargetFilterFactory.Permanent(ARG.wordrun(arg)),
MagicRuleEventAction.create(ARG.effect(arg)),
MagicDamage.Combat
));
}
},
DamageToTarget("When(ever)? " + ARG.WORDRUN + " deals damage to " + ARG.WORDRUN2 + ", " + ARG.EFFECT, 10) {
DamageToTarget("When(ever)? " + ARG.WORDRUN + " deals(?<combat> combat)? damage to " + ARG.WORDRUN2 + ", " + ARG.EFFECT, 10) {
@Override
protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
card.add(DamageIsDealtTrigger.DamageToTarget(
MagicTargetFilterFactory.Permanent(ARG.wordrun(arg)),
MagicTargetFilterFactory.Target(ARG.wordrun2(arg)),
MagicRuleEventAction.create(ARG.effect(arg)),
MagicDamage.Any
arg.group("combat") != null ? MagicDamage.Combat : MagicDamage.Any
));
}
},
CombatDamageToTarget("When(ever)? " + ARG.WORDRUN + " deals combat damage to " + ARG.WORDRUN2 + ", " + ARG.EFFECT, 10) {
@Override
protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
card.add(DamageIsDealtTrigger.DamageToTarget(
MagicTargetFilterFactory.Permanent(ARG.wordrun(arg)),
MagicTargetFilterFactory.Target(ARG.wordrun2(arg)),
MagicRuleEventAction.create(ARG.effect(arg)),
MagicDamage.Combat
));
}
},
DamageToAny("When(ever)? " + ARG.WORDRUN + " deals damage, " + ARG.EFFECT, 10) {
DamageToAny("When(ever)? " + ARG.WORDRUN + " deals(?<combat> combat)? damage, " + ARG.EFFECT, 10) {
@Override
protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
card.add(DamageIsDealtTrigger.DamageToAny(
MagicTargetFilterFactory.Permanent(ARG.wordrun(arg)),
MagicRuleEventAction.create(ARG.effect(arg)),
MagicDamage.Any
));
}
},
CombatDamageToAny("When(ever)? " + ARG.WORDRUN + " deals combat damage, " + ARG.EFFECT, 10) {
@Override
protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
card.add(DamageIsDealtTrigger.DamageToAny(
MagicTargetFilterFactory.Permanent(ARG.wordrun(arg)),
MagicRuleEventAction.create(ARG.effect(arg)),
MagicDamage.Combat
arg.group("combat") != null ? MagicDamage.Combat : MagicDamage.Any
));
}
},