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

fixed bug with throwing away all inventory.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-27 15:32:20 -08:00
parent 54021e18f8
commit 6d4a232c0d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
[play-clj.g2d :refer :all]))
(defn go-to-jail [entities]
(actions/update-state entities #(assoc % :chest-contents (remove #{:key} (:inventory %))))
(actions/update-state entities #(assoc % :chest-contents (concat (remove #{:key} (:inventory %)) (:chest-contents %))))
(actions/update-state entities #(assoc % :inventory []))
(actions/update-state entities #(assoc % :opened-bars? false))
(actions/transition-background entities :inside-jail [130 85]))

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

@@ -145,9 +145,9 @@
(aget warden-sheet 0 i)))
warden-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 2 (repeat 20 0) 2])]
(aget warden-sheet 0 i)))
warden-fall-asleep (animation 0.1 (for [i (flatten [(repeat 10 0) 2 2 (repeat 10 0) 2 2 2 2 2 2 2 (repeat 10 0) 2 2 2 2 2 2 2 ])]
warden-fall-asleep (animation 0.1 (for [i (flatten [(repeat 5 0) 2 2 (repeat 10 0) 2 2 2 2 2 2 2 (repeat 10 0) 2 2 2])]
(aget warden-sheet 0 i)))
warden-sleep (animation 0.5 (for [i (flatten [(repeat 5 2) 3])]
warden-sleep (animation 0.5 (for [i (flatten [ 3 3 2 2 2])]
(aget warden-sheet 0 i)))]
(rooms/make :music :inside-antique
:interactions {