diff --git a/desktop/in-jail.edn b/desktop/in-jail.edn index cc634291..af33b29c 100644 --- a/desktop/in-jail.edn +++ b/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} diff --git a/desktop/resources/inside-antique/background.psd b/desktop/resources/inside-antique/background.psd index 89d01e75..a2716910 100644 Binary files a/desktop/resources/inside-antique/background.psd and b/desktop/resources/inside-antique/background.psd differ diff --git a/desktop/resources/inside-antique/glow.png b/desktop/resources/inside-antique/glow.png new file mode 100644 index 00000000..9bb25978 Binary files /dev/null and b/desktop/resources/inside-antique/glow.png differ diff --git a/desktop/resources/inside-cafeteria/background.psd b/desktop/resources/inside-cafeteria/background.psd index 70975d8a..3b0e4c2a 100644 Binary files a/desktop/resources/inside-cafeteria/background.psd and b/desktop/resources/inside-cafeteria/background.psd differ diff --git a/desktop/resources/inside-cafeteria/glow.png b/desktop/resources/inside-cafeteria/glow.png new file mode 100644 index 00000000..e32f3dba Binary files /dev/null and b/desktop/resources/inside-cafeteria/glow.png differ diff --git a/desktop/resources/inside-house/background.psd b/desktop/resources/inside-house/background.psd index ae90a924..6c121998 100644 Binary files a/desktop/resources/inside-house/background.psd and b/desktop/resources/inside-house/background.psd differ diff --git a/desktop/resources/inside-house/desk.png b/desktop/resources/inside-house/desk.png index e5b39c84..13161aca 100644 Binary files a/desktop/resources/inside-house/desk.png and b/desktop/resources/inside-house/desk.png differ diff --git a/desktop/resources/inside-jail/background.png b/desktop/resources/inside-jail/background.png index 064e486e..7ced04f8 100644 Binary files a/desktop/resources/inside-jail/background.png and b/desktop/resources/inside-jail/background.png differ diff --git a/desktop/resources/inside-jail/fg.png b/desktop/resources/inside-jail/fg.png new file mode 100644 index 00000000..923f11d0 Binary files /dev/null and b/desktop/resources/inside-jail/fg.png differ diff --git a/desktop/resources/inside-jail/glow.png b/desktop/resources/inside-jail/glow.png index 41e853f8..ae2b4fb6 100644 Binary files a/desktop/resources/inside-jail/glow.png and b/desktop/resources/inside-jail/glow.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index f78144bb..900dd7a7 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/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 diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 3eda3237..4649bd29 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/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 diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 80cbade7..2583a8fd 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/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] diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 16c03a91..ffc554be 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/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