Merge branch 'master' into feature/bear

Author: Bisonpasfute

assets/database/db.bin

@@ -9541,7 +9541,6 @@
 {"id":635,"name":"Holy Light","icon":"spell_holy_holybolt","rank":1},
 {"id":639,"name":"Holy Light","icon":"spell_holy_holybolt","rank":2},
 {"id":647,"name":"Holy Light","icon":"spell_holy_holybolt","rank":3},
-{"id":689,"name":"Drain Life","icon":"spell_shadow_lifedrain02","rank":1,"hasBuff":true},
 {"id":702,"name":"Curse of Weakness","icon":"spell_shadow_curseofmannoroth","rank":1,"hasBuff":true},
 {"id":724,"name":"Lightwell","icon":"spell_holy_summonlightwell","rank":1},
 {"id":768,"name":"Cat Form","icon":"ability_druid_catform","hasBuff":true},
@@ -11198,6 +11197,7 @@
 {"id":27215,"name":"Immolate","icon":"spell_fire_immolation","rank":9,"hasBuff":true},
 {"id":27216,"name":"Corruption","icon":"spell_shadow_abominationexplosion","rank":8,"hasBuff":true},
 {"id":27218,"name":"Curse of Agony","icon":"spell_shadow_curseofsargeras","rank":7,"hasBuff":true},
+{"id":27220,"name":"Drain Life","icon":"spell_shadow_lifedrain02","rank":8,"hasBuff":true},
 {"id":27222,"name":"Life Tap","icon":"spell_shadow_burningspirit","rank":7},
 {"id":27223,"name":"Death Coil","icon":"spell_shadow_deathcoil","rank":4,"hasBuff":true},
 {"id":27226,"name":"Curse of Recklessness","icon":"spell_shadow_unholystrength","rank":5,"hasBuff":true},
