diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/analyzers/mod.rs | 1 | ||||
| -rw-r--r-- | src/gamedata.rs | 29 |
3 files changed, 24 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c6d750f..bf833c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file. - `EventKind::Glider` - `EventKind::Stunbreak` - A `PartialOrd` implementation for `gamemode::Encounter`. +- `{Boss, Encounter}::Kanaxai` ### Changed - `FromRawEventError::UnexpectedReplInfo` is now `UnexpectedInternalEvent`. diff --git a/src/analyzers/mod.rs b/src/analyzers/mod.rs index c27fefa..f510fbc 100644 --- a/src/analyzers/mod.rs +++ b/src/analyzers/mod.rs @@ -119,6 +119,7 @@ pub fn for_log<'l>(log: &'l Log) -> Option<Box<dyn Analyzer + 'l>> { | Encounter::MediumKittyGolem | Encounter::LargeKittyGolem => Some(Box::new(raids::GenericRaid::new(log))), + Encounter::Kanaxai => Some(Box::new(fractals::GenericFractal::new(log))), Encounter::Ai => Some(Box::new(fractals::Ai::new(log))), Encounter::Skorvald => Some(Box::new(fractals::Skorvald::new(log))), Encounter::Artsariiv diff --git a/src/gamedata.rs b/src/gamedata.rs index 8fcd45f..d50be5a 100644 --- a/src/gamedata.rs +++ b/src/gamedata.rs @@ -147,15 +147,18 @@ pub enum Encounter { MediumKittyGolem = Boss::MediumKittyGolem as u16, LargeKittyGolem = Boss::LargeKittyGolem as u16, - // 100 CM (Sunqua Peak) + // 99 CM (Silent Surf) + Kanaxai = Boss::Kanaxai as u16, + + // 98 CM (Sunqua Peak) Ai = Boss::Ai as u16, - // 99 CM (Shattered Observatory) + // 97 CM (Shattered Observatory) Skorvald = Boss::Skorvald as u16, Artsariiv = Boss::Artsariiv as u16, Arkk = Boss::Arkk as u16, - // 98 CM (Nightmare) + // 96 CM (Nightmare) MAMA = Boss::MAMA as u16, Siax = Boss::Siax as u16, Ensolyss = Boss::Ensolyss as u16, @@ -211,6 +214,7 @@ impl Encounter { Encounter::StandardKittyGolem => &[Boss::StandardKittyGolem], Encounter::MediumKittyGolem => &[Boss::MediumKittyGolem], Encounter::LargeKittyGolem => &[Boss::LargeKittyGolem], + Encounter::Kanaxai => &[Boss::Kanaxai], Encounter::Ai => &[Boss::Ai], Encounter::Skorvald => &[Boss::Skorvald], Encounter::Artsariiv => &[Boss::Artsariiv], @@ -258,7 +262,7 @@ impl Encounter { pub fn game_mode(self) -> GameMode { use Encounter::*; match self { - MAMA | Siax | Ensolyss | Skorvald | Artsariiv | Arkk | Ai => GameMode::Fractal, + MAMA | Siax | Ensolyss | Skorvald | Artsariiv | Arkk | Ai | Kanaxai => GameMode::Fractal, ValeGuardian | Gorseval | Sabetha | Slothasor | BanditTrio | Matthias | KeepConstruct | TwistedCastle | Xera | Cairn | MursaatOverseer | Samarog | Deimos @@ -339,6 +343,7 @@ impl Display for Encounter { Encounter::StandardKittyGolem => "Standard Kitty Golem", Encounter::MediumKittyGolem => "Medium Kitty Golem", Encounter::LargeKittyGolem => "Large Kitty Golem", + Encounter::Kanaxai => "Kanaxai, Scythe of House Aurkus", Encounter::Ai => "Ai Keeper of the Peak", Encounter::Skorvald => "Skorvald the Shattered", Encounter::Artsariiv => "Artsariiv", @@ -574,13 +579,19 @@ pub enum Boss { /// [Guild Wars 2 Wiki](https://wiki.guildwars2.com/wiki/Large_Kitty_Golem) LargeKittyGolem = 0x4CDC, - // 100 CM (Sunqua Peak) + // 99 CM (Silent Surf) + /// Kanaxai, Scythe of the House Aurkus, boss of the Silent Surf CM fractal. + /// + /// [Guild Wars 2 Wiki](https://wiki.guildwars2.com/wiki/Kanaxai,_Scythe_of_House_Aurkus) + Kanaxai = 0x63E9, + + // 98 CM (Sunqua Peak) /// Ai, Keeper of the Peak, boss of the Sunqua Peak CM fractal. /// /// [Guild Wars 2 Wiki](https://wiki.guildwars2.com/wiki/Ai,_Keeper_of_the_Peak) Ai = 0x5AD6, - // 99 CM (Shattered Observatory) + // 97 CM (Shattered Observatory) /// Skorvald the Shattered, first boss in the Shattered Observatory. /// /// [Guild Wars 2 Wiki](https://wiki.guildwars2.com/wiki/Skorvald_the_Shattered) @@ -594,7 +605,7 @@ pub enum Boss { /// [Guild Wars 2 Wiki](https://wiki.guildwars2.com/wiki/Arkk) Arkk = 0x455F, - // 98 CM (Nightmare) + // 96 CM (Nightmare) /// MAMA, first boss in the Nightmare CM fractal. /// /// [Guild Wars 2 Wiki](https://wiki.guildwars2.com/wiki/MAMA) @@ -684,6 +695,7 @@ impl Boss { Boss::StandardKittyGolem => Encounter::StandardKittyGolem, Boss::MediumKittyGolem => Encounter::MediumKittyGolem, Boss::LargeKittyGolem => Encounter::LargeKittyGolem, + Boss::Kanaxai => Encounter::Kanaxai, Boss::Ai => Encounter::Ai, Boss::Skorvald => Encounter::Skorvald, Boss::Artsariiv => Encounter::Artsariiv, @@ -753,6 +765,8 @@ impl FromStr for Boss { "medium golem" | "medium kitty golem" => Ok(Boss::MediumKittyGolem), "large golem" | "large kitty golem" => Ok(Boss::LargeKittyGolem), + "kanaxai" | "kana" | "kanaxai, scythe of the house aurkus" => Ok(Boss::Kanaxai), + "ai" | "ai keeper of the peak" => Ok(Boss::Ai), "skorvald" => Ok(Boss::Skorvald), @@ -812,6 +826,7 @@ impl Display for Boss { Boss::StandardKittyGolem => "Standard Kitty Golem", Boss::MediumKittyGolem => "Medium Kitty Golem", Boss::LargeKittyGolem => "Large Kitty Golem", + Boss::Kanaxai => "Kanaxai, Scythe of the House Aurkus", Boss::Ai => "Ai Keeper of the Peak", Boss::Skorvald => "Skorvald the Shattered", Boss::Artsariiv => "Artsariiv", |