diff --git a/src/game/card/digimon.rs b/src/game/card/digimon.rs index 2778f78..d002bbd 100644 --- a/src/game/card/digimon.rs +++ b/src/game/card/digimon.rs @@ -263,7 +263,7 @@ impl Bytes for Digimon { // Return the struct after building it Ok(Self { - name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.chars().collect(), + name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.to_ascii_string(), speciality: Speciality::from_bytes(&((bytes.speciality_level & 0xF0) >> 4)).map_err(FromBytesError::Speciality)?, @@ -298,20 +298,16 @@ impl Bytes for Digimon { effect_description: [ util::read_null_ascii_string(bytes.effect_description_0) .map_err(FromBytesError::EffectDescriptionFirst)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_1) .map_err(FromBytesError::EffectDescriptionSecond)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_2) .map_err(FromBytesError::EffectDescriptionThird)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_3) .map_err(FromBytesError::EffectDescriptionFourth)? - .chars() - .collect(), + .to_ascii_string(), ], // Unknown diff --git a/src/game/card/digivolve.rs b/src/game/card/digivolve.rs index ede6bbc..5d9cf46 100644 --- a/src/game/card/digivolve.rs +++ b/src/game/card/digivolve.rs @@ -103,26 +103,22 @@ impl Bytes for Digivolve { Ok(Self { // Name - name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.chars().collect(), + name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.to_ascii_string(), // Effect effect_description: [ util::read_null_ascii_string(bytes.effect_description_0) .map_err(FromBytesError::EffectDescriptionFirst)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_1) .map_err(FromBytesError::EffectDescriptionSecond)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_2) .map_err(FromBytesError::EffectDescriptionThird)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_3) .map_err(FromBytesError::EffectDescriptionFourth)? - .chars() - .collect(), + .to_ascii_string(), ], // Unknown diff --git a/src/game/card/item.rs b/src/game/card/item.rs index da79ae5..bc80f21 100644 --- a/src/game/card/item.rs +++ b/src/game/card/item.rs @@ -169,7 +169,7 @@ impl Bytes for Item { // And return the struct Ok(Self { - name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.chars().collect(), + name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.to_ascii_string(), // Effects effect_conditions: [ @@ -188,20 +188,16 @@ impl Bytes for Item { effect_description: [ util::read_null_ascii_string(bytes.effect_description_0) .map_err(FromBytesError::EffectDescriptionFirst)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_1) .map_err(FromBytesError::EffectDescriptionSecond)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_2) .map_err(FromBytesError::EffectDescriptionThird)? - .chars() - .collect(), + .to_ascii_string(), util::read_null_ascii_string(bytes.effect_description_3) .map_err(FromBytesError::EffectDescriptionFourth)? - .chars() - .collect(), + .to_ascii_string(), ], // Unknown diff --git a/src/game/card/property/moves.rs b/src/game/card/property/moves.rs index 7527bdb..9ba2f76 100644 --- a/src/game/card/property/moves.rs +++ b/src/game/card/property/moves.rs @@ -63,7 +63,7 @@ impl Bytes for Move { // Return the move Ok(Self { - name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.chars().collect(), + name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.to_ascii_string(), power: LittleEndian::read_u16(bytes.power), unknown: LittleEndian::read_u32(bytes.unknown), })