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

explosion

Browse Source
This commit is contained in:
Bryce Covert
2015-11-23 12:51:59 -08:00
parent 137b6b2f66
commit aa6931b4c7
8 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/wizard/drip.ogg Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/wizard/drip.wav Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/wizard/explode.ogg Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/wizard/explode.wav Normal file
View File

Binary file not shown.

BIN
desktop/resources/wizard/drip.ogg Normal file
View File

Binary file not shown.

BIN
desktop/resources/wizard/explode.ogg Normal file
View File

Binary file not shown.

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

@@ -230,6 +230,13 @@
:experiment (rooms/make-entity :experiment (assoc (animation->texture screen experiment-left) :experiment (rooms/make-entity :experiment (assoc (animation->texture screen experiment-left)
:x 228 :y 60 :scale-x 1.75 :scale-y 1.75 :origin-x 13 :origin-y 0 :x 228 :y 60 :scale-x 1.75 :scale-y 1.75 :origin-x 13 :origin-y 0
:experiment experiment-left :experiment experiment-left
:drip-sound (utils/load-sound "wizard/drip.ogg")
:explode-sound (utils/load-sound "wizard/explode.ogg")
:anim-sound-frames {experiment-left {31 [:drip-sound 0.5]
67 [:drip-sound 0.5]
73 [:explode-sound (constantly 0.8)]
}}
:baseline 225)) :baseline 225))
:collision "inside-house/collision.png" :collision "inside-house/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75) :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75)

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

@@ -633,7 +633,7 @@
(actions/talk entities :ego "It's locked.") (actions/talk entities :ego "It's locked.")
(do (actions/play-animation entities :door :open) (do (actions/play-animation entities :door :open)
(actions/transition-background entities :inside-house [237 0] :between (fn [s e] (actions/transition-background entities :inside-house [237 0] :between (fn [s e]
(if (= 1 (rand-int 4)) (if (= 1 (rand-int 2))
(assoc-in e [:room :entities :experiment] (get-in e [:room :experiment])) (assoc-in e [:room :entities :experiment] (get-in e [:room :experiment]))
e))) e)))
(when (get-in @entities [:room :entities :experiment]) (when (get-in @entities [:room :entities :experiment])