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

Always use the original SA params when building a token script

Browse Source
This commit is contained in:
friarsol
2024-01-31 19:29:33 -05:00
committed by Chris H
parent a4cec7ab4d
commit 8c2c45dfe9
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/AmassAi.java
View File

@@ -34,7 +34,7 @@ public class AmassAi extends SpellAbilityAi {
} }
final String type = sa.getParam("Type"); final String type = sa.getParam("Type");
StringBuilder sb = new StringBuilder("b_0_0_"); StringBuilder sb = new StringBuilder("b_0_0_");
sb.append(type.toLowerCase()).append("_army"); sb.append(sa.getOriginalParam("Type").toLowerCase()).append("_army");
final String tokenScript = sb.toString(); final String tokenScript = sb.toString();
final int amount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Num", "1"), sa); final int amount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Num", "1"), sa);

4
forge-game/src/main/java/forge/game/CardTraitBase.java
View File

@@ -86,6 +86,10 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView,
return mapParams.get(key); return mapParams.get(key);
} }
public String getOriginalParam(String key) {
return originalMapParams.get(key);
}
public boolean hasParam(String key) { public boolean hasParam(String key) {
return mapParams.containsKey(key); return mapParams.containsKey(key);
} }

2
forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java
View File

@@ -63,7 +63,7 @@ public class AmassEffect extends TokenEffectBase {
MutableBoolean combatChanged = new MutableBoolean(false); MutableBoolean combatChanged = new MutableBoolean(false);
StringBuilder sb = new StringBuilder("b_0_0_"); StringBuilder sb = new StringBuilder("b_0_0_");
sb.append(type.toLowerCase()).append("_army"); sb.append(sa.getOriginalParam("Type").toLowerCase()).append("_army");
final Card result = TokenInfo.getProtoType(sb.toString(), sa, activator, false); final Card result = TokenInfo.getProtoType(sb.toString(), sa, activator, false);
// need to alter the token to add the Type from the Parameter // need to alter the token to add the Type from the Parameter