From 1d8ac5d78ec059646bb883979b45e2710d07dd4a Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 17:49:51 +0000 Subject: [PATCH] - Applied the conversion of Umezawa's Jitte by lazylockie. --- res/cardsfolder/umezawas_jitte.txt | 6 ++++-- src/forge/GameActionUtil.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/res/cardsfolder/umezawas_jitte.txt b/res/cardsfolder/umezawas_jitte.txt index 9fd4ec0f27b..92e777da6a1 100644 --- a/res/cardsfolder/umezawas_jitte.txt +++ b/res/cardsfolder/umezawas_jitte.txt @@ -1,11 +1,13 @@ Name:Umezawa's Jitte ManaCost:2 Types:Legendary Artifact Equipment -Text:Whenever equipped creature deals combat damage, put two charge counters on Umezawa's Jitte. +Text:no text +T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage, put two charge counters on CARDNAME. A:AB$Pump | Cost$ SubCounter<1/CHARGE> | Defined$ Equipped | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Equipped creature gets +2/+2 until end of turn. A:AB$Pump | Cost$ SubCounter<1/CHARGE> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn. A:AB$GainLife | Cost$ SubCounter<1/CHARGE> | LifeAmount$ 2 | SpellDescription$ You gain 2 life. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | CounterType$ CHARGE | CounterNum$ 2 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/umezawas_jitte.jpg SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/163.jpg -End +End diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index b69f7c5e634..8f9d089532b 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -4055,18 +4055,18 @@ public class GameActionUtil { AllZone.Stack.add(ability); } - if(source.isEquipped()) { + /*if(source.isEquipped()) { ArrayList equips = source.getEquippedBy(); for(Card equip:equips) { /* * Whenever equipped creature deals combat damage, put two * charge counters on Umezawa's Jitte. - */ + * if(equip.getName().equals("Umezawa's Jitte")) { equip.addCounter(Counters.CHARGE, 2); } } - }//isEquipped + }//isEquipped*/ } //restricted to combat damage and dealing damage to creatures