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

*Added SVar$ to calculateAmount.

Browse Source 
*Removed NumBlockersMinus1 triggeredobject from AttackerBlocked.
This commit is contained in:
Hellfish
2011-10-05 07:12:10 +00:00
parent 89c8aa6bbf
commit 85a7fe15e1
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/forge/CombatUtil.java
View File

@@ -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

10
src/main/java/forge/card/abilityFactory/AbilityFactory.java
View File

@@ -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

1
src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java
View File

@@ -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"));
}
}