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

a step in the right direction for intro beefup.

Browse Source
This commit is contained in:
Bryce Covert
2015-07-28 17:36:49 -07:00
parent fc0f0a269c
commit 53215ae96f
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/ego/base.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

24
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -144,11 +144,17 @@
(defn do-intro [entities]
(Thread/sleep 2000)
(actions/do-dialogue entities
:ego "What's going on?"
:ego "Who turned out the lights?"
:ego "I must be dreaming.")
(actions/talk entities :fairy-godfather "... Tick ...")
(actions/walk-straight-to entities :ego [160 60])
(actions/do-dialogue entities :ego "What the?")
(actions/walk-straight-to entities :ego [120 50])
(actions/do-dialogue entities :ego "Who turned out the lights?"
:ego "What's going on?")
(actions/talk entities :fairy-godfather "... Tiiiiiiccckkkk ...")
(actions/do-dialogue entities :ego "Who is that?")
(actions/walk-straight-to entities :ego [140 55] :face :right)
(actions/do-dialogue entities :ego "Show yourself!")
(Thread/sleep 500)
(actions/talk entities :fairy-godfather "Taaaaaaaaaaaaaaaaaa-")
(sound! (sound "dream/appear.ogg") :play (utils/current-sound-volume))
@@ -159,9 +165,11 @@
(Thread/sleep 100)
(actions/talk entities :fairy-godfather "-daaaaaaaaaaaaa!")
(Thread/sleep 2500)
(actions/do-dialogue entities :ego "Umm... What was that all about?"
:fairy-godfather "Welcome, young Tick, to the pit of fate."
:ego "Err, who are you?"
(actions/do-dialogue entities :fairy-godfather "Welcome, young Tick, to the pit of fate!")
(actions/talk entities :ego "Pit of fate? I'm too young to die!" :anim :frustrated-talk)
(actions/do-dialogue entities
:fairy-godfather "Relax, Tick. You're dreaming!"
:ego "Who are you?"
:ego "And how do you know my name?"
:fairy-godfather "Why, I'm your fairy godfather of course!"
:fairy-godfather "I've brought you here, Tick, to help choose your destiny."
@@ -174,7 +182,7 @@
(fade-in-tools entities)
(Thread/sleep 2500)
(actions/do-dialogue entities :ego "What are these things?"
(actions/do-dialogue entities
:fairy-godfather "These, young Tick, represent the potential destinies for your life."
:fairy-godfather "They have been selected since the dawn of time."
:fairy-godfather "These destinies are never mistaken."

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

@@ -359,6 +359,7 @@ void main()
milk (utils/make-anim "ego/squat.png" [18 36] 0.05 [0 1 2 2 3 3 3 3 3 3 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 3 3 3 3 3 3 3 3 3 3 3 2 1 0])
idea (utils/make-anim "ego/idea.png" [18 70] 0.3 [2 0 0 0 0 0 0 2])
throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)] (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3 3] (repeat 33 6)]))
frustrated-talk (utils/make-anim "ego/frustrated-talk.png" [16 36] 0.2 (flatten (range 6)))
swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9))
love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0]))
axe (utils/make-anim "ego/axe.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)]))
@@ -419,6 +420,7 @@ void main()
:crawl-stand crawl-stand
:crawl-hide crawl-hide
:standup standup
:frustrated-talk frustrated-talk
}
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
@@ -460,6 +462,7 @@ void main()
:crawl-stand (utils/flip crawl-stand)
:crawl-hide (utils/flip crawl-hide)
:standup (utils/flip standup)
:frustrated-talk (utils/flip frustrated-talk)
}
:baseline (- 240 (last start-pos))
:facing :right