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

more scripting.

Browse Source
This commit is contained in:
Remington Covert
2015-03-11 18:20:40 -07:00
parent 0389ed6440
commit 5b76cd9644
5 changed files with 72 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop/src-common/advent/utils.clj
View File

@@ -132,12 +132,16 @@
(defn find-override [entities [x y]]
(first (concat (filter #(and ((:mouse-in? %) entities x y)
(:override %))
(get-in entities [:room :interactions]))
(filter #(and (:mouse-in? %)
((:mouse-in? %) entities x y))
((:mouse-in? %) entities x y)
(not= "ego" (:id %))
(:script %))
(vals (get-in entities [:room :entities])))
(filter #(and ((:mouse-in? %) entities x y))
(filter #(and ((:mouse-in? %) entities x y)
(:script %))
(get-in entities [:room :interactions])))))
@@ -209,6 +213,6 @@
(let [last-pos (unproject screen (get-in entities [:cursor :last-pos]))]
(if (get-in entities [:state :active?])
(if-let [mouse-override (find-override entities last-pos)]
(assoc-in entities [:cursor :override] (or (:cursor mouse-override) :active-main))
(assoc-in entities [:cursor :override] (or (:cursor mouse-override) (when (#{:main :active-main} (get-in entities [:cursor :last])) :active-main)))
(assoc-in entities [:cursor :override] nil))
entities)))