diff --git a/.gitattributes b/.gitattributes index 9c5dbb21ced..8e1dc5ac675 100644 --- a/.gitattributes +++ b/.gitattributes @@ -790,6 +790,7 @@ res/cardsfolder/creakwood_liege.txt -text svneol=native#text/plain res/cardsfolder/creeping_mold.txt -text svneol=native#text/plain res/cardsfolder/creeping_tar_pit.txt -text svneol=native#text/plain res/cardsfolder/crenellated_wall.txt -text svneol=native#text/plain +res/cardsfolder/crevasse.txt -text svneol=native#text/plain res/cardsfolder/crib_swap.txt -text svneol=native#text/plain res/cardsfolder/crimson_acolyte.txt -text svneol=native#text/plain res/cardsfolder/crimson_kobolds.txt -text svneol=native#text/plain @@ -896,6 +897,7 @@ res/cardsfolder/day_of_destiny.txt -text svneol=native#text/plain res/cardsfolder/day_of_judgment.txt -text svneol=native#text/plain res/cardsfolder/daze.txt -text svneol=native#text/plain res/cardsfolder/deadapult.txt -text svneol=native#text/plain +res/cardsfolder/deadfall.txt -text svneol=native#text/plain res/cardsfolder/deadly_grub.txt -text svneol=native#text/plain res/cardsfolder/deadly_insect.txt -text svneol=native#text/plain res/cardsfolder/deadly_recluse.txt -text svneol=native#text/plain @@ -1628,6 +1630,7 @@ res/cardsfolder/gorgon_recluse.txt -text svneol=native#text/plain res/cardsfolder/gorilla_chieftain.txt -text svneol=native#text/plain res/cardsfolder/gorilla_warrior.txt -text svneol=native#text/plain res/cardsfolder/gossamer_phantasm.txt -text svneol=native#text/plain +res/cardsfolder/gosta_dirk.txt -text svneol=native#text/plain res/cardsfolder/graceful_adept.txt -text svneol=native#text/plain res/cardsfolder/grand_arbiter_augustin_iv.txt -text svneol=native#text/plain res/cardsfolder/grand_coliseum.txt -text svneol=native#text/plain @@ -1653,6 +1656,7 @@ res/cardsfolder/grayscaled_gharial.txt -text svneol=native#text/plain res/cardsfolder/grazing_gladehart.txt -text svneol=native#text/plain res/cardsfolder/great_furnace.txt -text svneol=native#text/plain res/cardsfolder/great_sable_stag.txt -text svneol=native#text/plain +res/cardsfolder/great_wall.txt -text svneol=native#text/plain res/cardsfolder/greater_auramancy.txt -text svneol=native#text/plain res/cardsfolder/greater_basilisk.txt -text svneol=native#text/plain res/cardsfolder/greater_forgeling.txt -text svneol=native#text/plain @@ -2276,6 +2280,7 @@ res/cardsfolder/long_term_plans.txt -text svneol=native#text/plain res/cardsfolder/longbow_archer.txt -text svneol=native#text/plain res/cardsfolder/looming_hoverguard.txt -text svneol=native#text/plain res/cardsfolder/looming_shade.txt -text svneol=native#text/plain +res/cardsfolder/lord_magnus.txt -text svneol=native#text/plain res/cardsfolder/lord_of_atlantis.txt -text svneol=native#text/plain res/cardsfolder/lord_of_extinction.txt -text svneol=native#text/plain res/cardsfolder/lord_of_the_pit.txt -text svneol=native#text/plain @@ -2940,6 +2945,7 @@ res/cardsfolder/pyrohemia.txt -text svneol=native#text/plain res/cardsfolder/python.txt -text svneol=native#text/plain res/cardsfolder/qasali_pridemage.txt -text svneol=native#text/plain res/cardsfolder/quag_vampires.txt -text svneol=native#text/plain +res/cardsfolder/quagmire.txt -text svneol=native#text/plain res/cardsfolder/quagmire_druid.txt -text svneol=native#text/plain res/cardsfolder/quagmire_lamprey.txt -text svneol=native#text/plain res/cardsfolder/quick_sliver.txt -text svneol=native#text/plain @@ -4099,6 +4105,7 @@ res/cardsfolder/undercity_shade.txt -text svneol=native#text/plain res/cardsfolder/underground_river.txt -text svneol=native#text/plain res/cardsfolder/underground_sea.txt -text svneol=native#text/plain res/cardsfolder/undermine.txt -text svneol=native#text/plain +res/cardsfolder/undertow.txt -text svneol=native#text/plain res/cardsfolder/underworld_dreams.txt -text svneol=native#text/plain res/cardsfolder/undiscovered_paradise.txt -text svneol=native#text/plain res/cardsfolder/undying_beast.txt -text svneol=native#text/plain @@ -4118,6 +4125,7 @@ res/cardsfolder/unyaro_bee_sting.txt -text svneol=native#text/plain res/cardsfolder/unyaro_bees.txt -text svneol=native#text/plain res/cardsfolder/upheaval.txt -text svneol=native#text/plain res/cardsfolder/uproot.txt -text svneol=native#text/plain +res/cardsfolder/ur_drago.txt -text svneol=native#text/plain res/cardsfolder/ur_golems_eye.txt -text svneol=native#text/plain res/cardsfolder/urborg_drake.txt -text svneol=native#text/plain res/cardsfolder/urborg_elf.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/crevasse.txt b/res/cardsfolder/crevasse.txt new file mode 100644 index 00000000000..def4f5e9531 --- /dev/null +++ b/res/cardsfolder/crevasse.txt @@ -0,0 +1,8 @@ +Name:Crevasse +ManaCost:2 R +Types:Enchantment +Text:Creatures with mountainwalk can be blocked as though they didn't have mountainwalk. +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/crevasse.jpg +End diff --git a/res/cardsfolder/deadfall.txt b/res/cardsfolder/deadfall.txt new file mode 100644 index 00000000000..cdf5660b2c8 --- /dev/null +++ b/res/cardsfolder/deadfall.txt @@ -0,0 +1,8 @@ +Name:Deadfall +ManaCost:2 G +Types:Enchantment +Text:Creatures with forestwalk can be blocked as though they didn't have forestwalk. +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/deadfall.jpg +End diff --git a/res/cardsfolder/gosta_dirk.txt b/res/cardsfolder/gosta_dirk.txt new file mode 100644 index 00000000000..c865b803db4 --- /dev/null +++ b/res/cardsfolder/gosta_dirk.txt @@ -0,0 +1,10 @@ +Name:Gosta Dirk +ManaCost:3 W W U U +Types:Legendary Creature Human Warrior +Text:Creatures with islandwalk can be blocked as though they didn't have islandwalk. +PT:4/4 +K:First Strike +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/gosta_dirk.jpg +End diff --git a/res/cardsfolder/great_wall.txt b/res/cardsfolder/great_wall.txt new file mode 100644 index 00000000000..4e647bcbbca --- /dev/null +++ b/res/cardsfolder/great_wall.txt @@ -0,0 +1,8 @@ +Name:Great Wall +ManaCost:2 W +Types:Enchantment +Text:Creatures with plainswalk can be blocked as though they didn't have plainswalk. +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/great_wall.jpg +End diff --git a/res/cardsfolder/lord_magnus.txt b/res/cardsfolder/lord_magnus.txt new file mode 100644 index 00000000000..ece10954ad1 --- /dev/null +++ b/res/cardsfolder/lord_magnus.txt @@ -0,0 +1,10 @@ +Name:Lord Magnus +ManaCost:3 G W W +Types:Legendary Creature Human Druid +Text:Creatures with plainswalk can be blocked as though they didn't have plainswalk.\r\nCreatures with forestwalk can be blocked as though they didn't have forestwalk. +PT:4/3 +K:First Strike +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/lord_magnus.jpg +End diff --git a/res/cardsfolder/quagmire.txt b/res/cardsfolder/quagmire.txt new file mode 100644 index 00000000000..76a32bca9d6 --- /dev/null +++ b/res/cardsfolder/quagmire.txt @@ -0,0 +1,8 @@ +Name:Quagmire +ManaCost:2 B +Types:Enchantment +Text:Creatures with swampwalk can be blocked as though they didn't have swampwalk. +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/quagmire.jpg +End diff --git a/res/cardsfolder/undertow.txt b/res/cardsfolder/undertow.txt new file mode 100644 index 00000000000..36f27463a15 --- /dev/null +++ b/res/cardsfolder/undertow.txt @@ -0,0 +1,8 @@ +Name:Undertow +ManaCost:2 U +Types:Enchantment +Text:Creatures with islandwalk can be blocked as though they didn't have uslandwalk. +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/undertow.jpg +End diff --git a/res/cardsfolder/ur_drago.txt b/res/cardsfolder/ur_drago.txt new file mode 100644 index 00000000000..20068490bdd --- /dev/null +++ b/res/cardsfolder/ur_drago.txt @@ -0,0 +1,10 @@ +Name:Ur-Drago +ManaCost:3 U U B B +Types:Legendary Creature Elemental +Text:Creatures with swampwalk can be blocked as though they didn't have swampwalk. +PT:4/4 +K:First Strike +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/ur_drago.jpg +End diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index 91f96599450..4d96f0aab4b 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -118,27 +118,31 @@ public class CombatUtil { if(attacker.getKeyword().contains("Plainswalk")) { temp = blkCL.getType("Plains"); - if(!temp.isEmpty()) return false; + if(!AllZoneUtil.isCardInPlay("Lord Magnus") + && !AllZoneUtil.isCardInPlay("Great Wall") + && !temp.isEmpty()) return false; } if(attacker.getKeyword().contains("Islandwalk")) { temp = blkCL.getType("Island"); - if(!temp.isEmpty()) return false; + if(!AllZoneUtil.isCardInPlay("Undertow") && !AllZoneUtil.isCardInPlay("Gosta Dirk") && !temp.isEmpty()) return false; } if(attacker.getKeyword().contains("Swampwalk")) { temp = blkCL.getType("Swamp"); - if(!temp.isEmpty()) return false; + if(!AllZoneUtil.isCardInPlay("Ur-drago") && !AllZoneUtil.isCardInPlay("Quagmire") && !temp.isEmpty()) return false; } if(attacker.getKeyword().contains("Mountainwalk")) { temp = blkCL.getType("Mountain"); - if(!temp.isEmpty()) return false; + if(!AllZoneUtil.isCardInPlay("Crevasse") && !temp.isEmpty()) return false; } if(attacker.getKeyword().contains("Forestwalk")) { temp = blkCL.getType("Forest"); - if(!temp.isEmpty()) return false; + if(!AllZoneUtil.isCardInPlay("Lord Magnus") + && !AllZoneUtil.isCardInPlay("Deadfall") + && !temp.isEmpty()) return false; } if(attacker.getKeyword().contains("Legendary landwalk")) {