From fc54f77882f50f2b8125920c195c8a6be47576d1 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 28 Dec 2014 12:30:43 -0800 Subject: [PATCH] you can get a sack lunch. --- desktop/resources/cursor.png | Bin 7604 -> 7692 bytes desktop/src-common/advent/screens/items.clj | 1 + .../advent/screens/rooms/outside_jail.clj | 21 +++++++++++++----- desktop/src-common/advent/utils.clj | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 549030961b8d06a4a95f6f1da5f06cd76754966f..13e09844c6acbb88a38a7e5550d934248bb25b46 100644 GIT binary patch delta 6454 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 I%P#!?0M6*Na{vGU delta 6363 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 Q;P){-Z)sF@&LjSR0GLx>KmY&$ diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index c7ed629e..940e8110 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -87,4 +87,5 @@ :flask-water-ash {:name "Water and ashes" :value :flask-water-ash :cursor :flask-with-contents} :note-1 {:name "Note from Gandarf" :value :note-1 :cursor :note-1} :ash {:name "Ashes" :value :ash :cursor :ash :scripts {:flask-water (make-water-and-ash)}} + :sack-lunch {:name "Sack lunch" :value :sack-lunch :cursor :sack-lunch} }) diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 316cdf3f..d1147ca4 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -14,6 +14,16 @@ (-> entities (assoc-in [:room :entities :guard] (get-in entities [:room :guard])))) +(defn search-guard [entities] + (actions/walk-to entities :ego [121 75] :face :left) + (actions/play-animation entities :ego :squat) + (if (actions/has-obtained? entities :sack-lunch) + (actions/talk entities :ego "He doesn't have anything else on him.") + (do (actions/do-dialogue entities + :ego "He has a sack lunch here." + :ego "Looks like it's pretty mangled from his spill.") + (actions/give entities :sack-lunch)))) + (defn make [screen] (let [fountain (utils/make-anim "outside-jail/fountain.png" [42 50] 0.2 (range 3)) guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) @@ -83,11 +93,12 @@ :width 10 :height 10 :talk-color (color 0.9 0.3 0.9 1.0)}} - :guard (assoc (animation->texture screen guard-stand) - :x 70 :y 55 :baseline 185 - :stand guard-stand - :talk guard-talk - :sleep guard-sleep) + :guard (rooms/make-entity :guard (assoc (animation->texture screen guard-stand) + :x 70 :y 55 :baseline 185 + :stand guard-stand + :talk guard-talk + :sleep guard-sleep + :script (actions/get-script entities (search-guard entities)))) :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 34e8454a..638b200e 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]) +(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]) (defn cursor [filename which] (let [scale 2