Skip to content

Commit

Permalink
Merge branch 'legion-dev' of https://github.com/simulationcraft/simc
Browse files Browse the repository at this point in the history
…into legion-dev
  • Loading branch information
Hinalover committed Jan 10, 2017
2 parents 535d8d7 + 6705182 commit 4158e2f
Show file tree
Hide file tree
Showing 77 changed files with 231 additions and 155 deletions.
110 changes: 67 additions & 43 deletions SpellDataDump/allspells.txt

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions SpellDataDump/deathknight.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 8d6ad52)
SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build e5ada11)

Name : Dual Wield (Passive) (id=674) [Passive]
Class : Frost Warrior, Hunter, Rogue, Death Knight, Monk, Demon Hunter
Expand Down Expand Up @@ -1060,7 +1060,8 @@ Attributes : ........ ........ x....... ........ ........ ........ .....
: ........ ........ ........ ........ ........ ........ ........ ........
Effects :
#1 (id=44400) : School Damage: shadowstorm (2)
Base Value: 1 | Scaled Value: 0 (avg=0.5, dl=0.5) | Value Multiplier: 1 | SP Coefficient: 2.00000 | Target: Enemy(6)
Base Value: 1 | Scaled Value: 0 (avg=0.5, dl=0.15) | Value Multiplier: 1 | SP Coefficient: 2.00000 | Target: Enemy(6)
Hotfixed: Delta (0.5 -> 0.15)
Description : Inflicts Plague (Nature and Shadow) damage to an enemy.

Name : On a Pale Horse (id=51986) [Spell Family (15), Passive]
Expand Down Expand Up @@ -4346,7 +4347,8 @@ Attributes : ........ ........ ..x..... ........ ........ ........ .....
: ........ ........ ........ ........ ........ ........ ........ ........
Effects :
#1 (id=292108) : School Damage: shadow (2)
Base Value: 0 | Scaled Value: 0 | AP Coefficient: 7.00000 | Target: Enemy(6)
Base Value: 0 | Scaled Value: 0 | AP Coefficient: 7.50000 | Target: Enemy(6)
Hotfixed: AP Coefficient (7 -> 7.5)
Description : Inflicts Shadow damage to an enemy.

Name : Shadow Infusion (id=198943) [Spell Family (15), Passive]
Expand Down
56 changes: 32 additions & 24 deletions SpellDataDump/demonhunter.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 8d6ad52)
SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build e5ada11)

