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

getting better animation going on.

Browse Source
This commit is contained in:
Remington Covert
2015-02-17 16:14:34 -08:00
parent 8d93158af0
commit 2a6ed75e84
20 changed files with 102 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/space/bloodclot-head-talk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
desktop/resources/space/bloodclot-head-talk.pxa/0.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/1.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/10.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/11.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/12.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/13.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/2.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/3.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/4.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/5.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/6.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/7.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/8.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/bloodclot-head-talk.pxa/9.pxi Normal file
View File

Binary file not shown.

62
desktop/resources/space/bloodclot-head-talk.pxa/CelData.plist Normal file
View File

@@ -0,0 +1,62 @@
<?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>
<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/space/bloodclot-stand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
desktop/resources/space/bloodclot-stand.pxa/0.pxi Normal file
View File

Binary file not shown.

10
desktop/resources/space/bloodclot-stand.pxa/CelData.plist Normal file
View File

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

43
desktop/src-common/advent/screens/rooms/space.clj
View File

@@ -17,7 +17,7 @@
(when (and (not (get-in entities [:actions :script-running?])) (when (and (not (get-in entities [:actions :script-running?]))
(get-in entities [:state :active?]) (get-in entities [:state :active?])
(not (get-in entities [:state :blergh-dead?]))) (not (get-in entities [:state :blergh-dead?])))
((actions/get-script entities (actions/do-dialogue entities :blergh (rand-nth ["Come on, little man! Try and hit me!" ((actions/get-script entities (actions/do-dialogue entities :bloodclot-head (rand-nth ["Come on, little man! Try and hit me!"
"What's the matter? Cold feet?" "What's the matter? Cold feet?"
"Come here and fight me like man!" "Come here and fight me like man!"
"Your precious Georgia McGorgeous would be laughing if she saw you now." "Your precious Georgia McGorgeous would be laughing if she saw you now."
@@ -132,10 +132,13 @@
(defn make [screen] (defn make [screen]
(let [blergh-stand (texture "space/blergh-stand.png") (let [
blergh-flex (texture "space/blergh-flex.png") blergh-flex (texture "space/blergh-flex.png")
blergh-talk-anim (utils/make-anim "space/bloodclot-talk.png" [106 165] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 3 4 4 4 3 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) bloodclot-head-talk-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7])
blergh-stand-anim (animation 0.7 [blergh-flex blergh-stand]) bloodclot-head-stand-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 4 3])
bloodclot-head-shoot-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 10 11 10 11 10 11 10 11 10 11 10 11])
bloodclot-head-keep-shoot-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [12 13])
blergh-stand-anim (utils/make-anim "space/bloodclot-stand.png" [106 165] 0.05 [0 0 0])
blergh-swing (utils/make-anim "space/blergh-swing.png" [106 165] 0.1 [0 0 1 2 3 4 ]) blergh-swing (utils/make-anim "space/blergh-swing.png" [106 165] 0.1 [0 0 1 2 3 4 ])
blergh-appear (utils/make-anim "space/blergh-appear.png" [106 165] 0.05 (flatten [(range 13) 12 12 12 12 12 12 12 12 12 12 12 12 12 ])) blergh-appear (utils/make-anim "space/blergh-appear.png" [106 165] 0.05 (flatten [(range 13) 12 12 12 12 12 12 12 12 12 12 12 12 12 ]))
blergh-grow (utils/make-anim "space/blergh-grow.png" [106 165] 0.10 [0 1 0 1 0 1 0 1 1 1 1 0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 3 3 3 3 3 3 3 3 3 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11]) blergh-grow (utils/make-anim "space/blergh-grow.png" [106 165] 0.10 [0 1 0 1 0 1 0 1 1 1 1 0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 3 3 3 3 3 3 3 3 3 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11])
@@ -145,21 +148,34 @@
{} {}
:layers [(assoc (texture "space/background.png") :x 0 :y 0 :baseline 0)] :layers [(assoc (texture "space/background.png") :x 0 :y 0 :baseline 0)]
:timers {:taunt [10.0 8.0 taunt]} :timers {:taunt [10.0 8.0 taunt]}
:blergh (rooms/make-entity :blergh (assoc (animation->texture screen blergh-appear) :bloodclot-head (rooms/make-entity :bloodclot-head (assoc (animation->texture screen bloodclot-head-stand-anim)
:x 195 :y 138 :baseline 195
:anim bloodclot-head-stand-anim
:talk bloodclot-head-talk-anim
:keep-shoot bloodclot-head-keep-shoot-anim
:shoot bloodclot-head-shoot-anim
:anim-start 0
:stand bloodclot-head-stand-anim
:talk-color (color 0.95 0.4 0.2 1.0)))
:blergh (rooms/make-entity :blergh (assoc (animation->texture screen blergh-stand-anim)
:x 180 :y 50 :baseline 190 :x 180 :y 50 :baseline 190
:stand blergh-stand-anim :talk blergh-talk-anim :stand blergh-stand-anim
:swing blergh-swing
:appear blergh-appear :appear blergh-appear
:grow blergh-grow :grow blergh-grow
:talk-color (color 0.95 0.4 0.2 1.0)
:script (actions/get-script entities (actions/do-dialogue entities :blergh "Come on! Try and hit me!")) :script (actions/get-script entities (actions/do-dialogue entities :bloodclot-head "Come on! Try and hit me!"))
:scripts {:sword (actions/get-script entities :scripts {:sword (actions/get-script entities
#_(actions/walk-straight-to entities :ego [205 45] :anim :jump :stop? false :speed 3.0) #_(actions/walk-straight-to entities :ego [205 45] :anim :jump :stop? false :speed 3.0)
(swing-at-blergh entities) (swing-at-blergh entities)
#_(actions/play-animation entities :ego :swing)
(actions/do-dialogue entities :blergh "Ha ha ha! Is that the best you can do?" (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?"
:blergh "Take this!") :bloodclot-head "Take this!")
(actions/play-animation entities :bloodclot-head :shoot :stop? false)
(actions/begin-animation entities :bloodclot-head :keep-shoot)
(actions/play-animation entities :ego :shock :stop? false) (actions/play-animation entities :ego :shock :stop? false)
(actions/begin-animation entities :bloodclot-head :stand)
(actions/play-animation entities :ego :burnt :stop? false) (actions/play-animation entities :ego :burnt :stop? false)
(actions/play-animation entities :ego :passed-out :continue? true) (actions/play-animation entities :ego :passed-out :continue? true)
@@ -194,5 +210,6 @@
(if (get-in e [:state :broke-jewel?]) (if (get-in e [:state :broke-jewel?])
(assoc-in e [:room :entities :broken-jewel] (get-in e [:room :entities :broken-jewel])) (assoc-in e [:room :entities :broken-jewel] (get-in e [:room :entities :broken-jewel]))
e) e)
(assoc-in e [:room :entities :blergh] (get-in e [:room :blergh]))) (assoc-in e [:room :entities :blergh] (get-in e [:room :blergh]))
(assoc-in e [:room :entities :bloodclot-head] (get-in e [:room :bloodclot-head])))
)))) ))))