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

gandarf blink.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-11 19:16:17 -07:00
parent 343d1f0e26
commit 3be1ed0e9f
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/gametodos.txt
View File

@@ -16,7 +16,6 @@ IOS
AUDIO AUDIO
+ blink + blink
+ scratch + scratch
+ candles
+ magic hands + magic hands
+ gandarf explosion + gandarf explosion
+ crying + crying

2
desktop/src-common/advent/actions.clj
View File

@@ -540,7 +540,7 @@
(defn give [entities item] (defn give [entities item]
(run-action entities (run-action entities
(begin [this screen entities] (begin [this screen entities]
(sound! (utils/load-sound "pickup.ogg") :play (utils/current-sound-volume)) (sound! (utils/load-sound "pickup.ogg") :play (utils/current-sound-volume 0.3))
(-> entities (-> entities
(update-in [:state :inventory] #(conj % item)) (update-in [:state :inventory] #(conj % item))

2
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -355,6 +355,8 @@
:stand grandma-stand :stand grandma-stand
:squat-1 grandma-squat-1 :squat-1 grandma-squat-1
:squat-2 grandma-squat-2 :squat-2 grandma-squat-2
:anim-sound-frames {grandma-stand {15 [:blink 0.2 1.6]}
grandma-talk {11 [:blink 0.2 1.6]}}
:talk-color (color 1.0 0.4 0.9 1.0) :talk-color (color 1.0 0.4 0.9 1.0)
:origin-x 13 :origin-x 13

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

@@ -34,14 +34,16 @@
wizard-magic-hands (utils/make-anim "wizard/magic-hands.png" [20 50] 0.2 (range 2)) wizard-magic-hands (utils/make-anim "wizard/magic-hands.png" [20 50] 0.2 (range 2))
wizard-disappear (utils/make-anim "wizard/disappear.png" [20 46] 0.075 (range 19)) wizard-disappear (utils/make-anim "wizard/disappear.png" [20 46] 0.075 (range 19))
wizard-talk (animation 0.2 (for [i [0 2 0 2 1 2 0 3 0 2 0 1 0 2]] wizard-talk (animation 0.2 (for [i [0 2 0 2 1 2 0 3 0 2 0 1 0 2]]
(aget wizard-sheet 0 i)))] (aget wizard-sheet 0 i)))
wizard-talk-left (utils/flip wizard-talk)
wizard-stand-left (utils/flip wizard-stand)
wizard-talk-angry-left (utils/flip wizard-talk-angry)]
(actions/start-animation screen (merge (assoc (animation->texture screen wizard-stand) (actions/start-animation screen (merge (assoc (animation->texture screen wizard-stand)
:left {:talk (utils/flip wizard-talk) :left {:talk wizard-talk-left
:stand (utils/flip wizard-stand) :stand wizard-stand-left
:disappear (utils/flip wizard-disappear) :disappear (utils/flip wizard-disappear)
:magic-hands (utils/flip wizard-magic-hands) :magic-hands (utils/flip wizard-magic-hands)
:talk-angry (utils/flip wizard-talk-angry) :talk-angry wizard-talk-angry-left
} }
:right {:talk wizard-talk :right {:talk wizard-talk
:stand wizard-stand :stand wizard-stand
@@ -49,6 +51,16 @@
:talk-angry wizard-talk-angry :talk-angry wizard-talk-angry
:magic-hands wizard-magic-hands :magic-hands wizard-magic-hands
} }
:anim-sound-frames {wizard-stand {11 [:blink 0.15 0.7]}
wizard-talk {11 [:blink 0.15 0.7]
4 [:blink 0.15 0.7]}
wizard-talk-angry {11 [:blink 0.15 0.7]
4 [:blink 0.15 0.7]}
wizard-stand-left {11 [:blink 0.15 0.7]}
wizard-talk-left {11 [:blink 0.15 0.7]
4 [:blink 0.15 0.7]}
wizard-talk-angry-left {11 [:blink 0.15 0.7]
4 [:blink 0.15 0.7]}}
:night-profile :sprite :night-profile :sprite
:origin-x 0 :origin-x 0
:origin-y 0 :origin-y 0