From a21d0cb6f353b60aaec439d520db9d0081b3f7c7 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Thu, 2 Oct 2014 12:26:29 -0700 Subject: [PATCH] the sheep can move closer to the player now. --- desktop/resources/cursor.png | Bin 2257 -> 2271 bytes .../resources/outside-castle/collision.png | Bin 5654 -> 5825 bytes desktop/resources/outsidehouse/collision.png | Bin 6350 -> 6350 bytes desktop/src-common/advent/actions.clj | 42 ++++++++++++++++++ desktop/src-common/advent/screens/scene.clj | 15 ++++++- desktop/src-common/advent/utils.clj | 2 +- 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index b1f3bfa5783b9ecdbff8ced219e5316b1ca603f7..92337a7336cd9094471fd032daeff200c596976a 100644 GIT binary patch delta 1180 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
~0Pk$_bGh6uNP4H2Wz;!HS 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 delta 4590 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 W?Op9>Zk&KYkGYApafPAhwSNMgJff%o diff --git a/desktop/resources/outsidehouse/collision.png b/desktop/resources/outsidehouse/collision.png index c2c63c56ddb4242a8b92e4759f9e560c982aad1e..e1397b3e5e372deebd6fc89d4b0b0cc15d449585 100644 GIT binary patch delta 5282 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 delta 5266 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 YC0q%1Tv{%#19rC5aGENGSiIlA08BkUvH$=8 diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index ca2cfb1a..1c61d877 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -67,6 +67,48 @@ ~@forms)) (reset! ~entities ( entities + (assoc-in [:background :entities target-id :x] final-x) + (assoc-in [:background :entities target-id :y] final-y)) + (update-in entities [:background :entities target-id] + #(start-animation screen + (assoc (jump-to screen entities % [(+ moved-x from-x) (+ moved-y from-y)]) + :facing (cond (< delta-x 0) :left + (> delta-x 0) :right + :else (:facing %))) + :walk + )))))) + + (done? [this screen entities] + (let [{from-x :x from-y :y :keys [left right anim] :as target-entity} (get-in entities [:background :entities target-id])] + (< (dist final-x final-y from-x from-y) 1))) + + (terminate [this screen entities] + (stop screen entities target-id)) + (can-skip? [this screen entities] + false)))) + (defn walk-to [entities target-id [final-x final-y] & [can-skip?]] (let [{start-x :x start-y :y} (get-in @entities [:background :entities target-id]) final-x (int final-x) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 2302adce..d7620cf5 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -322,7 +322,11 @@ (do (actions/give entities :wool) (actions/talk entities :ego "I guess her wool is shedding.")))) :scripts {:wool (actions/get-script entities - (actions/talk entities :ego "She doesn't need it back."))}} + (actions/talk entities :ego "She doesn't need it back.")) + :carrot (actions/get-script entities + (actions/walk-to entities :ego [132 140]) + (actions/talk entities :ego "Come on girl, get the carrot!") + (actions/walk-straight-to entities :sheep [100 150]))}} :right-dir {:box [300 131 320 224] :script (actions/get-script entities @@ -410,6 +414,15 @@ (actions/walk-to entities :ego [310 80]) (actions/transition-background entities :outside-house [0 80])) :cursor :right} + :garden {:box [103 170 178 200] + :script (actions/get-script + entities + (if ((get-in @entities [:state :inventory]) :carrot) + (actions/talk entities :ego "If I steal any more, I might get caught.") + (do + (actions/walk-to entities :ego [128 180]) + (actions/talk entities :ego "Hey! Carrots. No one will notice one missing.") + (actions/give entities :carrot))))} :peddler {:box [110 90 128 146] :script (actions/get-script entities diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 23c113c4..b3c27dfa 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -11,7 +11,7 @@ (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})] (println (:input-x screen) (:input-y screen) "->" x y))) -(def +all-cursors+ [:main :wool :mushrooms :talk :right :down :left :up]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up]) (defn cursor [filename which] (let [scale 2