diff options
| author | troido <troido@protonmail.com> | 2020-03-03 14:55:45 +0100 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-03-03 14:55:45 +0100 |
| commit | c51585be254795be90626dbc376663b1be8b5bf5 (patch) | |
| tree | f172d05e4ef3c9df62006c627f3f53bc4176985f /src/parameter.rs | |
| parent | c30c92c23a269e5ff28946d3522e68338696ac94 (diff) | |
dummies respawn too; fixed problems with respawn delay
Diffstat (limited to 'src/parameter.rs')
| -rw-r--r-- | src/parameter.rs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/parameter.rs b/src/parameter.rs index 1b9bd4f..c08eed2 100644 --- a/src/parameter.rs +++ b/src/parameter.rs @@ -10,7 +10,8 @@ pub enum Parameter { // Pos(Pos), Float(f64), Template(Template), - Action(ItemAction) + Action(ItemAction), + Bool(bool) } impl Parameter { @@ -26,7 +27,8 @@ impl Parameter { ParameterType::Int => Some(Self::Int(val.as_i64()?)), ParameterType::Float => Some(Self::Float(val.as_f64()?)), ParameterType::Template => Some(Self::Template(Template::from_json(val).ok()?)), - ParameterType::Action => Some(Self::Action(ItemAction::from_json(val)?)) + ParameterType::Action => Some(Self::Action(ItemAction::from_json(val)?)), + ParameterType::Bool => Some(Self::Bool(val.as_bool()?)) } } @@ -36,7 +38,8 @@ impl Parameter { Self::Int(_) => ParameterType::Int, Self::Float(_) => ParameterType::Float, Self::Template(_) => ParameterType::Template, - Self::Action(_) => ParameterType::Action + Self::Action(_) => ParameterType::Action, + Self::Bool(_) => ParameterType::Bool } } @@ -48,6 +51,8 @@ impl Parameter { ParameterType::Int } else if val.is_f64() { ParameterType::Float + } else if val.is_boolean(){ + ParameterType::Bool } else if val.is_object(){ ParameterType::Template } else { @@ -63,7 +68,8 @@ impl Parameter { Self::Int(i) => json!(i), Self::Float(f) => json!(f), Self::Template(t) => t.to_json(), - Self::Action(a) => a.to_json() + Self::Action(a) => a.to_json(), + Self::Bool(b) => json!(b) } } } @@ -74,7 +80,8 @@ pub enum ParameterType { Int, Float, Template, - Action + Action, + Bool } impl ParameterType { @@ -86,6 +93,7 @@ impl ParameterType { "float" => Some(Self::Float), "template" => Some(Self::Template), "action" => Some(Self::Action), + "bool" => Some(Self::Bool), _ => None } } |
