mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 18:58:00 +00:00
1) Converted these cards from code to keyword: AEther Web; Armadillo Cloak; Serra's Embrace; Wings of Hope.
2) Reverted Vigilance to a non-keyword'ed card that is implemented by it's own coded card object.
This commit is contained in:
@@ -4994,7 +4994,6 @@ W
|
|||||||
Enchantment Aura
|
Enchantment Aura
|
||||||
Enchanted creature has vigilance.
|
Enchanted creature has vigilance.
|
||||||
Enchant creature
|
Enchant creature
|
||||||
enPump:Vigilance
|
|
||||||
|
|
||||||
Mask of Law and Grace
|
Mask of Law and Grace
|
||||||
W
|
W
|
||||||
@@ -6187,8 +6186,9 @@ AEther Web
|
|||||||
1 G
|
1 G
|
||||||
Enchantment Aura
|
Enchantment Aura
|
||||||
Enchanted creature gets +1/+1, has reach, and can block creatures with shadow as though they didn't have shadow.
|
Enchanted creature gets +1/+1, has reach, and can block creatures with shadow as though they didn't have shadow.
|
||||||
Enchant creature
|
|
||||||
Flash
|
Flash
|
||||||
|
Enchant creature
|
||||||
|
enPump:+1/+1/Reach & This creature can block creatures with shadow as though they didn't have shadow.
|
||||||
|
|
||||||
Emeria Angel
|
Emeria Angel
|
||||||
2 W W
|
2 W W
|
||||||
@@ -6446,12 +6446,14 @@ W U
|
|||||||
Enchantment Aura
|
Enchantment Aura
|
||||||
Enchanted creature gets +1/+3 and has flying.
|
Enchanted creature gets +1/+3 and has flying.
|
||||||
Enchant creature
|
Enchant creature
|
||||||
|
enPump:+1/+3/Flying
|
||||||
|
|
||||||
Serra's Embrace
|
Serra's Embrace
|
||||||
2 W W
|
2 W W
|
||||||
Enchantment Aura
|
Enchantment Aura
|
||||||
Enchanted creature gets +2/+2 and has flying and vigilance.
|
Enchanted creature gets +2/+2 and has flying and vigilance.
|
||||||
Enchant creature
|
Enchant creature
|
||||||
|
enPump:+2/+2/Flying & Vigilance
|
||||||
|
|
||||||
Flight
|
Flight
|
||||||
U
|
U
|
||||||
@@ -6566,6 +6568,7 @@ Armadillo Cloak
|
|||||||
Enchantment Aura
|
Enchantment Aura
|
||||||
Enchanted creature gets +2/+2 and has trample and lifelink.
|
Enchanted creature gets +2/+2 and has trample and lifelink.
|
||||||
Enchant creature
|
Enchant creature
|
||||||
|
enPump:+2/+2/Trample & Lifelink
|
||||||
|
|
||||||
Dryad Sophisticate
|
Dryad Sophisticate
|
||||||
1 G
|
1 G
|
||||||
|
|||||||
@@ -1380,10 +1380,6 @@ class CardFactory_Auras {
|
|||||||
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
||||||
}//*************** END ************ END **************************
|
}//*************** END ************ END **************************
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// NOTE: this card is missing it's cards.txt entry
|
|
||||||
|
|
||||||
//*************** START *********** START **************************
|
//*************** START *********** START **************************
|
||||||
else if(cardName.equals("Paralyzing Grasp")) {
|
else if(cardName.equals("Paralyzing Grasp")) {
|
||||||
final SpellAbility spell = new Spell(card) {
|
final SpellAbility spell = new Spell(card) {
|
||||||
@@ -1607,6 +1603,96 @@ class CardFactory_Auras {
|
|||||||
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
||||||
}//*************** END ************ END **************************
|
}//*************** END ************ END **************************
|
||||||
|
|
||||||
|
//******************************************************************
|
||||||
|
// This card can't be converted to keyword, problem with CARDNME *
|
||||||
|
//*************** START *********** START **************************
|
||||||
|
else if(cardName.equals("Vigilance")) {
|
||||||
|
final SpellAbility spell = new Spell(card) {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 3659751920022901998L;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canPlayAI() {
|
||||||
|
CardList list = new CardList(AllZone.Computer_Play.getCards());
|
||||||
|
list = list.getType("Creature");
|
||||||
|
|
||||||
|
if(list.isEmpty()) return false;
|
||||||
|
|
||||||
|
//else
|
||||||
|
CardListUtil.sortAttack(list);
|
||||||
|
CardListUtil.sortFlying(list);
|
||||||
|
|
||||||
|
for(int i = 0; i < list.size(); i++) {
|
||||||
|
if(CardFactoryUtil.canTarget(card, list.get(i))) {
|
||||||
|
setTargetCard(list.get(i));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}//canPlayAI()
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void resolve() {
|
||||||
|
PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
|
||||||
|
play.add(card);
|
||||||
|
|
||||||
|
Card c = getTargetCard();
|
||||||
|
|
||||||
|
if(AllZone.GameAction.isCardInPlay(c) && CardFactoryUtil.canTarget(card, c)) {
|
||||||
|
card.enchantCard(c);
|
||||||
|
System.out.println("Enchanted: " + getTargetCard());
|
||||||
|
}
|
||||||
|
}//resolve()
|
||||||
|
};//SpellAbility
|
||||||
|
card.clearSpellAbility();
|
||||||
|
card.addSpellAbility(spell);
|
||||||
|
|
||||||
|
Command onEnchant = new Command() {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = -2060758415927004190L;
|
||||||
|
|
||||||
|
public void execute() {
|
||||||
|
if(card.isEnchanting()) {
|
||||||
|
Card crd = card.getEnchanting().get(0);
|
||||||
|
crd.addExtrinsicKeyword("Vigilance");
|
||||||
|
}
|
||||||
|
}//execute()
|
||||||
|
};//Command
|
||||||
|
|
||||||
|
|
||||||
|
Command onUnEnchant = new Command() {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = -5220074511756932255L;
|
||||||
|
|
||||||
|
public void execute() {
|
||||||
|
if(card.isEnchanting()) {
|
||||||
|
Card crd = card.getEnchanting().get(0);
|
||||||
|
|
||||||
|
crd.removeExtrinsicKeyword("Vigilance");
|
||||||
|
}
|
||||||
|
|
||||||
|
}//execute()
|
||||||
|
};//Command
|
||||||
|
|
||||||
|
Command onLeavesPlay = new Command() {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = -549155960320946886L;
|
||||||
|
|
||||||
|
public void execute() {
|
||||||
|
if(card.isEnchanting()) {
|
||||||
|
Card crd = card.getEnchanting().get(0);
|
||||||
|
card.unEnchantCard(crd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
card.addEnchantCommand(onEnchant);
|
||||||
|
card.addUnEnchantCommand(onUnEnchant);
|
||||||
|
card.addLeavesPlayCommand(onLeavesPlay);
|
||||||
|
|
||||||
|
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
||||||
|
}//*************** END ************ END **************************
|
||||||
|
|
||||||
|
|
||||||
// *******************************************************************
|
// *******************************************************************
|
||||||
// Why are there two different card objects for Scavenged Weaponry ???
|
// Why are there two different card objects for Scavenged Weaponry ???
|
||||||
@@ -2432,6 +2518,8 @@ class CardFactory_Auras {
|
|||||||
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
||||||
}//*************** END ************ END **************************
|
}//*************** END ************ END **************************
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
//*************** START *********** START **************************
|
//*************** START *********** START **************************
|
||||||
else if(cardName.equals("Armadillo Cloak")) {
|
else if(cardName.equals("Armadillo Cloak")) {
|
||||||
final SpellAbility spell = new Spell(card) {
|
final SpellAbility spell = new Spell(card) {
|
||||||
@@ -2527,7 +2615,9 @@ class CardFactory_Auras {
|
|||||||
|
|
||||||
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
||||||
}//*************** END ************ END **************************
|
}//*************** END ************ END **************************
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
//*************** START *********** START **************************
|
//*************** START *********** START **************************
|
||||||
else if(cardName.equals("Serra's Embrace")) {
|
else if(cardName.equals("Serra's Embrace")) {
|
||||||
final SpellAbility spell = new Spell(card) {
|
final SpellAbility spell = new Spell(card) {
|
||||||
@@ -2619,7 +2709,9 @@ class CardFactory_Auras {
|
|||||||
|
|
||||||
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
||||||
}//*************** END ************ END **************************
|
}//*************** END ************ END **************************
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
//*************** START *********** START **************************
|
//*************** START *********** START **************************
|
||||||
else if(cardName.equals("Wings of Hope")) {
|
else if(cardName.equals("Wings of Hope")) {
|
||||||
final SpellAbility spell = new Spell(card) {
|
final SpellAbility spell = new Spell(card) {
|
||||||
@@ -2710,7 +2802,9 @@ class CardFactory_Auras {
|
|||||||
|
|
||||||
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
||||||
}//*************** END ************ END **************************
|
}//*************** END ************ END **************************
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
//*************** START *********** START **************************
|
//*************** START *********** START **************************
|
||||||
else if(cardName.equals("AEther Web")) {
|
else if(cardName.equals("AEther Web")) {
|
||||||
final SpellAbility spell = new Spell(card) {
|
final SpellAbility spell = new Spell(card) {
|
||||||
@@ -2809,7 +2903,7 @@ class CardFactory_Auras {
|
|||||||
|
|
||||||
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
||||||
}//*************** END ************ END **************************
|
}//*************** END ************ END **************************
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
//*************** START *********** START **************************
|
//*************** START *********** START **************************
|
||||||
@@ -3081,96 +3175,6 @@ class CardFactory_Auras {
|
|||||||
}//*************** END ************ END **************************
|
}//*************** END ************ END **************************
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
//*************** START *********** START **************************
|
|
||||||
else if(cardName.equals("Vigilance")) {
|
|
||||||
final SpellAbility spell = new Spell(card) {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 3659751920022901998L;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean canPlayAI() {
|
|
||||||
CardList list = new CardList(AllZone.Computer_Play.getCards());
|
|
||||||
list = list.getType("Creature");
|
|
||||||
|
|
||||||
if(list.isEmpty()) return false;
|
|
||||||
|
|
||||||
//else
|
|
||||||
CardListUtil.sortAttack(list);
|
|
||||||
CardListUtil.sortFlying(list);
|
|
||||||
|
|
||||||
for(int i = 0; i < list.size(); i++) {
|
|
||||||
if(CardFactoryUtil.canTarget(card, list.get(i))) {
|
|
||||||
setTargetCard(list.get(i));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}//canPlayAI()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void resolve() {
|
|
||||||
PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
|
|
||||||
play.add(card);
|
|
||||||
|
|
||||||
Card c = getTargetCard();
|
|
||||||
|
|
||||||
if(AllZone.GameAction.isCardInPlay(c) && CardFactoryUtil.canTarget(card, c)) {
|
|
||||||
card.enchantCard(c);
|
|
||||||
System.out.println("Enchanted: " + getTargetCard());
|
|
||||||
}
|
|
||||||
}//resolve()
|
|
||||||
};//SpellAbility
|
|
||||||
card.clearSpellAbility();
|
|
||||||
card.addSpellAbility(spell);
|
|
||||||
|
|
||||||
Command onEnchant = new Command() {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = -2060758415927004190L;
|
|
||||||
|
|
||||||
public void execute() {
|
|
||||||
if(card.isEnchanting()) {
|
|
||||||
Card crd = card.getEnchanting().get(0);
|
|
||||||
crd.addExtrinsicKeyword("Vigilance");
|
|
||||||
}
|
|
||||||
}//execute()
|
|
||||||
};//Command
|
|
||||||
|
|
||||||
|
|
||||||
Command onUnEnchant = new Command() {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = -5220074511756932255L;
|
|
||||||
|
|
||||||
public void execute() {
|
|
||||||
if(card.isEnchanting()) {
|
|
||||||
Card crd = card.getEnchanting().get(0);
|
|
||||||
|
|
||||||
crd.removeExtrinsicKeyword("Vigilance");
|
|
||||||
}
|
|
||||||
|
|
||||||
}//execute()
|
|
||||||
};//Command
|
|
||||||
|
|
||||||
Command onLeavesPlay = new Command() {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = -549155960320946886L;
|
|
||||||
|
|
||||||
public void execute() {
|
|
||||||
if(card.isEnchanting()) {
|
|
||||||
Card crd = card.getEnchanting().get(0);
|
|
||||||
card.unEnchantCard(crd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
card.addEnchantCommand(onEnchant);
|
|
||||||
card.addUnEnchantCommand(onUnEnchant);
|
|
||||||
card.addLeavesPlayCommand(onLeavesPlay);
|
|
||||||
|
|
||||||
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
|
|
||||||
}//*************** END ************ END **************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
//*************** START *********** START **************************
|
//*************** START *********** START **************************
|
||||||
else if(cardName.equals("Tiger Claws")) {
|
else if(cardName.equals("Tiger Claws")) {
|
||||||
|
|||||||
Reference in New Issue
Block a user