gered/vwowrla
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

always specify hit-type and damage-type when relevant

Browse source 
hit-type is now always :normal if it was specifically being set as nil
before. damage-type is now always :physical for all non-elemental damage
This commit is contained in:
Gered 2016-02-27 22:14:03 -05:00
parent 4bdcb041f8
commit bca76d7c16
3 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
vwowrla.core/src/vwowrla/core/matchers.clj
View file

@ -62,7 +62,8 @@
:damage (->int %4) :damage (->int %4)
:blocked (->int %5) :blocked (->int %5)
:absorbed (->int %6) :absorbed (->int %6)
:source-name "you")} :source-name "you"
:damage-type :physical)}
{:regex #"^Your (.+) (hits|crits) (.+) for (\d+)\.(?: \((\d+) blocked\))?(?: \((\d+) absorbed\))?$" {:regex #"^Your (.+) (hits|crits) (.+) for (\d+)\.(?: \((\d+) blocked\))?(?: \((\d+) absorbed\))?$"
:id :skill-damages-target-short-self :id :skill-damages-target-short-self
@ -75,7 +76,8 @@
:damage (->int %4) :damage (->int %4)
:blocked (->int %5) :blocked (->int %5)
:absorbed (->int %6) :absorbed (->int %6)
:source-name "you")} :source-name "you"
:damage-type :physical)}
{:regex #"^(.+?)'s (.+) (hits|crits) (.+) for (\d+) (.+) damage\.(?: \((\d+) resisted\))?(?: \((\d+) absorbed\))?$" {:regex #"^(.+?)'s (.+) (hits|crits) (.+) for (\d+) (.+) damage\.(?: \((\d+) resisted\))?(?: \((\d+) absorbed\))?$"
:id :skill-damages-target-elemental :id :skill-damages-target-elemental
@ -103,7 +105,8 @@
:target-name %4 :target-name %4
:damage (->int %5) :damage (->int %5)
:blocked (->int %6) :blocked (->int %6)
:absorbed (->int %7))} :absorbed (->int %7)
:damage-type :physical)}
{:regex #"^(.+?)'s (.+) (hits|crits) (.+) for (\d+)\.(?: \((\d+) blocked\))?(?: \((\d+) absorbed\))?$" {:regex #"^(.+?)'s (.+) (hits|crits) (.+) for (\d+)\.(?: \((\d+) blocked\))?(?: \((\d+) absorbed\))?$"
:id :skill-damages-target-short :id :skill-damages-target-short
@ -116,7 +119,8 @@
:target-name %4 :target-name %4
:damage (->int %5) :damage (->int %5)
:blocked (->int %6) :blocked (->int %6)
:absorbed (->int %7))} :absorbed (->int %7)
:damage-type :physical)}
;;; --------------------------------------------------------------------------------------------- ;;; ---------------------------------------------------------------------------------------------
;;; SKILL/SPELL MISSES / FULL-ABSORBS / FULL-RESISTS ;;; SKILL/SPELL MISSES / FULL-ABSORBS / FULL-RESISTS
@ -390,9 +394,11 @@
:damage (->int %4) :damage (->int %4)
:hit-type (cond :hit-type (cond
(= %5 "glancing") :glancing (= %5 "glancing") :glancing
(= %6 "crushing") :crushing) (= %6 "crushing") :crushing
:else :normal)
:blocked (->int %7) :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\))?$" {:regex #"^(.+) (hit|hits|crit|crits) (.+) for (\d+) (.+) damage\.(?: \((glancing)\))?(?: \((crushing)\))?(?: \((\d+) resisted\))?(?: \((\d+) absorbed\))?$"
:id :melee-damages-target-elemental :id :melee-damages-target-elemental
@ -406,9 +412,11 @@
:damage-type (->kw %5) :damage-type (->kw %5)
:hit-type (cond :hit-type (cond
(= %6 "glancing") :glancing (= %6 "glancing") :glancing
(= %7 "crushing") :crushing) (= %7 "crushing") :crushing
:else :normal)
:resisted (->int %8) :resisted (->int %8)
:absorbed (->int %9))} :absorbed (->int %9)
:damage-type :physical)}
;;; --------------------------------------------------------------------------------------------- ;;; ---------------------------------------------------------------------------------------------
;;; MELEE DAMAGE AVOIDANCE (ABSORB/RESIST/MISS/BLOCK/DODGE/PARRY/EVADE) ;;; MELEE DAMAGE AVOIDANCE (ABSORB/RESIST/MISS/BLOCK/DODGE/PARRY/EVADE)

33
vwowrla.core/test/vwowrla/core/matchers/melee_damage_to_target_test.clj
View file

