diff --git a/vwowrla.core/src/vwowrla/core/encounters/detection.clj b/vwowrla.core/src/vwowrla/core/encounters/detection.clj index 037d1cf..23f4daf 100644 --- a/vwowrla.core/src/vwowrla/core/encounters/detection.clj +++ b/vwowrla.core/src/vwowrla/core/encounters/detection.clj @@ -21,7 +21,7 @@ "returns true if the given parsed combat log line is between entities that have been specified to ignore interactions between for the purposes of detecting an encounter trigger" - [encounter :- Encounter + [encounter :- DefinedEncounter event :- CombatEvent] (->> (:entities encounter) (filter @@ -42,7 +42,7 @@ "returns true if the given parsed combat log line is for an encounter entity that is using a skill that has been specifically indicated should be ignored for the purposes of triggering an encounter" - [encounter :- Encounter + [encounter :- DefinedEncounter event :- CombatEvent] (->> (:entities encounter) (filter diff --git a/vwowrla.core/src/vwowrla/core/schemas.clj b/vwowrla.core/src/vwowrla/core/schemas.clj index 737b915..30c5fbe 100644 --- a/vwowrla.core/src/vwowrla/core/schemas.clj +++ b/vwowrla.core/src/vwowrla/core/schemas.clj @@ -23,6 +23,19 @@ :timezone java.util.TimeZone (s/optional-key :windows?) s/Bool}) +(def DefinedEncounterEntity + {:count s/Num + (s/optional-key :must-kill-count) s/Num + (s/optional-key :ignore-interactions-with) [s/Str] + (s/optional-key :ignore-skills) [s/Str]}) + +(def DefinedEncounter + {:entities {s/Str DefinedEncounterEntity} + (s/optional-key :trigger-on-damage?) s/Bool + (s/optional-key :trigger-on-aura?) s/Bool + (s/optional-key :trigger-on-debuff?) s/Bool + (s/optional-key :trigger-on-buff?) s/Bool}) + (def CombatEvent {:id s/Keyword :logfmt s/Keyword