Add options for ending encounters after wipes and out of game combat

OverlayPlugin.Core/EventSources/BuiltinEventConfig.cs

@@ -12,6 +12,8 @@ public class BuiltinEventConfig
  public event EventHandler SortKeyChanged;
  public event EventHandler SortDescChanged;
  public event EventHandler UpdateDpsDuringImportChanged;
+ public event EventHandler EndEncounterAfterWipeChanged;
+ public event EventHandler EndEncounterOutOfCombatChanged;
 
  private int updateInterval;
  public int UpdateInterval {
@@ -97,6 +99,40 @@ public bool UpdateDpsDuringImport
  }
  }
 
+ private bool endEncounterAfterWipe;
+ public bool EndEncounterAfterWipe
+ {
+ get
+ {
+ return this.endEncounterAfterWipe;
+ }
+ set
+ {
+ if (this.endEncounterAfterWipe != value)
+ {
+ this.endEncounterAfterWipe = value;
+ EndEncounterAfterWipeChanged?.Invoke(this, new EventArgs());
+ }
+ }
+ }
+
+ private bool endEncounterOutOfCombat;
+ public bool EndEncounterOutOfCombat
+ {
+ get
+ {
+ return this.endEncounterOutOfCombat;
+ }
+ set
+ {
+ if (this.endEncounterOutOfCombat != value)
+ {
+ this.endEncounterOutOfCombat = value;
+ EndEncounterOutOfCombatChanged?.Invoke(this, new EventArgs());
+ }
+ }
+ }
+
  // Data that overlays can save/load via event handlers.
  public Dictionary<string, JToken> OverlayData = new Dictionary<string, JToken>();
 
@@ -107,6 +143,8 @@ public BuiltinEventConfig()
  this.sortKey = "encdps";
  this.sortDesc = true;
  this.updateDpsDuringImport = false;
+ this.endEncounterAfterWipe = false;
+ this.endEncounterOutOfCombat = false;
  }
 
  public static BuiltinEventConfig LoadConfig(IPluginConfig Config)
@@ -142,6 +180,16 @@ public static BuiltinEventConfig LoadConfig(IPluginConfig Config)
  result.updateDpsDuringImport = value.ToObject<bool>();
  }
 
+ if (obj.TryGetValue("EndEncounterAfterWipe", out value))
+ {
+ result.endEncounterAfterWipe = value.ToObject<bool>();
+ }
+
+ if (obj.TryGetValue("EndEncounterOutOfCombat", out value))
+ {
+ result.endEncounterOutOfCombat = value.ToObject<bool>();
+ }
+
  if (obj.TryGetValue("OverlayData", out value))
  {
  result.OverlayData = value.ToObject<Dictionary<string, JToken>>();

OverlayPlugin.Core/EventSources/BuiltinEventConfigPanel.cs

@@ -49,6 +49,9 @@ private void SetupControlProperties()
 
  this.checkSortDesc.Checked = config.SortDesc;
  this.cbUpdateDuringImport.Checked = config.UpdateDpsDuringImport;
+
+ this.cbEndEncounterAfterWipe.Checked = config.EndEncounterAfterWipe;
+ this.cbEndEncounterOutOfCombat.Checked = config.EndEncounterOutOfCombat;
  }
 
  private void SetupConfigEventHandlers()
@@ -92,6 +95,22 @@ private void SetupConfigEventHandlers()
  this.cbUpdateDuringImport.Checked = config.UpdateDpsDuringImport;
  });
  };
+
+ this.config.EndEncounterAfterWipeChanged += (o, e) =>
+ {
+ this.InvokeIfRequired(() =>
+ {
+ this.cbEndEncounterAfterWipe.Checked = config.EndEncounterAfterWipe;
+ });
+ };
+
+ this.config.EndEncounterOutOfCombatChanged += (o, e) =>
+ {
+ this.InvokeIfRequired(() =>
+ {
+ this.cbEndEncounterOutOfCombat.Checked = config.EndEncounterOutOfCombat;
+ });
+ };
  }
 
  private void InvokeIfRequired(Action action)
@@ -133,6 +152,16 @@ private void cbUpdateDuringImport_CheckedChanged(object sender, EventArgs e)
  this.config.UpdateDpsDuringImport = this.cbUpdateDuringImport.Checked;
  }
 
+ private void cbEndEncounterAfterWipe_CheckedChanged(object sender, EventArgs e)
+ {
+ this.config.EndEncounterAfterWipe = this.cbEndEncounterAfterWipe.Checked;
+ }
+
+ private void cbEndEncounterOutOfCombat_CheckedChanged(object sender, EventArgs e)
+ {
+ this.config.EndEncounterOutOfCombat = this.cbEndEncounterOutOfCombat.Checked;
+ }
+
  private void TextEnmityInterval_Leave(object sender, EventArgs e)
  {
  if (int.TryParse(this.textEnmityInterval.Text, out int value))