fix dragonvoid ID

Dragonvoid is one of those weird bosses which consists of multiple
characters(?) that are structures and not even "normal" characters(??).
The first ID we used seemed to not catch the actual logs that are now
generated using an up-to-date arcDPS.

I'm not sure if the old ID was necessarily wrong, but for some reason,
it doesn't seem to match the actual ID that is currently used to log
this fight.

4 files changed, 15 insertions, 24 deletions

diff --git a/src/gamedata.rs b/src/gamedata.rs
index 8dfe288..c607147 100644
--- a/src/gamedata.rs
+++ b/src/gamedata.rs
@@ -153,7 +153,7 @@ pub enum Encounter {
     CaptainMaiTrin = Boss::CaptainMaiTrin as u16,
     Ankka = Boss::Ankka as u16,
     MinisterLi = Boss::MinisterLi as u16,
-    Dragonvoid = Boss::Dragonvoid as u16,
+    Dragonvoid = 0x0562,
 }
 
 impl Encounter {
@@ -209,7 +209,7 @@ impl Encounter {
             Encounter::CaptainMaiTrin => &[Boss::CaptainMaiTrin],
             Encounter::Ankka => &[Boss::Ankka],
             Encounter::MinisterLi => &[Boss::MinisterLi],
-            Encounter::Dragonvoid => &[Boss::Dragonvoid],
+            Encounter::Dragonvoid => &[],
         }
     }
 
@@ -229,6 +229,7 @@ impl Encounter {
         match id {
             _ if id == Encounter::TwistedCastle as u16 => Some(Encounter::TwistedCastle),
             _ if id == Encounter::RiverOfSouls as u16 => Some(Encounter::RiverOfSouls),
+            _ if id == Encounter::Dragonvoid as u16 => Some(Encounter::Dragonvoid),
             _ => Boss::from_u16(id).map(Boss::encounter),
         }
     }
@@ -283,6 +284,7 @@ impl FromStr for Encounter {
             "eyes" | "statue of darkness" => Ok(Encounter::StatueOfDarkness),
             "largos" | "twins" | "largos twins" | "twin largos" => Ok(Encounter::TwinLargos),
             "kodans" | "super kodan brothers" => Ok(Encounter::SuperKodanBrothers),
+            "dragonvoid" | "the dragonvoid" => Ok(Encounter::Dragonvoid),
 
             _ => Err(ParseEncounterError(s.to_owned())),
         }
@@ -571,10 +573,6 @@ pub enum Boss {
     ///
     /// [Guild Wars 2 Wiki](https://wiki.guildwars2.com/wiki/Strike_Mission:_Kaineng_Overlook)
     MinisterLi = 0x5FA5,
-    /// The Dragonvoid, boss in the Harvest Temple.
-    ///
-    /// [Guild Wars 2 Wiki](https://wiki.guildwars2.com/wiki/Strike_Mission:_Harvest_Temple)
-    Dragonvoid = 0x5F37,
 }
 
 impl Boss {
@@ -628,7 +626,6 @@ impl Boss {
             Boss::CaptainMaiTrin => Encounter::CaptainMaiTrin,
             Boss::Ankka => Encounter::Ankka,
             Boss::MinisterLi => Encounter::MinisterLi,
-            Boss::Dragonvoid => Encounter::Dragonvoid,
         }
     }
 }
@@ -701,7 +698,6 @@ impl FromStr for Boss {
             "captain mai trin" | "mai trin" | "mai" => Ok(Boss::CaptainMaiTrin),
             "ankka" => Ok(Boss::Ankka),
             "minister li" | "li" => Ok(Boss::MinisterLi),
-            "dragonvoid" | "the dragonvoid" => Ok(Boss::Dragonvoid),
 
             _ => Err(ParseBossError(s.to_owned())),
         }
@@ -758,7 +754,6 @@ impl Display for Boss {
             Boss::CaptainMaiTrin => "Captain Mai Trin",
             Boss::Ankka => "Ankka",
             Boss::MinisterLi => "Minister Li",
-            Boss::Dragonvoid => "The Dragonvoid",
         };
         write!(f, "{}", name)
     }
@@ -1257,10 +1252,6 @@ mod tests {
             ("Minister Li", MinisterLi),
             ("li", MinisterLi),
             ("Li", MinisterLi),
-            ("dragonvoid", Dragonvoid),
-            ("Dragonvoid", Dragonvoid),
-            ("the dragonvoid", Dragonvoid),
-            ("The Dragonvoid", Dragonvoid),
         ];
 
         for (input, expected) in tests {
diff --git a/tests/logs/dragonvoid-20220303.zevtc b/tests/logs/dragonvoid-20220303.zevtc
deleted file mode 100644
index 08ab387..0000000
--- a/tests/logs/dragonvoid-20220303.zevtc
+++ /dev/null
diff --git a/tests/logs/dragonvoid-20220309.zevtc b/tests/logs/dragonvoid-20220309.zevtc
new file mode 100644
index 0000000..e09a3f1
--- /dev/null
+++ b/tests/logs/dragonvoid-20220309.zevtc
diff --git a/tests/parsing.rs b/tests/parsing.rs
index 4a0ee18..3fdbbf6 100644
--- a/tests/parsing.rs
+++ b/tests/parsing.rs
@@ -820,20 +820,20 @@ test! {
 
 test! {
     name: parse_dragonvoid,
-    log: "logs/dragonvoid-20220303.zevtc",
+    log: "logs/dragonvoid-20220309.zevtc",
     boss: Encounter::Dragonvoid,
     mode: Strike,
     players: &[
-        (2, ":Areki.5906", "Areki Is Too Loud", Ranger, Some(Druid)),
-        (2, ":DarkSide.8427", "Nova Kings", Mesmer, Some(Virtuoso)),
-        (2, ":Master Dragon.6712", "Dragonnic", Warrior, Some(Berserker)),
-        (2, ":Salieri.7962", "Attack The Illusion", Mesmer, Some(Chronomancer)),
-        (2, ":vuko.3692", "Jgww", Thief, Some(Specter)),
-        (3, ":LINKAZZATORE.8135", "Urtola", Necromancer, Some(Scourge)),
-        (3, ":Lawitz.5128", "It Should Be Weaver", Engineer, Some(Mechanist)),
-        (3, ":Lin Chin Ping.9480", "Luna L Fay", Necromancer, Some(Scourge)),
-        (3, ":Tareo.3726", "Tarea A", Necromancer, Some(Scourge)),
-        (3, ":nate.5871", "Cute Aníme Waifu", Mesmer, Some(Chronomancer)),
+        (2, ":Mariopi.3485", "Xx Nendel Xx", Mesmer, Some(Virtuoso)),
+        (2, ":Rembar.7298", "Sr Rembar", Elementalist, Some(Catalyst)),
+        (2, ":Saint Peter.8329", "Mecha Booner", Engineer, Some(Mechanist)),
+        (2, ":Voldtekstoffer.6750", "Darkie Waifu", Necromancer, Some(Scourge)),
+        (2, ":neko.9741", "Cat Of Jormag", Engineer, Some(Holosmith)),
+        (3, ":Dunje.4863", "Engineer Effie", Engineer, Some(Holosmith)),
+        (3, ":Lykaon.4590", "Chubby Chad", Guardian, Some(Firebrand)),
+        (3, ":Straimer.1093", "Revenge On The Meta", Revenant, Some(Renegade)),
+        (3, ":UprisingSoul.6312", "Bogeygirl", Thief, Some(Specter)),
+        (3, ":gumpo.7518", "Lyrano Ela", Necromancer, Some(Reaper)),
     ],
 }