Merge branch 'master' into interact

9 files changed, 5 insertions, 43 deletions

diff --git a/content/maps/basement.json b/content/maps/basement.json
index c07670f..b30de89 100644
--- a/content/maps/basement.json
+++ b/content/maps/basement.json
@@ -21,7 +21,6 @@
 	],
 	"mapping": {
 		",": "grass",
-		"Y": ["grass", "radishplant"],
 		"~": "water",
 		"#": "wall",
 		"X": "rock",
diff --git a/content/maps/begin.json b/content/maps/begin.json
index 10c68b6..b5b5a75 100644
--- a/content/maps/begin.json
+++ b/content/maps/begin.json
@@ -29,7 +29,7 @@
 		",~~~~~~,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'1",
 		",~~~~~,,,,,,,,,''''''''T'''''''''''''''''''''''T'''''''''''''''1",
 		"~~~~~~,,,,,,,'''''''''''''T''''''''''''''''''''''''''''''''''''1",
-		"~~~~~''''T''''.................................................1",
+		"~~~~~*'''T''''.................................................1",
 		"~~~~~.'''''''.'''''''''''''''''''''''''''''''''''''''''''''''''1",
 		"~~~~~........''''''''''''''''''''''''''''''''''''''''''''''''''1",
 		"~~~~~.'''...'''',,,,,,,,,,,,,,,,,,,,,,,,,,'''''''',,,,,,,,,,,,'1",
@@ -85,13 +85,13 @@
 	"mapping": {
 		",": ["grass", "freeland"],
 		"'": ["grass"],
-		"Y": ["grass", "radishplant"],
 		"T": ["grass", "tree"],
 		"~": "water",
 		"=": ["water", "bridge"],
-		"o": ["grass", "stone", "stone", "stone", "stone", "stone", "stone", "stone", "stone"],
-		"W": ["grass", "hardwood", "hardwood", "hardwood", "hardwood", "hardwood", "hardwood", "hardwood", "hardwood"],
-		"*": ["grass", "pebble"],
+		"*": ["ground", {
+			"type": "spawner",
+			"kwargs": {"template": {"type": "pebble"}, "delay": 600, "initialSpawn": false}
+		}],
 		"d": ["ground", {
 			"type": "spawner",
 			"kwargs": {"template": {"type": "dummy"}, "delay": 600, "initialSpawn": true}
@@ -102,7 +102,6 @@
 			"type": "spawner",
 			"kwargs": {"template": {"type": "radishseed"}, "delay": 600, "initialSpawn": false}
 		}],
-		";": ["floor", "radishseed"],
 		".": "ground",
 		"+": "floor",
 		"X": "rock",
@@ -118,9 +117,6 @@
 			"floor"
 		],
 		"r": ["grass", "rabbit"],
-		"/": ["grass", "sword"],
-		"!": ["grass", "club"],
-		"]": ["grass", "armour"],
 		"1": [{
 			"type": "portal",
 			"kwargs": {"destination": "right", "destpos": "left"}
@@ -134,11 +130,6 @@
 			"kwargs": {"destination": "tutorial", "destpos": "tunnelout"}
 		}, "floor"],
 		"E": ["grass", "trader"],
-		"B": ["grass", "freeland", "builtwall"],
-		"5": ["grass", "plantedradishseed"],
-		"6": ["grass", "radishseedling"],
-		"7": ["grass", "youngradishplant"],
-		"8": ["grass", "radishplant"],
 		" ": []
 	}
 }
diff --git a/content/maps/broom.json b/content/maps/broom.json
index 38520d2..ed7e7ca 100644
--- a/content/maps/broom.json
+++ b/content/maps/broom.json
@@ -42,7 +42,6 @@
 		"T": ["grass", "tree"],
 		"f": ["grass", "fence"],
 		"X": "rock",
-		"*": ["grass", "pebble"],
 		"%": {"type": "portal", "kwargs": {"destination": "room"}},
 		" ": []
 	}
