From d9a40ea359cadd527be5ba4007053f5589e8999f Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:32:50 +0000 Subject: [PATCH] - Fixed Blood Moon and similar cards not removing the lands abilities. --- .gitattributes | 10 ++++---- res/cardsfolder/blood_moon.txt | 22 ++++++++--------- res/cardsfolder/contaminated_ground.txt | 22 ++++++++--------- res/cardsfolder/lush_growth.txt | 20 ++++++++-------- res/cardsfolder/magus_of_the_moon.txt | 20 ++++++++-------- res/cardsfolder/titanias_song.txt | 32 ++++++++++++------------- src/forge/ComputerUtil_Block2.java | 2 +- 7 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.gitattributes b/.gitattributes index bc80f1c5a67..1fe26a5397f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -804,7 +804,7 @@ res/cardsfolder/blood_cultist.txt -text svneol=native#text/plain res/cardsfolder/blood_frenzy.txt -text svneol=native#text/plain res/cardsfolder/blood_hound.txt -text svneol=native#text/plain res/cardsfolder/blood_knight.txt -text svneol=native#text/plain -res/cardsfolder/blood_moon.txt svneol=native#text/plain +res/cardsfolder/blood_moon.txt -text svneol=native#text/plain res/cardsfolder/blood_pet.txt -text svneol=native#text/plain res/cardsfolder/blood_rites.txt -text svneol=native#text/plain res/cardsfolder/blood_seeker.txt -text svneol=native#text/plain @@ -1388,7 +1388,7 @@ res/cardsfolder/contagion_clasp.txt -text svneol=native#text/plain res/cardsfolder/contagion_engine.txt -text svneol=native#text/plain res/cardsfolder/contagious_nim.txt -text svneol=native#text/plain res/cardsfolder/contaminated_bond.txt -text svneol=native#text/plain -res/cardsfolder/contaminated_ground.txt svneol=native#text/plain +res/cardsfolder/contaminated_ground.txt -text svneol=native#text/plain res/cardsfolder/contemplation.txt -text svneol=native#text/plain res/cardsfolder/contested_war_zone.txt svneol=native#text/plain res/cardsfolder/control_magic.txt -text svneol=native#text/plain @@ -4162,7 +4162,7 @@ res/cardsfolder/lurking_informant.txt -text svneol=native#text/plain res/cardsfolder/lurking_nightstalker.txt -text svneol=native#text/plain res/cardsfolder/lurking_predators.txt svneol=native#text/plain res/cardsfolder/lurking_skirge.txt svneol=native#text/plain -res/cardsfolder/lush_growth.txt svneol=native#text/plain +res/cardsfolder/lush_growth.txt -text svneol=native#text/plain res/cardsfolder/lust_for_war.txt svneol=native#text/plain res/cardsfolder/lux_cannon.txt -text svneol=native#text/plain res/cardsfolder/lymph_sliver.txt -text svneol=native#text/plain @@ -4211,7 +4211,7 @@ res/cardsfolder/magus_of_the_coffers.txt -text svneol=native#text/plain res/cardsfolder/magus_of_the_disk.txt -text svneol=native#text/plain res/cardsfolder/magus_of_the_library.txt -text svneol=native#text/plain res/cardsfolder/magus_of_the_moat.txt -text svneol=native#text/plain -res/cardsfolder/magus_of_the_moon.txt svneol=native#text/plain +res/cardsfolder/magus_of_the_moon.txt -text svneol=native#text/plain res/cardsfolder/magus_of_the_tabernacle.txt -text svneol=native#text/plain res/cardsfolder/magus_of_the_unseen.txt -text svneol=native#text/plain res/cardsfolder/mahamoti_djinn.txt -text svneol=native#text/plain @@ -7281,7 +7281,7 @@ res/cardsfolder/tireless_tribe.txt -text svneol=native#text/plain res/cardsfolder/titan_forge.txt -text svneol=native#text/plain res/cardsfolder/titanias_boon.txt -text svneol=native#text/plain res/cardsfolder/titanias_chosen.txt -text svneol=native#text/plain -res/cardsfolder/titanias_song.txt svneol=native#text/plain +res/cardsfolder/titanias_song.txt -text svneol=native#text/plain res/cardsfolder/titanic_bulvox.txt -text svneol=native#text/plain res/cardsfolder/titanic_ultimatum.txt -text svneol=native#text/plain res/cardsfolder/titanium_golem.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/blood_moon.txt b/res/cardsfolder/blood_moon.txt index 0113904d42e..bc527512397 100644 --- a/res/cardsfolder/blood_moon.txt +++ b/res/cardsfolder/blood_moon.txt @@ -1,12 +1,12 @@ -Name:Blood Moon -ManaCost:2 R -Types:Enchantment -Text:no text -K:stAnimateAll:Land.nonBasic:0/0:Land,Mountain,Overwrite,KeepSupertype:no colors:No Abilities:No Condition:Nonbasic lands are Mountains. -SVar:RemRandomDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_moon.jpg -SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/178.jpg -SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/57.jpg -SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/176.jpg +Name:Blood Moon +ManaCost:2 R +Types:Enchantment +Text:no text +K:stAnimateAll:Land.nonBasic:0/0:Land,Mountain,Overwrite,KeepSupertype:no colors:Overwrite:No Condition:Nonbasic lands are Mountains. +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_moon.jpg +SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/178.jpg +SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/57.jpg +SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/176.jpg End \ No newline at end of file diff --git a/res/cardsfolder/contaminated_ground.txt b/res/cardsfolder/contaminated_ground.txt index bfb35ae72ca..b55cbf060f6 100644 --- a/res/cardsfolder/contaminated_ground.txt +++ b/res/cardsfolder/contaminated_ground.txt @@ -1,12 +1,12 @@ -Name:Contaminated Ground -ManaCost:1 B -Types:Enchantment Aura -Text:no text -K:Enchant Land Curse -K:stAnimateEnchanted:Land:0/0:Land,Swamp,Overwrite,KeepSupertype:no colors:No Abilities:No Condition:Enchanted land is a Swamp. -T:Mode$ Taps | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigLose | TriggerDescription$ Whenever enchanted land becomes tapped, its controller loses 2 life. -SVar:TrigLose:AB$LoseLife | Cost$ 0 | Defined$ EnchantedController | LifeAmount$ 2 -SVar:Rarity:Common -SVar:Picture:http://www.wizards.com/global/images/magic/general/contaminated_ground.jpg -SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/102.jpg +Name:Contaminated Ground +ManaCost:1 B +Types:Enchantment Aura +Text:no text +K:Enchant Land Curse +K:stAnimateEnchanted:Land:0/0:Land,Swamp,Overwrite,KeepSupertype:no colors:Overwrite:No Condition:Enchanted land is a Swamp. +T:Mode$ Taps | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigLose | TriggerDescription$ Whenever enchanted land becomes tapped, its controller loses 2 life. +SVar:TrigLose:AB$LoseLife | Cost$ 0 | Defined$ EnchantedController | LifeAmount$ 2 +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/contaminated_ground.jpg +SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/102.jpg End \ No newline at end of file diff --git a/res/cardsfolder/lush_growth.txt b/res/cardsfolder/lush_growth.txt index 2d00e1d02cd..3b18f36a566 100644 --- a/res/cardsfolder/lush_growth.txt +++ b/res/cardsfolder/lush_growth.txt @@ -1,11 +1,11 @@ -Name:Lush Growth -ManaCost:G -Types:Enchantment Aura -Text:no text -K:Enchant Land -K:stAnimateEnchanted:Land:0/0:Land,Mountain,Forest,Plains,Overwrite,KeepSupertype:no colors:No Abilities:No Condition:Enchanted land is a Mountain, Forest, and Plains. -SVar:RemRandomDeck:True -SVar:Rarity:Common -SVar:Picture:http://www.wizards.com/global/images/magic/general/lush_growth.jpg -SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/136.jpg +Name:Lush Growth +ManaCost:G +Types:Enchantment Aura +Text:no text +K:Enchant Land +K:stAnimateEnchanted:Land:0/0:Land,Mountain,Forest,Plains,Overwrite,KeepSupertype:no colors:Overwrite:No Condition:Enchanted land is a Mountain, Forest, and Plains. +SVar:RemRandomDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/lush_growth.jpg +SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/136.jpg End \ No newline at end of file diff --git a/res/cardsfolder/magus_of_the_moon.txt b/res/cardsfolder/magus_of_the_moon.txt index 4e5d730e957..82ad6d7711b 100644 --- a/res/cardsfolder/magus_of_the_moon.txt +++ b/res/cardsfolder/magus_of_the_moon.txt @@ -1,11 +1,11 @@ -Name:Magus of the Moon -ManaCost:2 R -Types:Creature Human Wizard -Text:no text -PT:2/2 -K:stAnimateAll:Land.nonBasic:0/0:Land,Mountain,Overwrite,KeepSupertype:no colors:No Abilities:No Condition:Nonbasic lands are Mountains. -SVar:RemRandomDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_moon.jpg -SetInfo:FUT|Rare|http://magiccards.info/scans/en/fut/101.jpg +Name:Magus of the Moon +ManaCost:2 R +Types:Creature Human Wizard +Text:no text +PT:2/2 +K:stAnimateAll:Land.nonBasic:0/0:Land,Mountain,Overwrite,KeepSupertype:no colors:Overwrite:No Condition:Nonbasic lands are Mountains. +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_moon.jpg +SetInfo:FUT|Rare|http://magiccards.info/scans/en/fut/101.jpg End \ No newline at end of file diff --git a/res/cardsfolder/titanias_song.txt b/res/cardsfolder/titanias_song.txt index 8401356ba39..52d3833df54 100644 --- a/res/cardsfolder/titanias_song.txt +++ b/res/cardsfolder/titanias_song.txt @@ -1,17 +1,17 @@ -Name:Titania's Song -ManaCost:3 G -Types:Enchantment -Text:no text -K:stAnimateAll:Artifact.nonCreature:Count$CardManaCost/Count$CardManaCost:Creature:no colors:Overwrite:No condition:Each noncreature artifact loses its abilities and becomes an artifact creature with power and toughness each equal to its converted mana cost. -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ If CARDNAME leaves the battlefield, this effect continues until end of turn. -SVar:TrigEffect:AB$ Effect | Cost$ 0 | Name$ Titania's Song Effect | Keywords$ KWAnimateAll -SVar:KWAnimateAll:stAnimateAll:Artifact.nonCreature:Count$CardManaCost/Count$CardManaCost:Creature:no colors:Overwrite:No condition:Each noncreature artifact loses its abilities and becomes an artifact creature with power and toughness each equal to its converted mana cost. -SVar:PlayMain1:TRUE -SVar:RemAIDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/titanias_song.jpg -SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/194.jpg -SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/127.jpg -SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/160.jpg -SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/65.jpg +Name:Titania's Song +ManaCost:3 G +Types:Enchantment +Text:no text +K:stAnimateAll:Artifact.nonCreature:Count$CardManaCost/Count$CardManaCost:Creature:no colors:Overwrite:No condition:Each noncreature artifact loses its abilities and becomes an artifact creature with power and toughness each equal to its converted mana cost. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ If CARDNAME leaves the battlefield, this effect continues until end of turn. +SVar:TrigEffect:AB$ Effect | Cost$ 0 | Name$ Titania's Song Effect | Keywords$ KWAnimateAll +SVar:KWAnimateAll:stAnimateAll:Artifact.nonCreature:Count$CardManaCost/Count$CardManaCost:Creature:no colors:Overwrite:No condition:Each noncreature artifact loses its abilities and becomes an artifact creature with power and toughness each equal to its converted mana cost. +SVar:PlayMain1:TRUE +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/titanias_song.jpg +SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/194.jpg +SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/127.jpg +SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/160.jpg +SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/65.jpg End \ No newline at end of file diff --git a/src/forge/ComputerUtil_Block2.java b/src/forge/ComputerUtil_Block2.java index cb456f8e21c..92bc62ed801 100644 --- a/src/forge/ComputerUtil_Block2.java +++ b/src/forge/ComputerUtil_Block2.java @@ -190,7 +190,7 @@ public class ComputerUtil_Block2 if ((attacker.hasKeyword("First Strike") || attacker.hasKeyword("Double Strike")) && !(c.hasKeyword("First Strike") || c.hasKeyword("Double Strike"))) return false; - return true;//CardFactoryUtil.evaluateCreature(c) + diff < CardFactoryUtil.evaluateCreature(attacker); + return CardFactoryUtil.evaluateCreature(c) + diff < CardFactoryUtil.evaluateCreature(attacker); } });