made it easier to click on things.

desktop/resources/packed/pack.atlas

@@ -165,13 +165,6 @@ cat-tree/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-inside-antique/dot
-  rotate: false
-  xy: 704, 916
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
 inside-house/dot
   rotate: false
   xy: 704, 916
@@ -179,20 +172,6 @@ inside-house/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-dream/dot
-  rotate: false
-  xy: 704, 916
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-ego/dot
-  rotate: false
-  xy: 704, 916
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
 outsidehouse/dot
   rotate: false
   xy: 704, 916
@@ -200,7 +179,14 @@ outsidehouse/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-inside-jail/dot
+inside-antique/dot
+  rotate: false
+  xy: 704, 916
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+ego/dot
   rotate: false
   xy: 704, 916
   size: 1, 1
@@ -214,6 +200,20 @@ title/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
+dream/dot
+  rotate: false
+  xy: 704, 916
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+inside-jail/dot
+  rotate: false
+  xy: 704, 916
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
 wizard/dot
   rotate: false
   xy: 704, 916

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

@@ -125,8 +125,10 @@
                  (get-in entities [:room :interactions]))) )
 
 (defn get-interacting-entity [entities x y]
-  (let [interactable-entities (if (= (doto (get-selected-inventory-item)
+  (let [interactable-entities (if (or (= (doto (get-selected-inventory-item)
-                                       (#(log/info "clicked with " %)) ) :main)
+                                           (#(log/info "clicked with " %)) )
+                                         :main)
+                                      (not (get-selected-inventory-item)))
                                 (vals (dissoc (get-in entities [:room :entities]) :ego))
                                 (vals (get-in entities [:room :entities])))
         interacting-entity (first (sort-by (comp - :baseline)
@@ -149,6 +151,7 @@
                    (skip-action screen entities)
                    entities)]
 
+    (log/info "clicked interaction" interaction "entity" (:id interacting-entity))
 
     (when (and (not (get-in entities [:fg-actions :script-running?])))
       ((or (when (and (not (:override-cursor interaction))
@@ -1489,8 +1492,9 @@
 
 (defn get-selected-inventory-item []
   (let [{{:keys [state state-data]} :inv-fsm} (-> hud :entities deref)]
-    (and (= state :selected)
+    (if (= state :selected)
-         state-data)))
+      state-data
+      nil)))
 
 (defscreen demo
   :on-show