Skip to content

Commit

Permalink
ele phase 6 presets
Browse files Browse the repository at this point in the history
  • Loading branch information
kayla-glick committed Dec 1, 2024
1 parent 277b7ef commit 96e2425
Show file tree
Hide file tree
Showing 7 changed files with 389 additions and 1 deletion.
10 changes: 10 additions & 0 deletions sim/core/test_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,16 @@ var FullBuffsPhase5 = BuffsCombo{
Raid: FullRaidBuffsPhase5,
}

// No noteworthy additions in phase 6 sso far
var FullBuffsPhase6 = BuffsCombo{
Label: "Phase 6 Buffs",

Debuffs: FullDebuffsPhase4,
Party: FullPartyBuffs,
Player: FullIndividualBuffsPhase5,
Raid: FullRaidBuffsPhase5,
}

func NewDefaultTarget(playerLevel int32) *proto.Target {
switch playerLevel {
case 40:
Expand Down
259 changes: 259 additions & 0 deletions sim/shaman/elemental/TestElemental.results
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,55 @@ character_stats_results: {
final_stats: 0
}
}
character_stats_results: {
key: "TestElemental-Phase6-Lvl60-CharacterStats-Default"
value: {
final_stats: 259.325
final_stats: 222.64
final_stats: 612.44975
final_stats: 542.685
final_stats: 217.58
final_stats: 738
final_stats: 0
final_stats: 40
final_stats: 0
final_stats: 0
final_stats: 0
final_stats: 0
final_stats: 41.25
final_stats: 10
final_stats: 45.47138
final_stats: 0
final_stats: 0
final_stats: 1448.65
final_stats: 10
final_stats: 38.01011
final_stats: 0
final_stats: 0
final_stats: 0
final_stats: 9380.275
final_stats: 0
final_stats: 0
final_stats: 6623.28
final_stats: 740
final_stats: 0
final_stats: 5
final_stats: 55
final_stats: 13.01011
final_stats: 5
final_stats: 0
final_stats: 7667.4975
final_stats: 27
final_stats: 90
final_stats: 60
final_stats: 60
final_stats: 60
final_stats: 384
final_stats: 95
final_stats: 879.0275
final_stats: 0
}
}
stat_weights_results: {
key: "TestElemental-Phase1-Lvl25-StatWeights-Default"
value: {
Expand Down Expand Up @@ -488,6 +537,55 @@ stat_weights_results: {
weights: 0
}
}
stat_weights_results: {
key: "TestElemental-Phase6-Lvl60-StatWeights-Default"
value: {
weights: 0
weights: 0
weights: 0
weights: 4.74182
weights: 0
weights: 2.21589
weights: 0
weights: 0.7158
weights: 0
weights: 0
weights: 1.5001
weights: 0
weights: 0
weights: 0
weights: 35.52786
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
}
}
dps_results: {
key: "TestElemental-Phase1-Lvl25-Average-Default"
value: {
Expand Down Expand Up @@ -1104,3 +1202,164 @@ dps_results: {
tps: 2830.015
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-BloodGuard'sInscribedMail"
value: {
dps: 1579.36606
tps: 1651.32512
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-BloodGuard'sMail"
value: {
dps: 1578.82698
tps: 1650.52014
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-BloodGuard'sPulsingMail"
value: {
dps: 1714.73186
tps: 1781.87386
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-EmeraldChainmail"
value: {
dps: 1666.45551
tps: 1736.71556
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-EmeraldLadenChain"
value: {
dps: 1577.45113
tps: 1648.83897
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-EmeraldScalemail"
value: {
dps: 1577.63902
tps: 1649.02686
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
value: {
dps: 3472.11619
tps: 3502.66674
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-ShunnedDevotee'sChainmail"
value: {
dps: 3629.98976
tps: 3661.34515
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-AllItems-TheFiveThunders"
value: {
dps: 1394.09718
tps: 1384.8096
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Average-Default"
value: {
dps: 5423.16399
tps: 3226.84178
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 9219.33031
tps: 5265.26458
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 5329.31127
tps: 3182.60734
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 5566.87558
tps: 3386.02417
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 4603.92327
tps: 3003.67471
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 2340.2592
tps: 1423.08912
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 2515.21964
tps: 1560.68471
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 9218.02813
tps: 5302.40566
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 5336.53568
tps: 3180.42911
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 5603.54225
tps: 3385.68601
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 4608.96971
tps: 3028.44989
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 2336.73041
tps: 1421.37039
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 2474.07185
tps: 1529.72702
}
}
dps_results: {
key: "TestElemental-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
value: {
dps: 5346.4812
tps: 3176.9896
}
}
31 changes: 31 additions & 0 deletions sim/shaman/elemental/elemental_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,24 @@ func TestElemental(t *testing.T) {
Consumes: Phase5Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive},

ItemFilter: ItemFilters,
EPReferenceStat: proto.Stat_StatSpellPower,
StatsToWeigh: Stats,
},
{
Class: proto.Class_ClassShaman,
Phase: 6,
Level: 60,
Race: proto.Race_RaceTroll,
OtherRaces: []proto.Race{proto.Race_RaceOrc},

Talents: Phase4Talents,
GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "phase_6"),
Rotation: core.GetAplRotation("../../../ui/elemental_shaman/apls", "phase_6"),
Buffs: core.FullBuffsPhase6,
Consumes: Phase5Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive},

ItemFilter: ItemFilters,
EPReferenceStat: proto.Stat_StatSpellPower,
StatsToWeigh: Stats,
Expand Down Expand Up @@ -176,6 +194,19 @@ var Phase5Consumes = core.ConsumesCombo{
},
}

var Phase6Consumes = core.ConsumesCombo{
Label: "P6-Consumes",
Consumes: &proto.Consumes{
DefaultPotion: proto.Potions_MajorManaPotion,
Flask: proto.Flask_FlaskOfSupremePower,
FirePowerBuff: proto.FirePowerBuff_ElixirOfGreaterFirepower,
Food: proto.Food_FoodRunnTumTuberSurprise,
MainHandImbue: proto.WeaponImbue_FlametongueWeapon,
OffHandImbue: proto.WeaponImbue_EnchantedRepellent,
SpellPowerBuff: proto.SpellPowerBuff_GreaterArcaneElixir,
},
}

var ItemFilters = core.ItemFilter{
WeaponTypes: []proto.WeaponType{
proto.WeaponType_WeaponTypeAxe,
Expand Down
31 changes: 31 additions & 0 deletions ui/elemental_shaman/apls/phase_6.apl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "TypeAPL",
"prepullActions": [
{"action":{"castSpell":{"spellId":{"spellId":10432,"rank":7}}},"doAtValue":{"const":{"val":"-10s"}}},
{"action":{"activateAuraWithStacks":{"auraId":{"spellId":10432,"rank":7},"numStacks":"9"}},"doAtValue":{"const":{"val":"-10s"}}},
{"action":{"castSpell":{"spellId":{"spellId":25359,"rank":3}}},"doAtValue":{"const":{"val":"-8s"}}},
{"action":{"castSpell":{"spellId":{"spellId":25361,"rank":5}}},"doAtValue":{"const":{"val":"-6.5s"}}},
{"action":{"castSpell":{"spellId":{"spellId":10497,"rank":4}}},"doAtValue":{"const":{"val":"-5s"}}},
{"action":{"castSpell":{"spellId":{"spellId":10438,"rank":6}}},"doAtValue":{"const":{"val":"-3.5s"}}},
{"action":{"castSpell":{"spellId":{"spellId":15208,"rank":10}}},"doAtValue":{"const":{"val":"-2s"}}}
],
"priorityList": [
{"action":{"castSpell":{"spellId":{"spellId":440580}}}},
{"action":{"autocastOtherCooldowns":{}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":10432,"rank":7}}},"rhs":{"const":{"val":"8"}}}},"castSpell":{"spellId":{"itemId":231281}}}},
{"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"itemId":231281}}},{"auraIsActive":{"auraId":{"itemId":231281}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"itemId":231281}}},"rhs":{"const":{"val":"2s"}}}}]}},"castSpell":{"spellId":{"spellId":10414,"rank":7}}}},
{"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"65%"}}}},"castSpell":{"spellId":{"spellId":425336}}}},
{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":29228,"rank":6}}},"rhs":{"const":{"val":"3s"}}}},"castSpell":{"spellId":{"spellId":29228,"rank":6}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"dotRemainingTime":{"spellId":{"spellId":29228,"rank":6}}},"rhs":{"spellCastTime":{"spellId":{"spellId":408490}}}}},"castSpell":{"spellId":{"spellId":408490}}}},
{"hide":true,"action":{"condition":{"dotIsActive":{"spellId":{"spellId":29228,"rank":6}}},"castSpell":{"spellId":{"spellId":408490}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":10432,"rank":7}}},"rhs":{"const":{"val":"8"}}}},"castSpell":{"spellId":{"spellId":10414,"rank":7}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":408427}}}},
{"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":29228,"rank":6}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":408490}}}}}]}},"castSpell":{"spellId":{"spellId":16166}}}},
{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":408427}}}},
{"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":10587,"rank":4}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}},{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":10587,"rank":4}}}},
{"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":10438,"rank":6}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"30s"}}}},{"cmp":{"op":"OpLe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":10438,"rank":6}}}},
{"hide":true,"action":{"castSpell":{"spellId":{"spellId":10605,"rank":4}}}},
{"action":{"castSpell":{"spellId":{"spellId":15208,"rank":10}}}},
{"action":{"condition":{"const":{"val":"false"}},"castSpell":{"spellId":{"spellId":20572}}}}
]
}
21 changes: 21 additions & 0 deletions ui/elemental_shaman/gear_sets/phase_6.gear.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"items": [
{"id":233705,"enchant":7628,"rune":415231},
{"id":233620},
{"id":233707,"enchant":2605},
{"id":233436,"enchant":7564,"rune":440569},
{"id":233704,"enchant":7648,"rune":408438},
{"id":234114,"enchant":1883,"rune":432056},
{"id":233604,"enchant":7648,"rune":408490},
{"id":233622,"rune":415100},
{"id":233708,"enchant":7627,"rune":408514},
{"id":233518,"enchant":7648,"rune":408696},
{"id":234032,"rune":442896},
{"id":233437,"rune":442894},
{"id":230273},
{"id":233994},
{"id":235009,"enchant":2568},
{"id":231890,"enchant":7603},
{"id":228176}
]
}
Loading

0 comments on commit 96e2425

Please sign in to comment.