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

*Removed the CounterAdded suppression. Goes against my understanding of "Enters the battlefield with counters" but apparently there are rulings on Flourishing Defenses.

Browse Source 
*Corrected runTrigger call for Counter Adding, it should trigger once per counter added.
This commit is contained in:
jendave
2011-08-06 22:23:33 +00:00
parent 01718a4e24
commit 462b626c31
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/forge/Card.java
View File

@@ -535,13 +535,15 @@ public class Card extends MyObservable {
counters.remove(p1Counter); counters.remove(p1Counter);
} }
} }
//Run triggers //Run triggers
HashMap<String,Object> runParams = new HashMap<String,Object>(); HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Card", this); runParams.put("Card", this);
runParams.put("CounterType", counterName); runParams.put("CounterType", counterName);
AllZone.TriggerHandler.runTrigger("CounterAdded", runParams); for(int i=0;i<(multiplier*n);i++)
{
AllZone.TriggerHandler.runTrigger("CounterAdded", runParams);
}
AllZone.GameAction.checkStateEffects(); AllZone.GameAction.checkStateEffects();

8
src/forge/card/cardFactory/CardFactory.java
View File

@@ -802,12 +802,8 @@ public class CardFactory implements NewConstants {
public void resolve() { public void resolve() {
int totalCounters = numCreatures[0] * multiplier; int totalCounters = numCreatures[0] * multiplier;
AllZone.TriggerHandler.suppressMode("CounterAdded");
card.addCounter(Counters.P1P1, totalCounters); card.addCounter(Counters.P1P1, totalCounters);
AllZone.TriggerHandler.clearSuppression("CounterAdded");
if(card.getName().equals("Skullmulcher")) { if(card.getName().equals("Skullmulcher")) {
for(int i = 0; i < numCreatures[0]; i++) { for(int i = 0; i < numCreatures[0]; i++) {
card.getController().drawCard(); card.getController().drawCard();
@@ -975,11 +971,9 @@ public class CardFactory implements NewConstants {
else { else {
toAdd = Integer.parseInt(numCounters); toAdd = Integer.parseInt(numCounters);
} }
AllZone.TriggerHandler.suppressMode("CounterAdded");
card.addCounter(counter, toAdd); card.addCounter(counter, toAdd);
AllZone.TriggerHandler.clearSuppression("CounterAdded");
} }
});//ComesIntoPlayCommand });//ComesIntoPlayCommand
} // if etbCounter } // if etbCounter
@@ -994,11 +988,9 @@ public class CardFactory implements NewConstants {
public void execute() { public void execute() {
if(card.getController().getOpponent().getAssignedDamage() > 0) if(card.getController().getOpponent().getAssignedDamage() > 0)
{ {
AllZone.TriggerHandler.suppressMode("CounterAdded");
card.addCounter(Counters.P1P1, count); card.addCounter(Counters.P1P1, count);
AllZone.TriggerHandler.clearSuppression("CounterAdded");
} }
} }