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

- Fixing Multikicker.

Browse Source
This commit is contained in:
jendave
2011-08-07 00:35:54 +00:00
parent f128f51586
commit 1f6f5ea47f
2 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/MagicStack.java
View File

@@ -242,7 +242,7 @@ public class MagicStack extends MyObservable {
push(sp); push(sp);
} }
else if (sp.getPayCosts() != null && ! sp.isReplicate()){ else if (sp.getPayCosts() != null && !sp.isMultiKicker() && !sp.isReplicate()){
push(sp); push(sp);
} }

45
src/forge/card/cardFactory/CardFactory.java
View File

@@ -482,12 +482,7 @@ public class CardFactory implements NewConstants {
public void execute() { public void execute() {
CardList CardsinPlay = AllZoneUtil.getTypeInPlay("World"); CardList CardsinPlay = AllZoneUtil.getTypeInPlay("World");
CardsinPlay = CardsinPlay.filter(new CardListFilter() { CardsinPlay.remove(card);
public boolean addCard(Card c) {
if(!c.equals(card)) return true;
return false;
}
});
for(int i = 0; i < CardsinPlay.size(); i++) for(int i = 0; i < CardsinPlay.size(); i++)
AllZone.GameAction.sacrificeDestroy(CardsinPlay.get(i)); AllZone.GameAction.sacrificeDestroy(CardsinPlay.get(i));
}//execute() }//execute()
@@ -509,44 +504,6 @@ public class CardFactory implements NewConstants {
} }
} }
/*
if (hasKeyword(card, "etbLoseLife") != -1) {
int n = hasKeyword(card, "etbLoseLife");
String parse = card.getKeyword().get(n).toString();
card.removeIntrinsicKeyword(parse);
String k[] = parse.split(":");
final int num = Integer.parseInt(k[1]);
card.getSpellPermanent().setLoseLifeAmount(num);
// performs the gain
final SpellAbility etbLoseLifeAbility = new Ability(card, "0") {
@Override
public void resolve() {
card.getController().loseLife(num, card);
}
};
// when the card enters the battlefield
Command etbLoseLife = new Command() {
private static final long serialVersionUID = -6797619430597211329L;
public void execute() {
StringBuilder sb = new StringBuilder();
sb.append(card.getController()).append(" loses "+num+" life");
etbLoseLifeAbility.setStackDescription(sb.toString());
AllZone.Stack.addSimultaneousStackEntry(etbLoseLifeAbility);
}
};
card.addComesIntoPlayCommand(etbLoseLife);
} // etbLoseLife
*/
if(hasKeyword(card, "SearchRebel") != -1) { if(hasKeyword(card, "SearchRebel") != -1) {
int n = hasKeyword(card, "SearchRebel"); int n = hasKeyword(card, "SearchRebel");
if(n != -1) { if(n != -1) {