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

Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

Browse Source
This commit is contained in:
Bryce Covert
2015-03-11 13:06:01 -07:00
parent c2c50f7911 2149ae0c3e
commit 0389ed6440
16 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/ego/sigh.ogg Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
desktop/resources/ego/sigh.pxa/0.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.pxa/1.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.pxa/2.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.pxa/3.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.pxa/4.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.pxa/5.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.pxa/6.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.pxa/7.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/ego/sigh.pxa/8.pxi Normal file
View File

Binary file not shown.

42
desktop/resources/ego/sigh.pxa/CelData.plist Normal file
View File

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

BIN
desktop/resources/ego/sigh.wav Normal file
View File

Binary file not shown.

2
desktop/settings.edn
View File

@@ -1 +1 @@
{:sound-volume 60.0, :music-volume 74.0}
{:sound-volume 59.0, :music-volume 32.0}

5
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -337,7 +337,10 @@
(actions/play-animation entities :ego :reach)
(actions/give entities :wool)
(actions/talk entities :ego "I guess her wool is shedding."))
(actions/talk entities :ego "She's too far away for me to pet her."))))
(do
(actions/talk entities :ego "Come here mama sheep!")
(actions/play-animation entities :ego :sigh)
(actions/talk entities :ego "She's too far away for me to pet her.")))))
:scripts #(condp = %
:wool (actions/get-script entities
(actions/talk entities :ego "She doesn't need it back."))

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

@@ -196,6 +196,7 @@
scared (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1])
scared-talk (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1 0 1 0 1 0 1 2 3 2 3 2 3 2 3])
scared-walk (utils/make-anim "ego/scared-walk.png" [16 36] 0.05 (range 6))
sigh (utils/make-anim "ego/sigh.png" [18 36] 0.08 [0 0 0 0 1 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ])
ego {:right {:walk walk-right
:stand stand-anim
@@ -229,7 +230,8 @@
:passed-out passed-out
:scared scared
:scared-talk scared-talk
:scared-walk scared-walk}
:scared-walk scared-walk
:sigh sigh}
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
:talk (utils/flip talk-anim)
@@ -253,7 +255,8 @@
[:fire 2] (utils/flip fire-2-anim)
[:fire 3] (utils/flip fire-3-anim)
:spear (utils/flip spear)
:pant (utils/flip pant)}
:pant (utils/flip pant)
:sigh (utils/flip sigh)}
:baseline (- 240 (last start-pos))
:facing :right
:origin-x 9
@@ -261,6 +264,7 @@
:scaled true
:step-sound-1 (sound "ego/step-1.ogg")
:step-sound-2 (sound "ego/step-2.ogg")
:sigh-sound (sound "ego/sigh.ogg")
:blink (sound "blink.ogg")
:scale-x start-scale
:scale-y start-scale
@@ -329,7 +333,9 @@
77 [:blink 0.15]
110 [:blink 0.15]
143 [:blink 0.15]
176 [:blink 0.15]}}
176 [:blink 0.15]}
(get-in ego [:left :sigh]) {1 [:sigh-sound 0.4]}
(get-in ego [:right :sigh]) {1 [:sigh-sound 0.4]}}
:anim-merges {(get-in ego [:right :shock]) {:origin-x 15}
:default {:origin-x 9}})]
(actions/start-animation screen