diff options
| author | Daniel Schadt <kingdread@gmx.de> | 2020-09-28 13:32:54 +0200 | 
|---|---|---|
| committer | Daniel Schadt <kingdread@gmx.de> | 2020-09-28 13:32:54 +0200 | 
| commit | b50febe63e8d72b396feac4b67f55fbc52c03dae (patch) | |
| tree | 6278b78f8a9b1d59a921bf7cf5c121e5aa44c41d | |
| parent | 84fcd5692540940550daf9423d09de77cd18e803 (diff) | |
| download | evtclib-b50febe63e8d72b396feac4b67f55fbc52c03dae.tar.gz evtclib-b50febe63e8d72b396feac4b67f55fbc52c03dae.tar.bz2 evtclib-b50febe63e8d72b396feac4b67f55fbc52c03dae.zip | |
rename Log::npcs to Log::characters
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/analyzers/fractals.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 8 | 
3 files changed, 6 insertions, 5 deletions
| diff --git a/CHANGELOG.md b/CHANGELOG.md index bd8dd85..dfbd25d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.      `Boss::VoiceOfTheFallen` have been introduced  - `gamedata::Boss` is no longer re-exported as `evtclib::Boss`, instead    `evtclib::Encounter` is exported. +- Renamed `Log::npcs` to `Log::characters` to have consistent naming.  ### Removed  - Various `*_ID` constants from `gamedata`: `XERA_PHASE2_ID`, `NIKARE_ID`, diff --git a/src/analyzers/fractals.rs b/src/analyzers/fractals.rs index 69b7f17..5d4faf8 100644 --- a/src/analyzers/fractals.rs +++ b/src/analyzers/fractals.rs @@ -137,7 +137,7 @@ impl<'log> Analyzer for Skorvald<'log> {          }          self.log -            .npcs() +            .characters()              .any(|character| SKORVALD_CM_ANOMALY_IDS.contains(&character.id()))      } @@ -738,8 +738,8 @@ impl Log {          self.agents.iter().filter_map(|a| a.as_player())      } -    /// Return an iterator over all agents that are NPCs. -    pub fn npcs(&self) -> impl Iterator<Item = &Agent<Character>> { +    /// Return an iterator over all agents that are characters. +    pub fn characters(&self) -> impl Iterator<Item = &Agent<Character>> {          self.agents.iter().filter_map(|a| a.as_character())      } @@ -753,7 +753,7 @@ impl Log {      /// Be careful with encounters that have multiple boss agents, such as Trio      /// and Xera.      pub fn boss(&self) -> &Agent { -        self.npcs() +        self.characters()              .find(|c| c.character().id == self.boss_id)              .map(Agent::erase)              .expect("Boss has no agent!") @@ -768,7 +768,7 @@ impl Log {              .encounter()              .map(Encounter::bosses)              .unwrap_or(&[] as &[_]); -        self.npcs() +        self.characters()              .filter(|c| bosses.iter().any(|boss| *boss as u16 == c.character().id))              .map(Agent::erase)              .collect() | 
