Permalink
Browse files

Merge branch 'legion-dev' of https://github.com/simulationcraft/simc

…into legion-dev
  • Loading branch information...
2 parents 8410c49 + bd16c17 commit 2f0ab553c0d6ecb6972137d16b3dfec90f24aaae @Frostedmages Frostedmages committed Jan 11, 2017
Showing with 3,124 additions and 3,119 deletions.
  1. +115 −133 SpellDataDump/allspells.txt
  2. +7 −4 SpellDataDump/deathknight.txt
  3. +1 −1 SpellDataDump/demonhunter.txt
  4. +1 −1 SpellDataDump/druid.txt
  5. +3 −3 SpellDataDump/hunter.txt
  6. +5 −4 SpellDataDump/mage.txt
  7. +1 −1 SpellDataDump/monk.txt
  8. +1 −1 SpellDataDump/paladin.txt
  9. +1 −1 SpellDataDump/priest.txt
  10. +3 −2 SpellDataDump/rogue.txt
  11. +1 −1 SpellDataDump/shaman.txt
  12. +1 −1 SpellDataDump/warlock.txt
  13. +1 −1 SpellDataDump/warrior.txt
  14. +1 −1 WinReleaseScripts/WinCompileUpload_32.bat
  15. BIN dbc_extract3/cache/live/ArtifactPowerRank.adb
  16. BIN dbc_extract3/cache/live/CurvePoint.adb
  17. BIN dbc_extract3/cache/live/Item-sparse.adb
  18. BIN dbc_extract3/cache/live/Item.adb
  19. BIN dbc_extract3/cache/live/ItemSetSpell.adb
  20. BIN dbc_extract3/cache/live/Spell.adb
  21. BIN dbc_extract3/cache/live/SpellAuraOptions.adb
  22. BIN dbc_extract3/cache/live/SpellCategories.adb
  23. BIN dbc_extract3/cache/live/SpellClassOptions.adb
  24. BIN dbc_extract3/cache/live/SpellCooldowns.adb
  25. BIN dbc_extract3/cache/live/SpellDescriptionVariables.adb
  26. BIN dbc_extract3/cache/live/SpellEffect.adb
  27. BIN dbc_extract3/cache/live/SpellInterrupts.adb
  28. BIN dbc_extract3/cache/live/SpellItemEnchantment.adb
  29. BIN dbc_extract3/cache/live/SpellLabel.adb
  30. BIN dbc_extract3/cache/live/SpellMisc.adb
  31. BIN dbc_extract3/cache/live/SpellPower.adb
  32. BIN dbc_extract3/cache/live/SpellTargetRestrictions.adb
  33. +38 −32 engine/class_modules/sc_death_knight.cpp
  34. +17 −10 engine/class_modules/sc_demon_hunter.cpp
  35. +16 −4 engine/class_modules/sc_druid.cpp
  36. +4 −8 engine/class_modules/sc_hunter.cpp
  37. +15 −71 engine/class_modules/sc_monk.cpp
  38. +16 −26 engine/class_modules/sc_paladin.cpp
  39. +14 −62 engine/class_modules/sc_priest.cpp
  40. +33 −4 engine/class_modules/sc_shaman.cpp
  41. +8 −5 engine/class_modules/sc_warlock.cpp
  42. +2,606 −2,605 engine/dbc/generated/sc_item_data.inc
  43. +1 −1 engine/dbc/generated/sc_item_data2.inc
  44. +70 −65 engine/dbc/generated/sc_spell_data.inc
  45. +6 −0 engine/player/sc_unique_gear_x7.cpp
  46. +2 −3 engine/report/sc_report.cpp
  47. +21 −8 profiles/Tier19H/Death_Knight_Frost_T19H.simc
  48. +3 −3 profiles/Tier19H/Death_Knight_Unholy_T19H.simc
  49. +1 −1 profiles/Tier19H/Hunter_MM_T19H.simc
  50. +4 −3 profiles/Tier19H/Shaman_Elemental_T19H.simc
  51. +21 −8 profiles/Tier19H_NH/Death_Knight_Frost_T19H_NH.simc
  52. +3 −3 profiles/Tier19H_NH/Death_Knight_Unholy_T19H_NH.simc
  53. +21 −8 profiles/Tier19M/Death_Knight_Frost_T19M.simc
  54. +3 −3 profiles/Tier19M/Death_Knight_Unholy_T19M.simc
  55. +1 −1 profiles/Tier19M/Hunter_MM_T19M.simc
  56. +4 −3 profiles/Tier19M/Shaman_Elemental_T19M.simc
  57. +21 −8 profiles/Tier19M_NH/Death_Knight_Frost_T19M_NH.simc
  58. +3 −3 profiles/Tier19M_NH/Death_Knight_Unholy_T19M_NH.simc
  59. +1 −1 profiles/Tier19M_NH/generate_Priest_T19M_NH.simc
  60. +21 −8 profiles/Tier19P/Death_Knight_Frost_T19P.simc
  61. +3 −3 profiles/Tier19P/Death_Knight_Unholy_T19P.simc
  62. +1 −1 profiles/Tier19P/Hunter_MM_T19P.simc
  63. +4 −3 profiles/Tier19P/Shaman_Elemental_T19P.simc
