mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
1) make targeting for AF_DealDamage optional (though almost everything needs it; there's still a warning message displayed to console)
2) convert Stuffy Doll to AF_DealDamage (no target specified) 3) moved code from Filthy Cur, Jackal Pup, Shinka Gatekeeper and Stuffy Doll to the addDamage code in Card.java (previously, it was overriding the addDamage method and putting it on a new card in CardFactory_Creatures.java)
This commit is contained in:
@@ -56,7 +56,7 @@ public class CardFactory_Creatures {
|
||||
|
||||
|
||||
public static Card getCard(final Card card, String cardName, Player owner, CardFactory cf) {
|
||||
|
||||
/*
|
||||
//*************** START *********** START **************************
|
||||
if(cardName.equals("Filthy Cur")) {
|
||||
final Card newCard = new Card() {
|
||||
@@ -94,9 +94,10 @@ public class CardFactory_Creatures {
|
||||
|
||||
return newCard;
|
||||
}//*************** END ************ END **************************
|
||||
*/
|
||||
|
||||
//*************** START *********** START **************************
|
||||
else if(cardName.equals("Stone Giant")) {
|
||||
if(cardName.equals("Stone Giant")) {
|
||||
final ArrayList<Card> Tgt = new ArrayList<Card>();
|
||||
|
||||
final Command untilEOT = new Command() {
|
||||
@@ -243,7 +244,7 @@ public class CardFactory_Creatures {
|
||||
a1.setBeforePayMana(CardFactoryUtil.input_targetPlayer(a1));
|
||||
}//*************** END ************ END **************************
|
||||
|
||||
|
||||
/*
|
||||
//*************** START *********** START **************************
|
||||
else if(cardName.equals("Shinka Gatekeeper")) {
|
||||
final Card newCard = new Card() {
|
||||
@@ -327,7 +328,7 @@ public class CardFactory_Creatures {
|
||||
|
||||
//*************** START *********** START **************************
|
||||
else if(cardName.equals("Stuffy Doll")) {
|
||||
/*
|
||||
/
|
||||
final Card newCard = new Card() {
|
||||
Card c = this;
|
||||
|
||||
@@ -365,7 +366,7 @@ public class CardFactory_Creatures {
|
||||
newCard.setBaseDefense(1);
|
||||
|
||||
newCard.addIntrinsicKeyword("Indestructible");
|
||||
*/
|
||||
*
|
||||
|
||||
Ability_Cost abilCost = new Ability_Cost("T", cardName, true);
|
||||
|
||||
@@ -394,9 +395,9 @@ public class CardFactory_Creatures {
|
||||
|
||||
newCard.setSVars(card.getSVars());
|
||||
|
||||
return newCard;*/
|
||||
return newCard;*
|
||||
}//*************** END ************ END **************************
|
||||
|
||||
*/
|
||||
|
||||
//*************** START *********** START **************************
|
||||
else if(cardName.equals("Serra Avenger")) {
|
||||
|
||||
Reference in New Issue
Block a user