From 83cbcbb2311543f235677fc79876d29e60a9961c Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 20 Nov 2015 09:31:43 -0800 Subject: [PATCH 1/2] less akward walk to sheep. --- desktop/src-common/advent/screens/rooms/outside_house.clj | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 4920286a..8875bd11 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -66,11 +66,7 @@ (not (actions/has-item? entities :money)))) (defn walk-to-sheep [entities] - (actions/walk-to entities :ego [154 133] :skip-type :end) - (actions/walk-straight-to entities :ego [119 134] :update-baseline? false)) - -(defn leave-sheep [entities] - (actions/walk-straight-to entities :ego [154 133] :update-baseline? false)) + (actions/walk-to entities :ego [119 134] :skip-type :end)) (defn magic [entities] (actions/run-action entities From 20d343291ddd3056f59b4f411fb4d57d551771fb Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 20 Nov 2015 09:33:08 -0800 Subject: [PATCH 2/2] safe volumes are reasonable. --- desktop/src-common/advent/screens/safe.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/src-common/advent/screens/safe.clj b/desktop/src-common/advent/screens/safe.clj index f1ab2efd..454dff80 100644 --- a/desktop/src-common/advent/screens/safe.clj +++ b/desktop/src-common/advent/screens/safe.clj @@ -67,7 +67,7 @@ entities) :show-screen (fn [{:keys [success failure]} [entities]] - (sound! (utils/load-sound "inside-house/open-safe.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "inside-house/open-safe.ogg") :play (utils/current-sound-volume 0.3)) (assoc entities :shown? true :button-choices [] @@ -81,7 +81,7 @@ (when (:shown? entities) (let [[x y] (utils/unproject screen)] (if-let [button (get-button [x y])] - (do (sound! (:sound button) :play (utils/current-sound-volume)) + (do (sound! (:sound button) :play (utils/current-sound-volume 0.3)) (let [new-state (update-in entities [:button-choices] #(conj % (:id button)))] (cond (= [4 2 1 5 3] (:button-choices new-state)) @@ -103,7 +103,7 @@ (< y start-y) (> y (+ start-y 75))) (do - (sound! (utils/load-sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume 0.3)) (close entities))))))) :on-resize (fn [{:keys [width height viewport]} entities]