Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format

This commit is contained in:
leriomaggio
2021-09-01 17:47:50 +01:00
3 changed files with 3 additions and 7 deletions

View File

@@ -315,10 +315,6 @@ public class AbilityUtils {
for (final Card imprint : hostCard.getImprintedCards()) { for (final Card imprint : hostCard.getImprintedCards()) {
cards.add(game.getCardState(imprint)); cards.add(game.getCardState(imprint));
} }
} else if (defined.equals("UntilLeavesBattlefield")) {
for (final Card ulb : hostCard.getUntilLeavesBattlefield()) {
cards.add(game.getCardState(ulb));
}
} else if (defined.startsWith("ThisTurnEntered")) { } else if (defined.startsWith("ThisTurnEntered")) {
final String[] workingCopy = defined.split("_"); final String[] workingCopy = defined.split("_");
ZoneType destination, origin; ZoneType destination, origin;

View File

@@ -4,10 +4,10 @@ Types:Creature Horse Illusion
PT:4/3 PT:4/3
K:Flash K:Flash
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile another target creature you control until CARDNAME leaves the battlefield. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile another target creature you control until CARDNAME leaves the battlefield.
SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | RememberChanged$ True | Duration$ UntilHostLeavesPlay SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | Duration$ UntilHostLeavesPlay
SVar:PlayMain1:TRUE SVar:PlayMain1:TRUE
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, create a tapped and attacking token that's a copy of the exiled card, except it's an Illusion in addition to its other types. Sacrifice that token at end of combat. T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, create a tapped and attacking token that's a copy of the exiled card, except it's an Illusion in addition to its other types. Sacrifice that token at end of combat.
SVar:TrigCopy:DB$ CopyPermanent | Defined$ UntilLeavesBattlefield | TokenTapped$ True | TokenAttacking$ True | AddTypes$ Illusion | AtEOT$ SacrificeCombat SVar:TrigCopy:DB$ CopyPermanent | Defined$ ValidExile Card.ExiledWithSource | TokenTapped$ True | TokenAttacking$ True | AddTypes$ Illusion | AtEOT$ SacrificeCombat
SVar:HasAttackEffect:TRUE SVar:HasAttackEffect:TRUE
DeckHas:Ability$Sacrifice DeckHas:Ability$Sacrifice
Oracle:Flash\nWhen Phantom Steed enters the battlefield, exile another target creature you control until Phantom Steed leaves the battlefield.\nWhenever Phantom Steed attacks, create a tapped and attacking token that's a copy of the exiled card, except it's an Illusion in addition to its other types. Sacrifice that token at end of combat. Oracle:Flash\nWhen Phantom Steed enters the battlefield, exile another target creature you control until Phantom Steed leaves the battlefield.\nWhenever Phantom Steed attacks, create a tapped and attacking token that's a copy of the exiled card, except it's an Illusion in addition to its other types. Sacrifice that token at end of combat.