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 'patch' into 'master'

Browse Source 
Implement Return from Extinction

See merge request core-developers/forge!1783
This commit is contained in:
swordshine
2019-06-05 00:59:56 +00:00
parent a442122c7b ee7f1f4136
commit e264a92e82
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -1058,6 +1058,8 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
return c.getNetPower() <= parentTarget.getNetPower();
case "LECMC" :
return c.getCMC() <= parentTarget.getCMC();
case "SharedCreatureType" :
return c.sharesCreatureTypeWith(parentTarget);
}
}

3
forge-gui/res/cardsfolder/c/cliffside_market.txt
View File

@@ -5,7 +5,8 @@ T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigLife | OptionalDeci
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLife | TriggerZones$ Command | Secondary$ True | OptionalDecider$ You | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, you may exchange life totals with target player.
SVar:TrigLife:DB$ ExchangeLife | Optional$ True | ValidTgts$ Player | TgtPrompt$ Select target player to exchange life totals with
T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, exchange control of two target permanents that share a card type.
SVar:RolledChaos:DB$ ExchangeControl | ValidTgts$ Permanent | TgtPrompt$ Select target permanent card | TargetsWithSharedTypes$ Creature,Artifact,Enchantment,Planeswalker,Land | TargetUnique$ True
SVar:RolledChaos:DB$ Pump | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SubAbility$ DBExchange
SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Permanent | TgtPrompt$ Select target permanent card | TargetsWithSharedTypes$ Creature,Artifact,Enchantment,Planeswalker,Land,Tribal | TargetUnique$ True
AI:RemoveDeck:All
AI:RemoveDeck:Random
SVar:Picture:http://www.wizards.com/global/images/magic/general/cliffside_market.jpg

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

@@ -2,7 +2,7 @@ Name:Shifting Loyalties
ManaCost:5 U
Types:Sorcery
A:SP$ Pump | Cost$ 5 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SubAbility$ DBExchange | StackDescription$ None | SpellDescription$ Exchange control of two target permanents that share a card type.
SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Permanent | TgtPrompt$ Select target permanent shares a card type with it | TargetsWithSharedTypes$ Creature,Artifact,Enchantment,Planeswalker,Land | TargetUnique$ True
SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Permanent | TgtPrompt$ Select target permanent shares a card type with it | TargetsWithSharedTypes$ Creature,Artifact,Enchantment,Planeswalker,Land,Tribal | TargetUnique$ True
AI:RemoveDeck:All
AI:RemoveDeck:Random
SVar:Picture:http://www.wizards.com/global/images/magic/general/shifting_loyalties.jpg

7
forge-gui/res/cardsfolder/upcoming/return_from_extinction.txt
View File

@@ -1,7 +1,10 @@
Name:Return from Extinction
ManaCost:1 B
Types:Sorcery
A:SP$ Charm | Cost$ 1 B | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBChangeZone1,DBChangeZone2
A:SP$ Charm | Cost$ 1 B | Choices$ DBChangeZone1,DBChangeZone2
SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return target creature card from your graveyard to your hand.
SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select two target creature cards that share a creature type in your graveyard | ValidTgts$ Creature.sharesCreatureTypeWith+Other+YouOwn | TargetMin$ 2 | TargetMax$ 2 | SpellDescription$ Return two target creature cards that share a creature type from your graveyard to your hand.
SVar:DBChangeZone2:DB$ Pump | RememberObjects$ Targeted | TgtZone$ Graveyard | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select two target creature cards that share a creature type in your graveyard | SubAbility$ DBPump | SpellDescription$ Return two target creature cards that share a creature type from your graveyard to your hand.
SVar:DBPump:DB$ Pump | RememberObjects$ Targeted | TargetsWithRelatedProperty$ SharedCreatureType | TargetUnique$ True | TgtZone$ Graveyard | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select two target creature cards that share a creature type in your graveyard | SubAbility$ DBChangeZoneAll
SVar:DBChangeZoneAll:DB$ ChangeZone | Defined$ Remembered | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Choose one -\n• Return target creature card from your graveyard to your hand.\n• Return two target creature cards that share a creature type from your graveyard to your hand.

8
forge-gui/res/cardsfolder/upcoming/sisay_weatherlight_captain.txt
View File

@@ -2,8 +2,8 @@ Name:Sisay, Weatherlight Captain
ManaCost:2 W
Types:Legendary Creature Human Soldier
PT:2/2
S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Description$ Equipped creature gets +1/+1 for each color among permanents you control.
SVar:X:Count$ColorsCtrl Permanent.YouCtrl+Legendary+inZoneBattlefield
A:AB$ ChangeZone | Cost$ W U B R G | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Legendary+cmcLEY | ChangeNum$ 1 | References$ Y | SpellDescription$ Search your library for a legendary permanent card with converted mana cost less than CARDNAME’s power, put that card onto the battlefield, then shuffle your library.
S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Description$ CARDNAME gets +1/+1 for each color among permanents you control.
SVar:X:Count$ColorsCtrl Permanent.YouCtrl+Other+Legendary+inZoneBattlefield
A:AB$ ChangeZone | Cost$ W U B R G | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Legendary+cmcLTY | ChangeNum$ 1 | References$ Y | SpellDescription$ Search your library for a legendary permanent card with converted mana cost less than CARDNAME's power, put that card onto the battlefield, then shuffle your library.
SVar:Y:Count$CardPower
Oracle:Sisay, Weatherlight Captain gets +1/+1 for each color among other legendary permanents you control.\n{W}{U}{B}{R}{G}: Search your library for a legendary permanent card with converted mana cost less than Sisay’s power, put that card onto the battlefield, then shuffle your library.
Oracle:Sisay, Weatherlight Captain gets +1/+1 for each color among other legendary permanents you control.\n{W}{U}{B}{R}{G}: Search your library for a legendary permanent card with converted mana cost less than Sisay's power, put that card onto the battlefield, then shuffle your library.