Add buff target filter

Zerthox · May 3, 2024 · a72a8fd · a72a8fd
1 parent 48f0bc2
commit a72a8fd
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 137 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/combat/agent.rs b/src/combat/agent.rs
@@ -5,6 +5,8 @@ use arcdps::{
     exports::{Colors, CoreColor},
     Profession,
 };
+use serde::{Deserialize, Serialize};
+use strum::{AsRefStr, EnumIter, VariantArray, VariantNames};
 
 // TODO: show id settings?
 
@@ -94,3 +96,35 @@ impl From<&Player> for Agent {
         Self::new(AgentKind::Player, player.prof, player.name.clone())
     }
 }
+
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+    AsRefStr,
+    VariantArray,
+    VariantNames,
+    EnumIter,
+    Serialize,
+    Deserialize,
+)]
+pub enum AgentFilter {
+    All,
+    Player,
+    Npc,
+}
+
+impl AgentFilter {
+    pub fn matches(&self, agent: &Agent) -> bool {
+        match self {
+            Self::All => true,
+            Self::Player => agent.is_player(),
+            Self::Npc => !agent.is_player(),
+        }
+    }
+}
diff --git a/src/data/structs.rs b/src/data/structs.rs
@@ -82,19 +82,19 @@ impl SkillHits {
             } else if hits >= expected {
                 SkillHitCount::Expected
             } else {
-                SkillHitCount::Missed
+                SkillHitCount::Miss
             }
         } else if hits > 0 {
             SkillHitCount::Expected
         } else {
-            SkillHitCount::Missed
+            SkillHitCount::Miss
         }
     }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum SkillHitCount {
-    Missed,
+    Miss,
     Expected,
     Max,
     OverMax,

diff --git a/src/ui/breakbar_log.rs b/src/ui/breakbar_log.rs
@@ -48,41 +48,38 @@ impl Component<BreakbarLogProps<'_>> for BreakbarLog {
     fn render(&mut self, ui: &Ui, props: BreakbarLogProps) {
         let BreakbarLogProps { history } = props;
 
-        match history.viewed_fight() {
-            Some(fight) if !fight.data.breakbar.is_empty() => {
-                let colors = exports::colors();
-                let grey = colors.core(CoreColor::MediumGrey).unwrap_or(GREY);
-                let blue = colors.core(CoreColor::LightTeal).unwrap_or(CYAN);
-
-                for hit in fight
-                    .data
-                    .breakbar
-                    .iter()
-                    .filter(|hit| hit.is_own || self.display_others)
-                {
-                    if self.display_time {
-                        ui.text_colored(grey, format_time(hit.time));
-                        ui.same_line();
-                    }
-
-                    ui.text_colored(blue, format!("{}.{}", hit.damage / 10, hit.damage % 10));
-
+        if let Some(fight) = history.viewed_fight() {
+            let colors = exports::colors();
+            let grey = colors.core(CoreColor::MediumGrey).unwrap_or(GREY);
+            let blue = colors.core(CoreColor::LightTeal).unwrap_or(CYAN);
+
+            for hit in fight
+                .data
+                .breakbar
+                .iter()
+                .filter(|hit| hit.is_own || self.display_others)
+            {
+                if self.display_time {
+                    ui.text_colored(grey, format_time(hit.time));
                     ui.same_line();
-                    ui.text(&hit.skill.name);
+                }
 
-                    if self.display_others {
-                        ui.same_line();
-                        ui.text_colored(hit.attacker.friendly_color(&colors), &hit.attacker.name);
-                    }
+                ui.text_colored(blue, format!("{}.{}", hit.damage / 10, hit.damage % 10));
 
+                ui.same_line();
+                ui.text(&hit.skill.name);
+
+                if self.display_others {
                     ui.same_line();
-                    ui.text_colored(
-                        hit.target.enemy_color(&colors, fight.target),
-                        &hit.target.name,
-                    );
+                    ui.text_colored(hit.attacker.friendly_color(&colors), &hit.attacker.name);
                 }
+
+                ui.same_line();
+                ui.text_colored(
+                    hit.target.enemy_color(&colors, fight.target),
+                    &hit.target.name,
+                );
             }
-            _ => ui.text("No breakbar damage"),
         }
 
         self.scroll.update(ui);

diff --git a/src/ui/buff_log.rs b/src/ui/buff_log.rs
@@ -1,12 +1,15 @@
 use crate::{
-    combat::CombatData,
+    combat::{agent::AgentFilter, CombatData},
     history::History,
     ui::{format_time, scroll::AutoScroll},
 };
 use arc_util::{
     colors::{GREY, YELLOW},
     settings::HasSettings,
-    ui::{Component, Windowable},
+    ui::{
+        render::{ch_width, enum_combo_array},
+        Component, Windowable,
+    },
 };
 use arcdps::{
     exports::{self, CoreColor},
@@ -19,6 +22,7 @@ use serde::{Deserialize, Serialize};
 pub struct BuffLog {
     display_time: bool,
     display_duration: bool,
+    target_filter: AgentFilter,
 
     #[serde(skip)]
     scroll: AutoScroll,
@@ -29,13 +33,17 @@ impl BuffLog {
         Self {
             display_time: true,
             display_duration: true,
+            target_filter: AgentFilter::All,
             scroll: AutoScroll::new(),
         }
     }
 
     pub fn render_display(&mut self, ui: &Ui) {
         ui.checkbox("Display time", &mut self.display_time);
         ui.checkbox("Display duration", &mut self.display_duration);
+
+        ui.set_next_item_width(ch_width(ui, 16));
+        enum_combo_array(ui, "Targets", &mut self.target_filter);
     }
 }
 
@@ -48,13 +56,13 @@ impl Component<BuffLogProps<'_>> for BuffLog {
     fn render(&mut self, ui: &Ui, props: BuffLogProps) {
         let BuffLogProps { history } = props;
 
-        match history.viewed_fight() {
-            Some(fight) if !fight.data.buffs.is_empty() => {
-                let colors = exports::colors();
-                let grey = colors.core(CoreColor::MediumGrey).unwrap_or(GREY);
-                let yellow = colors.core(CoreColor::LightYellow).unwrap_or(YELLOW);
+        if let Some(fight) = history.viewed_fight() {
+            let colors = exports::colors();
+            let grey = colors.core(CoreColor::MediumGrey).unwrap_or(GREY);
+            let yellow = colors.core(CoreColor::LightYellow).unwrap_or(YELLOW);
 
-                for apply in &fight.data.buffs {
+            for apply in &fight.data.buffs {
+                if self.target_filter.matches(&apply.target) {
                     if self.display_time {
                         ui.text_colored(grey, format_time(apply.time));
                         ui.same_line();
@@ -74,7 +82,6 @@ impl Component<BuffLogProps<'_>> for BuffLog {
                     ui.text_colored(apply.target.friendly_color(&colors), &apply.target.name);
                 }
             }
-            _ => ui.text("No buffs"),
         }
 
         self.scroll.update(ui);