redstrate/physis
1
Fork 0
mirror of https://github.com/redstrate/Physis.git synced 2025-04-20 03:37:47 +00:00
Code Activity

Check for invalid race/tribe combinations in get_race_id

Browse source
This commit is contained in:
Joshua Goins 2025-03-31 15:42:53 -04:00
parent baf0df4858
commit 49698c7f21
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/race.rs
View file

@ -15,7 +15,7 @@ pub enum Gender {
#[binrw] #[binrw]
#[brw(repr = u8)] #[brw(repr = u8)]
#[derive(PartialEq, Eq, Clone, Debug)] #[derive(PartialEq, Eq, Clone, Copy, Debug)]
#[repr(u8)] #[repr(u8)]
/// The race's "tribe". Each race has two tribes, which are usually very similar (even down to the ids!) /// The race's "tribe". Each race has two tribes, which are usually very similar (even down to the ids!)
/// with the exception of Hyurs, which have two very distinct tribes. /// with the exception of Hyurs, which have two very distinct tribes.
@ -40,7 +40,7 @@ pub enum Tribe {
#[binrw] #[binrw]
#[brw(repr = u8)] #[brw(repr = u8)]
#[derive(PartialEq, Eq, Clone, Debug)] #[derive(PartialEq, Eq, Clone, Copy, Debug)]
#[repr(u8)] #[repr(u8)]
/// The major races of Eorzea. /// The major races of Eorzea.
pub enum Race { pub enum Race {
@ -57,7 +57,10 @@ pub enum Race {
/// Gets a proper race identifier (such as 101, for Hyur-Midlander-Males) given a race, a tribe, /// Gets a proper race identifier (such as 101, for Hyur-Midlander-Males) given a race, a tribe,
/// and a gender. /// and a gender.
pub fn get_race_id(race: Race, tribe: Tribe, gender: Gender) -> Option<i32> { pub fn get_race_id(race: Race, tribe: Tribe, gender: Gender) -> Option<i32> {
// TODO: should we check for invalid tribes like the Hyur branch does? if !get_supported_tribes(race).contains(&tribe) {
return None;
}
match race { match race {
Race::Hyur => match tribe { Race::Hyur => match tribe {
Tribe::Midlander => match gender { Tribe::Midlander => match gender {
@ -131,9 +134,15 @@ mod tests {
#[test] #[test]
fn test_convert_race_num() { fn test_convert_race_num() {
// valid
assert_eq!( assert_eq!(
get_race_id(Race::Roegadyn, Tribe::SeaWolf, Gender::Male), get_race_id(Race::Roegadyn, Tribe::SeaWolf, Gender::Male),
Some(901) Some(901)
); );
// invalid
assert_eq!(
get_race_id(Race::Roegadyn, Tribe::Midlander, Gender::Male),
None
);
} }
} }