@@ -1,2 +1,3 @@ {:desc "You are in a long, low-lit hallway that turns to the east." + :items #{:detector} :exits {:north :start :east :promenade} } \ No newline at end of file data/rooms/hallway @@ -52,6 +52,16 @@ [] (str-join "\n " (cons "You are carrying:" @*inventory*))) +(defn detect + "If you have the detector, you can see which room an item is in." + [item] + (if (@*inventory* :detector) + (if-let [room (first (filter #((:items %) (keyword item)) + (vals rooms)))] + (str item " is in " (:name room)) + (str item " is not in any room.")) + "You need to be carrying the detector for that.")) + ;; Command data (def commands {"move" move, @@ -62,6 +72,7 @@ "grab" grab "discard" discard "inventory" inventory + "detect" detect "look" look}) ;; Command handling src/mire/commands.clj @@ -6,9 +6,10 @@ (let [room (read-string (slurp (.getAbsolutePath file)))] (conj rooms {(keyword (.getName file)) - {:desc (:desc room) + {:name (keyword (.getName file)) + :desc (:desc room) :exits (ref (:exits room)) - :items (ref (or (:items room) [])) + :items (ref (or (:items room) #{})) :inhabitants (ref #{})}}))) (defn load-rooms [dir] src/mire/rooms.clj @@ -1,12 +1,12 @@ (ns mire.util) -(defn remove-from - "Return coll with all instances of obj removed." +(defn remove-from-set + "Return a set of coll with all instances of obj removed." [coll obj] - (remove #(= % obj) coll)) + (set (remove #(= % obj) coll))) (defn move-between-sets "Move one instance of obj between from and to. Must be called in a transaction." [obj from to] - (commute from remove-from obj) + (commute from remove-from-set obj) (commute to conj obj)) \ No newline at end of file src/mire/util.clj 814ba8474cff612ad5202fb5088ee6bec6f896d5 Phil Hagelberg technomancy@gmail.com http://github.com/technomancy/mire/commit/d176ea9cd87900797f621d8c38988a8656994235 d176ea9cd87900797f621d8c38988a8656994235 2009-02-28T16:15:24-08:00 2009-02-28T16:15:24-08:00 Implement detect command. e3725c40722c6386b7fe0eb35a8119abe92e454b Phil Hagelberg technomancy@gmail.com