external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Add and Fix some GRN cards

See merge request core-developers/forge!986
This commit is contained in:
austinio7116
2018-10-06 21:40:02 +00:00
parent 062c560ec5 ee752f8e8b
commit 897046b057
10 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-game/src/main/java/forge/game/trigger/Trigger.java
View File

@@ -37,6 +37,7 @@ import java.util.*;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import forge.util.TextUtil;
/**
@@ -335,6 +336,21 @@ public abstract class Trigger extends TriggerReplacementBase {
}
}
if (this.mapParams.containsKey("TriggerRememberedInZone")) {
// check delayed trigger remembered objects (Mnemonic Betrayal)
// make this check more general if possible
boolean bFlag = true;
for (Object o : getTriggerRemembered()) {
if (o instanceof Card && ((Card) o).isInZone(ZoneType.smartValueOf(this.mapParams.get("TriggerRememberedInZone")))) {
bFlag = false;
break;
}
}
if (bFlag) {
return false;
}
}
if ( !meetsCommonRequirements(this.mapParams))
return false;

2
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -366,7 +366,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
// Run SpellCast triggers
if (sp.isSpell()) {
if (source.isCommander()) {
if (source.isCommander() && (ZoneType.Command == source.getCastFrom())) {
activator.incCommanderCast(source);
}
game.getTriggerHandler().runTrigger(TriggerType.SpellCast, runParams, true);

8
forge-gui/res/cardsfolder/a/arclight_phoenix.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Phoenix
PT:3/2
K:Flying
K:Haste
T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ At the beginning of combat on your turn, if you cast 3 or more instand and/or game this turn, you may return CARDNAME to the battlefield.
SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Battlefield
SVar:X:Count$ThisTurnCast_Card.Instant.YouCtrl+Sorcery.YouCtrl
Oracle:Flying, Haste\nAt the beginning of combat on your turn, if you cast 3 or more instants and/or sorceries this turn, you may return Arclight Phoenix to the battlefield.
T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Graveyard | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ At the beginning of combat on your turn, if you've cast three or more instant and sorcery spells this turn, you may return CARDNAME from your graveyard to the battlefield.
SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl
Oracle:Flying, Haste\nAt the beginning of combat on your turn, if you've cast three or more instant and sorcery spells this turn, you may return Arclight Phoenix from your graveyard to the battlefield.

6
forge-gui/res/cardsfolder/f/find_finality.txt
View File

@@ -10,6 +10,8 @@ ALTERNATE
Name:Finality
ManaCost:4 B G
Types:Sorcery
A:SP$ ChooseCard | Cost$ 4 B G | Defined$ You | Amount$ 1 | MinAmount$ 0 | Choices$ Creature.YouCtrl | CounterNum$ 2 | CounterType$ P1P1 | SubAbility$ DBPumpAll | SpellDescription$ You may put two +1/+1 counters on a creature you control. Then all creatures get -4/-4 until end of turn.
SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True
A:SP$ ChooseCard | Cost$ 4 B G | Defined$ You | Amount$ 1 | MinAmount$ 0 | Choices$ Creature.YouCtrl | SubAbility$ DBPutCounter | SpellDescription$ You may put two +1/+1 counters on a creature you control. Then all creatures get -4/-4 until end of turn.
SVar:DBPutCounter:DB$ PutCounter | Defined$ ChosenCard | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBPumpAll
SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
Oracle:You may put two +1/+1 counters on a creature you control. Then all creatures get -4/-4 until end of turn.

2
forge-gui/res/cardsfolder/h/house_guildmage.txt
View File

@@ -3,5 +3,5 @@ ManaCost:U B
Types:Creature Human Wizard
PT:2/2
A:AB$ Pump | Cost$ 1 U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
A:AB$ Surveil | Cost$ 2 B T | Amount 2 | SpellDescription$ Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
A:AB$ Surveil | Cost$ 2 B T | Amount$ 2 | SpellDescription$ Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
Oracle:{1}{U}, {T}: Target creature doesn't untap during its controller's next untap step.\n{2}{B}, {T}: Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)

10
forge-gui/res/cardsfolder/m/mnemonic_betrayal.txt Normal file
View File

@@ -0,0 +1,10 @@
Name:Mnemonic Betrayal
ManaCost:1 U B
Types:Sorcery
A:SP$ ChangeZoneAll | Cost$ 1 U B | Defined$ Player.Opponent | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile all card from all opponents' graveyards. You may cast those cards this turn, and you may spend it as though it were mana of any type to cast those spells. At the beginning of the next end step, if any of those cards remain exiled, return them to their owner's graveyards. Exile CARDNAME.
SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | SubAbility$ DelTrig
SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreType$ True | EffectZone$ Command | Affected$ Card.nonLand+IsRemembered | AffectedZone$ Exile | Description$ You may cast those cards this turn, and you may spend mana as though it were mana of any type to cast those spells.
SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerRememberedInZone$ Exile | RememberObjects$ Remembered | TriggerDescription$ At the beginning of the next end step, if any of those cards remain exiled, return them to their owner's graveyards. | SubAbility$ ExileSelf
SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Exile | Destination$ Graveyard
SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Exile
Oracle:Exile all card from all opponents' graveyards. You may cast those cards this turn, and you may spend mana as though it were mana of any type to cast those spells. At the beginning of the next end step, if any of those cards remain exiled, return them to their owner's graveyards.\nExile Mnemonic Betrayal.

12
forge-gui/res/cardsfolder/p/plaguecrafter.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Plaguecrafter
ManaCost:2 B
Types:Creature Human Shaman
PT:3/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBRepeat | TriggerDescription$ When CARDNAME enters the battlefield, each player sacrifices a creature or planeswalker. Each player who can't discards a card.
SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseSac | SubAbility$ RememberSac
SVar:ChooseSac:DB$ ChooseCard | Defined$ Remembered | Choices$ Creature.RememberedPlayerCtrl,Planeswalker.RememberedPlayerCtrl | ChoiceTitle$ Choose a creature or planeswalker to sacrifice | AILogic$ WorstCard | Mandatory$ True | RememberChosen$ True
SVar:RememberSac:DB$ Pump | RememberObjects$ RememberedController | SubAbility$ TrigSac
SVar:TrigSac:DB$ SacrificeAll | Defined$ Remembered | SubAbility$ Discard
SVar:Discard:DB$ Discard | Mode$ TgtChoose | NumCards$ 1 | Defined$ Player.IsNotRemembered | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:When Plaguecrafter enters the battlefield, each player sacrifices a creature or planeswalker. Each player who can't discards a card.

2
forge-gui/res/cardsfolder/s/suspicious_bookcase.txt
View File

@@ -5,4 +5,4 @@ PT:0/4
K:Defender
A:AB$ Pump | Cost$ 3 T | ValidTgts$ Creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn. | TgtPrompt$ Select target creature.
SVar:Picture:http://www.wizards.com/global/images/magic/general/suspicious_bookcase.jpg
Oracle:Defender\n{3}{T}: Target creature can't be blocked this turn.
Oracle:Defender\n{3}, {T}: Target creature can't be blocked this turn.

12
forge-gui/res/cardsfolder/t/thief_of_sanity.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Thief of Sanity
ManaCost:1 U B
Types:Creature Specter
PT:2/2
K:Flying
T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at the top three cards of that player's library, exile one of them face down, then put the rest into their graveyard. For as long as that card remains exiled, you may look at it, and you may spend mana as though it were mana of any type to cast it.
SVar:TrigDig:DB$ Dig | DigNum$ 3 | Defined$ TriggeredTarget | DestinationZone$ Exile | ExileFaceDown$ True | SkipReorder$ True | DestinationZone2$ Graveyard | RememberChanged$ True | ChangeValid$ Card | SubAbility$ DBEffect
SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ STPlay1,STPlay2 | Duration$ Permanent | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
SVar:STPlay1:Mode$ Continuous | MayLookAt$ You | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may look at it, and you may spend mana as though it were mana of any type to cast it.
SVar:STPlay2:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreType$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | Secondary$ True | Description$ You may look at it, and you may spend mana as though it were mana of any type to cast it.
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Flying\nWhenever Thief of Sanity deals combat damage to a player, look at the top three cards of that player's library, exile one of them face down, then put the rest into their graveyard. For as long as that card remains exiled, you may look at it, you may cast it, and you may spend mana as though it were mana of any type to cast it.

5
forge-gui/res/cardsfolder/v/viviens_jaguar.txt
View File

@@ -1,7 +1,8 @@
Name:Vivien's Jaguar
ManaCost:2 G
Types:Creature Cat Spirit
PT:3/2
K:Reach
A:AB$ ChangeZone | Cost$ 2 G | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | IsPresent$ Planeswalker.Vivien+YouCtrl | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate this ability only if you control a Vivien planeswalker.
DeckHints:Type$Vivien
Oracle:{2}{G}: Return Vivien’s Jaguar from your graveyard to your hand. Activate this ability only if you control a Vivien planeswalker.
PT:3/2
Oracle:Reach\n{2}{G}: Return Vivien's Jaguar from your graveyard to your hand. Activate this ability only if you control a Vivien planeswalker.