From cbc1497f74ae08edebfb5f3d46e4fd5cbb49cd13 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sat, 13 Dec 2014 10:35:48 -0800 Subject: [PATCH] more grandma refinement. --- desktop/resources/cat-tree/grandma.png | Bin 3159 -> 3658 bytes desktop/resources/cat-tree/grandma.pxa/0.pxi | Bin 264078 -> 264078 bytes desktop/resources/cat-tree/grandma.pxa/1.pxi | Bin 264078 -> 264078 bytes desktop/resources/cat-tree/grandma.pxa/2.pxi | Bin 264078 -> 264078 bytes desktop/resources/cat-tree/grandma.pxa/3.pxi | Bin 526471 -> 526471 bytes desktop/resources/cat-tree/grandma.pxa/4.pxi | Bin 264078 -> 264078 bytes desktop/resources/cat-tree/grandma.pxa/5.pxi | Bin 264078 -> 264078 bytes desktop/resources/cat-tree/grandma.pxa/6.pxi | Bin 264078 -> 264078 bytes desktop/resources/cat-tree/grandma.pxa/7.pxi | Bin 264078 -> 264078 bytes .../cat-tree/grandma.pxa/CelData.plist | 12 +++++ desktop/resources/cursor.png | Bin 5776 -> 5803 bytes desktop/src-common/advent/screens/items.clj | 3 +- .../advent/screens/rooms/cat_tree.clj | 42 +++++++++++------- .../advent/screens/rooms/inside_castle.clj | 9 ++-- desktop/src-common/advent/screens/scene.clj | 3 ++ desktop/src-common/advent/utils.clj | 2 +- 16 files changed, 46 insertions(+), 25 deletions(-) diff --git a/desktop/resources/cat-tree/grandma.png b/desktop/resources/cat-tree/grandma.png index 7d954840cd910799cd4e50d7b82206d97c7aa74a..274af61caa1e8a5f54a72eb141f213bc8d7fd5d0 100644 GIT binary patch delta 2614 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 1 + + duration + 1 + + + duration + 1 + + + duration + 1 + diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 8de2224311bcbb93df7ca0a5382aaec9784c9800..3648f35a7d4caa0a7408febd46a69a8537875312 100644 GIT binary patch delta 4739 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 RS+M{B002ovPDHLkV1j>RQ#b$s delta 4712 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 screen grandma-stand) @@ -93,9 +102,10 @@ :anim grandma-stand :anim-start 0 :talk grandma-talk - :cat-stand grandma-cat-stand + :kiss grandma-kiss :stand grandma-stand - :squat grandma-squat + :squat-1 grandma-squat-1 + :squat-2 grandma-squat-2 :origin-x 12 :origin-y 0 :scale-x 1.45 @@ -104,7 +114,7 @@ :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20) :apply-state (fn [entities] (as-> entities entities - (if (actions/has-item? entities :certificate) + (if (actions/has-item? entities :kiss) (update-in entities [:room :entities] #(dissoc % :cat)) entities))) :start-pos [203 1]))) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 2a62bb88..b38663d9 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -106,7 +106,7 @@ (actions/talk entities :ego "I got it! I will become the greatest knight Remington has ever known!")) (defn try-to-pull-sword [entities missing-items obtained-items] - (let [item->proof {:trophy "wisdom" :medal "strength" :certificate "courage"}] + (let [item->proof {:trophy "wisdom" :medal "strength" :kiss "courage"}] (actions/play-animation entities :ego :reach) (actions/do-dialogue entities :ego "I can't pull it out!" @@ -159,8 +159,8 @@ (do (actions/talk entities :ego "That's the coolest sword I've ever seen!!") (actions/walk-to entities :ego [37 134] :face :left) (actions/talk entities :ego "If I pull it out I can become a great knight!") - (let [missing-items (set/difference #{:trophy :medal :certificate} (get-in @entities [:state :obtained-items])) - obtained-items (set/intersection #{:trophy :medal :certificate} (get-in @entities [:state :obtained-items]))] + (let [missing-items (set/difference #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items])) + obtained-items (set/intersection #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))] (if (= #{} missing-items) (pull-sword entities) (try-to-pull-sword entities missing-items obtained-items))))) @@ -203,9 +203,6 @@ :anim trophy :anim-start 0 :script (actions/get-script entities - (actions/give entities :trophy) - (actions/give entities :certificate) - (actions/give entities :medal) (walk-to-player entities) (if (= nil (get-in @entities [:state :current-riddle])) (let [{:keys [run choices]} (nice-trophy-dialogue entities)] diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index c33dddff..8573ae9d 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -122,6 +122,7 @@ grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0 0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]] (texture (aget grow-sheet 0 i)))) hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0]) + get-sick (animation 0.3 (map (partial get [(aget talk-sheet 0 0 ) (texture "ego/get-sick.png")]) [0 1 1 1 1 1 1 1 1 1 1 1]) ) ego {:right {:walk walk-right :stand stand-anim :talk talk-anim @@ -133,6 +134,7 @@ :cat-toy-first-half cat-toy-first-half :cat-toy-last-half cat-toy-last-half :grow grow + :get-sick get-sick :hold-up-to-window hold-up-to-window [:fire 1] fire-1-anim [:fire 2] fire-2-anim @@ -145,6 +147,7 @@ :squat (utils/flip squat-anim) :reach (utils/flip reach-anim) :cat-toy (utils/flip cat-toy-anim) + :get-sick (utils/flip get-sick) :cat-toy-first-half (utils/flip cat-toy-first-half) :cat-toy-last-half (utils/flip cat-toy-last-half) :grow (utils/flip grow) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 726cdd61..72f054a4 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 :certificate :sword]) +(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]) (defn cursor [filename which] (let [scale 2