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

more animations.

Browse Source
This commit is contained in:
Bryce Covert
2015-07-30 12:41:13 -07:00
parent 4ba5457d2e
commit 39f5d7de1e
16 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/castle-gate/goon-2-search.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
desktop/resources/castle-gate/goon-2-search.pxa/0.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/castle-gate/goon-2-search.pxa/1.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/castle-gate/goon-2-search.pxa/2.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/castle-gate/goon-2-search.pxa/3.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/castle-gate/goon-2-search.pxa/4.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/castle-gate/goon-2-search.pxa/5.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/castle-gate/goon-2-search.pxa/6.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/castle-gate/goon-2-search.pxa/7.pxi Normal file
View File

Binary file not shown.

38
desktop/resources/castle-gate/goon-2-search.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/castle-gate/goon-2-talk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
desktop/resources/castle-gate/goon-2-talk.pxa/0.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/castle-gate/goon-2-talk.pxa/1.pxi Normal file
View File

Binary file not shown.

14
desktop/resources/castle-gate/goon-2-talk.pxa/CelData.plist Normal file
View File

@@ -0,0 +1,14 @@
<?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>
</array>
</plist>

BIN
desktop/resources/castle-gate/goon-2.pxa/1.pxi
View File

Binary file not shown.

16
desktop/src-common/advent/screens/rooms/castle_gate.clj
View File

@@ -130,7 +130,9 @@
(defn make-goon-2 [screen]
(let [stand (utils/make-anim "castle-gate/goon-2.png" [12 32] 0.175 [0 0 0 0 0 0 0 0 0 0 0 0 0 1])
flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ])]
talk (utils/make-anim "castle-gate/goon-2-talk.png" [12 32] 0.175 (range 2))
flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ])
search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0])]
(assoc (animation->texture screen stand)
:x 214 :y 102 :baseline 138
:scale-x 1.4
@@ -138,7 +140,11 @@
:origin-x 6
:origin-y 0
:anim stand
:talk talk
:flip flip
:search search
:anim-merges {search {:origin-x 12}
:default {:origin-x 6}}
:update-fn (fn [s es e]
(if (and (= (:flip e) (:anim e))
(animation! (:flip e)
@@ -149,7 +155,7 @@
:script (actions/get-script entities
(if (get-in @entities [:tweens :coin-y])
(do
(actions/talk entities :ego "Hey goon!" :wait false)
(actions/talk entities :ego "Hey Bubba!" :wait false)
(actions/update-entities entities (fn [entities]
(update-in entities [:tweens] dissoc :coin-y)))
@@ -169,8 +175,10 @@
(Thread/sleep 50)
(actions/walk-straight-to entities :coin-flip [185 44] :update-baseline? false :speed 0.5)
(actions/update-state entities (fn [s] (assoc s :has-dropped-coin? true)))
(actions/talk entities :frankie "You made me lose my coin, Dipstick!"))
(actions/talk entities :ego "Hey goon!")))
(actions/talk entities :goon-2 "You made me lose my coin, Dipstick!" :anim :search)
(actions/talk entities :ego "Umm, sorry!"))
(actions/do-dialogue entities :ego "Hey Bubba!"
:goon-2 "Beat it, Dipstick.")))
:night-profile :sprite
:anim-start 0
:stand stand)))