equipent now kinda works

2 files changed, 246 insertions, 229 deletions

diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json
index 47fa9d2..36713cf 100644
--- a/content/encyclopediae/default_encyclopedia.json
+++ b/content/encyclopediae/default_encyclopedia.json
@@ -1,231 +1,247 @@
 {
-	"wall": {
-		"components": ["Blocking"],
-		"sprite": "wall",
-		"height": 2
-	},
-	"rock": {
-		"components": ["Blocking"],
-		"sprite": "rock",
-		"height": 10
-	},
-	"tree": {
-		"components": ["Blocking"],
-		"sprite": "tree",
-		"height": 3
-	},
-	"fence": {
-		"components": ["Blocking"],
-		"sprite": "fence",
-		"height": 1
-	},
-	"grass": {
-		"components": [
-			["Visible", {
-				"sprite": ["random", [
-					["string", "grass1"],
-					["string", "grass2"],
-					["string", "grass3"],
-					["string", "grass1"],
-					["string", "grass2"],
-					["string", "grass3"],
-					["string", "ground"]
-				]],
-				"height": ["float", 0.1],
-				"name": ["string", "grass"]
-			}],
-			"Floor"
-		]
-	},
-	"greengrass": {
-		"components": [
-			["Visible", {
-				"sprite": ["random", [
-					["string", "grass1"],
-					["string", "grass2"],
-					["string", "grass3"]
-				]],
-				"height": ["float", 0.1],
-				"name": ["string", "grass"]
-			}],
-			"Floor"
-		]
-	},
-	"ground": {
-		"components": ["Floor"],
-		"sprite": "ground",
-		"height": 0.1
-	},
-	"floor": {
-		"components": ["Floor"],
-		"sprite": "floor",
-		"height": 0.1
-	},
-	"bridge": {
-		"components": [
-			"Floor"
-		],
-		"sprite": "bridge",
-		"height": 0.1
-	},
-	"water": {
-		"components": [],
-		"sprite": "water",
-		"height": 0.1
-	},
-	"pebble": {
-		"components": [
-			["Item", {
-				"ent": ["template", "pebble"],
-				"name": ["string", "pebble"],
-				"action": ["action", ["none", null]]
-			}]
-		],
-		"sprite": "pebble",
-		"height": 0.3
-	},
-	"stone": {
-		"components": [
-			["Item", {
-				"ent": ["template", "stone"],
-				"name": ["string", "stone"],
-				"action": ["action", ["build", "builtwall"]]
-			}]
-		],
-		"sprite": "stone",
-		"height": 0.4
-	},
-	"player": {
-		"arguments": [["name", "string", null]],
-		"components": [
-			["Visible", {
-				"sprite": ["string", "player"],
-				"height": ["float", 1.0],
-				"name": ["arg", "name"]
-			}],
-			["Player", {
-				"name": ["arg", "name"]
-			}],
-			["Inventory", {"capacity": ["int", 3]}],
-			["Health", {"health": ["int", 9], "maxhealth": ["int", 10]}]
-		]
-	},
-	"portal": {
-		"arguments": [["destination", "string", null], ["dest_pos", "string", ""]],
-		"components": [
-			["RoomExit", {"destination": ["arg", "destination"], "dest_pos": ["arg", "dest_pos"]}],
-			"Floor"
-		]
-	},
-	"builtwall": {
-		"arguments": [["health", "int", 100]],
-		"components": [
-			"Blocking",
-			["Health", {"health": ["arg", "health"], "maxhealth": ["int", 100]}],
-			"Mortal"
-		],
-		"sprite": "wall",
-		"height": 2
-	},
-	"spiketrap": {
-		"components": [["Trap", {"damage": ["int", 8]}]],
-		"sprite": "spikes",
-		"height": 0.8
-	},
-	"dummy": {
-		"arguments": [["health", "int", 20]],
-		"sprite": "dummy",
-		"height": 1,
-		"components": [
-			["Health", {"health": ["arg", "health"], "maxhealth": ["int", 20]}],
-			"Mortal"
-		]
-	},
-	"wound": {
-		"sprite": "wound",
-		"height": 0.25,
-		"components": [["Volatile", {"delay": ["int", 4]}]],
-		"save": false
-	},
-	"rat": {
-		"sprite": "rat",
-		"height": 1,
-		"components": [
-			["MonsterAI", {
-				"view_distance": ["int", 3],
-				"move_chance": ["float", 0.08],
-				"homesickness": ["float", 0.1]
-			}],
-			["Health", {"health": ["int", 8], "maxhealth": ["int", 8]}],
-			["Fighter", {"damage": ["int", 2], "cooldown": ["int", 6]}],
-			["Movable", {"cooldown": ["int", 3]}],
-			"Mortal",
-			["Faction", {"faction": ["string", "evil"]}]
-		]
-	},
-	"spawner": {
-		"arguments": [["template", "template", null], ["amount", "int", 1], ["delay", "int", 0], ["clan", "string", ""], ["initial_spawn", "bool", true]],
-		"components": [
-			["Spawner", {
-				"template": ["arg", "template"],
-				"amount": ["arg", "amount"],
-				"delay": ["arg", "delay"],
-				"clan": ["arg", "clan"],
-				"initial_spawn": ["arg", "initial_spawn"]
-			}]
-		]
-	},
-	"letter": {
-		"arguments": [["char", "string", null]],
-		"components": [["Visible", {
-			"name": ["concat", [["string", "letter_"], ["arg", "char"]]],
-			"sprite": ["concat", [["string", "emptyletter-"], ["arg", "char"]]],
-			"height": ["float", 1.0]
-		}]]
-	},
-	"radishplant": {
-		"sprite": "smallplant",
-		"name": "radishplant",
-		"height": 0.5,
-		"components": [
-			["Interactable", {"action": ["string", "harvest"]}],
-			"Mortal",
-			["Loot", {"loot": ["lootlist", [["radishseed", 0.92], ["radishseed", 0.20], ["radishes", 0.8], ["radishes", 0.4]]]}]
-		]
-	},
-	"radishseed": {
-		"sprite": "seed",
-		"height": 0.2,
-		"name": "radishseed",
-		"components": [
-			["Item", {
-				"ent": ["template", "radishseed"],
-				"name": ["string", "radishseed"],
-				"action": ["action", ["build", "plantedradishseed"]]
-			}]
-		]
-	},
-	"plantedradishseed": {
-		"sprite": "seed",
-		"height": 0.05,
-		"name": "seed",
-		"components": [
-			["Grow", {
-				"delay": ["int", 200],
-				"into": ["template", "radishplant"]
-			}]
-		]
-	},
-	"radishes": {
-		"sprite": "food",
-		"height": 0.3,
-		"name": "radishes",
-		"components": [
-			["Item", {
-				"ent": ["template", "radishes"],
-				"name": ["string", "radishes"],
-				"action": ["action", ["eat", 3]]
-			}]
-		]
+	"assemblages": {
+		"wall": {
+			"components": ["Blocking"],
+			"sprite": "wall",
+			"height": 2
+		},
+		"rock": {
+			"components": ["Blocking"],
+			"sprite": "rock",
+			"height": 10
+		},
+		"tree": {
+			"components": ["Blocking"],
+			"sprite": "tree",
+			"height": 3
+		},
+		"fence": {
+			"components": ["Blocking"],
+			"sprite": "fence",
+			"height": 1
+		},
+		"grass": {
+			"components": [
+				["Visible", {
+					"sprite": ["random", [
+						["string", "grass1"],
+						["string", "grass2"],
+						["string", "grass3"],
+						["string", "grass1"],
+						["string", "grass2"],
+						["string", "grass3"],
+						["string", "ground"]
+					]],
+					"height": ["float", 0.1],
+					"name": ["string", "grass"]
+				}],
+				"Floor"
+			]
+		},
+		"greengrass": {
+			"components": [
+				["Visible", {
+					"sprite": ["random", [
+						["string", "grass1"],
+						["string", "grass2"],
+						["string", "grass3"]
+					]],
+					"height": ["float", 0.1],
+					"name": ["string", "grass"]
+				}],
+				"Floor"
+			]
+		},
+		"ground": {
+			"components": ["Floor"],
+			"sprite": "ground",
+			"height": 0.1
+		},
+		"floor": {
+			"components": ["Floor"],
+			"sprite": "floor",
+			"height": 0.1
+		},
+		"bridge": {
+			"components": [
+				"Floor"
+			],
+			"sprite": "bridge",
+			"height": 0.1
+		},
+		"water": {
+			"components": [],
+			"sprite": "water",
+			"height": 0.1
+		},
+		"pebble": {
+			"components": [
+				["Item", {
+					"ent": ["template", "pebble"],
+					"name": ["string", "pebble"],
+					"action": ["action", ["none", null]]
+				}]
+			],
+			"sprite": "pebble",
+			"height": 0.3
+		},
+		"stone": {
+			"components": [
+				["Item", {
+					"ent": ["template", "stone"],
+					"name": ["string", "stone"],
+					"action": ["action", ["build", "builtwall"]]
+				}]
+			],
+			"sprite": "stone",
+			"height": 0.4
+		},
+		"player": {
+			"arguments": [["name", "string", null]],
+			"components": [
+				["Visible", {
+					"sprite": ["string", "player"],
+					"height": ["float", 1.0],
+					"name": ["arg", "name"]
+				}],
+				["Player", {
+					"name": ["arg", "name"]
+				}],
+				["Inventory", {"capacity": ["int", 3]}],
+				["Health", {"health": ["int", 9], "maxhealth": ["int", 10]}]
+			]
+		},
+		"portal": {
+			"arguments": [["destination", "string", null], ["dest_pos", "string", ""]],
+			"components": [
+				["RoomExit", {"destination": ["arg", "destination"], "dest_pos": ["arg", "dest_pos"]}],
+				"Floor"
+			]
+		},
+		"builtwall": {
+			"arguments": [["health", "int", 100]],
+			"components": [
+				"Blocking",
+				["Health", {"health": ["arg", "health"], "maxhealth": ["int", 100]}],
+				"Mortal"
+			],
+			"sprite": "wall",
+			"height": 2
+		},
+		"spiketrap": {
+			"components": [["Trap", {"damage": ["int", 8]}]],
+			"sprite": "spikes",
+			"height": 0.8
+		},
+		"dummy": {
+			"arguments": [["health", "int", 20]],
+			"sprite": "dummy",
+			"height": 1,
+			"components": [
+				["Health", {"health": ["arg", "health"], "maxhealth": ["int", 20]}],
+				"Mortal"
+			]
+		},
+		"wound": {
+			"sprite": "wound",
+			"height": 0.25,
+			"components": [["Volatile", {"delay": ["int", 4]}]],
+			"save": false
+		},
+		"rat": {
+			"sprite": "rat",
+			"height": 1,
+			"components": [
+				["MonsterAI", {
+					"view_distance": ["int", 3],
+					"move_chance": ["float", 0.08],
+					"homesickness": ["float", 0.1]
+				}],
+				["Health", {"health": ["int", 8], "maxhealth": ["int", 8]}],
+				["Fighter", {"damage": ["int", 2], "cooldown": ["int", 6]}],
+				["Movable", {"cooldown": ["int", 3]}],
+				"Mortal",
+				["Faction", {"faction": ["string", "evil"]}]
+			]
+		},
+		"spawner": {
+			"arguments": [["template", "template", null], ["amount", "int", 1], ["delay", "int", 0], ["clan", "string", ""], ["initial_spawn", "bool", true]],
+			"components": [
+				["Spawner", {
+					"template": ["arg", "template"],
+					"amount": ["arg", "amount"],
+					"delay": ["arg", "delay"],
+					"clan": ["arg", "clan"],
+					"initial_spawn": ["arg", "initial_spawn"]
+				}]
+			]
+		},
+		"letter": {
+			"arguments": [["char", "string", null]],
+			"components": [["Visible", {
+				"name": ["concat", [["string", "letter_"], ["arg", "char"]]],
+				"sprite": ["concat", [["string", "emptyletter-"], ["arg", "char"]]],
+				"height": ["float", 1.0]
+			}]]
+		},
+		"radishplant": {
+			"sprite": "smallplant",
+			"name": "radishplant",
+			"height": 0.5,
+			"components": [
+				["Interactable", {"action": ["string", "harvest"]}],
+				"Mortal",
+				["Loot", {"loot": ["lootlist", [["radishseed", 0.92], ["radishseed", 0.20], ["radishes", 0.8], ["radishes", 0.4]]]}]
+			]
+		},
+		"radishseed": {
+			"sprite": "seed",
+			"height": 0.2,
+			"name": "radishseed",
+			"components": [
+				["Item", {
+					"ent": ["template", "radishseed"],
+					"name": ["string", "radishseed"],
+					"action": ["action", ["build", "plantedradishseed"]]
+				}]
+			]
+		},
+		"plantedradishseed": {
+			"sprite": "seed",
+			"height": 0.05,
+			"name": "seed",
+			"components": [
+				["Grow", {
+					"delay": ["int", 200],
+					"into": ["template", "radishplant"]
+				}]
+			]
+		},
+		"radishes": {
+			"sprite": "food",
+			"height": 0.3,
+			"name": "radishes",
+			"components": [
+				["Item", {
+					"ent": ["template", "radishes"],
+					"name": ["string", "radishes"],
+					"action": ["action", ["eat", 3]]
+				}]
+			]
+		},
+		"sword": {
+			"sprite": "sword",
+			"height": 0.5,
+			"components": [
+				["Item", {
+					"ent": ["template", "sword"],
+					"name": ["string", "sword"],
+					"action": ["action", ["equip", {
+						"slot": "hand",
+						"stats": {"strength": 50}
+					}]]
+				}]
+			]
+		}
 	}
 }
diff --git a/content/maps/room.json b/content/maps/room.json
index 16e6230..39d504e 100644
--- a/content/maps/room.json
+++ b/content/maps/room.json
@@ -23,7 +23,7 @@
 		"X,,*,,.,,,,,,,,,,,~~~''''''''''''''''f'''X",
 		"X*,,,,.,,,d,VVV,,,~~~'''''''''''f''''f'''X",
 		"X,,,,,.,,,,,VVV,,,~~~'''''''''''ffffff'''X",
-		"X,,,,,.,,,,,VVV,,,~~~''''''''''''''''''''X",
+		"X/,,,,.,,,,,VVV,,,~~~''''''''''''''''''''X",
 		"XXXXX,.,XXXXXXXXXX~~~XXXXXXXXXXXXXXXXXXXXX",
 		"     %%%                                  "
 	],
@@ -45,6 +45,7 @@
 		"d": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "dummy"}, "delay": 100}}],
 		"r": ["grass", {"type": "spawner", "kwargs": {"template": {"type": "rat"}, "amount": 3, "clan": "rats", "delay": 200}}],
 		"V": ["grass", "radishplant"],
+		"/": ["grass", "sword"],
 		" ": []
 	}
 }