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

no endless loop

Browse Source
This commit is contained in:
Bryce Covert
2015-08-14 18:56:52 -07:00
parent 95cdb05760
commit aef2e47b11
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/src-common/advent/actions.clj
View File

@@ -765,7 +765,7 @@
(- (:total-time screen) (get-in entities [:room :entities :ego :anim-start]))))) (- (:total-time screen) (get-in entities [:room :entities :ego :anim-start])))))
(terminate [this screen entities] (terminate [this screen entities]
entities) (stop screen entities :ego))
(skip-type [this screen entities] (skip-type [this screen entities]
:none))) :none)))

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

@@ -376,7 +376,6 @@
:cursor :up :cursor :up
:script (actions/get-script entities :script (actions/get-script entities
(actions/walk-to entities :ego [182 90] :face :left :skip-type :end) (actions/walk-to entities :ego [182 90] :face :left :skip-type :end)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(if (= :night (get-in @entities [:state :time])) (if (= :night (get-in @entities [:state :time]))
(actions/talk entities :ego "It's locked.") (actions/talk entities :ego "It's locked.")

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

@@ -629,6 +629,8 @@ void main()
:anim-merges {(get-in ego [:right :shock]) {:origin-x 15} :anim-merges {(get-in ego [:right :shock]) {:origin-x 15}
(get-in ego [:left :swing-shovel]) {:origin-x 26} (get-in ego [:left :swing-shovel]) {:origin-x 26}
(get-in ego [:right :swing-shovel]) {:origin-x 26} (get-in ego [:right :swing-shovel]) {:origin-x 26}
(get-in ego [:left :glad]) {:origin-x 11}
(get-in ego [:right :glad]) {:origin-x 11}
(get-in ego [:right :standup]) {:origin-x 32} (get-in ego [:right :standup]) {:origin-x 32}
(get-in ego [:right :crawl]) {:origin-x 32} (get-in ego [:right :crawl]) {:origin-x 32}
(get-in ego [:right :crawl-hide]) {:origin-x 32} (get-in ego [:right :crawl-hide]) {:origin-x 32}