Fix Gilraen

Author: tool4EvEr

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

@@ -122,16 +122,6 @@ public void resolve(SpellAbility sa) {
 
             if (destination == ZoneType.Battlefield) {
                 moveParams.put(AbilityKey.SimultaneousETB, cards);
-                if (sa.hasAdditionalAbility("AnimateSubAbility")) {
-                    // need LKI before Animate does apply
-                    moveParams.put(AbilityKey.CardLKI, CardCopyService.getLKICopy(c));
-
-                    final SpellAbility animate = sa.getAdditionalAbility("AnimateSubAbility");
-                    source.addRemembered(c);
-                    AbilityUtils.resolve(animate);
-                    source.removeRemembered(c);
-                    animate.setSVar("unanimateTimestamp", String.valueOf(game.getTimestamp()));
-                }
                 if (sa.hasParam("Tapped")) {
                     c.setTapped(true);
                 }

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

@@ -599,12 +599,13 @@ private void changeKnownOriginResolve(final SpellAbility sa) {
                     }
                 }
                 if (sa.hasParam("WithCountersType")) {
-                    CounterType cType = CounterType.getType(sa.getParam("WithCountersType"));
                     int cAmount = AbilityUtils.calculateAmount(hostCard, sa.getParamOrDefault("WithCountersAmount", "1"), sa);
-
                     GameEntityCounterTable table = new GameEntityCounterTable();
-                    table.put(activator, gameCard, cType, cAmount);
                     moveParams.put(AbilityKey.CounterTable, table);
+                    for (String type : sa.getParam("WithCountersType").split(",")) {
+                        CounterType cType = CounterType.getType(type);
+                        table.put(activator, gameCard, cType, cAmount);
+                    }
                 } else if (sa.hasParam("WithNotedCounters")) {
                     CountersNoteEffect.loadCounters(gameCard, hostCard, chooser, sa, moveParams);
                 }

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

@@ -399,16 +399,6 @@ else if (!sa.hasParam("NoLooking")) {
                                 moveParams.put(AbilityKey.CounterTable, table);
                             }
                         }
-                        if (sa.hasAdditionalAbility("AnimateSubAbility")) {
-                            // need LKI before Animate does apply
-                            moveParams.put(AbilityKey.CardLKI, CardCopyService.getLKICopy(c));
-
-                            final SpellAbility animate = sa.getAdditionalAbility("AnimateSubAbility");
-                            host.addRemembered(c);
-                            AbilityUtils.resolve(animate);
-                            host.removeRemembered(c);
-                            animate.setSVar("unanimateTimestamp", String.valueOf(game.getTimestamp()));
-                        }
                         c = game.getAction().moveTo(c.getController().getZone(destZone1), c, sa, moveParams);
                         if (destZone1.equals(ZoneType.Battlefield)) {
                             if (addToCombat(c, sa, "Attacking", "Blocking")) {

forge-gui/res/cardsfolder/g/gilraen_dunedain_protector.txt

@@ -2,13 +2,10 @@ Name:Gilraen, Dúnedain Protector
 ManaCost:2 W
 Types:Legendary Creature Human Noble
 PT:2/3
-A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.Other+YouCtrl | RememberChanged$ True | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select another target creature you control | SubAbility$ DBReturn | SpellDescription$ Exile another target creature you control. You may return that card to the battlefield under its owner's control. If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
+A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.Other+YouCtrl | RememberChanged$ True | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select another target creature you control | SubAbility$ DBReturn | SpellDescription$ Exile another target creature you control. You may return that card to the battlefield under its owner's control.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Optional$ True | ForgetChanged$ True | Destination$ Battlefield | SubAbility$ DBDelayedTrigger
 SVar:DBDelayedTrigger:DB$ DelayedTrigger | RememberObjects$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | SubAbility$ DBCleanup | SpellDescription$ If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
-SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Exile | Destination$ Battlefield | AnimateSubAbility$ DBConditionEffect
-SVar:DBConditionEffect:DB$ Effect | RememberObjects$ RememberedLKI | ReplacementEffects$ ETBCounters
-SVar:ETBCounters:Event$ Moved | ReplacementResult$ Updated | Destination$ Battlefield | ValidCard$ Card.IsRemembered | ReplaceWith$ AddExtraCounter | Description$ return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
-SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterTypes$ Vigilance,Lifelink
+SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Exile | Destination$ Battlefield | WithCountersType$ Vigilance,Lifelink
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Counters|LifeGain
 Oracle:{2}, {T}: Exile another target creature you control. You may return that card to the battlefield under its owner's control. If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.