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

- Reimplemented "StackDescription$ SpellDescription".

Browse Source
This commit is contained in:
Sloth
2012-11-23 18:48:51 +00:00
parent 9d7928d4c8
commit b481d69043
2 changed files with 67 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/card/abilityfactory/SpellEffect.java
View File

@@ -60,7 +60,9 @@ import forge.game.player.Player;
// Own description
String stackDesc = params.get("StackDescription");
if (stackDesc != null) {
if (!"None".equalsIgnoreCase(stackDesc)) { // by typing "none" they want to suppress output
if ("SpellDescription".equalsIgnoreCase(stackDesc)) { // by typing "none" they want to suppress output
sb.append(params.get("SpellDescription").replace("CARDNAME", sa.getSourceCard().getName()));
} else if (!"None".equalsIgnoreCase(stackDesc)) { // by typing "none" they want to suppress output
sb.append(stackDesc.replace("CARDNAME", sa.getSourceCard().getName()));
}
} else {

12
src/main/java/forge/card/abilityfactory/effects/ChangeZoneEffect.java
View File

@@ -66,17 +66,6 @@ public class ChangeZoneEffect extends SpellEffect {
}
sb.append(" ");
if (sa.hasParam("StackDescription")) {
String stackDesc = sa.getParam("StackDescription");
if (stackDesc.equals("None")) {
// Intentionally blank to avoid double spaces, otherwise: sb.append("");
} else if (stackDesc.equals("SpellDescription")) {
sb.append(sa.getParam("SpellDescription"));
} else {
sb.append(stackDesc);
}
} else {
String origin = "";
if (sa.hasParam("Origin")) {
origin = sa.getParam("Origin");
@@ -150,7 +139,6 @@ public class ChangeZoneEffect extends SpellEffect {
sb.append("Return ").append(num).append(" ").append(type).append(" card(s) ");
sb.append(" to your ").append(destination);
}
}
final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) {