Oops, something went wrong.
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Dual Wield (Passive) (id=674) [Passive]
Class : Frost Warrior, Hunter, Rogue, Death Knight, Monk, Demon Hunter
@@ -2136,9 +2136,11 @@ Attributes : ....x... ........ ..x..... ........ ........ .x...... .x...
: ........ ........ ........ ........ ........ ........ ........ ........
Effects :
#1 (id=95513) : Dummy (3)
- Base Value: 135 | Scaled Value: 135 | Target: Enemy(6)
+ Base Value: 80 | Scaled Value: 80 | Target: Enemy(6)
+ Hotfixed: Base Value (135 -> 80)
#2 (id=341774) : Weapon Damage% (31)
- Base Value: 135 | Scaled Value: 1.35 | Radius: 8 yards | Target: Cone Front(104)
+ Base Value: 80 | Scaled Value: 0.8 | Radius: 8 yards | Target: Cone Front(104)
+ Hotfixed: Base Value (135 -> 80)
Description : Rakes an enemy with deformed claws, dealing $91778s1% of normal damage as Shadow to the target and nearby enemies.
Name : Monstrous Blow (id=91797) [Spell Family (15)]
@@ -5676,7 +5678,8 @@ Attributes : ....x... ........ ..x..... ........ ........ .x...... .x...
: ........ ........ ........ ........ ........ ........ ........ ........
Effects :
#1 (id=314805) : Weapon Damage% (31)
- Base Value: 135 | Scaled Value: 1.35 | Radius: 0 - 10 yards | Target: Custom(18) -> AOE enemy (instant)(16)
+ Base Value: 80 | Scaled Value: 0.8 | Radius: 0 - 10 yards | Target: Custom(18) -> AOE enemy (instant)(16)
+ Hotfixed: Base Value (135 -> 80)
Description : $@spelldesc212333
Name : Dark Arbiter (id=212412) [Spell Family (15), Hidden]
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Dual Wield (Passive) (id=674) [Passive]
Class : Frost Warrior, Hunter, Rogue, Death Knight, Monk, Demon Hunter
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Incapacitating Roar (id=99) [Spell Family (7)]
Class : Guardian Druid
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Mend Pet (id=136) [Scaling Spell (4), Spell Family (9)]
Class : Hunter
@@ -2440,6 +2440,7 @@ Description : $@spelldesc109215
Tooltip : Increased movement speed by $s1%.
Name : Barrage (id=120360) [Spell Family (9)]
+Hotfixed : Variables
Class : Hunter
School : Physical
Resource : 60 Focus
@@ -2462,8 +2463,7 @@ Effects :
#1 (id=139839) : Apply Aura (6) | Periodic Trigger Spell: Barrage every 0.2 seconds (23)
Base Value: 0 | Scaled Value: 0 | Trigger Spell: 120361 | Target: Self(1)
Description : Rapidly fires a spray of shots for $120360d, dealing an average of $<damageSec> Physical damage to all enemies in front of you. Usable while moving.
-Variables : $damagePri=${($rw+$RW)/2*0.7*15*(1+$@versadmg)*(1+$193468m2/100)}
-$damageSec=$?s137015[${($rw+$RW)*(1+$137015s3/100)/2*0.7*7.5*(1+$@versadmg)*(1+$193468m2/100)}][${($rw+$RW)/2*0.7*7.5*(1+$@versadmg)*(1+$193468m2/100)}]
+Variables : $damageSec=${$120361sw2*8}
Name : Barrage (id=120361) [Spell Family (9)]
Class : Hunter
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Invisibility (id=66) [Spell Family (3)]
Class : Arcane Fire Frost Mage
@@ -4013,14 +4013,15 @@ Effects :
Description : Casting Pyroblast or Flamestrike while Hot Streak is active has a $s1% chance to instantly reactivate Hot Streak.
Name : Ray of Frost (id=205021) [Spell Family (3)]
+Hotfixed : Affecting Spells
Class : Mage
School : Frost
Spell Level : 1
Range : 40 yards
GCD : 1.5 seconds
Duration : 10 seconds
Cooldown : 60 seconds
-Affecting spells : Shatter (12982), Frost Mage (137020), Ray of Frost (208141), Norgannon's Foresight (236380)
+Affecting spells : Shatter (12982), Frost Mage (137020), Ray of Frost (208141), Frigid Winds (235224), Norgannon's Foresight (236380)
Attributes : ........ ........ ........ ........ ..x..... ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ .....x.. ........ ........
@@ -4913,7 +4914,7 @@ Name : Ice Lance (id=228598) [Scaling Spell (5), Spell Family (3)]
Class : Mage
School : Frost
Spell Level : 5
-Range : 40 yards
+Range : 100 yards
GCD : 1.5 seconds
Affecting spells : Shatter (12982), Splitting Ice (56377), Frost Mage (137020), Let It Go (195322), Chain Reaction (195418), Lonely Winter (205024), Magtheridon's Might (214404), Norgannon's Foresight (236380)
Attributes : ........ ........ x.x....x x..x.... .....x.. ........ ........ ........
@@ -5185,7 +5186,7 @@ Attributes : ......x. ........ ........ ........ ........ ........ .....
Effects :
#1 (id=355547) : Apply Aura (6) | Add Flat Modifier: Spell Effect 1 (107)
Base Value: -15 | Scaled Value: -15 | Misc Value: 3 | Target: Self(1)
- Affected Spells: Chilled (205708), Cone of Cold (212792), Flurry (228354)
+ Affected Spells: Ray of Frost (205021), Chilled (205708), Cone of Cold (212792), Flurry (228354)
Description : All of your chilling effects reduces the target's movement speed by an additional $s1%.
Name : Glacial Insulation (id=235297) [Spell Family (3), Passive]
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Dual Wield (Passive) (id=674) [Passive]
Class : Frost Warrior, Hunter, Rogue, Death Knight, Monk, Demon Hunter
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Block (Passive) (id=107) [Passive]
Class : Warrior, Paladin, Shaman
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Power Word: Shield (id=17) [Spell Family (6)]
Class : Discipline Shadow Priest
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Backstab (id=53) [Spell Family (8)]
Class : Subtlety Rogue
@@ -2311,6 +2311,7 @@ Effects :
Description : You may have a maximum of ${5+$m1} combo points. Finishers still consume a maximum of 5 combo points.
Name : Shroud of Concealment (id=114018) [Spell Family (8)]
+Hotfixed : Attributes
Class : Rogue
School : Physical
Spell Level : 68
@@ -2320,7 +2321,7 @@ Cooldown : 360 seconds
Stance Mask : 0x20000000
Attributes : ........ ........ ........ ........ .....x.. ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
- : ........ ........ ........ ........ ........ .x...... ........ ......x.
+ : ........ ........ x....... ........ ........ .x...... ........ ......x.
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ .....x.. ........ ........ ........ ........ ........ ........
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Block (Passive) (id=107) [Passive]
Class : Warrior, Paladin, Shaman
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Eye of Kilrogg (id=126) [Spell Family (5)]
Class : Warlock
@@ -1,4 +1,4 @@
-SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build b5b7250)
+SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build 4568440)
Name : Defensive Stance (id=71) [Spell Family (4), Passive, Hidden]
Class : Protection Warrior
@@ -12,7 +12,7 @@ set simcversion=715-01
set SIMCAPPFULLVERSION=7.1.5.01
:: For bumping the minor version, just change the above line. Make sure to also change setup32.iss and setup64.iss as well.
-set qt_dir=C:\Qt\Qt5.6.0.32\5.6\
+set qt_dir=C:\Qt\Qt5.7.1.32\5.7\
set visualstudio=%VS140COMNTOOLS:~0,-14%
cd ..
git clean -f -x -d
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 2f0ab55

Please sign in to comment.