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

convert 3 costs from string to costs,

Browse Source 
extra clean up in Player class
This commit is contained in:
Maxmtg
2013-06-06 08:52:10 +00:00
parent 6a4934d67f
commit 9f1a00651d
6 changed files with 18 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/forge/Card.java
View File

@@ -199,9 +199,9 @@ public class Card extends GameEntity implements Comparable<Card> {
private TreeMap<Long, Player> tempControllers = new TreeMap<Long, Player>();
private String text = "";
private String echoCost = "";
private String madnessCost = null;
private String miracleCost = null;
private Cost echoCost = null;
private Cost madnessCost = null;
private Cost miracleCost = null;
private String chosenType = "";
private List<String> chosenColor = new ArrayList<String>();
private String namedCard = "";
@@ -1440,18 +1440,11 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param s
* a {@link java.lang.String} object.
*/
public final void setEchoCost(final String s) {
public final void setEchoCost(final Cost s) {
this.echoCost = s;
}
/**
* <p>
* Getter for the field <code>echoCost</code>.
* </p>
*
* @return a {@link java.lang.String} object.
*/
public final String getEchoCost() {
public final Cost getEchoCost() {
return this.echoCost;
}
@@ -4679,7 +4672,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*
* @return a {@link java.lang.String} object.
*/
public final String getMadnessCost() {
public final Cost getMadnessCost() {
return this.madnessCost;
}
@@ -4691,7 +4684,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param cost
* a {@link java.lang.String} object.
*/
public final void setMadnessCost(final String cost) {
public final void setMadnessCost(final Cost cost) {
this.madnessCost = cost;
}
@@ -4702,7 +4695,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*
* @return a {@link java.lang.String} object.
*/
public final String getMiracleCost() {
public final Cost getMiracleCost() {
return this.miracleCost;
}
@@ -4714,7 +4707,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param cost
* a {@link java.lang.String} object.
*/
public final void setMiracleCost(final String cost) {
public final void setMiracleCost(final Cost cost) {
this.miracleCost = cost;
}

6
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -2354,7 +2354,7 @@ public class CardFactoryUtil {
final String[] k = card.getKeyword().get(echoPos).split(":");
final String manacost = k[1];
card.setEchoCost(manacost);
card.setEchoCost(new Cost(manacost, false));
final Command intoPlay = new Command() {
@@ -3149,7 +3149,7 @@ public class CardFactoryUtil {
// card.removeIntrinsicKeyword(parse);
final String[] k = parse.split(":");
card.setMadnessCost(k[1]);
card.setMadnessCost(new Cost(k[1], false));
}
} // madness
@@ -3160,7 +3160,7 @@ public class CardFactoryUtil {
// card.removeIntrinsicKeyword(parse);
final String[] k = parse.split(":");
card.setMiracleCost(k[1]);
card.setMiracleCost(new Cost(k[1], false));
}
} // miracle

2
src/main/java/forge/game/GameAction.java
View File

@@ -757,7 +757,7 @@ public class GameAction {
}
final SpellAbility madness = card.getFirstSpellAbility().copy();
madness.setPayCosts(new Cost(card.getMadnessCost(), false));
madness.setPayCosts(card.getMadnessCost());
final StringBuilder sb = new StringBuilder();
sb.append(card.getName()).append(" - Cast via Madness");

5
src/main/java/forge/game/phase/Upkeep.java
View File

@@ -165,8 +165,7 @@ public class Upkeep extends Phase {
for (int i = 0; i < list.size(); i++) {
final Card c = list.get(i);
if (c.hasStartOfKeyword("(Echo unpaid)")) {
Cost cost = new Cost(c.getEchoCost(), true);
final Ability blankAbility = Upkeep.getBlankAbility(c, cost);
final Ability blankAbility = Upkeep.getBlankAbility(c, c.getEchoCost());
blankAbility.setActivatingPlayer(c.getController());
final StringBuilder sb = new StringBuilder();
@@ -175,7 +174,7 @@ public class Upkeep extends Phase {
final Ability sacAbility = new Ability(c, ManaCost.ZERO) {
@Override
public void resolve() {
Cost cost = new Cost(c.getEchoCost().trim(), true);
Cost cost = c.getEchoCost();
boolean hasPaid = c.getController().getController().payManaOptional(c, cost, "Echo for " + c, ManaPaymentPurpose.Echo);
if (!hasPaid)

81
src/main/java/forge/game/player/Player.java
View File

@@ -113,7 +113,7 @@ public class Player extends GameEntity implements Comparable<Player> {
private ArrayList<String> prowl = new ArrayList<String>();
/** The max lands to play. */
private int maxLandsToPlay = 1;
private final static int maxLandsToPlay = 1;
/** The num lands played. */
private int numLandsPlayed = 0;
@@ -1849,32 +1849,6 @@ public class Player extends GameEntity implements Comparable<Player> {
// // properties about the player and his/her cards/game status
// //
// /////////////////////////////
/**
* <p>
* hasPlaneswalker.
* </p>
*
* @return a boolean.
*/
public final boolean hasPlaneswalker() {
return null != this.getPlaneswalker();
}
/**
* <p>
* getPlaneswalker.
* </p>
*
* @return a {@link forge.Card} object.
*/
public final Card getPlaneswalker() {
final List<Card> c = CardLists.filter(this.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANEWALKERS);
if ((null != c) && (c.size() > 0)) {
return c.get(0);
} else {
return null;
}
}
/**
* <p>
@@ -1921,24 +1895,11 @@ public class Player extends GameEntity implements Comparable<Player> {
* a {@link forge.Card} object.
* @return a {@link forge.Card} object.
*/
public final Card setLastDrawnCard(final Card c) {
private final Card setLastDrawnCard(final Card c) {
this.lastDrawnCard = c;
return this.lastDrawnCard;
}
/**
* <p>
* resetLastDrawnCard.
* </p>
*
* @return a {@link forge.Card} object.
*/
public final Card resetLastDrawnCard() {
final Card old = this.lastDrawnCard;
this.lastDrawnCard = null;
return old;
}
/**
* <p>
* getTurn.
@@ -2502,42 +2463,6 @@ public class Player extends GameEntity implements Comparable<Player> {
this.unlimitedHandSize = unlimited;
}
/**
* <p>
* Getter for the field <code>maxLandsToPlay</code>.
* </p>
*
* @return a int.
*/
public final int getMaxLandsToPlay() {
return this.maxLandsToPlay;
}
/**
* <p>
* Setter for the field <code>maxLandsToPlay</code>.
* </p>
*
* @param n
* a int.
*/
public final void setMaxLandsToPlay(final int n) {
this.maxLandsToPlay = n;
}
/**
* <p>
* addMaxLandsToPlay.
* </p>
*
* @param n
* a int.
*/
public final void addMaxLandsToPlay(final int n) {
this.maxLandsToPlay += n;
}
/**
* <p>
* Getter for the field <code>numLandsPlayed</code>.
@@ -3062,7 +2987,7 @@ public class Player extends GameEntity implements Comparable<Player> {
}
final SpellAbility playForMiracleCost = card.getFirstSpellAbility().copy();
playForMiracleCost.setPayCosts(new Cost(card.getMiracleCost(), false));
playForMiracleCost.setPayCosts(card.getMiracleCost());
playForMiracleCost.setStackDescription(card.getName() + " - Cast via Miracle");
// TODO Convert this to a Trigger

1
src/main/java/forge/gui/framework/SLayoutIO.java
View File

@@ -12,7 +12,6 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.SwingUtilities;
import javax.swing.border.EmptyBorder;
import javax.xml.stream.XMLEventFactory;
import javax.xml.stream.XMLEventReader;