Name : Dual Wield (Passive) (id=674) [Passive]
Class : Frost Warrior, Hunter, Rogue, Death Knight, Monk, Demon Hunter
Expand Down Expand Up @@ -375,7 +375,7 @@ Resource : 30 Fury
GCD : 1.5 seconds
Duration : 5 seconds
Cooldown : 60 seconds
Affecting spells : Mastery: Demonic Presence (185164), Unleashed Power (206477),
Affecting spells : Mastery: Demonic Presence (185164), Unleashed Power (206477), Havoc Demon Hunter (212612)
Attributes : ....x... ........ ........ ........ ...x...x .x...... ........ ........
: ........ ........ .x...... ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
Expand Down Expand Up @@ -728,7 +728,7 @@ Name : Fel Rush (id=192611) [Spell Family (107)]
Class : Demon Hunter
School : Chaos
Range : 50000 yards
Affecting spells : Mastery: Demonic Presence (185164), Fel Mastery (192939)
Affecting spells : Mastery: Demonic Presence (185164), Fel Mastery (192939), Havoc Demon Hunter (212612)
Attributes : ....x... ........ ........ ........ ........ .x...... ........ ........
: ..x..... ........ ........ ........ ........ .x...... ........ ........
: .......x ........ ........ ........ ........ ........ ........ ..x.....
Expand Down Expand Up @@ -1007,7 +1007,7 @@ Name : Chaos Strike (id=199547) [Spell Family (107)]
Class : Demon Hunter
School : Chaos
Range : 15 yards
Affecting spells : Mastery: Demonic Presence (185164), Critical Chaos (201455), Warglaives of Chaos (214795)
Affecting spells : Mastery: Demonic Presence (185164), Critical Chaos (201455), Havoc Demon Hunter (212612), Warglaives of Chaos (214795)
Triggered by : Chaos Strike (162794)
Attributes : ....x... ........ x.x..... ........ ........ .x...... ........ ........
: ........ ........ ........ ........ ........ .x...... ........ x.....x.
Expand All @@ -1026,7 +1026,7 @@ Description : $@spelldesc162794
Name : Blade Dance (id=199552) [Spell Family (107)]
Class : Demon Hunter
School : Physical
Affecting spells : Metamorphosis (162264), First Blood (206416)
Affecting spells : Metamorphosis (162264), First Blood (206416), Havoc Demon Hunter (212612)
Triggered by : Blade Dance (188499)
Attributes : ....x... ........ ..x..... ........ ........ .x...... ........ ........
: ........ ........ ........ ........ ........ ..x..... ........ ........
Expand All @@ -1045,7 +1045,7 @@ Name : Metamorphosis (id=200166) [Spell Family (107)]
Class : Demon Hunter
School : Chromatic
Duration : 3 seconds
Affecting spells : Mastery: Demonic Presence (185164)
Affecting spells : Mastery: Demonic Presence (185164), Havoc Demon Hunter (212612)
Attributes : ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
Expand All @@ -1063,7 +1063,7 @@ Tooltip : Stunned.
Name : Blade Dance (id=200685) [Spell Family (107)]
Class : Demon Hunter
School : Physical
Affecting spells : Metamorphosis (162264), First Blood (206416)
Affecting spells : Metamorphosis (162264), First Blood (206416), Havoc Demon Hunter (212612)
Triggered by : Blade Dance (188499)
Attributes : ....x... ........ ..x..... ........ ........ .x...... ........ ........
: ........ ........ ........ ........ ........ ..x..... ........ ........
Expand Down Expand Up @@ -1123,7 +1123,7 @@ Name : Annihilation (id=201428) [Spell Family (107)]
Class : Demon Hunter
School : Chaos
Range : 15 yards
Affecting spells : Mastery: Demonic Presence (185164), Critical Chaos (201455), Warglaives of Chaos (214795)
Affecting spells : Mastery: Demonic Presence (185164), Critical Chaos (201455), Havoc Demon Hunter (212612), Warglaives of Chaos (214795)
Triggered by : Annihilation (201427)
Attributes : ....x... ........ x.x..... ........ ........ .x...... ........ ...x....
: ........ ........ ........ ........ ........ .x...... ........ x.......
Expand Down Expand Up @@ -1204,7 +1204,7 @@ Name : Fury of the Illidari (id=201628) [Spell Family (107)]
Class : Demon Hunter
School : Chaos
Range : 100 yards
Affecting spells : Mastery: Demonic Presence (185164)
Affecting spells : Mastery: Demonic Presence (185164), Havoc Demon Hunter (212612)
Attributes : ........ ........ ........ .......x ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: x......x ........ ........ ........ ...x.... ........ .xx..... ..x.....
Expand All @@ -1223,7 +1223,7 @@ Name : Fury of the Illidari (id=201789) [Spell Family (107)]
Class : Demon Hunter
School : Chaos
Range : 100 yards
Affecting spells : Mastery: Demonic Presence (185164)
Affecting spells : Mastery: Demonic Presence (185164), Havoc Demon Hunter (212612)
Attributes : ........ ........ ........ .......x ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ x.......
: x......x ........ ........ ........ ...x.... ........ .xx..... ..x.....
Expand Down Expand Up @@ -1441,9 +1441,10 @@ Effects :
Description : Reduces the cooldown of Vengeful Retreat by 10 sec, and generates $203650s1 Fury over $203650d if you damage at least one enemy with Vengeful Retreat.

