From eef884b43a1716fd6774a475cf6d8b74fb054abd Mon Sep 17 00:00:00 2001 From: Eric Taylor Date: Sat, 23 Nov 2024 22:03:26 -0500 Subject: [PATCH 1/3] Initial cleaning of Balance --- ui/balance_druid/apls/p1.apl.json | 8 +++ ui/balance_druid/apls/phase_1.apl.json | 13 ----- ui/balance_druid/apls/phase_2.apl.json | 16 ------ ui/balance_druid/apls/phase_3.apl.json | 14 ------ ui/balance_druid/apls/phase_4.apl.json | 15 ------ ui/balance_druid/apls/phase_5.apl.json | 18 ------- ui/balance_druid/gear_sets/blank.gear.json | 1 - ui/balance_druid/gear_sets/p0.bis.gear.json | 19 ++++++++ ui/balance_druid/gear_sets/p1.bis.gear.json | 19 ++++++++ ui/balance_druid/presets.ts | 54 ++++++--------------- ui/balance_druid/sim.ts | 10 +--- 11 files changed, 62 insertions(+), 125 deletions(-) create mode 100644 ui/balance_druid/apls/p1.apl.json delete mode 100644 ui/balance_druid/apls/phase_1.apl.json delete mode 100644 ui/balance_druid/apls/phase_2.apl.json delete mode 100644 ui/balance_druid/apls/phase_3.apl.json delete mode 100644 ui/balance_druid/apls/phase_4.apl.json delete mode 100644 ui/balance_druid/apls/phase_5.apl.json delete mode 100644 ui/balance_druid/gear_sets/blank.gear.json create mode 100644 ui/balance_druid/gear_sets/p0.bis.gear.json create mode 100644 ui/balance_druid/gear_sets/p1.bis.gear.json diff --git a/ui/balance_druid/apls/p1.apl.json b/ui/balance_druid/apls/p1.apl.json new file mode 100644 index 000000000..374284e1a --- /dev/null +++ b/ui/balance_druid/apls/p1.apl.json @@ -0,0 +1,8 @@ +{ + "type": "TypeAPL", + "prepullActions": [], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"castSpell":{"spellId":{"spellId":5179,"rank":4}}}} + ] +} diff --git a/ui/balance_druid/apls/phase_1.apl.json b/ui/balance_druid/apls/phase_1.apl.json deleted file mode 100644 index d372fe7da..000000000 --- a/ui/balance_druid/apls/phase_1.apl.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":2912,"rank":1}}},"doAtValue":{"const":{"val":"-3.5s"}}} - ], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":417157}}}}, - {"action":{"multidot":{"spellId":{"spellId":414684},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"multidot":{"spellId":{"spellId":8926,"rank":4},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"castSpell":{"spellId":{"spellId":5179,"rank":4}}}} - ] -} diff --git a/ui/balance_druid/apls/phase_2.apl.json b/ui/balance_druid/apls/phase_2.apl.json deleted file mode 100644 index 76a3b97a2..000000000 --- a/ui/balance_druid/apls/phase_2.apl.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":8950,"rank":3}}},"doAtValue":{"const":{"val":"-3.09s"}}} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":24858}}}}},"castSpell":{"spellId":{"spellId":24858}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},"castSpell":{"spellId":{"spellId":29166}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":417157}}},"castSpell":{"spellId":{"spellId":417157}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":417157}}},"castSpell":{"spellId":{"spellId":8950,"rank":3}}}}, - {"action":{"multidot":{"spellId":{"spellId":414684},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"multidot":{"spellId":{"spellId":8929,"rank":7},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":6780,"rank":6}}},"castSpell":{"spellId":{"spellId":6780,"rank":6}}}} - ] -} diff --git a/ui/balance_druid/apls/phase_3.apl.json b/ui/balance_druid/apls/phase_3.apl.json deleted file mode 100644 index bebc4bdf8..000000000 --- a/ui/balance_druid/apls/phase_3.apl.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":9875,"rank":5}}},"doAtValue":{"const":{"val":"-2.99s"}}} - ], - "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":417157}}},{"spellCanCast":{"spellId":{"spellId":9833,"rank":8}}}]}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":417157}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417157}}}}}]}},"castSpell":{"spellId":{"spellId":417157}}}}, - {"action":{"multidot":{"spellId":{"spellId":9833,"rank":8},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"multidot":{"spellId":{"spellId":414684},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":417157}}},"castSpell":{"spellId":{"spellId":9875,"rank":5}}}}, - {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":8905,"rank":7}}},"castSpell":{"spellId":{"spellId":8905,"rank":7}}}} - ] -} diff --git a/ui/balance_druid/apls/phase_4.apl.json b/ui/balance_druid/apls/phase_4.apl.json deleted file mode 100644 index 7c10932ee..000000000 --- a/ui/balance_druid/apls/phase_4.apl.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":25298,"rank":7}}},"doAtValue":{"const":{"val":"-2.99s"}}} - ], - "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":417157}}},{"spellCanCast":{"spellId":{"spellId":9835,"rank":10}}}]}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":417157}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417157}}}}}]}},"castSpell":{"spellId":{"spellId":417157}}}}, - {"action":{"multidot":{"spellId":{"spellId":9835,"rank":10},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"multidot":{"spellId":{"spellId":414684},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"multidot":{"spellId":{"spellId":24977,"rank":5},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":417157}}},"castSpell":{"spellId":{"spellId":9876,"rank":6}}}}, - {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":9912,"rank":8}}},"castSpell":{"spellId":{"spellId":9912,"rank":8}}}} - ] -} diff --git a/ui/balance_druid/apls/phase_5.apl.json b/ui/balance_druid/apls/phase_5.apl.json deleted file mode 100644 index 5232807bf..000000000 --- a/ui/balance_druid/apls/phase_5.apl.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":417157}}},"doAtValue":{"const":{"val":"-12.99s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":9876,"rank":6}}},"doAtValue":{"const":{"val":"-1.49s"}}} - ], - "priorityList": [ - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":417157}}},"castSpell":{"spellId":{"itemId":231280}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":417157}}},"castSpell":{"spellId":{"itemId":215162}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417157}}}}},"castSpell":{"spellId":{"spellId":417157},"target":{"type":"Target"}}}}, - {"action":{"multidot":{"spellId":{"spellId":9835,"rank":10},"maxDots":2,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"multidot":{"spellId":{"spellId":414684},"maxDots":2,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"multidot":{"spellId":{"spellId":24977,"rank":5},"maxDots":2,"maxOverlap":{"const":{"val":"0ms"}}}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":417157}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":408255}}},"rhs":{"const":{"val":"1"}}}}]}},"castSpell":{"spellId":{"spellId":9876,"rank":6},"target":{"type":"Target"}}}}, - {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":9912,"rank":8}}},"castSpell":{"spellId":{"spellId":9912,"rank":8},"target":{"type":"Target"}}}} - ] -} diff --git a/ui/balance_druid/gear_sets/blank.gear.json b/ui/balance_druid/gear_sets/blank.gear.json deleted file mode 100644 index 4bcab0861..000000000 --- a/ui/balance_druid/gear_sets/blank.gear.json +++ /dev/null @@ -1 +0,0 @@ -{"items": []} \ No newline at end of file diff --git a/ui/balance_druid/gear_sets/p0.bis.gear.json b/ui/balance_druid/gear_sets/p0.bis.gear.json new file mode 100644 index 000000000..e764fbd43 --- /dev/null +++ b/ui/balance_druid/gear_sets/p0.bis.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":16720}, + {}, + {"id":16718}, + {}, + {"id":16706}, + {"id":16714}, + {"id":16717}, + {"id":16716}, + {"id":16719}, + {"id":16715}, + {}, + {}, + {}, + {}, + {}, + {}, + {} +]} \ 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 new file mode 100644 index 000000000..6253f92d0 --- /dev/null +++ b/ui/balance_druid/gear_sets/p1.bis.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":16834}, + {}, + {"id":16836}, + {}, + {"id":16833}, + {"id":16830}, + {"id":16831}, + {"id":16828}, + {"id":16835}, + {"id":16829}, + {}, + {}, + {}, + {}, + {}, + {}, + {} +]} \ No newline at end of file diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts index 22a249e1c..20d1c57bd 100644 --- a/ui/balance_druid/presets.ts +++ b/ui/balance_druid/presets.ts @@ -20,12 +20,9 @@ import { } from '../core/proto/common.js'; import { BalanceDruid_Options as BalanceDruidOptions } from '../core/proto/druid.js'; import { SavedTalents } from '../core/proto/ui.js'; -import Phase1APL from './apls/phase_1.apl.json'; -import Phase2APL from './apls/phase_2.apl.json'; -import Phase3APL from './apls/phase_3.apl.json'; -import Phase4APL from './apls/phase_4.apl.json'; -import Phase5APL from './apls/phase_5.apl.json'; -import BlankGear from './gear_sets/blank.gear.json'; +import P1APL from './apls/p1.apl.json'; +import P0BISGear from './gear_sets/p0.bis.gear.json'; +import P1BISGear from './gear_sets/p1.bis.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -35,63 +32,42 @@ import BlankGear from './gear_sets/blank.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); +export const GearP0BIS = PresetUtils.makePresetGear('Pre-BiS', P0BISGear); +export const GearP1BIS = PresetUtils.makePresetGear('P1 BiS', P1BISGear); -export const GearPresets = {}; +export const GearPresets = { + [Phase.Phase1]: [GearP0BIS, GearP1BIS], +}; -export const DefaultGear = GearBlank; +export const DefaultGear = GearP0BIS; /////////////////////////////////////////////////////////////////////////// // APL Presets /////////////////////////////////////////////////////////////////////////// -export const APLPhase1 = PresetUtils.makePresetAPLRotation('Phase 1', Phase1APL, { customCondition: player => player.getLevel() === 25 }); -export const APLPhase2 = PresetUtils.makePresetAPLRotation('Phase 2', Phase2APL, { customCondition: player => player.getLevel() === 40 }); -export const APLPhase3 = PresetUtils.makePresetAPLRotation('Phase 3', Phase3APL, { customCondition: player => player.getLevel() === 50 }); -export const APLPhase4 = PresetUtils.makePresetAPLRotation('Phase 4', Phase4APL, { customCondition: player => player.getLevel() === 60 }); -export const APLPhase5 = PresetUtils.makePresetAPLRotation('Phase 5', Phase5APL, { customCondition: player => player.getLevel() === 60 }); +export const APLP1Balance = PresetUtils.makePresetAPLRotation('Balance', P1APL, { customCondition: player => player.getLevel() === 60 }); export const APLPresets = { - [Phase.Phase1]: [APLPhase1], - [Phase.Phase2]: [APLPhase2], - [Phase.Phase3]: [APLPhase3], - [Phase.Phase4]: [APLPhase4], - [Phase.Phase5]: [APLPhase5], + [Phase.Phase1]: [APLP1Balance], }; export const DefaultAPLs: Record = { - 25: APLPresets[Phase.Phase1][0], - 40: APLPresets[Phase.Phase2][0], - 50: APLPresets[Phase.Phase3][0], - 60: APLPresets[Phase.Phase5][0], + 60: APLPresets[Phase.Phase1][0], }; /////////////////////////////////////////////////////////////////////////// // Talent Presets /////////////////////////////////////////////////////////////////////////// -export const TalentsPhase1 = PresetUtils.makePresetTalents('Level 25', SavedTalents.create({ talentsString: '50005003021' }), { - customCondition: player => player.getLevel() === 25, -}); -export const TalentsPhase2 = PresetUtils.makePresetTalents('Level 40', SavedTalents.create({ talentsString: '5000500302541051' }), { - customCondition: player => player.getLevel() === 40, -}); -export const TalentsPhase3 = PresetUtils.makePresetTalents('Level 50', SavedTalents.create({ talentsString: '5000550012551351--3' }), { - customCondition: player => player.getLevel() === 50, -}); -export const TalentsPhase4 = PresetUtils.makePresetTalents('Level 60', SavedTalents.create({ talentsString: '5000550012551251--5005031' }), { +export const TalentsP1Balance = PresetUtils.makePresetTalents('Balance', SavedTalents.create({ talentsString: '5000550012551251--5005031' }), { customCondition: player => player.getLevel() === 60, }); export const TalentPresets = { - [Phase.Phase1]: [TalentsPhase1], - [Phase.Phase2]: [TalentsPhase2], - [Phase.Phase3]: [TalentsPhase3], - [Phase.Phase4]: [TalentsPhase4], - [Phase.Phase5]: [], + [Phase.Phase1]: [TalentsP1Balance], }; -export const DefaultTalents = TalentPresets[Phase.Phase4][0]; +export const DefaultTalents = TalentPresets[Phase.Phase1][0]; /////////////////////////////////////////////////////////////////////////// // Options diff --git a/ui/balance_druid/sim.ts b/ui/balance_druid/sim.ts index f85a0d05c..2ba0754f5 100644 --- a/ui/balance_druid/sim.ts +++ b/ui/balance_druid/sim.ts @@ -111,21 +111,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBalanceDruid, { presets: { talents: [ - ...Presets.TalentPresets[Phase.Phase5], - ...Presets.TalentPresets[Phase.Phase4], - ...Presets.TalentPresets[Phase.Phase3], - ...Presets.TalentPresets[Phase.Phase2], ...Presets.TalentPresets[Phase.Phase1], ], rotations: [ - ...Presets.APLPresets[Phase.Phase5], - ...Presets.APLPresets[Phase.Phase4], - ...Presets.APLPresets[Phase.Phase3], - ...Presets.APLPresets[Phase.Phase2], ...Presets.APLPresets[Phase.Phase1], ], gear: [ - Presets.DefaultGear, + ...Presets.GearPresets[Phase.Phase1], ], }, From 45de7d25233b0e512f006f1d687ae9d7939a1009 Mon Sep 17 00:00:00 2001 From: Eric Taylor Date: Sat, 23 Nov 2024 22:15:53 -0500 Subject: [PATCH 2/3] Initial cleaning of Feral --- ui/feral_druid/apls/p1.apl.json | 9 ++++ ui/feral_druid/apls/phase_1.apl.json | 11 ----- ui/feral_druid/apls/phase_2.apl.json | 21 -------- ui/feral_druid/apls/phase_3.apl.json | 24 ---------- ui/feral_druid/apls/phase_4.apl.json | 27 ----------- ui/feral_druid/apls/phase_5.apl.json | 25 ---------- ui/feral_druid/gear_sets/blank.gear.json | 1 - ui/feral_druid/gear_sets/p0.bis.gear.json | 19 ++++++++ ui/feral_druid/gear_sets/p1.bis.gear.json | 19 ++++++++ ui/feral_druid/presets.ts | 58 ++++++----------------- ui/feral_druid/sim.ts | 9 +--- 11 files changed, 63 insertions(+), 160 deletions(-) create mode 100644 ui/feral_druid/apls/p1.apl.json delete mode 100644 ui/feral_druid/apls/phase_1.apl.json delete mode 100644 ui/feral_druid/apls/phase_2.apl.json delete mode 100644 ui/feral_druid/apls/phase_3.apl.json delete mode 100644 ui/feral_druid/apls/phase_4.apl.json delete mode 100644 ui/feral_druid/apls/phase_5.apl.json delete mode 100644 ui/feral_druid/gear_sets/blank.gear.json create mode 100644 ui/feral_druid/gear_sets/p0.bis.gear.json create mode 100644 ui/feral_druid/gear_sets/p1.bis.gear.json diff --git a/ui/feral_druid/apls/p1.apl.json b/ui/feral_druid/apls/p1.apl.json new file mode 100644 index 000000000..abd879162 --- /dev/null +++ b/ui/feral_druid/apls/p1.apl.json @@ -0,0 +1,9 @@ +{ + "type": "TypeAPL", + "prepullActions": [ + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"castSpell":{"spellId":{"spellId":9830,"rank":5}}}} + ] +} diff --git a/ui/feral_druid/apls/phase_1.apl.json b/ui/feral_druid/apls/phase_1.apl.json deleted file mode 100644 index 15a640578..000000000 --- a/ui/feral_druid/apls/phase_1.apl.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":768}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"activateAura":{"auraId":{"spellId":407988}}},"doAtValue":{"const":{"val":"-8s"}}} - ], - "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"catOptimalRotationAction":{"maxWaitTime":2,"minCombosForRip":3}}} - ] -} diff --git a/ui/feral_druid/apls/phase_2.apl.json b/ui/feral_druid/apls/phase_2.apl.json deleted file mode 100644 index 38288d589..000000000 --- a/ui/feral_druid/apls/phase_2.apl.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":768}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"activateAura":{"auraId":{"spellId":407988}}},"doAtValue":{"const":{"val":"-8s"}}} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":768}}}}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"14"}}}}]}},"castSpell":{"spellId":{"spellId":29166}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407988}}}}},"castSpell":{"spellId":{"spellId":407988}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20"}}}},"castSpell":{"spellId":{"spellId":417045}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":409828}}}}},"castSpell":{"spellId":{"spellId":409828}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":16870}}},{"auraIsActive":{"auraId":{"spellId":16870}}}]}},"castSpell":{"spellId":{"spellId":8992}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407988}}},"rhs":{"const":{"val":"7"}}}}]}},"castSpell":{"spellId":{"spellId":9493}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":414684}}}}},"castSpell":{"spellId":{"spellId":414684}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":1823}}}}},"castSpell":{"spellId":{"spellId":1823}}}}, - {"action":{"castSpell":{"spellId":{"spellId":8992}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"14"}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"const":{"val":"500"}}}},{"auraIsActive":{"auraId":{"spellId":17061,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":768}}}} - ] -} diff --git a/ui/feral_druid/apls/phase_3.apl.json b/ui/feral_druid/apls/phase_3.apl.json deleted file mode 100644 index 6bb7cf965..000000000 --- a/ui/feral_druid/apls/phase_3.apl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":768}}},"doAtValue":{"const":{"val":"-10s"}}}, - {"action":{"activateAura":{"auraId":{"spellId":407988}}},"doAtValue":{"const":{"val":"-8s"}}} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":768}}}}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"currentMana":{}},"rhs":{"const":{"val":"1500.0"}}}},"rhs":{"math":{"op":"OpDiv","lhs":{"currentMana":{}},"rhs":{"currentManaPercent":{}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":1824,"rank":3}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"itemId":12662}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpMul","lhs":{"const":{"val":"2.0"}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":1824,"rank":3}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"gcdIsReady":{}},{"not":{"val":{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":1824,"rank":3}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":29166}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"not":{"val":{"or":{"vals":[{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}},{"and":{"vals":[{"spellIsKnown":{"spellId":{"otherId":"OtherActionPotion"}}},{"spellIsReady":{"spellId":{"otherId":"OtherActionPotion"}}}]}}]}}}}]}},"castSpell":{"spellId":{"spellId":29166}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":1824,"rank":3}}},"rhs":{"const":{"val":"20.2"}}}}}}]}},{"and":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":417141}}},{"spellIsKnown":{"spellId":{"spellId":417141}}}]}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":9829,"rank":4}}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20"}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"gcdTimeToReady":{}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"spellId":417045}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407988}}}}},"castSpell":{"spellId":{"spellId":407988}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":409828}}}}},"castSpell":{"spellId":{"spellId":409828}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":16870}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":16870}}}]}},"castSpell":{"spellId":{"spellId":9829}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407988}}},"rhs":{"const":{"val":"7s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9752,"rank":4}}}}}]}},"castSpell":{"spellId":{"spellId":9752}}}}, - {"action":{"castSpell":{"spellId":{"spellId":9829}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":414684}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.52s"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":414684}}}}}]}},"castSpell":{"spellId":{"spellId":414684}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.02s"}}}}]}},"castSpell":{"spellId":{"spellId":409828}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.02s"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":1824,"rank":3}}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{}}}}}]}},"castSpell":{"spellId":{"spellId":1824,"rank":3}}}} - ] -} diff --git a/ui/feral_druid/apls/phase_4.apl.json b/ui/feral_druid/apls/phase_4.apl.json deleted file mode 100644 index cc3d675c1..000000000 --- a/ui/feral_druid/apls/phase_4.apl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":407988}}},"doAtValue":{"const":{"val":"-8s"}}} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":768}}}}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407988}}}}},"castSpell":{"spellId":{"spellId":407988}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"currentMana":{}},"rhs":{"const":{"val":"1500.0"}}}},"rhs":{"math":{"op":"OpDiv","lhs":{"currentMana":{}},"rhs":{"currentManaPercent":{}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}}]}},"castSpell":{"spellId":{"itemId":12662}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpMul","lhs":{"const":{"val":"2.0"}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"not":{"val":{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGt","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":29166}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"not":{"val":{"or":{"vals":[{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}},{"and":{"vals":[{"spellIsKnown":{"spellId":{"otherId":"OtherActionPotion"}}},{"spellIsReady":{"spellId":{"otherId":"OtherActionPotion"}}}]}}]}}}}]}},"castSpell":{"spellId":{"spellId":29166}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}}]}},{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":417141}}},{"auraIsActive":{"auraId":{"spellId":417141}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417045}}}}},{"or":{"vals":[{"not":{"val":{"energyThreshold":{"threshold":-59}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"gcdTimeToReady":{}}}},{"not":{"val":{"energyThreshold":{"threshold":-39}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":417045}}}}, - {"action":{"condition":{"or":{"vals":[{"not":{"val":{"energyThreshold":{"threshold":-79}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"gcdTimeToReady":{}}}},{"not":{"val":{"energyThreshold":{"threshold":-59}}}}]}}]}},"castSpell":{"spellId":{"spellId":417045}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":417045}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":409828}}}}},"castSpell":{"spellId":{"spellId":409828}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"4"}}}},{"auraIsKnown":{"auraId":{"spellId":16870}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":16870}}}]}},"castSpell":{"spellId":{"spellId":411128}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"4"}}}},{"auraIsKnown":{"auraId":{"spellId":16870}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":16870}}}]}},"castSpell":{"spellId":{"spellId":9830,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9896,"rank":6}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407988}}},"rhs":{"const":{"val":"8.0"}}}},{"auraIsKnown":{"auraId":{"spellId":455873}}}]}}]}},"castSpell":{"spellId":{"spellId":9896,"rank":6}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9904,"rank":4}}}}},"castSpell":{"spellId":{"spellId":9904,"rank":4}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.00"}}}},{"cmp":{"op":"OpGe","lhs":{"math":{"op":"OpAdd","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20.2"}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}}}}}},{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpAdd","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20.2"}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}}}}}}]}},"castSpell":{"spellId":{"spellId":409828}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":455873}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5.0"}}}},{"auraIsActive":{"auraId":{"spellId":407988}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"53.0"}}}}]}},"castSpell":{"spellId":{"spellId":31018}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":411128}}}}, - {"action":{"castSpell":{"spellId":{"spellId":9830,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.02"}}}}]}},"castSpell":{"spellId":{"spellId":409828}}}} - ] -} diff --git a/ui/feral_druid/apls/phase_5.apl.json b/ui/feral_druid/apls/phase_5.apl.json deleted file mode 100644 index d43b22fa9..000000000 --- a/ui/feral_druid/apls/phase_5.apl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":407988}}},"doAtValue":{"const":{"val":"-8s"}},"hide":true} - ], - "priorityList": [ - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":768}}}}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407988}}}}},"castSpell":{"spellId":{"spellId":407988}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"currentMana":{}},"rhs":{"const":{"val":"1500.0"}}}},"rhs":{"math":{"op":"OpDiv","lhs":{"currentMana":{}},"rhs":{"currentManaPercent":{}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"itemId":12662}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpMul","lhs":{"const":{"val":"2.0"}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"gcdIsReady":{}},{"not":{"val":{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGt","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":29166}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"not":{"val":{"or":{"vals":[{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}},{"and":{"vals":[{"spellIsKnown":{"spellId":{"otherId":"OtherActionPotion"}}},{"spellIsReady":{"spellId":{"otherId":"OtherActionPotion"}}}]}}]}}}}]}},"castSpell":{"spellId":{"spellId":29166}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}}]}},{"and":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":417141}}},{"spellIsKnown":{"spellId":{"spellId":417141}}}]}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417045}}}}},{"or":{"vals":[{"not":{"val":{"energyThreshold":{"threshold":-59}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"gcdTimeToReady":{}}}},{"not":{"val":{"energyThreshold":{"threshold":-39}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":417045}}}}, - {"action":{"condition":{"or":{"vals":[{"not":{"val":{"energyThreshold":{"threshold":-79}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"gcdTimeToReady":{}}}},{"not":{"val":{"energyThreshold":{"threshold":-59}}}}]}}]}},"castSpell":{"spellId":{"spellId":417045}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":417045}}},"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":409828}}}}},"castSpell":{"spellId":{"spellId":409828}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":16870}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":16870}}}]}},"castSpell":{"spellId":{"spellId":9830,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407988}}},"rhs":{"const":{"val":"8.0"}}}},{"auraIsKnown":{"auraId":{"spellId":455873}}}]}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9896,"rank":6}}}}}]}},"castSpell":{"spellId":{"spellId":9896,"rank":6}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9904,"rank":4}}}}},"castSpell":{"spellId":{"spellId":9904,"rank":4}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.00"}}}},{"cmp":{"op":"OpGe","lhs":{"math":{"op":"OpAdd","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20.2"}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}}}}}},{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpAdd","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20.2"}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}}}}}}]}},"castSpell":{"spellId":{"spellId":409828}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":455873}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5.0"}}}},{"auraIsActive":{"auraId":{"spellId":407988}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"53.0"}}}}]}},"castSpell":{"spellId":{"spellId":31018}}}}, - {"action":{"castSpell":{"spellId":{"spellId":9830,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.02"}}}}]}},"castSpell":{"spellId":{"spellId":409828}}}} - ] -} diff --git a/ui/feral_druid/gear_sets/blank.gear.json b/ui/feral_druid/gear_sets/blank.gear.json deleted file mode 100644 index 4bcab0861..000000000 --- a/ui/feral_druid/gear_sets/blank.gear.json +++ /dev/null @@ -1 +0,0 @@ -{"items": []} \ No newline at end of file diff --git a/ui/feral_druid/gear_sets/p0.bis.gear.json b/ui/feral_druid/gear_sets/p0.bis.gear.json new file mode 100644 index 000000000..e764fbd43 --- /dev/null +++ b/ui/feral_druid/gear_sets/p0.bis.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":16720}, + {}, + {"id":16718}, + {}, + {"id":16706}, + {"id":16714}, + {"id":16717}, + {"id":16716}, + {"id":16719}, + {"id":16715}, + {}, + {}, + {}, + {}, + {}, + {}, + {} +]} \ No newline at end of file diff --git a/ui/feral_druid/gear_sets/p1.bis.gear.json b/ui/feral_druid/gear_sets/p1.bis.gear.json new file mode 100644 index 000000000..6253f92d0 --- /dev/null +++ b/ui/feral_druid/gear_sets/p1.bis.gear.json @@ -0,0 +1,19 @@ +{"items": [ + {"id":16834}, + {}, + {"id":16836}, + {}, + {"id":16833}, + {"id":16830}, + {"id":16831}, + {"id":16828}, + {"id":16835}, + {"id":16829}, + {}, + {}, + {}, + {}, + {}, + {}, + {} +]} \ No newline at end of file diff --git a/ui/feral_druid/presets.ts b/ui/feral_druid/presets.ts index f927fb4c2..ee2040a47 100644 --- a/ui/feral_druid/presets.ts +++ b/ui/feral_druid/presets.ts @@ -22,12 +22,9 @@ import { } from '../core/proto/common.js'; import { FeralDruid_Options as FeralDruidOptions, FeralDruid_Rotation as FeralDruidRotation } from '../core/proto/druid.js'; import { SavedTalents } from '../core/proto/ui.js'; -import Phase1APL from './apls/phase_1.apl.json'; -import Phase2APL from './apls/phase_2.apl.json'; -import Phase3APL from './apls/phase_3.apl.json'; -import Phase4APL from './apls/phase_4.apl.json'; -import Phase5APL from './apls/phase_5.apl.json'; -import BlankGear from './gear_sets/blank.gear.json'; +import P1APL from './apls/p1.apl.json'; +import P0BISGear from './gear_sets/p0.bis.gear.json'; +import P1BISGear from './gear_sets/p1.bis.gear.json'; // Preset options for this spec. // Eventually we will import these values for the raid sim too, so its good to @@ -37,36 +34,27 @@ import BlankGear from './gear_sets/blank.gear.json'; // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); +export const GearP0BIS = PresetUtils.makePresetGear('Pre-BiS', P0BISGear); +export const GearP1BIS = PresetUtils.makePresetGear('P1 BiS', P1BISGear); -export const GearPresets = {}; +export const GearPresets = { + [Phase.Phase1]: [GearP0BIS, GearP1BIS], +}; -export const DefaultGear = GearBlank; +export const DefaultGear = GearP0BIS; /////////////////////////////////////////////////////////////////////////// // APL Presets /////////////////////////////////////////////////////////////////////////// -export const APLPhase1 = PresetUtils.makePresetAPLRotation('Phase 1', Phase1APL, { customCondition: player => player.getLevel() === 25 }); -export const APLPhase2 = PresetUtils.makePresetAPLRotation('Phase 2', Phase2APL, { customCondition: player => player.getLevel() === 40 }); -export const APLPhase3 = PresetUtils.makePresetAPLRotation('Phase 3', Phase3APL, { customCondition: player => player.getLevel() === 50 }); -export const APLPhase4 = PresetUtils.makePresetAPLRotation('Phase 4', Phase4APL, { customCondition: player => player.getLevel() === 60 }); -export const APLPhase5 = PresetUtils.makePresetAPLRotation('Phase 5', Phase5APL, { customCondition: player => player.getLevel() === 60 }); +export const APLP1Feral = PresetUtils.makePresetAPLRotation('Feral', P1APL, { customCondition: player => player.getLevel() === 60 }); export const APLPresets = { - [Phase.Phase1]: [APLPhase1], - [Phase.Phase2]: [APLPhase2], - [Phase.Phase3]: [APLPhase3], - [Phase.Phase4]: [APLPhase4], - [Phase.Phase5]: [APLPhase5], + [Phase.Phase1]: [APLP1Feral], }; -// TODO: Add Phase 2 preset an pull from map export const DefaultAPLs: Record = { - 25: APLPresets[Phase.Phase1][0], - 40: APLPresets[Phase.Phase2][0], - 50: APLPresets[Phase.Phase3][0], - 60: APLPresets[Phase.Phase5][0], + 60: APLPresets[Phase.Phase1][0], }; export const DefaultRotation = FeralDruidRotation.create({ @@ -84,31 +72,15 @@ export const SIMPLE_ROTATION_DEFAULT = PresetUtils.makePresetSimpleRotation('Sim // Talent Presets /////////////////////////////////////////////////////////////////////////// -export const TalentsPhase1 = PresetUtils.makePresetTalents('Level 25', SavedTalents.create({ talentsString: '500005001--05' }), { - customCondition: player => player.getLevel() === 25, -}); -export const TalentsPhase2 = PresetUtils.makePresetTalents('Level 40', SavedTalents.create({ talentsString: '-550002032320211-05' }), { - customCondition: player => player.getLevel() === 40, -}); -export const TalentsPhase3 = PresetUtils.makePresetTalents('Level 50', SavedTalents.create({ talentsString: '500005301-5500020323002-05' }), { - customCondition: player => player.getLevel() === 50, -}); -export const TalentsPhase3LoTP = PresetUtils.makePresetTalents('Level 50 LoTP', SavedTalents.create({ talentsString: '-5500020323202151-55' }), { - customCondition: player => player.getLevel() === 50, -}); -export const TalentsPhase4 = PresetUtils.makePresetTalents('Level 60', SavedTalents.create({ talentsString: '500005301-5500020323202151-15' }), { +export const TalentsP1Feral = PresetUtils.makePresetTalents('Feral', SavedTalents.create({ talentsString: '500005301-5500020323202151-15' }), { customCondition: player => player.getLevel() === 60, }); export const TalentPresets = { - [Phase.Phase1]: [TalentsPhase1], - [Phase.Phase2]: [TalentsPhase2], - [Phase.Phase3]: [TalentsPhase3, TalentsPhase3LoTP], - [Phase.Phase4]: [TalentsPhase4], - [Phase.Phase5]: [], + [Phase.Phase1]: [TalentsP1Feral], }; -export const DefaultTalents = TalentPresets[Phase.Phase4][0]; +export const DefaultTalents = TalentPresets[Phase.Phase1][0]; /////////////////////////////////////////////////////////////////////////// // Options diff --git a/ui/feral_druid/sim.ts b/ui/feral_druid/sim.ts index e236eb8d5..0fb295b86 100644 --- a/ui/feral_druid/sim.ts +++ b/ui/feral_druid/sim.ts @@ -135,21 +135,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralDruid, { presets: { // Preset talents that the user can quickly select. talents: [ - ...Presets.TalentPresets[Phase.Phase5], - ...Presets.TalentPresets[Phase.Phase4], - ...Presets.TalentPresets[Phase.Phase3], - ...Presets.TalentPresets[Phase.Phase2], ...Presets.TalentPresets[Phase.Phase1], ], rotations: [ - ...Presets.APLPresets[Phase.Phase4], - ...Presets.APLPresets[Phase.Phase3], - ...Presets.APLPresets[Phase.Phase2], ...Presets.APLPresets[Phase.Phase1], ], // Preset gear configurations that the user can quickly select. gear: [ - Presets.DefaultGear, + ...Presets.GearPresets[Phase.Phase1], ], }, From 02483b57ad33229341b9adc40fd12b265f4d758c Mon Sep 17 00:00:00 2001 From: Eric Taylor Date: Sat, 23 Nov 2024 22:36:43 -0500 Subject: [PATCH 3/3] Updated Druid tests --- sim/druid/balance/TestBalance.results | 196 ------------- sim/druid/balance/TestP1Balance.results | 196 +++++++++++++ sim/druid/balance/balance_test.go | 21 +- sim/druid/feral/TestFeral.results | 364 ------------------------ sim/druid/feral/TestP1Feral.results | 364 ++++++++++++++++++++++++ sim/druid/feral/feral_test.go | 21 +- sim/warlock/dps/TestWarlock.results | 196 ------------- 7 files changed, 578 insertions(+), 780 deletions(-) delete mode 100644 sim/druid/balance/TestBalance.results create mode 100644 sim/druid/balance/TestP1Balance.results delete mode 100644 sim/druid/feral/TestFeral.results create mode 100644 sim/druid/feral/TestP1Feral.results delete mode 100644 sim/warlock/dps/TestWarlock.results diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results deleted file mode 100644 index 5843f41bb..000000000 --- a/sim/druid/balance/TestBalance.results +++ /dev/null @@ -1,196 +0,0 @@ -character_stats_results: { - key: "TestBalance-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 217.35 - final_stats: 200.1 - final_stats: 300.2075 - final_stats: 180.55 - final_stats: 210.45 - final_stats: 150 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 49.25 - final_stats: 0 - final_stats: 25.81519 - final_stats: 0 - final_stats: 0 - final_stats: 1044.7 - final_stats: 0 - final_stats: 23.905 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3672.25 - final_stats: 0 - final_stats: 0 - final_stats: 784.2 - final_stats: 540 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 10.905 - final_stats: 5 - final_stats: 0 - final_stats: 4835.32875 - final_stats: 27 - final_stats: 60 - final_stats: 60 - final_stats: 70 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestBalance-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.41993 - weights: 0 - weights: 0.49198 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 4.11318 - weights: 3.16483 - 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: "TestBalance-Phase5-Lvl60-Average-Default" - value: { - dps: 502.03576 - tps: 523.22217 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 520.28089 - tps: 758.25771 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 409.77009 - tps: 422.72601 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 536.40526 - tps: 557.19402 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 246.78487 - tps: 427.5317 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 195.64652 - tps: 204.68386 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 361.0815 - tps: 376.26525 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 495.0913 - tps: 730.51146 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 393.46144 - tps: 406.23053 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 534.12213 - tps: 554.86172 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 241.68414 - tps: 422.43096 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 192.73883 - tps: 201.77617 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 361.5953 - tps: 376.77906 - } -} -dps_results: { - key: "TestBalance-Phase5-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 494.86012 - tps: 516.25597 - } -} diff --git a/sim/druid/balance/TestP1Balance.results b/sim/druid/balance/TestP1Balance.results new file mode 100644 index 000000000..0a1afa1f0 --- /dev/null +++ b/sim/druid/balance/TestP1Balance.results @@ -0,0 +1,196 @@ +character_stats_results: { + key: "TestP1Balance-Phase1-Lvl60-CharacterStats-Default" + value: { + final_stats: 247.25 + final_stats: 213.9 + final_stats: 386.17 + final_stats: 320.85 + final_stats: 336.95 + final_stats: 150 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 49.25 + final_stats: 0 + final_stats: 28.1582 + final_stats: 0 + final_stats: 0 + final_stats: 1130.5 + final_stats: 0 + final_stats: 24.595 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 5776.75 + final_stats: 0 + final_stats: 0 + final_stats: 1989.8 + final_stats: 566 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 11.595 + final_stats: 5 + final_stats: 0 + final_stats: 5737.935 + final_stats: 35 + final_stats: 68 + final_stats: 68 + final_stats: 78 + final_stats: 68 + final_stats: 384 + final_stats: 15 + final_stats: 50 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestP1Balance-Phase1-Lvl60-StatWeights-Default" + value: { + weights: 0 + weights: 0 + weights: 0 + weights: 0.04486 + weights: 0 + weights: 0.59211 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 3.87073 + weights: 3.04363 + 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: "TestP1Balance-Phase1-Lvl60-Average-Default" + value: { + dps: 277.78892 + tps: 291.26631 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 276.03428 + tps: 518.78252 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 276.03428 + tps: 288.1717 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 265.65065 + tps: 274.24129 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 154.66373 + tps: 304.76804 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 154.66373 + tps: 162.16895 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 159.29075 + tps: 174.4745 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 274.14307 + tps: 541.17321 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 274.14307 + tps: 287.49457 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 263.72755 + tps: 272.34674 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 153.90514 + tps: 296.06075 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 153.90514 + tps: 161.01292 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 158.80529 + tps: 173.98904 + } +} +dps_results: { + key: "TestP1Balance-Phase1-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 275.18712 + tps: 288.60431 + } +} diff --git a/sim/druid/balance/balance_test.go b/sim/druid/balance/balance_test.go index 6e4e7d126..66d5a11bf 100644 --- a/sim/druid/balance/balance_test.go +++ b/sim/druid/balance/balance_test.go @@ -12,20 +12,20 @@ func init() { RegisterBalanceDruid() } -func TestBalance(t *testing.T) { +func TestP1Balance(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassDruid, - Phase: 5, + Phase: 1, Level: 60, Race: proto.Race_RaceTauren, OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../../ui/balance_druid/apls", "phase_5"), + Talents: P1Talents, + GearSet: core.GetGearSet("../../../ui/balance_druid/gear_sets", "p0.bis"), + Rotation: core.GetAplRotation("../../../ui/balance_druid/apls", "p1"), Buffs: core.FullBuffs, - Consumes: Phase5Consumes, + Consumes: P1Consumes, SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsAdaptive}, ItemFilter: ItemFilters, @@ -35,13 +35,10 @@ func TestBalance(t *testing.T) { })) } -var Phase1Talents = "50005003021" -var Phase2Talents = "5000500302541051" -var Phase3Talents = "5000550012551351--3" -var Phase4Talents = "5000550012551251--5005031" +var P1Talents = "5000550012551251--5005031" -var Phase5Consumes = core.ConsumesCombo{ - Label: "P5-Consumes", +var P1Consumes = core.ConsumesCombo{ + Label: "P1-Consumes", Consumes: &proto.Consumes{ DefaultPotion: proto.Potions_MajorManaPotion, Flask: proto.Flask_FlaskOfSupremePower, diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results deleted file mode 100644 index 288b814f9..000000000 --- a/sim/druid/feral/TestFeral.results +++ /dev/null @@ -1,364 +0,0 @@ -character_stats_results: { - key: "TestFeral-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 329.82 - final_stats: 228.85 - final_stats: 300.2075 - final_stats: 216.66 - final_stats: 210.45 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 0 - final_stats: 26.41822 - final_stats: 0 - final_stats: 0 - final_stats: 1748.49 - final_stats: 0 - final_stats: 33.3425 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 6213.9 - final_stats: 0 - final_stats: 0 - final_stats: 841.7 - final_stats: 580 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 16.3425 - final_stats: 5 - final_stats: 0 - final_stats: 4835.32875 - final_stats: 27 - final_stats: 60 - final_stats: 60 - final_stats: 70 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 0 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestFeral-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0.67462 - weights: 0.53884 - 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.24451 - weights: 0 - weights: 5.48958 - 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: "TestFeral-Phase5-Lvl60-Average-Default" - value: { - dps: 709.44416 - tps: 528.09487 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 405.3226 - tps: 520.99922 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 384.24199 - tps: 284.53209 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 452.29707 - tps: 333.294 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 181.39652 - tps: 305.24379 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 166.99752 - tps: 127.4363 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 210.30186 - tps: 167.41165 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 405.3226 - tps: 520.99922 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 384.24199 - tps: 284.53209 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 452.29707 - tps: 333.294 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 181.39652 - tps: 305.24379 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 166.99752 - tps: 127.4363 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 210.30186 - tps: 167.41165 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 405.3226 - tps: 520.99922 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 384.24199 - tps: 284.53209 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 452.29707 - tps: 333.294 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 181.39652 - tps: 305.24379 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 166.99752 - tps: 127.4363 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 210.30186 - tps: 167.41165 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 420.29532 - tps: 530.84234 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 399.68342 - tps: 295.50391 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 472.61736 - tps: 351.86128 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 180.76748 - tps: 305.07322 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 166.51698 - tps: 127.11686 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 210.58222 - tps: 167.65243 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 420.29532 - tps: 530.84234 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 399.68342 - tps: 295.50391 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 472.61736 - tps: 351.86128 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 180.76748 - tps: 305.07322 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 166.51698 - tps: 127.11686 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 210.58222 - tps: 167.65243 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 420.29532 - tps: 530.84234 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 399.68342 - tps: 295.50391 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 472.61736 - tps: 351.86128 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget" - value: { - dps: 180.76748 - tps: 305.07322 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget" - value: { - dps: 166.51698 - tps: 127.11686 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget" - value: { - dps: 210.58222 - tps: 167.65243 - } -} -dps_results: { - key: "TestFeral-Phase5-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 376.62744 - tps: 267.40548 - } -} diff --git a/sim/druid/feral/TestP1Feral.results b/sim/druid/feral/TestP1Feral.results new file mode 100644 index 000000000..36dd35c7b --- /dev/null +++ b/sim/druid/feral/TestP1Feral.results @@ -0,0 +1,364 @@ +character_stats_results: { + key: "TestP1Feral-Phase1-Lvl60-CharacterStats-Default" + value: { + final_stats: 365.7 + final_stats: 242.65 + final_stats: 386.17 + final_stats: 385.02 + final_stats: 336.95 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 41.25 + final_stats: 0 + final_stats: 29.22983 + final_stats: 0 + final_stats: 0 + final_stats: 1860.05 + final_stats: 0 + final_stats: 34.0325 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 8739.3 + final_stats: 0 + final_stats: 0 + final_stats: 2047.3 + final_stats: 606 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 17.0325 + final_stats: 5 + final_stats: 0 + final_stats: 5737.935 + final_stats: 35 + final_stats: 68 + final_stats: 68 + final_stats: 78 + final_stats: 68 + final_stats: 384 + final_stats: 15 + final_stats: 15 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestP1Feral-Phase1-Lvl60-StatWeights-Default" + value: { + weights: 0.48677 + weights: 0.53087 + 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.17636 + weights: 0 + weights: 4.85395 + 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: "TestP1Feral-Phase1-Lvl60-Average-Default" + value: { + dps: 535.03289 + tps: 379.87335 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 241.93047 + tps: 171.77064 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 226.72526 + tps: 160.97494 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 256.85824 + tps: 182.36935 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-NoBleed-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 114.77616 + tps: 81.49107 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-NoBleed-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 103.70397 + tps: 73.62982 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-NoBleed-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 117.10622 + tps: 83.14542 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 241.93047 + tps: 171.77064 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 226.72526 + tps: 160.97494 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 256.85824 + tps: 182.36935 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 114.77616 + tps: 81.49107 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 103.70397 + tps: 73.62982 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Default-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 117.10622 + tps: 83.14542 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 241.93047 + tps: 171.77064 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 226.72526 + tps: 160.97494 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 256.85824 + tps: 182.36935 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Flower-Aoe-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 114.77616 + tps: 81.49107 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Flower-Aoe-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 103.70397 + tps: 73.62982 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-NightElf-p0.bis-Flower-Aoe-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 117.10622 + tps: 83.14542 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 253.32152 + tps: 179.85828 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 238.16751 + tps: 169.09893 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 270.40415 + tps: 191.98695 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-NoBleed-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 114.58324 + tps: 81.3541 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-NoBleed-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 103.51792 + tps: 73.49773 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-NoBleed-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 116.80157 + tps: 82.92912 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 253.32152 + tps: 179.85828 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 238.16751 + tps: 169.09893 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 270.40415 + tps: 191.98695 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 114.58324 + tps: 81.3541 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 103.51792 + tps: 73.49773 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Default-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 116.80157 + tps: 82.92912 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 253.32152 + tps: 179.85828 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 238.16751 + tps: 169.09893 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 270.40415 + tps: 191.98695 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Flower-Aoe-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 114.58324 + tps: 81.3541 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Flower-Aoe-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 103.51792 + tps: 73.49773 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-Settings-Tauren-p0.bis-Flower-Aoe-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 116.80157 + tps: 82.92912 + } +} +dps_results: { + key: "TestP1Feral-Phase1-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 226.72147 + tps: 160.97224 + } +} diff --git a/sim/druid/feral/feral_test.go b/sim/druid/feral/feral_test.go index cf6f43572..086650bc8 100644 --- a/sim/druid/feral/feral_test.go +++ b/sim/druid/feral/feral_test.go @@ -12,20 +12,20 @@ func init() { RegisterFeralDruid() } -func TestFeral(t *testing.T) { +func TestP1Feral(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassDruid, - Phase: 5, + Phase: 1, Level: 60, Race: proto.Race_RaceTauren, OtherRaces: []proto.Race{proto.Race_RaceNightElf}, - Talents: Phase4Talents, - GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../../ui/feral_druid/apls", "phase_5"), + Talents: P1Talents, + GearSet: core.GetGearSet("../../../ui/feral_druid/gear_sets", "p0.bis"), + Rotation: core.GetAplRotation("../../../ui/feral_druid/apls", "p1"), Buffs: core.FullBuffs, - Consumes: Phase4Consumes, + Consumes: P1Consumes, SpecOptions: core.SpecOptionsCombo{Label: "Default", SpecOptions: PlayerOptionsMonoCat}, OtherSpecOptions: []core.SpecOptionsCombo{ {Label: "Default-NoBleed", SpecOptions: PlayerOptionsMonoCatNoBleed}, @@ -39,10 +39,7 @@ func TestFeral(t *testing.T) { })) } -var Phase1Talents = "500005001--05" -var Phase2Talents = "-550002032320211-05" -var Phase3Talents = "500005301-5500020323002-05" -var Phase4Talents = "500005301-5500020323202151-15" +var P1Talents = "500005301-5500020323202151-15" var PlayerOptionsMonoCat = &proto.Player_FeralDruid{ FeralDruid: &proto.FeralDruid{ @@ -74,8 +71,8 @@ var PlayerOptionsFlowerCatAoe = &proto.Player_FeralDruid{ }, } -var Phase4Consumes = core.ConsumesCombo{ - Label: "P4-Consumes", +var P1Consumes = core.ConsumesCombo{ + Label: "P1-Consumes", Consumes: &proto.Consumes{ AgilityElixir: proto.AgilityElixir_ElixirOfTheMongoose, AttackPowerBuff: proto.AttackPowerBuff_JujuMight, diff --git a/sim/warlock/dps/TestWarlock.results b/sim/warlock/dps/TestWarlock.results deleted file mode 100644 index af3049fbc..000000000 --- a/sim/warlock/dps/TestWarlock.results +++ /dev/null @@ -1,196 +0,0 @@ -character_stats_results: { - key: "TestWarlock-Phase4-Lvl60-CharacterStats-Default" - value: { - final_stats: 195.5 - final_stats: 194.35 - final_stats: 559.682 - final_stats: 342.7 - final_stats: 258.9225 - final_stats: 496 - final_stats: 0 - final_stats: 40 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 161 - final_stats: 41.25 - final_stats: 0 - final_stats: 32.35455 - final_stats: 0 - final_stats: 0 - final_stats: 815.5 - final_stats: 0 - final_stats: 24.7175 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 6233.5 - final_stats: 0 - final_stats: 0 - final_stats: 1974.7 - final_stats: 540 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 11.7175 - final_stats: 5 - final_stats: 0 - final_stats: 7130.82 - final_stats: 43 - final_stats: 75 - final_stats: 76 - final_stats: 60 - final_stats: 85 - final_stats: 384 - final_stats: 0 - final_stats: 65 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestWarlock-Phase4-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.06971 - weights: 0 - weights: 0.85007 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 9.82568 - weights: 4.96062 - 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: "TestWarlock-Phase4-Lvl60-Average-Default" - value: { - dps: 922.93664 - tps: 985.15323 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-FullBuffs-Consumes-LongMultiTarget" - value: { - dps: 910.29517 - tps: 2100.18562 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-FullBuffs-Consumes-LongSingleTarget" - value: { - dps: 910.29517 - tps: 972.17928 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-FullBuffs-Consumes-ShortSingleTarget" - value: { - dps: 944.73183 - tps: 987.76278 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-NoBuffs-Consumes-LongMultiTarget" - value: { - dps: 528.6421 - tps: 1808.84642 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-NoBuffs-Consumes-LongSingleTarget" - value: { - dps: 528.6421 - tps: 593.64701 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-DS/Ruin Warlock-rotation-NoBuffs-Consumes-ShortSingleTarget" - value: { - dps: 562.41626 - tps: 613.12879 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-LongMultiTarget" - value: { - dps: 1122.5486 - tps: 2089.17391 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-LongSingleTarget" - value: { - dps: 1122.5486 - tps: 951.82139 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-ShortSingleTarget" - value: { - dps: 1177.62985 - tps: 988.25245 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-NoBuffs-Consumes-LongMultiTarget" - value: { - dps: 608.4618 - tps: 1804.7454 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-NoBuffs-Consumes-LongSingleTarget" - value: { - dps: 608.4618 - tps: 591.27545 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-Settings-Orc-mc-SM/Ruin Warlock-rotation-NoBuffs-Consumes-ShortSingleTarget" - value: { - dps: 645.2379 - tps: 613.25236 - } -} -dps_results: { - key: "TestWarlock-Phase4-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 910.29517 - tps: 972.17928 - } -}