Adding more of the nighttime puzzle.

desktop/src-common/advent/screens/items.clj

@@ -1,15 +1,6 @@
 (ns advent.screens.items
   (:require [advent.actions :as actions]))
 
-
-(declare stick)
-(declare wool)
-(declare cat-toy)
-(declare flask-1-with-milk)
-(declare slobber)
-(declare flask-1-strength)
-(declare flask-1-with-cream-of-mushroom)
-
 (def make-cat-toy
   (actions/get-script entities
                       (actions/remove-item entities :stick)
@@ -17,12 +8,6 @@
                       (actions/give entities :cat-toy)
                       (actions/talk entities :ego "It makes a little cat toy!")))
 
-(def wool {:name "Wool" :value :wool :cursor :wool :scripts {:stick make-cat-toy}})
-(def mushrooms {:name "Mushrooms" :value :mushrooms :cursor :mushrooms})
-(def carrot {:name "Carrot" :value :carrot :cursor :carrot})
-
-(def flask-1-with-mushrooms {:name "Flask with mushrooms" :value :flask-1-with-mushrooms :cursor :flask-with-contents}) 
-
 (defn make-cream-of-mushroom [entities]
   (actions/remove-item entities :flask-1-with-mushrooms)
   (actions/remove-item entities :flask-1-with-milk)
@@ -30,30 +15,6 @@
   (actions/give entities :flask-1-with-cream-of-mushroom)
   (actions/talk entities :ego "It's just like cream of mushroom soup."))
 
-(def flask-1-strength {:name "Strength potion" :value :flask-1-strength :cursor :flask-with-strength}) 
-(def flask-1 {:name "Flask" :value :flask-1 :cursor :flask
-              :scripts {:mushrooms (actions/get-script entities
-                                                      (actions/remove-item entities :flask-1)
-                                                      (actions/remove-item entities :mushrooms)
-                                                      (actions/give entities :flask-1-with-mushrooms)
-                                                      (actions/talk entities :ego "I'll just put a few of these in here."))}})
-
-(def trophy {:name "Trophy of wisdom" :value :trophy :cursor :trophy})
-(def cheat-deck {:name "Warlock's Tower cheat deck" :value :cheat-deck :cursor :cheat-deck})
-
-(def cat-toy {:name "Cat toy" :value :cat-toy :cursor :cat-toy})
-(def stick {:name "Stick" :value :stick :cursor :stick :scripts {:wool make-cat-toy}})
-(def balloon {:name "Choicest of balloons" :value :balloon :cursor :balloon})
-(def frog-legs {:name "Frog legs" :value :frog-legs :cursor :frog-legs})
-(def ladder {:name "ladder" :value :ladder :cursor :ladder})
-(def teddy {:name "Teddy Bear" :value :teddy :cursor :teddy})
-(def portrait {:name "Portrait" :value :portrait :cursor :portrait})
-(def recipe {:name "Strength potion recipe" :value :recipe :cursor :recipe})
-
-(def glass-eye {:name "Choicest of glass eyes" :value :glass-eye :cursor :glass-eye})
-(def motivational-tapes {:name "Choicest motivational tapes" :value :motivational-tapes :cursor :motivational-tapes})
-(def used-earplugs {:name "Choicest used earplugs" :value :used-earplugs :cursor :used-earplugs})
-(def grass {:name "Huge grass" :value :grass :cursor :grass})
 
 (defn add-slobber []
   (actions/get-script entities
@@ -70,6 +31,12 @@
                       (actions/talk entities :ego "It's the completed strength potion!")))
 
 
+(defn make-water-and-ash []
+  (actions/get-script entities
+                      (actions/remove-item entities :flask-water)
+                      (actions/remove-item entities :ash)
+                      (actions/give entities :flask-water-ash)
+                      (actions/talk entities :ego "I added the ashes to the water.")))
 
 (def items
   {:wool {:name "Wool" :value :wool :cursor :wool :scripts {:stick make-cat-toy}}
@@ -115,4 +82,9 @@
    :key {:name "Jail key" :value :key :cursor :key}
    :rope {:name "Rope" :value :rope :cursor :rope}
    :crowbar {:name "Crowbar" :value :crowbar :cursor :crowbar}
+   :flask-2 {:name "Flask" :value :flask-2 :cursor :flask}
+   :flask-water {:name "Water from fountain" :value :flask-water :cursor :flask :scripts {:ash (make-water-and-ash)}}
+   :flask-water-ash {:name "Water and ashes" :value :flask-water-ash :cursor :flask-with-contents}
+   :note-1 {:name "Note from Gandarf" :value :note-1 :cursor :note-1}
+   :ash {:name "Ashes" :value :ash :cursor :ash :scripts {:flask-water (make-water-and-ash)}}
    })