diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index cca27494498..c2777aa19d0 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -871,10 +871,12 @@ public class CardFactoryUtil { if (l[0].startsWith("SacrificedThisTurn")) { CardCollectionView list = cc.getSacrificedThisTurn(); if (l[0].contains(" ")) { - final String[] components = l[0].split(" ", 2); - list = CardLists.getValidCards(list, components[1], cc, c); + String[] lparts = l[0].split(" ", 2); + String restrictions = TextUtil.fastReplace(l[0], TextUtil.addSuffix(lparts[0]," "), ""); + final String[] rest = restrictions.split(","); + list = CardLists.getValidCards(list, rest, cc, c, null); } - return list.size(); + return doXMath(list.size(), m, c); } final String[] sq; diff --git a/forge-gui/res/cardsfolder/upcoming/dargo_the_shipwrecker.txt b/forge-gui/res/cardsfolder/upcoming/dargo_the_shipwrecker.txt new file mode 100755 index 00000000000..60013e89d72 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/dargo_the_shipwrecker.txt @@ -0,0 +1,15 @@ +Name:Dargo, the Shipwrecker +ManaCost:6 R +Types:Legendary Creature Giant Pirate +PT:7/5 +A:SP$ PermanentCreature | Announce$ X | Cost$ 6 R Sac | AILogic$ SacToReduceCost | References$ X,Y | CostDesc$ As an additional cost to cast this spell, you may sacrifice any number of artifacts and/or creatures. | SpellDescription$ +S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ Y | EffectZone$ All | References$ Y | Description$ This spell costs {2} less to cast for each permanent sacrificed this way and {2} less to cast for each other artifact or creature you've sacrificed this turn. +S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ Z | EffectZone$ All | References$ Z | Secondary$ True | Description$ This spell costs {2} less to cast for each permanent sacrificed this way and {2} less to cast for each other artifact or creature you've sacrificed this turn. +SVar:X:XChoice +SVar:Y:SVar$X/Times.2 +SVar:Z:Count$SacrificedThisTurn Artifact,Creature/Times.2 +SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE2 +DeckHas:Ability$Sacrifice +K:Trample +K:Partner +Oracle:As an additional cost to cast this spell, you may sacrifice any number of artifacts and/or creatures. This spell costs {2} less to cast for each permanent sacrificed this way and {2} less to cast for each other artifact or creature you've sacrificed this turn.\nTrample\nPartner (You can have two commanders if both have partner.)