mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 04:08:01 +00:00
- 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:
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user