@@ -12200,8 +12200,8 @@
 {"id":22851,"type":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,500,0,0,0,0,0,0,0,0],"name":"Flask of Fortification","buffDuration":7200,"categoryCooldownDuration":3},
 {"id":22853,"type":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0],"name":"Flask of Mighty Restoration","buffDuration":7200,"categoryCooldownDuration":3},
 {"id":22854,"type":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Relentless Assault","buffDuration":7200,"categoryCooldownDuration":3},
-{"id":22861,"type":2,"stats":[0,0,0,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Blinding Light","buffDuration":7200,"categoryCooldownDuration":3},
-{"id":22866,"type":2,"stats":[0,0,0,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Pure Death","buffDuration":7200,"categoryCooldownDuration":3},
+{"id":22861,"type":2,"stats":[0,0,0,0,0,0,80,0,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Blinding Light","buffDuration":7200,"categoryCooldownDuration":3},
+{"id":22866,"type":2,"stats":[0,0,0,0,0,0,0,80,80,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Pure Death","buffDuration":7200,"categoryCooldownDuration":3},
 {"id":22871,"type":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Shrouding Potion","categoryCooldownDuration":120},
 {"id":23334,"type":10,"stats":[0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Cracked Power Core","buffDuration":30,"cooldownDuration":3600,"categoryCooldownDuration":120},
 {"id":23381,"type":10,"stats":[0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Chipped Power Core","buffDuration":30,"cooldownDuration":3600,"categoryCooldownDuration":120},

assets/database/db.json

@@ -156,8 +156,8 @@
 {"effectId":931,"spellId":13928,"name":"Enchant Gloves - Minor Haste","icon":"trade_engraving","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"itemId":22552,"spellId":27967,"name":"Enchant Weapon - Major Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1704,"itemId":12645,"spellId":16624,"name":"Thorium Shield Spike","icon":"inv_misc_armorkit_20","stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1843,"itemId":15564,"spellId":19057,"name":"Rugged Armor Kit","icon":"inv_misc_armorkit_09","type":5,"extraTypes":[7,9,10],"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1883,"itemId":16214,"spellId":13825,"name":"Enchant Bracer - Greater Intellect","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -283,8 +283,8 @@
 {"id":22851,"type":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,500,0,0,0,0,0,0,0,0],"name":"Flask of Fortification","buffDuration":7200,"categoryCooldownDuration":3},
 {"id":22853,"type":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0],"name":"Flask of Mighty Restoration","buffDuration":7200,"categoryCooldownDuration":3},
 {"id":22854,"type":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Relentless Assault","buffDuration":7200,"categoryCooldownDuration":3},
-{"id":22861,"type":2,"stats":[0,0,0,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Blinding Light","buffDuration":7200,"categoryCooldownDuration":3},
-{"id":22866,"type":2,"stats":[0,0,0,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Pure Death","buffDuration":7200,"categoryCooldownDuration":3},
+{"id":22861,"type":2,"stats":[0,0,0,0,0,0,80,0,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Blinding Light","buffDuration":7200,"categoryCooldownDuration":3},
+{"id":22866,"type":2,"stats":[0,0,0,0,0,0,0,80,80,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Flask of Pure Death","buffDuration":7200,"categoryCooldownDuration":3},
 {"id":22871,"type":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Shrouding Potion","categoryCooldownDuration":120},
 {"id":23334,"type":10,"stats":[0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Cracked Power Core","buffDuration":30,"cooldownDuration":3600,"categoryCooldownDuration":120},
 {"id":23381,"type":10,"stats":[0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"name":"Chipped Power Core","buffDuration":30,"cooldownDuration":3600,"categoryCooldownDuration":120},

assets/database/leftover_db.bin

@@ -3746,9 +3746,7 @@ func RegisterAllProcs() {
 	//       This can be ignored if the effect has already been implemented.
 	//       With next db run the item will be removed if implemented.
 	//
-	// Sometimes heals bearer of 120 damage when damaging an enemy in melee and chance on ranged hit to restore
-	// 172 mana to the bearer.
-	// https://www.wowhead.com/tbc/spell=33504
+	// https://www.wowhead.com/tbc/spell=39599
 	// shared.NewProcStatBonusEffectWithVariants(shared.ProcStatBonusEffect{
 	//	Callback:           core.CallbackEmpty,
 	//	ProcMask:           core.ProcMaskUnknown,
@@ -6429,8 +6427,9 @@ func RegisterAllProcs() {
 	//       This can be ignored if the effect has already been implemented.
 	//       With next db run the item will be removed if implemented.
 	//
-	// Collects 100 Holy Energy from healing spells you cast. Cannot collect more than 2000 Holy Energy.
-	// https://www.wowhead.com/tbc/spell=45062
+	// Release all accumulated Holy Energy to instantly heal current friendly target by the amount of Holy Energy
+	// accumulated.
+	// https://www.wowhead.com/tbc/spell=45064
 	// shared.NewProcStatBonusEffectWithVariants(shared.ProcStatBonusEffect{
 	//	Callback:           core.CallbackEmpty,
 	//	ProcMask:           core.ProcMaskUnknown,

assets/database/leftover_db.json

@@ -94,13 +94,6 @@ dps_results: {
   tps: 1225.01389
  }
 }
-dps_results: {
- key: "TestBalance-AllItems-Biznicks247x128Accurascope-2523"
- value: {
-  dps: 1412.39069
-  tps: 1339.58641
- }
-}
 dps_results: {
  key: "TestBalance-AllItems-BlackenedNaaruSliver-34427"
  value: {
@@ -592,6 +585,13 @@ dps_results: {
   tps: 1339.58641
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-StabilizedEterniumScope-2523"
+ value: {
+  dps: 1412.39069
+  tps: 1339.58641
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-StaffofNaturalFury-31334"
  value: {

sim/common/tbc/stat_bonus_procs_auto_gen.go

@@ -349,15 +349,6 @@ dps_results: {
   hps: 71.35766
  }
 }
-dps_results: {
- key: "TestFeralBear-AllItems-Biznicks247x128Accurascope-2523"
- value: {
-  dps: 421.70348
-  tps: 650.89173
-  dtps: 1095.61128
-  hps: 74.14484
- }
-}
 dps_results: {
  key: "TestFeralBear-AllItems-BlackenedNaaruSliver-34427"
  value: {
@@ -1519,6 +1510,15 @@ dps_results: {
   hps: 74.14484
  }
 }
+dps_results: {
+ key: "TestFeralBear-AllItems-StabilizedEterniumScope-2523"
+ value: {
+  dps: 421.70348
+  tps: 650.89173
+  dtps: 1095.61128
+  hps: 74.14484
+ }
+}
 dps_results: {
  key: "TestFeralBear-AllItems-StaffofNaturalFury-31334"
  value: {

sim/druid/balance/TestBalance.results

@@ -322,14 +322,6 @@ dps_results: {
   hps: 68.78525
  }
 }
-dps_results: {
- key: "TestFeralCat-AllItems-Biznicks247x128Accurascope-2523"
- value: {
-  dps: 758.37199
-  tps: 538.44412
-  hps: 68.78525
- }
-}
 dps_results: {
  key: "TestFeralCat-AllItems-BlackenedNaaruSliver-34427"
  value: {
@@ -1362,6 +1354,14 @@ dps_results: {
   hps: 68.78525
  }
 }
+dps_results: {
+ key: "TestFeralCat-AllItems-StabilizedEterniumScope-2523"
+ value: {
+  dps: 758.37199
+  tps: 538.44412
+  hps: 68.78525
+ }
+}
 dps_results: {
  key: "TestFeralCat-AllItems-StaffofNaturalFury-31334"
  value: {

sim/druid/feralbear/TestFeralBear.results

@@ -292,14 +292,6 @@ dps_results: {
   dtps: 13.13388
  }
 }
-dps_results: {
- key: "TestHunter-AllItems-Biznicks247x128Accurascope-2523"
- value: {
-  dps: 3136.47051
-  tps: 2121.05874
-  dtps: 13.09299
- }
-}
 dps_results: {
  key: "TestHunter-AllItems-BlackBowoftheBetrayer-32336"
  value: {
@@ -1229,6 +1221,14 @@ dps_results: {
   hps: 14.44444
  }
 }
+dps_results: {
+ key: "TestHunter-AllItems-StabilizedEterniumScope-2523"
+ value: {
+  dps: 3136.47051
+  tps: 2121.05874
+  dtps: 13.09299
+ }
+}
 dps_results: {
  key: "TestHunter-AllItems-StaffoftheQirajiProphets-21128"
  value: {

sim/druid/feralcat/TestFeralCat.results

@@ -241,13 +241,6 @@ dps_results: {
   tps: 1326.50282
  }
 }
-dps_results: {
- key: "TestArcane-AllItems-Biznicks247x128Accurascope-2523"
- value: {
-  dps: 1944.26562
-  tps: 1322.02423
- }
-}
 dps_results: {
  key: "TestArcane-AllItems-BlackenedNaaruSliver-34427"
  value: {
@@ -970,6 +963,13 @@ dps_results: {
   tps: 1322.02423
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-StabilizedEterniumScope-2523"
+ value: {
+  dps: 1944.26562
+  tps: 1322.02423
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-StaffoftheQirajiProphets-21128"
  value: {