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

- Untap should happen before the AIs upkeep phase now (I hope changing that didn't break anything).

Browse Source 
- Added Echo, Upkeep and Cumulative Upkeep functionality. 
- Thelonite Hermit should also give +1/+1 to creatures with Changeling.
- Added Donate, Illusions of Grandeur, Drifting Djinn, Drifter il-Dal, Karmic Guide, Avalanche Riders, Basalt Gargoyle, Keldon Vandals, Vaevictis Asmadi, Palladia-Mors, Nicol Bolas, Goblin Patrol, Goblin Marshal, Mogg War Marshal, Urza's Blueprints, Deranged Hermit, Winding Wurm, Vug Lizard, Viashino Outrider, Uktabi Drake, Thran War Machine, Tectonic Fiend, Simian Grunts, Shivan Raptor, Radiant's Dragoons, Pouncing Jaguar, Multani's Acolyte, Lightning Dragon, Herald of Serra, Henchfiend of Ukor, Goblin War Buggy, Cradle Guard, Citanul Centaurs, Albino Troll, Acridian.
This commit is contained in:
jendave
2011-08-06 03:05:59 +00:00
parent 9b23d90ec2
commit b66c63bdce
13 changed files with 1161 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

273
res/cards.txt
View File

@@ -1,3 +1,276 @@
Donate
2 U
Sorcery
Target player gains control of target permanent you control.
Illusions of Grandeur
3 U
Enchantment
When Illusions of Grandeur enters the battlefield, you gain 20 life. When Illusions of Grandeur leaves the battlefield, you lose 20 life.
Cumulative upkeep:2
Drifting Djinn
4 U U
Creature Djinn
At the beginning of your upkeep, sacrifice Drifting Djinn unless you pay:1 U
5/5
Flying
Cycling:2
Drifter il-Dal
U
Creature Human Wizard
At the beginning of your upkeep, sacrifice Drifter il-Dal unless you pay:U
2/1
Shadow
Karmic Guide
3 W W
Creature Angel Spirit
When Karmic Guide enters the battlefield, return target creature card from your graveyard to the battlefield.
2/2
Flying
Protection from black
Echo:3 W W
Avalanche Riders
3 R
Creature Human Nomad
When Avalanche Riders enters the battlefield, destroy target land.
2/2
Haste
Echo:3 R
Basalt Gargoyle
2 R
Creature Gargoyle
no text
3/2
Flying
Echo:2 R
abPump R:+0/+1
Keldon Vandals
2 R
Creature Human Rogue
When Keldon Vandals enters the battlefield, destroy target artifact.
4/1
Echo:2 R
Vaevictis Asmadi
2 B B R R G G
Legendary Creature Elder Dragon
no text
7/7
Flying
At the beginning of your upkeep, sacrifice Vaevictis Asmadi unless you pay:B R G
abPump B:+1/+0
abPump R:+1/+0
abPump G:+1/+0
Palladia-Mors
2 W W R R G G
Legendary Creature Elder Dragon
no text
7/7
Flying
At the beginning of your upkeep, sacrifice Palladia-Mors unless you pay:R G W
Nicol Bolas
2 U U B B R R
Legendary Creature Elder Dragon
Whenever Nicol Bolas deals damage to an opponent, that player discards his or her hand.
7/7
Flying
At the beginning of your upkeep, sacrifice Nicol Bolas unless you pay:U B R
Goblin Patrol
R
Creature Goblin
no text
2/1
Echo:R
Goblin Marshal
4 R R
Creature Goblin Warrior
When Goblin Marshal enters the battlefield or is put into a graveyard from the battlefield, put two 1/1 red Goblin creature tokens onto the battlefield.
3/3
Echo:4 R R
Mogg War Marshal
1 R
Creature Goblin Warrior
When Mogg War Marshal enters the battlefield or is put into a graveyard from the battlefield, put a 1/1 red Goblin creature token onto the battlefield.
1/1
Echo:1 R
Urza's Blueprints
6
Artifact
no text
Echo:6
Deranged Hermit
3 G G
Creature Elf
When Deranged Hermit enters the battlefield, put four 1/1 green Squirrel creature tokens onto the battlefield. Squirrel creatures get +1/+1.
1/1
Echo:3 G G
Winding Wurm
4 G
Creature Wurm
no text
6/6
Echo:4 G
Vug Lizard
1 R R
Creature Lizard
no text
3/4
Mountainwalk
Echo:1 R R
Viashino Outrider
2 R
Creature Viashino
no text
4/3
Echo:2 R
Uktabi Drake
G
Creature Drake
no text
2/1
Flying
Haste
Echo:1 G G
Thran War Machine
4
Artifact Creature Construct
no text
4/5
This card attacks each turn if able.
Echo:4
Tectonic Fiend
4 R R
Creature Elemental
no text
7/7
This card attacks each turn if able.
Echo:4 R R
Simian Grunts
2 G
Creature Ape
no text
3/4
Flash
Echo:2 G
Shivan Raptor
2 R
Creature Lizard
no text
3/1
First Strike
Haste
Echo:2 R
Radiant's Dragoons
3 W
Creature Human Soldier
no text
2/5
Echo:3 W
Pouncing Jaguar
G
Creature Cat
no text
2/2
Echo:G
Multani's Acolyte
G G
Creature Elf
no text
2/1
When this card comes into play, draw a card.
Echo:G G
Lightning Dragon
2 R R
Creature Dragon
no text
4/4
Flying
Haste
Echo:2 R R
abPump R:+1/+0
Herald of Serra
2 W W
Creature Angel
no text
3/4
Flying
Vigilance
Echo:2 W W
Henchfiend of Ukor
3 R
Creature Ogre
no text
3/2
Haste
Echo:1 B
abPump BR:+1/+0
Goblin War Buggy
1 R
Creature Goblin
no text
2/2
Haste
Echo:1 R
Cradle Guard
1 G G
Creature Treefolk
no text
4/4
Trample
Echo:1 G G
Citanul Centaurs
3 G
Creature Centaur
no text
6/3
Echo:3 G
Shroud
Albino Troll
1 G
Creature Ape
no text
3/3
Echo:1 G
RegenerateMe:1 G
Acridian
1 G
Creature Insect
no text
2/4
Echo:1 G
Feral Animist
1 R G
Creature Goblic Shaman

2
res/main.properties
View File

@@ -1,6 +1,6 @@
program/mail=mtgerror@yahoo.com
program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26
program/version=Forge -- official beta: 09/12/14, SVN revision: 221
program/version=Forge -- official beta: 09/12/14, SVN revision: 225
tokens--file=AllTokens.txt

11
src/forge/Card.java
View File

@@ -43,7 +43,6 @@ public class Card extends MyObservable
private boolean dealtDmgToOppThisTurn = false;
private boolean exaltedBonus = false;
private boolean faceDown = false;
private boolean echoPaid = false;
private boolean sacrificeAtEOT = false;
private boolean firstStrike = false;
@@ -81,6 +80,8 @@ public class Card extends MyObservable
private String rarity = "";
private String text = "";
private String manaCost = "";
private String upkeepCost = "";
private String echoCost = "";
private String chosenType = "";
private String chosenColor = "";
private String namedCard = "";
@@ -243,12 +244,16 @@ public class Card extends MyObservable
public int getTurnInZone() {return turnInZone;}
public void setTurnInZone(int turn) {turnInZone = turn;}
public boolean getEchoPaid() {return echoPaid;}
public void setEchoPaid(boolean b) {echoPaid = b;}
public void setEchoCost(String s) {echoCost = s;}
public String getEchoCost() {return echoCost;}
public void setManaCost(String s) {manaCost = s;}
public String getManaCost() {return manaCost;}
public void setUpkeepCost(String s) {upkeepCost = s;}
public String getUpkeepCost() {return upkeepCost;}
public boolean hasUpkeepCost(){return upkeepCost.length() > 0 && !upkeepCost.equals("0");}
//used for cards like Belbe's Portal, Conspiracy, Cover of Darkness, etc.
public String getChosenType() { return chosenType;}
public void setChosenType(String s) {chosenType = s;}

149
src/forge/CardFactory.java
View File

@@ -18464,6 +18464,155 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase();
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Urza's Blueprints"))
{
final SpellAbility ability = new Ability_Tap(card, "0")
{
private static final long serialVersionUID = -1802481790805608497L;
public boolean canPlayAI() {return AllZone.Phase.getPhase().equals(Constant.Phase.Main1);}
public void resolve()
{
AllZone.GameAction.drawCard(card.getController());
}
};//SpellAbility
card.addSpellAbility(ability);
ability.setDescription("tap: Draw a card.");
ability.setStackDescription(card.getName() + " - draw a card.");
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Illusions of Grandeur"))
{
final SpellAbility gainLife = new Ability(card, "0")
{
public void resolve()
{
Card c = card;
PlayerLife life = AllZone.GameAction.getPlayerLife(c.getController());
life.addLife(20);
}
};
final SpellAbility loseLife = new Ability(card, "0")
{
public void resolve()
{
Card c = card;
PlayerLife life = AllZone.GameAction.getPlayerLife(c.getController());
life.subtractLife(20);
}
};
Command intoPlay = new Command()
{
private static final long serialVersionUID = 502892931516451254L;
public void execute()
{
gainLife.setStackDescription(card.getController() +" gains 20 life");
AllZone.Stack.add(gainLife);
}
};
Command leavesPlay = new Command()
{
private static final long serialVersionUID = 5772999389072757369L;
public void execute()
{
loseLife.setStackDescription(card.getController() +" loses 20 life");
AllZone.Stack.add(loseLife);
}
};
card.addComesIntoPlayCommand(intoPlay);
card.addLeavesPlayCommand(leavesPlay);
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Donate"))
{
final SpellAbility spell = new Spell(card)
{
private static final long serialVersionUID = 782912579034503349L;
public void resolve()
{
Card c = getTargetCard();
if (c!=null && AllZone.GameAction.isCardInPlay(c) && CardFactoryUtil.canTarget(card, c))
{
if (!c.isAura())
{
((PlayerZone_ComesIntoPlay)AllZone.Human_Play).setTriggers(false);
((PlayerZone_ComesIntoPlay)AllZone.Computer_Play).setTriggers(false);
PlayerZone from = AllZone.getZone(c);
from.remove(c);
c.setController(AllZone.GameAction.getOpponent(card.getController()));
PlayerZone to = AllZone.getZone(Constant.Zone.Play, AllZone.GameAction.getOpponent(card.getController()));
to.add(c);
((PlayerZone_ComesIntoPlay)AllZone.Human_Play).setTriggers(true);
((PlayerZone_ComesIntoPlay)AllZone.Computer_Play).setTriggers(true);
}
else //Aura
{
c.setController(AllZone.GameAction.getOpponent(card.getController()));
}
}
}
public boolean canPlayAI()
{
CardList list = new CardList(AllZone.Computer_Play.getCards());
list = list.getName("Illusions of Grandeur");
if (list.size() > 0){
setTargetCard(list.get(0));
return true;
}
return false;
}
};
Input runtime = new Input()
{
private static final long serialVersionUID = -7823269301012427007L;
public void showMessage()
{
PlayerZone play = AllZone.getZone(Constant.Zone.Play, Constant.Player.Human);
CardList perms = new CardList();
perms.addAll(play.getCards());
perms = perms.filter(new CardListFilter()
{
public boolean addCard(Card c)
{
return c.isPermanent() && !c.getName().equals("Mana Pool");
}
});
stopSetNext(CardFactoryUtil.input_targetSpecific(spell, perms, "Select a permanent you control", true));
}//showMessage()
};//Input
spell.setBeforePayMana(runtime);
card.clearSpellAbility();
card.addSpellAbility(spell);
}//*************** END ************ END **************************
// Cards with Cycling abilities
// -1 means keyword "Cycling" not found
if (hasKeyword(card, "Cycling") != -1)

46
src/forge/CardFactoryUtil.java
View File

@@ -2117,6 +2117,42 @@ public class CardFactoryUtil
}
return count;
}
public static String multiplyManaCost(String manacost, int multiplier)
{
if (multiplier == 0)
return "";
if (multiplier == 1)
return manacost;
String result = "";
String tokenized[] = manacost.split("\\s");
if (Character.isDigit(tokenized[0].charAt(0))) //manacost starts with "colorless" number cost
{
int cost = Integer.parseInt(tokenized[0]);
cost = multiplier * cost;
tokenized[0] = "" + cost;
result = result + " " + tokenized[0];
}
else {
for (int i=0; i<multiplier; i++)
//tokenized[0] = tokenized[0] + " " + tokenized[0];
result = result + " " + tokenized[0];
}
for (int i=1;i<tokenized.length;i++){
for (int j=0;j<multiplier;j++)
{
//tokenized[i] = tokenized[i] + " " + tokenized[i];
result = result + " " + tokenized[i];
}
}
result = result.trim();
return result;
}
public static boolean canTarget(SpellAbility ability, Card target)
{
return canTarget(ability.getSourceCard(), target);
@@ -3017,6 +3053,16 @@ public class CardFactoryUtil
list = list.getType("Creature");
System.out.println("Most prominent creature type: " + getMostProminentCreatureType(list));
String manacost = "3 GW W W R B S";
String multipliedTwice = multiplyManaCost(manacost, 2);
String multipliedThrice = multiplyManaCost(manacost, 3);
System.out.println(manacost + " times 2 = " + multipliedTwice);
System.out.println(manacost + " times 3 = " + multipliedThrice);
}
}

