Skip to content

Commit

Permalink
Merge pull request #168 from FelixPflaum/more-crit-mults
Browse files Browse the repository at this point in the history 
Adjust some level 40 agi/int crit mults
  • Loading branch information
@rosenrusinov
rosenrusinov authored Feb 12, 2024
2 parents af4ac63 + 7d59c1d commit f4a2ab1
Show file tree
Hide file tree
Showing 14 changed files with 464 additions and 466 deletions.
34 changes: 16 additions & 18 deletions sim/core/base_stats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,33 +122,31 @@ var ClassBaseCrit = map[proto.Class]stats.Stats{
}

// Melee/Ranged crit agi scaling
// TODO: Level 40 and 50 values!
var CritPerAgiAtLevel = map[proto.Class]map[int]float64{
proto.Class_ClassUnknown: {25: 0.0, 40: 0.0, 50: 0.0, 60: 0.0},
proto.Class_ClassWarrior: {25: 0.1111, 40: 0.0755, 50: 0.0604, 60: 0.0500},
proto.Class_ClassPaladin: {25: 0.1075, 40: 0.0753, 50: 0.0618, 60: 0.0506},
proto.Class_ClassHunter: {25: 0.0515, 40: 0.0312, 50: 0.0239, 60: 0.0189},
proto.Class_ClassRogue: {25: 0.0952, 40: 0.0572, 50: 0.0440, 60: 0.0345},
proto.Class_ClassPriest: {25: 0.0769, 40: 0.0640, 50: 0.0565, 60: 0.0500},
proto.Class_ClassShaman: {25: 0.0971, 40: 0.0722, 50: 0.0602, 60: 0.0508},
proto.Class_ClassMage: {25: 0.0720, 40: 0.0623, 50: 0.0566, 60: 0.0514},
proto.Class_ClassWarlock: {25: 0.0909, 40: 0.0639, 50: 0.0551, 60: 0.0500},
proto.Class_ClassDruid: {25: 0.1025, 40: 0.0730, 50: 0.0599, 60: 0.0500},
proto.Class_ClassWarrior: {25: 0.1111, 40: 0.0758, 50: 0.0604, 60: 0.0500}, // TODO: Level 50 value!
proto.Class_ClassPaladin: {25: 0.1075, 40: 0.0753, 50: 0.0618, 60: 0.0506}, // TODO: Level 40 and 50 values!
proto.Class_ClassHunter: {25: 0.0515, 40: 0.0303, 50: 0.0239, 60: 0.0189}, // TODO: Level 50 value!
proto.Class_ClassRogue: {25: 0.0952, 40: 0.0556, 50: 0.0440, 60: 0.0345}, // TODO: Level 50 value!
proto.Class_ClassPriest: {25: 0.0769, 40: 0.0640, 50: 0.0565, 60: 0.0500}, // TODO: Level 40 and 50 values!
proto.Class_ClassShaman: {25: 0.0971, 40: 0.0717, 50: 0.0602, 60: 0.0508}, // TODO: Level 50 value!
proto.Class_ClassMage: {25: 0.0720, 40: 0.0623, 50: 0.0566, 60: 0.0514}, // TODO: Level 40 and 50 values!
proto.Class_ClassWarlock: {25: 0.0909, 40: 0.0639, 50: 0.0551, 60: 0.0500}, // TODO: Level 40 and 50 values!
proto.Class_ClassDruid: {25: 0.1025, 40: 0.0719, 50: 0.0599, 60: 0.0500}, // TODO: Level 50 value!
}

// Spell crit int scaling
// TODO: Level 40 and 50 values!
var CritPerIntAtLevel = map[proto.Class]map[int]float64{
proto.Class_ClassUnknown: {25: 0.0, 45: 0.0, 50: 0.0, 60: 0.0},
proto.Class_ClassWarrior: {25: 0.0, 40: 0.0, 50: 0.0, 60: 0.0},
proto.Class_ClassPaladin: {25: 0.0357, 40: 0.0250, 50: 0.0203, 60: 0.0167},
proto.Class_ClassHunter: {25: 0.0350, 40: 0.0246, 50: 0.0200, 60: 0.0165},
proto.Class_ClassPaladin: {25: 0.0357, 40: 0.0250, 50: 0.0203, 60: 0.0167}, // TODO: Level 40 and 50 values!
proto.Class_ClassHunter: {25: 0.0350, 40: 0.0241, 50: 0.0200, 60: 0.0165}, // TODO: Level 50 value!
proto.Class_ClassRogue: {25: 0.0, 40: 0.0, 50: 0.0, 60: 0.0},
proto.Class_ClassPriest: {25: 0.0457, 40: 0.0277, 50: 0.0212, 60: 0.0168},
proto.Class_ClassShaman: {25: 0.0422, 40: 0.0269, 50: 0.0210, 60: 0.0169},
proto.Class_ClassMage: {25: 0.0475, 40: 0.0283, 50: 0.0214, 60: 0.0168},
proto.Class_ClassWarlock: {25: 0.0429, 40: 0.0267, 50: 0.0207, 60: 0.0165},
proto.Class_ClassDruid: {25: 0.0427, 40: 0.0268, 50: 0.0208, 60: 0.0167},
proto.Class_ClassPriest: {25: 0.0457, 40: 0.0277, 50: 0.0212, 60: 0.0168}, // TODO: Level 40 and 50 values!
proto.Class_ClassShaman: {25: 0.0422, 40: 0.0262, 50: 0.0210, 60: 0.0169}, // TODO: Level 50 value!
proto.Class_ClassMage: {25: 0.0475, 40: 0.0283, 50: 0.0214, 60: 0.0168}, // TODO: Level 40 and 50 values!
proto.Class_ClassWarlock: {25: 0.0429, 40: 0.0267, 50: 0.0207, 60: 0.0165}, // TODO: Level 40 and 50 values!
proto.Class_ClassDruid: {25: 0.0427, 40: 0.0260, 50: 0.0208, 60: 0.0167}, // TODO: Level 50 value!
}

