Add RE for soul steal, add expression support for skill accuracy (#649)

Azurelol · web-flow · commit d325f2d74858 · 2026-01-04T21:20:10.000+01:00
* Add RE for soul steal, add expression support for skill accuracy
* Render the DL used for the attribute check too.
diff --git a/lang/en.json b/lang/en.json
@@ -957,8 +957,8 @@
 		"ChatApplyDamagePrompt": "The followings characters have <strong>suffered {amount} {type} damage</strong> due to <strong>{source}</strong>.",
 		"ChatResourceGainPrompt": "The followings characters have <strong>gained {amount} {type}</strong> due to <strong>{source}</strong>.",
 		"ChatResourceLossPrompt": "The followings characters have <strong>lost {amount} {type}</strong> due to <strong>{source}</strong>.",
-		"ChatResourceGainTooltip": "Gain <strong>{amount} {resource}</strong>.",
-		"ChatResourceLossTooltip": "Lose <strong>{amount} {resource}</strong>.",
+		"ChatResourceGainTooltip": "Gain {amount} {resource}",
+		"ChatResourceLossTooltip": "Lose {amount} {resource}",
 		"Increment": "Increment",
 		"Decrement": "Decrement",
 		"TotalAvailableSkills": "Total Available Skills",
@@ -1666,6 +1666,7 @@
 		"RulePredicateFactionRelation": "Faction Relation",
 		"RulePredicateEffect": "Effect",
 		"RulePredicateSpecies": "Species",
+		"RulePredicateRank": "Rank",
 		"RulePredicateWeapon": "Weapon",
 		"RulePredicateResource": "Resource",
 		"RulePredicateTargeting": "Targeting",
diff --git a/module/documents/effects/actions/message-rule-action.mjs b/module/documents/effects/actions/message-rule-action.mjs
@@ -5,6 +5,7 @@ import { FUHooks } from '../../../hooks.mjs';
 import { CommonSections } from '../../../checks/common-sections.mjs';
 import { Flags } from '../../../helpers/flags.mjs';
 import { Pipeline } from '../../../pipelines/pipeline.mjs';
+import { CHECK_DETAILS } from '../../../checks/default-section-order.mjs';
 
 const { StringField } = foundry.data.fields;
 
@@ -52,7 +53,7 @@ export class MessageRuleAction extends RuleActionDataModel {
 			/** @type RenderCheckEvent **/
 			const rce = context.event;
 			const actor = rce.source.actor !== context.character.actor ? context.item.parent : null;
-			CommonSections.itemText(rce.renderData, this.message, actor, context.item, flags);
+			CommonSections.itemText(rce.renderData, this.message, actor, context.item, flags, CHECK_DETAILS);
 		} else {
 			const actor = context.character.actor;
 			const content = await FoundryUtils.renderTemplate('chat/partials/chat-item-text', {
diff --git a/module/documents/effects/actions/update-resource-rule-action.mjs b/module/documents/effects/actions/update-resource-rule-action.mjs
@@ -4,9 +4,9 @@ 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 { FUHooks } from '../../../hooks.mjs';
 
 const fields = foundry.data.fields;
+
 /**
  * @property {FU.resources} resource
  * @property {String} amount
@@ -48,11 +48,9 @@ export class UpdateResourceRuleAction extends RuleActionDataModel {
 		const request = new ResourceRequest(context.sourceInfo, targets, this.resource, amount);
 		request.fromOrigin(context.origin);
 
-		if (context.eventType === FUHooks.INITIALIZE_CHECK_EVENT) {
-			/** @type InitializeCheckEvent **/
-			const ice = context.event;
+		if (context.config) {
 			const targetAction = ResourcePipeline.getTargetedAction(request);
-			ice.config.addTargetedAction(targetAction);
+			context.config.addTargetedAction(targetAction);
 		} else {
 			if (game.settings.get(SYSTEM, SETTINGS.automationUpdateResource)) {
 				await ResourcePipeline.process(request);
diff --git a/module/documents/effects/active-effect-config.mjs b/module/documents/effects/active-effect-config.mjs
@@ -145,47 +145,49 @@ export class FUActiveEffectConfig extends foundry.applications.sheets.ActiveEffe
 			case 'rules':
 				{
 					context.options = {
+						...FU,
 						ruleActions: RuleActionRegistry.instance.localizedEntries,
 						ruleTriggers: RuleTriggerRegistry.instance.localizedEntries,
-						combatEvent: FU.combatEvent,
-						duration: FU.duration,
-						damageTypes: FU.damageTypes,
 						damageTypeOptions: FoundryUtils.getFormOptions(FU.damageTypes),
-						itemGroup: FU.itemGroup,
 						itemGroupOptions: FoundryUtils.getFormOptions(FU.itemGroup),
-						damageSource: FU.damageSource,
 						damageSourceOptions: FoundryUtils.getFormOptions(FU.damageSource),
-						expenseSource: FU.expenseSource,
-						checkTypes: FU.checkTypes,
 						checkTypeOptions: FoundryUtils.getFormOptions(FU.checkTypes),
-						dialogCheckTypes: FU.dialogCheckTypes,
-						attributes: FU.attributes,
-						resources: FU.resources,
-						species: FU.species,
-						weaponTypes: FU.weaponTypes,
-						handedness: FU.handedness,
-						weaponCategories: FU.weaponCategories,
+						rankOptions: FoundryUtils.getFormOptions(FU.rank),
 						weaponCategoryOptions: FoundryUtils.getFormOptions(FU.weaponCategories),
 						consumableTraitOptions: FoundryUtils.getFormOptions(ConsumableTraits, (k, v) => k),
-						targetingRules: FU.targetingRules,
-						commandAction: FU.commandAction,
-						statusEffects: FU.statusEffects,
-						eventRelation: FU.eventRelation,
-						factionRelation: FU.factionRelation,
-						bondPredicate: FU.bondPredicate,
-						targetSelector: FU.targetSelector,
-						checkParity: FU.checkParity,
-						checkOutcome: FU.checkOutcome,
 						traits: TraitUtils.getOptions(Traits),
-						changeSetMode: FU.changeSetMode,
-						booleanOption: FU.booleanOption,
-						collectionChange: FU.collectionChange,
-						collectionRemovalRule: FU.collectionRemovalRule,
-						scalarChange: FU.scalarChange,
-						comparisonOperator: FU.comparisonOperator,
-						targetingPredicate: FU.targetingPredicate,
-						predicateQuantifier: FU.predicateQuantifier,
-						modifyDamageVariant: FU.modifyDamageVariant,
+						// combatEvent: FU.combatEvent,
+						// duration: FU.duration,
+						// damageTypes: FU.damageTypes,
+						// itemGroup: FU.itemGroup,
+						// damageSource: FU.damageSource,
+						// expenseSource: FU.expenseSource,
+						// checkTypes: FU.checkTypes,
+						// dialogCheckTypes: FU.dialogCheckTypes,
+						// attributes: FU.attributes,
+						// resources: FU.resources,
+						// species: FU.species,
+						// weaponTypes: FU.weaponTypes,
+						// handedness: FU.handedness,
+						// weaponCategories: FU.weaponCategories,
+						// targetingRules: FU.targetingRules,
+						// commandAction: FU.commandAction,
+						// statusEffects: FU.statusEffects,
+						// eventRelation: FU.eventRelation,
+						// factionRelation: FU.factionRelation,
+						// bondPredicate: FU.bondPredicate,
+						// targetSelector: FU.targetSelector,
+						// checkParity: FU.checkParity,
+						// checkOutcome: FU.checkOutcome,
+						// changeSetMode: FU.changeSetMode,
+						// booleanOption: FU.booleanOption,
+						// collectionChange: FU.collectionChange,
+						// collectionRemovalRule: FU.collectionRemovalRule,
+						// scalarChange: FU.scalarChange,
+						// comparisonOperator: FU.comparisonOperator,
+						// targetingPredicate: FU.targetingPredicate,
+						// predicateQuantifier: FU.predicateQuantifier,
+						// modifyDamageVariant: FU.modifyDamageVariant,
 					};
 				}
 				break;
diff --git a/module/documents/effects/predicates/check-rule-predicate.mjs b/module/documents/effects/predicates/check-rule-predicate.mjs
@@ -94,6 +94,9 @@ export class CheckRulePredicate extends RulePredicateDataModel {
 					break;
 
 				default:
+					if (context.config.isFumble()) {
+						return false;
+					}
 					for (const target of context.event.targets) {
 						switch (target.check) {
 							case 'hit':
diff --git a/module/documents/effects/predicates/rank-rule-predicate.mjs b/module/documents/effects/predicates/rank-rule-predicate.mjs
@@ -0,0 +1,41 @@
+import { RulePredicateDataModel } from './rule-predicate-data-model.mjs';
+import { systemTemplatePath } from '../../../helpers/system-utils.mjs';
+
+const fields = foundry.data.fields;
+
+/**
+ * @property {Set<FUAdversaryRank>} ranks
+ */
+export class RankRulePredicate extends RulePredicateDataModel {
+	static {
+		Object.defineProperty(this, 'TYPE', { value: 'rankRulePredicate' });
+	}
+
+	static defineSchema() {
+		return Object.assign(super.defineSchema(), {
+			ranks: new fields.SetField(new fields.StringField()),
+		});
+	}
+
+	static get localization() {
+		return 'FU.RulePredicateRank';
+	}
+
+	static get template() {
+		return systemTemplatePath('effects/predicates/rank-rule-predicate');
+	}
+
+	/**
+	 * @override
+	 */
+	validateContext(context) {
+		for (const target of context.targets) {
+			/** @type NpcDataModel **/
+			const targetData = target.actor.system;
+			if (!this.ranks.has(targetData.rank.value)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/module/documents/items/skill/skill-data-model.mjs b/module/documents/items/skill/skill-data-model.mjs
@@ -61,15 +61,17 @@ Hooks.on(CheckHooks.renderCheck, onRenderAccuracyCheck);
 /**
  * @type RenderCheckHook
  */
-let onRenderAttributeCheck = (sections, check, actor, item) => {
+let onRenderAttributeCheck = (sections, check, actor, item, flags) => {
 	if (check.type === 'attribute' && check.additionalData[skillForAttributeCheck]) {
 		const skill = fromUuidSync(check.additionalData[skillForAttributeCheck]);
+		const inspector = CheckConfiguration.inspect(check);
 		CommonSections.itemFlavor(sections, skill);
 		CommonSections.tags(sections, getTags(skill), CHECK_DETAILS);
 		if (skill.system.hasResource.value) {
 			CommonSections.resource(sections, skill.system.rp, CHECK_DETAILS);
 		}
 		CommonSections.description(sections, skill.system.description, skill.system.summary.value, CHECK_DETAILS);
+		CommonSections.actions(sections, actor, item, [], flags, inspector);
 	}
 };
 Hooks.on(CheckHooks.renderCheck, onRenderAttributeCheck);
@@ -115,7 +117,7 @@ function getTags(skill) {
  * @property {string} class.value
  * @property {UseWeaponDataModelV2} useWeapon
  * @property {ItemAttributesDataModelV2} attributes
- * @property {number} accuracy
+ * @property {String} accuracy A number or expression for the accuracy to be used.
  * @property {Defense} defense
  * @property {DamageDataModelV2} damage
  * @property {ResourceDataModel} resource
@@ -160,7 +162,7 @@ export class SkillDataModel extends FUStandardItemDataModel {
 					secondary: 'ins',
 				},
 			}),
-			accuracy: new NumberField({ initial: 0, integer: true, nullable: false }),
+			accuracy: new StringField({ initial: '', blank: true, nullable: false }),
 			defense: new StringField({ initial: 'def', choices: Object.keys(FU.defenses), blank: true }),
 			damage: new EmbeddedDataField(DamageDataModelV2, {}),
 			resource: new EmbeddedDataField(ResourceDataModel, {}),
@@ -212,7 +214,7 @@ export class SkillDataModel extends FUStandardItemDataModel {
 						secondary: this.attributes.secondary,
 					},
 					this.parent,
-					this.#initializeAttributeCheck(),
+					this.#initializeAttributeCheck(modifiers),
 				);
 			}
 		}
@@ -236,6 +238,44 @@ export class SkillDataModel extends FUStandardItemDataModel {
 		};
 	}
 
+	/**
+	 * @return {CheckCallback}
+	 */
+	#initializeAttributeCheck(modifiers) {
+		return async (check, actor, item) => {
+			/** @type SkillDataModel **/
+			const skill = item.system;
+			const config = CheckConfiguration.configure(check);
+			const targets = config.getTargets();
+			const context = ExpressionContext.fromTargetData(actor, item, targets);
+
+			if (skill.defense && targets.length === 1) {
+				let dl;
+				switch (skill.defense) {
+					case 'def':
+						dl = targets[0].def;
+						break;
+
+					case 'mdef':
+						dl = targets[0].mdef;
+						break;
+				}
+				config.setDifficulty(dl);
+			}
+
+			if (this.accuracy) {
+				const calculatedAccuracyBonus = await Expressions.evaluateAsync(this.accuracy, context);
+				if (calculatedAccuracyBonus > 0) {
+					check.modifiers.push({
+						label: 'FU.CheckBonus',
+						value: calculatedAccuracyBonus,
+					});
+				}
+			}
+			check.additionalData[skillForAttributeCheck] = this.parent.uuid;
+		};
+	}
+
 	/**
 	 * @param {KeyboardModifiers} modifiers
 	 * @return {CheckCallback}
@@ -264,6 +304,8 @@ export class SkillDataModel extends FUStandardItemDataModel {
 			/** @type SkillDataModel **/
 			const skill = item.system;
 			const config = CheckConfiguration.configure(check);
+			const targets = config.getTargets();
+			const context = ExpressionContext.fromTargetData(actor, item, targets);
 
 			config.addTraits('skill');
 			config.addTraitsFromItemModel(this.traits);
@@ -273,10 +315,13 @@ export class SkillDataModel extends FUStandardItemDataModel {
 			config.setWeaponTraits(config.getWeaponTraits());
 
 			if (this.accuracy) {
-				check.modifiers.push({
-					label: 'FU.CheckBonus',
-					value: this.accuracy,
-				});
+				const calculatedAccuracyBonus = await Expressions.evaluateAsync(this.accuracy, context);
+				if (calculatedAccuracyBonus > 0) {
+					check.modifiers.push({
+						label: 'FU.CheckBonus',
+						value: calculatedAccuracyBonus,
+					});
+				}
 			}
 
 			if (skill.resource.enabled) {
@@ -307,8 +352,6 @@ export class SkillDataModel extends FUStandardItemDataModel {
 
 				const onRoll = this.damage.onRoll;
 				if (onRoll) {
-					const targets = config.getTargets();
-					const context = ExpressionContext.fromTargetData(actor, item, targets);
 					const extraDamage = await Expressions.evaluateAsync(onRoll, context);
 					if (extraDamage > 0) {
 						config.addDamageBonus('FU.DamageOnRoll', extraDamage);
@@ -325,19 +368,6 @@ export class SkillDataModel extends FUStandardItemDataModel {
 		};
 	}
 
-	/**
-	 * @return {CheckCallback}
-	 */
-	#initializeAttributeCheck() {
-		return (check) => {
-			check.modifiers.push({
-				label: 'FU.CheckBonus',
-				value: this.accuracy,
-			});
-			check.additionalData[skillForAttributeCheck] = this.parent.uuid;
-		};
-	}
-
 	shouldApplyEffect(effect) {
 		return this.level.value > 0;
 	}
diff --git a/module/helpers/config.mjs b/module/helpers/config.mjs
@@ -662,6 +662,10 @@ FU.combatHudThemeTemplates = {
 	'fu-pixel': 'combat-hud-pixel',
 };
 
+/**
+ * @typedef {'soldier', 'elite', 'champion'} FUAdversaryRank
+ */
+
 FU.rank = {
 	soldier: 'FU.Soldier',
 	elite: 'FU.Elite',
diff --git a/module/pipelines/resource-pipeline.mjs b/module/pipelines/resource-pipeline.mjs
@@ -437,6 +437,7 @@ function getTargetedAction(request) {
 	})
 		.requiresOwner()
 		.setFlag(request.gain ? Flags.ChatMessage.ResourceGain : Flags.ChatMessage.ResourceLoss)
+		.withLabel(tooltip)
 		.withColor(request.gain ? 'var(--color-hp)' : 'var(--color-hp-crisis)')
 		.withSelected();
 }
diff --git a/module/pipelines/rule-elements.mjs b/module/pipelines/rule-elements.mjs
@@ -53,6 +53,7 @@ import { PerformCheckRuleAction } from '../documents/effects/actions/perform-che
 import { ModifyResourceRuleAction } from '../documents/effects/actions/modify-resource-rule-action.mjs';
 import { CalculateResourceRuleTrigger } from '../documents/effects/triggers/calculate-resource-rule-trigger.mjs';
 import { OpenApplicationRuleAction } from '../documents/effects/actions/open-application-rule-action.mjs';
+import { RankRulePredicate } from '../documents/effects/predicates/rank-rule-predicate.mjs';
 
 function register() {
 	RuleTriggerRegistry.instance.register(systemId, CombatEventRuleTrigger.TYPE, CombatEventRuleTrigger);
@@ -94,6 +95,7 @@ function register() {
 	RulePredicateRegistry.instance.register(systemId, FactionRelationRulePredicate.TYPE, FactionRelationRulePredicate);
 	RulePredicateRegistry.instance.register(systemId, EffectRulePredicate.TYPE, EffectRulePredicate);
 	RulePredicateRegistry.instance.register(systemId, SpeciesRulePredicate.TYPE, SpeciesRulePredicate);
+	RulePredicateRegistry.instance.register(systemId, RankRulePredicate.TYPE, RankRulePredicate);
 	RulePredicateRegistry.instance.register(systemId, WeaponRulePredicate.TYPE, WeaponRulePredicate);
 	RulePredicateRegistry.instance.register(systemId, ResourceRulePredicate.TYPE, ResourceRulePredicate);
 	RulePredicateRegistry.instance.register(systemId, TargetingRulePredicate.TYPE, TargetingRulePredicate);
diff --git a/templates/effects/predicates/rank-rule-predicate.hbs b/templates/effects/predicates/rank-rule-predicate.hbs
@@ -0,0 +1,4 @@
+<div class="fu-rule-element__property">
+	<span>{{localize 'FU.Rank'}}</span>
+	{{formGroup predicate.schema.fields.ranks value=predicate.ranks options=options.rankOptions name=(pfuConcat path ".ranks") classes="fu-rule-element__set stacked"}}
+</div>
diff --git a/templates/item/partials/item-accuracy-section.hbs b/templates/item/partials/item-accuracy-section.hbs
@@ -32,13 +32,11 @@
 			</div>
 			<div class=" flexcol flex-group-center">
 				<label class="resource-label-m">{{localize 'FU.Bonus'}}</label>
-				<input type="number" name="system.accuracy" value="{{ system.accuracy }}" class="resource-inputs" {{disabled
-				 (not system.hasRoll.value)}}/>
+				<input type="text" name="system.accuracy" value="{{ system.accuracy }}" class="resource-inputs select-dropdown-m" {{disabled (not system.hasRoll.value)}}/>
 			</div>
 			<div class="resource-content flexcol flex-group-center">
 				<label for="system.defense" class="resource-label-m flexlarge align-left">{{localize 'FU.Defense'}}</label>
-				<select name="system.defense" class="resource-inputs select-dropdown-m" {{disabled
-				 (not system.useWeapon.accuracy)}}>
+				<select name="system.defense" class="resource-inputs select-dropdown-m">
 					{{selectOptions defenses selected=system.defense sort=true localize=true labelAttr="abbr" blank="-"}}
 				</select>
 			</div>

Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,7 @@ function getTargetedAction(request) {`
`437`	`437`	`})`
`438`	`438`	`.requiresOwner()`
`439`	`439`	`.setFlag(request.gain ? Flags.ChatMessage.ResourceGain : Flags.ChatMessage.ResourceLoss)`
	`440`	`+ .withLabel(tooltip)`
`440`	`441`	`.withColor(request.gain ? 'var(--color-hp)' : 'var(--color-hp-crisis)')`
`441`	`442`	`.withSelected();`
`442`	`443`	`}`