Merge pull request #3272 from wowsims/apl

Fix more APL bugs and update default rotation
wowsims · Jul 8, 2023 · e3d0d09 · e3d0d09
2 parents 99f29f7 + e1e65b9
commit e3d0d09
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/proto/api.proto b/proto/api.proto
@@ -292,6 +292,7 @@ message RaidSimResult {
 // RPC ComputeStats
 message ComputeStatsRequest {
 	Raid raid = 1;
+	Encounter encounter = 2;
 }
 message AuraStats {
 	ActionID id = 1;

diff --git a/sim/core/api.go b/sim/core/api.go
@@ -12,7 +12,11 @@ import (
  * Returns character stats taking into account gear / buffs / consumes / etc
  */
 func ComputeStats(csr *proto.ComputeStatsRequest) *proto.ComputeStatsResult {
-	_, raidStats := NewEnvironment(csr.Raid, &proto.Encounter{})
+	encounter := csr.Encounter
+	if encounter == nil {
+		encounter = &proto.Encounter{}
+	}
+	_, raidStats := NewEnvironment(csr.Raid, encounter)
 
 	return &proto.ComputeStatsResult{
 		RaidStats: raidStats,

diff --git a/sim/core/apl_actions_core.go b/sim/core/apl_actions_core.go
@@ -48,9 +48,16 @@ func (rot *APLRotation) newActionMultidot(config *proto.APLActionMultidot) APLAc
 		maxOverlap = rot.newValueConst(&proto.APLValueConst{Val: "0ms"})
 	}
 
+	maxDots := config.MaxDots
+	numTargets := unit.Env.GetNumTargets()
+	if numTargets < maxDots {
+		rot.validationWarning("Encounter only has %d targets. Using that for Max Dots instead of %d", numTargets, maxDots)
+		maxDots = numTargets
+	}
+
 	return &APLActionMultidot{
 		spell:      spell,
-		maxDots:    MinInt32(config.MaxDots, unit.Env.GetNumTargets()),
+		maxDots:    maxDots,
 		maxOverlap: maxOverlap,
 	}
 }

diff --git a/sim/hunter/raptor_strike.go b/sim/hunter/raptor_strike.go
@@ -11,7 +11,7 @@ func (hunter *Hunter) registerRaptorStrikeSpell() {
 		ActionID:    core.ActionID{SpellID: 48996},
 		SpellSchool: core.SpellSchoolPhysical,
 		ProcMask:    core.ProcMaskMeleeMHAuto | core.ProcMaskMeleeMHSpecial,
-		Flags:       core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagAPL,
+		Flags:       core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage,
 
 		ManaCost: core.ManaCostOptions{
 			BaseCost:   0.04,

diff --git a/ui/core/sim.ts b/ui/core/sim.ts
@@ -117,7 +117,7 @@ export class Sim {
 			this.encounter.changeEmitter,
 		]);
 
-		this.raid.changeEmitter.on(eventID => this.updateCharacterStats(eventID));
+		TypedEvent.onAny([this.raid.changeEmitter, this.encounter.changeEmitter]).on(eventID => this.updateCharacterStats(eventID));
 	}
 
 	waitForInit(): Promise<void> {
@@ -277,7 +277,10 @@ export class Sim {
 		// request is in-flight.
 		const players = this.raid.getPlayers();
 
-		const req = ComputeStatsRequest.create({ raid: this.getModifiedRaidProto() });
+		const req = ComputeStatsRequest.create({
+			raid: this.getModifiedRaidProto(),
+			encounter: this.encounter.toProto(),
+		});
 		const result = await this.workerPool.computeStats(req);
 
 		if (result.errorResult != "") {

diff --git a/ui/hunter/presets.ts b/ui/hunter/presets.ts
@@ -120,12 +120,24 @@ export const ROTATION_PRESET_DEFAULT = {
 					"condition": {"cmp": {"op": "OpGt", "lhs": {"currentTime": {}}, "rhs": { "const": {"val": "10s"}}}},
 					"autocastOtherCooldowns": {}
 				}},
+				{"action": {
+					"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}}]}},
+					"castSpell":{"spellId":{"spellId":34074}}
+				}},
+				{"action":{
+					"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}},{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}}]}},
+					"castSpell":{"spellId":{"spellId":61847}}
+				}},
 				{"action": {
 					"condition": {"not": {"val": {"dotIsActive": {"spellId": { "spellId": 49001 }}}}},
 					"castSpell": {"spellId": { "spellId": 49001 }}
 				}},
 				{"action": {"castSpell": {"spellId": { "spellId": 61006 }}}},
 				{"action": {"castSpell": {"spellId": { "spellId": 63672 }}}},
+				{"action":{
+					"condition":{"dotIsActive":{"spellId":{"spellId":60053}}},
+					"castSpell":{"spellId":{"spellId":60052}}
+				}},
 				{"action": {
 					"condition": {"not": {"val": {"dotIsActive": {"spellId": { "spellId": 60053 }}}}},
 					"castSpell": {"spellId": { "spellId": 60053 }}

diff --git a/ui/shared/bootstrap_overrides.ts b/ui/shared/bootstrap_overrides.ts
@@ -21,13 +21,13 @@ body.addEventListener('mouseover', event => {
 body.addEventListener('mouseleave', event => {
   let e = event as MouseEvent;
   let target = event.target as HTMLElement;
-  let toggle = target.closest('[data-bs-toggle=dropdown]');
+  let toggle = target.closest('[data-bs-toggle=dropdown]') as HTMLElement | null;
   // Hide dropdowns when hovering off of the toggle, so long as the new target is not part of the dropdown as well
   if (toggle) {
     let dropdown = Dropdown.getOrCreateInstance(toggle);
     let dropdownMenu = toggle.nextElementSibling as HTMLElement;
     let relatedTarget = e.relatedTarget as HTMLElement;
-    if (relatedTarget == null || !isDescendant(relatedTarget, dropdownMenu))
+    if (relatedTarget == null || (!isDescendant(relatedTarget, dropdownMenu) && !isDescendant(relatedTarget, toggle)))
       dropdown.hide();
   }