From a5f7855e036fef27f8b54ce72ccbb11bdf73c606 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Thu, 14 Mar 2013 03:29:35 +0000
Subject: [PATCH 1/6] - Added Mercadian Atlas

---
 .gitattributes                        |  1 +
 res/cardsfolder/m/mercadian_atlas.txt |  9 +++++++++
 res/mtg-data.txt                      | 10 +++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 res/cardsfolder/m/mercadian_atlas.txt

diff --git a/.gitattributes b/.gitattributes
index cdcaa9bc2f6..c93f9a1dafa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6519,6 +6519,7 @@ res/cardsfolder/m/mental_vapors.txt -text
 res/cardsfolder/m/mentor_of_the_meek.txt -text
 res/cardsfolder/m/mephidross_vampire.txt svneol=native#text/plain
 res/cardsfolder/m/mephitic_ooze.txt svneol=native#text/plain
+res/cardsfolder/m/mercadian_atlas.txt -text
 res/cardsfolder/m/mercadian_lift.txt -text
 res/cardsfolder/m/mercenary_informer.txt svneol=native#text/plain
 res/cardsfolder/m/mercenary_knight.txt -text
diff --git a/res/cardsfolder/m/mercadian_atlas.txt b/res/cardsfolder/m/mercadian_atlas.txt
new file mode 100644
index 00000000000..f56da9590af
--- /dev/null
+++ b/res/cardsfolder/m/mercadian_atlas.txt
@@ -0,0 +1,9 @@
+Name:Mercadian Atlas
+ManaCost:5
+Types:Artifact
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ AtlasDraw | CheckSVar$ X | SVarCompare$ EQ0 | Optional$ True | TriggerDescription$ At the beginning of your end step, if you didn't play a land this turn, you may draw a card.
+SVar:AtlasDraw:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:X:Count$YourLandsPlayed
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mercadian_atlas.jpg
+Oracle:At the beginning of your end step, if you didn't play a land this turn, you may draw a card.
+SetInfo:MMQ Rare
\ No newline at end of file
diff --git a/res/mtg-data.txt b/res/mtg-data.txt
index 57fc8ca6e21..4b7d848272d 100644
--- a/res/mtg-data.txt
+++ b/res/mtg-data.txt
@@ -26985,7 +26985,7 @@ Ice
 Instant
 Tap target permanent.
 Draw a card.
-AP U (x2), CMD U, DDJ U
+AP U, CMD U, DDJ U
 
 Fire Ambush
 {1}{R}
@@ -38485,7 +38485,7 @@ Reality
 {2}{G}
 Instant
 Destroy target artifact.
-AP U (x2)
+AP U
 
 Illusionary Forces
 {3}{U}
@@ -45343,7 +45343,7 @@ Death
 {1}{B}
 Sorcery
 Return target creature card from your graveyard to the battlefield. You lose life equal to its converted mana cost.
-AP U (x2), DDJ U
+AP U, DDJ U
 
 Life Burst
 {1}{W}
@@ -54219,7 +54219,7 @@ Day
 {2}{W}
 Instant
 Creatures target player controls get +1/+1 until end of turn.
-AP U (x2)
+AP U
 
 Night Dealings
 {2}{B}{B}
@@ -56353,7 +56353,7 @@ Chaos
 {2}{R}
 Instant
 Creatures can't block this turn.
-AP U (x2), HOP U
+AP U, HOP U
 
 Order of Leitbur
 {W}{W}

From 5e687f98b983ab8e407d4c5a89bccdb34711267d Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Thu, 14 Mar 2013 08:24:50 +0000
Subject: [PATCH 2/6] - Fixed AI using Man-o'-War.

---
 res/cardsfolder/m/man_o_war.txt                       | 1 +
 src/main/java/forge/card/ability/ai/ChangeZoneAi.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/cardsfolder/m/man_o_war.txt b/res/cardsfolder/m/man_o_war.txt
index 6c530e60036..a00276a6398 100644
--- a/res/cardsfolder/m/man_o_war.txt
+++ b/res/cardsfolder/m/man_o_war.txt
@@ -4,6 +4,7 @@ Types:Creature Jellyfish
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
 SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
+SVar:PlayMain1:TRUE
 SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4266.jpg
 Oracle:When Man-o'-War enters the battlefield, return target creature to its owner's hand.
 SetInfo:VIS Common
diff --git a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
index b9d572d06bf..43d741c1196 100644
--- a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
+++ b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
@@ -745,7 +745,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
                     }
                 }
                 // Blink permanents with ETB triggers
