Skip to content

Commit

Permalink
Merge pull request #304 from wowsims/fixes
Browse files Browse the repository at this point in the history 
update trinket autocast and warlock bonus armor
  • Loading branch information
@rosenrusinov
rosenrusinov authored Feb 26, 2024
2 parents 704f9de + 1bbf3e9 commit 6fb7539
Show file tree
Hide file tree
Showing 12 changed files with 188 additions and 183 deletions.
2 changes: 1 addition & 1 deletion sim/common/sod/enchant_effects.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ func init() {
character.AddStat(stats.FrostPower, bonus)
})

// Globes - Threat
// Gloves - Threat
// core.NewEnchantEffect(2613, func(agent core.Agent) {
// character := agent.GetCharacter()
// character.PseudoStats.ThreatMultiplier *= 1.02
Expand Down
4 changes: 4 additions & 0 deletions sim/common/sod/item_effects/phase_2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ func init() {
Spell: regChannel,
Priority: core.CooldownPriorityDefault,
Type: core.CooldownTypeMana,
ShouldActivate: func(_ *core.Simulation, _ *core.Character) bool {
// Only castable with manual APL Action
return false
},
})
})

Expand Down
4 changes: 1 addition & 3 deletions sim/common/sod/melee_items.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func init() {
},
})

aura := character.GetOrRegisterAura(core.Aura{
character.GetOrRegisterAura(core.Aura{
Label: "Mekkatorque Proc Aura",
Duration: core.NeverExpires,
OnReset: func(aura *core.Aura, sim *core.Simulation) {
Expand All @@ -341,8 +341,6 @@ func init() {
}
},
})

character.ItemSwap.RegisterOnSwapItemForEffect(36, aura)
})

core.AddEffectsToTest = true
Expand Down
100 changes: 50 additions & 50 deletions sim/druid/balance/TestBalance.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,18 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.54428
weights: -0.42992
weights: 0
weights: 0.79455
weights: 0.82502
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 6.33103
weights: 3.90042
weights: 7.319
weights: 4.38145
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -358,161 +358,161 @@ dps_results: {
dps_results: {
key: "TestBalance-Lvl40-AllItems-BlackfathomElementalist'sHide"
value: {
dps: 306.70804
tps: 314.16812
dps: 310.47817
tps: 317.77271
}
}
dps_results: {
key: "TestBalance-Lvl40-AllItems-BlackfathomSlayer'sLeather"
value: {
dps: 286.31109
tps: 293.67216
dps: 287.84422
tps: 295.03151
}
}
dps_results: {
key: "TestBalance-Lvl40-AllItems-HyperconductiveMender'sMeditation"
value: {
dps: 165.774
tps: 172.17609
dps: 168.33065
tps: 174.32444
}
}
dps_results: {
key: "TestBalance-Lvl40-AllItems-HyperconductiveWizard'sAttire"
value: {
dps: 175.20144
tps: 181.5564
dps: 177.85392
tps: 183.77622
}
}
dps_results: {
key: "TestBalance-Lvl40-AllItems-InsulatedLeathers"
value: {
dps: 161.5218
tps: 167.84376
dps: 163.47343
tps: 169.35448
}
}
dps_results: {
key: "TestBalance-Lvl40-AllItems-InsulatedSorceror'sLeathers"
value: {
dps: 177.04309
tps: 183.38705
dps: 179.20289
tps: 185.11969
}
}
dps_results: {
key: "TestBalance-Lvl40-AllItems-IrradiatedGarments"
value: {
dps: 182.78674
tps: 189.15631
dps: 182.94073
tps: 188.87953
}
}
dps_results: {
key: "TestBalance-Lvl40-AllItems-StormshroudArmor"
value: {
dps: 129.19903
tps: 135.40549
dps: 128.99257
tps: 134.74162
}
}
dps_results: {
key: "TestBalance-Lvl40-AllItems-TwilightInvoker'sVestments"
value: {
dps: 301.74535
tps: 309.18617
dps: 305.57224
tps: 312.83929
}
}
dps_results: {
key: "TestBalance-Lvl40-Average-Default"
value: {
dps: 543.00319
tps: 552.34402
dps: 561.29658
tps: 570.59972
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 541.31557
tps: 728.79699
dps: 558.9036
tps: 745.02582
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 541.31557
tps: 550.68964
dps: 558.9036
tps: 568.20971
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 475.33351
tps: 487.52987
dps: 584.73723
tps: 596.85504
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 373.3469
tps: 458.97675
dps: 381.04236
tps: 461.20832
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 373.3469
tps: 377.62839
dps: 381.04236
tps: 385.05066
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 370.8672
tps: 378.94067
dps: 451.12948
tps: 457.83698
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 541.72306
tps: 729.58948
dps: 561.02719
tps: 747.53442
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 541.72306
tps: 551.11638
dps: 561.02719
tps: 570.35256
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 474.42369
tps: 486.62006
dps: 584.73723
tps: 596.85504
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 370.56291
tps: 456.19276
dps: 379.63737
tps: 459.80333
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 370.56291
tps: 374.8444
dps: 379.63737
tps: 383.64566
}
}
dps_results: {
key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 370.5654
tps: 378.63887
dps: 449.55232
tps: 456.25982
}
}
dps_results: {
key: "TestBalance-Lvl40-SwitchInFrontOfTarget-Default"
value: {
dps: 541.72306
tps: 551.11638
dps: 561.02719
tps: 570.35256
}
}
Loading

0 comments on commit 6fb7539

Please sign in to comment.