diff --git a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java index 2b5b166cb12..e6d28711947 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java @@ -131,12 +131,16 @@ public class MakeCardEffect extends SpellAbilityEffect { AbilityUtils.calculateAmount(source, sa.getParamOrDefault("WithCounterNum", "1"), sa), player); } - Card made = game.getAction().moveTo(zone, c, sa, moveParams); + + final int libraryPos = sa.hasParam("LibraryPosition") ? AbilityUtils.calculateAmount(source, sa.getParam("LibraryPosition"), sa) : 0; + Card made = game.getAction().moveTo(zone, c, libraryPos, sa, moveParams); + if (sa.hasParam("WithCounter") && zone != null && !zone.equals(ZoneType.Battlefield)) { made.addCounter(CounterType.getType(sa.getParam("WithCounter")), AbilityUtils.calculateAmount(source, sa.getParamOrDefault("WithCounterNum", "1"), sa), player, counterTable); } + if (sa.hasParam("FaceDown")) { made.turnFaceDown(true); } diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_morale_sergeant.txt b/forge-gui/res/cardsfolder/upcoming/goblin_morale_sergeant.txt index a9b80bad53b..714577f155a 100644 --- a/forge-gui/res/cardsfolder/upcoming/goblin_morale_sergeant.txt +++ b/forge-gui/res/cardsfolder/upcoming/goblin_morale_sergeant.txt @@ -4,10 +4,10 @@ Types:Creature Goblin Soldier PT:2/1 K:Haste K:Enlist -T:Mode$ Enlisted | ValidCard$ Card.Self | ValidEnlisted$ Card.nonToken | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigConjure | TriggerDescription$ Whenever CARDNAME Sergeant enlists a nontoken creature, you may conjure a duplicate of that creature into the top five cards of your library at random. The duplicate perpetually gets +1/+0 and gains haste. -SVar:TrigConjure:DB$ MakeCard | Conjure$ True | DefinedName$ TriggeredEnlisted | Zone$ Library | RememberMade$ True | SubAbility$ DBReorder -SVar:DBReorder:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Library | Destination$ Library | Defined$ Top5 | SubAbility$ DBEffect +T:Mode$ Enlisted | ValidCard$ Card.Self | ValidEnlisted$ Card.nonToken | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigConjure | TriggerDescription$ Whenever CARDNAME enlists a nontoken creature, you may conjure a duplicate of that creature into the top five cards of your library at random. The duplicate perpetually gets +1/+0 and gains haste. +SVar:TrigConjure:DB$ MakeCard | Conjure$ True | DefinedName$ TriggeredEnlisted | Zone$ Library | LibraryPosition$ Z | RememberMade$ True | SubAbility$ DBEffect SVar:DBEffect:DB$ Effect | Name$ Goblin Morale Sergeant's Perpetual Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | SubAbility$ DBCleanup SVar:PerpetualAbility:Mode$ Continuous | AddPower$ 1 | AddKeyword$ Haste | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The duplicate perpetually gets +1/+0 and gains haste. SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:Z:Count$Random.0.4 Oracle:Haste\nEnlist\nWhenever Goblin Morale Sergeant enlists a nontoken creature, you may conjure a duplicate of that creature into the top five cards of your library at random. The duplicate perpetually gets +1/+0 and gains haste.