notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grandma

Browse Source
This commit is contained in:
Remington Covert
2014-12-11 21:23:08 -08:00
parent 53b7efb6a4
commit 3572a09227
16 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/cat-tree/Untitled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
desktop/resources/cat-tree/grandma.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
desktop/resources/cat-tree/grandma.pxa/0.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/cat-tree/grandma.pxa/1.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/cat-tree/grandma.pxa/2.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/cat-tree/grandma.pxa/3.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/cat-tree/grandma.pxa/4.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/cat-tree/grandma.pxa/5.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/cat-tree/grandma.pxa/6.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/cat-tree/grandma.pxa/7.pxi Normal file
View File

Binary file not shown.

38
desktop/resources/cat-tree/grandma.pxa/CelData.plist Normal file
View File

@@ -0,0 +1,38 @@
<?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>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<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>

BIN
desktop/resources/cat-tree/pounce.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
desktop/resources/inside-castle/hands-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

4
desktop/src-common/advent/actions.clj
View File

@@ -89,7 +89,7 @@
~@forms)) ~@forms))
(reset! ~entities (<!! c#))))) (reset! ~entities (<!! c#)))))
(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face]}] (defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed]}]
(let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id]) (let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id])
final-x (int final-x) final-x (int final-x)
final-y (int final-y) final-y (int final-y)
@@ -103,7 +103,7 @@
(let [delta-x (- final-x from-x) (let [delta-x (- final-x from-x)
delta-y (- final-y from-y) delta-y (- final-y from-y)
distance (utils/dist from-x from-y final-x final-y) distance (utils/dist from-x from-y final-x final-y)
speed (* (or scale-x 1.0) 1.5) speed (* (or scale-x 1.0) (or speed 1.5))
moved-x (if (= 0.0 distance) moved-x (if (= 0.0 distance)
0 0
(* speed (/ delta-x distance))) (* speed (/ delta-x distance)))

35
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -20,7 +20,12 @@
(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)
cat-stand (animation 0.15 (for [i (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])] cat-stand (animation 0.15 (for [i (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])]
(aget cat-stand-sheet 0 i))) (aget cat-stand-sheet 0 i)))
ladder-entity (assoc (texture "inside-cafeteria/ladder.png") :x 120 :y 60 :baseline 162)] cat-walk (animation 0.2 [(texture "cat-tree/pounce.png")])
ladder-entity (assoc (texture "inside-cafeteria/ladder.png") :x 120 :y 60 :baseline 162)
grandma-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1])
grandma-cat-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [6 6 6 6 6 6 6 6 6 6 6 6 6 6 7])
grandma-squat (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [3 4 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])]
(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]
@@ -57,6 +62,8 @@
:entities {:cat (actions/start-animation screen :entities {:cat (actions/start-animation screen
(assoc (animation->texture screen cat-stand) (assoc (animation->texture screen cat-stand)
:x 184 :y 173 :baseline 1000 :x 184 :y 173 :baseline 1000
:walk cat-walk
:stand cat-stand
:script (actions/get-script entities :script (actions/get-script entities
(actions/talk entities :ego "Here kitty, kitty, kitty.") (actions/talk entities :ego "Here kitty, kitty, kitty.")
(actions/talk entities :ego "Kitty's not so interested in me.")) (actions/talk entities :ego "Kitty's not so interested in me."))
@@ -64,13 +71,35 @@
(actions/play-animation entities :ego :cat-toy) (actions/play-animation entities :ego :cat-toy)
(if (get-in @entities [:room :entities :ladder]) (if (get-in @entities [:room :entities :ladder])
(do (actions/talk entities :ego "I think he's going for it!") (do (actions/talk entities :ego "I think he's going for it!")
(actions/play-animation entities :ego :cat-toy) (actions/play-animation entities :ego :cat-toy-first-half :stop? false)
(actions/walk-straight-to entities :cat [138 40] :update-baseline? false :speed 3)
(actions/play-animation entities :ego :cat-toy-last-half)
(swap! entities #(assoc-in % [:room :entities :grandma :stand]
(get-in % [:room :entities :grandma :cat-stand])))
(actions/play-animation entities :grandma :squat)
(actions/remove-entity entities :cat) (actions/remove-entity entities :cat)
(get-down entities) (get-down entities)
(actions/do-dialogue entities
:grandma "Thank you for rescuing my furry friend, young man!"
:ego "It's nothing."
:grandma "You are so brave!"
:grandma "Here's a certificate of bravery!")
(actions/talk entities :ego "TODO: get award from little old lady in this room") (actions/talk entities :ego "TODO: get award from little old lady in this room")
(actions/give entities :certificate)) (actions/give entities :certificate))
(actions/talk entities :ego "I guess I'm too far away.")))}) (actions/talk entities :ego "I guess I'm too far away.")))})
cat-stand)} cat-stand)
:grandma (assoc (animation->texture screen grandma-stand)
:x 130 :y 37 :baseline 200
:anim grandma-stand
:anim-start 0
:talk grandma-talk
:cat-stand grandma-cat-stand
:stand grandma-stand
:squat grandma-squat
:origin-x 12
:origin-y 0
:scale-x 1.45
:scale-y 1.45)}
: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]