var ClassBaseStats = map[proto.Class]map[int]stats.Stats{
Expand Down
3 changes: 0 additions & 3 deletions sim/core/mana.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ func (character *Character) EnableManaBarWithModifier(modifier float64) {
character.AddStat(stats.Mana, 20-15*20*modifier)
character.AddStatDependency(stats.Intellect, stats.Mana, 15*modifier)

// This conversion is now universal for
character.AddStatDependency(stats.Intellect, stats.SpellCrit, CritRatingPerCritChance/166.66667)

// Not a real spell, just holds metrics from mana gain threat.
character.RegisterSpell(SpellConfig{
ActionID: ActionID{OtherID: proto.OtherAction_OtherActionManaGain},
Expand Down
70 changes: 35 additions & 35 deletions sim/druid/balance/TestBalance.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ character_stats_results: {
final_stats: 0
final_stats: 20
final_stats: 1
final_stats: 11.62482
final_stats: 10.78398
final_stats: 0
final_stats: 10
final_stats: 275.68
Expand Down Expand Up @@ -51,119 +51,119 @@ character_stats_results: {
dps_results: {
key: "TestBalance-AllItems-BlackfathomElementalist'sHide"
value: {
dps: 35.20865
tps: 36.13569
dps: 34.99654
tps: 35.92358
}
}
dps_results: {
key: "TestBalance-AllItems-BlackfathomSlayer'sLeather"
value: {
dps: 30.74433
tps: 31.49317
dps: 30.32114
tps: 31.06998
}
}
dps_results: {
key: "TestBalance-AllItems-HyperconductiveMender'sMeditation"
value: {
dps: 18.70173
tps: 19.58257
dps: 18.63053
tps: 19.51137
}
}
dps_results: {
key: "TestBalance-AllItems-HyperconductiveWizard'sAttire"
value: {
dps: 18.23835
tps: 19.20499
dps: 18.15472
tps: 19.12136
}
}
dps_results: {
key: "TestBalance-AllItems-InsulatedLeathers"
value: {
dps: 14.87791
tps: 15.63995
dps: 14.86433
tps: 15.62637
}
}
dps_results: {
key: "TestBalance-AllItems-InsulatedSorceror'sLeathers"
value: {
dps: 18.29556
tps: 19.2292
dps: 18.23178
tps: 19.16542
}
}
dps_results: {
key: "TestBalance-AllItems-IrradiatedGarments"
value: {
dps: 20.37491
tps: 21.34155
dps: 20.30988
tps: 21.27652
}
}
dps_results: {
key: "TestBalance-AllItems-StormshroudArmor"
value: {
dps: 12.43377
tps: 13.16281
dps: 12.27773
tps: 13.00677
}
}
dps_results: {
key: "TestBalance-AllItems-TwilightInvoker'sVestments"
value: {
dps: 34.95225
tps: 35.82649
dps: 34.56513
tps: 35.43937
}
}
dps_results: {
key: "TestBalance-Average-Default"
value: {
dps: 61.48214
tps: 62.4029
dps: 61.0596
tps: 61.98036
}
}
dps_results: {
key: "TestBalance-Settings-Tauren-25-phase_1-Default-phase_1-FullBuffs-Full Consumes-LongMultiTarget"
value: {
dps: 62.02244
tps: 80.43124
dps: 61.17397
tps: 79.58277
}
}
dps_results: {
key: "TestBalance-Settings-Tauren-25-phase_1-Default-phase_1-FullBuffs-Full Consumes-LongSingleTarget"
value: {
dps: 62.02244
tps: 62.94288
dps: 61.17397
tps: 62.09441
}
}
dps_results: {
key: "TestBalance-Settings-Tauren-25-phase_1-Default-phase_1-FullBuffs-Full Consumes-ShortSingleTarget"
value: {
dps: 62.34573
tps: 66.94793
dps: 62.0261
tps: 66.6283
}
}
dps_results: {
key: "TestBalance-Settings-Tauren-25-phase_1-Default-phase_1-NoBuffs-Full Consumes-LongMultiTarget"
value: {
dps: 59.33107
tps: 59.33107
dps: 58.82957
tps: 58.82957
}
}
dps_results: {
key: "TestBalance-Settings-Tauren-25-phase_1-Default-phase_1-NoBuffs-Full Consumes-LongSingleTarget"
value: {
dps: 59.33107
tps: 59.33107
dps: 58.82957
tps: 58.82957
}
}
dps_results: {
key: "TestBalance-Settings-Tauren-25-phase_1-Default-phase_1-NoBuffs-Full Consumes-ShortSingleTarget"
value: {
dps: 62.0261
tps: 62.0261
dps: 61.58205
tps: 61.58205
}
}
dps_results: {
key: "TestBalance-SwitchInFrontOfTarget-Default"
value: {
dps: 62.02244
tps: 62.94288
dps: 61.17397
tps: 62.09441
}
}
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 @@ -15,7 +15,7 @@ character_stats_results: {
final_stats: 0
final_stats: 18
final_stats: 2
final_stats: 8.46419
final_stats: 8.01275
final_stats: 0
final_stats: 0
final_stats: 688.82
Expand Down
2 changes: 1 addition & 1 deletion sim/priest/shadow/TestShadow.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ character_stats_results: {
final_stats: 0
final_stats: 18
final_stats: 0
final_stats: 7.40556
final_stats: 6.98712
final_stats: 0
final_stats: 0
final_stats: 131
Expand Down
Loading

0 comments on commit f4a2ab1

Please sign in to comment.