@ -30,7 +30,8 @@
:target-name "Lava Surger" :target-name "Lava Surger"
:source-name "Eggs" :source-name "Eggs"
:damage 175 :damage 175
:hit-type nil :damage-type :physical
:hit-type :normal
:crit? false :crit? false
:absorbed nil :absorbed nil
:blocked nil})) :blocked nil}))
@ -44,7 +45,8 @@
:target-name "Lava Annihilator" :target-name "Lava Annihilator"
:source-name owner-char-name :source-name owner-char-name
:damage 187 :damage 187
:hit-type nil :damage-type :physical
:hit-type :normal
:crit? false :crit? false
:absorbed nil :absorbed nil
:blocked nil})) :blocked nil}))
@ -58,7 +60,8 @@
:target-name "Futilian" :target-name "Futilian"
:source-name "Lava Surger" :source-name "Lava Surger"
:damage 1382 :damage 1382
:hit-type nil :damage-type :physical
:hit-type :normal
:crit? true :crit? true
:absorbed nil :absorbed nil
:blocked nil})) :blocked nil}))
@ -72,7 +75,8 @@
:target-name "Eggs" :target-name "Eggs"
:source-name "Lava Surger" :source-name "Lava Surger"
:damage 752 :damage 752
:hit-type nil :damage-type :physical
:hit-type :normal
:crit? false :crit? false
:absorbed nil :absorbed nil
:blocked 81})) :blocked 81}))
@ -86,6 +90,7 @@
:target-name "Lava Surger" :target-name "Lava Surger"
:source-name "Laurent" :source-name "Laurent"
:damage 114 :damage 114
:damage-type :physical
:hit-type :glancing :hit-type :glancing
:crit? false :crit? false
:absorbed nil :absorbed nil
@ -100,6 +105,7 @@
:target-name "Mightystroon" :target-name "Mightystroon"
:source-name "Lucifron" :source-name "Lucifron"
:damage 1365 :damage 1365
:damage-type :physical
:hit-type :crushing :hit-type :crushing
:crit? false :crit? false
:absorbed nil :absorbed nil
@ -114,7 +120,8 @@
:target-name "Aesthetera" :target-name "Aesthetera"
:source-name "Flame Imp" :source-name "Flame Imp"
:damage 147 :damage 147
:hit-type nil :damage-type :physical
:hit-type :normal
:crit? false :crit? false
:absorbed 395 :absorbed 395
:blocked nil})) :blocked nil}))
@ -128,7 +135,8 @@
:target-name "Eggs" :target-name "Eggs"
:source-name "Magmadar" :source-name "Magmadar"
:damage 160 :damage 160
:hit-type nil :damage-type :physical
:hit-type :normal
:crit? false :crit? false
:absorbed 607 :absorbed 607
:blocked 82})) :blocked 82}))
@ -142,6 +150,7 @@
:target-name "Mightystroon" :target-name "Mightystroon"
:source-name "Gehennas" :source-name "Gehennas"
:damage 1530 :damage 1530
:damage-type :physical
:hit-type :crushing :hit-type :crushing
:crit? false :crit? false
:absorbed 96 :absorbed 96
@ -160,7 +169,7 @@
:source-name "Firelord" :source-name "Firelord"
:damage 792 :damage 792
:damage-type :fire :damage-type :fire
:hit-type nil :hit-type :normal
:crit? false :crit? false
:absorbed nil :absorbed nil
:resisted nil})) :resisted nil}))
@ -176,7 +185,7 @@
:source-name "Twilight's Hammer Ambassador" :source-name "Twilight's Hammer Ambassador"
:damage 42 :damage 42
:damage-type :fire :damage-type :fire
:hit-type nil :hit-type :normal
:crit? false :crit? false
:absorbed nil :absorbed nil
:resisted nil})) :resisted nil}))
@ -191,7 +200,7 @@
:source-name "Lava Spawn" :source-name "Lava Spawn"
:damage 1172 :damage 1172
:damage-type :fire :damage-type :fire
:hit-type nil :hit-type :normal
:crit? true :crit? true
:absorbed nil :absorbed nil
:resisted nil})) :resisted nil}))
@ -206,7 +215,7 @@
:source-name "Firelord" :source-name "Firelord"
:damage 480 :damage 480
:damage-type :fire :damage-type :fire
:hit-type nil :hit-type :normal
:crit? false :crit? false
:absorbed nil :absorbed nil
:resisted 160})) :resisted 160}))
@ -221,7 +230,7 @@
:source-name "Baron Geddon" :source-name "Baron Geddon"
:damage 1592 :damage 1592
:damage-type :fire :damage-type :fire
:hit-type nil :hit-type :normal
:crit? false :crit? false
:absorbed 967 :absorbed 967
:resisted nil})) :resisted nil}))
@ -236,7 +245,7 @@
:source-name "Son of Flame" :source-name "Son of Flame"
:damage 269 :damage 269
:damage-type :fire :damage-type :fire
:hit-type nil :hit-type :normal
:crit? false :crit? false
:absorbed 138 :absorbed 138
:resisted 135})) :resisted 135}))

4
vwowrla.core/test/vwowrla/core/matchers/skill_damage_to_target_test.clj
View file

@ -188,6 +188,7 @@
:target-name "Lava Surger" :target-name "Lava Surger"
:skill "Ambush" :skill "Ambush"
:damage 1398 :damage 1398
:damage-type :physical
:crit? true :crit? true
:absorbed nil :absorbed nil
:blocked nil})) :blocked nil}))
@ -202,6 +203,7 @@
:target-name "Lava Surger" :target-name "Lava Surger"
:skill "Shield Slam" :skill "Shield Slam"
:damage 240 :damage 240
:damage-type :physical
:crit? false :crit? false
:absorbed nil :absorbed nil
:blocked nil})) :blocked nil}))
@ -216,6 +218,7 @@
:target-name "Lava Surger" :target-name "Lava Surger"
:skill "Whirlwind" :skill "Whirlwind"
:damage 902 :damage 902
:damage-type :physical
:crit? true :crit? true
:absorbed nil :absorbed nil
:blocked 31})) :blocked 31}))
@ -230,6 +233,7 @@
:target-name "Architrex" :target-name "Architrex"
:skill "Earthquake" :skill "Earthquake"
:damage 1034 :damage 1034
:damage-type :physical
:crit? false :crit? false
:absorbed 460 :absorbed 460
:blocked nil}))) :blocked nil})))