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

sighs

Browse Source
This commit is contained in:
Remington Covert
2015-03-10 13:42:45 -07:00
parent cf5278b5bd
commit fd171e43ca
14 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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."))

7
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 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