diff --git a/content/maps/cave.json b/content/maps/cave.json
index 6086d78..93cdce8 100644
--- a/content/maps/cave.json
+++ b/content/maps/cave.json
@@ -53,7 +53,6 @@
 	],
 	"mapping": {
 		",": "grass",
-		"Y": ["grass", "plant"],
 		"~": "water",
 		"X": "wall",
 		"X": "rock",
diff --git a/content/maps/right.json b/content/maps/right.json
index 27f13c0..5772efc 100644
--- a/content/maps/right.json
+++ b/content/maps/right.json
@@ -86,15 +86,10 @@
 	"mapping": {
 		",": ["grass", "freeland"],
 		"'": ["grass"],
-		"Y": ["grass", "plant"],
 		"T": ["grass", "tree"],
 		"~": "water",
 		"=": ["water", "bridge"],
-		"o": ["grass", "stone"],
-		"*": ["grass", "pebble"],
-		"d": ["ground", "dummy"],
 		"#": "wall",
-		";": ["floor", "seed"],
 		".": "ground",
 		"+": "floor",
 		"X": "rock",
@@ -112,9 +107,6 @@
 			"kwargs": {"destination": "smallview", "destpos": "begin"}
 		}, "bridge", "water"],
 		"r": ["grass", "rabbit"],
-		"/": ["grass", "sword"],
-		"!": ["grass", "club"],
-		"]": ["grass", "armour"],
 		" ": []
 	}
 }
diff --git a/content/maps/room.json b/content/maps/room.json
index 173f79e..84201a0 100644
--- a/content/maps/room.json
+++ b/content/maps/room.json
@@ -45,13 +45,10 @@
 		"^": ["grass", "spiketrap"],
 		"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"],
 		"s": ["ground", "sign"],
 		"u": ["ground", "dude"],
 		"t": ["ground", "trader"],
-		"P": ["ground", "pickaxe"],
 		"Q": "quarry",
 		" ": []
 	}
diff --git a/content/maps/smallview.json b/content/maps/smallview.json
index 4a6cb31..3485780 100644
--- a/content/maps/smallview.json
+++ b/content/maps/smallview.json
@@ -48,11 +48,7 @@
         "T": ["grass", "tree"],
         "~": "water",
         "=": ["water", {"type": "bridge", "kwargs": {"small": true}}],
-        "o": ["grass", "stone"],
-        "*": ["grass", "pebble"],
-        "d": ["ground", "dummy"],
         "#": "fence",
-        ";": ["floor", "seed"],
         ".": "ground",
         "+": "floor",
         "X": "rock",
@@ -71,9 +67,6 @@
             "kwargs": {"destination": "room"}
         }, "floor"],
         "r": ["grass", "rabbit"],
-        "/": ["grass", "sword"],
-        "!": ["grass", "club"],
-        "]": ["grass", "armour"],
         " ": []
     }
 }
diff --git a/content/maps/town.json b/content/maps/town.json
index c1b265d..26e700e 100644
--- a/content/maps/town.json
+++ b/content/maps/town.json
@@ -78,12 +78,8 @@
         "T": ["grass", "tree"],
         "~": "water",
         "=": ["water", "bridge"],
-        "o": ["grass", "stone"],
-        "*": ["grass", "pebble"],
-        "d": ["ground", "dummy"],
         "#": "wall",
         "h": "fence",
-        ";": ["floor", "seed"],
         ".": "ground",
         "+": "floor",
         "X": "rock",
@@ -93,9 +89,6 @@
             "kwargs": {"destination": "smallview", "destpos": "towneast"}
         }, "ground"],
         "r": ["grass", "rabbit"],
-        "/": ["grass", "sword"],
-        "!": ["grass", "club"],
-        "]": ["grass", "armour"],
         " ": []
     }
 }
diff --git a/content/maps/tutorial.json b/content/maps/tutorial.json
index 9c854a4..035e66b 100644
--- a/content/maps/tutorial.json
+++ b/content/maps/tutorial.json
@@ -77,7 +77,6 @@
 		"#": ["wall"],
 		".": ["ground"],
 		"+": ["floor"],
-		"$": ["grass", "radishplant"],
 		"~": ["water"],
 		"=": ["water", "bridge"],
 		"m": ["rock"],