From 10d13f9396882646e2e5d27242a3de3fe9af599c Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 31 Dec 2014 13:51:51 -0800 Subject: [PATCH] You can get the split second. --- desktop/resources/cursor.png | Bin 8519 -> 8757 bytes desktop/src-common/advent/screens/items.clj | 4 +- .../advent/screens/rooms/inside_castle.clj | 25 ++++++++++- .../advent/screens/rooms/outside_jail.clj | 40 ++++++++++++++++-- desktop/src-common/advent/utils.clj | 2 +- 5 files changed, 64 insertions(+), 7 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 0b75b294ca4120485c23b396c093e5986df5fbca..4f1ee414ca36d1e05b46104c0c9dd7e426ea6d33 100644 GIT binary patch delta 7718 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 entities (update-in [:room :entities] #(dissoc % :game-player)) - add-monocle-if-necessary)) + add-monocle-if-necessary + add-watch-if-necessary)) (defn make [screen] (let [game-player-talk-sheet (texture! (texture "inside-castle/game-player-talk.png") :split 40 44) @@ -343,6 +349,21 @@ (actions/remove-entity entities :monocle) (actions/give entities :monocle) (actions/talk entities :ego "It looks like a monocle."))})) + :watch (rooms/make-entity :watch (assoc (texture "inside-castle/watch.png") + :x 282 :y 62 :baseline 140 + :script (actions/get-script entities + + (actions/talk entities :ego "There's something on that chair.") + (actions/walk-to entities :ego [265 90] :face :right) + (actions/walk-straight-to entities :ego [303 80]) + (actions/walk-straight-to entities :ego [302 48]) + (actions/play-animation entities :ego :squat) + (actions/remove-entity entities :watch) + (actions/give entities :watch) + (actions/do-dialogue entities :ego "It's a watch." + :ego "Brian O'Brainy must have left it behind.") + (actions/walk-straight-to entities :ego [303 80]) + (actions/walk-straight-to entities :ego [265 90])))) :collision "inside-castle/collision.png" :scale-fn (utils/scaler-fn-from-image "inside-castle/scale.png" 0.25 1.00) :apply-state (fn [entities] diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 7193c4b0..006e4166 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -15,10 +15,18 @@ (assoc-in entities [:room :entities :spear] (get-in entities [:room :spear])) entities)) +(defn add-watch-if-necessary [entities] + (if (and (not (actions/has-obtained? entities :broken-watch)) + (not (actions/has-item? entities :watch)) + (actions/has-obtained? entities :watch)) + (assoc-in entities [:room :entities :watch] (get-in entities [:room :watch])) + entities)) + (defn make-night [entities] (-> entities (assoc-in [:room :entities :guard] (get-in entities [:room :guard])) - add-spear-if-necessary)) + add-spear-if-necessary + add-watch-if-necessary)) (defn search-guard [entities] (actions/walk-to entities :ego [121 75] :face :left) @@ -81,7 +89,25 @@ :ego "That's Captain McHulk's house!" :ego "He's the mightiest knight in all of Remington." :ego "If only I could be as strong as him one day." - ))}} + ))} + :stump {:box [205 68 251 89] + :script (actions/get-script entities + (actions/do-dialogue entities :ego "It's a stump.")) + :scripts {:watch (actions/get-script entities + (actions/walk-to entities :ego [189 65] :face :right) + (actions/play-animation entities :ego :reach) + (actions/remove-item entities :watch) + (actions/add-entity entities :watch (get-in @entities [:room :watch]))) + :sword (actions/get-script entities + (when (get-in @entities [:room :entities :watch]) + (actions/walk-to entities :ego [129 65] :face :right) + (actions/talk entities :ego "I'll take a big swing!") + (actions/walk-straight-to entities :ego [189 65] :face :right :speed 3.5) + (actions/play-animation entities :ego :swing) + (actions/talk entities :ego "It's split right down the middle!") + (actions/play-animation entities :ego :reach) + (actions/remove-entity entities :watch) + (actions/give entities :broken-watch)))}}} :layers {:day [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)] :night [(assoc (texture "outside-jail/background-dark.png") :x 0 :y 0 :baseline 0)]} :entities {:fountain (assoc (animation->texture screen fountain) @@ -105,7 +131,8 @@ :y 86 :width 10 :height 10 - :talk-color (color 0.9 0.3 0.9 1.0)}} + :talk-color (color 0.9 0.3 0.9 1.0)} + } :guard (rooms/make-entity :guard (assoc (animation->texture screen guard-stand) :x 70 :y 55 :baseline 185 :stand guard-stand @@ -115,6 +142,13 @@ :spear (rooms/make-entity :spear (assoc (texture "outside-jail/spear.png") :x 60 :y 65 :baseline 180 :script (actions/get-script entities (grab-spear entities)))) + :watch (rooms/make-entity :watch (assoc (texture "inside-castle/watch.png") + :x 217 :y 83 :baseline 160 + :script (actions/get-script entities + (actions/walk-to entities :ego [189 65] :face :right) + (actions/play-animation entities :ego :reach) + (actions/remove-entity entities :watch) + (actions/give entities :watch)))) :collision "outside-jail/collision.png" :scale-fn (utils/scaler-fn-with-baseline 40 0.001 1.3) :start-pos [145 15] diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index ef22a30c..eac82432 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -14,7 +14,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 :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :watch :broken-watch]) (defn cursor [filename which] (let [scale 2