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

- Added Descriptions and ActivatingPlayers to some Upkeep abilities.

Browse Source
This commit is contained in:
Sloth
2013-03-05 14:42:49 +00:00
parent 44daa56145
commit b46adaeb9e
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,9 @@ public class Upkeep extends Phase {
} }
}; };
upkeepAbility.setActivatingPlayer(c.getController());
upkeepAbility.setStackDescription(sb.toString()); upkeepAbility.setStackDescription(sb.toString());
upkeepAbility.setDescription(sb.toString());
game.getStack().addSimultaneousStackEntry(upkeepAbility); game.getStack().addSimultaneousStackEntry(upkeepAbility);
@@ -206,6 +208,7 @@ public class Upkeep extends Phase {
} }
} }
}; };
sacAbility.setActivatingPlayer(c.getController());
sacAbility.setStackDescription(sb.toString()); sacAbility.setStackDescription(sb.toString());
sacAbility.setDescription(sb.toString()); sacAbility.setDescription(sb.toString());
@@ -514,7 +517,9 @@ public class Upkeep extends Phase {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append(abyss.getName()).append(" - destroy a nonartifact creature of your choice."); sb.append(abyss.getName()).append(" - destroy a nonartifact creature of your choice.");
sacrificeCreature.setActivatingPlayer(c.getController());
sacrificeCreature.setStackDescription(sb.toString()); sacrificeCreature.setStackDescription(sb.toString());
sacrificeCreature.setDescription(sb.toString());
game.getStack().addAndUnfreeze(sacrificeCreature); game.getStack().addAndUnfreeze(sacrificeCreature);
} // end for } // end for
} // The Abyss } // The Abyss
@@ -587,7 +592,9 @@ public class Upkeep extends Phase {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append(c.getName()).append(" - destroy 1 creature with lowest power."); sb.append(c.getName()).append(" - destroy 1 creature with lowest power.");
ability.setActivatingPlayer(c.getController());
ability.setStackDescription(sb.toString()); ability.setStackDescription(sb.toString());
ability.setDescription(sb.toString());
game.getStack().addSimultaneousStackEntry(ability); game.getStack().addSimultaneousStackEntry(ability);
@@ -997,6 +1004,7 @@ public class Upkeep extends Phase {
sb.append(source).append(" - deals ").append(damage).append(" damage to ").append(player); sb.append(source).append(" - deals ").append(damage).append(" damage to ").append(player);
ability.setStackDescription(sb.toString()); ability.setStackDescription(sb.toString());
ability.setDescription(sb.toString()); ability.setDescription(sb.toString());
ability.setActivatingPlayer(surge.getController());
if (damage > 0) { if (damage > 0) {
game.getStack().addSimultaneousStackEntry(ability); game.getStack().addSimultaneousStackEntry(ability);
@@ -1084,6 +1092,7 @@ public class Upkeep extends Phase {
+ " taps X artifacts, creatures or lands he or she controls."); + " taps X artifacts, creatures or lands he or she controls.");
ability.setDescription(source.getName() + " - " + player ability.setDescription(source.getName() + " - " + player
+ " taps X artifacts, creatures or lands he or she controls."); + " taps X artifacts, creatures or lands he or she controls.");
ability.setActivatingPlayer(source.getController());
game.getStack().addSimultaneousStackEntry(ability); game.getStack().addSimultaneousStackEntry(ability);
@@ -1119,6 +1128,8 @@ public class Upkeep extends Phase {
sb.append(blaze.get(i)).append(" - has a blaze counter and deals 1 damage to "); sb.append(blaze.get(i)).append(" - has a blaze counter and deals 1 damage to ");
sb.append(player).append("."); sb.append(player).append(".");
ability.setStackDescription(sb.toString()); ability.setStackDescription(sb.toString());
ability.setDescription(sb.toString());
ability.setActivatingPlayer(source.getController());
game.getStack().addSimultaneousStackEntry(ability); game.getStack().addSimultaneousStackEntry(ability);