diff --git a/res/cardsfolder/j/johtull_wurm.txt b/res/cardsfolder/j/johtull_wurm.txt index 82fa8f8ff2f..ce3bf96b508 100644 --- a/res/cardsfolder/j/johtull_wurm.txt +++ b/res/cardsfolder/j/johtull_wurm.txt @@ -5,8 +5,8 @@ Text:no text PT:6/6 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets -2/-1 until end of turn for each creature blocking it beyond the first. SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ -X | NumDef$ -Y -SVar:X:TriggerCount$NumBlockersMinus1/Times.2 -SVar:Y:TriggerCount$NumBlockersMinus1 +SVar:X:SVar$Y/Twice +SVar:Y:TriggerCount$NumBlockers/Minus.1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/johtull_wurm.jpg End \ No newline at end of file diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index 3a28b015b5e..6437e7b42e8 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -1869,7 +1869,6 @@ public class CombatUtil { if (!a.getCreatureGotBlockedThisCombat()) { final int blockers = AllZone.getCombat().getBlockers(a).size(); runParams.put("NumBlockers", blockers); - runParams.put("NumBlockersMinus1", blockers - 1); AllZone.getTriggerHandler().runTrigger("AttackerBlocked", runParams); //Bushido diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory.java b/src/main/java/forge/card/abilityFactory/AbilityFactory.java index 98e89614e80..72b096c2da3 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory.java @@ -1197,6 +1197,10 @@ public class AbilityFactory { public static int calculateAmount(final Card card, String amount, final SpellAbility ability) { // amount can be anything, not just 'X' as long as sVar exists + if(card.getName().equals("Johtull Wurm")) + { + System.out.println("Heyo!"); + } if (amount == null) { return 0; } @@ -1221,6 +1225,11 @@ public class AbilityFactory { if (calcX[0].startsWith("Number")) { return CardFactoryUtil.xCount(card, card.getSVar(amount)) * multiplier; } + else if (calcX[0].startsWith("SVar")) { + String[] l = calcX[1].split("/"); + String[] m = CardFactoryUtil.parseMath(l); + return CardFactoryUtil.doXMath(calculateAmount(card,l[0],ability), m, card) * multiplier; + } else if (calcX[0].startsWith("Remembered")) { // Add whole Remembered list to handlePaid CardList list = new CardList(); @@ -1231,7 +1240,6 @@ public class AbilityFactory { } return CardFactoryUtil.handlePaid(list, calcX[1], card) * multiplier; - } else if (calcX[0].startsWith("Imprinted")) { // Add whole Imprinted list to handlePaid diff --git a/src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java b/src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java index 8e81dbc4ba9..32760829ae4 100644 --- a/src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java +++ b/src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java @@ -60,6 +60,5 @@ public class Trigger_AttackerBlocked extends Trigger { sa.setTriggeringObject("Attacker", runParams.get("Attacker")); sa.setTriggeringObject("Blocker", runParams.get("Blocker")); sa.setTriggeringObject("NumBlockers", runParams.get("NumBlockers")); - sa.setTriggeringObject("NumBlockersMinus1", runParams.get("NumBlockersMinus1")); } }