Name : Demon Blades (id=203555) [Spell Family (107), Passive]
Hotfixed : Proc Chance (65 -> 60)
Class : Demon Hunter
School : Physical
Proc Chance : 65%
Proc Chance : 60%
Proc Flags : ..x..... ........ ........ ........
: White Melee
Attributes : ......x. x....... ........ ........ ........ ........ ........ ........
Expand Down Expand Up @@ -2037,9 +2038,11 @@ Attributes : ......x. ........ ........ ........ ........ ........ .....
: Passive (6)
Effects :
#1 (id=305360) : Apply Aura (6) | Proc Trigger Spell (42)
Base Value: 25 | Scaled Value: 25 | Target: Self(1)
Base Value: 0 | Scaled Value: 0 | Target: Self(1)
Hotfixed: Base Value (25 -> 0)
#2 (id=344817) : Apply Aura (6) | Dummy (4)
Base Value: 25 | Scaled Value: 25 | Misc Value: 17 | Target: Self(1)
Base Value: 10 | Scaled Value: 10 | Misc Value: 17 | Target: Self(1)
Hotfixed: Base Value (25 -> 10)
Description : Chaos Strike hits all nearby enemies for an additional $s2% damage.

Name : Momentum (id=206476) [Spell Family (107), Passive]
Expand Down Expand Up @@ -2702,7 +2705,7 @@ Tooltip : Dodge chance increased by $s3%.
Name : Death Sweep (id=210153) [Spell Family (107)]
Class : Demon Hunter
School : Physical
Affecting spells : First Blood (206416)
Affecting spells : First Blood (206416), Havoc Demon Hunter (212612)
Triggered by : Death Sweep (210152)
Attributes : ....x... ........ ..x..... ........ ........ .x...... ........ ........
: ........ ........ ........ ........ ........ ..x..... ........ ........
Expand All @@ -2720,7 +2723,7 @@ Description : $@spelldesc210152
Name : Death Sweep (id=210155) [Spell Family (107)]
Class : Demon Hunter
School : Physical
Affecting spells : First Blood (206416)
Affecting spells : First Blood (206416), Havoc Demon Hunter (212612)
Triggered by : Death Sweep (210152)
Attributes : ....x... ........ ..x..... ........ ........ .x...... ........ ........
: ........ ........ ........ ........ ........ ..x..... ........ ........
Expand Down Expand Up @@ -2777,11 +2780,12 @@ Tooltip : Damage done increased by $w2%.
Auto attack damage increased by $s1%, and deal Chaos damage.

