Fix UI bug and expose Furious Howl as hunter APL MCD

sim/hunter/pet_abilities.go

@@ -351,6 +351,20 @@ func (hp *HunterPet) newFuriousHowl() *core.Spell {
 		},
 	})
 
+	hp.hunterOwner.RegisterSpell(core.SpellConfig{
+		ActionID: actionID,
+		Flags:    core.SpellFlagAPL | core.SpellFlagMCD,
+		Cast: core.CastConfig{
+			CD: howlSpell.CD,
+		},
+		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
+			return howlSpell.CanCast(sim, target)
+		},
+		ApplyEffects: func(sim *core.Simulation, target *core.Unit, _ *core.Spell) {
+			howlSpell.Cast(sim, target)
+		},
+	})
+
 	hp.hunterOwner.AddMajorCooldown(core.MajorCooldown{
 		Spell: howlSpell,
 		Type:  core.CooldownTypeDPS,

ui/core/components/detailed_results/results_filter.ts

@@ -34,10 +34,10 @@ export class ResultsFilter extends ResultComponent {
 				'player-filter-root',
 			],
 			changedEvent: (_filterData: FilterData) => this.changeEmitter,
-			sourceToValue: (src: UnitReference) => this.refToValue(src),
+			sourceToValue: (src: UnitReference|undefined) => this.refToValue(src),
 			valueToSource: (val: UnitValue) => val.value,
 			getValue: (filterData: FilterData) => this.numToRef(filterData.player, true),
-			setValue: (eventID: EventID, filterData: FilterData, newValue: UnitReference) => this.setPlayer(eventID, this.refToNum(newValue)),
+			setValue: (eventID: EventID, filterData: FilterData, newValue: UnitReference|undefined) => this.setPlayer(eventID, this.refToNum(newValue)),
 			values: [],
 		});
 
@@ -46,10 +46,10 @@ export class ResultsFilter extends ResultComponent {
 				'target-filter-root',
 			],
 			changedEvent: (_filterData: FilterData) => this.changeEmitter,
-			sourceToValue: (src: UnitReference) => this.refToValue(src),
+			sourceToValue: (src: UnitReference|undefined) => this.refToValue(src),
 			valueToSource: (val: UnitValue) => val.value,
 			getValue: (filterData: FilterData) => this.numToRef(filterData.target, false),
-			setValue: (eventID: EventID, filterData: FilterData, newValue: UnitReference) => this.setTarget(eventID, this.refToNum(newValue)),
+			setValue: (eventID: EventID, filterData: FilterData, newValue: UnitReference|undefined) => this.setTarget(eventID, this.refToNum(newValue)),
 			values: [],
 		});
 	}
@@ -76,8 +76,12 @@ export class ResultsFilter extends ResultComponent {
 		this.changeEmitter.emit(eventID);
 	}
 
