summaryrefslogtreecommitdiff
path: root/src/assemblage.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-04-05 20:04:33 +0200
committertroido <troido@protonmail.com>2020-04-05 20:04:33 +0200
commit48c24ec8b011d081550dc78329cbe61de67b30e9 (patch)
treed2d700897dc5ba3d0f52e8a1cd57c0f4880272fd /src/assemblage.rs
parent84c70cee089b72720a85d285ee0437b65be298b9 (diff)
items are now mostly replaced by itemids, with a mapping to the item in the encyclopedia
Diffstat (limited to 'src/assemblage.rs')
-rw-r--r--src/assemblage.rs10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/assemblage.rs b/src/assemblage.rs
index 6856151..aa3154f 100644
--- a/src/assemblage.rs
+++ b/src/assemblage.rs
@@ -98,15 +98,9 @@ impl Assemblage {
}]));
}
// item component is common too
- if let Some(action) = val.get("item") {
+ if let Some(item) = val.get("item") {
components.push(json!(["Item", {
- "ent": ["self", null],
- "name": if let Some(n) = name {
- json!(["string", n])
- } else {
- json!(["name", Value::Null])
- },
- "action": ["action", action]
+ "item": ["string", item]
}]));
}
// and so is flags