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

move CounterUnless before Counter as it is more specific

master
melvin 2013-10-27 11:10:41 +08:00
parent 012bd1eb7a
commit d9aed8041d
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/magic/model/event/MagicRuleEventAction.java
View File

@ -95,23 +95,6 @@ public enum MagicRuleEventAction {
}
}
),
Counter(
"counter (?<choice>[^\\.]*).",
MagicTargetHint.Negative,
MagicDefaultTargetPicker.create(),
MagicTiming.Counter,
"Counter",
new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetCardOnStack(game,new MagicCardOnStackAction() {
public void doAction(final MagicCardOnStack targetSpell) {
game.doAction(new MagicCounterItemOnStackAction(targetSpell));
}
});
}
}
),
CounterUnless(
"counter (?<choice>[^\\.]*) unless its controller pays (?<cost>[^\\.]*).",
MagicTargetHint.Negative,
@ -137,6 +120,23 @@ public enum MagicRuleEventAction {
};
}
},
Counter(
"counter (?<choice>[^\\.]*).",
MagicTargetHint.Negative,
MagicDefaultTargetPicker.create(),
MagicTiming.Counter,
"Counter",
new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetCardOnStack(game,new MagicCardOnStackAction() {
public void doAction(final MagicCardOnStack targetSpell) {
game.doAction(new MagicCounterItemOnStackAction(targetSpell));
}
});
}
}
),
Exile(
"exile (?<choice>[^\\.]*).",
MagicTargetHint.Negative,