Fix up update resource rule action not rendering on damage rule trigger (#975)

Author: Azurelol

module/documents/effects/actions/update-resource-rule-action.mjs

@@ -4,6 +4,10 @@ import { ExpressionContext, Expressions } from '../../../expressions/expressions
 import { ResourcePipeline, ResourceRequest } from '../../../pipelines/resource-pipeline.mjs';
 import { RuleActionDataModel } from './rule-action-data-model.mjs';
 import { SETTINGS } from '../../../settings.js';
+import { CommonSections } from '../../../checks/common-sections.mjs';
+import { ChatSectionOrder } from '../../../checks/default-section-order.mjs';
+import { Pipeline } from '../../../pipelines/pipeline.mjs';
+import { Flags } from '../../../helpers/flags.mjs';
 
 const fields = foundry.data.fields;
 
@@ -48,12 +52,18 @@ export class UpdateResourceRuleAction extends RuleActionDataModel {
 		const request = new ResourceRequest(context.sourceInfo, targets, this.resource, amount);
 		request.fromOrigin(context.origin);
 
+		const targetAction = ResourcePipeline.getTargetedAction(request);
+		if (selected.length === 1 && selected[0] === context.character) {
+			targetAction.forActor(context.character.actor);
+		}
+
 		if (context.config) {
-			const targetAction = ResourcePipeline.getTargetedAction(request);
-			if (selected.length === 1 && selected[0] === context.character) {
-				targetAction.forActor(context.character.actor);
-			}
 			context.config.addTargetedAction(targetAction);
+		} else if (context.renderData) {
+			let flags = Pipeline.initializedFlags(Flags.ChatMessage.Source, context.sourceInfo);
+			flags = Pipeline.setFlag(flags, Flags.ChatMessage.Item, context.item.uuid);
+			context.renderData.flags = flags;
+			CommonSections.chatActions(context.renderData.sections, [targetAction], flags, ChatSectionOrder.actions);
 		}
 
 		if (game.settings.get(SYSTEM, SETTINGS.automationApplyDamage)) {

module/helpers/chat-action.mjs

@@ -77,7 +77,8 @@ export class ChatAction {
 	 */
 	forActor(actor) {
 		return this.withDataset({
-			actorId: actor.uuid,
+			['actor-id']: actor.uuid,
+			['actor-img']: actor.img,
 		}).notTargeted();
 	}
 

module/helpers/chat-builder.mjs

@@ -7,6 +7,7 @@ import { ChatSectionOrder } from '../checks/default-section-order.mjs';
  * @property {CheckSectionRenderData} sections
  * @property {Promise[]} postRenderActions
  * @property {Tag[]} tags
+ * @property {Object} flags
  */
 
 /**
@@ -46,6 +47,7 @@ export class FUChatBuilder {
 			tags: [],
 			sections: [],
 			postRenderActions: [],
+			flags: [],
 		};
 	}
 
@@ -83,9 +85,8 @@ export class FUChatBuilder {
 	getMergedFlags() {
 		// Merge all current flags
 		let merged = {};
-		for (const current of this.#flags) {
+		for (const current of this.#flags.concat(this.renderData.flags)) {
 			foundry.utils.mergeObject(merged, current, { overwrite: false });
-			//ObjectUtils.mergeRecursive(merged, flag);
 		}
 		return merged;
 	}

templates/chat/partials/chat-actions.hbs

@@ -61,6 +61,10 @@
 			   data-tooltip="{{localize tooltip}}">
             <span class='fu-tag button flex-group-center gap-5 fu-target-action__icon__container'
 				  style="width: 100%;white-space: nowrap;">
+				{{#if dataset.actor-img}}
+					<img class="fu-target-action__icon {{classes}}" alt="{{localize tooltip}}"
+						 src="{{dataset.actor-img}}" />
+				{{/if}}
 				{{~localize action.label}}
 				{{#if img}}
 					<img class="fu-target-action__icon {{classes}}" alt="{{localize tooltip}}"