Skip to content

Commit

Permalink
update shockadin, ele presets
Browse files Browse the repository at this point in the history
  • Loading branch information
@kayla-glick
kayla-glick committed Sep 27, 2024
1 parent c6294d0 commit 076c26e
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 77 deletions.
130 changes: 65 additions & 65 deletions sim/shaman/elemental/TestElemental.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ character_stats_results: {
final_stats: 640.09
final_stats: 478.17
final_stats: 246.675
final_stats: 657
final_stats: 669
final_stats: 0
final_stats: 40
final_stats: 0
Expand All @@ -211,7 +211,7 @@ character_stats_results: {
final_stats: 0
final_stats: 112.9755
final_stats: 9
final_stats: 39.38107
final_stats: 40.38107
final_stats: 0
final_stats: 0
final_stats: 1334.375
Expand Down Expand Up @@ -445,18 +445,18 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 3.11846
weights: 3.10644
weights: 0
weights: 2.12324
weights: 2.1359
weights: 0
weights: 0.53325
weights: 0.5345
weights: 0
weights: 0
weights: 1.58999
weights: 1.6014
weights: 0
weights: 0
weights: 0
weights: 23.99945
weights: 23.52306
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -946,161 +946,161 @@ dps_results: {
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail"
value: {
dps: 1466.14885
tps: 1495.1997
dps: 1494.07326
tps: 1522.72748
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sMail"
value: {
dps: 1466.51122
tps: 1495.54076
dps: 1493.13794
tps: 1521.59369
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail"
value: {
dps: 1601.47571
tps: 1630.99042
dps: 1625.9067
tps: 1654.93176
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldChainmail"
value: {
dps: 1549.63324
tps: 1577.56619
dps: 1575.73503
tps: 1603.14182
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldLadenChain"
value: {
dps: 1465.72193
tps: 1494.72112
dps: 1491.25118
tps: 1519.73634
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldScalemail"
value: {
dps: 1466.03799
tps: 1495.03718
dps: 1491.56724
tps: 1520.05239
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
value: {
dps: 2505.21299
tps: 2508.8274
dps: 2537.1534
tps: 2541.0349
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-ShunnedDevotee'sChainmail"
value: {
dps: 2637.20992
tps: 2640.95669
dps: 2662.76773
tps: 2666.94248
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-AllItems-TheFiveThunders"
value: {
dps: 1313.40016
tps: 1298.1081
dps: 1334.55092
tps: 1318.38416
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Average-Default"
value: {
dps: 4173.69914
tps: 2521.30186
dps: 4222.71714
tps: 2550.60172
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 7990.11373
tps: 3978.07939
dps: 8064.48365
tps: 4013.62068
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 4036.77501
tps: 2437.91455
dps: 4090.36115
tps: 2469.59804
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 4373.0872
tps: 2714.98461
dps: 4430.74772
tps: 2747.11587
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 4212.32599
tps: 2225.34125
dps: 4257.98424
tps: 2242.60653
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 1851.50601
tps: 1128.31269
dps: 1876.31779
tps: 1142.92707
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 1999.01673
tps: 1253.46333
dps: 2021.75735
tps: 1267.28219
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 8013.97363
tps: 3994.6137
dps: 8095.25783
tps: 4033.05022
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 4045.8169
tps: 2445.09218
dps: 4097.09717
tps: 2474.33687
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 4360.36991
tps: 2701.15031
dps: 4421.09877
tps: 2734.61883
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 4205.16906
tps: 2231.25626
dps: 4249.53231
tps: 2246.99021
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 1870.9223
tps: 1140.71408
dps: 1895.91966
tps: 1155.16737
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 2026.26613
tps: 1265.4106
dps: 2051.96766
tps: 1280.73274
}
}
dps_results: {
key: "TestElemental-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
value: {
dps: 4109.99113
tps: 2490.35244
dps: 4162.69244
tps: 2521.37566
}
}
15 changes: 14 additions & 1 deletion sim/shaman/elemental/elemental_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func TestElemental(t *testing.T) {
GearSet: core.GetGearSet("../../../ui/elemental_shaman/gear_sets", "phase_5"),
Rotation: core.GetAplRotation("../../../ui/elemental_shaman/apls", "phase_5"),
Buffs: core.FullBuffsPhase5,
Consumes: Phase4Consumes,
Consumes: Phase5Consumes,
SpecOptions: core.SpecOptionsCombo{Label: "Adaptive", SpecOptions: PlayerOptionsAdaptive},

ItemFilter: ItemFilters,
Expand Down Expand Up @@ -163,6 +163,19 @@ var Phase4Consumes = core.ConsumesCombo{
},
}

var Phase5Consumes = core.ConsumesCombo{
Label: "P5-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_MagnificentTrollshine,
SpellPowerBuff: proto.SpellPowerBuff_GreaterArcaneElixir,
},
}

var ItemFilters = core.ItemFilter{
WeaponTypes: []proto.WeaponType{
proto.WeaponType_WeaponTypeAxe,
Expand Down
2 changes: 1 addition & 1 deletion ui/retribution_paladin/gear_sets/p5shockadin.gear.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
{"id":230248,"enchant":7603},
{"id":232420}
]
}
}
18 changes: 8 additions & 10 deletions ui/retribution_paladin/presets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
WeaponImbue,
ZanzaBuff,
} from '../core/proto/common.js';
import { PaladinAura, PaladinSeal, PaladinOptions as RetributionPaladinOptions } from '../core/proto/paladin.js';
import { PaladinAura, PaladinOptions as RetributionPaladinOptions, PaladinSeal } from '../core/proto/paladin.js';
import { SavedTalents } from '../core/proto/ui.js';
import APLP1RetJson from './apls/p1ret.apl.json';
import APLP2RetJson from './apls/p2ret.apl.json';
Expand All @@ -31,12 +31,10 @@ import APLP4RetJson from './apls/p4ret.apl.json';
import APLP4RetExodinJson from './apls/p4ret-exodin.apl.json';
import APLP4RetExodin6PcT1Json from './apls/p4ret-exodin-6pcT1.apl.json';
import APLP4RetTwisting6PcT1Json from './apls/p4ret-twisting-6pcT1.apl.json';
import APLPP5ShockadinJson from './apls/p5Shockadin.apl.json';

import APLPP5ExodinJson from './apls/p5ret-exodin-6CF2DR.apl.json';
import APLPP5TwistingSlowJson from './apls/p5ret-twist-4DR-3.5-3.6.apl.json';
import APLPP5TwistingSlowerJson from './apls/p5ret-twist-4DR-3.7-4.0.apl.json';

import APLPP5ShockadinJson from './apls/p5Shockadin.apl.json';
import Phase1RetGearJson from './gear_sets/p1ret.gear.json';
import Phase2RetSoCGearJson from './gear_sets/p2retsoc.gear.json';
import Phase2RetSoMGearJson from './gear_sets/p2retsom.gear.json';
Expand All @@ -45,9 +43,9 @@ import Phase4RetExodinGearJson from './gear_sets/p4ret-exodin.gear.json';
import Phase4RetExodin6PcT1GearJson from './gear_sets/p4ret-exodin-6pcT1.gear.json';
import Phase4RetTwisting6PcT1GearJson from './gear_sets/p4ret-twisting-6pcT1.gear.json';
import Phase4RetGearJson from './gear_sets/p4rettwist.gear.json';
import Phase5TwistingGearJson from './gear_sets/p5twisting.gear.json';
import Phase5ExodinGearJson from './gear_sets/p5exodin.gear.json';
import Phase5ShockadinGearJson from './gear_sets/p5shockadin.gear.json';
import Phase5TwistingGearJson from './gear_sets/p5twisting.gear.json';

// Preset options for this spec.
// Eventually we will import these values for the raid sim too, so its good to
Expand Down Expand Up @@ -206,21 +204,21 @@ export const DefaultOptions = RetributionPaladinOptions.create({

export const DefaultConsumes = Consumes.create({
agilityElixir: AgilityElixir.ElixirOfTheMongoose,
attackPowerBuff: AttackPowerBuff.JujuMight,
boglingRoot: false,
defaultConjured: Conjured.ConjuredDemonicRune,
defaultPotion: Potions.MajorManaPotion,
dragonBreathChili: true,
enchantedSigil: EnchantedSigil.FlowingWatersSigil,
fillerExplosive: Explosive.ExplosiveUnknown,
firePowerBuff: FirePowerBuff.ElixirOfGreaterFirepower,
food: Food.FoodBlessSunfruit,
flask: Flask.FlaskOfSupremePower,
firePowerBuff: FirePowerBuff.ElixirOfGreaterFirepower,
fillerExplosive: Explosive.ExplosiveUnknown,
mainHandImbue: WeaponImbue.WildStrikes,

offHandImbue: WeaponImbue.MagnificentTrollshine,
spellPowerBuff: SpellPowerBuff.GreaterArcaneElixir,
strengthBuff: StrengthBuff.JujuPower,
zanzaBuff: ZanzaBuff.ROIDS,
attackPowerBuff: AttackPowerBuff.JujuMight,
defaultConjured: Conjured.ConjuredDemonicRune,
});

export const DefaultIndividualBuffs = IndividualBuffs.create({
Expand Down

0 comments on commit 076c26e

Please sign in to comment.