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

CharmEffect.java support GameActivationLimit in formatted desc

Browse Source
This commit is contained in:
Northmoc
2021-07-26 19:09:25 -04:00
parent f0ead44849
commit de4ae7bb3c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
View File

@@ -71,6 +71,7 @@ public class CharmEffect extends SpellAbilityEffect {
boolean repeat = sa.hasParam("CanRepeatModes"); boolean repeat = sa.hasParam("CanRepeatModes");
boolean random = sa.hasParam("Random"); boolean random = sa.hasParam("Random");
boolean limit = sa.hasParam("ActivationLimit"); boolean limit = sa.hasParam("ActivationLimit");
boolean gameLimit = sa.hasParam("GameActivationLimit");
boolean oppChooses = "Opponent".equals(sa.getParam("Chooser")); boolean oppChooses = "Opponent".equals(sa.getParam("Chooser"));
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -108,6 +109,14 @@ public class CharmEffect extends SpellAbilityEffect {
sb.append(". Additional code needed in CharmEffect."); sb.append(". Additional code needed in CharmEffect.");
} }
} }
if (gameLimit) {
int limitNum = AbilityUtils.calculateAmount(source, sa.getParam("GameActivationLimit"), sa);
if (limitNum == 1) {
sb.append(". Activate only once.");
} else {
sb.append(". Additional code needed in CharmEffect.");
}
}
if (additionalDesc) { if (additionalDesc) {
if (optional) { if (optional) {
@@ -118,7 +127,7 @@ public class CharmEffect extends SpellAbilityEffect {
} }
if (!list.isEmpty()) { if (!list.isEmpty()) {
if (!repeat && !additionalDesc && !limit) { if (!repeat && !additionalDesc && !limit && !gameLimit) {
sb.append(" \u2014"); sb.append(" \u2014");
} }
sb.append("\r\n"); sb.append("\r\n");