361
src/forge/CardFactory_Creatures.java
View File

@@ -6,6 +6,16 @@ import javax.swing.JOptionPane;
public class CardFactory_Creatures {
private static final int hasKeyword(Card c, String k)
{
ArrayList<String> a = c.getKeyword();
for (int i = 0; i < a.size(); i++)
if (a.get(i).toString().startsWith(k))
return i;
return -1;
}
public static int shouldCycle(Card c) {
ArrayList<String> a = c.getKeyword();
for (int i = 0; i < a.size(); i++)
@@ -52,6 +62,8 @@ public class CardFactory_Creatures {
}
public static Card getCard(final Card card, String cardName, String owner, CardFactory cf)
{
@@ -1727,6 +1739,31 @@ public class CardFactory_Creatures {
card.addComesIntoPlayCommand(intoPlay);
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Radiant's Dragoons"))
{
final SpellAbility ability = new Ability(card, "0")
{
public void resolve()
{
Card c = card;
PlayerLife life = AllZone.GameAction.getPlayerLife(c.getController());
life.addLife(5);
}
};
Command intoPlay = new Command()
{
private static final long serialVersionUID = -7748429739046909730L;
public void execute()
{
ability.setStackDescription(card.getController() +" gains 5 life");
AllZone.Stack.add(ability);
}
};
card.addComesIntoPlayCommand(intoPlay);
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Shu Soldier-Farmers") || cardName.equals("Staunch Defenders") ||
cardName.equals("Spiritual Guardian") || cardName.equals("Teroh's Faithful") ||
@@ -4037,7 +4074,7 @@ public class CardFactory_Creatures {
//*************** START *********** START **************************
else if(cardName.equals("Man-o'-War") || cardName.equals("Sun Ce, Young Conquerer"))
else if(cardName.equals("Man-o'-War") || cardName.equals("Sun Ce, Young Conquerer") )
{
final SpellAbility ability = new Ability(card, "0")
{
@@ -4263,7 +4300,79 @@ public class CardFactory_Creatures {
card.addComesIntoPlayCommand(intoPlay);
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Karmic Guide"))
{
final SpellAbility ability = new Ability(card, "0")
{
public void resolve()
{
PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
if(AllZone.GameAction.isCardInZone(getTargetCard(), grave))
{
PlayerZone play = AllZone.getZone(Constant.Zone.Hand, card.getController());
grave.remove(getTargetCard());
play.add(getTargetCard());
}
}//resolve()
};
Command intoPlay = new Command()
{
private static final long serialVersionUID = 2128307240208621147L;
public void execute()
{
PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
CardList list = new CardList(grave.getCards());
list = list.getType("Creature");
if(list.isEmpty())
return;
if(card.getController().equals(Constant.Player.Human))
{
Object o = AllZone.Display.getChoiceOptional("Select target card", list.toArray());
if(o != null)
{
ability.setTargetCard((Card)o);
AllZone.Stack.add(ability);
}
}//if
else//computer
{
Card best = CardFactoryUtil.AI_getBestCreature(list);
ability.setTargetCard(best);
AllZone.Stack.add(ability);
}
}//execute()
};//Command
card.addComesIntoPlayCommand(intoPlay);
card.clearSpellAbility();
card.addSpellAbility(new Spell_Permanent(card)
{
private static final long serialVersionUID = 4446838001015234917L;
public boolean canPlayAI()
{
CardList creats = new CardList();
creats.addAll(AllZone.Computer_Graveyard.getCards());
creats = creats.filter(new CardListFilter()
{
public boolean addCard(Card c)
{
return c.isCreature() && c.getNetAttack() > 2;
}
});
if (creats.size() > 0)
return true;
else
return false;
}
});
}//*************** END ************ END **************************
@@ -14065,7 +14174,8 @@ public class CardFactory_Creatures {
//*************** START *********** START **************************
else if(cardName.equals("Viridian Shaman") || cardName.equals("Uktabi Orangutan") || cardName.equals("Vithian Renegades"))
else if(cardName.equals("Viridian Shaman") || cardName.equals("Uktabi Orangutan") || cardName.equals("Vithian Renegades") ||
cardName.equals("Keldon Vandals"))
{
final SpellAbility ability = new Ability(card, "0")
{
@@ -14149,6 +14259,83 @@ public class CardFactory_Creatures {
});
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Avalanche Riders"))
{
final SpellAbility ability = new Ability(card, "0")
{
public void resolve()
{
Card c = getTargetCard();
if(AllZone.GameAction.isCardInPlay(c) && CardFactoryUtil.canTarget(card, getTargetCard()) )
AllZone.GameAction.destroy(c);
}
};
Command intoPlay = new Command()
{
private static final long serialVersionUID = -8270520707155953207L;
public void execute()
{
CardList all = new CardList();
all.addAll(AllZone.Human_Play.getCards());
all.addAll(AllZone.Computer_Play.getCards());
all = all.filter(new CardListFilter(){
public boolean addCard(Card c)
{
return c.isLand() && CardFactoryUtil.canTarget(card, c);
}
});
CardList humanList = new CardList(AllZone.Human_Play.getCards());
humanList = humanList.getType("Land");
if (all.size() != 0) {
if(card.getController().equals(Constant.Player.Human)) {
AllZone.InputControl.setInput(CardFactoryUtil.input_targetSpecific(ability, all, "Select target artifact.", true));
ButtonUtil.disableAll();
}
else if (card.getController().equals(Constant.Player.Computer)) {
if (humanList.size() > 0 ){
ability.setTargetCard(humanList.get(0));
AllZone.Stack.add(ability);
}
else
{
Card comp = CardFactoryUtil.AI_getCheapestPermanent(all, card, true);
ability.setTargetCard(comp);
AllZone.Stack.add(ability);
}
}
}
}//execute()
};//Command
card.addComesIntoPlayCommand(intoPlay);
card.clearSpellAbility();
card.addSpellAbility(new Spell_Permanent(card)
{
private static final long serialVersionUID = -517667816379595978L;
public boolean canPlayAI()
{
CardList lands = new CardList();
lands.addAll(AllZone.Human_Play.getCards());
lands = lands.getType("Land");
if (lands.size() > 0)
return true;
else
return false;
}
});
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Aven Cloudchaser") || cardName.equals("Cloudchaser Eagle") || cardName.equals("Monk Realist"))
{
@@ -14580,6 +14767,106 @@ public class CardFactory_Creatures {
};
card.addComesIntoPlayCommand(intoPlay);
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Deranged Hermit"))
{
final SpellAbility ability = new Ability(card, "0")
{
public void resolve()
{
for (int i=0;i<4;i++)
makeToken();
}//resolve()
void makeToken()
{
Card c = new Card();
c.setOwner(card.getController());
c.setController(card.getController());
c.setName("Squirrel");
c.setImageName("G 1 1 Squirrel");
c.setManaCost("G");
c.setToken(true);
c.addType("Creature");
c.addType("Squirrel");
c.setBaseAttack(1);
c.setBaseDefense(1);
PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
play.add(c);
}
};
Command intoPlay = new Command()
{
private static final long serialVersionUID = 7299232424224916928L;
public void execute()
{
ability.setStackDescription("Deranged Hermit - put four green 1/1 Squirrel creature tokens onto the battlefield.");
AllZone.Stack.add(ability);
}
};
card.addComesIntoPlayCommand(intoPlay);
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Mogg War Marshal") || cardName.equals("Goblin Marshal"))
{
final SpellAbility ability = new Ability(card, "0")
{
public void resolve()
{
makeToken();
if (card.getName().equals("Goblin Marshal"))
makeToken();
}//resolve()
void makeToken()
{
Card c = new Card();
c.setOwner(card.getController());
c.setController(card.getController());
c.setName("Goblin");
c.setImageName("R 1 1 Goblin");
c.setManaCost("R");
c.setToken(true);
c.addType("Creature");
c.addType("Goblin");
c.setBaseAttack(1);
c.setBaseDefense(1);
PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
play.add(c);
}
};
Command intoPlayDestroy = new Command()
{
private static final long serialVersionUID = 5554242458006247407L;
public void execute()
{
if (card.getName().equals("Mogg War Marshal"))
ability.setStackDescription("Mogg War Marshal - put a red 1/1 Goblin creature token onto the battlefield.");
else if (card.getName().equals("Goblin Marshal"))
ability.setStackDescription("Goblin Marshal - put two red 1/1 Goblin creature tokens onto the battlefield.");
AllZone.Stack.add(ability);
}
};
card.addComesIntoPlayCommand(intoPlayDestroy);
card.addDestroyCommand(intoPlayDestroy);
}//*************** END ************ END **************************
//*************** START *********** START **************************
@@ -18924,6 +19211,23 @@ public class CardFactory_Creatures {
return newCard;
}//*************** END ************ END **************************
/*
else if (cardName.equals("Acridian"))
{
card.setEchoCost(card.getManaCost());
final Command intoPlay = new Command()
{
private static final long serialVersionUID = 8930023870127082001L;
public void execute() {
card.addIntrinsicKeyword("(Echo unpaid)");
}
};
card.addComesIntoPlayCommand(intoPlay);
}
*/
// Cards with Cycling abilities
// -1 means keyword "Cycling" not found
@@ -19004,6 +19308,59 @@ public class CardFactory_Creatures {
}
}//Vanishing
if (hasKeyword(card, "Echo") != -1)
{
int n = hasKeyword(card, "Echo");
if (n != -1)
{
String parse = card.getKeyword().get(n).toString();
//card.removeIntrinsicKeyword(parse);
String k[] = parse.split(":");
final String manacost = k[1];
card.setEchoCost(manacost);
final Command intoPlay = new Command()
{
private static final long serialVersionUID = 8930023870127082001L;
public void execute() {
card.addIntrinsicKeyword("(Echo unpaid)");
}
};
card.addComesIntoPlayCommand(intoPlay);
}
}//echo
/*
if (hasKeyword(card, "Upkeep") != -1)
{
int n = hasKeyword(card, "Upkeep");
if (n != -1)
{
String parse = card.getKeyword().get(n).toString();
card.removeIntrinsicKeyword(parse);
String k[] = parse.split(":");
final String manacost = k[1];
card.addIntrinsicKeyword("At the beginning of your upkeep, sacrifice " + card.getName() + " unless you pay " + manacost+".");
final Command intoPlay = new Command()
{
private static final long serialVersionUID = 925179072354331141L;
public void execute() {
card.setUpkeepCost(manacost);
}
};
card.addComesIntoPlayCommand(intoPlay);
}
}//upkeep
*/
return card;
}
}

7
src/forge/GameAction.java
View File

@@ -131,6 +131,13 @@ private Card getCurrentCard(int ID)
AI_discardNumUnless(numDiscard, uType);
}
public void discardHand(String player)
{
PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, player);
for (int i=0;i<hand.size();i++)
discardRandom(player);
}
public void AI_discardNumUnless(int numDiscard, String uType)
{
CardList hand = new CardList();

283
src/forge/GameActionUtil.java
View File

@@ -8,7 +8,9 @@ public class GameActionUtil
{
upkeep_removeDealtDamageToOppThisTurn();
//upkeep_Echo();
upkeep_UpkeepCost();
upkeep_CumulativeUpkeepCost();
upkeep_Echo();
// upkeep_CheckEmptyDeck_Lose(); //still a little buggy
upkeep_Phyrexian_Arena();
upkeep_Honden_of_Cleansing_Fire();
@@ -2466,6 +2468,146 @@ public class GameActionUtil
}
}
public static void upkeep_UpkeepCost()
{
String player = AllZone.Phase.getActivePlayer();
PlayerZone play = AllZone.getZone(Constant.Zone.Play, player);
CardList list = new CardList();
list.addAll(play.getCards());
//list = list.getType("Creature");
list = list.filter(new CardListFilter()
{
public boolean addCard(Card c)
{
ArrayList<String> a = c.getKeyword();
for (int i = 0; i < a.size(); i++)
{
if (a.get(i).toString().startsWith("At the beginning of your upkeep, sacrifice "))
{
String k[] = a.get(i).toString().split(":");
c.setUpkeepCost(k[1]);
return true;
}
}
return false;
}
});
for (int i=0; i<list.size();i++)
{
final Card c = list.get(i);
final Ability sacAbility = new Ability(c, c.getUpkeepCost())
{
public void resolve()
{
;
}
};
final Command unpaidCommand = new Command() {
private static final long serialVersionUID = -8737736216222268696L;
public void execute() {
AllZone.GameAction.sacrifice(c);
}
};
final Command paidCommand = new Command() {
private static final long serialVersionUID = -1832975152887536245L;
public void execute() {
;
}
};
//AllZone.Stack.add(sacAbility);
if (c.getController().equals(Constant.Player.Human)) {
AllZone.InputControl.setInput(new Input_PayManaCost_Ability("Upkeep for "+ c +"\r\n", sacAbility.getManaCost(), paidCommand, unpaidCommand));
}
else //computer
{
if (ComputerUtil.canPayCost(sacAbility))
ComputerUtil.playNoStack(sacAbility);
else
AllZone.GameAction.sacrifice(c);
}
}
}//upkeepCost
public static void upkeep_CumulativeUpkeepCost()
{
String player = AllZone.Phase.getActivePlayer();
PlayerZone play = AllZone.getZone(Constant.Zone.Play, player);
CardList list = new CardList();
list.addAll(play.getCards());
//list = list.getType("Creature");
list = list.filter(new CardListFilter()
{
public boolean addCard(Card c)
{
ArrayList<String> a = c.getKeyword();
for (int i = 0; i < a.size(); i++)
{
if (a.get(i).toString().startsWith("Cumulative upkeep"))
{
String k[] = a.get(i).toString().split(":");
c.addCounter(Counters.AGE, 1);
c.setUpkeepCost(CardFactoryUtil.multiplyManaCost(k[1], c.getCounters(Counters.AGE)));
//c.setUpkeepCost(k[1]);
return true;
}
}
return false;
}
});
for (int i=0; i<list.size();i++)
{
final Card c = list.get(i);
final Ability sacAbility = new Ability(c, c.getUpkeepCost())
{
public void resolve()
{
;
}
};
final Command unpaidCommand = new Command() {
private static final long serialVersionUID = -8737736216222268696L;
public void execute() {
AllZone.GameAction.sacrifice(c);
}
};
final Command paidCommand = new Command() {
private static final long serialVersionUID = -1832975152887536245L;
public void execute() {
;
}
};
//AllZone.Stack.add(sacAbility);
if (c.getController().equals(Constant.Player.Human)) {
AllZone.InputControl.setInput(new Input_PayManaCost_Ability("Upkeep for "+ c +"\r\n", sacAbility.getManaCost(), paidCommand, unpaidCommand));
}
else //computer
{
if (ComputerUtil.canPayCost(sacAbility))
ComputerUtil.playNoStack(sacAbility);
else
AllZone.GameAction.sacrifice(c);
}
}
}//upkeepCost
public static void upkeep_Echo()
{
String player = AllZone.Phase.getActivePlayer();
@@ -2473,20 +2615,58 @@ public class GameActionUtil
PlayerZone play = AllZone.getZone(Constant.Zone.Play, player);
CardList list = new CardList();
list.addAll(play.getCards());
list = list.getType("Creature");
//list = list.getType("Creature");
list = list.filter(new CardListFilter()
{
public boolean addCard(Card c)
{
return c.getKeyword().contains("(Echo unpaid)");
}
});
for (int i=0; i<list.size();i++)
{
Card c = list.get(i);
if (c.getIntrinsicKeyword().contains("Echo") && (c.getTurnInZone()+2 == AllZone.Phase.getTurn() ))
final Card c = list.get(i);
if (c.getIntrinsicKeyword().contains("(Echo unpaid)") )
{
final SpellAbility[] sa = c.getSpellAbility();
AllZone.GameAction.playSpellAbility(sa[1]);
//AllZone.Stack.push(sa[1]);
if (c.getEchoPaid())
System.out.println("success");
final Ability sacAbility = new Ability(c, c.getEchoCost())
{
public void resolve()
{
System.out.println("Echo cost for " + c + " was paid.");
}
};
final Command unpaidCommand = new Command() {
private static final long serialVersionUID = -7354791599039157375L;
public void execute() {
AllZone.GameAction.sacrifice(c);
}
};
final Command paidCommand = new Command() {
private static final long serialVersionUID = 4549981408026393913L;
public void execute() {
;
}
};
//AllZone.Stack.add(sacAbility);
if (c.getController().equals(Constant.Player.Human)) {
AllZone.InputControl.setInput(new Input_PayManaCost_Ability("Echo for "+ c +"\r\n", sacAbility.getManaCost(), paidCommand, unpaidCommand));
}
else //computer
{
if (ComputerUtil.canPayCost(sacAbility))
ComputerUtil.playNoStack(sacAbility);
else
System.out.println("crap");
AllZone.GameAction.sacrifice(c);
}
c.removeIntrinsicKeyword("(Echo unpaid)");
}
}
}
@@ -3656,6 +3836,8 @@ public class GameActionUtil
|| c.getName().equals("Thieving Magpie")
|| c.getName().equals("Lu Xun, Scholar General"))
playerCombatDamage_Shadowmage_Infiltrator(c);
else if (c.getName().equals("Nicol Bolas"))
playerCombatDamage_Nicol_Bolas(c);
else if (c.getName().equals("Goblin Lackey"))
playerCombatDamage_Goblin_Lackey(c);
else if (c.getName().equals("Augury Adept"))
@@ -4311,7 +4493,27 @@ public class GameActionUtil
}
}//warren instigator
private static void playerCombatDamage_Nicol_Bolas(Card c)
{
final String[] opp = new String[1];
final Card crd = c;
if (c.getNetAttack() > 0)
{
Ability ability = new Ability(c, "0")
{
public void resolve()
{
opp[0] = AllZone.GameAction.getOpponent(crd.getController());
AllZone.GameAction.discardHand(opp[0]);
}
};
opp[0] = AllZone.GameAction.getOpponent(c.getController());
ability.setStackDescription(c.getName() + " - " + opp[0]
+ " discards his or her hand.");
AllZone.Stack.add(ability);
}
}//nicol bolas
private static void playerCombatDamage_Shadowmage_Infiltrator(Card c)
{
@@ -15088,26 +15290,72 @@ public class GameActionUtil
CardList creature = new CardList();
creature.addAll(AllZone.Human_Play.getCards());
creature.addAll(AllZone.Computer_Play.getCards());
creature = creature.getType("Creature");
creature = creature.filter(new CardListFilter(){
public boolean addCard(Card c)
{
return c.getType().contains("Saproling") || c.getKeyword().contains("Changeling");
}
});
for (int i = 0; i < creature.size(); i++)
{
c = creature.get(i);
if (c.getType().contains("Saproling"))
{
c.addSemiPermanentAttackBoost(1);
c.addSemiPermanentDefenseBoost(1);
gloriousAnthemList.add(c);
}
}// for inner
}// for outer
}// execute()
};// Thelonite Hermit
public static Command Deranged_Hermit = new Command()
{
private static final long serialVersionUID = -6105987998040015344L;
CardList gloriousAnthemList = new CardList();
public void execute()
{
CardList list = gloriousAnthemList;
Card c;
// reset all cards in list - aka "old" cards
for (int i = 0; i < list.size(); i++)
{
c = list.get(i);
c.addSemiPermanentAttackBoost(-1);
c.addSemiPermanentDefenseBoost(-1);
}
// add +1/+1 to black cards
list.clear();
PlayerZone[] zone = getZone("Deranged Hermit");
for (int outer = 0; outer < zone.length; outer++)
{
// CardList creature = new CardList(zone[outer].getCards());
CardList creature = new CardList();
creature.addAll(AllZone.Human_Play.getCards());
creature.addAll(AllZone.Computer_Play.getCards());
creature = creature.filter(new CardListFilter(){
public boolean addCard(Card c)
{
return c.getType().contains("Squirrel") || c.getKeyword().contains("Changeling");
}
});
for (int i = 0; i < creature.size(); i++)
{
c = creature.get(i);
c.addSemiPermanentAttackBoost(1);
c.addSemiPermanentDefenseBoost(1);
gloriousAnthemList.add(c);
}// for inner
}// for outer
}// execute()
};// Deranged Hermit
public static Command Muraganda_Petroglyphs = new Command()
@@ -15461,6 +15709,7 @@ public class GameActionUtil
commands.put("Night_of_Souls_Betrayal", Night_of_Souls_Betrayal);
commands.put("Thelonite_Hermit", Thelonite_Hermit);
commands.put("Deranged_Hermit", Deranged_Hermit);
commands.put("Jacques", Jacques);
commands.put("Kaysa", Kaysa);
commands.put("Meng_Huo", Meng_Huo);

3
src/forge/InputControl.java
View File

@@ -185,6 +185,7 @@ import java.util.*;
{
System.out.println("Cache size: " + ImageCache.cache.size());
/*
CardList visibleCards = new CardList();
PlayerZone hPlay = AllZone.Human_Play;
PlayerZone hand = AllZone.Human_Hand;
@@ -211,7 +212,7 @@ import java.util.*;
ImageCache.cache.remove(s);
System.out.println("Removing " + s + " from cache.");
}
*/
if(AllZone.Display.stopEOT())
return new Input_EOT();

17
src/forge/Input_PayManaCost_Ability.java
View File

@@ -7,6 +7,7 @@ public class Input_PayManaCost_Ability extends Input
private static final long serialVersionUID = 3836655722696348713L;
private String originalManaCost;
private String message = "";
private ManaCost manaCost;
//private ArrayList<Card> tappedLand = new ArrayList<Card>();
@@ -15,6 +16,7 @@ public class Input_PayManaCost_Ability extends Input
@SuppressWarnings("unused") // isPaid
private boolean isPaid;
//for Abilities that don't tap
public Input_PayManaCost_Ability(String manaCost, Command paid)
{
@@ -26,11 +28,24 @@ public class Input_PayManaCost_Ability extends Input
public Input_PayManaCost_Ability(String manaCost_2, Command paidCommand_2, Command unpaidCommand_2)
{
originalManaCost = manaCost_2;
message = "";
manaCost = new ManaCost(originalManaCost);
paidCommand = paidCommand_2;
unpaidCommand = unpaidCommand_2;
}
public Input_PayManaCost_Ability(String m, String manaCost_2, Command paidCommand_2, Command unpaidCommand_2)
{
originalManaCost = manaCost_2;
message = m;
manaCost = new ManaCost(originalManaCost);
paidCommand = paidCommand_2;
unpaidCommand = unpaidCommand_2;
}
public void resetManaCost()
{
manaCost = new ManaCost(originalManaCost);
@@ -67,7 +82,7 @@ public class Input_PayManaCost_Ability extends Input
public void showMessage()
{
ButtonUtil.enableOnlyCancel();
AllZone.Display.showMessage("Pay Mana Cost: \r\n" +manaCost.toString());
AllZone.Display.showMessage(message + "Pay Mana Cost: \r\n" +manaCost.toString());
}

4
src/forge/Input_Untap.java
View File

@@ -5,7 +5,7 @@ public class Input_Untap extends Input
public void showMessage()
{
GameActionUtil.executeUpkeepEffects();
//GameActionUtil.executeUpkeepEffects();
PlayerZone p = AllZone.getZone(Constant.Zone.Play, AllZone.Phase.getActivePlayer());
Card[] c = p.getCards();
@@ -18,6 +18,8 @@ public class Input_Untap extends Input
else
regularUntap();
GameActionUtil.executeUpkeepEffects();
//otherwise land seems to stay tapped when it is really untapped
AllZone.Human_Play.updateObservers();

11
src/forge/SpellAbility.java
View File

@@ -1,4 +1,5 @@
package forge;
//only SpellAbility can go on the stack
//override any methods as needed
public abstract class SpellAbility
@@ -27,6 +28,8 @@ public abstract class SpellAbility
private Input afterResolve;
private Input afterPayMana;
private Command cancelCommand = null;
private CommandArgs randomTarget = new CommandArgs() {
private static final long serialVersionUID = 1795025064923737374L;
@@ -154,4 +157,12 @@ public void execute(Object o) {}};
setStackDescription(getSourceCard().getName() +" - targeting " +p);
}
public String getTargetPlayer() {return targetPlayer;}
public Command getCancelCommand() {
return cancelCommand;
}
public void setCancelCommand(Command cancelCommand) {
this.cancelCommand = cancelCommand;
}
}

1
src/forge/StateBasedEffects.java
View File

@@ -111,6 +111,7 @@ public class StateBasedEffects
cardToEffectsList.put("Engineered Plague", new String[] {"Engineered_Plague"});
cardToEffectsList.put("Night of Souls' Betrayal", new String[] {"Night_of_Souls_Betrayal"});
cardToEffectsList.put("Thelonite Hermit", new String[] {"Thelonite_Hermit"});
cardToEffectsList.put("Deranged Hermit", new String[] {"Deranged_Hermit"});
cardToEffectsList.put("Jacques le Vert", new String[] {"Jacques"});
cardToEffectsList.put("Kaysa", new String[] {"Kaysa"});
cardToEffectsList.put("Meng Huo, Barbarian King", new String[] {"Meng_Huo"});