diff --git a/src/pokemmo/pokemmo_test.rs b/src/pokemmo/pokemmo_test.rs index 472c5f1..6600bef 100644 --- a/src/pokemmo/pokemmo_test.rs +++ b/src/pokemmo/pokemmo_test.rs @@ -16,6 +16,8 @@ mod tests { let key_words = vec![ "闪".to_string(), "光".to_string(), + "雷".to_string(), + "公".to_string(), ]; single_meet_shiny(&key_words); diff --git a/src/pokemon/pokemon.rs b/src/pokemon/pokemon.rs index 2accdd0..040d89a 100644 --- a/src/pokemon/pokemon.rs +++ b/src/pokemon/pokemon.rs @@ -113,35 +113,35 @@ pub(crate) mod pokemon { Quirky, } - impl Nature { - pub fn influence(&self) -> (f32, f32, f32, f32, f32) { - return match self { - Hardy => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), - Lonely => (1.1_f32, 0.9_f32, 0_f32, 0_f32, 0_f32), - Brave => (1.1_f32, 0_f32, 0_f32, 0_f32, 0.9_f32), - Adamant => (1.1_f32, 0_f32, 0.9_f32, 0_f32, 0_f32), - Naughty => (1.1_f32, 0_f32, 0_f32, 0.9_f32, 0_f32), - Bold => (0.9_f32, 1.1_f32, 0_f32, 0_f32, 0_f32), - Docile => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), - Relaxed => (0_f32, 1.1_f32, 0_f32, 0_f32, 0.9_f32), - Impish => (0_f32, 1.1_f32, 0.9_f32, 0_f32, 0_f32), - Lax => (0_f32, 1.1_f32, 0_f32, 0.9_f32, 0_f32), - Timid => (0.9_f32, 0_f32, 0_f32, 0_f32, 1.1_f32), - Hasty => (0_f32, 0.9_f32, 0_f32, 0_f32, 1.1_f32), - Serious => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), - Jolly => (0_f32, 0_f32, 0.9_f32, 0_f32, 1.1_f32), - Naive => (0_f32, 0_f32, 0_f32, 0.9_f32, 1.1_f32), - Modest => (0.9_f32, 0_f32, 1.1_f32, 0_f32, 0_f32), - Mild => (0_f32, 0.9_f32, 1.1_f32, 0_f32, 0_f32), - Quiet => (0_f32, 0_f32, 1.1_f32, 0_f32, 0.9_f32), - Bashful => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), - Rash => (0_f32, 0_f32, 1.1_f32, 0.9_f32, 0_f32), - Calm => (0.9_f32, 0_f32, 0_f32, 1.1_f32, 0_f32), - Gentle => (0_f32, 0.9_f32, 0_f32, 1.1_f32, 0_f32), - Sassy => (0_f32, 0_f32, 0_f32, 1.1_f32, 0.9_f32), - Careful => (0_f32, 0_f32, 0.9_f32, 1.1_f32, 0_f32), - Quirky => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), - }; - } - } + // impl Nature { + // pub fn influence(&self) -> (f32, f32, f32, f32, f32) { + // return match &self { + // Hardy => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), + // Lonely => (1.1_f32, 0.9_f32, 0_f32, 0_f32, 0_f32), + // Brave => (1.1_f32, 0_f32, 0_f32, 0_f32, 0.9_f32), + // Adamant => (1.1_f32, 0_f32, 0.9_f32, 0_f32, 0_f32), + // Naughty => (1.1_f32, 0_f32, 0_f32, 0.9_f32, 0_f32), + // Bold => (0.9_f32, 1.1_f32, 0_f32, 0_f32, 0_f32), + // Docile => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), + // Relaxed => (0_f32, 1.1_f32, 0_f32, 0_f32, 0.9_f32), + // Impish => (0_f32, 1.1_f32, 0.9_f32, 0_f32, 0_f32), + // Lax => (0_f32, 1.1_f32, 0_f32, 0.9_f32, 0_f32), + // Timid => (0.9_f32, 0_f32, 0_f32, 0_f32, 1.1_f32), + // Hasty => (0_f32, 0.9_f32, 0_f32, 0_f32, 1.1_f32), + // Serious => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), + // Jolly => (0_f32, 0_f32, 0.9_f32, 0_f32, 1.1_f32), + // Naive => (0_f32, 0_f32, 0_f32, 0.9_f32, 1.1_f32), + // Modest => (0.9_f32, 0_f32, 1.1_f32, 0_f32, 0_f32), + // Mild => (0_f32, 0.9_f32, 1.1_f32, 0_f32, 0_f32), + // Quiet => (0_f32, 0_f32, 1.1_f32, 0_f32, 0.9_f32), + // Bashful => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), + // Rash => (0_f32, 0_f32, 1.1_f32, 0.9_f32, 0_f32), + // Calm => (0.9_f32, 0_f32, 0_f32, 1.1_f32, 0_f32), + // Gentle => (0_f32, 0.9_f32, 0_f32, 1.1_f32, 0_f32), + // Sassy => (0_f32, 0_f32, 0_f32, 1.1_f32, 0.9_f32), + // Careful => (0_f32, 0_f32, 0.9_f32, 1.1_f32, 0_f32), + // Quirky => (0_f32, 0_f32, 0_f32, 0_f32, 0_f32), + // }; + // } + // } } \ No newline at end of file