diff options
| author | troido <troido@protonmail.com> | 2020-05-19 15:06:45 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-05-19 15:06:45 +0200 |
| commit | dac89209fdde17e2e4fdf89768e814945a8cea62 (patch) | |
| tree | 8713ca53fd85b1c88a9263197fa7306766747e19 /content | |
| parent | 0d382ea19f8f964c35761f6a3ff80bc9bfc25375 (diff) | |
better json parsing using serde_json::value::from_value
Diffstat (limited to 'content')
| -rw-r--r-- | content/encyclopediae/default_encyclopedia.json | 19 | ||||
| -rw-r--r-- | content/encyclopediae/npcs.json | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json index 118b9cd..18cf967 100644 --- a/content/encyclopediae/default_encyclopedia.json +++ b/content/encyclopediae/default_encyclopedia.json @@ -90,25 +90,6 @@ ["Interactable", {"action": ["interaction", ["say", "Good morning there, World"]]}] ] }, - "dude": { - "sprite": "human", - "height": 1.5, - "flags": ["Occupied"], - "components": [ - ["Interactable", {"action": ["interaction", ["reply", "did you say '{}'?"]]}] - ] - }, - "trader": { - "sprite": "human", - "height": 1.5, - "components": [ - ["Interactable", {"action": ["interaction", ["exchange", ["buy ", { - "pebble": [["radish", "radish"], ["pebble"]], - "radishseed": [["radish"], ["radishseed", "radishseed"]], - "carrotseed": [["radish"], ["carrotseed"]] - }]]]}] - ] - }, "quarry": { "sprite": "quarry", "height": 2, diff --git a/content/encyclopediae/npcs.json b/content/encyclopediae/npcs.json index cef6f0b..bfaa6fe 100644 --- a/content/encyclopediae/npcs.json +++ b/content/encyclopediae/npcs.json @@ -73,6 +73,25 @@ ["Movable", {"cooldown": 3}], ["Faction", {"faction": "neutral"}] ] + }, + "dude": { + "sprite": "human", + "height": 1.5, + "flags": ["Occupied"], + "components": [ + ["Interactable", {"action": ["interaction", ["reply", "did you say '{}'?"]]}] + ] + }, + "trader": { + "sprite": "human", + "height": 1.5, + "components": [ + ["Interactable", {"action": ["interaction", ["exchange", ["buy ", { + "pebble": [["radish", "radish"], ["pebble"]], + "radishseed": [["radish"], ["radishseed", "radishseed"]], + "carrotseed": [["radish"], ["carrotseed"]] + }]]]}] + ] } } } |