minor map changes; gave homeportal a sprite

7 files changed, 17 insertions, 43 deletions

diff --git a/content/maps/basement.json b/content/maps/basement.json
index 0d090b4..c07670f 100644
--- a/content/maps/basement.json
+++ b/content/maps/basement.json
@@ -36,13 +36,11 @@
 		],
 		"a": ["floor", {
 			"type": "spawner",
-			"args": [{"type": "rat"}, 1, 300],
-			"kwargs": {"initialSpawn": true, "setHome": true}
+			"kwargs": {"template": {"type": "rat"}, "delay": 300, "initial_spawn": true}
 		}],
 		":": ["floor", {
 			"type": "spawner",
-			"args": [{"type": "carrotseed"}, 1, 1200],
-			"kwargs": {"initialSpawn": false}
+			"kwargs": {"template": {"type": "carrotseed"}, "delay": 1200, "initial_spawn": false}
 		}],
 		" ": []
 	}
diff --git a/content/maps/begin.json b/content/maps/begin.json
index 401f0ab..a6714dc 100644
--- a/content/maps/begin.json
+++ b/content/maps/begin.json
@@ -94,15 +94,13 @@
 		"*": ["grass", "pebble"],
 		"d": ["ground", {
 			"type": "spawner",
-			"args": [{"type": "dummy"}, 1, 600],
-			"kwargs": {"initialSpawn": true}
+			"kwargs": {"template": {"type": "dummy"}, "delay": 600, "initialSpawn": true}
 		}],
 		"D": ["ground", "opendoor"],
 		"#": "wall",
 		":": ["ground", {
 			"type": "spawner",
-			"args": ["radishseed", 1, 600],
-			"kwargs": {"initialSpawn": false}
+			"kwargs": {"template": {"type": "radishseed"}, "delay": 600, "initialSpawn": false}
 		}],
 		";": ["floor", "radishseed"],
 		".": "ground",
diff --git a/content/maps/right.json b/content/maps/right.json
index ca41231..21cf1a0 100644
--- a/content/maps/right.json
+++ b/content/maps/right.json
@@ -93,11 +93,6 @@
 		"*": ["grass", "pebble"],
 		"d": ["ground", "dummy"],
 		"#": "wall",
-		":": ["floor", {
-			"type": "spawner",
-			"args": ["seed", 1, 600],
-			"kwargs": {"initialSpawn": true}
-		}],
 		";": ["floor", "seed"],
 		".": "ground",
 		"+": "floor",
diff --git a/content/maps/room.json b/content/maps/room.json
index ec4533f..052e65b 100644
--- a/content/maps/room.json
+++ b/content/maps/room.json
@@ -38,13 +38,13 @@
 		"T": ["grass", "tree"],
 		"f": ["grass", "fence"],
 		"X": "rock",
-		"*": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "pebble"}, "delay": 600}}],
-		"o": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "stone"}, "delay": 600}}],
+		"*": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "pebble"}, "delay": 1200, "initial_spawn": false}}],
+		"o": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "stone"}, "delay": 1200, "initial_spawn": false}}],
 		"%": {"type": "portal", "kwargs": {"destination": "broom", "destpos": "northentry"}},
 		"1": {"type": "portal", "kwargs": {"destination": "smallview"}},
 		"^": ["grass", "spiketrap"],
-		"d": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "dummy"}, "delay": 100}}],
-		"r": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "rat"}, "amount": 3, "clan": "rats", "delay": 200, "initial_spawn": false}}],
+		"d": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "dummy"}, "delay": 100, "initial_spawn": true}}],
+		"r": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "rat"}, "amount": 3, "clan": "rats", "delay": 200, "initial_spawn": true}}],
 		"V": ["grass", "radishplant"],
 		"/": ["grass", "sword"],
 		"D": ["ground", "closeddoor"],
