diff --git a/vwowrla.core/src/vwowrla/core/matchers.clj b/vwowrla.core/src/vwowrla/core/matchers.clj index d581e54..5ade4c9 100644 --- a/vwowrla.core/src/vwowrla/core/matchers.clj +++ b/vwowrla.core/src/vwowrla/core/matchers.clj @@ -62,7 +62,8 @@ :damage (->int %4) :blocked (->int %5) :absorbed (->int %6) - :source-name "you")} + :source-name "you" + :damage-type :physical)} {:regex #"^Your (.+) (hits|crits) (.+) for (\d+)\.(?: \((\d+) blocked\))?(?: \((\d+) absorbed\))?$" :id :skill-damages-target-short-self @@ -75,7 +76,8 @@ :damage (->int %4) :blocked (->int %5) :absorbed (->int %6) - :source-name "you")} + :source-name "you" + :damage-type :physical)} {:regex #"^(.+?)'s (.+) (hits|crits) (.+) for (\d+) (.+) damage\.(?: \((\d+) resisted\))?(?: \((\d+) absorbed\))?$" :id :skill-damages-target-elemental @@ -103,7 +105,8 @@ :target-name %4 :damage (->int %5) :blocked (->int %6) - :absorbed (->int %7))} + :absorbed (->int %7) + :damage-type :physical)} {:regex #"^(.+?)'s (.+) (hits|crits) (.+) for (\d+)\.(?: \((\d+) blocked\))?(?: \((\d+) absorbed\))?$" :id :skill-damages-target-short @@ -116,7 +119,8 @@ :target-name %4 :damage (->int %5) :blocked (->int %6) - :absorbed (->int %7))} + :absorbed (->int %7) + :damage-type :physical)} ;;; --------------------------------------------------------------------------------------------- ;;; SKILL/SPELL MISSES / FULL-ABSORBS / FULL-RESISTS @@ -390,9 +394,11 @@ :damage (->int %4) :hit-type (cond (= %5 "glancing") :glancing - (= %6 "crushing") :crushing) + (= %6 "crushing") :crushing + :else :normal) :blocked (->int %7) - :absorbed (->int %8))} + :absorbed (->int %8) + :damage-type :physical)} {:regex #"^(.+) (hit|hits|crit|crits) (.+) for (\d+) (.+) damage\.(?: \((glancing)\))?(?: \((crushing)\))?(?: \((\d+) resisted\))?(?: \((\d+) absorbed\))?$" :id :melee-damages-target-elemental @@ -406,9 +412,11 @@ :damage-type (->kw %5) :hit-type (cond (= %6 "glancing") :glancing - (= %7 "crushing") :crushing) + (= %7 "crushing") :crushing + :else :normal) :resisted (->int %8) - :absorbed (->int %9))} + :absorbed (->int %9) + :damage-type :physical)} ;;; --------------------------------------------------------------------------------------------- ;;; MELEE DAMAGE AVOIDANCE (ABSORB/RESIST/MISS/BLOCK/DODGE/PARRY/EVADE) diff --git a/vwowrla.core/test/vwowrla/core/matchers/melee_damage_to_target_test.clj b/vwowrla.core/test/vwowrla/core/matchers/melee_damage_to_target_test.clj index 857cf1a..9df672a 100644 --- a/vwowrla.core/test/vwowrla/core/matchers/melee_damage_to_target_test.clj +++ b/vwowrla.core/test/vwowrla/core/matchers/melee_damage_to_target_test.clj @@ -30,7 +30,8 @@ :target-name "Lava Surger" :source-name "Eggs" :damage 175 - :hit-type nil + :damage-type :physical + :hit-type :normal :crit? false :absorbed nil :blocked nil})) @@ -44,7 +45,8 @@ :target-name "Lava Annihilator" :source-name owner-char-name :damage 187 - :hit-type nil + :damage-type :physical + :hit-type :normal :crit? false :absorbed nil :blocked nil})) @@ -58,7 +60,8 @@ :target-name "Futilian" :source-name "Lava Surger" :damage 1382 - :hit-type nil + :damage-type :physical + :hit-type :normal :crit? true :absorbed nil :blocked nil})) @@ -72,7 +75,8 @@ :target-name "Eggs" :source-name "Lava Surger" :damage 752 - :hit-type nil + :damage-type :physical + :hit-type :normal :crit? false :absorbed nil :blocked 81})) @@ -86,6 +90,7 @@ :target-name "Lava Surger" :source-name "Laurent" :damage 114 + :damage-type :physical :hit-type :glancing :crit? false :absorbed nil @@ -100,6 +105,7 @@ :target-name "Mightystroon" :source-name "Lucifron" :damage 1365 + :damage-type :physical :hit-type :crushing :crit? false :absorbed nil @@ -114,7 +120,8 @@ :target-name "Aesthetera" :source-name "Flame Imp" :damage 147 - :hit-type nil + :damage-type :physical + :hit-type :normal :crit? false :absorbed 395 :blocked nil})) @@ -128,7 +135,8 @@ :target-name "Eggs" :source-name "Magmadar" :damage 160 - :hit-type nil + :damage-type :physical + :hit-type :normal :crit? false :absorbed 607 :blocked 82})) @@ -142,6 +150,7 @@ :target-name "Mightystroon" :source-name "Gehennas" :damage 1530 + :damage-type :physical :hit-type :crushing :crit? false :absorbed 96 @@ -160,7 +169,7 @@ :source-name "Firelord" :damage 792 :damage-type :fire - :hit-type nil + :hit-type :normal :crit? false :absorbed nil :resisted nil})) @@ -176,7 +185,7 @@ :source-name "Twilight's Hammer Ambassador" :damage 42 :damage-type :fire - :hit-type nil + :hit-type :normal :crit? false :absorbed nil :resisted nil})) @@ -191,7 +200,7 @@ :source-name "Lava Spawn" :damage 1172 :damage-type :fire - :hit-type nil + :hit-type :normal :crit? true :absorbed nil :resisted nil})) @@ -206,7 +215,7 @@ :source-name "Firelord" :damage 480 :damage-type :fire - :hit-type nil + :hit-type :normal :crit? false :absorbed nil :resisted 160})) @@ -221,7 +230,7 @@ :source-name "Baron Geddon" :damage 1592 :damage-type :fire - :hit-type nil + :hit-type :normal :crit? false :absorbed 967 :resisted nil})) @@ -236,7 +245,7 @@ :source-name "Son of Flame" :damage 269 :damage-type :fire - :hit-type nil + :hit-type :normal :crit? false :absorbed 138 :resisted 135})) diff --git a/vwowrla.core/test/vwowrla/core/matchers/skill_damage_to_target_test.clj b/vwowrla.core/test/vwowrla/core/matchers/skill_damage_to_target_test.clj index 3c5d9c0..06cca10 100644 --- a/vwowrla.core/test/vwowrla/core/matchers/skill_damage_to_target_test.clj +++ b/vwowrla.core/test/vwowrla/core/matchers/skill_damage_to_target_test.clj @@ -188,6 +188,7 @@ :target-name "Lava Surger" :skill "Ambush" :damage 1398 + :damage-type :physical :crit? true :absorbed nil :blocked nil})) @@ -202,6 +203,7 @@ :target-name "Lava Surger" :skill "Shield Slam" :damage 240 + :damage-type :physical :crit? false :absorbed nil :blocked nil})) @@ -216,6 +218,7 @@ :target-name "Lava Surger" :skill "Whirlwind" :damage 902 + :damage-type :physical :crit? true :absorbed nil :blocked 31})) @@ -230,6 +233,7 @@ :target-name "Architrex" :skill "Earthquake" :damage 1034 + :damage-type :physical :crit? false :absorbed 460 :blocked nil})))