From 5f75cd8d9e0307539d36fcd23d43d02569ad1da3 Mon Sep 17 00:00:00 2001 From: Classic Ceridwyn Date: Sun, 5 Oct 2025 22:14:22 +0200 Subject: [PATCH 1/3] First version of the balance druid sim Needs improvments to be more accurante (innverate, Starfire Rank1, ...) --- ui/balance_druid/apls/balance.apl.json | 11 +++++++ ui/balance_druid/gear_sets/p0.bis.gear.json | 32 ++++++++++----------- ui/balance_druid/gear_sets/p1.bis.gear.json | 32 ++++++++++----------- ui/balance_druid/gear_sets/p2.bis.gear.json | 18 ++++++++++++ ui/balance_druid/gear_sets/p3.bis.gear.json | 18 ++++++++++++ ui/balance_druid/gear_sets/p4.bis.gear.json | 19 ++++++++++++ ui/balance_druid/gear_sets/p5.bis.gear.json | 19 ++++++++++++ ui/balance_druid/presets.ts | 26 +++++++++++------ ui/balance_druid/sim.ts | 2 +- 9 files changed, 133 insertions(+), 44 deletions(-) create mode 100644 ui/balance_druid/apls/balance.apl.json create mode 100644 ui/balance_druid/gear_sets/p2.bis.gear.json create mode 100644 ui/balance_druid/gear_sets/p3.bis.gear.json create mode 100644 ui/balance_druid/gear_sets/p4.bis.gear.json create mode 100644 ui/balance_druid/gear_sets/p5.bis.gear.json diff --git a/ui/balance_druid/apls/balance.apl.json b/ui/balance_druid/apls/balance.apl.json new file mode 100644 index 0000000000..20823f007b --- /dev/null +++ b/ui/balance_druid/apls/balance.apl.json @@ -0,0 +1,11 @@ +{ + "type": "TypeAPL", + "prepullActions": [], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"1.5"}}}},"castSpell":{"spellId":{"spellId":9835,"rank":10}}}}, + {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3.5"}}}},"castSpell":{"spellId":{"spellId":9912,"rank":8}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9835,"rank":10}}}}},"castSpell":{"spellId":{"spellId":9835,"rank":10}}}}, + {"action":{"castSpell":{"spellId":{"spellId":25298,"rank":7}}}} + ] +} diff --git a/ui/balance_druid/gear_sets/p0.bis.gear.json b/ui/balance_druid/gear_sets/p0.bis.gear.json index e764fbd43b..65e9877a29 100644 --- a/ui/balance_druid/gear_sets/p0.bis.gear.json +++ b/ui/balance_druid/gear_sets/p0.bis.gear.json @@ -1,19 +1,17 @@ {"items": [ - {"id":16720}, - {}, - {"id":16718}, - {}, - {"id":16706}, - {"id":16714}, - {"id":16717}, - {"id":16716}, - {"id":16719}, - {"id":16715}, - {}, - {}, - {}, - {}, - {}, - {}, - {} + {"id":18727}, + {"id": 12103}, + {"id": 18681}, + {"id": 10249}, + {"id": 10246}, + {"id": 10248}, + {"id": 13253}, + {"id": 15191}, + {"id": 13170}, + {"id": 10247}, + {"id": 12543}, + {"id": 13001}, + {"id": 13968}, + {"id": 13515}, + {"id": 15278} ]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p1.bis.gear.json b/ui/balance_druid/gear_sets/p1.bis.gear.json index 6253f92d01..f3fc889afc 100644 --- a/ui/balance_druid/gear_sets/p1.bis.gear.json +++ b/ui/balance_druid/gear_sets/p1.bis.gear.json @@ -1,19 +1,17 @@ {"items": [ - {"id":16834}, - {}, - {"id":16836}, - {}, - {"id":16833}, - {"id":16830}, - {"id":16831}, - {"id":16828}, - {"id":16835}, - {"id":16829}, - {}, - {}, - {}, - {}, - {}, - {}, - {} + {"id":18727}, + {"id": 18814}, + {"id": 18681}, + {"id": 17078}, + {"id": 19145}, + {"id": 10248}, + {"id": 13253}, + {"id": 19136}, + {"id": 19165}, + {"id": 10247}, + {"id": 19147}, + {"id": 19147}, + {"id": 13968}, + {"id": 18820}, + {"id": 18842} ]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p2.bis.gear.json b/ui/balance_druid/gear_sets/p2.bis.gear.json new file mode 100644 index 0000000000..aa2c3fbf5b --- /dev/null +++ b/ui/balance_druid/gear_sets/p2.bis.gear.json @@ -0,0 +1,18 @@ +{"items": [ + {"id":18727}, + {"id": 18814}, + {"id": 18681}, + {"id": 17078}, + {"id": 19145}, + {"id": 10248}, + {"id": 13253}, + {"id": 19136}, + {"id": 19165}, + {"id": 10247}, + {"id": 19147}, + {"id": 19147}, + {"id": 13968}, + {"id": 18820}, + {"id": 17105}, + {"id": 19308} +]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p3.bis.gear.json b/ui/balance_druid/gear_sets/p3.bis.gear.json new file mode 100644 index 0000000000..8b6b58b3ba --- /dev/null +++ b/ui/balance_druid/gear_sets/p3.bis.gear.json @@ -0,0 +1,18 @@ +{"items": [ + {"id":19375}, + {"id": 18814}, + {"id": 19370}, + {"id": 22731}, + {"id": 19145}, + {"id": 19374}, + {"id": 13253}, + {"id": 19136}, + {"id": 19683}, + {"id": 19684}, + {"id": 19147}, + {"id": 19403}, + {"id": 19379}, + {"id": 18820}, + {"id": 23451}, + {"id": 19308} +]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p4.bis.gear.json b/ui/balance_druid/gear_sets/p4.bis.gear.json new file mode 100644 index 0000000000..5136b77268 --- /dev/null +++ b/ui/balance_druid/gear_sets/p4.bis.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":19375}, + {"id": 18814}, + {"id": 19370}, + {"id": 22731}, + {"id": 19682}, + {"id": 19374}, + {"id": 19929}, + {"id": 19136}, + {"id": 19683}, + {"id": 19684}, + {"id": 19147}, + {"id": 19403}, + {"id": 19379}, + {"id": 18820}, + {"id": 23451}, + {"id": 19891}, + {"id": 23197} +]} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p5.bis.gear.json b/ui/balance_druid/gear_sets/p5.bis.gear.json new file mode 100644 index 0000000000..bf9d10af97 --- /dev/null +++ b/ui/balance_druid/gear_sets/p5.bis.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":19375}, + {"id": 21608}, + {"id": 19370}, + {"id": 22731}, + {"id": 19682}, + {"id": 21186}, + {"id": 21585}, + {"id": 22730}, + {"id": 19683}, + {"id": 19684}, + {"id": 21709}, + {"id": 19403}, + {"id": 19379}, + {"id": 18820}, + {"id": 23451}, + {"id": 19891}, + {"id": 23197} +]} \ No newline at end of file diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts index 8d3ad8262c..219dbcbcd6 100644 --- a/ui/balance_druid/presets.ts +++ b/ui/balance_druid/presets.ts @@ -20,10 +20,13 @@ import { } from '../core/proto/common.js'; import { BalanceDruid_Options as BalanceDruidOptions } from '../core/proto/druid.js'; import { SavedTalents } from '../core/proto/ui.js'; -import P1APL from './apls/p1.apl.json'; +import Balance from './apls/balance.apl.json'; import P0BISGear from './gear_sets/p0.bis.gear.json'; import P1BISGear from './gear_sets/p1.bis.gear.json'; - +import P2BISGear from './gear_sets/p2.bis.gear.json'; +import P3BISGear from './gear_sets/p3.bis.gear.json'; +import P4BISGear from './gear_sets/p4.bis.gear.json'; +import P5BISGear from './gear_sets/p5.bis.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. @@ -34,21 +37,26 @@ import P1BISGear from './gear_sets/p1.bis.gear.json'; export const GearP0BIS = PresetUtils.makePresetGear('Pre-BiS', P0BISGear); export const GearP1BIS = PresetUtils.makePresetGear('P1 BiS', P1BISGear); +export const GearP2BIS = PresetUtils.makePresetGear('P2 BiS', P2BISGear); +export const GearP3BIS = PresetUtils.makePresetGear('P3 BiS', P3BISGear); +export const GearP4BIS = PresetUtils.makePresetGear('P4 BiS', P4BISGear); +export const GearP5BIS = PresetUtils.makePresetGear('P5 BiS', P5BISGear); + export const GearPresets = { - [Phase.Phase1]: [GearP0BIS, GearP1BIS], + [Phase.Phase5]: [GearP0BIS, GearP1BIS, GearP2BIS, GearP3BIS, GearP4BIS, GearP5BIS], }; -export const DefaultGear = GearP0BIS; +export const DefaultGear = GearP5BIS; /////////////////////////////////////////////////////////////////////////// // APL Presets /////////////////////////////////////////////////////////////////////////// -export const APLP1Balance = PresetUtils.makePresetAPLRotation('Balance', P1APL); - +// export const APLP1Balance = PresetUtils.makePresetAPLRotation('Balance', P1APL); +export const DefaultBalance = PresetUtils.makePresetAPLRotation('DefaultBalance', Balance); export const APLPresets = { - [Phase.Phase1]: [APLP1Balance], + [Phase.Phase1]: [DefaultBalance], }; export const DefaultAPL = APLPresets[Phase.Phase1][0]; @@ -115,6 +123,6 @@ export const DefaultDebuffs = Debuffs.create({ export const OtherDefaults = { distanceFromTarget: 15, - profession1: Profession.Enchanting, - profession2: Profession.Alchemy, + profession1: Profession.Engineering, + profession2: Profession.Tailoring, }; diff --git a/ui/balance_druid/sim.ts b/ui/balance_druid/sim.ts index 7d6773a68f..455042f40c 100644 --- a/ui/balance_druid/sim.ts +++ b/ui/balance_druid/sim.ts @@ -111,7 +111,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBalanceDruid, { presets: { talents: [...Presets.TalentPresets[Phase.Phase1]], rotations: [...Presets.APLPresets[Phase.Phase1]], - gear: [...Presets.GearPresets[Phase.Phase1]], + gear: [...Presets.GearPresets[Phase.Phase5]], }, autoRotation: player => { From 6c1054f4969e6ff7c2f84baec220eb1760b4aec9 Mon Sep 17 00:00:00 2001 From: Classic Ceridwyn Date: Fri, 10 Oct 2025 18:08:03 +0200 Subject: [PATCH 2/3] Adding links in the landing page and enabling the sim as P5 Beta --- ui/core/launched_sims.ts | 2 +- ui/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts index 4565342276..3ce0a6f3ad 100644 --- a/ui/core/launched_sims.ts +++ b/ui/core/launched_sims.ts @@ -26,7 +26,7 @@ export const raidSimStatus: SimStatus = { export const simLaunchStatuses: Record = { [Spec.SpecBalanceDruid]: { phase: Phase.Phase1, - status: LaunchStatus.Unlaunched, + status: LaunchStatus.Beta, }, [Spec.SpecFeralDruid]: { phase: Phase.Phase2, diff --git a/ui/index.html b/ui/index.html index 9a3bbdd31d..8e4213414e 100644 --- a/ui/index.html +++ b/ui/index.html @@ -110,13 +110,13 @@

Classic

  • - +
    Druid Balance - Phase 1 - Unreleased + Phase 5 - Beta
    From 5ddfb712e89309ab8124ea8d32f726b49e963d2c Mon Sep 17 00:00:00 2001 From: Ceridwyn <85354177+Ceridwyn@users.noreply.github.com> Date: Fri, 10 Oct 2025 18:19:33 +0200 Subject: [PATCH 3/3] Update ui/balance_druid/presets.ts Co-authored-by: Kayla Glick <12898988+kayla-glick@users.noreply.github.com> --- ui/balance_druid/presets.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts index 219dbcbcd6..0248587e00 100644 --- a/ui/balance_druid/presets.ts +++ b/ui/balance_druid/presets.ts @@ -54,7 +54,7 @@ export const DefaultGear = GearP5BIS; /////////////////////////////////////////////////////////////////////////// // export const APLP1Balance = PresetUtils.makePresetAPLRotation('Balance', P1APL); -export const DefaultBalance = PresetUtils.makePresetAPLRotation('DefaultBalance', Balance); +export const DefaultBalance = PresetUtils.makePresetAPLRotation('Default Balance', Balance); export const APLPresets = { [Phase.Phase1]: [DefaultBalance], };