diff --git a/content/maps/smallview.json b/content/maps/smallview.json
index 0f0982e..4a6cb31 100644
--- a/content/maps/smallview.json
+++ b/content/maps/smallview.json
@@ -8,7 +8,7 @@
         "home": [24, 26]
     },
     "field": [
-        "########.###############.########",
+        "#################################",
         "#,,,,,,#.#,,,,,,#~~~,~,#.#,,,,^,#",
         "#,,,,,,#.#,,,,,,#~~~~~~#.#,,,,,,#",
         "#,,,,,,#.#,,,,,,#~~~~~~#.#,,,,,,#",
@@ -16,7 +16,7 @@
         "#,,,^^,#.#,,,,^,#,~~~~,#.#,,,,,,#",
         "#,,,,,,#.#,,,,,,#,~~,,,#.#,,,,,,#",
         "########.#########~#####.########",
-        "..................=..............",
+        "#.................=.............#",
         "########.#########~#####.########",
         "#,,,,,,#.#,,,,,,#^~^..^#.#,^,,,,#",
         "#,,,,,,#.#,,,,,,#^~^..^#.#,,,,,,#",
@@ -32,7 +32,7 @@
         "#,,,,,,#.T,,,TT,TT,T,T~,.#,,^,,,#",
         "#,,,,,,#.,TT,T,,T,,,T,~~.#,,,,,,#",
         "########.T,,TTTT,TTT,TT~.########",
-        ".......................=........4",
+        "#......................=........4",
         "########.,,~~~~~~~~~~1~~.########",
         "#,,,,,,#.~~~,,,T,,,,,,,~.3,,,,,,#",
         "#,,,,,,#.~,,,,,,,,,,,,,~,#,^,,,,#",
@@ -52,11 +52,6 @@
         "*": ["grass", "pebble"],
         "d": ["ground", "dummy"],
         "#": "fence",
-        ":": ["floor", {
-            "type": "spawner",
-            "args": ["seed", 1, 600],
-            "kwargs": {"initialSpawn": true}
-        }],
         ";": ["floor", "seed"],
         ".": "ground",
         "+": "floor",
@@ -70,7 +65,7 @@
             "type": "portal",
             "kwargs": {"destination": "town", "destpos": "gate"}
         }, "floor"],
-        "3": [{"type": "homeportal", "kwargs": {"dedup_id": "homeportal"}, "save": true}, "floor"],
+        "3": [{"type": "homeportal", "kwargs": {"dedup_id": "homeportal"}, "save": true}, "floor", {"type": "img", "kwargs": {"sprite": "portal", "height": 1.0}}],
         "4": [{
             "type": "portal",
             "kwargs": {"destination": "room"}
diff --git a/content/maps/town.json b/content/maps/town.json
index 4a31f17..c1b265d 100644
--- a/content/maps/town.json
+++ b/content/maps/town.json
@@ -83,11 +83,6 @@
         "d": ["ground", "dummy"],
         "#": "wall",
         "h": "fence",
-        ":": ["floor", {
-            "type": "spawner",
-            "args": ["seed", 1, 600],
-            "kwargs": {"initialSpawn": true}
-        }],
         ";": ["floor", "seed"],
         ".": "ground",
         "+": "floor",
diff --git a/content/maps/tutorial.json b/content/maps/tutorial.json
index 2ac04b4..c9a7c85 100644
--- a/content/maps/tutorial.json
+++ b/content/maps/tutorial.json
@@ -82,26 +82,19 @@
 		"=": ["water", "bridge"],
 		"m": ["rock"],
 		"^": [{"type": "spiketrap", "kwargs": {"damage": 3}}
-			, "ground"],
-		"d": ["ground", {
-			"type": "spawner",
-			"args": [{"type": "dummy"}, 1, 600],
-			"kwargs": {"initial_spawn": true}
-		}],
+			, "floor"],
 		"%": ["floor", "closeddoor"],
 		"&": [{
 			"type": "spawner",
-			"args": [{"type": "dummy"}, 1, 300],
-			"kwargs": {"initial_spawn": true}
-		}],
+			"kwargs": {"template": {"type": "dummy"}, "delay": 300, "initial_spawn": true}
+		}, "floor"],
 		"1": [{
 			"type": "portal",
-			"args": ["begin","cavebridge"]
+			"kwargs": {"destination": "begin", "destpos": "cavebridge"}
 		}, "floor"],
 		";": ["floor", {
 			"type": "spawner",
-			"args": [{"type": "radishseed"}, 1, 600],
-			"kwargs": {"initial_spawn": true}
+			"kwargs": {"template": {"type": "radishseed"}, "delay": 600, "initial_spawn": true}
 		}],
 		"A": [{"type": "letter", "args": ["A"]}],
 		"B": [{"type": "letter", "args": ["B"]}],