diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 8f372996..cf229434 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -14,13 +14,15 @@ (rooms/make :music :inside-antique :interactions {} :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/bars.png") :x 0 :y 0 :baseline 165) + (assoc (texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240)] :entities {:warden (assoc (texture "inside-jail/warden.png" ) :x 40 :y 60 :baseline 166 :talk-color (color 0.9 0.3 0.9 1.0) :script (actions/get-script entities (actions/do-dialogue entities :ego "Hey, who are you? Why am I in this cell?" - :warden "You're under arrest for theft of public property.")))} + :warden "You're under arrest for theft of public property." + :ego "Under arrest? But I'm the good guy!\nThe game is named after me!")))} :collision "inside-jail/collision.png" :scale-fn (utils/scaler-fn-with-baseline 0 0.50 1.5) :start-pos [130 85])) diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index ed1582ec..f52300c7 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -53,7 +53,9 @@ (actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0) (actions/do-dialogue entities :ego "Ouch!" :blergh "My turn.") - (actions/transition-background entities :inside-jail [100 100]))})) + (actions/transition-background entities :inside-jail [130 85]) + (actions/do-dialogue entities :ego "Hey!" + :ego "What's going on? I was just about to teach Blergh a lesson!"))})) :entities {} :collision "space/collision.png" :scale-fn (constantly 1.5)