From b9cfb78c20fd309929aae98f24acc8ba4a9a7481 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Sun, 9 Feb 2020 23:38:22 +0100
Subject: can now pick up and drop items

---
 src/main.rs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index d2cfd13..0b055c9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -90,12 +90,12 @@ fn gen_room<'a, 'b>() -> Room<'a, 'b> {
 			"X,,,,,,,,,,,,,,,,,,~~~,,,,,T,,,,######,,,X",
 			"X,,,,,,,,,,,,,,,,,,bbb,,,,,,,,,,#++++#,,,X",
 			"X,,,,,.............bbb...........++++#,,,X",
-			"X,,,,,.,,,,,,,,,,,,bbb,,,,,,,,,,#++++#,,,X",
-			"X,,,,,.,,,,,,,,,,,,~~~,,,T,,,T,,#++++#,,,X",
-			"X,,,,,.,,,,   ,,,,,~~~,,,,,,,,,,######,,,X",
-			"X,,,,,.,,,,   ,,,,~~~~,,,,,,,,,,f,,,,f,,,X",
-			"X,,,,,.,,,,   ,,,,~~~''''''''''''''''f'''X",
-			"X,,,,,.,,,,,,,,,,,~~~'''''''''''f''''f'''X",
+			"X,**,,.,,,,,,,,,,,,bbb,,,,,,,,,,#++++#,,,X",
+			"X,*,*,.,,,,,,,,,,,,~~~,,,T,,,T,,#++++#,,,X",
+			"X,,*,,.,,,,   ,,,,,~~~,,,,,,,,,,######,,,X",
+			"X,**,,.,,,,   ,,,,~~~~,,,,,,,,,,f,,,,f,,,X",
+			"X,,*,,.,,,,   ,,,,~~~''''''''''''''''f'''X",
+			"X*,,,,.,,,,,,,,,,,~~~'''''''''''f''''f'''X",
 			"X,,,,,.,,,,,,,,,,,~~~'''''''''''ffffff'''X",
 			"X,,,,,.,,,,,,,,,,,~~~''''''''''''''''''''X",
 			"XXXXX,.,XXXXXXXXXX~~~XXXXXXXXXXXXXXXXXXXXX"
@@ -111,6 +111,7 @@ fn gen_room<'a, 'b>() -> Room<'a, 'b> {
 			"T": ["grass", "tree"],
 			"f": ["grass", "fence"],
 			"X": "rock",
+			"*": ["grass", "pebble"],
 			" ": []
 		}
 	})).unwrap();
@@ -221,6 +222,15 @@ fn default_assemblages() -> Encyclopedia {
 				}]
 			]
 		},
+		"pebble": {
+			"components": [
+				["Visible", {
+					"sprite": ["string", "pebble"],
+					"height": ["float", 0.4]
+				}],
+				["Item", {"ent": ["template", "pebble"]}]
+			]
+		},
 		"player": {
 			"arguments": [["name", "string", null]],
 			"components": [
@@ -230,7 +240,8 @@ fn default_assemblages() -> Encyclopedia {
 				}],
 				["Player", {
 					"name": ["arg", "name"]
-				}]
+				}],
+				["Inventory", {}]
 			]
 		}
 	})).unwrap()
-- 
cgit