Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor the damage and resource pipelines #189

Merged
merged 20 commits into from
Jan 2, 2025
Merged

Refactor the damage and resource pipelines #189

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e7196cb
Refactor the damage pipeline
Azurelol Dec 25, 2024
f210b92
Refactor the resource pipelines
Azurelol Dec 25, 2024
f2c5e19
Clean up the usage of the event hook for damage pipeline
Azurelol Dec 25, 2024
0cf7534
Compose the default pipeline steps
Azurelol Dec 25, 2024
af3a1b4
Use a different function for resolving the affinity
Azurelol Dec 25, 2024
39ad40a
Forgot to remove the eval that was added to the step
Azurelol Dec 25, 2024
36f80dd
Update the damage bonuses data model
Azurelol Dec 26, 2024
ae83659
Add support for modifier by damage type
Azurelol Dec 26, 2024
ee3a9f6
Add support for flags for edge cases like zero shield
Azurelol Dec 27, 2024
1e2ba11
Remove comments, deprecate callback
Azurelol Dec 27, 2024
3ace982
Use a more generic flag to implement zero shield
Azurelol Dec 27, 2024
128051e
Need to account for untyped (which wouldnt have a bonus) here
Azurelol Dec 27, 2024
8619a8b
Add the damage pipeline legacy hooks once again
Azurelol Dec 28, 2024
22c0c9e
Use a list of bonuses/modifiers for the damage, remove click modifier…
Azurelol Dec 28, 2024
744aa3b
Improve the language on the hooks a bit
Azurelol Dec 29, 2024
61ab60b
Add a tooltip breakdown for damage applied
Azurelol Dec 29, 2024
eea63e4
Address feedback
Azurelol Dec 30, 2024
3d79892
Connect the legacy hooks properly
Azurelol Dec 31, 2024
41620af
Update the hook values
Azurelol Dec 31, 2024
229e394
Add missing localization for choose weapon dialog, check mainhand isn…
Azurelol Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions module/documents/actors/common/bonuses-data-model.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { DamageBonusesDataModel } from './damage-bonuses-data-model.mjs';
* @property {number} outgoingRecovery.mp
* @property {number} outgoingRecovery.ip
* @property {AccuracyBonusesDataModel} accuracy
* @property {DamageBonusesDataModel} incomingDamage
* @property {DamageBonusesDataModel} damage
*/
export class BonusesDataModel extends foundry.abstract.DataModel {
Expand All @@ -28,6 +29,7 @@ export class BonusesDataModel extends foundry.abstract.DataModel {
ip: new NumberField({ initial: 0, integer: true }),
}),
accuracy: new EmbeddedDataField(AccuracyBonusesDataModel, {}),
incomingDamage: new EmbeddedDataField(DamageBonusesDataModel, {}),
damage: new EmbeddedDataField(DamageBonusesDataModel, {}),
};
}
Expand Down
23 changes: 23 additions & 0 deletions module/documents/actors/common/damage-bonuses-data-model.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* @property {number} all
* @property {number} melee
* @property {number} ranged
* @property {number} spell
Expand All @@ -12,14 +13,26 @@
* @property {number} spear
* @property {number} sword
* @property {number} thrown
* @property {number} physical
* @property {number} air
* @property {number} bolt
* @property {number} dark
* @property {number} earth
* @property {number} fire
* @property {number} ice
* @property {number} light
* @property {number} poison
*/
export class DamageBonusesDataModel extends foundry.abstract.DataModel {
static defineSchema() {
const { NumberField } = foundry.data.fields;
return {
all: new NumberField({ initial: 0, integer: true, nullable: false }),

melee: new NumberField({ initial: 0, integer: true, nullable: false }),
ranged: new NumberField({ initial: 0, integer: true, nullable: false }),
spell: new NumberField({ initial: 0, integer: true, nullable: false }),

arcane: new NumberField({ initial: 0, integer: true, nullable: false }),
bow: new NumberField({ initial: 0, integer: true, nullable: false }),
brawling: new NumberField({ initial: 0, integer: true, nullable: false }),
Expand All @@ -30,6 +43,16 @@ export class DamageBonusesDataModel extends foundry.abstract.DataModel {
spear: new NumberField({ initial: 0, integer: true, nullable: false }),
sword: new NumberField({ initial: 0, integer: true, nullable: false }),
thrown: new NumberField({ initial: 0, integer: true, nullable: false }),

physical: new NumberField({ initial: 0, integer: true, nullable: false }),
air: new NumberField({ initial: 0, integer: true, nullable: false }),
bolt: new NumberField({ initial: 0, integer: true, nullable: false }),
dark: new NumberField({ initial: 0, integer: true, nullable: false }),
earth: new NumberField({ initial: 0, integer: true, nullable: false }),
fire: new NumberField({ initial: 0, integer: true, nullable: false }),
ice: new NumberField({ initial: 0, integer: true, nullable: false }),
light: new NumberField({ initial: 0, integer: true, nullable: false }),
poison: new NumberField({ initial: 0, integer: true, nullable: false }),
};
}
}
316 changes: 0 additions & 316 deletions module/helpers/apply-damage.mjs
View file
Open in desktop

This file was deleted.

Loading