chore: implement from fun for alignment_enum

RakuJa · Mar 2, 2024 · 8f34ca1 · 8f34ca1
1 parent d1b4e3a
commit 8f34ca1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/models/creature.rs b/src/models/creature.rs
@@ -169,7 +169,7 @@ impl From<(RawCreature, Vec<RawTrait>, bool, bool, Option<String>)> 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
@@ -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<RawTrait>, bool)> for AlignmentEnum {
+    fn from(tuple: (&Vec<RawTrait>, bool)) -> AlignmentEnum {
+        if tuple.1 {
             return AlignmentEnum::No;
         }
-        let string_traits: Vec<String> = vec_of_traits.iter().map(|x| x.name.clone()).collect();
+        let string_traits: Vec<String> = 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());