Merge pull request #3693 from wowsims/apl

Fix bug with loading simple CD settings
wowsims · Sep 17, 2023 · 0b70f8c · 0b70f8c
2 parents 9ada6eb + 5b39775
commit 0b70f8c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/ui/core/components/individual_sim_ui/rotation_tab.ts b/ui/core/components/individual_sim_ui/rotation_tab.ts
@@ -135,6 +135,9 @@ export class RotationTab extends SimTab {
 	}
 
 	private buildSimpleOrLegacyContent(isSimple: boolean) {
+		if (!isSimple && aplLaunchStatuses[this.simUI.player.spec] == LaunchStatus.Launched) {
+			return;
+		}
 		const cssClass = isSimple ? 'rotation-tab-simple' : 'rotation-tab-legacy';
 
 		const contentBlock = new ContentBlock(this.leftPanel, 'rotation-settings', {

diff --git a/ui/core/components/settings_menu.ts b/ui/core/components/settings_menu.ts
@@ -32,7 +32,7 @@ export class SettingsMenu extends BaseModal {
 			<button
 				class="restore-defaults-button btn btn-primary"
 				data-bs-toggle="tooltip"
-				data-bs-title="Restores all default settings (gear, consumes, buffs, talents, EP weights, etc)."
+				data-bs-title="Restores all default settings (gear, consumes, buffs, talents, EP weights, etc). Saved settings are preserved."
 			>Restore Defaults</button>
 		`
 

diff --git a/ui/core/proto_utils/apl_utils.ts b/ui/core/proto_utils/apl_utils.ts
@@ -21,7 +21,7 @@ export function autocastCooldownsAction(startAt?: string): APLAction {
 }
 
 export function scheduledCooldownAction(schedule: string, actionId: ActionIdProto): APLAction {
-    return APLAction.fromJsonString(`{"schedule":{"schedule":"${schedule}","innerAction":{"castSpell":{"spellId":${ActionIdProto.toJson(actionId)}}}}}`);
+    return APLAction.fromJsonString(`{"schedule":{"schedule":"${schedule}","innerAction":{"castSpell":{"spellId":${ActionIdProto.toJsonString(actionId)}}}}}`);
 }
 
 export function simpleCooldownActions(cooldowns: Cooldowns): Array<APLAction> {

diff --git a/ui/hunter/sim.ts b/ui/hunter/sim.ts
@@ -288,7 +288,7 @@ export class HunterSimUI extends IndividualSimUI<Spec.SpecHunter> {
 			simpleRotation: (player: Player<Spec.SpecHunter>, simple: HunterRotation, cooldowns: Cooldowns): APLRotation => {
 				let [prepullActions, actions] = AplUtils.standardCooldownDefaults(cooldowns);
 
-				const multiDotSerpentSting = (numTargets: number) => APLAction.fromJsonString(`{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":49001},"maxDots":${numTargets},"maxOverlap":{"const":{"val":"0ms"}}}}`);
+				const serpentSting = APLAction.fromJsonString(`{"condition":{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":49001},"maxDots":${simple.multiDotSerpentSting ? 3 : 1},"maxOverlap":{"const":{"val":"0ms"}}}}`);
 				const scorpidSting = APLAction.fromJsonString(`{"condition":{"auraShouldRefresh":{"auraId":{"spellId":3043},"maxOverlap":{"const":{"val":"0ms"}}}},"castSpell":{"spellId":{"spellId":3043}}}`);
 				const trapWeave = APLAction.fromJsonString(`{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49067}}}}},"castSpell":{"spellId":{"tag":1,"spellId":49067}}}`);
 				const volley = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":58434}}}`);
@@ -314,7 +314,7 @@ export class HunterSimUI extends IndividualSimUI<Spec.SpecHunter> {
 				if (simple.type == Hunter_Rotation_RotationType.Aoe) {
 					actions.push(...[
 						simple.sting == StingType.ScorpidSting ? scorpidSting : null,
-						simple.sting == StingType.SerpentSting ? (simple.multiDotSerpentSting ? multiDotSerpentSting(3) : multiDotSerpentSting(1)) : null,
+						simple.sting == StingType.SerpentSting ? serpentSting : null,
 						simple.trapWeave ? trapWeave : null,
 						volley,
 					].filter(a => a) as Array<APLAction>)
@@ -323,7 +323,7 @@ export class HunterSimUI extends IndividualSimUI<Spec.SpecHunter> {
 						killShot,
 						simple.trapWeave ? trapWeave : null,
 						simple.sting == StingType.ScorpidSting ? scorpidSting : null,
-						simple.sting == StingType.SerpentSting ? (simple.multiDotSerpentSting ? multiDotSerpentSting(3) : multiDotSerpentSting(1)) : null,
+						simple.sting == StingType.SerpentSting ? serpentSting : null,
 						aimedShot,
 						multiShot,
 						steadyShot,
@@ -333,7 +333,7 @@ export class HunterSimUI extends IndividualSimUI<Spec.SpecHunter> {
 						silencingShot,
 						killShot,
 						simple.sting == StingType.ScorpidSting ? scorpidSting : null,
-						simple.sting == StingType.SerpentSting ? (simple.multiDotSerpentSting ? multiDotSerpentSting(3) : multiDotSerpentSting(1)) : null,
+						simple.sting == StingType.SerpentSting ? serpentSting : null,
 						simple.trapWeave ? trapWeave : null,
 						chimeraShot,
 						aimedShot,
@@ -347,7 +347,7 @@ export class HunterSimUI extends IndividualSimUI<Spec.SpecHunter> {
 						simple.allowExplosiveShotDownrank ? explosiveShot3 : null,
 						simple.trapWeave ? trapWeave : null,
 						simple.sting == StingType.ScorpidSting ? scorpidSting : null,
-						simple.sting == StingType.SerpentSting ? (simple.multiDotSerpentSting ? multiDotSerpentSting(3) : multiDotSerpentSting(1)) : null,
+						simple.sting == StingType.SerpentSting ? serpentSting : null,
 						blackArrow,
 						aimedShot,
 						multiShot,