diff options
author | Daniel Schadt <kingdread@gmx.de> | 2021-11-17 20:07:18 +0100 |
---|---|---|
committer | Daniel Schadt <kingdread@gmx.de> | 2021-11-17 20:07:18 +0100 |
commit | 70750b3c10aa05e8fe922b5d70e9cfe61253c72a (patch) | |
tree | 455dfb7be43e3f6724f52d4974eb4769ff9e8c40 /src/lib.rs | |
parent | b962896e0d31667162b0a844e3f2186707b641ad (diff) | |
download | evtclib-70750b3c10aa05e8fe922b5d70e9cfe61253c72a.tar.gz evtclib-70750b3c10aa05e8fe922b5d70e9cfe61253c72a.tar.bz2 evtclib-70750b3c10aa05e8fe922b5d70e9cfe61253c72a.zip |
Move game_mode to Encounter
If we already have an Encounter, it might be nice to determine the game
mode from it as well - without needing to go through the whole log
first.
This is especially useful for raidgrep, where we can use the early
filters - which don't have access to the whole Log item.
Diffstat (limited to 'src/lib.rs')
-rw-r--r-- | src/lib.rs | 42 |
1 files changed, 4 insertions, 38 deletions
@@ -102,7 +102,7 @@ mod processing; pub use processing::{process, process_file, process_stream, Compression}; pub mod gamedata; -pub use gamedata::{EliteSpec, Encounter, Profession}; +pub use gamedata::{EliteSpec, Encounter, GameMode, Profession}; pub mod analyzers; pub use analyzers::{Analyzer, Outcome}; @@ -134,27 +134,6 @@ pub enum EvtcError { Utf8Error(#[from] std::str::Utf8Error), } -/// The game mode in which a log was produced. -/// -/// Note that the distinction made here is relatively arbitrary, but hopefully still useful. In -/// Guild Wars 2 terms, there is no clear definition of what a "game mode" is. -/// -/// The game mode of a [`Log`] is obtained through [`Log::game_mode()`]. -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] -pub enum GameMode { - /// The log is from a raid encounter. - Raid, - /// The log is from a fractal fight. - Fractal, - /// The log is from a strike mission. - Strike, - /// The log is from a training golem. - Golem, - /// The log is from a world-versus-world fight. - WvW, -} - /// A fully processed log file. #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Debug, Clone)] @@ -304,22 +283,9 @@ impl Log { // Here we assume that any generic log is a WvW log, I'm not aware of other generic logs // being produced at the moment. if self.is_generic() { - return Some(GameMode::WvW); - } - use Encounter::*; - match self.encounter()? { - MAMA | Siax | Ensolyss | Skorvald | Artsariiv | Arkk | Ai => Some(GameMode::Fractal), - - ValeGuardian | Gorseval | Sabetha | Slothasor | BanditTrio | Matthias - | KeepConstruct | Xera | Cairn | MursaatOverseer | Samarog | Deimos - | SoullessHorror | RiverOfSouls | BrokenKing | EaterOfSouls | StatueOfDarkness - | VoiceInTheVoid | ConjuredAmalgamate | TwinLargos | Qadim | CardinalAdina - | CardinalSabir | QadimThePeerless => Some(GameMode::Raid), - - IcebroodConstruct | Boneskinner | SuperKodanBrothers | FraenirOfJormag - | WhisperOfJormag => Some(GameMode::Strike), - - StandardKittyGolem | MediumKittyGolem | LargeKittyGolem => Some(GameMode::Golem), + Some(GameMode::WvW) + } else { + self.encounter().map(Encounter::game_mode) } } } |