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

Merge branch 'bell_borca' into 'master'

Browse Source 
CMR: Bell Borca and support

See merge request core-developers/forge!3361
This commit is contained in:
Michael Kamensky
2020-11-09 04:39:01 +00:00
parent 57b9260d8a 68e4f86642
commit 94e5c99694
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/ability/effects/StoreSVarEffect.java
View File

@@ -1,10 +1,13 @@
package forge.game.ability.effects;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardFactoryUtil;
import forge.game.spellability.SpellAbility;
import forge.game.trigger.Trigger;
import forge.game.trigger.TriggerHandler;
import forge.util.TextUtil;
public class StoreSVarEffect extends SpellAbilityEffect {
@@ -50,9 +53,11 @@ public class StoreSVarEffect extends SpellAbilityEffect {
expr = TextUtil.fastReplace(expr, exprMathVar, Integer.toString(exprMath));
}
value = CardFactoryUtil.xCount(source, "SVar$" + expr);
}
else if (type.equals("Targeted")) {
} else if (type.equals("Targeted")) {
value = CardFactoryUtil.handlePaid(sa.findTargetedCards(), expr, source);
} else if (type.equals("Triggered")) {
Card trigCard = (Card)sa.getTriggeringObject(AbilityKey.Card);
value = CardFactoryUtil.xCount(trigCard, expr);
} else if (type.equals("Calculate")) {
value = AbilityUtils.calculateAmount(source, expr, sa);
}