diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index df966f30..5046a311 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -765,7 +765,7 @@ (- (:total-time screen) (get-in entities [:room :entities :ego :anim-start]))))) (terminate [this screen entities] - entities) + (stop screen entities :ego)) (skip-type [this screen entities] :none))) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index b82a2137..78735627 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -376,7 +376,6 @@ :cursor :up :script (actions/get-script entities (actions/walk-to entities :ego [182 90] :face :left :skip-type :end) - (actions/play-animation entities :ego :reach) (if (= :night (get-in @entities [:state :time])) (actions/talk entities :ego "It's locked.") diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 1e9d1d36..31022677 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -629,6 +629,8 @@ void main() :anim-merges {(get-in ego [:right :shock]) {:origin-x 15} (get-in ego [:left :swing-shovel]) {:origin-x 26} (get-in ego [:right :swing-shovel]) {:origin-x 26} + (get-in ego [:left :glad]) {:origin-x 11} + (get-in ego [:right :glad]) {:origin-x 11} (get-in ego [:right :standup]) {:origin-x 32} (get-in ego [:right :crawl]) {:origin-x 32} (get-in ego [:right :crawl-hide]) {:origin-x 32}