Skip to content

Commit

Permalink
Merge branch 'master' into RogueP5Presetsv2
Browse files Browse the repository at this point in the history
  • Loading branch information
@sanguinerarogue
sanguinerarogue authored Sep 25, 2024
2 parents e5fbec1 + 4352295 commit 6f272d6
Show file tree
Hide file tree
Showing 22 changed files with 324 additions and 323 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions assets/database/db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10295,8 +10295,8 @@
{"effectId":929,"itemId":16217,"spellId":20069,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[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,0,0,0],"quality":1},
{"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","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,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":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","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,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","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,0,0],"quality":1},
{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","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,0,0],"quality":1},
{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","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,0,0],"quality":1},
{"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","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,0,0],"quality":1},
{"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"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,100,0,0,0,0,0,0,0,0,0],"quality":2},
Expand All @@ -10322,8 +10322,8 @@
{"effectId":1893,"spellId":20028,"name":"Enchant Chest - Major Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1894,"spellId":20029,"name":"Enchant Weapon - Icy Chill","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,0,0],"quality":2},
{"effectId":1896,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","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,0,0],"quality":2},
{"effectId":1897,"spellId":20031,"name":"Enchant Weapon - Superior Striking","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,0,0],"quality":2},
{"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","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,0,0],"quality":1},
{"effectId":1897,"spellId":20031,"name":"Enchant Weapon - Superior Striking","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,0,0],"quality":2},
{"effectId":1898,"spellId":20032,"name":"Enchant Weapon - Lifestealing","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,0,0],"quality":3},
{"effectId":1899,"spellId":20033,"name":"Enchant Weapon - Unholy Weapon","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,0,0],"quality":2},
{"effectId":1900,"spellId":20034,"name":"Enchant Weapon - Crusader","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,0,0],"quality":2},
Expand Down Expand Up @@ -10358,8 +10358,8 @@
{"effectId":7325,"itemId":221322,"spellId":446459,"name":"Atal'ai Signet of Mojo","type":3,"stats":[0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":3},
{"effectId":7326,"itemId":221323,"spellId":446472,"name":"Atal'ai Signet of Serenity","type":3,"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,18,0,0],"quality":3},
{"effectId":7328,"itemId":221321,"spellId":446451,"name":"Atal'ai Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":7563,"itemId":227819,"spellId":460963,"name":"Blessed Flame Mantle of the Dawn","type":3,"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,15,0,0,0,0,0,0,0],"quality":3},
{"effectId":7564,"itemId":227926,"spellId":461129,"name":"Hydraxian Coronation","type":4,"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,20,0,0,0,0,0,0,0],"quality":3},
{"effectId":7563,"itemId":227819,"spellId":460963,"name":"Blessed Flame Mantle of the Dawn","type":3,"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,25,0,0,0,0,0,0,0],"quality":3},
{"effectId":7564,"itemId":227926,"spellId":461129,"name":"Hydraxian Coronation","type":4,"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,30,0,0,0,0,0,0,0],"quality":3},
{"effectId":7603,"itemId":228982,"spellId":463871,"name":"Enchant Shield - Law of Nature","type":13,"enchantType":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,0,0,0,0,0,0,55,30,0],"quality":2},
{"effectId":7613,"itemId":231354,"spellId":468314,"name":"Animist's Caress","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0],"quality":3,"classAllowlist":[1],"requiresLevel":60},
{"effectId":7614,"itemId":231355,"spellId":468318,"name":"Animist's Balance","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,0,0,12,0,0,0,0,0,0,0,1,0,0,0,0,1,0,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":3,"classAllowlist":[1],"requiresLevel":60},
Expand Down
Binary file modified assets/database/leftover_db.bin
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions assets/database/leftover_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1619,8 +1619,8 @@
{"effectId":7325,"itemId":221322,"spellId":446459,"name":"Atal'ai Signet of Mojo","type":3,"stats":[0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":3},
{"effectId":7326,"itemId":221323,"spellId":446472,"name":"Atal'ai Signet of Serenity","type":3,"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,18,0,0],"quality":3},
{"effectId":7328,"itemId":221321,"spellId":446451,"name":"Atal'ai Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":7563,"itemId":227819,"spellId":460963,"name":"Blessed Flame Mantle of the Dawn","type":3,"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,15,0,0,0,0,0,0,0],"quality":3},
{"effectId":7564,"itemId":227926,"spellId":461129,"name":"Hydraxian Coronation","type":4,"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,20,0,0,0,0,0,0,0],"quality":3},
{"effectId":7563,"itemId":227819,"spellId":460963,"name":"Blessed Flame Mantle of the Dawn","type":3,"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,25,0,0,0,0,0,0,0],"quality":3},
{"effectId":7564,"itemId":227926,"spellId":461129,"name":"Hydraxian Coronation","type":4,"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,30,0,0,0,0,0,0,0],"quality":3},
{"effectId":7603,"itemId":228982,"spellId":463871,"name":"Enchant Shield - Law of Nature","type":13,"enchantType":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,0,0,0,0,0,0,55,30,0],"quality":2},
{"effectId":7613,"itemId":231354,"spellId":468314,"name":"Animist's Caress","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0],"quality":3,"classAllowlist":[1],"requiresLevel":60},
{"effectId":7614,"itemId":231355,"spellId":468318,"name":"Animist's Balance","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,0,0,12,0,0,0,0,0,0,0,1,0,0,0,0,1,0,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":3,"classAllowlist":[1],"requiresLevel":60},
Expand Down
4 changes: 2 additions & 2 deletions sim/druid/balance/TestBalance.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ character_stats_results: {
final_stats: 0
final_stats: 6690.6525
final_stats: 27
final_stats: 234
final_stats: 254
final_stats: 60
final_stats: 70
final_stats: 60
Expand Down Expand Up @@ -233,7 +233,7 @@ character_stats_results: {
final_stats: 0
final_stats: 7670.901
final_stats: 27
final_stats: 90
final_stats: 100
final_stats: 90
final_stats: 120
final_stats: 60
Expand Down
2 changes: 1 addition & 1 deletion sim/druid/feral/TestFeral.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ character_stats_results: {
final_stats: 0
final_stats: 6783.63
final_stats: 27
final_stats: 216
final_stats: 226
final_stats: 60
final_stats: 70
final_stats: 60
Expand Down
4 changes: 2 additions & 2 deletions sim/hunter/item_sets_pve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ var ItemSetDragonstalkerProwess = core.NewItemSet(core.ItemSet{

core.MakePermanent(hunter.RegisterAura(core.Aura{
Label: "S03 - Item - T2 - Hunter - Melee 2P Bonus Trigger",
OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
if spell.SpellCode == SpellCode_HunterRaptorStrike {
OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
if spell.SpellCode == SpellCode_HunterRaptorStrikeHit {
procAura.Activate(sim)
}
},
Expand Down
94 changes: 47 additions & 47 deletions sim/mage/TestArcane.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,18 +298,18 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: -0.20439
weights: -0.88337
weights: 0
weights: 1.22546
weights: 1.09824
weights: 0.12722
weights: 1.21892
weights: 1.09189
weights: 0.12703
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 13.72806
weights: 14.07399
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -589,29 +589,29 @@ dps_results: {
dps_results: {
key: "TestArcane-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
value: {
dps: 684.20857
tps: 690.8746
dps: 684.08679
tps: 692.8031
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-AllItems-BloodGuard'sSatin"
value: {
dps: 629.34438
tps: 635.48304
dps: 629.22425
tps: 637.11462
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
value: {
dps: 679.84549
tps: 686.46887
dps: 679.72372
tps: 688.41069
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-AllItems-EmeraldWovenGarb"
value: {
dps: 628.95516
tps: 634.85904
dps: 628.68867
tps: 637.05315
}
}
dps_results: {
Expand All @@ -624,22 +624,22 @@ dps_results: {
dps_results: {
key: "TestArcane-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
value: {
dps: 684.20857
tps: 690.8746
dps: 684.08679
tps: 692.8031
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin"
value: {
dps: 629.34438
tps: 635.48304
dps: 629.22425
tps: 637.11462
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments"
value: {
dps: 1634.62893
tps: 1655.93236
dps: 1630.73808
tps: 1652.48143
}
}
dps_results: {
Expand All @@ -652,99 +652,99 @@ dps_results: {
dps_results: {
key: "TestArcane-Phase4-Lvl60-Average-Default"
value: {
dps: 2069.08713
tps: 2091.87855
dps: 2054.82151
tps: 2078.14061
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 2088.13209
tps: 2468.77138
dps: 2081.4061
tps: 2491.653
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 2088.13209
tps: 2107.16406
dps: 2081.4061
tps: 2101.91845
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 2341.43891
tps: 2358.31393
dps: 2341.45102
tps: 2359.2382
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 1006.5327
tps: 1247.45353
dps: 980.09414
tps: 1226.73852
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 1006.5327
tps: 1018.57875
dps: 980.09414
tps: 992.42635
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 1250.69607
tps: 1264.46516
dps: 1250.73439
tps: 1266.68376
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 2092.00401
tps: 2476.69454
dps: 2090.03172
tps: 2501.22251
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 2092.00401
tps: 2111.23854
dps: 2090.03172
tps: 2110.59126
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 2371.01326
tps: 2389.97336
dps: 2371.02537
tps: 2390.29165
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 995.81967
tps: 1238.67995
dps: 968.95013
tps: 1216.33511
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 995.81967
tps: 1007.96268
dps: 968.95013
tps: 981.31938
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 1264.6048
tps: 1280.55417
dps: 1264.62377
tps: 1281.48918
}
}
dps_results: {
key: "TestArcane-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
value: {
dps: 2078.79733
tps: 2101.5431
dps: 2054.53651
tps: 2077.89264
}
}
dps_results: {
Expand Down
Loading

0 comments on commit 6f272d6

Please sign in to comment.