diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 7b2961ac..bb4674b2 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -25,8 +25,6 @@ AUDIO + strength potion + metal clanking + jail door sliding open - + jail creak - + pit go down + ladder break + eavesdrop + milking diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index 00289f71..ce6a0389 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -902,13 +902,13 @@ (dotimes [n length] (actions/do-pan entities (get-in @entities [:cam :x]) (+ (get-in @entities [:cam :y]) - 5) + 3) (constantly (get-in @entities [:cam :zoom])) nil (* 0.01 (inc n))) (actions/do-pan entities (get-in @entities [:cam :x]) (- (get-in @entities [:cam :y]) - 5) + 3) (constantly (get-in @entities [:cam :zoom])) nil (* 0.01 (inc n))))) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index e4b9e740..1ec82a1b 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -96,6 +96,8 @@ (actions/walk-to entities :ego [141 90] :face :right) (actions/play-animation entities :ego :reach) (actions/remove-item entities :money) + (actions/camera-shake entities 2) + (Thread/sleep 500) (actions/talk entities :ego "I guess that's what you could call 'money in the pot'.")) (actions/talk entities :ego "I don't want to put something in there unless I'm sure I need to."))) :slingshot (actions/get-script entities @@ -105,7 +107,9 @@ (dawn-fade entities) (actions/talk entities :ego "Here goes!") (actions/play-animation entities :ego :reach-start :stop? false) + (actions/camera-shake entities 12) (magic entities) + (actions/play-animation entities :ego :reach-stop :stop? true) (actions/remove-item entities :slingshot) @@ -137,6 +141,8 @@ (actions/walk-to entities :ego [141 90] :face :right) (actions/play-animation entities :ego :reach) (actions/remove-item entities :broken-clock) + (actions/camera-shake entities 2) + (Thread/sleep 500) (actions/talk entities :ego "Just in the nick of time.")) (actions/talk entities :ego "I don't want to put something in there unless I'm sure I need to."))) :recipe (actions/get-script entities @@ -149,6 +155,8 @@ (actions/walk-to entities :ego [141 90] :face :right) (actions/play-animation entities :ego :reach) (actions/remove-item entities :spell-component) + (actions/camera-shake entities 2) + (Thread/sleep 500) (actions/talk entities :ego "I poured it in. Now what?")) (actions/get-script entities (actions/talk entities :ego "I don't want to put something in there unless I'm sure I need to."))))