diff options
| author | troido <troido@protonmail.com> | 2020-03-05 12:50:25 +0100 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-03-05 12:50:25 +0100 |
| commit | 170741fe959d30ee43ce689fd5fbae725cc1dae4 (patch) | |
| tree | de337876fb9afc3ca20e5a99ef61689813f51ebe /src/encyclopedia.rs | |
| parent | ea99b86b89659624133a63f03600f0b57592a5f4 (diff) | |
equipent now kinda works
Diffstat (limited to 'src/encyclopedia.rs')
| -rw-r--r-- | src/encyclopedia.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/encyclopedia.rs b/src/encyclopedia.rs index 8de5424..75302b8 100644 --- a/src/encyclopedia.rs +++ b/src/encyclopedia.rs @@ -19,7 +19,7 @@ impl Encyclopedia { pub fn from_json(val: Value) -> Result<Encyclopedia> { let mut items = HashMap::new(); - for (k, v) in val.as_object().ok_or(aerr!("encyclopedia not a json object"))?.into_iter() { + for (k, v) in val.get("assemblages").ok_or(aerr!("no assemblages in encyclopedia json"))?.as_object().ok_or(aerr!("encyclopedia not a json object"))?.into_iter() { items.insert(EntityType(k.clone()), Assemblage::from_json(v)?); } Ok(Encyclopedia{items}) |