- Added the option temporarilySuppressed to the trigger class (suppressed can now be used without it being reset all the time).

This commit is contained in:
Sloth
2011-09-08 10:28:55 +00:00
parent ab8ec0d4d2
commit 48d045cd51
3 changed files with 9 additions and 4 deletions

View File

@@ -246,7 +246,7 @@ public class StaticAbility_Continuous {
if (params.containsKey("RemoveTriggers") || params.containsKey("RemoveAllAbilities")) {
ArrayList<Trigger> triggers = affectedCard.getTriggers();
for (Trigger trigger : triggers) {
trigger.setSuppressed(true);
trigger.setTemporarilySuppressed(true);
}
}
//affectedCard.updateObservers();

View File

@@ -525,12 +525,17 @@ public abstract class Trigger {
}
protected boolean suppressed = false;
protected boolean temporarilySuppressed = false;
public void setSuppressed(boolean supp) {
/*public void setSuppressed(boolean supp) {
suppressed = supp;
}*/
public void setTemporarilySuppressed(boolean supp) {
temporarilySuppressed = supp;
}
public boolean isSuppressed() {
return suppressed;
return (suppressed || temporarilySuppressed);
}
}

View File

@@ -261,7 +261,7 @@ public class TriggerHandler {
}
}
for (int i = 0; i < registeredTriggers.size(); i++) {
registeredTriggers.get(i).setSuppressed(false);
registeredTriggers.get(i).setTemporarilySuppressed(false);
}
}