external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups in CardFactory classes

Browse Source
This commit is contained in:
jendave
2011-08-06 14:15:24 +00:00
parent 2f849b741e
commit eea8f37930
4 changed files with 146 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/forge/CardFactory.java
View File

@@ -7548,7 +7548,6 @@ public class CardFactory implements NewConstants {
}
};//SpellAbility
//card.clearSpellKeepManaAbility();
card.addSpellAbility(a1);
StringBuilder sb = new StringBuilder();
@@ -7566,6 +7565,7 @@ public class CardFactory implements NewConstants {
a1.setBeforePayMana(new Input_PayManaCost_Ability(a1.getManaCost(), paid1));
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if (cardName.equals("An-Zerrin Ruins")) {
@@ -7645,6 +7645,7 @@ public class CardFactory implements NewConstants {
card.addSpellAbility(ability);
}//*************** END ************ END **************************
//*************** START ************ START **************************
else if(cardName.equals("Black Mana Battery") || cardName.equals("Blue Mana Battery")
|| cardName.equals("Green Mana Battery") || cardName.equals("Red Mana Battery")
@@ -8166,6 +8167,8 @@ public class CardFactory implements NewConstants {
else JOptionPane.showMessageDialog(null, "Error in "+cardName+". freeCard is null", "", JOptionPane.INFORMATION_MESSAGE);
}
@Override
public boolean canPlayAI() {
return false;
}

48
src/forge/CardFactory_Creatures.java
View File

@@ -926,6 +926,7 @@ public class CardFactory_Creatures {
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Lava Hounds")) {
final SpellAbility ability = new Ability(card, "0") {
@@ -2025,7 +2026,6 @@ public class CardFactory_Creatures {
@Override
public void resolve() {
Player opponent = card.getController().getOpponent();
//AllZone.GameAction.addDamage(opponent, card, 4);
opponent.addDamage(4, card);
}
};
@@ -3835,7 +3835,6 @@ public class CardFactory_Creatures {
@Override
public void selectPlayer(Player player) {
int damage = ((Integer) countZubera.execute()).intValue();
//AllZone.GameAction.addDamage(player, card, damage);
player.addDamage(damage, card);
stop();
}//selectPlayer()
@@ -5629,51 +5628,6 @@ public class CardFactory_Creatures {
card.addSpellAbility(ability2);
}//*************** END ************ END **************************
/*
//*************** START *********** START **************************
else if(cardName.equals("Turtleshell Changeling")) {
//mana ability - targets itself - until EOT
//mana ability
final Ability ability = new Ability(card, "1 U") {
@Override
public boolean canPlayAI() {
return CardFactoryUtil.AI_doesCreatureAttack(card) && card.getNetAttack() == 1;
}
@Override
public void resolve() {
//in case ability is played twice
final int[] oldAttack = new int[1];
final int[] oldDefense = new int[1];
oldAttack[0] = card.getBaseAttack();
oldDefense[0] = card.getBaseDefense();
card.setBaseAttack(oldDefense[0]);
card.setBaseDefense(oldAttack[0]);
//EOT
final Command untilEOT = new Command() {
private static final long serialVersionUID = -5494886974452901728L;
public void execute() {
card.setBaseAttack(oldAttack[0]);
card.setBaseDefense(oldDefense[0]);
}
};
AllZone.EndOfTurn.addUntil(untilEOT);
}//resolve()
};//SpellAbility
StringBuilder sb = new StringBuilder();
sb.append(card).append(" - switch power and toughness until EOT.");
ability.setStackDescription(sb.toString());
ability.setDescription("1 U: Switch Turtleshell Changeling's power and toughness until end of turn.");
card.addSpellAbility(ability);
}//*************** END ************ END **************************
*/
//*************** START *********** START **************************
else if(cardName.equals("Jugan, the Rising Star")) {

1
src/forge/CardFactory_Planeswalkers.java
View File

@@ -2467,7 +2467,6 @@ class CardFactory_Planeswalkers {
for(int i = 0; i < dragons.size(); i++) {
Card dragon = dragons.get(i);
int damage = dragon.getNetAttack();
//AllZone.GameAction.addDamage(target, dragon, damage);
target.addDamage(damage, dragon);
}

4
src/forge/CardFactory_Sorceries.java
View File

@@ -4580,7 +4580,6 @@ public class CardFactory_Sorceries {
list.get(i).addDamage(card.getXManaCostPaid(), card);
}
//AllZone.GameAction.addDamage(player, card, damage);
player.addDamage(damage, card);
card.setXManaCostPaid(0);
}
@@ -4612,8 +4611,7 @@ public class CardFactory_Sorceries {
card.clearSpellAbility();
card.addSpellAbility(spell);
}
//*************** END ************ END **************************
}//*************** END ************ END **************************
//*************** START *********** START **************************