Further damage model improvements and extras #229

Azurelol · 2025-02-20T16:39:13Z

It was brought to my attention that we actually need two evaluations when adding extra damage from expressions:. As a bonus when making the roll for the skill (Shadow Strike) and as a bonus when applying the damage on the target (Cheap Shot)
Fix bug in open check modifiers
Fix negative damage results leading to corruption in the pipeline
Add overrides data model to characters; Add Lone Wolf effect to grant extra turns for PCs
Add a weapon for mutants that has automation for akromorphosis.
Update dancer dance entries to use newer automation, including support for blanket override of damage types, done via @AFFINITY[dark damage]

Normalizes line endings due to git attribute change

- Allow extra turns

…for mutant with akromorphosis automation

Azurelol · 2025-02-21T22:22:08Z

Don't panic! The culprit behind the big line count change came from the formatter redoing the line endings on en.json. They should be LF now.

Shourn · 2025-02-23T18:24:56Z

module/checks/check-configuration.mjs

+		if (actor.system instanceof CharacterDataModel) {
+			const characterData = actor.system;
+			const damageType = characterData.overrides.damageType;
+			if (damageType && damageType !== 'untyped') {


Why the special case for untyped?
It's a standard damage type, just like all the others.

Ah, I wasn't sure whether someone would want to override to untyped.

Shourn · 2025-02-23T19:28:12Z

module/documents/actors/common/overrides-data-model.mjs

+		const { StringField, NumberField } = foundry.data.fields;
+		return {
+			turns: new NumberField({ initial: 1, min: 1, integer: true, nullable: false }),
+			damageType: new StringField({ initial: '', choices: Object.keys(FU.damageTypes), blank: true, nullable: false }),


I don't blame you for not following the discussion, but we figured out that we'll need at least the following differentiated override possibilities:

attacks (accuracy check)

spells (magic check)

skills (flat damage, not damage by free attacks or spells)

Additionally, we will need fields for both "normal" and "priority" changes.
The rationale is as follows:
An accessory may change the damage type of all attacks, spells and skills to a specific type (CRB p284).
A dance, like "Angel Dance", changes the damage type of attacks and spells, but not skills (HF p144).
The "Arcanum of the Sword" (CRB p181) changes the damage type of attacks and only attacks to "untyped".

It is reasonable for a character to have an accessory equipped that changes their damage to "earth", while dancing the "Angel Dance" and being merged with the "Arcanum of the Sword".
In this constellation their attacks should do "untyped" damage, their spells "light" damage and their skills "earth" damage.

Skills that change the damage type for a single attack or spell occupy something of a middle ground between "normal" and "priority" changes.
They take precedence over "normal", but yield to "priority".
They also come in "normal" and "priority" variations:
A tinkerers "Pyro Infusion" will add 5 damage to a "Shadow Strike", but won't change the damage type from "dark" to "fire".

I'd say implementing damage type changes for flat damage is outside the scope of this PR, but both attacks and spells should be supported independently.

Very well. I think we could make sure of a nice table on a feature request that lists the use cases. I will sub-divide the damage override data structure.

Shourn · 2025-02-23T19:56:20Z

module/documents/items/common/damage-data-model-v2.mjs

@@ -14,7 +15,8 @@ export class DamageDataModelV2 extends foundry.abstract.DataModel {
 			hasDamage: new BooleanField(),
 			hrZero: new BooleanField(),
 			value: new NumberField({ initial: 0, integer: true, nullable: false }),
-			extra: new StringField({ nullable: true }),
+			onRoll: new StringField({ nullable: true }),


I'd prefer blank to nullable, since exposing these fields on the sheets will basically guarantee that they are filled with empty strings.

Ah I wasn't aware of this option. Will do.

Shourn · 2025-02-23T20:08:22Z

module/documents/actors/common/overrides-data-model.mjs

+	static defineSchema() {
+		const { StringField, NumberField } = foundry.data.fields;
+		return {
+			turns: new NumberField({ initial: 1, min: 1, integer: true, nullable: false }),


Not a fan of having this under overrides.
Personally, I feel like having this under bonuses and starting with 0 is more intuitive.
This would make the usual usecases of "lose a turn"/"gain an additional turn" very straightforward and applicable to both PCs and NPCs: ["system.bonuses.turns", "add", "1"].

Oh that's a great idea.

Shourn · 2025-02-23T20:14:40Z

module/helpers/inline-affinity.mjs

 	const localizedType = game.i18n.localize(FU.damageTypes[type]);
-	const affValue = FU.affValue[value];
-	const localizedValue = game.i18n.localize(FU.affType[affValue]);
+	if (value === 'damage') {


I feel like this is conflating different usecases by lumping together changes to affinities and changes to outgoing damage.
It's not a 100% fit, but the inline weapon enchantments feel like a more sensible place for this.

I wanted to avoid having to define a new inline command, but I may as well at this point.

Shourn · 2025-02-23T20:20:28Z

src/packs/skills/skill_Cheap_Shot_c2XRt5pvOab25Tbe.json

@@ -48,7 +48,8 @@
      "hasDamage": true,
      "value": 0,
      "type": "",
-      "extra": "$sl+$tsc"
+      "onRoll": "",
+      "onApply": "$sl+$tsc"


This formula is actually not correct.
"Cheap Shot" only deals its bonus damage if the target is suffering from at least 1 status effect.
Untested, but (min($tsc, 1) * $sl) + $tsc might work.

Ah. Will try it.

@type

- Add new inline, @type that now supports damage - Redeisgn the damage type override fields - Cry a little

Azurelol marked this pull request as ready for review February 20, 2025 17:10

Azurelol force-pushed the add/damage_on_roll_apply branch 2 times, most recently from 345ccfe to 9339e1e Compare February 21, 2025 17:00

Add onRoll, onApply fields to damage model

fabbaa8

Azurelol force-pushed the add/damage_on_roll_apply branch from 9339e1e to fabbaa8 Compare February 21, 2025 17:31

Azurelol added 5 commits February 21, 2025 18:37

Add localization for OnRoll, OnApply

4c14c7a

Normalizes line endings due to git attribute change

Do not let damage go below 0 during the damage pipeline

78125ae

Fix shadowing of the totally-different check parameter in the callback.

ab55d30

Add overrides data model for PCs

fcd33a8

- Allow extra turns

Add lone wolf effect for campaigns with less PCs; Add unarmed strike …

d23b795

…for mutant with akromorphosis automation

Azurelol changed the title ~~Add two distinct evaluations for the damage data model~~ Further damage model improvements and extras Feb 21, 2025

Azurelol added 3 commits February 21, 2025 22:49

Add damage override option to the newer @AFFINTIY inline.

06e8c4c

Integrate the damage override effect onto PC actions

302aabc

Update dancer compendium entries with newer automation

d61f584

Set the floor for the result after all increments have been applied

dd723c5

Shourn self-requested a review February 23, 2025 20:22

Shourn requested changes Feb 23, 2025

View reviewed changes

Azurelol added 2 commits February 24, 2025 23:14

Address PR feedback

f40cea8

- Add new inline, @type that now supports damage - Redeisgn the damage type override fields - Cry a little

Update compendium entries (again)

50b4b1e

Azurelol requested a review from Shourn February 24, 2025 22:23

Fix user error

7b8efd9

Shourn approved these changes Feb 26, 2025

View reviewed changes

Shourn merged commit 64c4e05 into dev Feb 26, 2025

Azurelol linked an issue Mar 8, 2025 that may be closed by this pull request

Allow manual adjustment of turns per round #223

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Further damage model improvements and extras #229

Further damage model improvements and extras #229

Azurelol commented Feb 20, 2025 •

edited

Loading

Azurelol commented Feb 21, 2025

Shourn Feb 23, 2025

Azurelol Feb 24, 2025

Shourn Feb 23, 2025

Azurelol Feb 24, 2025

Shourn Feb 23, 2025

Azurelol Feb 24, 2025

Shourn Feb 23, 2025

Azurelol Feb 24, 2025

Shourn Feb 23, 2025

Azurelol Feb 24, 2025

Shourn Feb 23, 2025

Azurelol Feb 24, 2025

Azurelol Feb 24, 2025

Further damage model improvements and extras #229

Further damage model improvements and extras #229

Conversation

Azurelol commented Feb 20, 2025 • edited Loading

Azurelol commented Feb 21, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Azurelol commented Feb 20, 2025 •

edited

Loading