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

- checkETBEffects will now check requirements (like Metalcraft).

Browse Source 
- Converted some etb AF's to DB's.
This commit is contained in:
jendave
2011-08-07 00:38:54 +00:00
parent 81ab5e3b50
commit c32b3259f8
12 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored
View File

@@ -5707,7 +5707,7 @@ res/cardsfolder/ridgetop_raptor.txt -text svneol=native#text/plain
res/cardsfolder/riding_red_hare.txt -text svneol=native#text/plain
res/cardsfolder/riding_the_dilu_horse.txt -text svneol=native#text/plain
res/cardsfolder/rift_bolt.txt -text svneol=native#text/plain
res/cardsfolder/riftwing_cloudskate.txt svneol=native#text/plain
res/cardsfolder/riftwing_cloudskate.txt -text svneol=native#text/plain
res/cardsfolder/righteous_avengers.txt -text svneol=native#text/plain
res/cardsfolder/righteous_cause.txt svneol=native#text/plain
res/cardsfolder/righteous_charge.txt -text svneol=native#text/plain
@@ -6082,7 +6082,7 @@ res/cardsfolder/selesnya_evangel.txt -text svneol=native#text/plain
res/cardsfolder/selesnya_guildmage.txt -text svneol=native#text/plain
res/cardsfolder/selesnya_sanctuary.txt -text svneol=native#text/plain
res/cardsfolder/selesnya_signet.txt -text svneol=native#text/plain
res/cardsfolder/selkie_hedge_mage.txt svneol=native#text/plain
res/cardsfolder/selkie_hedge_mage.txt -text svneol=native#text/plain
res/cardsfolder/sell_sword_brute.txt -text svneol=native#text/plain
res/cardsfolder/sengir_autocrat.txt -text svneol=native#text/plain
res/cardsfolder/sengir_bats.txt -text svneol=native#text/plain
@@ -6775,7 +6775,7 @@ res/cardsfolder/stifle.txt -text svneol=native#text/plain
res/cardsfolder/still_life.txt -text svneol=native#text/plain
res/cardsfolder/stillmoon_cavalier.txt -text svneol=native#text/plain
res/cardsfolder/stinging_barrier.txt -text svneol=native#text/plain
res/cardsfolder/stingscourger.txt svneol=native#text/plain
res/cardsfolder/stingscourger.txt -text svneol=native#text/plain
res/cardsfolder/stinkdrinker_daredevil.txt -text svneol=native#text/plain
res/cardsfolder/stinkweed_imp.txt -text svneol=native#text/plain
res/cardsfolder/stir_the_grave.txt -text svneol=native#text/plain

2
res/cardsfolder/aether_adept.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Human Wizard
Text:no text
PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_adept.jpg
SetInfo:M11|Common|http://magiccards.info/scans/en/m11/41.jpg

2
res/cardsfolder/aethersnipe.txt
View File

@@ -5,7 +5,7 @@ Text:
PT:4/4
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, return target nonland permanent to its owner's hand.
K:Evoke:1 U U
SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | ValidTgts$ Permanent.nonLand | TgtPrompt$ Choose target non-Land permanent. | Origin$ Battlefield | Destination$ Hand
SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Choose target non-Land permanent. | Origin$ Battlefield | Destination$ Hand
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+evoked | Execute$ TrigSac | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it by it's evoke cost, sacrifice it.
SVar:TrigSac:AB$Sacrifice | Cost$ 0
SVar:Rarity:Common

2
res/cardsfolder/aven_fogbringer.txt
View File

@@ -5,7 +5,7 @@ Text:no text
PT:2/1
K:Flying
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target land to its owner's hand.
SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ Hand
SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ Hand
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_fogbringer.jpg
SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/34.jpg

2
res/cardsfolder/glowing_anemone.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Jellyfish Beast
Text:no text
PT:1/3
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target land to its owner's hand.
SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ Hand
SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Land | TgtPrompt$ Select target land | Origin$ Battlefield | Destination$ Hand
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/glowing_anemone.jpg
SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/81.jpg

2
res/cardsfolder/lumengrid_drake.txt
View File

@@ -5,7 +5,7 @@ Text:no text
PT:2/2
K:Flying
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | Metalcraft$ True | TriggerDescription$ Metalcraft - When CARDNAME enters the battlefield, if you control three or more artifacts, return target creature to its owner's hand.
SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/lumengrid_drake.jpg
SetInfo:SOM|Common|http://magiccards.info/scans/en/som/36.jpg

2
res/cardsfolder/riftwing_cloudskate.txt
View File

@@ -6,7 +6,7 @@ PT:2/2
K:Flying
K:Suspend:3:1 U
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target permanent to its owner's hand.
SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand
SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/riftwing_cloudskate.jpg
SetInfo:TSP|Uncommon|http://magiccards.info/scans/en/ts/73.jpg

4
res/cardsfolder/sedraxis_alchemist.txt
View File

@@ -4,9 +4,9 @@ Types:Creature Zombie Wizard
Text:no text
PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Permanent.Blue+YouCtrl | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, if you control a blue permanent, return target nonland permanent to its owner's hand.
SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
SVar:Picture:http://www.wizards.com/global/images/magic/general/sedraxis_alchemist.jpg
SVar:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
SVar:RemAIDeck:True
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/sedraxis_alchemist.jpg
SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/54.jpg
End

2
res/cardsfolder/selkie_hedge_mage.txt
View File

@@ -6,7 +6,7 @@ PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Forest.YouCtrl | PresentCompare$ GE2 | Execute$ TrigGainLife | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Forests, you may gain 3 life.
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Island.YouCtrl | PresentCompare$ GE2 | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Islands, you may return target tapped creature to its owner's hand.
SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 3
SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | Origin$ Battlefield | Destination$ Hand
SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | Origin$ Battlefield | Destination$ Hand
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/selkie_hedge_mage.jpg
SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/158.jpg

2
res/cardsfolder/stern_proctor.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Human Wizard
Text:no text
PT:1/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target artifact or enchantment to its owner's hand.
SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Hand
SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Hand
SVar:RemRandomDeck:True
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/Stern_Proctor.jpg

2
res/cardsfolder/stingscourger.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Goblin Warrior
Text:no text
PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature an opponent controls to its owner's hand.
SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature an opponent controls | Origin$ Battlefield | Destination$ Hand
SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature an opponent controls | Origin$ Battlefield | Destination$ Hand
K:Echo:3 R
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/stingscourger.jpg

3
src/forge/card/spellability/Spell_Permanent.java
View File

@@ -245,6 +245,9 @@ public class Spell_Permanent extends Spell {
if (params.containsKey("ValidCard") && !params.get("ValidCard").contains("Self"))
continue;
if(!tr.requirementsCheck())
continue;
if (tr.getOverridingAbility() != null) // Don't look at Overriding Abilities yet
continue;