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

good progress on fight experience.

Browse Source
This commit is contained in:
Bryce Covert
2018-01-11 21:18:29 -08:00
parent 994669b132
commit 3ac732b172
61 changed files with 985 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@
[advent.screens.rooms.inside-antique :as rooms.inside-antique]
[advent.screens.rooms.behind-house :as rooms.behind-house]
[advent.screens.rooms.outside-castle :as rooms.outside-castle]
[advent.screens.rooms.tongue-fight :as rooms.tongue-fight]
[advent.screens.rooms.space :as rooms.space]
[advent.screens.rooms.held :as rooms.held]
[advent.screens.rooms.cat-tree :as rooms.cat-tree]
@@ -518,6 +519,9 @@
love (utils/make-anim-seq global-atlas "ego/love" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0]))
whistle (utils/make-anim-seq global-atlas "ego/whistle" [18 36] 0.2 (flatten [0 1 1 (repeat 200 [2 3])]))
axe (utils/make-anim global-atlas "ego/axe" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)]))
tongue-windup (utils/make-anim-seq global-atlas "ego/tongue-stance" [119 134] 0.05 [0 1 2 2 2 2 2 2 2 2])
tongue-swing (utils/make-anim-seq global-atlas "ego/tongue-stance" [119 134] 0.12 [ 3 4 5 6 ])
tongue-idle (utils/make-anim-seq global-atlas "ego/tongue-idle" [119 134] 0.7 [0 1])
axe-wood (utils/make-anim global-atlas "ego/axe-wood" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 11)]))
suspended (utils/make-anim global-atlas "ego/suspended" [20 36] 0.10 [0])
suspended-talk (utils/make-anim global-atlas "ego/suspended" [20 36] 0.20 (range 7))
@@ -556,6 +560,9 @@
:reach-down reach-down
:reach-start reach-start
:jump jump
:tongue-swing tongue-swing
:tongue-windup tongue-windup
:tongue-idle tongue-idle
:jump-straight jump-straight
:jumping-straight jumping-straight
:reach-stop reach-stop
@@ -615,6 +622,9 @@
:reach-down (utils/flip reach-down)
:reach-start (utils/flip reach-start)
:jump-straight (utils/flip jump-straight)
:tongue-swing tongue-swing
:tongue-windup tongue-windup
:tongue-idle tongue-idle
:jumping-straight (utils/flip jumping-straight)
:reach-stop (utils/flip reach-stop)
:shoot (utils/flip shoot)
@@ -739,6 +749,10 @@
(get-in ego [:left :frustrated-talk]) {:origin-x 7}
(get-in ego [:left :jump-straight]) {:origin-x 9}
(get-in ego [:right :jump-straight]) {:origin-x 9}
(get-in ego [:left :tongue-swing]) {:origin-x 41 :origin-y 15}
(get-in ego [:left :tongue-windup]) {:origin-x 41 :origin-y 15}
(get-in ego [:left :tongue-idle]) {:origin-x 41 :origin-y 15}
(get-in ego [:left :poke]) {:origin-x 10}
(get-in ego [:right :poke]) {:origin-x 10}
(get-in ego [:left :jumping-straight]) {:origin-x 9}
@@ -1225,6 +1239,7 @@
:cat-tree (wrap rooms.cat-tree/make "packed/cat-tree.atlas")
:inside-castle (wrap rooms.inside-castle/make "packed/inside-castle.atlas")
:space (wrap rooms.space/make "packed/space.atlas")
:tongue-fight (wrap rooms.tongue-fight/make "packed/tongue-fight.atlas")
:held (wrap rooms.held/make "packed/held.atlas")
:inside-cafeteria (wrap rooms.inside-cafeteria/make "packed/inside-cafeteria.atlas")
:inside-antique (wrap rooms.inside-antique/make "packed/inside-antique.atlas")
@@ -1243,6 +1258,7 @@
:cat-tree {:day :town-2 :night :night :sunrise :night}
:inside-castle {:day :town-1 :night :night :sunrise :night}
:space :fight
:tongue-fight :fight
:held :fight
:inside-cafeteria {:day :town-1 :night :night :sunrise :night}
:inside-antique :inside-antique