Merge pull request #3424 from spjspj/master

Update Australian 7pt Highlander rules (to 24th April 2017) http://ww
This commit is contained in:
spjspj 2017-05-25 08:52:34 +10:00 committed by GitHub
commit b9a87ab8a2

View file

@ -89,14 +89,13 @@ public class AusHighlander extends Constructed {
for (Map.Entry<String, Integer> entry : counts.entrySet()) {
String cn = entry.getKey();
if (cn.equals("Balance")
if (cn.equals("Back to Basics")
|| cn.equals("Balance")
|| cn.equals("Birthing Pod")
|| cn.equals("Crop Rotation")
|| cn.equals("Dark Petition")
|| cn.equals("Dig Through Time")
|| cn.equals("Enlightened Tutor")
|| cn.equals("Fastbond")
|| cn.equals("Flash")
|| cn.equals("Force of Will")
|| cn.equals("Gifts Ungiven")
|| cn.equals("Green Sun's Zenith")
@ -109,12 +108,11 @@ public class AusHighlander extends Constructed {
|| cn.equals("Mana Vault")
|| cn.equals("Memory Jar")
|| cn.equals("Merchant Scroll")
|| cn.equals("Mind Twist")
|| cn.equals("Mishra's Workshop")
|| cn.equals("Muddle the Mixture")
|| cn.equals("Natural Order")
|| cn.equals("Oath of Druids")
|| cn.equals("Personal Tutor")
|| cn.equals("Protean Hulk")
|| cn.equals("Snapcaster Mage")
|| cn.equals("Steelshaper's Gift")
|| cn.equals("Stoneforge Mystic")
@ -134,15 +132,16 @@ public class AusHighlander extends Constructed {
}
if (cn.equals("Channel")
|| cn.equals("Dig Through Time")
|| cn.equals("Library of Alexandria")
|| cn.equals("Mana Crypt")
|| cn.equals("Mind Twist")
|| cn.equals("Mox Emerald")
|| cn.equals("Mox Jet")
|| cn.equals("Mox Pearl")
|| cn.equals("Mox Ruby")
|| cn.equals("Mox Sapphire")
|| cn.equals("Mystical Tutor")
|| cn.equals("Protean Hulk")
|| cn.equals("Skullclamp")
|| cn.equals("Strip Mine")
|| cn.equals("Tolarian Academy")) {
@ -153,7 +152,6 @@ public class AusHighlander extends Constructed {
if (cn.equals("Demonic Tutor")
|| cn.equals("Imperial Seal")
|| cn.equals("Sol Ring")
|| cn.equals("Time Vault")
|| cn.equals("Time Walk")
|| cn.equals("Tinker")
|| cn.equals("Vampiric Tutor")
@ -163,7 +161,8 @@ public class AusHighlander extends Constructed {
}
if (cn.equals("Ancestral Recall")
|| cn.equals("Black Lotus")) {
|| cn.equals("Black Lotus")
|| cn.equals("Time Vault")) {
totalPoints += 4;
invalid.put(cn, "4 points");
}