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

ending is beginning to be fun.

Browse Source
This commit is contained in:
Bryce Covert
2018-02-08 22:01:56 -08:00
parent 40e1d61d69 cdf4178a62
commit c37309fac1
67 changed files with 982 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop/src-common/advent/screens/scene.clj
View File

@@ -145,7 +145,7 @@
(defn left-click [screen entities options]
(println "x y" (:input-x options) (:input-y options))
(let [[x y] (utils/unproject screen options)
_ (log/info (str "clicked " x y))
_ (log/info (str "clicked " x " " y))
interaction (get-interaction entities x y)
interacting-entity (get-interacting-entity entities x y)
current-action (get-in entities [:fg-actions :current])
@@ -489,6 +489,7 @@
(texture (aget grow-sheet 0 i))))
squat-talk (utils/make-anim global-atlas "ego/squat-talk" [18 36] 0.2 [0 1 0 2 1 0 3])
frog (utils/make-anim global-atlas "ego/frog" [16 36] 0.1 [0])
fall-small (utils/make-anim-seq global-atlas "ego/fall-small" [9 16] 0.1 [0])
frog-nod (utils/make-anim global-atlas "ego/frog" [16 36] 0.2 [0 1 0 1 0 1 0 1])
hold-up-to-window (utils/make-anim global-atlas "ego/hold-up-to-window" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0])
jump (utils/make-anim global-atlas "ego/swing" [36 75] 0.2 (flatten [[1 2]]))
@@ -562,6 +563,7 @@
:reach-start reach-start
:jump jump
:tongue-swing tongue-swing
:fall-small fall-small
:tongue-hit tongue-hit
:tongue-windup tongue-windup
:tongue-idle tongue-idle
@@ -611,6 +613,7 @@
:start-squat (utils/flip start-squat)
:start-squat-2 (utils/flip start-squat-2)
:end-squat (utils/flip end-squat)
:fall-small fall-small
:squat (utils/flip squat-anim)
:reach (utils/flip reach-anim)
:cat-toy (utils/flip cat-toy-anim)
@@ -776,6 +779,7 @@
(get-in ego [:right :axe]) {:origin-x 17}
(get-in ego [:right :axe-wood]) {:origin-x 17}
(get-in ego [:left :love]) {:origin-x 41}
(get-in ego [:left :fall-small]) {:origin-x 5 :origin-y 0}
(get-in ego [:left :suspended]) {:origin-x 0 :origin-y 0}
(get-in ego [:right :suspended]) {:origin-x 0 :origin-y 0}
(get-in ego [:left :suspended-talk]) {:origin-x 0 :origin-y 0}
@@ -1262,7 +1266,7 @@
:cat-tree {:day :town-2 :night :night :sunrise :night}
:inside-castle {:day :town-1 :night :night :sunrise :night}
:space :fight
:tongue-fight :fight
:tongue-fight :tongue-fight
:held :fight
:inside-cafeteria {:day :town-1 :night :night :sunrise :night}
:inside-antique :inside-antique
@@ -1289,6 +1293,7 @@
:town-1 (utils/make-music "music/town-music-1.ogg")
:town-2 (utils/make-music "music/town-music-2.ogg")
:love (utils/make-music "music/love.ogg")
:tongue-fight (utils/make-music "music/tongue-fight.ogg")
:inside-fangald (utils/make-music "music/inside-fangald.ogg")
:fight (utils/make-music "music/megaboss.mp3")
:pull-sword (utils/make-music "music/pull-sword.ogg")
@@ -1612,6 +1617,7 @@
(let [scene-entities (-> scene :entities deref)]
(and (not (get-in scene-entities [:fg-actions :script-running?]))
(get-in scene-entities [:state :active?])
(not= (get-in scene-entities [:state :last-room]) :tongue-fight)
(= 0.0 (get-in scene-entities [:fade :opacity])))))
(defmulti transition-hud (fn [screen entities new-state state-data]