-	private refToValue(ref: UnitReference): UnitValue {
-		if (ref.type == UnitType.AllPlayers) {
+	private refToValue(ref: UnitReference|undefined): UnitValue {
+		if (!ref || ref.type == UnitType.Unknown) {
+			return {
+				value: ref,
+			};
+		} else if (ref.type == UnitType.AllPlayers) {
 			return {
 				iconUrl: '',
 				text: 'All Players',
@@ -114,8 +118,8 @@ export class ResultsFilter extends ResultComponent {
 		};
 	}
 
-	private refToNum(ref: UnitReference): number {
-		return (ref.type == UnitType.AllPlayers || ref.type == UnitType.AllTargets) ? ALL_UNITS : ref.index;
+	private refToNum(ref: UnitReference|undefined): number {
+		return (!ref || ref.type == UnitType.AllPlayers || ref.type == UnitType.AllTargets) ? ALL_UNITS : ref.index;
 	}
 
 	private numToRef(idx: number, isPlayer: boolean): UnitReference {

ui/core/components/individual_sim_ui/apl_helpers.ts

@@ -163,7 +163,7 @@ export class APLUnitPicker extends UnitPicker<Player<any>> {
 	constructor(parent: HTMLElement, player: Player<any>, config: APLUnitPickerConfig) {
 		super(parent, player, {
 			...config,
-			sourceToValue: (src: UnitReference) => APLUnitPicker.refToValue(src, player),
+			sourceToValue: (src: UnitReference|undefined) => APLUnitPicker.refToValue(src, player),
 			valueToSource: (val: UnitValue) => val.value,
 			values: [],
 		});
@@ -172,8 +172,8 @@ export class APLUnitPicker extends UnitPicker<Player<any>> {
 		player.sim.unitMetadataEmitter.on(() => this.updateValues());
 	}
 
-	private static refToValue(ref: UnitReference, thisPlayer: Player<any>): UnitValue {
-		if (ref.type == UnitType.Unknown) {
+	private static refToValue(ref: UnitReference|undefined, thisPlayer: Player<any>): UnitValue {
+		if (!ref || ref.type == UnitType.Unknown) {
 			return {
 				value: ref,
 				text: 'fa-user',
@@ -235,7 +235,7 @@ export class APLUnitPicker extends UnitPicker<Player<any>> {
 
 	private updateValues() {
 		let values = [
-			UnitReference.create(),
+			undefined,
 			UnitReference.create({type: UnitType.Self}),
 			this.modObject.getPetMetadatas().asList().map((petMetadata, i) => UnitReference.create({type: UnitType.Pet, index: i, owner: UnitReference.create({type: UnitType.Self})})),
 			UnitReference.create({type: UnitType.CurrentTarget}),
@@ -245,7 +245,7 @@ export class APLUnitPicker extends UnitPicker<Player<any>> {
 		this.setOptions(values.map(v => {
 			return {
 				value: APLUnitPicker.refToValue(v, this.modObject),
-				submenu: v.type == UnitType.Pet ? [APLUnitPicker.refToValue(v.owner!, this.modObject)] : undefined,
+				submenu: v?.type == UnitType.Pet ? [APLUnitPicker.refToValue(v.owner!, this.modObject)] : undefined,
 			};
 		}));
 	}
@@ -355,7 +355,7 @@ export function actionIdFieldConfig(field: string, actionIdSet: ACTION_ID_SET, u
 export function unitFieldConfig(field: string, options?: Partial<APLPickerBuilderFieldConfig<any, any>>): APLPickerBuilderFieldConfig<any, any> {
 	return {
 		field: field,
-		newValue: () => UnitReference.create(),
+		newValue: () => undefined,
 		factory: (parent, player, config) => new APLUnitPicker(parent, player, {
 			...config,
 		}),

ui/core/components/individual_sim_ui/apl_rotation_picker.ts

@@ -5,6 +5,7 @@ import { Player } from '../../player.js';
 import { ListItemPickerConfig, ListPicker } from '../list_picker.js';
 import { AdaptiveStringPicker } from '../string_picker.js';
 import {
+	APLRotation,
 	APLListItem,
 	APLAction,
 	APLPrepullAction,
@@ -60,7 +61,7 @@ export class APLRotationPicker extends Component {
 			inlineMenuBar: true,
 		});
 
-		//modPlayer.rotationChangeEmitter.on(() => console.log('APL: ' + APLRotation.toJsonString(modPlayer.aplRotation)))
+		modPlayer.rotationChangeEmitter.on(() => console.log('APL: ' + APLRotation.toJsonString(modPlayer.aplRotation)))
 	}
 }
 

ui/core/components/unit_picker.ts

@@ -3,21 +3,21 @@ import { ActionId } from '../proto_utils/action_id.js';
 import { DropdownPicker, DropdownPickerConfig, DropdownValueConfig } from './dropdown_picker.js';
 
 export interface UnitValue {
-    value: UnitReference,
+    value: UnitReference|undefined,
 	text?: string,
 	iconUrl?: string|ActionId,
 	color?: string,
 }
 
 export interface UnitValueConfig extends DropdownValueConfig<UnitValue> {}
-export interface UnitPickerConfig<ModObject> extends Omit<DropdownPickerConfig<ModObject, UnitReference, UnitValue>, 'equals' | 'setOptionContent' | 'defaultLabel'> {
+export interface UnitPickerConfig<ModObject> extends Omit<DropdownPickerConfig<ModObject, UnitReference|undefined, UnitValue>, 'equals' | 'setOptionContent' | 'defaultLabel'> {
 }
 
-export class UnitPicker<ModObject> extends DropdownPicker<ModObject, UnitReference, UnitValue> {
+export class UnitPicker<ModObject> extends DropdownPicker<ModObject, UnitReference|undefined, UnitValue> {
 	constructor(parent: HTMLElement, modObject: ModObject, config: UnitPickerConfig<ModObject>) {
 		super(parent, modObject, {
 			...config,
-			equals: (a, b) => UnitReference.equals(a?.value, b?.value),
+			equals: (a, b) => UnitReference.equals(a?.value || UnitReference.create(), b?.value || UnitReference.create()),
             defaultLabel: 'Unit',
 			setOptionContent: (button: HTMLButtonElement, valueConfig: DropdownValueConfig<UnitValue>) => {
                 const unitConfig = valueConfig.value;