8
desktop/src-common/advent/screens/scene.clj
View File

@@ -109,6 +109,10 @@
(texture (aget reach-sheet 0 i)))) (texture (aget reach-sheet 0 i))))
cat-toy-anim (animation 0.1 (for [i [0 0 1 1 2 2 3 4 3 2 3 4 3 2 3 4 3 2 3 4 3 2 2 1 1 0 0]] cat-toy-anim (animation 0.1 (for [i [0 0 1 1 2 2 3 4 3 2 3 4 3 2 3 4 3 2 3 4 3 2 2 1 1 0 0]]
(texture (aget cat-toy-sheet 0 i)))) (texture (aget cat-toy-sheet 0 i))))
cat-toy-first-half (animation 0.1 (for [i [0 0 1 1 2 2 3]]
(texture (aget cat-toy-sheet 0 i))))
cat-toy-last-half (animation 0.1 (for [i [3 3 3 2 1 1 0 0]]
(texture (aget cat-toy-sheet 0 i))))
fire-1-anim (animation 0.1 (for [i [0 1 2 2 2 3 2 3 2 2 2 1 0]] fire-1-anim (animation 0.1 (for [i [0 1 2 2 2 3 2 3 2 2 2 1 0]]
(texture (aget fire-sheet 0 i)))) (texture (aget fire-sheet 0 i))))
fire-2-anim (animation 0.1 (for [i [0 1 2 2 2 2 3 2 3 2 2 2 4 5 6 7 2 2 2 2 2 2 2 2 1 0]] fire-2-anim (animation 0.1 (for [i [0 1 2 2 2 2 3 2 3 2 2 2 4 5 6 7 2 2 2 2 2 2 2 2 1 0]]
@@ -126,6 +130,8 @@
:end-squat end-squat :end-squat end-squat
:reach reach-anim :reach reach-anim
:cat-toy cat-toy-anim :cat-toy cat-toy-anim
:cat-toy-first-half cat-toy-first-half
:cat-toy-last-half cat-toy-last-half
:grow grow :grow grow
:hold-up-to-window hold-up-to-window :hold-up-to-window hold-up-to-window
[:fire 1] fire-1-anim [:fire 1] fire-1-anim
@@ -139,6 +145,8 @@
:squat (utils/flip squat-anim) :squat (utils/flip squat-anim)
:reach (utils/flip reach-anim) :reach (utils/flip reach-anim)
:cat-toy (utils/flip cat-toy-anim) :cat-toy (utils/flip cat-toy-anim)
:cat-toy-first-half (utils/flip cat-toy-first-half)
:cat-toy-last-half (utils/flip cat-toy-last-half)
:grow (utils/flip grow) :grow (utils/flip grow)
:hold-up-to-window (utils/flip hold-up-to-window) :hold-up-to-window (utils/flip hold-up-to-window)
[:fire 1] (utils/flip fire-1-anim) [:fire 1] (utils/flip fire-1-anim)