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

various bug fixes.

Browse Source
This commit is contained in:
Bryce Covert
2018-02-11 16:49:50 -08:00
parent e9b1c8b0a4
commit 97794f953c
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,7 +482,7 @@
(assoc-in [:room :entities :penultimate-wall :opacity] 1)
(assoc-in [:room :entities :bloodclot-swallow-top :opacity] 1)
(assoc-in [:room :entities :bloodclot-swallow-bottom :opacity] 1)
(assoc-in [:cam :paused?] true)
(update-in [:cam ] assoc :paused? true :x 160 :y 120)
(update-in [:room :entities :ego ] assoc :x 200 :y 166 :baseline 4)
(update-in [:room :entities] dissoc :tongue)
(update-in [:room :entities :ego] actions/start-animation :fall-small))))
@@ -531,8 +531,9 @@
(println "doing screen shake?")
(actions/camera-shake entities 8.0)
(println "doing screen shake?")
(actions/update-entities entities (fn [e] (update-in e [:cam ] assoc :paused? true :x 160 :y 120)))
(actions/transition-background entities :space [55 90]
(actions/transition-background entities :space [55 80]
:time 4.0
:transition-music? false
:type :white-fade

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

@@ -216,10 +216,10 @@
:baseline 240
:opacity 0.0)
:grow-explode (assoc grow-explode
:x 240 :y 240
:x 300 :y 240
:baseline 200)
:blowup (assoc blowup-effect
:x 300 :y 240
:x 225 :y 181
:baseline 241)
:lightning (assoc lightning-effect
:x 225 :y 160

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

@@ -184,8 +184,8 @@
: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-black (assoc (utils/atlas->texture atlas "penultimate-black") :x 0 :y 0 :baseline 6 :scale-x 1 :scale-y 1 :opacity 0)
:bloodclot-swallow-top (assoc (animation->texture screen bloodclot-swallow-top) :x 167 :y 118 :baseline 3 :scale-x 1 :scale-y 1 :opacity 0 :swallow bloodclot-swallow-top :uhoh bloodclot-swallow-top-uhoh)
:bloodclot-swallow-bottom (assoc (animation->texture screen bloodclot-swallow-bottom) :x 167 :y 118 :baseline 5 :scale-x 1 :scale-y 1 :opacity 0 :swallow bloodclot-swallow-bottom :uhoh bloodclot-swallow-bottom-uhoh)
:bloodclot-swallow-top (assoc (utils/atlas->texture atlas "bloodclot-swallow-top" 0) :x 167 :y 118 :baseline 3 :scale-x 1 :scale-y 1 :opacity 0 :swallow bloodclot-swallow-top :uhoh bloodclot-swallow-top-uhoh)
:bloodclot-swallow-bottom (assoc (utils/atlas->texture atlas "bloodclot-swallow-bottom" 0) :x 167 :y 118 :baseline 5 :scale-x 1 :scale-y 1 :opacity 0 :swallow bloodclot-swallow-bottom :uhoh bloodclot-swallow-bottom-uhoh)
:black-blowup (assoc black-blowup
:x 222 :y 85
:baseline 241)