additive to the max

desktop/in-jail.edn

@@ -1 +1 @@
-{:active? true, :convinced-wizard? true, :inventory [] :chest-contents [:ladder :glass-eye :recipe :grass :medal :kiss :trophy :flask-1-strength :sword ], :wizard-left? false, :clues #{},  :current-riddle :wool,  :last-room :inside-jail, :wants-toy true, :mints-eaten 0, :object nil, :obtained-items #{:kiss :medal :sword :flask-1 :grass :ladder :trophy} :time :night}
+{:active? true, :seen-intro? true, :convinced-wizard? true, :inventory [] :chest-contents [:ladder :glass-eye :recipe :grass :medal :kiss :trophy :flask-1-strength :sword ], :wizard-left? false, :clues #{},  :current-riddle :wool,  :last-room :inside-jail, :wants-toy true, :mints-eaten 0, :object nil, :obtained-items #{:kiss :medal :sword :flask-1 :grass :ladder :trophy} :time :night}

desktop/src-common/advent/screens/rooms/inside_antique.clj

@@ -167,7 +167,8 @@
                                                                          :ego "He's the town of Remington's mascot."))}
                  }
                 :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)
-                         (assoc (texture "inside-antique/fg.png") :x 0 :y 0 :baseline 320 :parallax 1.5)]
+                         (assoc (texture "inside-antique/fg.png") :x 0 :y 0 :baseline 320 :parallax 1.5)
+                         (assoc (texture "inside-antique/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.3)]
                 :entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 148 :y 122 :baseline 112 
                                                                             :stand shopkeep-stand
                                                                             :scale-x 1.6

desktop/src-common/advent/screens/rooms/inside_cafeteria.clj

@@ -166,7 +166,9 @@
                  }
                 :layers [(assoc (texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0)
                          (assoc (texture "inside-cafeteria/doorway.png") :x 306 :y 34 :baseline 202)
-                         (assoc (texture "inside-cafeteria/fg.png") :x 10 :y 0 :scale-x 1.1 :scale-y 1.0 :baseline 320 :parallax 1.5)]
+                         (assoc (texture "inside-cafeteria/glow.png") :y 0 :baseline 240 :additive? true :opacity 0.3)
+                         (assoc (texture "inside-cafeteria/fg.png") :x 10 :y 0 :scale-x 1.1 :scale-y 1.0 :baseline 320 :parallax 1.5)
+                         ]
                 :entities {
                            :warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 8 :y 19  :baseline 180 
                                                                             

desktop/src-common/advent/screens/rooms/inside_jail.clj

@@ -230,7 +230,8 @@
                                       :script (actions/get-script entities (leave entities))}}
                 :layers [(assoc (texture "inside-jail/background.png") :x 0 :y 0 :baseline 0)
                          (assoc (texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165)
-                         (assoc (texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240)]
+                         (assoc (texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.35)
+                         (assoc (texture "inside-jail/fg.png") :x 0 :y 5 :baseline 241 :parallax 1.5 )]
                 :hotspots [{:box [121 40 258 44]
                             :fn (fn [screen entities]
 

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

@@ -78,7 +78,7 @@
           interacting-entity (first (sort-by (comp - :baseline) (filter #(and (:mouse-in? %)
                                                                               (:get-script %)
                                                                               ((:mouse-in? %) entities x y))
-                                                                        (vals (get-in entities [:room :entities])))))
+                                                                        (vals (dissoc  (get-in entities [:room :entities]) :ego)))))
           current-action (get-in entities [:actions :current])
           
           ;; TODO - hacky way of resetting queue