Skip to content

Commit

Permalink
Merge pull request #1258 from wowsims/engineering_changes
Browse files Browse the repository at this point in the history
Engineering shared CD changes
  • Loading branch information
Watcher7 authored Oct 11, 2022
2 parents fac7371 + 98caeef commit a3fe5e7
Show file tree
Hide file tree
Showing 17 changed files with 353 additions and 349 deletions.
12 changes: 8 additions & 4 deletions sim/common/wotlk/enchant_effects.go
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,14 @@ func init() {
Timer: character.NewTimer(),
Duration: time.Second * 60,
},
SharedCD: core.Cooldown{
Timer: character.GetOffensiveTrinketCD(),
Duration: time.Second * 12,
},
// Shared CD with Offensive trinkets has been removed.
// https://twitter.com/AggrendWoW/status/1579664462843633664
// Change possibly temporary, but developers have confirmed it was intended.

// SharedCD: core.Cooldown{
// Timer: character.GetOffensiveTrinketCD(),
// Duration: time.Second * 12,
// },
},

ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {
Expand Down
4 changes: 2 additions & 2 deletions sim/deathknight/dps/TestFrost.results
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ dps_results: {
dps_results: {
key: "TestFrost-AllItems-IncisorFragment-37723"
value: {
dps: 7654.88139
tps: 4535.31735
dps: 7761.73661
tps: 4595.72263
}
}
dps_results: {
Expand Down
6 changes: 3 additions & 3 deletions sim/deathknight/dps/TestUnholy.results
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,9 @@ dps_results: {
dps_results: {
key: "TestUnholy-AllItems-IncisorFragment-37723"
value: {
dps: 7422.91011
tps: 4762.00023
hps: 189.09928
dps: 7423.88616
tps: 4753.50556
hps: 190.44129
}
}
dps_results: {
Expand Down
6 changes: 3 additions & 3 deletions sim/druid/balance/TestBalance.results
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ dps_results: {
dps_results: {
key: "TestBalance-AllItems-IncisorFragment-37723"
value: {
dps: 7006.27608
tps: 6828.06421
dps: 7044.42416
tps: 6867.72766
}
}
dps_results: {
Expand Down Expand Up @@ -403,7 +403,7 @@ dps_results: {
key: "TestBalance-AllItems-OfferingofSacrifice-37638"
value: {
dps: 7044.42416
tps: 6868.53475
tps: 6868.34107
}
}
dps_results: {
Expand Down
4 changes: 2 additions & 2 deletions sim/druid/feral/TestFeral.results
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ dps_results: {
dps_results: {
key: "TestFeral-AllItems-IncisorFragment-37723"
value: {
dps: 7576.17541
tps: 5755.5162
dps: 7579.89987
tps: 5776.16536
}
}
dps_results: {
Expand Down
52 changes: 26 additions & 26 deletions sim/hunter/TestHunter.results
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,22 @@ dps_results: {
dps_results: {
key: "TestHunter-AllItems-BeamingEarthsiegeDiamond"
value: {
dps: 6724.19902
tps: 5707.30097
dps: 6722.23839
tps: 5705.33784
}
}
dps_results: {
key: "TestHunter-AllItems-Beast-tamer'sShoulders-30892"
value: {
dps: 6631.71781
tps: 5621.98533
dps: 6634.06518
tps: 5624.33454
}
}
dps_results: {
key: "TestHunter-AllItems-BlackBowoftheBetrayer-32336"
value: {
dps: 6341.40392
tps: 5329.48552
dps: 6340.4029
tps: 5328.48872
}
}
dps_results: {
Expand Down Expand Up @@ -185,8 +185,8 @@ dps_results: {
dps_results: {
key: "TestHunter-AllItems-EmberSkyflareDiamond"
value: {
dps: 6721.39412
tps: 5698.11226
dps: 6718.33635
tps: 5695.0531
}
}
dps_results: {
Expand Down Expand Up @@ -290,15 +290,15 @@ dps_results: {
dps_results: {
key: "TestHunter-AllItems-IncisorFragment-37723"
value: {
dps: 6731.81765
tps: 5718.68765
dps: 6783.4274
tps: 5764.54896
}
}
dps_results: {
key: "TestHunter-AllItems-InsightfulEarthsiegeDiamond"
value: {
dps: 6918.51511
tps: 5908.89464
dps: 6919.7539
tps: 5910.12511
}
}
dps_results: {
Expand Down Expand Up @@ -332,8 +332,8 @@ dps_results: {
dps_results: {
key: "TestHunter-AllItems-OfferingofSacrifice-37638"
value: {
dps: 6631.80249
tps: 5622.13719
dps: 6630.54577
tps: 5620.88046
}
}
dps_results: {
Expand Down Expand Up @@ -430,15 +430,15 @@ dps_results: {
dps_results: {
key: "TestHunter-AllItems-Sindragosa'sFlawlessFang-50361"
value: {
dps: 6631.80249
tps: 5622.13719
dps: 6630.44596
tps: 5620.78065
}
}
dps_results: {
key: "TestHunter-AllItems-SparkofLife-37657"
value: {
dps: 6807.28424
tps: 5796.38653
dps: 6807.25273
tps: 5796.35502
}
}
dps_results: {
Expand Down Expand Up @@ -479,8 +479,8 @@ dps_results: {
dps_results: {
key: "TestHunter-AllItems-ThunderingSkyflareDiamond"
value: {
dps: 6761.99164
tps: 5742.13339
dps: 6763.98242
tps: 5744.12416
}
}
dps_results: {
Expand Down Expand Up @@ -542,22 +542,22 @@ dps_results: {
dps_results: {
key: "TestHunter-AllItems-Zod'sRepeatingLongbow-50034"
value: {
dps: 7407.96296
tps: 6386.20389
dps: 7407.8441
tps: 6386.08503
}
}
dps_results: {
key: "TestHunter-AllItems-Zod'sRepeatingLongbow-50638"
value: {
dps: 7688.93756
tps: 6665.57491
dps: 7689.30779
tps: 6665.94177
}
}
dps_results: {
key: "TestHunter-Average-Default"
value: {
dps: 6812.57814
tps: 5795.60695
dps: 6812.77121
tps: 5795.79981
}
}
dps_results: {
Expand Down
Loading

0 comments on commit a3fe5e7

Please sign in to comment.