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

couple bugfixes.

Browse Source
This commit is contained in:
Remington Covert
2015-02-04 07:30:12 -08:00
parent ae7b3356b9
commit 41e75513f5
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,6 +331,6 @@
entities)
(if (= :night (get-in entities [:state :time]))
(make-night entities)
(utils/remove-interaction :rock)
(utils/remove-interaction entities :rock)
)))
:start-pos [203 1])))

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

@@ -115,6 +115,8 @@
(actions/transition-music entities :pull-sword :town-1)
(actions/do-dialogue entities :ego "That was weird."
:ego "I have to go show my friends!")
(walk-to-blergh entities)

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

@@ -122,7 +122,7 @@
:else (do-initial-peddler-conversation entities)))
(defn should-block? [entities]
(and (:night (get-in @entities [:state :time]))
(and (= :night (get-in @entities [:state :time]))
(actions/has-obtained? entities :flask-2)
(not (actions/has-item? entities :magic-slingshot))))