From 11f2e70f0de10faa6ad921af7b77a123a7db45fd Mon Sep 17 00:00:00 2001 From: gered Date: Tue, 8 Mar 2016 16:52:17 -0500 Subject: [PATCH] add a "cannot-trigger?" encounter entity setting when true, indicates that combat events regarding this entity cannot trigger the encounter to start --- vwowrla.core/src/vwowrla/core/encounters/core.clj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vwowrla.core/src/vwowrla/core/encounters/core.clj b/vwowrla.core/src/vwowrla/core/encounters/core.clj index 17e0f7d..7ac8835 100644 --- a/vwowrla.core/src/vwowrla/core/encounters/core.clj +++ b/vwowrla.core/src/vwowrla/core/encounters/core.clj @@ -19,7 +19,10 @@ (->> defined-encounters (filter (fn [[_ {:keys [entities]}]] (->> entities - (filter #(= (first %) entity-name)) + (filter + (fn [[name {:keys [cannot-trigger?]}]] + (and (= entity-name name) + (not cannot-trigger?)))) (first)))) (ffirst)))