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

Merge branch 'new-cards' into 'master'

Browse Source 
Nils, Discipline Enforcer (attacking tax computation)

See merge request core-developers/forge!4457
This commit is contained in:
Michael Kamensky
2021-04-11 12:40:38 +00:00
parent fc1c5ca6e9 da7a1f34e1
commit 129e4762dc
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
View File

@@ -20,6 +20,7 @@ package forge.game.staticability;
import com.google.common.collect.Iterables;
import forge.game.GameEntity;
import forge.game.ability.AbilityUtils;
import forge.game.card.Card;
import forge.game.card.CardCollectionView;
import forge.game.card.CardFactoryUtil;
@@ -128,14 +129,14 @@ public class StaticAbilityCantAttackBlock {
*
* @param stAb
* a StaticAbility
* @param card
* @param attacker
* the card
* @return a Cost
*/
public static Cost getAttackCost(final StaticAbility stAb, final Card card, final GameEntity target) {
public static Cost getAttackCost(final StaticAbility stAb, final Card attacker, final GameEntity target) {
final Card hostCard = stAb.getHostCard();
if (!stAb.matchesValidParam("ValidCard", card)) {
if (!stAb.matchesValidParam("ValidCard", attacker)) {
return null;
}
@@ -144,7 +145,14 @@ public class StaticAbilityCantAttackBlock {
}
String costString = stAb.getParam("Cost");
if (stAb.hasSVar(costString)) {
costString = Integer.toString(CardFactoryUtil.xCount(hostCard, stAb.getSVar(costString)));
boolean remember = stAb.hasParam("RememberingAttacker");
if (remember) {
hostCard.addRemembered(attacker);
}
costString = Integer.toString(AbilityUtils.calculateAmount(hostCard, stAb.getSVar(costString), stAb));
if (remember) {
hostCard.removeRemembered(attacker);
}
}
return new Cost(costString, true);