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

- Fixed prompt of "At the beginning of your upkeep, sacrifice" keywords.

Browse Source
This commit is contained in:
Sloth
2013-06-24 14:58:04 +00:00
parent 7bb5f45c82
commit 8e8ee4bb5c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,21 +252,21 @@ public class Upkeep extends Phase {
if (ability.startsWith("At the beginning of your upkeep, sacrifice")) { if (ability.startsWith("At the beginning of your upkeep, sacrifice")) {
final String[] k = ability.split(" pay "); final String[] k = ability.split(" pay ");
cost = k[1].toString(); cost = k[1].toString();
sb.append("Sacrifice upkeep for ").append(c).append("\n"); sb.append("Sacrifice upkeep for " + c);
} }
if (ability.startsWith("Cumulative upkeep")) { if (ability.startsWith("Cumulative upkeep")) {
final String[] k = ability.split(":"); final String[] k = ability.split(":");
c.addCounter(CounterType.AGE, 1, true); c.addCounter(CounterType.AGE, 1, true);
cost = CardFactoryUtil.multiplyCost(k[1], c.getCounters(CounterType.AGE)); cost = CardFactoryUtil.multiplyCost(k[1], c.getCounters(CounterType.AGE));
sb.append("Cumulative upkeep for ").append(c).append("\n"); sb.append("Cumulative upkeep for " + c);
} }
final Cost upkeepCost = new Cost(cost, true); final Cost upkeepCost = new Cost(cost, true);
final Ability upkeepAbility = new Ability(c, ManaCost.ZERO) { final Ability upkeepAbility = new Ability(c, ManaCost.ZERO) {
@Override @Override
public void resolve() { public void resolve() {
boolean isPaid = controller.getController().payManaOptional(c, upkeepCost, this, "Cumulative upkeep for " + c, ManaPaymentPurpose.CumulativeUpkeep); boolean isPaid = controller.getController().payManaOptional(c, upkeepCost, this, sb.toString(), ManaPaymentPurpose.CumulativeUpkeep);
final HashMap<String, Object> runParams = new HashMap<String, Object>(); final HashMap<String, Object> runParams = new HashMap<String, Object>();
runParams.put("CumulativeUpkeepPaid", (Boolean) isPaid); runParams.put("CumulativeUpkeepPaid", (Boolean) isPaid);
runParams.put("Card", this.getSourceCard()); runParams.put("Card", this.getSourceCard());
@@ -275,6 +275,7 @@ public class Upkeep extends Phase {
game.getAction().sacrifice(c, null); game.getAction().sacrifice(c, null);
} }
}; };
sb.append("\n");
upkeepAbility.setActivatingPlayer(controller); upkeepAbility.setActivatingPlayer(controller);
upkeepAbility.setStackDescription(sb.toString()); upkeepAbility.setStackDescription(sb.toString());
upkeepAbility.setDescription(sb.toString()); upkeepAbility.setDescription(sb.toString());