diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java index 115f5d71519..366307523c1 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Random; - import forge.card.CardCharacteristicName; import forge.game.Game; import forge.game.ability.AbilityUtils; @@ -18,7 +16,6 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.util.Lang; -import forge.util.MyRandom; public class DigEffect extends SpellAbilityEffect { @@ -195,8 +192,7 @@ public class DigEffect extends SpellAbilityEffect { Card chosen = chooser.getController().chooseSingleEntityForEffect(valid, sa, prompt, false, p); movedCards.remove(chosen); if (sa.hasParam("RandomOrder")) { - final Random random = MyRandom.getRandom(); - Collections.shuffle(movedCards, random); + CardLists.shuffle(movedCards); } } else { @@ -287,7 +283,9 @@ public class DigEffect extends SpellAbilityEffect { // now, move the rest to destZone2 if (destZone2 == ZoneType.Library || destZone2 == ZoneType.PlanarDeck || destZone2 == ZoneType.SchemeDeck) { List afterOrder = rest; - if (!skipReorder && rest.size() > 1) { + if (sa.hasParam("RestRandomOrder")) { + CardLists.shuffle(afterOrder); + } else if (!skipReorder && rest.size() > 1) { afterOrder = chooser.getController().orderMoveToZoneList(rest, destZone2); } if (libraryPosition2 != -1) { diff --git a/forge-gui/res/cardsfolder/i/interplanar_tunnel.txt b/forge-gui/res/cardsfolder/i/interplanar_tunnel.txt index 77dac1139ac..d9b560d48c3 100644 --- a/forge-gui/res/cardsfolder/i/interplanar_tunnel.txt +++ b/forge-gui/res/cardsfolder/i/interplanar_tunnel.txt @@ -2,6 +2,6 @@ Name:Interplanar Tunnel ManaCost:no cost Types:Phenomenon T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ TrigDig | TriggerDescription$ When you encounter CARDNAME, reveal cards from the top of your planar deck until you reveal five plane cards. Put a plane card from among them on top of your planar deck, then put the rest of the revealed cards on the bottom in a random order. (Then planeswalk away from this phenomenon.) -SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | SourceZone$ PlanarDeck | DestinationZone$ PlanarDeck | DestinationZone2$ PlanarDeck | LibraryPosition$ 0 | ChangeValid$ Plane | SubAbility$ Replaneswalk +SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | SourceZone$ PlanarDeck | DestinationZone$ PlanarDeck | DestinationZone2$ PlanarDeck | LibraryPosition$ 0 | ChangeValid$ Plane | RestRandomOrder$ True | SubAbility$ Replaneswalk SVar:Replaneswalk:DB$ Planeswalk | Cost$ 0 Oracle:When you encounter Interplanar Tunnel, reveal cards from the top of your planar deck until you reveal five plane cards. Put a plane card from among them on top of your planar deck, then put the rest of the revealed cards on the bottom in a random order. (Then planeswalk away from this phenomenon.) \ No newline at end of file