Fixed issue with Cranial Plating.

Issue
	attach then equip: plating will give bonus to both creatures
Fix
	Changed "attach" to "retarget target(creature|mybattlefield)"
	as this doesnot admit this bug
	Attach should become deprecated in future
This commit is contained in:
Dmitry Panin
2013-11-17 01:49:51 +04:00
parent afc903e31b
commit 2835bdf767
3 changed files with 7 additions and 5 deletions

View File

@@ -17432,7 +17432,7 @@ toughness=4
[card] [card]
name=Cranial Plating name=Cranial Plating
auto=foreach(artifact|mybattlefield) 1/0 auto=foreach(artifact|mybattlefield) 1/0
auto={B}{B}:attach auto={B}{B}:name(attach) retarget target(creature|mybattlefield)
auto={1}:equip auto={1}:equip
text=Equipped creature gets +1/+0 for each artifact you control. -- {B}{B}: Attach Cranial Plating to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) text=Equipped creature gets +1/+0 for each artifact you control. -- {B}{B}: Attach Cranial Plating to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
mana={2} mana={2}
@@ -39826,7 +39826,7 @@ name=Healer's Headdress
auto={1}:equip auto={1}:equip
auto=0/2 auto=0/2
auto=teach(creature) {T}:prevent:1 target(creature,player) auto=teach(creature) {T}:prevent:1 target(creature,player)
auto={W}{W}:attach auto={W}{W}:name(attach) retarget target(creature|mybattlefield)
text=Equipped creature gets +0/+2 and has "{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn." -- {W}{W}: Attach Healer's Headdress to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) text=Equipped creature gets +0/+2 and has "{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn." -- {W}{W}: Attach Healer's Headdress to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
mana={2} mana={2}
type=Artifact type=Artifact
@@ -41596,7 +41596,7 @@ toughness=2
name=Horned Helm name=Horned Helm
auto=1/1 auto=1/1
auto=trample auto=trample
auto={G}{G}:attach auto={G}{G}:name(attach) retarget target(creature|mybattlefield)
auto={1}:equip auto={1}:equip
text=Equipped creature gets +1/+1 and has trample. -- {G}{G}: Attach Horned Helm to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) text=Equipped creature gets +1/+1 and has trample. -- {G}{G}: Attach Horned Helm to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
mana={2} mana={2}
@@ -59983,7 +59983,7 @@ toughness=2
[card] [card]
name=Neurok Stealthsuit name=Neurok Stealthsuit
auto=teach(creature) shroud auto=teach(creature) shroud
auto={U}{U}:attach auto={U}{U}:name(attach) retarget target(creature|mybattlefield)
auto={1}:equip auto={1}:equip
text=Equipped creature has shroud. (It can't be the target of spells or abilities.) -- {U}{U}: Attach Neurok Stealthsuit to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) text=Equipped creature has shroud. (It can't be the target of spells or abilities.) -- {U}{U}: Attach Neurok Stealthsuit to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
mana={2} mana={2}
@@ -83437,7 +83437,7 @@ toughness=3
[card] [card]
name=Sparring Collar name=Sparring Collar
auto=first strike auto=first strike
auto={R}{R}:attach auto={R}{R}:name(attach) retarget target(creature|mybattlefield)
auto={1}:equip auto={1}:equip
text=Equipped creature has first strike. -- {R}{R}: Attach Sparring Collar to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) text=Equipped creature has first strike. -- {R}{R}: Attach Sparring Collar to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
mana={2} mana={2}

View File

@@ -5341,6 +5341,7 @@ int AEquip::equip(MTGCardInstance * equipped)
if (dynamic_cast<AEquip *> (a)) continue; if (dynamic_cast<AEquip *> (a)) continue;
if (dynamic_cast<ATeach *> (a)) continue; if (dynamic_cast<ATeach *> (a)) continue;
if (dynamic_cast<AAConnect *> (a)) continue; if (dynamic_cast<AAConnect *> (a)) continue;
if (dynamic_cast<AANewTarget *> (af.getCoreAbility(a))) continue;
if (a->aType == MTGAbility::STANDARD_TOKENCREATOR && a->oneShot) if (a->aType == MTGAbility::STANDARD_TOKENCREATOR && a->oneShot)
{ {
a->forceDestroy = 1; a->forceDestroy = 1;

View File

@@ -2163,6 +2163,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
return NEW AEquip(observer, id, card); return NEW AEquip(observer, id, card);
} }
// TODO: deprecate this ability in favor of retarget
//Equipment (attach) //Equipment (attach)
found = s.find("attach"); found = s.find("attach");
if (found != string::npos) if (found != string::npos)