diff --git a/src/encode.rs b/src/encode.rs index 46e6a0a..46f5d8f 100644 --- a/src/encode.rs +++ b/src/encode.rs @@ -38,7 +38,7 @@ pub fn encode_namedata(general_params: &mut FuncParams, real_name: &str) { .encode(general_params.fr_ver, general_params.fr_out) .unwrap(); } -pub fn encode_ids(general_params: &mut FuncParams, real_ids: Vec, idsmap: HashMap) { +pub fn encode_iddata(general_params: &mut FuncParams, real_ids: Vec, idsmap: HashMap) { let mut idvec = Vec::new(); for eachid in real_ids { let id_id = idsmap.get(eachid.id.trim()); @@ -69,7 +69,7 @@ pub fn encode_ids(general_params: &mut FuncParams, real_ids: Vec) { +pub fn encode_powderdata(general_params: &mut FuncParams, real_powders: Vec) { let mut powdervec = Vec::new(); for eachpowder in real_powders { let powderamount: u8 = eachpowder.amount.unwrap_or(1); @@ -105,7 +105,7 @@ pub fn encode_powder(general_params: &mut FuncParams, real_powders: Vec) .encode(general_params.fr_ver, general_params.fr_out) .unwrap(); } -pub fn encode_reroll(general_params: &mut FuncParams, rerollcount: u8) { +pub fn encode_rerolldata(general_params: &mut FuncParams, rerollcount: u8) { if rerollcount != 0 { // ENCODE: RerollData if applicable RerollData(rerollcount) @@ -116,7 +116,7 @@ pub fn encode_reroll(general_params: &mut FuncParams, rerollcount: u8) { } } } -pub fn encode_shiny(general_params: &mut FuncParams, shiny: Shinyjson, json_shiny: Vec) { +pub fn encode_shinydata(general_params: &mut FuncParams, shiny: Shinyjson, json_shiny: Vec) { let mut realshinykey: u8; let _shinykey = &shiny.key; let shinyvalue = shiny.value; diff --git a/src/main.rs b/src/main.rs index 44eec03..b0feaa5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -154,7 +154,7 @@ fn cook( match json_config.item_type { ItemTypeDeser::Gear | ItemTypeDeser::Tome | ItemTypeDeser::Charm => { if let Some(real_ids) = json_config.ids { - encode_ids(&mut fr_params, real_ids, idsmap) + encode_iddata(&mut fr_params, real_ids, idsmap) } } _ => {} @@ -164,7 +164,7 @@ fn cook( match json_config.item_type { ItemTypeDeser::Gear | ItemTypeDeser::CraftedGear => { if let Some(real_powders) = json_config.powders { - encode_powder(&mut fr_params, real_powders) + encode_powderdata(&mut fr_params, real_powders) } } _ => {} @@ -175,7 +175,7 @@ fn cook( ItemTypeDeser::Gear | ItemTypeDeser::Tome | ItemTypeDeser::Charm => { if let Some(rerollcount) = json_config.rerolls { // rerolldata - encode_reroll(&mut fr_params, rerollcount) + encode_rerolldata(&mut fr_params, rerollcount) } } _ => {}