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

background script pt 1

Browse Source
This commit is contained in:
Bryce Covert
2015-11-19 17:39:24 -08:00
parent 462abe747b
commit ff04d07a0f
8 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@
[play-clj.g2d :refer :all]))
(defn taunt [screen entities]
(when (and (not (get-in entities [:actions :script-running?]))
(when (and (not (get-in entities [:fg-actions :script-running?]))
(get-in entities [:state :active?])
(not (get-in entities [:state :blergh-dead?]))
(not (actions/has-item? entities :magic-slingshot)))
@@ -30,7 +30,7 @@
nil)
(defn shock [screen entities]
(when (and (not (get-in entities [:actions :script-running?]))
(when (and (not (get-in entities [:fg-actions :script-running?]))
(get-in entities [:state :active?])
(not (get-in entities [:state :blergh-dead?]))
(actions/has-item? entities :magic-slingshot))