From 8f34ca11a38b03481a3609862b41e5f0766d53d4 Mon Sep 17 00:00:00 2001 From: rakuja Date: Sat, 2 Mar 2024 01:15:10 +0100 Subject: [PATCH] chore: implement from fun for alignment_enum --- src/models/creature.rs | 2 +- src/models/creature_metadata/alignment_enum.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/models/creature.rs b/src/models/creature.rs index bc9e9d2..7d03096 100644 --- a/src/models/creature.rs +++ b/src/models/creature.rs @@ -169,7 +169,7 @@ impl From<(RawCreature, Vec, bool, bool, Option)> for CoreCrea let is_melee = tuple.3; let archive_link = tuple.4; - let alignment_enum = AlignmentEnum::from_trait_vec(&traits, raw.remaster); + let alignment_enum = AlignmentEnum::from((&traits, raw.remaster)); CoreCreatureData { id: raw.id as i32, aon_id: raw.aon_id.map(|x| x as i32), diff --git a/src/models/creature_metadata/alignment_enum.rs b/src/models/creature_metadata/alignment_enum.rs index 462f83e..afaf784 100644 --- a/src/models/creature_metadata/alignment_enum.rs +++ b/src/models/creature_metadata/alignment_enum.rs @@ -44,12 +44,12 @@ pub enum AlignmentEnum { Any, // can be every alignment } -impl AlignmentEnum { - pub fn from_trait_vec(vec_of_traits: &[RawTrait], remastered: bool) -> AlignmentEnum { - if remastered { +impl From<(&Vec, bool)> for AlignmentEnum { + fn from(tuple: (&Vec, bool)) -> AlignmentEnum { + if tuple.1 { return AlignmentEnum::No; } - let string_traits: Vec = vec_of_traits.iter().map(|x| x.name.clone()).collect(); + let string_traits: Vec = tuple.0.iter().map(|x| x.name.clone()).collect(); let is_good = string_traits.contains(&"good".to_string()); let is_evil = string_traits.contains(&"evil".to_string()); let is_chaos = string_traits.contains(&"chaotic".to_string());