diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index cf2c6f26..d7ee5715 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -110,9 +110,6 @@ (defn stop [screen entities target-id & {:keys [face]}] (update-in entities [:room :entities target-id] (comp #(start-animation screen % :stand) (if face #(assoc % :facing face) identity)))) - - - (defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed]}] (let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id]) final-x (int final-x) diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 19ada04a..1a854290 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -136,7 +136,8 @@ (actions/remove-item entities :teddy))) (actions/walk-to entities :ego [222 3]) - (actions/transition-background entities :inside-castle [182 90]))} + (actions/transition-background entities :inside-castle [182 90]) + (actions/walk-to entities :ego [187 75]))} :window {:box [212 130 256 180] :script (actions/get-script entities (actions/talk entities :ego "It's a nice, big window.")) @@ -207,6 +208,9 @@ (if (or (actions/has-item? entities :teddy) (actions/has-obtained? entities :balloon)) (update-in entities [:room :entities] #(dissoc % :teddy)) + entities) + (if (actions/has-item? entities :portrait ) + (update-in entities [:room :entities] #(dissoc % :portrait)) entities))) :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50) :start-pos [222 3])))