Skip to content

Commit

Permalink
Merge pull request #1154 from wowsims/feature/p3-launch
Browse files Browse the repository at this point in the history 
[UI] Finalise last classes for P3
  • Loading branch information
@1337LutZ
1337LutZ authored Nov 2, 2024
2 parents 993c89d + ee3f0ef commit 7918726
Show file tree
Hide file tree
Showing 37 changed files with 393 additions and 316 deletions.
48 changes: 24 additions & 24 deletions sim/warrior/protection/TestProtectionWarrior.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2097,43 +2097,43 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-Settings-Human-preraid-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 22234.38953
tps: 127386.551
dps: 23573.79485
tps: 134997.17692
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Human-preraid-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 4806.89898
tps: 29492.7692
dps: 5247.6378
tps: 31894.62084
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Human-preraid-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 5269.54917
tps: 31967.53151
dps: 5727.35544
tps: 34446.68445
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Human-preraid-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 16046.71083
tps: 92074.83956
dps: 16887.08099
tps: 96872.51812
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Human-preraid-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 3154.36043
tps: 19570.51001
dps: 3437.55582
tps: 21112.50425
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Human-preraid-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 3021.13082
tps: 18850.28962
dps: 3297.99839
tps: 20365.18955
}
}
dps_results: {
Expand Down Expand Up @@ -2223,43 +2223,43 @@ dps_results: {
dps_results: {
key: "TestProtectionWarrior-Settings-Orc-preraid-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 22243.62497
tps: 127435.48925
dps: 23553.99325
tps: 134858.44962
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Orc-preraid-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 4780.24513
tps: 29339.3541
dps: 5226.39416
tps: 31735.51033
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Orc-preraid-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 5233.81197
tps: 31779.39138
dps: 5682.83686
tps: 34167.25405
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Orc-preraid-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 16043.99064
tps: 92035.11697
dps: 16877.15557
tps: 96789.77658
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Orc-preraid-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 3148.45943
tps: 19491.55244
dps: 3436.30448
tps: 21063.89509
}
}
dps_results: {
key: "TestProtectionWarrior-Settings-Orc-preraid-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 2994.5041
tps: 18682.26018
dps: 3267.26215
tps: 20161.14939
}
}
dps_results: {
Expand Down
30 changes: 15 additions & 15 deletions ui/core/launched_sims.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ export const raidSimStatus: SimStatus = {
// This list controls which links are shown in the top-left dropdown menu.
export const simLaunchStatuses: Record<Spec, SimStatus> = {
[Spec.SpecUnknown]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Unlaunched,
},
// Death Knight
[Spec.SpecBloodDeathKnight]: {
phase: Phase.Phase2,
status: LaunchStatus.Launched,
phase: Phase.Phase3,
status: LaunchStatus.Beta,
},
[Spec.SpecFrostDeathKnight]: {
phase: Phase.Phase3,
Expand All @@ -43,7 +43,7 @@ export const simLaunchStatuses: Record<Spec, SimStatus> = {
},
// Druid
[Spec.SpecBalanceDruid]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecFeralDruid]: {
Expand Down Expand Up @@ -73,11 +73,11 @@ export const simLaunchStatuses: Record<Spec, SimStatus> = {
},
// Mage
[Spec.SpecArcaneMage]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecFireMage]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecFrostMage]: {
Expand Down Expand Up @@ -107,7 +107,7 @@ export const simLaunchStatuses: Record<Spec, SimStatus> = {
status: LaunchStatus.Unlaunched,
},
[Spec.SpecShadowPriest]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
// Rogue
Expand All @@ -125,11 +125,11 @@ export const simLaunchStatuses: Record<Spec, SimStatus> = {
},
// Shaman
[Spec.SpecElementalShaman]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecEnhancementShaman]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecRestorationShaman]: {
Expand All @@ -138,28 +138,28 @@ export const simLaunchStatuses: Record<Spec, SimStatus> = {
},
// Warlock
[Spec.SpecAfflictionWarlock]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecDemonologyWarlock]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecDestructionWarlock]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
// Warrior
[Spec.SpecArmsWarrior]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecFuryWarrior]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
[Spec.SpecProtectionWarrior]: {
phase: Phase.Phase2,
phase: Phase.Phase3,
status: LaunchStatus.Launched,
},
};
Expand Down
22 changes: 14 additions & 8 deletions ui/death_knight/blood/sim.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBloodDeathKnight, {
),
defaults: {
// Default equipped gear.
gear: Presets.P1_BLOOD_PRESET.gear,
gear: Presets.P3_BLOOD_BALANCED_PRESET.gear,
// Default EP weights for sorting gear in the gear picker.
epWeights: Presets.P1_BLOOD_EP_PRESET.epWeights,
epWeights: Presets.P3_BLOOD_EP_PRESET.epWeights,
// Default stat caps for the Reforge Optimizer
statCaps: (() => {
const hitCap = new Stats().withPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent, 8);
Expand Down Expand Up @@ -110,16 +110,16 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBloodDeathKnight, {

modifyDisplayStats: (player: Player<Spec.SpecBloodDeathKnight>) => {
// Blood Presence is a combat buff but we want to include its bonus in the stats
const currentStats = player.getCurrentStats()
const currentStats = player.getCurrentStats();
if (currentStats.finalStats) {
const bonusStamina = currentStats.finalStats.stats[Stat.StatStamina]*0.08
const bonusHealth = bonusStamina*14
const stats = new Stats().addStat(Stat.StatHealth, bonusHealth).addStat(Stat.StatStamina, bonusStamina)
const bonusStamina = currentStats.finalStats.stats[Stat.StatStamina] * 0.08;
const bonusHealth = bonusStamina * 14;
const stats = new Stats().addStat(Stat.StatHealth, bonusHealth).addStat(Stat.StatStamina, bonusStamina);
return {
buffs: stats,
};
}
return {}
return {};
},

// IconInputs to include in the 'Player' section on the settings tab.
Expand Down Expand Up @@ -157,7 +157,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBloodDeathKnight, {
// Preset talents that the user can quickly select.
talents: [Presets.BloodTalents],
// Preset gear configurations that the user can quickly select.
gear: [Presets.PRERAID_BLOOD_PRESET, Presets.P1_BLOOD_PRESET, Presets.P3_BLOOD_BALANCED_PRESET, Presets.P3_BLOOD_DEFENSIVE_PRESET, Presets.P3_BLOOD_OFFENSIVE_PRESET],
gear: [
Presets.PRERAID_BLOOD_PRESET,
Presets.P1_BLOOD_PRESET,
Presets.P3_BLOOD_BALANCED_PRESET,
Presets.P3_BLOOD_DEFENSIVE_PRESET,
Presets.P3_BLOOD_OFFENSIVE_PRESET,
],
builds: [Presets.P1_PRESET, Presets.P3_PRESET],
},

Expand Down
40 changes: 21 additions & 19 deletions ui/druid/balance/gear_sets/preraid.gear.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{ "items": [
{"id":59453,"enchant":4207,"gems":[68780,59479,59493]},
{"id":67130,"reforging":162},
{"id":57866,"enchant":4200,"gems":[52207,52207],"reforging":145},
{"id":67131,"enchant":4115,"gems":[52207],"reforging":162},
{"id":56561,"enchant":4102,"gems":[52207],"reforging":145},
{"id":56297,"enchant":4257,"gems":[0],"reforging":141},
{"id":56334,"enchant":4107,"gems":[52207,0],"reforging":151},
{"id":56536,"enchant":3601,"gems":[52207,52207],"reforging":151},
{"id":56401,"enchant":4110,"gems":[52207,52207],"reforging":165},
{"id":56277,"enchant":4104,"gems":[52207],"reforging":144},
{"id":67129,"reforging":141},
{"id":64904,"reforging":162},
{"id":56320},
{"id":62047,"reforging":167},
{"id":64489,"enchant":4097,"reforging":141},
{},
{"id":56372,"gems":[52207],"reforging":119}
]}
{
"items": [
{ "id": 60282, "enchant": 4207, "gems": [68780, 52236], "reforging": 141 },
{ "id": 69882, "randomSuffix": -131 },
{ "id": 60284, "enchant": 4200, "gems": [52207], "reforging": 162 },
{ "id": 60232, "enchant": 4115, "gems": [52207], "reforging": 162 },
{ "id": 60281, "enchant": 4102, "gems": [52207, 52207], "reforging": 145 },
{ "id": 65021, "enchant": 4257, "gems": [0], "reforging": 167 },
{ "id": 60285, "enchant": 4068, "gems": [52207, 0], "reforging": 141 },
{ "id": 65374, "randomSuffix": -231, "gems": [52208, 52207] },
{ "id": 65384, "randomSuffix": -193, "enchant": 4110, "gems": [52207, 52236] },
{ "id": 60236, "enchant": 4104, "gems": [52236, 52207], "reforging": 167 },
{ "id": 65373, "randomSuffix": -131 },
{ "id": 70124, "reforging": 145 },
{ "id": 65105 },
{ "id": 62047, "reforging": 167 },
{ "id": 70157, "enchant": 4097, "reforging": 167 },
{ "id": 59484, "enchant": 4091, "reforging": 148 },
{ "id": 70111, "gems": [52207], "reforging": 162 }
]
}
8 changes: 4 additions & 4 deletions ui/druid/balance/sim.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBalanceDruid, {

defaults: {
// Default equipped gear.
gear: Presets.T11PresetGear.gear,
gear: Presets.T12PresetGear.gear,
// Default EP weights for sorting gear in the gear picker.
epWeights: Presets.StandardEPWeights.epWeights,
// Default stat caps for the Reforge optimizer
Expand Down Expand Up @@ -99,7 +99,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBalanceDruid, {
},

autoRotation: (_player: Player<Spec.SpecBalanceDruid>): APLRotation => {
return Presets.T11PresetRotation.rotation.rotation!;
return Presets.T12PresetRotation.rotation.rotation!;
},

raidSimPresets: [
Expand All @@ -117,10 +117,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBalanceDruid, {
defaultGear: {
[Faction.Unknown]: {},
[Faction.Alliance]: {
1: Presets.PreraidPresetGear.gear,
1: Presets.T13PresetGear.gear,
},
[Faction.Horde]: {
1: Presets.PreraidPresetGear.gear,
1: Presets.T13PresetGear.gear,
},
},
},
Expand Down
39 changes: 20 additions & 19 deletions ui/mage/arcane/gear_sets/prebis.gear.json
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ "items": [
{"id":59449,"enchant":4207,"gems":[68780,59479,59493]},
{"id":62416,"reforging":144},
{"id":63463,"enchant":4200,"gems":[52208],"reforging":167},
{"id":56267,"enchant":4115},
{"id":56311,"enchant":4102,"gems":[52208,52207],"reforging":167},
{"id":56389,"enchant":4257,"gems":[0],"reforging":145},
{"id":62364,"enchant":4068,"gems":[52217,0]},
{"id":54503,"gems":[52217,52207],"reforging":167},
{"id":54505,"enchant":4112,"gems":[52207],"reforging":144},
{"id":62450,"enchant":4104,"gems":[52208]},
{"id":64904},
{"id":65169,"gems":[52207],"reforging":167},
{"id":62047,"reforging":167},
{"id":62465},
{"id":64489,"enchant":4097,"reforging":144},
{},
{"id":56296,"reforging":167}
]
{
"items": [
{ "id": 60237, "enchant": 4207, "gems": [68780, 52217], "reforging": 144 },
{ "id": 71213, "reforging": 145 },
{ "id": 65043, "enchant": 4200, "gems": [52207], "reforging": 117 },
{ "id": 60232, "enchant": 4096, "gems": [52205], "reforging": 165 },
{ "id": 71289, "enchant": 4102, "gems": [52207, 52217] },
{ "id": 65138, "enchant": 4257, "gems": [0], "reforging": 165 },
{ "id": 71286, "enchant": 4068, "gems": [52217, 0] },
{ "id": 65376, "randomSuffix": -230, "gems": [52208, 52207], "reforging": 165 },
{ "id": 71288, "enchant": 4112, "gems": [52207, 52207], "reforging": 165 },
{ "id": 69954, "enchant": 4104, "gems": [52207], "reforging": 145 },
{ "id": 65373, "randomSuffix": -138, "enchant": 4080, "reforging": 165 },
{ "id": 71210, "enchant": 4080, "reforging": 167 },
{ "id": 65105 },
{ "id": 65053, "reforging": 144 },
{ "id": 70156, "enchant": 4097, "reforging": 147 },
{ "id": 70112, "enchant": 4091, "reforging": 144 },
{ "id": 71151 }
]
}
4 changes: 2 additions & 2 deletions ui/mage/arcane/presets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import { Stats } from '../../core/proto_utils/stats';
import ArcaneApl from './apls/arcane.apl.json';
import P1ArcaneBisGear from './gear_sets/p1.gear.json';
import P3ArcaneBisGear from './gear_sets/p3.gear.json';
import P1ArcanePrebisGear from './gear_sets/prebis.gear.json';
import P3ArcanePrebisGear from './gear_sets/prebis.gear.json';

// Preset options for this spec.
// Eventually we will import these values for the raid sim too, so its good to
// keep them in a separate file.
export const ARCANE_P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1ArcaneBisGear, { talentTree: 0 });
export const ARCANE_P1_PREBIS_PRESET = PresetUtils.makePresetGear('P1 Pre-raid ', P1ArcanePrebisGear, { talentTree: 0 });
export const ARCANE_P3_PREBIS_PRESET = PresetUtils.makePresetGear('Pre-raid ', P3ArcanePrebisGear, { talentTree: 0 });
export const ARCANE_P3_PRESET = PresetUtils.makePresetGear('P3 Preset', P3ArcaneBisGear, { talentTree: 0 });
/* export const DefaultSimpleRotation = MageRotation.create({
only3ArcaneBlastStacksBelowManaPercent: 0.15,
Expand Down
Loading

0 comments on commit 7918726

Please sign in to comment.