diff --git a/desktop/resources/inside-jail/background.png b/desktop/resources/inside-jail/background.png index 7ced04f8..5c7e712a 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/bars.png b/desktop/resources/inside-jail/bars.png index 5c38df21..c57b5386 100644 Binary files a/desktop/resources/inside-jail/bars.png and b/desktop/resources/inside-jail/bars.png differ diff --git a/desktop/resources/inside-jail/chest-top-open.png b/desktop/resources/inside-jail/chest-top-open.png new file mode 100644 index 00000000..b7a78bee Binary files /dev/null and b/desktop/resources/inside-jail/chest-top-open.png differ diff --git a/desktop/resources/inside-jail/chest-top.png b/desktop/resources/inside-jail/chest-top.png new file mode 100644 index 00000000..d2a34450 Binary files /dev/null and b/desktop/resources/inside-jail/chest-top.png differ diff --git a/desktop/resources/inside-jail/crowbar.png b/desktop/resources/inside-jail/crowbar.png index f50354da..293f9328 100644 Binary files a/desktop/resources/inside-jail/crowbar.png and b/desktop/resources/inside-jail/crowbar.png differ diff --git a/desktop/resources/outside-castle/background.psd b/desktop/resources/outside-castle/background.psd index 1bda5984..e76c55a5 100644 Binary files a/desktop/resources/outside-castle/background.psd and b/desktop/resources/outside-castle/background.psd differ diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 346628b6..3d3af7dd 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -33,12 +33,19 @@ (cond (not (chest-full? entities)) (do (actions/walk-to entities :ego [192 66] :face :right) - (actions/play-animation entities :ego :reach) - (actions/do-dialogue entities :ego "It's empty now.")) + (actions/play-animation entities :ego :reach-start :stop? false) + (actions/play-animation entities :chest-top :open) + (actions/play-animation entities :ego :reach-stop) + (actions/do-dialogue entities :ego "It's empty now.") + (actions/play-animation entities :ego :reach-start :stop? false) + (actions/play-animation entities :chest-top :close) + (actions/play-animation entities :ego :reach-stop)) (get-in @entities [:state :opened-bars?]) (do (actions/walk-to entities :ego [192 66] :face :right) - (actions/play-animation entities :ego :reach) + (actions/play-animation entities :ego :reach-start :stop? false) + (actions/play-animation entities :chest-top :open) + (actions/play-animation entities :ego :reach-stop) (actions/do-dialogue entities :ego "Hey!" :ego "All my possessions are in here!") @@ -47,7 +54,11 @@ (assoc :chest-contents []))) (when (not (actions/has-obtained? entities :rope)) (actions/give entities :rope) - (actions/do-dialogue entities :ego "Looks like there's some rope in here too."))) + (actions/do-dialogue entities :ego "Looks like there's some rope in here too.")) + (actions/play-animation entities :ego :reach-start :stop? false) + (actions/play-animation entities :chest-top :close) + (actions/play-animation entities :ego :reach-stop) + ) :else (do (actions/walk-to entities :ego [179 81] :face :right) @@ -156,6 +167,7 @@ (do (actions/talk entities :ego "One more try.") (actions/play-animation entities :ego :squat) + (actions/play-animation entities :ego :sigh) (actions/do-dialogue entities :ego "You know, in some games, you have to try multiple times." :ego "But I have a feeling each time you click on this hay, I'm going to find nothing." @@ -169,12 +181,14 @@ (actions/walk-to entities :ego [279 57]) (if (chest-full? entities) (actions/talk entities :ego "I probably shouldn't leave without my belongings.") - (do (actions/transition-background entities :outside-jail [50 46] ) + (do (actions/transition-background entities :outside-jail [50 46] :face :right) (when (not (get-in @entities [:state :dropped-ball?])) (actions/do-dialogue entities :ego "Yes I made it!" :guard "Hmm?" :guard "Halt! Thou art under arrest!" :guard "Thou wilst be putteth back into thy cell.") + (actions/play-animation entities :ego :sigh) + (common/go-to-jail entities) (actions/do-dialogue entities :ego "Dang! I was so close to freedom, I could taste it!"))))) (actions/talk entities :ego "Do you really think I can walk down those steps while I'm locked up?"))) @@ -207,7 +221,9 @@ (actions/walk-to entities :ego [102 88] :face :right) (actions/do-dialogue entities :ego "What a peaceful night." - :ego "Oh my sweet Georgia McGorgeous. How will I ever save you now?" + :ego "Oh my sweet Georgia McGorgeous. How will I ever save you now?") + (actions/in-love entities) + (actions/do-dialogue entities :ego "I have to find a way out of here!")) :scripts {:crowbar (actions/get-script entities (if (get-in @entities [:state :bent-bars?]) @@ -305,6 +321,12 @@ :ego "That's pretty gruesome." :ego "I can't kill him just for doing his job.")) :rope (actions/get-script entities (tie-up-warden entities))}) + :chest-top (assoc (texture "inside-jail/chest-top.png") + :x 193 :y (- 240 165) :baseline 166 + :origin-x 0 :origin-y 0 + :night-profile :none + :open (animation 0.8 [(texture "inside-jail/chest-top-open.png")]) + :close (animation 0.8 [(texture "inside-jail/chest-top.png")])) :ball-n-chain (assoc (texture "inside-jail/ball-n-chain.png") :x 80 :y 80 :baseline 160 :night-profile :none