iprogress

This commit is contained in:
Bryce Covert
2018-02-11 18:56:33 -08:00
parent c52784d5e5
commit 1c6f61c5d2
20 changed files with 18 additions and 5 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -459,20 +459,26 @@
entities) entities)
(skip-type [this screen entities] (skip-type [this screen entities]
:none)) :none))
(actions/play-sound entities :swallow 0.5)
(Thread/sleep 1500) (Thread/sleep 1500)
(actions/update-entities entities (fn [e] (actions/update-entities entities (fn [e]
(-> e (-> e
(assoc-in [:room :entities :falling-bg :opacity] 1) (assoc-in [:room :entities :falling-bg :opacity] 1)
(assoc-in [:room :entities :falling-ego :opacity] 1)))) (assoc-in [:room :entities :falling-ego :opacity] 1))))
(actions/play-sound entities :falling-ego 0.2)
(Thread/sleep 4000) (Thread/sleep 4000)
(show-big-bloodclot entities 1000) (show-big-bloodclot entities 1000)
(actions/update-entities entities (fn [e] (actions/update-entities entities (fn [e]
(-> e (-> e
(assoc-in [:room :entities :falling-bg :opacity] 1) (assoc-in [:room :entities :falling-bg :opacity] 1)
(assoc-in [:room :entities :falling-ego :opacity] 0) (assoc-in [:room :entities :falling-ego :opacity] 0)
(assoc-in [:room :entities :sword-spin :opacity] 1)))) (assoc-in [:room :entities :sword-spin :opacity] 1))))
(actions/play-sound entities :swoosh 0.5)
(Thread/sleep 2000)) (Thread/sleep 2000))
(defn do-win [entities won?] (defn do-win [entities won?]
@@ -493,6 +499,7 @@
(fall-in entities)) (fall-in entities))
(show-big-bloodclot entities 1000) (show-big-bloodclot entities 1000)
(actions/play-sound entities :big-swoosh 0.5)
(actions/update-entities entities (fn [e] (actions/update-entities entities (fn [e]
(-> e (-> e
@@ -513,12 +520,14 @@
(assoc-in [:room :entities :belly-bottom :opacity] 0)))) (assoc-in [:room :entities :belly-bottom :opacity] 0))))
(show-big-bloodclot entities 0) (show-big-bloodclot entities 0)
(Thread/sleep 1000) (Thread/sleep 1000)
(actions/play-sound entities :impact 0.5)
(actions/update-entities entities (fn [e] (actions/update-entities entities (fn [e]
(-> e (-> e
(update-in [:room :entities :bloodclot-swallow-top] #(actions/start-animation % :uhoh)) (update-in [:room :entities :bloodclot-swallow-top] #(actions/start-animation % :uhoh))
(update-in [:room :entities :bloodclot-swallow-bottom] #(actions/start-animation % :uhoh))))) (update-in [:room :entities :bloodclot-swallow-bottom] #(actions/start-animation % :uhoh)))))
(Thread/sleep 2000) (Thread/sleep 2000)
(actions/play-sound entities :explode-sound 0.5)
(actions/update-entities entities (fn [e] (actions/update-entities entities (fn [e]
(-> e (-> e

View File

@@ -242,13 +242,11 @@
:stand blergh-stand-anim :stand blergh-stand-anim
:inhale-sound (utils/load-sound "space/bloodclot-inhale.ogg") :inhale-sound (utils/load-sound "space/bloodclot-inhale.ogg")
:exhale-sound (utils/load-sound "space/bloodclot-exhale.ogg") :exhale-sound (utils/load-sound "space/bloodclot-exhale.ogg")
:explode-sound (utils/load-sound "space/bloodclot-explode.ogg")
:anim-sound-frames {blergh-stand-anim {0 [:inhale-sound grunt-vol] :anim-sound-frames {blergh-stand-anim {0 [:inhale-sound grunt-vol]
1 [:exhale-sound grunt-vol]} 1 [:exhale-sound grunt-vol]}
bloodclot-grow {35 [:grow-sound (constantly 0.5)] bloodclot-grow {35 [:grow-sound (constantly 0.5)]}
181 [:explode-sound (constantly 0.5)]} bloodclot-big {35 [:grow-sound (constantly 0.5)]}}
bloodclot-big {35 [:grow-sound (constantly 0.5)]
181 [:explode-sound (constantly 0.5)]}}
:opacity 0.0 :opacity 0.0
:anim blergh-stand-anim :anim blergh-stand-anim
:anim-start 0 :anim-start 0

View File

@@ -180,6 +180,12 @@
:update-fn trigger-tongue :update-fn trigger-tongue
:ego-hearts 1 :ego-hearts 1
:tongue-hearts 5 :tongue-hearts 5
:sounds {:swoosh (utils/load-sound "tongue-fight/swoosh.ogg")
:big-swoosh (utils/load-sound "tongue-fight/big-swoosh.ogg")
:impact (utils/load-sound "tongue-fight/impact.ogg")
:explode-sound (utils/load-sound "space/bloodclot-explode.ogg")
:swallow (utils/load-sound "tongue-fight/swallow.ogg")
:falling-ego (utils/load-sound "tongue-fight/falling-ego.ogg")}
:entities (into {:penultimate (assoc (utils/atlas->texture atlas "penultimate") :x 0 :y 0 :baseline 2 :scale-x 1 :scale-y 1 :opacity 0) :entities (into {:penultimate (assoc (utils/atlas->texture atlas "penultimate") :x 0 :y 0 :baseline 2 :scale-x 1 :scale-y 1 :opacity 0)
:penultimate-wall (assoc (utils/atlas->texture atlas "penultimate-wall") :x 0 :y 0 :baseline 5 :scale-x 1 :scale-y 1 :opacity 0) :penultimate-wall (assoc (utils/atlas->texture atlas "penultimate-wall") :x 0 :y 0 :baseline 5 :scale-x 1 :scale-y 1 :opacity 0)