templates are not used as {"type": something} anymore

1 files changed, 31 insertions, 41 deletions

diff --git a/content/maps/tutorial.json b/content/maps/tutorial.json
index 5f75725..f84cf73 100644
--- a/content/maps/tutorial.json
+++ b/content/maps/tutorial.json
@@ -80,48 +80,38 @@
 		"~": ["water"],
 		"=": ["water", "bridge"],
 		"m": ["rock"],
-		"^": [{"type": "spiketrap", "kwargs": {"damage": 3}}
-			, "floor"],
+		"^": [{":template": "spiketrap", "damage": 3}, "floor"],
 		"%": ["floor", "closeddoor"],
-		"&": [{
-			"type": "spawner",
-			"kwargs": {"template": {"type": "dummy"}, "delay": 300, "initial_spawn": true}
-		}, "floor"],
-		"1": [{
-			"type": "portal",
-			"kwargs": {"destination": "begin", "destpos": "cavebridge"}
-		}, "floor"],
-		";": ["floor", {
-			"type": "spawner",
-			"kwargs": {"template": {"type": "radishseed"}, "delay": 600, "initial_spawn": true}
-		}],
-		"A": [{"type": "letter", "kwargs": {"char": "A"}}],
-		"B": [{"type": "letter", "kwargs": {"char": "B"}}],
-		"C": [{"type": "letter", "kwargs": {"char": "C"}}],
-		"D": [{"type": "letter", "kwargs": {"char": "D"}}],
-		"E": [{"type": "letter", "kwargs": {"char": "E"}}],
-		"F": [{"type": "letter", "kwargs": {"char": "F"}}],
-		"G": [{"type": "letter", "kwargs": {"char": "G"}}],
-		"H": [{"type": "letter", "kwargs": {"char": "H"}}],
-		"I": [{"type": "letter", "kwargs": {"char": "I"}}],
-		"J": [{"type": "letter", "kwargs": {"char": "J"}}],
-		"K": [{"type": "letter", "kwargs": {"char": "K"}}],
-		"L": [{"type": "letter", "kwargs": {"char": "L"}}],
-		"M": [{"type": "letter", "kwargs": {"char": "M"}}],
-		"N": [{"type": "letter", "kwargs": {"char": "N"}}],
-		"O": [{"type": "letter", "kwargs": {"char": "O"}}],
-		"P": [{"type": "letter", "kwargs": {"char": "P"}}],
-		"Q": [{"type": "letter", "kwargs": {"char": "Q"}}],
-		"R": [{"type": "letter", "kwargs": {"char": "R"}}],
-		"S": [{"type": "letter", "kwargs": {"char": "S"}}],
-		"T": [{"type": "letter", "kwargs": {"char": "T"}}],
-		"U": [{"type": "letter", "kwargs": {"char": "U"}}],
-		"V": [{"type": "letter", "kwargs": {"char": "V"}}],
-		"W": [{"type": "letter", "kwargs": {"char": "W"}}],
-		"X": [{"type": "letter", "kwargs": {"char": "X"}}],
-		"Y": [{"type": "letter", "kwargs": {"char": "Y"}}],
-		"Z": [{"type": "letter", "kwargs": {"char": "Z"}}],
-		"_": [{"type": "letter", "kwargs": {"char": " "}}],
+		"&": [{":template": "spawner", "template": {":template": "dummy"}, "delay": 300, "initial_spawn": true}, "floor"],
+		"1": [{":template": "portal", "destination": "begin", "destpos": "cavebridge"}, "floor"],
+		";": ["floor", {":template": "spawner", "template": {":template": "radishseed"}, "delay": 600, "initial_spawn": true}],
+		"A": [{":template": "letter", "char": "A"}],
+		"B": [{":template": "letter", "char": "B"}],
+		"C": [{":template": "letter", "char": "C"}],
+		"D": [{":template": "letter", "char": "D"}],
+		"E": [{":template": "letter", "char": "E"}],
+		"F": [{":template": "letter", "char": "F"}],
+		"G": [{":template": "letter", "char": "G"}],
+		"H": [{":template": "letter", "char": "H"}],
+		"I": [{":template": "letter", "char": "I"}],
+		"J": [{":template": "letter", "char": "J"}],
+		"K": [{":template": "letter", "char": "K"}],
+		"L": [{":template": "letter", "char": "L"}],
+		"M": [{":template": "letter", "char": "M"}],
+		"N": [{":template": "letter", "char": "N"}],
+		"O": [{":template": "letter", "char": "O"}],
+		"P": [{":template": "letter", "char": "P"}],
+		"Q": [{":template": "letter", "char": "Q"}],
+		"R": [{":template": "letter", "char": "R"}],
+		"S": [{":template": "letter", "char": "S"}],
+		"T": [{":template": "letter", "char": "T"}],
+		"U": [{":template": "letter", "char": "U"}],
+		"V": [{":template": "letter", "char": "V"}],
+		"W": [{":template": "letter", "char": "W"}],
+		"X": [{":template": "letter", "char": "X"}],
+		"Y": [{":template": "letter", "char": "Y"}],
+		"Z": [{":template": "letter", "char": "Z"}],
+		"_": [{":template": "letter", "char": " "}],
 		" ": []
 	}
 }