Add zone ordering

Author: tool4EvEr

forge-game/src/main/java/forge/game/GameActionUtil.java

@@ -26,6 +26,7 @@
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.ability.SpellAbilityEffect;
+import forge.game.ability.effects.DetachedCardEffect;
 import forge.game.card.*;
 import forge.game.card.CardPlayOption.PayManaCost;
 import forge.game.cost.Cost;
@@ -34,6 +35,7 @@
 import forge.game.player.Player;
 import forge.game.player.PlayerCollection;
 import forge.game.player.PlayerController;
+import forge.game.player.PlayerController.FullControlFlag;
 import forge.game.replacement.ReplacementEffect;
 import forge.game.replacement.ReplacementHandler;
 import forge.game.replacement.ReplacementLayer;
@@ -835,9 +837,11 @@ public static String generatedMana(final SpellAbility sa) {
     }
 
     public static CardCollectionView orderCardsByTheirOwners(Game game, CardCollectionView list, ZoneType dest, SpellAbility sa) {
-        if (list.size() <= 1) {
+        if (list.size() <= 1 &&
+                (sa == null || !sa.getActivatingPlayer().getController().isFullControl(FullControlFlag.LayerTimestampOrder))) {
             return list;
         }
+        Card eff = null;
         CardCollection completeList = new CardCollection();
         // CR 613.7m use APNAP
         PlayerCollection players = game.getPlayersInTurnOrder(game.getPhaseHandler().getPlayerTurn());
@@ -853,12 +857,28 @@ public static CardCollectionView orderCardsByTheirOwners(Game game, CardCollecti
                     subList.add(c);
                 }
             }
+            if (sa.getActivatingPlayer() == p && sa.hasParam("StaticEffect")) {
+                String name = "Static Effect of " + sa.getHostCard();
+                // create helper card for ordering
+                eff = new DetachedCardEffect(sa.getHostCard(), name);
+                subList.add(eff);
+            }
             CardCollectionView subListView = subList;
             if (subList.size() > 1) {
                 subListView = p.getController().orderMoveToZoneList(subList, dest, sa);
             }
             completeList.addAll(subListView);
         }
+        if (eff != null) {
+            int idx = completeList.indexOf(eff);
+            // add generous buffer to timestamp, to ensure it applies last compared to cards that were ordered to ETB before it
+            sa.setSVar("StaticEffectTimestamp", String.valueOf(game.getTimestamp() + idx + 100));
+            // effects with this param have the responsibility to realign it when later cards are reached
+            if (idx < completeList.size() - 1) {
+                sa.setSVar("StaticEffectUntilCardID", String.valueOf(completeList.get(idx + 1).getId()));
+            }
+            completeList.remove(eff);
+        }
         return completeList;
     }
 

forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java

@@ -13,6 +13,7 @@
 import forge.game.event.GameEventCombatChanged;
 import forge.game.keyword.Keyword;
 import forge.game.player.*;
+import forge.game.player.PlayerController.FullControlFlag;
 import forge.game.replacement.ReplacementEffect;
 import forge.game.replacement.ReplacementType;
 import forge.game.spellability.SpellAbility;
@@ -516,7 +517,7 @@ private void changeKnownOriginResolve(final SpellAbility sa) {
         }
 
         // CR 401.4
-        if (destination.isDeck() && !shuffle && tgtCards.size() > 1) {
+        if (((destination.isDeck() && tgtCards.size() > 1) || chooser.getController().isFullControl(FullControlFlag.LayerTimestampOrder)) && !shuffle) {
             if (sa.hasParam("RandomOrder")) {
                 final CardCollection random = new CardCollection(tgtCards);
                 CardLists.shuffle(random);
@@ -534,6 +535,10 @@ private void changeKnownOriginResolve(final SpellAbility sa) {
         }
 
         for (final Card tgtC : tgtCards) {
+            if (sa.hasSVar("StaticEffectUntilCardID") && sa.getSVarInt("StaticEffectUntilCardID") == tgtC.getId()) {
+                sa.setSVar("StaticEffectTimestamp", String.valueOf(game.getNextTimestamp()));
+            }
+
             final Card gameCard = game.getCardState(tgtC, null);
             // gameCard is LKI in that case, the card is not in game anymore
             // or the timestamp did change

forge-game/src/main/java/forge/game/player/PlayerController.java

@@ -65,7 +65,7 @@ public enum FullControlFlag {
         NoPaymentFromManaAbility,
         NoFreeCombatCostHandling,
         AllowPaymentStartWithMissingResources,
-        //AdditionalLayerTimestampOrder // tokens etc.
+        LayerTimestampOrder // for StaticEffect$, tokens later etc.
     }
 
     private Set<FullControlFlag> fullControls = EnumSet.noneOf(FullControlFlag.class);

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -1516,6 +1516,7 @@ public void showFullControl(PlayerView pv, MouseEvent e) {
         addFullControlEntry(menu, "lblNoPaymentFromManaAbility", FullControlFlag.NoPaymentFromManaAbility, controlFlags);
         addFullControlEntry(menu, "lblNoFreeCombatCostHandling", FullControlFlag.NoFreeCombatCostHandling, controlFlags);
         addFullControlEntry(menu, "lblAllowPaymentStartWithMissingResources", FullControlFlag.AllowPaymentStartWithMissingResources, controlFlags);
+        addFullControlEntry(menu, "lblLayerTimestampOrder", FullControlFlag.LayerTimestampOrder, controlFlags);
 
         menu.show(view.getControl().getFieldViewFor(pv).getAvatarArea(), e.getX(), e.getY());
     }

forge-gui-mobile/src/forge/screens/match/MatchController.java

@@ -757,6 +757,7 @@ protected void buildMenu() {
                 addItem(getFullControlMenuEntry("lblNoPaymentFromManaAbility", FullControlFlag.NoPaymentFromManaAbility, controlFlags));
                 addItem(getFullControlMenuEntry("lblNoFreeCombatCostHandling", FullControlFlag.NoFreeCombatCostHandling, controlFlags));
                 addItem(getFullControlMenuEntry("lblAllowPaymentStartWithMissingResources", FullControlFlag.AllowPaymentStartWithMissingResources, controlFlags));
+                addItem(getFullControlMenuEntry("lblLayerTimestampOrder", FullControlFlag.LayerTimestampOrder, controlFlags));
             }
         };