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

Added Tundra Kavu (Also added StackDescription to Pump and GenericChoice to allow correct stack description)

Browse Source
This commit is contained in:
moomarc
2012-02-13 08:21:35 +00:00
parent 0bb4385f6c
commit a86c9553a9
2 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java
View File

@@ -1869,19 +1869,24 @@ public final class AbilityFactoryChoose {
sb.append(" ");
}
ArrayList<Player> tgtPlayers;
final Target tgt = sa.getTarget();
if (tgt != null) {
tgtPlayers = tgt.getTargetPlayers();
} else {
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
if (params.containsKey("StackDescription")) {
sb.append(params.get("StackDescription"));
}
else {
ArrayList<Player> tgtPlayers;
for (final Player p : tgtPlayers) {
sb.append(p).append(" ");
final Target tgt = sa.getTarget();
if (tgt != null) {
tgtPlayers = tgt.getTargetPlayers();
} else {
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
}
for (final Player p : tgtPlayers) {
sb.append(p).append(" ");
}
sb.append("chooses from a list.");
}
sb.append("chooses from a list.");
final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) {

71
src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
View File

@@ -857,45 +857,50 @@ public class AbilityFactoryPump {
sb.append(name).append(" - ");
}
for (final GameEntity c : tgts) {
sb.append(c.getName()).append(" ");
if (params.containsKey("StackDescription")) {
sb.append(params.get("StackDescription"));
}
if (af.getMapParams().containsKey("Radiance")) {
sb.append(" and each other ").append(af.getMapParams().get("ValidTgts"))
.append(" that shares a color with ");
if (tgts.size() > 1) {
sb.append("them ");
} else {
sb.append("it ");
else {
for (final GameEntity c : tgts) {
sb.append(c.getName()).append(" ");
}
}
final int atk = this.getNumAttack(sa);
final int def = this.getNumDefense(sa);
sb.append("gains ");
if ((atk != 0) || (def != 0)) {
if (atk >= 0) {
sb.append("+");
if (af.getMapParams().containsKey("Radiance")) {
sb.append(" and each other ").append(af.getMapParams().get("ValidTgts"))
.append(" that shares a color with ");
if (tgts.size() > 1) {
sb.append("them ");
} else {
sb.append("it ");
}
}
sb.append(atk);
sb.append("/");
if (def >= 0) {
sb.append("+");
}
sb.append(def);
sb.append(" ");
}
for (int i = 0; i < this.keywords.size(); i++) {
if (!this.keywords.get(i).equals("none")) {
sb.append(this.keywords.get(i)).append(" ");
}
}
final int atk = this.getNumAttack(sa);
final int def = this.getNumDefense(sa);
if (!this.params.containsKey("Permanent")) {
sb.append("until end of turn.");
sb.append("gains ");
if ((atk != 0) || (def != 0)) {
if (atk >= 0) {
sb.append("+");
}
sb.append(atk);
sb.append("/");
if (def >= 0) {
sb.append("+");
}
sb.append(def);
sb.append(" ");
}
for (int i = 0; i < this.keywords.size(); i++) {
if (!this.keywords.get(i).equals("none")) {
sb.append(this.keywords.get(i)).append(" ");
}
}
if (!this.params.containsKey("Permanent")) {
sb.append("until end of turn.");
}
}
}