From dac89209fdde17e2e4fdf89768e814945a8cea62 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Tue, 19 May 2020 15:06:45 +0200
Subject: better json parsing using serde_json::value::from_value

---
 content/encyclopediae/default_encyclopedia.json | 19 -------------------
 content/encyclopediae/npcs.json                 | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'content')

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"]]
+				}]]]}]
+			]
 		}
 	}
 }
-- 
cgit