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

factor regex for <target>'s controller into a separate constant

master
melvinzhang 2015-12-15 09:02:04 +08:00
parent 253d9e3e5b
commit 0fb49ed3d6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/magic/model/ARG.java
View File

@ -133,7 +133,8 @@ public class ARG {
}
}
public static final String PLAYERS = "((?<rnc>rn's controller)|(?<tnc>(that [^ ]+'s|its) controller)|(?<rn>rn)|(?<pn>(pn||you))|" + CHOICE + "|(?<group>[^\\.]+?))";
private static final String TNC = "(that [^ ]+'s|its) controller( or that player)?";
public static final String PLAYERS = "((?<rnc>rn's controller)|(?<tnc>" + TNC + ")|(?<rn>rn)|(?<pn>(pn||you))|" + CHOICE + "|(?<group>[^\\.]+?))";
public static List<MagicPlayer> players(final MagicEvent event, final Matcher m, final MagicTargetFilter<MagicPlayer> filter) {
if (m.group("rnc") != null) {
return Collections.singletonList(event.getRefObject().getController());
@ -179,7 +180,7 @@ public class ARG {
}
}
public static final String TARGETS = "((?<rnc1>rn's controller)|(?<tnc1>(that [^ ]+'s|its) controller)|(?<rn1>rn)|(?<sn1>sn)|(?<pn1>(pn||you))|" + CHOICE + "|(?<group1>[^\\.]+?))";
public static final String TARGETS = "((?<rnc1>rn's controller)|(?<tnc1>" + TNC + ")|(?<rn1>rn)|(?<sn1>sn)|(?<pn1>(pn||you))|" + CHOICE + "|(?<group1>[^\\.]+?))";
public static List<? extends MagicTarget> targets(final MagicEvent event, final Matcher m, final MagicTargetFilter<MagicTarget> filter) {
if (m.group("rnc1") != null) {
return Collections.singletonList(event.getRefObject().getController());
@ -206,7 +207,7 @@ public class ARG {
}
}
public static final String TARGETS2 = "((?<tnc2>(that [^ ]+'s|its) controller)|(?<rn2>rn)|(?<sn2>sn)|(?<pn2>(pn||you))|(?<group2>[^\\.]+?))";
public static final String TARGETS2 = "((?<tnc2>" + TNC + ")|(?<rn2>rn)|(?<sn2>sn)|(?<pn2>(pn||you))|(?<group2>[^\\.]+?))";
public static List<? extends MagicTarget> targets2(final MagicEvent event, final Matcher m, final MagicTargetFilter<MagicTarget> filter) {
if (m.group("tnc2") != null) {
return event.listTargetController();