From 1f13b8d43de93becd2491568e87d9cda72d77612 Mon Sep 17 00:00:00 2001 From: Hythonia Date: Tue, 18 May 2021 20:11:24 +0200 Subject: [PATCH] Minor card fixes --- .../src/main/java/forge/game/ability/AbilityUtils.java | 3 +++ .../src/main/java/forge/game/card/CounterEnumType.java | 2 ++ .../n/nezumi_graverobber_nighteyes_the_desecrator.txt | 10 ++++------ forge-gui/res/cardsfolder/p/poets_quill.txt | 2 +- forge-gui/res/cardsfolder/p/psychic_miasma.txt | 9 +++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index d358d55f990..135a52ea213 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -2173,6 +2173,9 @@ public class AbilityUtils { if (sq[0].equals("Threshold")) { return doXMath(calculateAmount(c, sq[player.hasThreshold() ? 1 : 2], ctb), expr, c, ctb); } + if (sq[0].equals("ExtraTurn")) { + return doXMath(calculateAmount(c, sq[game.getPhaseHandler().getPlayerTurn().isExtraTurn() ? 1 : 2], ctb), expr, c, ctb); + } if (sq[0].equals("Averna")) { String str = "As you cascade, you may put a land card from among the exiled cards onto the " + "battlefield tapped."; diff --git a/forge-game/src/main/java/forge/game/card/CounterEnumType.java b/forge-game/src/main/java/forge/game/card/CounterEnumType.java index e5096c9c6c9..dad3e42e911 100644 --- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java +++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java @@ -65,6 +65,8 @@ public enum CounterEnumType { CORPSE("CRPSE", 230, 186, 209), + CORRUPTION("CRPTN", 210, 121, 210), + CREDIT("CRDIT", 188, 197, 234), CRYSTAL("CRYST", 255, 85, 206), diff --git a/forge-gui/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt b/forge-gui/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt index 5ef3a0cb5a9..f53192013cc 100644 --- a/forge-gui/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt +++ b/forge-gui/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt @@ -2,11 +2,10 @@ Name:Nezumi Graverobber ManaCost:1 B Types:Creature Rat Rogue PT:2/1 -A:AB$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card.OppOwn | SubAbility$ DBFlip | SpellDescription$ Exile target card from an opponent's graveyard. If no cards are in that graveyard, flip CARDNAME. -SVar:DBFlip:DB$SetState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | Mode$ Flip -SVar:X:Count$InOppYard +A:AB$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card.OppOwn | TgtPrompt$ Select target card in an opponent's graveyard | SubAbility$ DBFlip | SpellDescription$ Exile target card from an opponent's graveyard. If no cards are in that graveyard, flip CARDNAME. +SVar:DBFlip:DB$ SetState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | Mode$ Flip +SVar:X:Count$ValidGraveyard Card.TargetedControllerCtrl AlternateMode:Flip -SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_graverobber.jpg Oracle:{1}{B}: Exile target card from an opponent's graveyard. If no cards are in that graveyard, flip Nezumi Graverobber. ALTERNATE @@ -16,6 +15,5 @@ ManaCost:1 B Colors:black Types:Legendary Creature Rat Wizard PT:4/2 -A:AB$ ChangeZone | Cost$ 4 B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature. | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control. -SVar:Picture:http://www.wizards.com/global/images/magic/general/nighteyes_the_desecrator.jpg +A:AB$ ChangeZone | Cost$ 4 B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature card in a graveyard | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control. Oracle:{4}{B}: Put target creature card from a graveyard onto the battlefield under your control. diff --git a/forge-gui/res/cardsfolder/p/poets_quill.txt b/forge-gui/res/cardsfolder/p/poets_quill.txt index 2a7625fb525..84b5e8eb258 100644 --- a/forge-gui/res/cardsfolder/p/poets_quill.txt +++ b/forge-gui/res/cardsfolder/p/poets_quill.txt @@ -1,6 +1,6 @@ Name:Poet's Quill ManaCost:1 B -Types:Artifact — Equipment +Types:Artifact Equipment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLearn | TriggerDescription$ When CARDNAME enters the battlefield, learn. (You may reveal a Lesson card you own from outside the game and put it into your hand, or discard a card to draw a card.) SVar:TrigLearn:DB$ Learn S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Lifelink | Description$ Equipped creature gets +1/+1 and has lifelink. diff --git a/forge-gui/res/cardsfolder/p/psychic_miasma.txt b/forge-gui/res/cardsfolder/p/psychic_miasma.txt index a44780932f7..240586cad3e 100644 --- a/forge-gui/res/cardsfolder/p/psychic_miasma.txt +++ b/forge-gui/res/cardsfolder/p/psychic_miasma.txt @@ -1,10 +1,7 @@ Name:Psychic Miasma ManaCost:1 B Types:Sorcery -#You can not clear a remembered object from a card on the stack, so this card is cleaned beforehand. -A:SP$ Pump | Cost$ 1 B | SubAbility$ DBCleanup | Static$ True -SVar:DBDiscard:DB$ Discard | ValidTgts$ Player | TgtPrompt$ Select target player | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBChangeZone | SpellDescription$ Target player discards a card. If a land card is discarded this way, return CARDNAME to its owner's hand. -SVar:DBChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | Hidden$ True | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBDiscard -SVar:Picture:http://www.wizards.com/global/images/magic/general/psychic_miasma.jpg +A:SP$ Discard | Cost$ 1 B | ValidTgts$ Player | TgtPrompt$ Select target player | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBChangeZone | SpellDescription$ Target player discards a card. If a land card is discarded this way, return CARDNAME to its owner's hand. +SVar:DBChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | Hidden$ True | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True Oracle:Target player discards a card. If a land card is discarded this way, return Psychic Miasma to its owner's hand.