-                else if (SpellAbilityAi.playReusable(ai, sa)) {
+                else if (!sa.isTrigger() && SpellAbilityAi.playReusable(ai, sa)) {
                     aiPermanents = CardLists.filter(aiPermanents, new Predicate<Card>() {
                         @Override
                         public boolean apply(final Card c) {
@@ -755,7 +755,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
                             // counters TODO check good and
                             // bad counters
                             // checks only if there is a dangerous ETB effect
-                            return SpellPermanent.checkETBEffects(c, ai);
+                            return !c.equals(sa.getSourceCard()) && SpellPermanent.checkETBEffects(c, ai);
                         }
                     });
                     if (!aiPermanents.isEmpty()) {

From 32b2b6a2c13240ea85261a5c239a285cf4654981 Mon Sep 17 00:00:00 2001
From: RumbleBBU <rumblebbu@cardforge.org>
Date: Thu, 14 Mar 2013 08:45:26 +0000
Subject: [PATCH 3/6] As a stopgap measure, replaced some cards that currently
 crash the game in the Jamuraa AI decks with ones that do not.

---
 res/quest/world/jamuraa/challenges/quest3009.dck  | 2 +-
 res/quest/world/jamuraa/duels/Black Talon 3.dck   | 3 ++-
 res/quest/world/jamuraa/duels/Black Talon 4.dck   | 3 ++-
 res/quest/world/jamuraa/duels/Horus 4.dck         | 3 ++-
 res/quest/world/jamuraa/duels/Impundulu 4.dck     | 2 +-
 res/quest/world/jamuraa/duels/Jengu 4.dck         | 2 +-
 res/quest/world/jamuraa/duels/MamanBrigitte 2.dck | 2 +-
 res/quest/world/jamuraa/duels/Mawu 3.dck          | 2 +-
 res/quest/world/jamuraa/duels/Nana Buruku 2.dck   | 6 ++++--
 res/quest/world/jamuraa/duels/Nana Buruku 3.dck   | 5 +++--
 res/quest/world/jamuraa/duels/Osiris 3.dck        | 6 ++++--
 res/quest/world/jamuraa/duels/Osiris 4.dck        | 5 +++--
 res/quest/world/jamuraa/duels/Oya 4.dck           | 3 ++-
 res/quest/world/jamuraa/duels/Sakpata 3.dck       | 2 +-
 res/quest/world/jamuraa/duels/Storm 2.dck         | 3 ++-
 res/quest/world/jamuraa/duels/Were-Hyena 2.dck    | 5 +++--
 res/quest/world/jamuraa/duels/Yemaya 4.dck        | 3 ++-
 17 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/res/quest/world/jamuraa/challenges/quest3009.dck b/res/quest/world/jamuraa/challenges/quest3009.dck
index 7ae671b67e1..04a1c760324 100644
--- a/res/quest/world/jamuraa/challenges/quest3009.dck
+++ b/res/quest/world/jamuraa/challenges/quest3009.dck
@@ -24,7 +24,7 @@ Deck Type=constructed
 1 Kaervek's Spite|VIS
 3 Kaervek's Torch|MIR
 10 Mountain|MIR
-1 Necromancy|VIS
+1 Animate Dead|5ED
 2 Quicksand|VIS
 4 Rocky Tar Pit|MIR
 3 Shadow Guildmage|MIR
diff --git a/res/quest/world/jamuraa/duels/Black Talon 3.dck b/res/quest/world/jamuraa/duels/Black Talon 3.dck
index a52fa2495dc..5650e816593 100644
--- a/res/quest/world/jamuraa/duels/Black Talon 3.dck	
+++ b/res/quest/world/jamuraa/duels/Black Talon 3.dck	
@@ -13,7 +13,8 @@ Deck Type=constructed
 2 Bone Harvest|MIR
 3 Brass Man|ARN
 3 Charcoal Diamond|MIR
-3 Contagion|ALL
+2 Serrated Arrows|HML
+1 Pestilence|5ED
 4 Erg Raiders|ARN
 4 Hypnotic Specter|LEB
 4 Mishra's Factory|ATQ
diff --git a/res/quest/world/jamuraa/duels/Black Talon 4.dck b/res/quest/world/jamuraa/duels/Black Talon 4.dck
index 14e9100b464..883099bd050 100644
--- a/res/quest/world/jamuraa/duels/Black Talon 4.dck	
+++ b/res/quest/world/jamuraa/duels/Black Talon 4.dck	
@@ -14,7 +14,8 @@ Card Reward=14% chosen card sets:5ED,MIR,VIS rules:black,creature rarity:C,U des
 1 Brass Man|ARN
 2 Charcoal Diamond|MIR
 2 Choking Sands|MIR
-3 Contagion|ALL
+2 Serrated Arrows|HML
+1 Pestilence|5ED
 2 Dark Banishing|ICE
 4 Hypnotic Specter|LEB
 2 Insidious Bookworms|ALL
diff --git a/res/quest/world/jamuraa/duels/Horus 4.dck b/res/quest/world/jamuraa/duels/Horus 4.dck
index 8ed7bee1d57..07c52e367ca 100644
--- a/res/quest/world/jamuraa/duels/Horus 4.dck	
+++ b/res/quest/world/jamuraa/duels/Horus 4.dck	
@@ -9,6 +9,7 @@ Deck Type=constructed
 Card Reward=14% chosen card sets:5ED,MIR,VIS rules:white,creature rarity:C,U desc:a White Creature
 [main]
 1 Basalt Monolith|LEB
+1 Boomerang|5ED
 3 Clone|LEB
 3 Counterspell|5ED
 3 Fireball|LEB
@@ -16,7 +17,7 @@ Card Reward=14% chosen card sets:5ED,MIR,VIS rules:white,creature rarity:C,U des
 7 Island|MIR
 3 Kismet|LEG
 3 Lightning Bolt|LEB
-3 Man-o'-War|VIS
+2 Time Elemental|5ED
 6 Mountain|MIR
 7 Plains|MIR
 2 Plateau|LEB
diff --git a/res/quest/world/jamuraa/duels/Impundulu 4.dck b/res/quest/world/jamuraa/duels/Impundulu 4.dck
index 4558b74bfc8..e97d7a37d1a 100644
--- a/res/quest/world/jamuraa/duels/Impundulu 4.dck	
+++ b/res/quest/world/jamuraa/duels/Impundulu 4.dck	
@@ -16,7 +16,7 @@ Card Reward=14% chosen card sets:5ED,MIR,VIS rules:blue,creature rarity:C,U desc
 4 Force of Will|ALL
 2 Icy Manipulator|LEB
 8 Island|MIR
-2 Man-o'-War|VIS
+2 Time Elemental|5ED
 3 Phyrexian War Beast|ALL
 4 Quicksand|VIS
 4 Sky Diamond|MIR
diff --git a/res/quest/world/jamuraa/duels/Jengu 4.dck b/res/quest/world/jamuraa/duels/Jengu 4.dck
index b6bf96e6c8e..e97b1a7fb7b 100644
--- a/res/quest/world/jamuraa/duels/Jengu 4.dck	
+++ b/res/quest/world/jamuraa/duels/Jengu 4.dck	
@@ -17,7 +17,7 @@ Card Reward=20% Waterspout Djinn|VIS
 3 Floodgate|MIR
 3 Impulse|VIS
 16 Island|MIR
-4 Man-o'-War|VIS
+4 Time Elemental|5ED
 4 Memory Lapse|MIR
 1 Plains|MIR
 4 Quicksand|VIS
diff --git a/res/quest/world/jamuraa/duels/MamanBrigitte 2.dck b/res/quest/world/jamuraa/duels/MamanBrigitte 2.dck
index 6d842afdb2f..b2d732afb91 100644
--- a/res/quest/world/jamuraa/duels/MamanBrigitte 2.dck	
+++ b/res/quest/world/jamuraa/duels/MamanBrigitte 2.dck	
@@ -22,7 +22,7 @@ Deck Type=constructed
 12 Island|MIR
 2 Kukemssa Serpent|MIR
 2 Man-o'-War|VIS
-2 Necromancy|VIS
+2 Animate Dead|5ED
 1 Necrosavant|VIS
 1 Nekrataal|VIS
 1 Ray of Command|MIR
diff --git a/res/quest/world/jamuraa/duels/Mawu 3.dck b/res/quest/world/jamuraa/duels/Mawu 3.dck
index 2f896cb04fa..13a6a3550b2 100644
--- a/res/quest/world/jamuraa/duels/Mawu 3.dck	
+++ b/res/quest/world/jamuraa/duels/Mawu 3.dck	
@@ -16,7 +16,7 @@ Deck Type=constructed
 5 Island|MIR
 2 Kaervek's Torch|MIR
 4 Mountain|MIR
-2 Necromancy|VIS
+2 Animate Dead|5ED
 1 Necrosavant|VIS
 4 Nekrataal|VIS
 3 Power Sink|5ED
diff --git a/res/quest/world/jamuraa/duels/Nana Buruku 2.dck b/res/quest/world/jamuraa/duels/Nana Buruku 2.dck
index affb440355c..2257622ee4f 100644
--- a/res/quest/world/jamuraa/duels/Nana Buruku 2.dck	
+++ b/res/quest/world/jamuraa/duels/Nana Buruku 2.dck	
@@ -7,16 +7,18 @@ Difficulty=medium
 Description=Jakub Slemr's '4-color Black' deck from the 1997 Worlds tournament.
 Deck Type=constructed
 [main]
+2 Boomerang|5ED
 4 Black Knight|5ED
 4 Choking Sands|MIR
 3 City of Brass|5ED
-4 Contagion|ALL
+3 Serrated Arrows|HML
+1 Pestilence|5ED
 2 Earthquake|LEB
 4 Fallen Askari|VIS
 3 Gemstone Mine|WTH
 4 Incinerate|MIR
 4 Knight of Stromgald|ICE
-4 Man-o'-War|VIS
+2 Time Elemental|5ED
 1 Necratog|WTH
 4 Nekrataal|VIS
 2 Shadow Guildmage|MIR
diff --git a/res/quest/world/jamuraa/duels/Nana Buruku 3.dck b/res/quest/world/jamuraa/duels/Nana Buruku 3.dck
index 67d1c573ae6..3fd5630adae 100644
--- a/res/quest/world/jamuraa/duels/Nana Buruku 3.dck	
+++ b/res/quest/world/jamuraa/duels/Nana Buruku 3.dck	
@@ -8,12 +8,13 @@ Description=Szwedowski's '4-Color Black' deck.
 Deck Type=constructed
 [main]
 4 Arcane Denial|ALL
+2 Boomerang|5ED
 3 City of Brass|5ED
-2 Contagion|ALL
+2 Serrated Arrows|HML
 4 Fallen Askari|VIS
 4 Incinerate|MIR
 2 Island|MIR
-4 Man-o'-War|VIS
+2 Time Elemental|5ED
 3 Mountain|MIR
 4 Nekrataal|VIS
 1 Pyrokinesis|ALL
diff --git a/res/quest/world/jamuraa/duels/Osiris 3.dck b/res/quest/world/jamuraa/duels/Osiris 3.dck
index db499ae5786..fe3807b4d95 100644
--- a/res/quest/world/jamuraa/duels/Osiris 3.dck	
+++ b/res/quest/world/jamuraa/duels/Osiris 3.dck	
@@ -9,13 +9,15 @@ Deck Type=constructed
 [main]
 4 Bad River|MIR
 4 Black Knight|5ED
+2 Boomerang|5ED
 3 Choking Sands|MIR
-4 Contagion|ALL
+3 Serrated Arrows|HML
+1 Pestilence|5ED
 4 Erg Raiders|ARN
 4 Fallen Askari|VIS
 2 Island|ZEN
 4 Knight of Stromgald|ICE
-4 Man-o'-War|VIS
+2 Time Elemental|5ED
 4 Memory Lapse|MIR
 4 Nekrataal|VIS
 1 Stench of Decay|ALL
diff --git a/res/quest/world/jamuraa/duels/Osiris 4.dck b/res/quest/world/jamuraa/duels/Osiris 4.dck
index 8f6c928b0c1..436d7f1f3cb 100644
--- a/res/quest/world/jamuraa/duels/Osiris 4.dck	
+++ b/res/quest/world/jamuraa/duels/Osiris 4.dck	
@@ -10,13 +10,14 @@ Card Reward=14% duplicate card;8% Winter Orb|2ED
 [main]
 2 Arcane Denial|ALL
 4 Black Knight|5ED
+2 Boomerang|5ED
 1 City of Brass|5ED
-2 Contagion|ALL
+2 Serrated Arrows|HML
 3 Erg Raiders|ARN
 4 Fallen Askari|VIS
 3 Island|MIR
 3 Knight of Stromgald|ICE
-3 Man-o'-War|VIS
+2 Time Elemental|5ED
 4 Memory Lapse|MIR
 3 Nekrataal|VIS
 2 Phyrexian War Beast|ALL
diff --git a/res/quest/world/jamuraa/duels/Oya 4.dck b/res/quest/world/jamuraa/duels/Oya 4.dck
index 3822418fcd7..441b2e749d3 100644
--- a/res/quest/world/jamuraa/duels/Oya 4.dck	
+++ b/res/quest/world/jamuraa/duels/Oya 4.dck	
@@ -8,13 +8,14 @@ Description=Oya plays RB 'Blue Fire' deck.
 Deck Type=constructed
 Card Reward=20% Kaervek's Torch|MIR
 [main]
+2 Boomerang|5ED
 3 Dissipate|MIR
 3 Fireblast|VIS
 2 Goblin Elite Infantry|MIR
 4 Incinerate|MIR
 10 Island|MIR
 4 Kaervek's Torch|MIR
-4 Man-o'-War|VIS
+2 Time Elemental|5ED
 4 Memory Lapse|MIR
 14 Mountain|MIR
 4 Ophidian|WTH
diff --git a/res/quest/world/jamuraa/duels/Sakpata 3.dck b/res/quest/world/jamuraa/duels/Sakpata 3.dck
index aa6aecfb2db..ed925c9a801 100644
--- a/res/quest/world/jamuraa/duels/Sakpata 3.dck	
+++ b/res/quest/world/jamuraa/duels/Sakpata 3.dck	
@@ -9,7 +9,7 @@ Deck Type=constructed
 [main]
 4 Black Knight|5ED
 3 Choking Sands|MIR
-2 Contagion|ALL
+2 Pestilence|5ED
 2 Crypt Rats|VIS
 2 Dancing Scimitar|ARN
 3 Drain Life|MIR
diff --git a/res/quest/world/jamuraa/duels/Storm 2.dck b/res/quest/world/jamuraa/duels/Storm 2.dck
index 95979c0052f..c15f0ecc9f1 100644
--- a/res/quest/world/jamuraa/duels/Storm 2.dck	
+++ b/res/quest/world/jamuraa/duels/Storm 2.dck	
@@ -7,13 +7,14 @@ Difficulty=medium
 Description=Storm plays a modified version of Darwin Kastle's 'Sumu' deck from PT Paris 1997.
 Deck Type=constructed
 [main]
+2 Boomerang|5ED
 4 Cloud Elemental|VIS
 4 Fireblast|VIS
 4 Goblin Elite Infantry|MIR
 4 Incinerate|MIR
 10 Island|MIR
 4 Kaervek's Torch|MIR
-4 Man-o'-War|VIS
+2 Time Elemental|5ED
 4 Memory Lapse|MIR
 14 Mountain|MIR
 4 Suq'Ata Lancer|VIS
diff --git a/res/quest/world/jamuraa/duels/Were-Hyena 2.dck b/res/quest/world/jamuraa/duels/Were-Hyena 2.dck
index a9495aba38f..54f4a1c5716 100644
--- a/res/quest/world/jamuraa/duels/Were-Hyena 2.dck	
+++ b/res/quest/world/jamuraa/duels/Were-Hyena 2.dck	
@@ -8,14 +8,15 @@ Description=Gbadu plays Jason Zila's BU Rat deck.
 Deck Type=constructed
 [main]
 4 Bad River|MIR
+2 Boomerang|5ED
 4 Cloud Elemental|VIS
 4 Crypt Rats|VIS
 2 Dissipate|MIR
 4 Drain Life|MIR
 3 Impulse|VIS
 6 Island|MIR
-4 Man-o'-War|VIS
-2 Necromancy|VIS
+2 Time Elemental|5ED
+2 Animate Dead|5ED
 4 Nekrataal|VIS
 4 Power Sink|5ED
 2 Quicksand|VIS
diff --git a/res/quest/world/jamuraa/duels/Yemaya 4.dck b/res/quest/world/jamuraa/duels/Yemaya 4.dck
index 31532e6d17c..ac6238390fa 100644
--- a/res/quest/world/jamuraa/duels/Yemaya 4.dck	
+++ b/res/quest/world/jamuraa/duels/Yemaya 4.dck	
@@ -8,6 +8,7 @@ Description=Yemaya plays Sheppard's 'Comerish Turbo-Xerox' deck.
 Deck Type=constructed
 Card Reward=15% duplicate card
 [main]
+2 Boomerang|5ED
 4 Brainstorm|ICE
 4 Counterspell|5ED
 3 Dissipate|MIR
@@ -16,7 +17,7 @@ Card Reward=15% duplicate card
 1 Foresight|ALL
 4 Impulse|VIS
 14 Island|MIR
-3 Man-o'-War|VIS
+2 Time Elemental|5ED
 4 Memory Lapse|MIR
 4 Portent|ICE
 3 Power Sink|5ED

From 2b154db93d7b4c16d9249ee7059ee267b2579d79 Mon Sep 17 00:00:00 2001
From: RumbleBBU <rumblebbu@cardforge.org>
Date: Thu, 14 Mar 2013 08:51:52 +0000
Subject: [PATCH 4/6] Restored Man-o'-War to some decks after the recent fix.

---
 res/quest/world/jamuraa/duels/Horus 4.dck       | 3 +--
 res/quest/world/jamuraa/duels/Impundulu 4.dck   | 2 +-
 res/quest/world/jamuraa/duels/Jengu 4.dck       | 2 +-
 res/quest/world/jamuraa/duels/Nana Buruku 2.dck | 3 +--
 res/quest/world/jamuraa/duels/Nana Buruku 3.dck | 3 +--
 res/quest/world/jamuraa/duels/Osiris 3.dck      | 3 +--
 res/quest/world/jamuraa/duels/Osiris 4.dck      | 3 +--
 res/quest/world/jamuraa/duels/Oya 4.dck         | 3 +--
 res/quest/world/jamuraa/duels/Storm 2.dck       | 3 +--
 res/quest/world/jamuraa/duels/Were-Hyena 2.dck  | 3 +--
 res/quest/world/jamuraa/duels/Yemaya 4.dck      | 3 +--
 11 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/res/quest/world/jamuraa/duels/Horus 4.dck b/res/quest/world/jamuraa/duels/Horus 4.dck
index 07c52e367ca..8ed7bee1d57 100644
--- a/res/quest/world/jamuraa/duels/Horus 4.dck	
+++ b/res/quest/world/jamuraa/duels/Horus 4.dck	
@@ -9,7 +9,6 @@ Deck Type=constructed
 Card Reward=14% chosen card sets:5ED,MIR,VIS rules:white,creature rarity:C,U desc:a White Creature
 [main]
 1 Basalt Monolith|LEB
-1 Boomerang|5ED
 3 Clone|LEB
 3 Counterspell|5ED
 3 Fireball|LEB
@@ -17,7 +16,7 @@ Card Reward=14% chosen card sets:5ED,MIR,VIS rules:white,creature rarity:C,U des
 7 Island|MIR
 3 Kismet|LEG
 3 Lightning Bolt|LEB
-2 Time Elemental|5ED
+3 Man-o'-War|VIS
 6 Mountain|MIR
 7 Plains|MIR
 2 Plateau|LEB
diff --git a/res/quest/world/jamuraa/duels/Impundulu 4.dck b/res/quest/world/jamuraa/duels/Impundulu 4.dck
index e97d7a37d1a..4558b74bfc8 100644
--- a/res/quest/world/jamuraa/duels/Impundulu 4.dck	
+++ b/res/quest/world/jamuraa/duels/Impundulu 4.dck	
@@ -16,7 +16,7 @@ Card Reward=14% chosen card sets:5ED,MIR,VIS rules:blue,creature rarity:C,U desc
 4 Force of Will|ALL
 2 Icy Manipulator|LEB
 8 Island|MIR
-2 Time Elemental|5ED
+2 Man-o'-War|VIS
 3 Phyrexian War Beast|ALL
 4 Quicksand|VIS
 4 Sky Diamond|MIR
diff --git a/res/quest/world/jamuraa/duels/Jengu 4.dck b/res/quest/world/jamuraa/duels/Jengu 4.dck
index e97b1a7fb7b..b6bf96e6c8e 100644
--- a/res/quest/world/jamuraa/duels/Jengu 4.dck	
+++ b/res/quest/world/jamuraa/duels/Jengu 4.dck	
@@ -17,7 +17,7 @@ Card Reward=20% Waterspout Djinn|VIS
 3 Floodgate|MIR
 3 Impulse|VIS
 16 Island|MIR
-4 Time Elemental|5ED
+4 Man-o'-War|VIS
 4 Memory Lapse|MIR
 1 Plains|MIR
 4 Quicksand|VIS
diff --git a/res/quest/world/jamuraa/duels/Nana Buruku 2.dck b/res/quest/world/jamuraa/duels/Nana Buruku 2.dck
index 2257622ee4f..1f6b313e96e 100644
--- a/res/quest/world/jamuraa/duels/Nana Buruku 2.dck	
+++ b/res/quest/world/jamuraa/duels/Nana Buruku 2.dck	
@@ -7,7 +7,6 @@ Difficulty=medium
 Description=Jakub Slemr's '4-color Black' deck from the 1997 Worlds tournament.
 Deck Type=constructed
 [main]
-2 Boomerang|5ED
 4 Black Knight|5ED
 4 Choking Sands|MIR
 3 City of Brass|5ED
@@ -18,7 +17,7 @@ Deck Type=constructed
 3 Gemstone Mine|WTH
 4 Incinerate|MIR
 4 Knight of Stromgald|ICE
-2 Time Elemental|5ED
+4 Man-o'-War|VIS
 1 Necratog|WTH
 4 Nekrataal|VIS
 2 Shadow Guildmage|MIR
diff --git a/res/quest/world/jamuraa/duels/Nana Buruku 3.dck b/res/quest/world/jamuraa/duels/Nana Buruku 3.dck
index 3fd5630adae..8d63538d2f9 100644
--- a/res/quest/world/jamuraa/duels/Nana Buruku 3.dck	
+++ b/res/quest/world/jamuraa/duels/Nana Buruku 3.dck	
@@ -8,13 +8,12 @@ Description=Szwedowski's '4-Color Black' deck.
 Deck Type=constructed
 [main]
 4 Arcane Denial|ALL
-2 Boomerang|5ED
 3 City of Brass|5ED
 2 Serrated Arrows|HML
 4 Fallen Askari|VIS
 4 Incinerate|MIR
 2 Island|MIR
-2 Time Elemental|5ED
+4 Man-o'-War|VIS
 3 Mountain|MIR
 4 Nekrataal|VIS
 1 Pyrokinesis|ALL
diff --git a/res/quest/world/jamuraa/duels/Osiris 3.dck b/res/quest/world/jamuraa/duels/Osiris 3.dck
index fe3807b4d95..c626c7018e3 100644
--- a/res/quest/world/jamuraa/duels/Osiris 3.dck	
+++ b/res/quest/world/jamuraa/duels/Osiris 3.dck	
@@ -9,7 +9,6 @@ Deck Type=constructed
 [main]
 4 Bad River|MIR
 4 Black Knight|5ED
-2 Boomerang|5ED
 3 Choking Sands|MIR
 3 Serrated Arrows|HML
 1 Pestilence|5ED
@@ -17,7 +16,7 @@ Deck Type=constructed
 4 Fallen Askari|VIS
 2 Island|ZEN
 4 Knight of Stromgald|ICE
-2 Time Elemental|5ED
+4 Man-o'-War|VIS
 4 Memory Lapse|MIR
 4 Nekrataal|VIS
 1 Stench of Decay|ALL
diff --git a/res/quest/world/jamuraa/duels/Osiris 4.dck b/res/quest/world/jamuraa/duels/Osiris 4.dck
index 436d7f1f3cb..b7774185d33 100644
--- a/res/quest/world/jamuraa/duels/Osiris 4.dck	
+++ b/res/quest/world/jamuraa/duels/Osiris 4.dck	
@@ -10,14 +10,13 @@ Card Reward=14% duplicate card;8% Winter Orb|2ED
 [main]
 2 Arcane Denial|ALL
 4 Black Knight|5ED
-2 Boomerang|5ED
 1 City of Brass|5ED
 2 Serrated Arrows|HML
 3 Erg Raiders|ARN
 4 Fallen Askari|VIS
 3 Island|MIR
 3 Knight of Stromgald|ICE
-2 Time Elemental|5ED
+4 Man-o'-War|VIS
 4 Memory Lapse|MIR
 3 Nekrataal|VIS
 2 Phyrexian War Beast|ALL
diff --git a/res/quest/world/jamuraa/duels/Oya 4.dck b/res/quest/world/jamuraa/duels/Oya 4.dck
index 441b2e749d3..3822418fcd7 100644
--- a/res/quest/world/jamuraa/duels/Oya 4.dck	
+++ b/res/quest/world/jamuraa/duels/Oya 4.dck	
@@ -8,14 +8,13 @@ Description=Oya plays RB 'Blue Fire' deck.
 Deck Type=constructed
 Card Reward=20% Kaervek's Torch|MIR
 [main]
-2 Boomerang|5ED
 3 Dissipate|MIR
 3 Fireblast|VIS
 2 Goblin Elite Infantry|MIR
 4 Incinerate|MIR
 10 Island|MIR
 4 Kaervek's Torch|MIR
-2 Time Elemental|5ED
+4 Man-o'-War|VIS
 4 Memory Lapse|MIR
 14 Mountain|MIR
 4 Ophidian|WTH
diff --git a/res/quest/world/jamuraa/duels/Storm 2.dck b/res/quest/world/jamuraa/duels/Storm 2.dck
index c15f0ecc9f1..95979c0052f 100644
--- a/res/quest/world/jamuraa/duels/Storm 2.dck	
+++ b/res/quest/world/jamuraa/duels/Storm 2.dck	
@@ -7,14 +7,13 @@ Difficulty=medium
 Description=Storm plays a modified version of Darwin Kastle's 'Sumu' deck from PT Paris 1997.
 Deck Type=constructed
 [main]
-2 Boomerang|5ED
 4 Cloud Elemental|VIS
 4 Fireblast|VIS
 4 Goblin Elite Infantry|MIR
 4 Incinerate|MIR
 10 Island|MIR
 4 Kaervek's Torch|MIR
-2 Time Elemental|5ED
+4 Man-o'-War|VIS
 4 Memory Lapse|MIR
 14 Mountain|MIR
 4 Suq'Ata Lancer|VIS
diff --git a/res/quest/world/jamuraa/duels/Were-Hyena 2.dck b/res/quest/world/jamuraa/duels/Were-Hyena 2.dck
index 54f4a1c5716..b003376c7d4 100644
--- a/res/quest/world/jamuraa/duels/Were-Hyena 2.dck	
+++ b/res/quest/world/jamuraa/duels/Were-Hyena 2.dck	
@@ -8,14 +8,13 @@ Description=Gbadu plays Jason Zila's BU Rat deck.
 Deck Type=constructed
 [main]
 4 Bad River|MIR
-2 Boomerang|5ED
 4 Cloud Elemental|VIS
 4 Crypt Rats|VIS
 2 Dissipate|MIR
 4 Drain Life|MIR
 3 Impulse|VIS
 6 Island|MIR
-2 Time Elemental|5ED
+4 Man-o'-War|VIS
 2 Animate Dead|5ED
 4 Nekrataal|VIS
 4 Power Sink|5ED
diff --git a/res/quest/world/jamuraa/duels/Yemaya 4.dck b/res/quest/world/jamuraa/duels/Yemaya 4.dck
index ac6238390fa..82982929ae9 100644
--- a/res/quest/world/jamuraa/duels/Yemaya 4.dck	
+++ b/res/quest/world/jamuraa/duels/Yemaya 4.dck	
@@ -8,7 +8,6 @@ Description=Yemaya plays Sheppard's 'Comerish Turbo-Xerox' deck.
 Deck Type=constructed
 Card Reward=15% duplicate card
 [main]
-2 Boomerang|5ED
 4 Brainstorm|ICE
 4 Counterspell|5ED
 3 Dissipate|MIR
@@ -17,7 +16,7 @@ Card Reward=15% duplicate card
 1 Foresight|ALL
 4 Impulse|VIS
 14 Island|MIR
-2 Time Elemental|5ED
+4 Man-o'-War|VIS
 4 Memory Lapse|MIR
 4 Portent|ICE
 3 Power Sink|5ED

From 07f744ea2bd267d16ef780c97e227975be1c46f7 Mon Sep 17 00:00:00 2001
From: Chris <chris.h@cardforge.org>
Date: Thu, 14 Mar 2013 11:59:09 +0000
Subject: [PATCH 5/6] - Added new card names to changes.txt.

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2492c6208e6..a808f182ce2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -68,6 +68,8 @@ Ashling the Pilgrim
 Inner-Flame Igniter
 Novijen Sages
 Trickbind
+Yare
+Mercadian Atlas
 
 
 New Phenomenons:

From 1d6035e66ac046680f01ce713299883b07ab8367 Mon Sep 17 00:00:00 2001
From: Chris <chris.h@cardforge.org>
Date: Thu, 14 Mar 2013 14:24:50 +0000
Subject: [PATCH 6/6] - Added a fluff piece to the changes.txt file.

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a808f182ce2..3e0a756aac5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -95,6 +95,8 @@ New Vanguard Avatars:
 
 Known Issues:
 
+A small number of cards including Wall of Corpses, Abu Ja'far and others with a similar ability are not functional. The common issue here is actually that they check the blocker/attacker after being removed from the battlefield. Probably need to use LKI. Regular destroy/destroy all effects work just fine. The problem cards are caring about battlefield specific properties, that no longer apply when the base card is no longer on the battlefield.
+
 On several occasions people have noticed that the forge deck editor and/or quest mode card shop would not open or display. We have also received reports that some of the tabs/panels in the deck editor are missing. Try deleting the file named "editor_preferred.xml" which is found in the "res/layouts" folder. This should force forge to then use the "editor_default.xml" file instead.
 
 Several people have noticed that the cards displayed on the battlefield will fail to be displayed when the number of cards on the battlefield increases. Maximizing the human panel can help to re-display the cards.