diff --git a/.gitattributes b/.gitattributes index 5a4d978992e..189af4f03fc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -173,6 +173,7 @@ res/cardsfolder/a/akki_raider.txt svneol=native#text/plain res/cardsfolder/a/akki_rockspeaker.txt svneol=native#text/plain res/cardsfolder/a/akki_underling.txt svneol=native#text/plain res/cardsfolder/a/akki_underminer.txt svneol=native#text/plain +res/cardsfolder/a/akoum.txt -text res/cardsfolder/a/akoum_battlesinger.txt svneol=native#text/plain res/cardsfolder/a/akoum_boulderfoot.txt svneol=native#text/plain res/cardsfolder/a/akoum_refuge.txt svneol=native#text/plain @@ -4674,6 +4675,7 @@ res/cardsfolder/g/groundling_pouncer.txt svneol=native#text/plain res/cardsfolder/g/groundskeeper.txt svneol=native#text/plain res/cardsfolder/g/groundswell.txt svneol=native#text/plain res/cardsfolder/g/grove_of_the_burnwillows.txt svneol=native#text/plain +res/cardsfolder/g/grove_of_the_dreampods.txt -text res/cardsfolder/g/grove_of_the_guardian.txt -text res/cardsfolder/g/growing_ranks.txt -text res/cardsfolder/g/growth_spasm.txt svneol=native#text/plain diff --git a/res/cardsfolder/a/akoum.txt b/res/cardsfolder/a/akoum.txt new file mode 100644 index 00000000000..3dc6196b037 --- /dev/null +++ b/res/cardsfolder/a/akoum.txt @@ -0,0 +1,9 @@ +Name:Akoum +ManaCost:no cost +Types:Plane Zendikar +S:Mode$ Continuous | EffectZone$ Command | Affected$ Enchantment | AddHiddenKeyword$ Flash | AffectedZone$ Exile,Graveyard,Hand,Library | Description$ Players may cast enchantment cards as though they had flash. +T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, destroy target creature that isn't enchanted. +SVar:RolledChaos:AB$ Destroy | Cost$ 0 | ValidTgts$ Creature.unenchanted | TgtPrompt$ Select target creature that isn't enchanted +SVar:Picture:http://www.wizards.com/global/images/magic/general/akoum.jpg +Oracle:Players may cast enchantment cards as though they had flash.\nWhenever you roll {C}, destroy target creature that isn't enchanted. +SetInfo:PC2 Common \ No newline at end of file diff --git a/res/cardsfolder/b/bronze_horse.txt b/res/cardsfolder/b/bronze_horse.txt index 9c1fb61902c..3cbc5467442 100644 --- a/res/cardsfolder/b/bronze_horse.txt +++ b/res/cardsfolder/b/bronze_horse.txt @@ -8,6 +8,5 @@ SVar:X:Count$Valid Creature.YouCtrl+Other SVar:BuffedBy:Creature SVar:Picture:http://www.wizards.com/global/images/magic/general/bronze_horse.jpg Oracle:Trample\nAs long as you control another creature, prevent all damage that would be dealt to Bronze Horse by spells that target it. -SetInfo:LEG Rare -SetInfo:CHN Rare -SetInfo:TSB Uncommon \ No newline at end of file +SetInfo:CHR Rare +SetInfo:LEG Rare \ No newline at end of file diff --git a/res/cardsfolder/g/grove_of_the_dreampods.txt b/res/cardsfolder/g/grove_of_the_dreampods.txt new file mode 100644 index 00000000000..d0b2dfe332b --- /dev/null +++ b/res/cardsfolder/g/grove_of_the_dreampods.txt @@ -0,0 +1,11 @@ +Name:Grove of the Dreampods +ManaCost:no cost +Types:Plane Fabacin +T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ DreampodsDig | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DreampodsDig | TriggerZones$ Command | Secondary$ True | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order. +SVar:DreampodsDig:AB$ DigUntil | Cost$ 0 | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True +T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, return target creature card from your graveyard to the battlefield. +SVar:RolledChaos:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl +SVar:Picture:http://www.wizards.com/global/images/magic/general/grove_of_the_dreampods.jpg +Oracle:When you planeswalk to Grove of the Dreampods or at the beginning of your upkeep, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.\nWhenever you roll {C}, return target creature card from your graveyard to the battlefield. +SetInfo:PC2 Common \ No newline at end of file diff --git a/src/main/java/forge/card/ability/effects/DigUntilEffect.java b/src/main/java/forge/card/ability/effects/DigUntilEffect.java index b0836a92257..9276620efb0 100644 --- a/src/main/java/forge/card/ability/effects/DigUntilEffect.java +++ b/src/main/java/forge/card/ability/effects/DigUntilEffect.java @@ -1,8 +1,10 @@ package forge.card.ability.effects; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Random; import forge.Card; import forge.card.ability.AbilityUtils; @@ -14,6 +16,7 @@ import forge.game.player.Player; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; +import forge.util.MyRandom; public class DigUntilEffect extends SpellAbilityEffect { @@ -154,6 +157,10 @@ public class DigUntilEffect extends SpellAbilityEffect { host.addImprinted(c); } } + if (sa.hasParam("RevealRandomOrder")) { + final Random random = MyRandom.getRandom(); + Collections.shuffle(revealed, random); + } // TODO Use getOrderChoices before this moveTo call for the Human final Iterator itr = revealed.iterator();