Fix incorrect advance number

cargo fmt

Author: SteveCookTU

src/filter.rs

@@ -128,4 +128,4 @@ impl Filter {
 
         true
     }
-}
+}

src/lib.rs

@@ -1,14 +1,14 @@
+mod filter;
 mod flag_util;
 pub mod personal_info;
 pub mod personal_info_bdsp;
 pub mod personal_table;
 mod resource_util;
 mod run_results;
 mod xorshift;
-mod filter;
 
-pub use run_results::*;
 pub use filter::*;
+pub use run_results::*;
 
 use crate::personal_info::PersonalInfo;
 use crate::xorshift::XorShift;

src/main.rs

@@ -1,6 +1,9 @@
 #![allow(unused)]
 
-use bdsp_ug_generator::{run_results, Pokemon, RoomType, Version, ABILITIES_EN, GENDER_SYMBOLS, ITEMS_EN, MOVES_EN, NATURES_EN, SPECIES_EN, personal_table, Filter};
+use bdsp_ug_generator::{
+    personal_table, run_results, Filter, Pokemon, RoomType, Version, ABILITIES_EN, GENDER_SYMBOLS,
+    ITEMS_EN, MOVES_EN, NATURES_EN, SPECIES_EN,
+};
 use clap::Parser;
 use std::fmt::Write;
 
@@ -41,7 +44,7 @@ fn write_pokemon(pokemon: &Pokemon, string: &mut String) {
     let personal_info = personal_table::BDSP.get_form_entry(pokemon.species as usize, 0);
     let ability = match pokemon.ability {
         0 => personal_info.get_ability_1(),
-        _ => personal_info.get_ability_2()
+        _ => personal_info.get_ability_2(),
     };
     writeln!(string, "Species: {}\nPID: {:08X} EC: {:08X} Shiny: {}\nIVs: {:?} Ability: {} Gender: {}\nNature: {} Item: {}{}\n", SPECIES_EN[pokemon.species as usize], pokemon.pid, pokemon.ec, pokemon.shiny, pokemon.ivs, ABILITIES_EN[ability],  GENDER_SYMBOLS[pokemon.gender as usize], NATURES_EN[pokemon.nature as usize].trim(),
              ITEMS_EN[pokemon.item as usize].trim(),
@@ -77,15 +80,19 @@ fn main() {
 
     for (i, val) in min_split.take(6).enumerate() {
         if !val.is_empty() {
-            min_ivs[i] = val.parse::<u8>().expect(&format!("Failed to parse min iv {}", i));
+            min_ivs[i] = val
+                .parse::<u8>()
+                .expect(&format!("Failed to parse min iv {}", i));
         }
     }
 
     let mut max_ivs = [31, 31, 31, 31, 31, 31];
 
     for (i, val) in max_split.take(6).enumerate() {
         if !val.is_empty() {
-            max_ivs[i] = val.parse::<u8>().expect(&format!("Failed to parse max iv {}", i));
+            max_ivs[i] = val
+                .parse::<u8>()
+                .expect(&format!("Failed to parse max iv {}", i));
         }
     }
 
@@ -98,7 +105,7 @@ fn main() {
         nature: cli.nature,
         item: cli.item,
         egg_move: cli.egg_move,
-        gender: cli.gender
+        gender: cli.gender,
     };
 
     let results = run_results(
@@ -110,16 +117,16 @@ fn main() {
         cli.version,
         cli.story_flag,
         cli.room,
-        filter
+        filter,
     );
 
     let mut print = String::new();
 
-    for (advance, result) in results.iter().enumerate() {
+    for result in results.iter() {
         writeln!(
             print,
             "-------------------------------------------\nAdvances: {}",
-            advance
+            result.advance
         )
         .unwrap();
         for pokemon in result.regular_pokemon.iter() {

src/run_results.rs

@@ -1,6 +1,15 @@
-use crate::{personal_table, PersonalInfo, PokeRate, RoomType, Sheet1, TamagoWazaIgnoreTable, TamagoWazaTable, TypeAndSize, TypeRate, UgEncount, UgEncountSheet, UgPokemonData, UgRandMarkSheet, UgSpecialPokemon, Version, XorShift, ABILITIES_EN, GENDER_SYMBOLS, ITEMS_EN, MOVES_EN, NATURES_EN, SPECIES_EN, TAMAGO_WAZA_IGNORE_TABLE, TAMAGO_WAZA_TABLE, UG_ENCOUNT_02, UG_ENCOUNT_03, UG_ENCOUNT_04, UG_ENCOUNT_05, UG_ENCOUNT_06, UG_ENCOUNT_07, UG_ENCOUNT_08, UG_ENCOUNT_09, UG_ENCOUNT_10, UG_ENCOUNT_11, UG_ENCOUNT_12, UG_ENCOUNT_20, UG_POKEMON_DATA, UG_RAND_MARK, UG_SPECIAL_POKEMON, Filter};
+use crate::{
+    personal_table, Filter, PersonalInfo, PokeRate, RoomType, Sheet1, TamagoWazaIgnoreTable,
+    TamagoWazaTable, TypeAndSize, TypeRate, UgEncount, UgEncountSheet, UgPokemonData,
+    UgRandMarkSheet, UgSpecialPokemon, Version, XorShift, ABILITIES_EN, GENDER_SYMBOLS, ITEMS_EN,
+    MOVES_EN, NATURES_EN, SPECIES_EN, TAMAGO_WAZA_IGNORE_TABLE, TAMAGO_WAZA_TABLE, UG_ENCOUNT_02,
+    UG_ENCOUNT_03, UG_ENCOUNT_04, UG_ENCOUNT_05, UG_ENCOUNT_06, UG_ENCOUNT_07, UG_ENCOUNT_08,
+    UG_ENCOUNT_09, UG_ENCOUNT_10, UG_ENCOUNT_11, UG_ENCOUNT_12, UG_ENCOUNT_20, UG_POKEMON_DATA,
+    UG_RAND_MARK, UG_SPECIAL_POKEMON,
+};
 
 pub struct Advance {
+    pub advance: u32,
     pub regular_pokemon: Vec<Pokemon>,
     pub rare_pokemon: Option<Pokemon>,
 }
@@ -27,7 +36,7 @@ pub fn run_results(
     version: Version,
     story_flag: u8,
     room: RoomType,
-    filter: Filter
+    filter: Filter,
 ) -> Vec<Advance> {
     let mut results = Vec::with_capacity(advances as usize);
 
@@ -187,7 +196,7 @@ pub fn run_results(
 
     let mut rng = XorShift::from_state([s0, s1, s2, s3]);
     let secret_base_used_tiles = 0;
-    for _ in 0..=advances {
+    for curr_advance in 0..=advances {
         let mut contains_shiny = false;
         let mut spawn_count = rand_mark_data.min;
         let mut clone = rng.clone();
@@ -217,6 +226,7 @@ pub fn run_results(
         let mut poke_slots: Vec<TypeAndSize> = Vec::with_capacity(spawn_count as usize);
 
         let mut advance = Advance {
+            advance: curr_advance,
             regular_pokemon: Vec::with_capacity(spawn_count as usize),
             rare_pokemon: None,
         };