Merge branch 'boss-encounter-split' into master

1 files changed, 8 insertions, 8 deletions

diff --git a/src/analyzers/raids/w6.rs b/src/analyzers/raids/w6.rs
index 8701a63..97a2094 100644
--- a/src/analyzers/raids/w6.rs
+++ b/src/analyzers/raids/w6.rs
@@ -1,7 +1,7 @@
 //! Boss fight analyzers for Wing 6 (Mythwright Gambit)
 use crate::{
     analyzers::{helpers, Analyzer, Outcome},
-    gamedata::{KENUT_ID, NIKARE_ID},
+    gamedata::Boss,
     EventKind, Log,
 };
 
@@ -59,21 +59,21 @@ pub const LARGOS_CM_HEALTH: u64 = 19_200_000;
 ///
 /// The CM is detected by the boss's health, which is higher in the challenge mote.
 #[derive(Debug, Clone, Copy)]
-pub struct LargosTwins<'log> {
+pub struct TwinLargos<'log> {
     log: &'log Log,
 }
 
-impl<'log> LargosTwins<'log> {
-    /// Create a new [`LargosTwins`] analyzer for the given log.
+impl<'log> TwinLargos<'log> {
+    /// Create a new [`TwinLargos`] analyzer for the given log.
     ///
     /// **Do not** use this method unless you know what you are doing. Instead, rely on
     /// [`Log::analyzer`]!
     pub fn new(log: &'log Log) -> Self {
-        LargosTwins { log }
+        TwinLargos { log }
     }
 }
 
-impl<'log> Analyzer for LargosTwins<'log> {
+impl<'log> Analyzer for TwinLargos<'log> {
     fn log(&self) -> &Log {
         self.log
     }
@@ -100,9 +100,9 @@ impl<'log> Analyzer for LargosTwins<'log> {
                     continue;
                 };
 
-                if agent.id() == NIKARE_ID {
+                if agent.id() == Boss::Nikare as u16 {
                     nikare_dead = true;
-                } else if agent.id() == KENUT_ID {
+                } else if agent.id() == Boss::Kenut as u16 {
                     kenut_dead = true;
                 }
             }