added owl.
This commit is contained in:
Binary file not shown.
BIN
desktop/resources/cat-tree/owl.png
Normal file
BIN
desktop/resources/cat-tree/owl.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
desktop/resources/cat-tree/owl.pxa/0.pxi
Normal file
BIN
desktop/resources/cat-tree/owl.pxa/0.pxi
Normal file
Binary file not shown.
BIN
desktop/resources/cat-tree/owl.pxa/1.pxi
Normal file
BIN
desktop/resources/cat-tree/owl.pxa/1.pxi
Normal file
Binary file not shown.
BIN
desktop/resources/cat-tree/owl.pxa/2.pxi
Normal file
BIN
desktop/resources/cat-tree/owl.pxa/2.pxi
Normal file
Binary file not shown.
18
desktop/resources/cat-tree/owl.pxa/CelData.plist
Normal file
18
desktop/resources/cat-tree/owl.pxa/CelData.plist
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<array>
|
||||||
|
<dict>
|
||||||
|
<key>duration</key>
|
||||||
|
<real>1</real>
|
||||||
|
</dict>
|
||||||
|
<dict>
|
||||||
|
<key>duration</key>
|
||||||
|
<real>1</real>
|
||||||
|
</dict>
|
||||||
|
<dict>
|
||||||
|
<key>duration</key>
|
||||||
|
<real>1</real>
|
||||||
|
</dict>
|
||||||
|
</array>
|
||||||
|
</plist>
|
||||||
@@ -96,7 +96,13 @@
|
|||||||
(-> entities
|
(-> entities
|
||||||
(update-in [:room :entities] #(dissoc % :grandma))
|
(update-in [:room :entities] #(dissoc % :grandma))
|
||||||
(utils/remove-interaction :ladder-area)
|
(utils/remove-interaction :ladder-area)
|
||||||
(utils/remove-interaction :grandma)))
|
(utils/remove-interaction :grandma)
|
||||||
|
(update-in [:room :entities] #(assoc % :owl (doto (get-in entities [:room :owl]) println)))))
|
||||||
|
|
||||||
|
(defn talk-to-owl [entities]
|
||||||
|
(actions/walk-to entities :ego [141 54] :face :right)
|
||||||
|
(actions/do-dialogue entities :ego "Hello there little owl."
|
||||||
|
:owl "You talking to me?"))
|
||||||
|
|
||||||
(defn make [screen]
|
(defn make [screen]
|
||||||
(let [cat-stand-sheet (texture! (texture "cat-tree/cat-stand.png") :split 22 10)
|
(let [cat-stand-sheet (texture! (texture "cat-tree/cat-stand.png") :split 22 10)
|
||||||
@@ -108,7 +114,9 @@
|
|||||||
grandma-squat-1 (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [3 4 5 5 5 5 5])
|
grandma-squat-1 (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [3 4 5 5 5 5 5])
|
||||||
grandma-squat-2 (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [5 5 4 3])
|
grandma-squat-2 (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [5 5 4 3])
|
||||||
grandma-talk (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 2 0 2 0 2 0 2 0 2 0 1 0 2 0 0])
|
grandma-talk (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 2 0 2 0 2 0 2 0 2 0 1 0 2 0 0])
|
||||||
grandma-kiss (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 8 9 10 9 10 9 10 9 8 0])]
|
grandma-kiss (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 8 9 10 9 10 9 10 9 8 0])
|
||||||
|
owl-stand (utils/make-anim "cat-tree/owl.png" [19 28] 0.2 [0 0 0 0 0 0 0 2])
|
||||||
|
owl-talk (utils/make-anim "cat-tree/owl.png" [19 28] 0.2 [1 0 1 0 1 0 0 0 2 0])]
|
||||||
(rooms/make :music :town-2
|
(rooms/make :music :town-2
|
||||||
:interactions
|
:interactions
|
||||||
{:down-dir {:box [150 0 270 20]
|
{:down-dir {:box [150 0 270 20]
|
||||||
@@ -211,6 +219,14 @@
|
|||||||
:origin-y 0
|
:origin-y 0
|
||||||
:scale-x 1.45
|
:scale-x 1.45
|
||||||
:scale-y 1.45)}
|
:scale-y 1.45)}
|
||||||
|
:owl (rooms/make-entity :owl (assoc (animation->texture screen owl-stand)
|
||||||
|
:x 187 :y 172 :baseline 241
|
||||||
|
:stand owl-stand
|
||||||
|
:talk owl-talk
|
||||||
|
:talk-color (color 0.5 0.5 1.0 1.0)
|
||||||
|
:anim owl-stand
|
||||||
|
:anim-start 0
|
||||||
|
:script (actions/get-script entities (talk-to-owl entities))))
|
||||||
:collision "cat-tree/collision.png"
|
:collision "cat-tree/collision.png"
|
||||||
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20)
|
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20)
|
||||||
:apply-state (fn [entities]
|
:apply-state (fn [entities]
|
||||||
|
|||||||
Reference in New Issue
Block a user