2 Commits 4aebd390db ... cc877e92d2

Author SHA1 Message Date
  eq cc877e92d2 Merge branch 'master' of notabug.org:selfsame/aaa 5 years ago
  eq f825eb6984 using items 5 years ago
2 changed files with 14 additions and 3 deletions
  1. 7 2
      dialogue.fnl
  2. 7 1
      monsters.fnl

+ 7 - 2
dialogue.fnl

@@ -82,8 +82,13 @@
     (draw-menu "commands" 6)
     (let [cmd (option-list (point 30 40) ["drop" "wear" "use" "remove"] state)]
       (if (= cmd 1) (inventory-menu "drop" identity (fn [o] (drop player o) (exit-dialogue)))
-          (= cmd 3) (inventory-menu "use"  identity (fn [o] (exit-dialogue)))
-          (= cmd 2) (inventory-menu "wear" 
+          (= cmd 3)
+          (inventory-menu
+            "use"
+            (fn [o] o.use)
+            (fn [o] (o.use player o) (exit-dialogue)))
+          (= cmd 2)
+          (inventory-menu "wear"
             (fn [o] (if (or o.wear o.weapon) true)) 
             (fn [o] (wear player o) (exit-dialogue)))
           (= cmd 4) (equipment-menu "remove" identity (fn [o] (unwear player o) (exit-dialogue)))

+ 7 - 1
monsters.fnl

@@ -68,6 +68,11 @@
 
 ; items
 
+(fn item-heal [n msg]
+  (lambda [player item]
+    ; TODO msg
+    (set player.hp (math.min (+ player.hp n) player.maxhp))))
+
 (var base-item {
   :name "thing"
   :color 15
@@ -77,7 +82,8 @@
 (var item-map [
   {:name :key
     :color 14
-    :sprite 3}
+    :sprite 3
+    :use (item-heal 5 "you eat the key. +5 HP")}
   {:name :gold
     :color 14
     :sprite 4