Fix missing traits on npc skills

Author: Azurelol

module/documents/items/misc/misc-ability-data-model.mjs

@@ -18,10 +18,10 @@ const skillForAttributeCheck = 'skillForAttributeCheck';
 /**
  * @type RenderCheckHook
  */
-let onRenderAccuracyCheck = (data, check, actor, item, flags) => {
+let onRenderAccuracyCheck = async (data, check, actor, item, flags) => {
 	if (check.type === 'accuracy' && item?.system instanceof MiscAbilityDataModel) {
 		const inspector = CheckConfiguration.inspect(check);
-		const weapon = fromUuidSync(inspector.getWeaponReference());
+		const weapon = await fromUuid(inspector.getWeaponReference());
 		if (check.critical) {
 			CommonSections.opportunity(data.sections, item.system.opportunity, CHECK_DETAILS);
 		}
@@ -46,10 +46,10 @@ Hooks.on(CheckHooks.renderCheck, onRenderAccuracyCheck);
 /**
  * @type RenderCheckHook
  */
-let onRenderAttributeCheck = (sections, check, actor, item, flags) => {
+let onRenderAttributeCheck = async (sections, check, actor, item, flags) => {
 	if (check.type === 'attribute' && item?.system instanceof MiscAbilityDataModel && check.additionalData[skillForAttributeCheck]) {
 		const inspector = CheckConfiguration.inspect(check);
-		const ability = fromUuidSync(inspector.getWeaponReference());
+		const ability = await fromUuid(inspector.getWeaponReference());
 		CommonSections.itemFlavor(sections, ability);
 		if (check.critical) {
 			CommonSections.opportunity(sections, ability.system.opportunity, CHECK_DETAILS);
@@ -216,7 +216,7 @@ export class MiscAbilityDataModel extends BaseSkillDataModel {
 			config.setWeaponReference(weapon);
 			await this.configureCheck(config);
 			await this.addSkillAccuracy(config, actor, item, context);
-			await this.addSkillDamage(config, item, context);
+			await this.addSkillDamage(config, item, context, weapon.system);
 		};
 	}
 

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

@@ -14,6 +14,7 @@ import { ItemPartialTemplates } from '../item-partial-templates.mjs';
 import { ChooseWeaponDialog } from './choose-weapon-dialog.mjs';
 import { WeaponDataModel } from '../weapon/weapon-data-model.mjs';
 import { ResourcePipeline } from '../../../pipelines/resource-pipeline.mjs';
+import { BasicItemDataModel } from '../basic/basic-item-data-model.mjs';
 
 /**
  * @property {string} description
@@ -184,18 +185,20 @@ export class BaseSkillDataModel extends FUStandardItemDataModel {
 
 			// Weapon support
 			if (weaponData) {
-				if (this.useWeapon.traits && weaponData.traits) {
+				if (this.useWeapon.traits) {
 					if (weaponData.traits) {
 						config.addTraitsFromItemModel(weaponData.traits);
 					}
 					if (weaponData instanceof WeaponDataModel) {
-						config
-							.setWeaponTraits({
-								weaponType: weaponData.type.value,
-								weaponCategory: weaponData.category.value,
-								handedness: weaponData.hands.value,
-							})
-							.addTraits(weaponData.damageType.value);
+						config.setWeaponTraits({
+							weaponType: weaponData.type.value,
+							weaponCategory: weaponData.category.value,
+							handedness: weaponData.hands.value,
+						});
+					} else if (weaponData instanceof BasicItemDataModel) {
+						config.setWeaponTraits({
+							weaponType: weaponData.type.value,
+						});
 					}
 				}
 				if (this.useWeapon.damage) {

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

@@ -16,10 +16,10 @@ const skillForAttributeCheck = 'skillForAttributeCheck';
 /**
  * @type RenderCheckHook
  */
-let onRenderAccuracyCheck = (data, check, actor, item, flags) => {
+let onRenderAccuracyCheck = async (data, check, actor, item, flags) => {
 	if (check.type === 'accuracy' && item?.system instanceof SkillDataModel) {
 		const inspector = CheckConfiguration.inspect(check);
-		const weapon = fromUuidSync(inspector.getWeaponReference());
+		const weapon = await fromUuid(inspector.getWeaponReference());
 
 		if (check.critical) {
 			CommonSections.opportunity(data.sections, item.system.opportunity, CHECK_DETAILS);
@@ -40,9 +40,9 @@ Hooks.on(CheckHooks.renderCheck, onRenderAccuracyCheck);
 /**
  * @type RenderCheckHook
  */
-let onRenderAttributeCheck = (data, check, actor, item, flags) => {
+let onRenderAttributeCheck = async (data, check, actor, item, flags) => {
 	if (check.type === 'attribute' && item?.system instanceof SkillDataModel && check.additionalData[skillForAttributeCheck]) {
-		const skill = fromUuidSync(check.additionalData[skillForAttributeCheck]);
+		const skill = await fromUuid(check.additionalData[skillForAttributeCheck]);
 		const inspector = CheckConfiguration.inspect(check);
 		CommonSections.itemFlavor(data.sections, skill);
 		CommonSections.tags(data.sections, getTags(skill), CHECK_DETAILS);
@@ -196,8 +196,6 @@ export class SkillDataModel extends BaseSkillDataModel {
 	#initializeAccuracyCheck(modifiers) {
 		return async (check, actor, item) => {
 			const weapon = await this.getWeapon(actor);
-			/** @type WeaponDataModel **/
-			const weaponData = weapon.system;
 			const { check: weaponCheck, error } = await Checks.prepareCheckDryRun('accuracy', actor, weapon);
 			if (error) {
 				throw error;
@@ -213,7 +211,7 @@ export class SkillDataModel extends BaseSkillDataModel {
 			config.setWeaponReference(weapon);
 			config.setHrZero(this.damage.hrZero || modifiers.shift);
 			await this.configureCheck(config);
-			await this.addSkillDamage(config, item, context, weaponData);
+			await this.addSkillDamage(config, item, context, weapon.system);
 			await this.addSkillAccuracy(config, actor, item, context);
 		};
 	}

module/pipelines/inventory-pipeline.mjs

@@ -258,11 +258,11 @@ async function requestZenitTransfer(sourceActorId, targetActorId, amount) {
 	// Now execute directly on GM or request as user
 	if (game.user?.isGM) {
 		/** @type FUActor **/
-		const sourceActor = fromUuidSync(sourceActorId);
+		const sourceActor = await fromUuid(sourceActorId);
 
 		if (validateFunds(sourceActor, amount)) {
 			/** @type FUActor **/
-			const targetActor = fromUuidSync(targetActorId);
+			const targetActor = await fromUuid(targetActorId);
 
 			await updateResources(sourceActor, -amount);
 			await updateResources(targetActor, amount);