diff options
| -rw-r--r-- | src/bt.rs | 2 | ||||
| -rw-r--r-- | src/main.rs | 20 |
2 files changed, 10 insertions, 12 deletions
@@ -276,7 +276,7 @@ impl BuildTemplate { } } -static JSON_PALETTE: &'static str = include_str!("skill_palette.json"); +static JSON_PALETTE: &str = include_str!("skill_palette.json"); fn skill_id_to_palette_id(input: u32) -> u32 { let lookup_table: Vec<(u32, u32)> = serde_json::from_str(JSON_PALETTE).unwrap(); diff --git a/src/main.rs b/src/main.rs index 36d7a21..c8afd0f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -154,18 +154,16 @@ fn run_searching(api: &mut Api, matches: &ArgMatches) -> MainResult<BuildTemplat .into_iter() .map(|s| resolve_skill(api, &profession, s)) .collect::<Result<Vec<_>, _>>()? - } else { - if let Some(l) = legends.first() { - let l = api.get_legends(&[l.get_api_id().unwrap()])?.remove(0); - let mut result = Vec::new(); - for skill_id in (&[l.heal]).iter().chain(&l.utilities).chain(&[l.elite]) { - let skill = api.get_skills(&[*skill_id])?.remove(0); - result.push(skill); - } - result - } else { - Vec::new() + } else if let Some(l) = legends.first() { + let l = api.get_legends(&[l.get_api_id().unwrap()])?.remove(0); + let mut result = Vec::new(); + for skill_id in (&[l.heal]).iter().chain(&l.utilities).chain(&[l.elite]) { + let skill = api.get_skills(&[*skill_id])?.remove(0); + result.push(skill); } + result + } else { + Vec::new() }; let traitlines = matches |