Fix elemental weapon inline

Author: Azurelol

module/checks/common-sections.mjs

@@ -420,6 +420,15 @@ const actions = (data, actor, item, targetData, flags, inspector = undefined) =>
 				}
 			}
 
+			// Remove malformed actions
+			actions = actions.filter((a) => {
+				if (!a) {
+					ui.notifications.warn(`An action was malformed during the rendering of this chat message. Please report the issue!`);
+					return false;
+				}
+				return true;
+			});
+
 			// Set any flags
 			Pipeline.toggleFlag(flags, Flags.ChatMessage.Targets);
 			flags = Pipeline.setFlag(flags, Flags.ChatMessage.Source, sourceInfo);

module/documents/items/skill/base-skill-data-model.mjs

@@ -399,16 +399,16 @@ export class BaseSkillDataModel extends FUStandardItemDataModel {
 	 * @returns {Promise<WeaponResolution>}
 	 */
 	async getWeapon(actor) {
-		const weapon = await WeaponResolver.prompt(actor, true);
-		if (weapon === false) {
+		const getWeapon = await WeaponResolver.prompt(actor, true);
+		if (getWeapon === false) {
 			let message = game.i18n.localize('FU.AbilityNoWeaponEquipped');
 			ui.notifications.error(message);
 			throw new Error(message);
 		}
-		if (weapon == null) {
+		if (getWeapon == null) {
 			throw new Error('no selection');
 		}
-		return weapon;
+		return getWeapon;
 	}
 
 	/**

module/enrichers/inline-weapon.mjs

@@ -1,4 +1,4 @@
-import { FU, systemPath } from '../helpers/config.mjs';
+import { FU } from '../helpers/config.mjs';
 import { InlineHelper, InlineSourceInfo } from '../helpers/inline-helper.mjs';
 import { targetHandler } from '../helpers/target-handler.mjs';
 import { CharacterDataModel } from '../documents/actors/character/character-data-model.mjs';
@@ -11,6 +11,7 @@ import { InlineEffects } from './inline-effects.mjs';
 import { StringUtils } from '../helpers/string-utils.mjs';
 import { systemAssetPath } from '../helpers/system-utils.mjs';
 import { CustomWeaponDataModel } from '../documents/items/customWeapon/custom-weapon-data-model.mjs';
+import FoundryUtils from '../helpers/foundry-utils.mjs';
 
 const INLINE_WEAPON = 'InlineWeapon';
 const className = `inline-weapon`;
@@ -139,12 +140,14 @@ function createAlterDamageTypeEffect(weapon, type, label) {
 async function applyEffectToWeapon(actor, sourceInfo, choices, config) {
 	if (actor.system instanceof CharacterDataModel) {
 		const source = sourceInfo.resolve();
-		const weapon = await WeaponResolver.prompt(actor, true);
-		if (!weapon) {
+		const promptWeapon = await WeaponResolver.prompt(actor, true);
+		if (!promptWeapon) {
 			ui.notifications.error('FU.AbilityNoWeaponEquipped', { localize: true });
 			return;
 		}
 
+		const weapon = promptWeapon.item;
+
 		const onApply = async (choice) => {
 			choice = choice.trim();
 			if (choice in FU.damageTypes) {
@@ -167,15 +170,13 @@ async function applyEffectToWeapon(actor, sourceInfo, choices, config) {
 			if (isAny) {
 				choices = Object.keys(FU.damageTypes);
 			}
-			const result = await foundry.applications.api.DialogV2.wait({
-				window: { title: 'Select Damage Type' },
-				content: await foundry.applications.handlebars.renderTemplate(systemPath('templates/dialog/dialog-inline-weapon-enchant.hbs')),
-				rejectClose: false,
-				buttons: choices.map((choice) => ({
-					action: choice,
-					label: game.i18n.localize(FU.damageTypes[choice]),
-				})),
-			});
+			const options = choices.map((choice) => ({
+				label: game.i18n.localize(FU.damageTypes[choice]),
+				value: choice,
+				icon: FU.affIcon[choice],
+			}));
+			const result = await FoundryUtils.selectIconOptionDialog('FU.SelectDamageType', options);
+
 			console.log(result);
 			if (result) {
 				onApply(result);

module/helpers/targeting.mjs

@@ -73,7 +73,7 @@ async function filterTargetsByRule(actor, item, targets) {
 			return targets;
 		case 'weapon': {
 			const weapon = await WeaponResolver.prompt(actor);
-			return [weapon];
+			return [weapon.item];
 		}
 		case 'special':
 			return targets;

templates/dialog/dialog-select-option-icon.hbs

@@ -9,7 +9,7 @@
 		<button type="button" class="fu-dialog__icon-option"
 				data-tooltip="{{label}}"
 				data-action="selectOption" data-value="{{value}}">
-			<i class="{{icon}}"></i>
+			<i class="fu-icon--m {{icon}}"></i>
 		</button>
 	{{/each}}
 </div>