Name : Fel Barrage (id=211052) [Spell Family (107)]
Hotfixed : Affecting Spells
Class : Demon Hunter
School : Magic
Range : 100 yards
Velocity : 22 yards/sec
Affecting spells : Mastery: Demonic Presence (185164)
Affecting spells : Mastery: Demonic Presence (185164), Havoc Demon Hunter (212612)
Attributes : ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ......x.
: ........ ........ ........ ........ ........ ........ ........ ........
Expand All @@ -2801,6 +2805,7 @@ GCD : 1.5 seconds
Duration : 1 seconds
Charges : 5 (30 seconds cooldown)
Category : 1619
Affecting spells : Havoc Demon Hunter (212612)
Attributes : ........ ........ ........ ........ ..x..... ........ ........ ........
: x....... ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ .x...... ........ ........
Expand Down Expand Up @@ -3001,10 +3006,13 @@ Effects :
Base Value: 0 | Scaled Value: 0 | Misc Value: 1612 | Target: Self(1)
#5 (id=315239) : Apply Aura (6) | Unknown effect sub type (218)
Base Value: -50 | Scaled Value: -50 | Misc Value: 3 | Misc Value 2: 0xf7 | Target: Self(1)
#6 (id=315240) : Apply Aura (6) | Dummy (4)
Base Value: 0 | Scaled Value: 0 | Target: Self(1)
#7 (id=315241) : Apply Aura (6) | Dummy (4)
Base Value: 0 | Scaled Value: 0 | Target: Self(1)
#6 (id=315240) : Apply Aura (6) | Add Percent Modifier: Generic Modifier (108)
Base Value: 10 | Scaled Value: 10 | Target: Self(1)
Affected Spells: Demon's Bite (162243), Chaos Nova (179057), Throw Glaive (185123), Blade Dance (188499), Fel Rush (192611), Eye Beam (198030), Chaos Strike (199547), Blade Dance (199552), Metamorphosis (200166), Blade Dance (200685), Annihilation (201428), Fury of the Illidari (201467), Fury of the Illidari (201628), Fury of the Illidari (201789), Demon Blades (203796), Throw Glaive (204157), Death Sweep (210152), Death Sweep (210153), Death Sweep (210155), Fel Barrage (211052), Fel Barrage (211053), Felblade (213241), Felblade (213243), Chaos Strike (222031), Fel Eruption (225102), Annihilation (227518), Felblade (232893)
Hotfixed: Sub Type (4 -> 108), Base Value (0 -> 10), Affects Spells
#7 (id=315241) : Apply Aura (6) | Add Percent Modifier: Spell Periodic Damage (108)
Base Value: 10 | Scaled Value: 10 | Misc Value: 22 | Target: Self(1)
Hotfixed: Sub Type (4 -> 108), Base Value (0 -> 10), Misc Value (0 -> 22)
#8 (id=315242) : Apply Aura (6) | Dummy (4)
Base Value: 0 | Scaled Value: 0 | Target: Self(1)
#9 (id=315243) : Apply Aura (6) | Dummy (4)
Expand Down Expand Up @@ -3150,7 +3158,7 @@ Class : Demon Hunter
School : Fire
Spell Level : 98
Range : 15 yards
Affecting spells : Item - Demon Hunter T19 Havoc 2P Bonus (211054), Vengeance Demon Hunter (212613)
Affecting spells : Item - Demon Hunter T19 Havoc 2P Bonus (211054), Havoc Demon Hunter (212612), Vengeance Demon Hunter (212613)
Attributes : ....x... ........ ..x..... ........ ........ .x...... ........ ........
: ........ ........ ........ ........ ........ ..x..... ........ ........
: ........ ........ ........ ........ ........ ........ ........ .x......
Expand Down Expand Up @@ -3438,7 +3446,7 @@ Name : Chaos Strike (id=222031) [Spell Family (107)]
Class : Demon Hunter
School : Chaos
Range : 15 yards
Affecting spells : Mastery: Demonic Presence (185164), Critical Chaos (201455), Warglaives of Chaos (214795)
Affecting spells : Mastery: Demonic Presence (185164), Critical Chaos (201455), Havoc Demon Hunter (212612), Warglaives of Chaos (214795)
Triggered by : Chaos Strike (162794)
Attributes : ....x... ........ x.x..... ........ ........ .x...... ........ ........
: ........ ........ ........ ........ ........ .xx..... ........ ......x.
Expand Down Expand Up @@ -3500,7 +3508,7 @@ Name : Fel Eruption (id=225102) [Spell Family (107)]
Class : Demon Hunter
School : Chromatic
Range : 20 yards
Affecting spells : Mastery: Demonic Presence (185164), Vengeance Demon Hunter (212613)
Affecting spells : Mastery: Demonic Presence (185164), Havoc Demon Hunter (212612), Vengeance Demon Hunter (212613)
Attributes : ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
Expand Down Expand Up @@ -3648,7 +3656,7 @@ Name : Annihilation (id=227518) [Spell Family (107)]
Class : Demon Hunter
School : Chaos
Range : 15 yards
Affecting spells : Mastery: Demonic Presence (185164), Critical Chaos (201455), Warglaives of Chaos (214795)
Affecting spells : Mastery: Demonic Presence (185164), Critical Chaos (201455), Havoc Demon Hunter (212612), Warglaives of Chaos (214795)
Triggered by : Annihilation (201427)
Attributes : ....x... ........ x.x..... ........ ........ .x...... ........ ........
: ........ ........ ........ ........ ........ .xx..... ........ ......x.
Expand Down
2 changes: 1 addition & 1 deletion SpellDataDump/druid.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 8d6ad52)
SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build e5ada11)

Name : Incapacitating Roar (id=99) [Spell Family (7)]
Class : Guardian Druid
Expand Down
Loading

0 comments on commit 4158e2f

Please sign in to comment.