- Converted Blight Sickle from code to keyword.

- Simplified the onUnEquip Command in CardFactoryUtil.java. Removed the test to see if keyword is named "none". Previous update should remove all of these keywords named "none".
This commit is contained in:
jendave
2011-08-06 03:32:56 +00:00
parent 76ea782664
commit 81a701ee1c
3 changed files with 15 additions and 4 deletions

View File

@@ -7404,7 +7404,8 @@ abPumpTgt T:Haste
Blight Sickle Blight Sickle
2 2
Artifact Equipment Artifact Equipment
Equipped creature gets +1/+0 and has Wither. Equipped creature gets +1/+0 and has wither.
VanillaEquipment:1:0:2:Wither:none:none
Priest of Titania Priest of Titania
1 G 1 G

View File

@@ -1330,9 +1330,15 @@ public class CardFactoryUtil {
public void execute() { public void execute() {
if(sourceCard.isEquipping()) { if(sourceCard.isEquipping()) {
Card crd = sourceCard.getEquipping().get(0); Card crd = sourceCard.getEquipping().get(0);
if(!(Ab1 == "none")) crd.removeExtrinsicKeyword(Ab1);
if(!(Ab2 == "none")) crd.removeExtrinsicKeyword(Ab2); //if(!(Ab1 == "none")) crd.removeExtrinsicKeyword(Ab1);
if(!(Ab3 == "none")) crd.removeExtrinsicKeyword(Ab3); //if(!(Ab2 == "none")) crd.removeExtrinsicKeyword(Ab2);
//if(!(Ab3 == "none")) crd.removeExtrinsicKeyword(Ab3);
crd.removeExtrinsicKeyword(Ab1); //no longer a need to test for a keyword named "none"
crd.removeExtrinsicKeyword(Ab2);
crd.removeExtrinsicKeyword(Ab3);
crd.addSemiPermanentAttackBoost(-1 * Power); crd.addSemiPermanentAttackBoost(-1 * Power);
crd.addSemiPermanentDefenseBoost(-1 * Tough); crd.addSemiPermanentDefenseBoost(-1 * Tough);

View File

@@ -767,6 +767,8 @@ class CardFactory_Equipment {
} //*************** END ************ END ************************** } //*************** END ************ END **************************
/*
//*************** START *********** START ************************** //*************** START *********** START **************************
else if(cardName.equals("Blight Sickle")) { else if(cardName.equals("Blight Sickle")) {
final Ability equip = new Ability(card, "2") { final Ability equip = new Ability(card, "2") {
@@ -875,6 +877,8 @@ class CardFactory_Equipment {
card.addUnEquipCommand(onUnEquip); card.addUnEquipCommand(onUnEquip);
} //*************** END ************ END ************************** } //*************** END ************ END **************************
*/
//*************** START *********** START ************************** //*************** START *********** START **************************
else if(cardName.equals("Spidersilk Net")) { else if(cardName.equals("Spidersilk Net")) {