summaryrefslogtreecommitdiff
path: root/src/componentwrapper.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-09-20 23:33:13 +0200
committertroido <troido@protonmail.com>2020-09-20 23:33:13 +0200
commit5eda37efbd1b34851364923069c0c3effdc32ca8 (patch)
treed2f6e035c32f49eeebc1149ef5a08bdd6229912f /src/componentwrapper.rs
parent39d7f4a123171a1dc5d5a8ec1c512599d4bec0f0 (diff)
create interactions from parameter instead of json
Diffstat (limited to 'src/componentwrapper.rs')
-rw-r--r--src/componentwrapper.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/componentwrapper.rs b/src/componentwrapper.rs
index 638d156..f3c2db0 100644
--- a/src/componentwrapper.rs
+++ b/src/componentwrapper.rs
@@ -185,7 +185,7 @@ components!(all:
Clan (name: String);
Home (home: Pos);
Faction (faction: String) {Faction::from_str(faction.as_str()).ok_or(aerr!("invalid faction name"))?};
- Interactable (action: Interactable) {action};
+ Interactable (typ: String, arg: Parameter) {Interactable::parse_from_parameter(&typ, &arg).ok_or(aerr!("invalid interaction"))?};
Loot (loot: Vec<(Template, f64)>);
Timer (
trigger: String, (panic!("can't turn trigger to string")),