diff --git a/desktop/settings.edn b/desktop/settings.edn index c5d36dd7..e6723941 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 69.0, :music-volume 86.0} \ No newline at end of file +{:sound-volume 67.0, :music-volume 86.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index e9434d8f..b9bcce6c 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -102,7 +102,7 @@ :night-profile :sprite :scale-x 1.4 :scale-y 1.4 - :talk-color (color 0.6 0.2 0.6 1.0) + :talk-color common/frankie-color :talk talk :flex flex :stand stand @@ -215,6 +215,7 @@ (defn attempt-walking-through-gate [entities] (actions/walk-to entities :ego [157 83] :skip-type :end) + (actions/walk-straight-to entities :ego [100 83]) (actions/transition-background entities :inside-castle [280 145]) (actions/walk-to entities :ego [245 90] :skip-type :end)) @@ -251,8 +252,6 @@ :script (actions/get-script entities (attempt-walking-through-gate entities)) :cursor :left} - :big-tree {:box [20 10 82 235] - :scripts {:walkie-talkies (actions/get-script entities (drop-walkie-talkie entities))}} :window {:box [192 157 215 215] :script (actions/get-script entities (actions/talk entities :ego "That's a big window!")) @@ -269,8 +268,10 @@ (Thread/sleep 2000) (actions/walk-straight-to entities :ego [285 71]))}}} - :layers {:day [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0)] - :night [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0)]} + :layers {:day [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)] + :night [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)]} :entities {:frankie (make-frankie screen) :goon-1 (make-goon-1 screen) :goon-2 (make-goon-2 screen) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 7d581ea6..de9bdf22 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -11,7 +11,8 @@ [play-clj.ui :refer :all] [play-clj.utils :refer :all] [play-clj.math :refer :all] - [play-clj.g2d :refer :all])) + [play-clj.g2d :refer :all]) + (:import [com.badlogic.gdx.graphics Color])) (defn go-to-jail [entities] @@ -86,16 +87,18 @@ :ego "'Also, you'll need to add a split second.'" :ego "'Then, dip the Slinger's Shot in to complete the spell.'" :ego "'Don't forget about my secret stash of helpful stuff.'")) +(def frankie-color (Color/valueOf "9907CFFF")) (defn listen-to-frankie [entities] (let [respond (fn [msg] - (actions/talk entities :ego msg :animate? false :stop? false :color (color 0.6 0.2 0.6 1.0)) + (actions/talk entities :ego msg :animate? false :stop? false :color frankie-color) (Thread/sleep 200)) talk (fn [msg] (actions/talk entities :ego msg :animate? false :stop? false) (Thread/sleep 200))] (talk "Hello?") - (respond "Who said that?!") + (respond "What the?! A walkie-talkie?") + (respond "Who's there?") (actions/present-choices entities {:choices ["It's me, Tick!" {:run #(do