merge latest trunk

.gitattributes

@@ -6517,6 +6517,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

CHANGES.txt

@@ -68,6 +68,8 @@ Ashling the Pilgrim
 Inner-Flame Igniter
 Novijen Sages
 Trickbind
+Yare
+Mercadian Atlas
 
 
 New Phenomenons:
@@ -93,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.

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

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

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}

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

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

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

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

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

res/quest/world/jamuraa/duels/Nana Buruku 2.dck

@@ -10,7 +10,8 @@ Deck Type=constructed
 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

res/quest/world/jamuraa/duels/Nana Buruku 3.dck

@@ -9,7 +9,7 @@ Deck Type=constructed
 [main]
 4 Arcane Denial|ALL
 3 City of Brass|5ED
-2 Contagion|ALL
+2 Serrated Arrows|HML
 4 Fallen Askari|VIS
 4 Incinerate|MIR
 2 Island|MIR

res/quest/world/jamuraa/duels/Osiris 3.dck

@@ -10,7 +10,8 @@ Deck Type=constructed
 4 Bad River|MIR
 4 Black Knight|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

res/quest/world/jamuraa/duels/Osiris 4.dck

@@ -11,12 +11,12 @@ Card Reward=14% duplicate card;8% Winter Orb|2ED
 2 Arcane Denial|ALL
 4 Black Knight|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
+4 Man-o'-War|VIS
 4 Memory Lapse|MIR
 3 Nekrataal|VIS
 2 Phyrexian War Beast|ALL

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

res/quest/world/jamuraa/duels/Were-Hyena 2.dck

@@ -15,7 +15,7 @@ Deck Type=constructed
 3 Impulse|VIS
 6 Island|MIR
 4 Man-o'-War|VIS
-2 Necromancy|VIS
+2 Animate Dead|5ED
 4 Nekrataal|VIS
 4 Power Sink|5ED
 2 Quicksand|VIS

res/quest/world/jamuraa/duels/Yemaya 4.dck

@@ -16,7 +16,7 @@ Card Reward=15% duplicate card
 1 Foresight|ALL
 4 Impulse|VIS
 14 Island|MIR
-3 Man-o'-War|VIS
+4 Man-o'-War|VIS
 4 Memory Lapse|MIR
 4 Portent|ICE
 3 Power Sink|5ED

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()) {