mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-12 03:31:07 +01:00
Feature/167 damage types and resistances (#330)
* Add Resistances * Relocate Damage Reduction * Damage Types * dmg type fallback * Actor getRollData * Remove comments
This commit is contained in:
parent
3f4c884974
commit
812a5e8dd7
24 changed files with 167 additions and 97 deletions
|
|
@ -987,6 +987,11 @@
|
||||||
"minor": "Minor",
|
"minor": "Minor",
|
||||||
"none": "None"
|
"none": "None"
|
||||||
},
|
},
|
||||||
|
"DamageResistance": {
|
||||||
|
"none": "None",
|
||||||
|
"resistance": "Resistance",
|
||||||
|
"immunity": "Immunity"
|
||||||
|
},
|
||||||
"DamageThresholds": {
|
"DamageThresholds": {
|
||||||
"title": "Damage Thresholds",
|
"title": "Damage Thresholds",
|
||||||
"minor": "Minor",
|
"minor": "Minor",
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
|
||||||
this.actor = actor;
|
this.actor = actor;
|
||||||
this.damage = damage;
|
this.damage = damage;
|
||||||
|
|
||||||
const canApplyArmor = actor.system.armorApplicableDamageTypes[damageType];
|
const canApplyArmor = damageType.every(t => actor.system.armorApplicableDamageTypes[t] === true);
|
||||||
const maxArmorMarks = canApplyArmor
|
const maxArmorMarks = canApplyArmor
|
||||||
? Math.min(
|
? Math.min(
|
||||||
actor.system.armorScore - actor.system.armor.system.marks.value,
|
actor.system.armorScore - actor.system.armor.system.marks.value,
|
||||||
|
|
|
||||||
|
|
@ -56,10 +56,6 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
|
||||||
id: 'effect',
|
id: 'effect',
|
||||||
template: 'systems/daggerheart/templates/sheets-settings/action-settings/effect.hbs'
|
template: 'systems/daggerheart/templates/sheets-settings/action-settings/effect.hbs'
|
||||||
}
|
}
|
||||||
/* form: {
|
|
||||||
id: 'action',
|
|
||||||
template: 'systems/daggerheart/templates/config/action.hbs'
|
|
||||||
} */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static TABS = {
|
static TABS = {
|
||||||
|
|
@ -161,7 +157,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
|
||||||
container = foundry.utils.getProperty(this.action.parent, this.action.systemPath);
|
container = foundry.utils.getProperty(this.action.parent, this.action.systemPath);
|
||||||
let newActions;
|
let newActions;
|
||||||
if (Array.isArray(container)) {
|
if (Array.isArray(container)) {
|
||||||
newActions = foundry.utils.getProperty(this.action.parent, this.action.systemPath).map(x => x.toObject()); // Find better way
|
newActions = foundry.utils.getProperty(this.action.parent, this.action.systemPath).map(x => x.toObject());
|
||||||
if (!newActions.findSplice(x => x._id === data._id, data)) newActions.push(data);
|
if (!newActions.findSplice(x => x._id === data._id, data)) newActions.push(data);
|
||||||
} else newActions = data;
|
} else newActions = data;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -215,7 +215,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
|
||||||
if (message.system.onSave && message.system.targets.find(t => t.id === target.id)?.saved?.success === true)
|
if (message.system.onSave && message.system.targets.find(t => t.id === target.id)?.saved?.success === true)
|
||||||
damage = Math.ceil(damage * (CONFIG.DH.ACTIONS.damageOnSave[message.system.onSave]?.mod ?? 1));
|
damage = Math.ceil(damage * (CONFIG.DH.ACTIONS.damageOnSave[message.system.onSave]?.mod ?? 1));
|
||||||
|
|
||||||
target.actor.takeDamage(damage, message.system.roll.type);
|
target.actor.takeDamage(damage, message.system.damage.damageType);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -59,13 +59,13 @@ export const damageTypes = {
|
||||||
id: 'physical',
|
id: 'physical',
|
||||||
label: 'DAGGERHEART.CONFIG.DamageType.physical.name',
|
label: 'DAGGERHEART.CONFIG.DamageType.physical.name',
|
||||||
abbreviation: 'DAGGERHEART.CONFIG.DamageType.physical.abbreviation',
|
abbreviation: 'DAGGERHEART.CONFIG.DamageType.physical.abbreviation',
|
||||||
icon: ['fa-hand-fist']
|
icon: 'fa-hand-fist'
|
||||||
},
|
},
|
||||||
magical: {
|
magical: {
|
||||||
id: 'magical',
|
id: 'magical',
|
||||||
label: 'DAGGERHEART.CONFIG.DamageType.magical.name',
|
label: 'DAGGERHEART.CONFIG.DamageType.magical.name',
|
||||||
abbreviation: 'DAGGERHEART.CONFIG.DamageType.magical.abbreviation',
|
abbreviation: 'DAGGERHEART.CONFIG.DamageType.magical.abbreviation',
|
||||||
icon: ['fa-wand-sparkles']
|
icon: 'fa-wand-sparkles'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -395,7 +395,7 @@ export const armorFeatures = {
|
||||||
img: 'icons/magic/defensive/barrier-shield-dome-pink.webp',
|
img: 'icons/magic/defensive/barrier-shield-dome-pink.webp',
|
||||||
changes: [
|
changes: [
|
||||||
{
|
{
|
||||||
key: 'system.bonuses.damageReduction.magical',
|
key: 'system.resistance.magical.reduction',
|
||||||
mode: 2,
|
mode: 2,
|
||||||
value: '@system.armorScore'
|
value: '@system.armorScore'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,11 +76,7 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
getFormula(actor) {
|
getFormula() {
|
||||||
/* const multiplier = this.multiplier === 'flat' ? this.flatMultiplier : actor.system[this.multiplier]?.total;
|
|
||||||
return this.custom.enabled
|
|
||||||
? this.custom.formula
|
|
||||||
: `${multiplier ?? 1}${this.dice}${this.bonus ? (this.bonus < 0 ? ` - ${Math.abs(this.bonus)}` : ` + ${this.bonus}`) : ''}`; */
|
|
||||||
const multiplier = this.multiplier === 'flat' ? this.flatMultiplier : `@${this.multiplier}`,
|
const multiplier = this.multiplier === 'flat' ? this.flatMultiplier : `@${this.multiplier}`,
|
||||||
bonus = this.bonus ? (this.bonus < 0 ? ` - ${Math.abs(this.bonus)}` : ` + ${this.bonus}`) : '';
|
bonus = this.bonus ? (this.bonus < 0 ? ` - ${Math.abs(this.bonus)}` : ` + ${this.bonus}`) : '';
|
||||||
return this.custom.enabled ? this.custom.formula : `${multiplier ?? 1}${this.dice}${bonus}`;
|
return this.custom.enabled ? this.custom.formula : `${multiplier ?? 1}${this.dice}${bonus}`;
|
||||||
|
|
@ -93,7 +89,6 @@ export class DHDamageField extends fields.SchemaField {
|
||||||
parts: new fields.ArrayField(new fields.EmbeddedDataField(DHDamageData)),
|
parts: new fields.ArrayField(new fields.EmbeddedDataField(DHDamageData)),
|
||||||
includeBase: new fields.BooleanField({ initial: false })
|
includeBase: new fields.BooleanField({ initial: false })
|
||||||
};
|
};
|
||||||
// if (hasBase) damageFields.includeBase = new fields.BooleanField({ initial: true });
|
|
||||||
super(damageFields, options, context);
|
super(damageFields, options, context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -102,15 +97,19 @@ export class DHDamageData extends foundry.abstract.DataModel {
|
||||||
/** @override */
|
/** @override */
|
||||||
static defineSchema() {
|
static defineSchema() {
|
||||||
return {
|
return {
|
||||||
// ...super.defineSchema(),
|
|
||||||
base: new fields.BooleanField({ initial: false, readonly: true, label: 'Base' }),
|
base: new fields.BooleanField({ initial: false, readonly: true, label: 'Base' }),
|
||||||
type: new fields.StringField({
|
type: new fields.SetField(
|
||||||
choices: CONFIG.DH.GENERAL.damageTypes,
|
new fields.StringField({
|
||||||
initial: 'physical',
|
choices: CONFIG.DH.GENERAL.damageTypes,
|
||||||
label: 'Type',
|
initial: 'physical',
|
||||||
nullable: false,
|
nullable: false,
|
||||||
required: true
|
required: true
|
||||||
}),
|
}),
|
||||||
|
{
|
||||||
|
label: 'Type',
|
||||||
|
initial: 'physical',
|
||||||
|
}
|
||||||
|
),
|
||||||
resultBased: new fields.BooleanField({
|
resultBased: new fields.BooleanField({
|
||||||
initial: false,
|
initial: false,
|
||||||
label: 'DAGGERHEART.ACTIONS.Settings.resultBased.label'
|
label: 'DAGGERHEART.ACTIONS.Settings.resultBased.label'
|
||||||
|
|
|
||||||
|
|
@ -179,16 +179,9 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
|
||||||
getRollData(data = {}) {
|
getRollData(data = {}) {
|
||||||
const actorData = this.actor.getRollData(false);
|
const actorData = this.actor.getRollData(false);
|
||||||
|
|
||||||
// Remove when included directly in Actor getRollData
|
// Add Roll results to RollDatas
|
||||||
actorData.prof = actorData.proficiency?.total ?? 1;
|
|
||||||
actorData.cast = actorData.spellcast?.total ?? 1;
|
|
||||||
actorData.result = data.roll?.total ?? 1;
|
actorData.result = data.roll?.total ?? 1;
|
||||||
/* actorData.scale = data.costs?.length
|
|
||||||
? data.costs.reduce((a, c) => {
|
|
||||||
a[c.type] = c.value;
|
|
||||||
return a;
|
|
||||||
}, {})
|
|
||||||
: 1; */
|
|
||||||
actorData.scale = data.costs?.length // Right now only return the first scalable cost.
|
actorData.scale = data.costs?.length // Right now only return the first scalable cost.
|
||||||
? (data.costs.find(c => c.scalable)?.total ?? 1)
|
? (data.costs.find(c => c.scalable)?.total ?? 1)
|
||||||
: 1;
|
: 1;
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,10 @@ export default class DHDamageAction extends DHBaseAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
async rollDamage(event, data) {
|
async rollDamage(event, data) {
|
||||||
let formula = this.damage.parts.map(p => this.getFormulaValue(p, data).getFormula(this.actor)).join(' + ');
|
let formula = this.damage.parts.map(p => this.getFormulaValue(p, data).getFormula(this.actor)).join(' + '),
|
||||||
|
damageTypes = [...new Set(this.damage.parts.reduce((a,c) => a.concat([...c.type]), []))];
|
||||||
|
|
||||||
|
damageTypes = !damageTypes.length ? ['physical'] : damageTypes;
|
||||||
|
|
||||||
if (!formula || formula == '') return;
|
if (!formula || formula == '') return;
|
||||||
let roll = { formula: formula, total: formula },
|
let roll = { formula: formula, total: formula },
|
||||||
|
|
@ -25,6 +28,7 @@ export default class DHDamageAction extends DHBaseAction {
|
||||||
hasSave: this.hasSave,
|
hasSave: this.hasSave,
|
||||||
isCritical: data.system?.roll?.isCritical ?? false,
|
isCritical: data.system?.roll?.isCritical ?? false,
|
||||||
source: data.system?.source,
|
source: data.system?.source,
|
||||||
|
damageTypes,
|
||||||
event
|
event
|
||||||
};
|
};
|
||||||
if (this.hasSave) config.onSave = this.save.damageMod;
|
if (this.hasSave) config.onSave = this.save.damageMod;
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import BaseDataActor from './base.mjs';
|
||||||
const resourceField = () =>
|
const resourceField = () =>
|
||||||
new foundry.data.fields.SchemaField({
|
new foundry.data.fields.SchemaField({
|
||||||
value: new foundry.data.fields.NumberField({ initial: 0, integer: true }),
|
value: new foundry.data.fields.NumberField({ initial: 0, integer: true }),
|
||||||
|
bonus: new foundry.data.fields.NumberField({ initial: 0, integer: true }),
|
||||||
max: new foundry.data.fields.NumberField({ initial: 0, integer: true })
|
max: new foundry.data.fields.NumberField({ initial: 0, integer: true })
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -22,6 +23,7 @@ export default class DhpAdversary extends BaseDataActor {
|
||||||
static defineSchema() {
|
static defineSchema() {
|
||||||
const fields = foundry.data.fields;
|
const fields = foundry.data.fields;
|
||||||
return {
|
return {
|
||||||
|
...super.defineSchema(),
|
||||||
tier: new fields.StringField({
|
tier: new fields.StringField({
|
||||||
required: true,
|
required: true,
|
||||||
choices: CONFIG.DH.GENERAL.tiers,
|
choices: CONFIG.DH.GENERAL.tiers,
|
||||||
|
|
@ -32,7 +34,6 @@ export default class DhpAdversary extends BaseDataActor {
|
||||||
choices: CONFIG.DH.ACTOR.adversaryTypes,
|
choices: CONFIG.DH.ACTOR.adversaryTypes,
|
||||||
initial: CONFIG.DH.ACTOR.adversaryTypes.standard.id
|
initial: CONFIG.DH.ACTOR.adversaryTypes.standard.id
|
||||||
}),
|
}),
|
||||||
description: new fields.StringField(),
|
|
||||||
motivesAndTactics: new fields.StringField(),
|
motivesAndTactics: new fields.StringField(),
|
||||||
notes: new fields.HTMLField(),
|
notes: new fields.HTMLField(),
|
||||||
difficulty: new fields.NumberField({ required: true, initial: 1, integer: true }),
|
difficulty: new fields.NumberField({ required: true, initial: 1, integer: true }),
|
||||||
|
|
@ -63,6 +64,7 @@ export default class DhpAdversary extends BaseDataActor {
|
||||||
damage: {
|
damage: {
|
||||||
parts: [
|
parts: [
|
||||||
{
|
{
|
||||||
|
type: ['physical'],
|
||||||
value: {
|
value: {
|
||||||
multiplier: 'flat'
|
multiplier: 'flat'
|
||||||
}
|
}
|
||||||
|
|
@ -93,4 +95,9 @@ export default class DhpAdversary extends BaseDataActor {
|
||||||
get features() {
|
get features() {
|
||||||
return this.parent.items.filter(x => x.type === 'feature');
|
return this.parent.items.filter(x => x.type === 'feature');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
prepareDerivedData() {
|
||||||
|
this.resources.hitPoints.maxTotal = this.resources.hitPoints.max + this.resources.hitPoints.bonus;
|
||||||
|
this.resources.stress.maxTotal = this.resources.stress.max + this.resources.stress.bonus;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,12 @@
|
||||||
import DHBaseActorSettings from "../../applications/sheets/api/actor-setting.mjs";
|
import DHBaseActorSettings from "../../applications/sheets/api/actor-setting.mjs";
|
||||||
|
|
||||||
|
const resistanceField = () =>
|
||||||
|
new foundry.data.fields.SchemaField({
|
||||||
|
resistance: new foundry.data.fields.BooleanField({ initial: false }),
|
||||||
|
immunity: new foundry.data.fields.BooleanField({ initial: false }),
|
||||||
|
reduction: new foundry.data.fields.NumberField({ integer: true, initial: 0 })
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Describes metadata about the actor data model type
|
* Describes metadata about the actor data model type
|
||||||
* @typedef {Object} ActorDataModelMetadata
|
* @typedef {Object} ActorDataModelMetadata
|
||||||
|
|
@ -16,6 +23,7 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
|
||||||
type: 'base',
|
type: 'base',
|
||||||
isNPC: true,
|
isNPC: true,
|
||||||
settingSheet: null,
|
settingSheet: null,
|
||||||
|
hasResistances: true
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -27,10 +35,16 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
|
||||||
/** @inheritDoc */
|
/** @inheritDoc */
|
||||||
static defineSchema() {
|
static defineSchema() {
|
||||||
const fields = foundry.data.fields;
|
const fields = foundry.data.fields;
|
||||||
|
const schema = {};
|
||||||
|
|
||||||
return {
|
if(this.metadata.isNPC)
|
||||||
description: new fields.HTMLField({ required: true, nullable: true })
|
schema.description = new fields.HTMLField({ required: true, nullable: true });
|
||||||
};
|
if(this.metadata.hasResistances)
|
||||||
|
schema.resistance = new fields.SchemaField({
|
||||||
|
physical: resistanceField(),
|
||||||
|
magical: resistanceField()
|
||||||
|
})
|
||||||
|
return schema;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@ export default class DhCharacter extends BaseDataActor {
|
||||||
const fields = foundry.data.fields;
|
const fields = foundry.data.fields;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
...super.defineSchema(),
|
||||||
resources: new fields.SchemaField({
|
resources: new fields.SchemaField({
|
||||||
hitPoints: new fields.SchemaField({
|
hitPoints: new fields.SchemaField({
|
||||||
value: new foundry.data.fields.NumberField({ initial: 0, integer: true }),
|
value: new foundry.data.fields.NumberField({ initial: 0, integer: true }),
|
||||||
|
|
@ -100,10 +101,6 @@ export default class DhCharacter extends BaseDataActor {
|
||||||
levelData: new fields.EmbeddedDataField(DhLevelData),
|
levelData: new fields.EmbeddedDataField(DhLevelData),
|
||||||
bonuses: new fields.SchemaField({
|
bonuses: new fields.SchemaField({
|
||||||
armorScore: new fields.NumberField({ integer: true, initial: 0 }),
|
armorScore: new fields.NumberField({ integer: true, initial: 0 }),
|
||||||
damageReduction: new fields.SchemaField({
|
|
||||||
physical: new fields.NumberField({ integer: true, initial: 0 }),
|
|
||||||
magical: new fields.NumberField({ integer: true, initial: 0 })
|
|
||||||
}),
|
|
||||||
damageThresholds: new fields.SchemaField({
|
damageThresholds: new fields.SchemaField({
|
||||||
severe: new fields.NumberField({ integer: true, initial: 0 }),
|
severe: new fields.NumberField({ integer: true, initial: 0 }),
|
||||||
major: new fields.NumberField({ integer: true, initial: 0 })
|
major: new fields.NumberField({ integer: true, initial: 0 })
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ export default class DhCompanion extends BaseDataActor {
|
||||||
const fields = foundry.data.fields;
|
const fields = foundry.data.fields;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
...super.defineSchema(),
|
||||||
partner: new ForeignDocumentUUIDField({ type: 'Actor' }),
|
partner: new ForeignDocumentUUIDField({ type: 'Actor' }),
|
||||||
resources: new fields.SchemaField({
|
resources: new fields.SchemaField({
|
||||||
stress: new fields.SchemaField({
|
stress: new fields.SchemaField({
|
||||||
|
|
@ -66,6 +67,7 @@ export default class DhCompanion extends BaseDataActor {
|
||||||
damage: {
|
damage: {
|
||||||
parts: [
|
parts: [
|
||||||
{
|
{
|
||||||
|
type: ['physical'],
|
||||||
value: {
|
value: {
|
||||||
dice: 'd6',
|
dice: 'd6',
|
||||||
multiplier: 'prof'
|
multiplier: 'prof'
|
||||||
|
|
|
||||||
|
|
@ -9,20 +9,21 @@ export default class DhEnvironment extends BaseDataActor {
|
||||||
return foundry.utils.mergeObject(super.metadata, {
|
return foundry.utils.mergeObject(super.metadata, {
|
||||||
label: 'TYPES.Actor.environment',
|
label: 'TYPES.Actor.environment',
|
||||||
type: 'environment',
|
type: 'environment',
|
||||||
settingSheet: DHEnvironmentSettings
|
settingSheet: DHEnvironmentSettings,
|
||||||
|
hasResistances: false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
static defineSchema() {
|
static defineSchema() {
|
||||||
const fields = foundry.data.fields;
|
const fields = foundry.data.fields;
|
||||||
return {
|
return {
|
||||||
|
...super.defineSchema(),
|
||||||
tier: new fields.StringField({
|
tier: new fields.StringField({
|
||||||
required: true,
|
required: true,
|
||||||
choices: CONFIG.DH.GENERAL.tiers,
|
choices: CONFIG.DH.GENERAL.tiers,
|
||||||
initial: CONFIG.DH.GENERAL.tiers.tier1.id
|
initial: CONFIG.DH.GENERAL.tiers.tier1.id
|
||||||
}),
|
}),
|
||||||
type: new fields.StringField({ choices: CONFIG.DH.ACTOR.environmentTypes }),
|
type: new fields.StringField({ choices: CONFIG.DH.ACTOR.environmentTypes }),
|
||||||
description: new fields.StringField(),
|
|
||||||
impulses: new fields.StringField(),
|
impulses: new fields.StringField(),
|
||||||
difficulty: new fields.NumberField({ required: true, initial: 11, integer: true }),
|
difficulty: new fields.NumberField({ required: true, initial: 11, integer: true }),
|
||||||
potentialAdversaries: new fields.TypedObjectField(
|
potentialAdversaries: new fields.TypedObjectField(
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@ export default class DHWeapon extends BaseDataItem {
|
||||||
damage: {
|
damage: {
|
||||||
parts: [
|
parts: [
|
||||||
{
|
{
|
||||||
|
type: ['physical'],
|
||||||
value: {
|
value: {
|
||||||
multiplier: 'prof',
|
multiplier: 'prof',
|
||||||
dice: 'd8'
|
dice: 'd8'
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,10 @@ export default class DamageRoll extends DHRoll {
|
||||||
super.postEvaluate(roll, config);
|
super.postEvaluate(roll, config);
|
||||||
config.roll.type = config.type;
|
config.roll.type = config.type;
|
||||||
config.roll.modifierTotal = this.calculateTotalModifiers(roll);
|
config.roll.modifierTotal = this.calculateTotalModifiers(roll);
|
||||||
|
}
|
||||||
|
|
||||||
|
static async buildPost(roll, config, message) {
|
||||||
|
await super.buildPost(roll, config, message);
|
||||||
if (config.source?.message) {
|
if (config.source?.message) {
|
||||||
const chatMessage = ui.chat.collection.get(config.source.message);
|
const chatMessage = ui.chat.collection.get(config.source.message);
|
||||||
chatMessage.update({ 'system.damage': config });
|
chatMessage.update({ 'system.damage': config });
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,8 @@ export default class DHRoll extends Roll {
|
||||||
|
|
||||||
// Create Chat Message
|
// Create Chat Message
|
||||||
if (config.source?.message) {
|
if (config.source?.message) {
|
||||||
|
if(game.modules.get('dice-so-nice')?.active) await game.dice3d.showForRoll(roll, game.user, true);
|
||||||
} else {
|
} else {
|
||||||
const messageData = {};
|
|
||||||
config.message = await this.toMessage(roll, config);
|
config.message = await this.toMessage(roll, config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -370,7 +370,10 @@ export default class DhpActor extends Actor {
|
||||||
}
|
}
|
||||||
|
|
||||||
getRollData() {
|
getRollData() {
|
||||||
return this.system;
|
const rollData = super.getRollData();
|
||||||
|
rollData.prof = this.system.proficiency?.total ?? 1;
|
||||||
|
rollData.cast = this.system.spellcast?.total ?? 1;
|
||||||
|
return rollData;
|
||||||
}
|
}
|
||||||
|
|
||||||
formatRollModifier(roll) {
|
formatRollModifier(roll) {
|
||||||
|
|
@ -462,7 +465,7 @@ export default class DhpActor extends Actor {
|
||||||
const canUseArmor =
|
const canUseArmor =
|
||||||
this.system.armor &&
|
this.system.armor &&
|
||||||
this.system.armor.system.marks.value < this.system.armorScore &&
|
this.system.armor.system.marks.value < this.system.armorScore &&
|
||||||
this.system.armorApplicableDamageTypes[type];
|
type.every(t => this.system.armorApplicableDamageTypes[t] === true);
|
||||||
const canUseStress = Object.keys(this.system.rules.damageReduction.stressDamageReduction).reduce((acc, x) => {
|
const canUseStress = Object.keys(this.system.rules.damageReduction.stressDamageReduction).reduce((acc, x) => {
|
||||||
const rule = this.system.rules.damageReduction.stressDamageReduction[x];
|
const rule = this.system.rules.damageReduction.stressDamageReduction[x];
|
||||||
if (damageKeyToNumber(x) <= hpDamage) return acc || (rule.enabled && availableStress >= rule.cost);
|
if (damageKeyToNumber(x) <= hpDamage) return acc || (rule.enabled && availableStress >= rule.cost);
|
||||||
|
|
@ -480,11 +483,9 @@ export default class DhpActor extends Actor {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const flatReduction = this.system.bonuses.damageReduction[type];
|
type = !Array.isArray(type) ? [type] : type;
|
||||||
const damage = Math.max(baseDamage - (flatReduction ?? 0), 0);
|
|
||||||
const hpDamage = this.convertDamageToThreshold(damage);
|
|
||||||
|
|
||||||
if (Hooks.call(`${CONFIG.DH.id}.postDamageTreshold`, this, hpDamage, damage, type) === false) return null;
|
const hpDamage = this.calculateDamage(baseDamage, type);
|
||||||
|
|
||||||
if (!hpDamage) return;
|
if (!hpDamage) return;
|
||||||
|
|
||||||
|
|
@ -511,6 +512,35 @@ export default class DhpActor extends Actor {
|
||||||
if (Hooks.call(`${CONFIG.DH.id}.postTakeDamage`, this, damage, type) === false) return null;
|
if (Hooks.call(`${CONFIG.DH.id}.postTakeDamage`, this, damage, type) === false) return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
calculateDamage(baseDamage, type) {
|
||||||
|
if (Hooks.call(`${CONFIG.DH.id}.preCalculateDamage`, this, baseDamage, type) === false) return null;
|
||||||
|
|
||||||
|
/* if(this.system.resistance[type]?.immunity) return 0;
|
||||||
|
if(this.system.resistance[type]?.resistance) baseDamage = Math.ceil(baseDamage / 2); */
|
||||||
|
if(this.canResist(type, 'immunity')) return 0;
|
||||||
|
if(this.canResist(type, 'resistance')) baseDamage = Math.ceil(baseDamage / 2);
|
||||||
|
|
||||||
|
// const flatReduction = this.system.resistance[type].reduction;
|
||||||
|
const flatReduction = this.getDamageTypeReduction(type);
|
||||||
|
const damage = Math.max(baseDamage - (flatReduction ?? 0), 0);
|
||||||
|
const hpDamage = this.convertDamageToThreshold(damage);
|
||||||
|
|
||||||
|
if (Hooks.call(`${CONFIG.DH.id}.postCalculateDamage`, this, baseDamage, type) === false) return null;
|
||||||
|
|
||||||
|
return hpDamage;
|
||||||
|
}
|
||||||
|
|
||||||
|
canResist(type, resistance) {
|
||||||
|
if(!type) return 0;
|
||||||
|
return type.every(t => this.system.resistance[t]?.[resistance] === true);
|
||||||
|
}
|
||||||
|
|
||||||
|
getDamageTypeReduction(type) {
|
||||||
|
if(!type) return 0;
|
||||||
|
const reduction = Object.entries(this.system.resistance).reduce((a, [index, value]) => type.includes(index) ? Math.min(value.reduction, a) : a, Infinity);
|
||||||
|
return reduction === Infinity ? 0 : reduction;
|
||||||
|
}
|
||||||
|
|
||||||
async takeHealing(resources) {
|
async takeHealing(resources) {
|
||||||
resources.forEach(r => (r.value *= -1));
|
resources.forEach(r => (r.value *= -1));
|
||||||
await this.modifyResource(resources);
|
await this.modifyResource(resources);
|
||||||
|
|
@ -553,18 +583,6 @@ export default class DhpActor extends Actor {
|
||||||
u.resources,
|
u.resources,
|
||||||
u.target.uuid
|
u.target.uuid
|
||||||
);
|
);
|
||||||
/* if (game.user.isGM) {
|
|
||||||
await u.target.update(u.resources);
|
|
||||||
} else {
|
|
||||||
await game.socket.emit(`system.${CONFIG.DH.id}`, {
|
|
||||||
action: socketEvent.GMUpdate,
|
|
||||||
data: {
|
|
||||||
action: GMUpdateEvent.UpdateDocument,
|
|
||||||
uuid: u.target.uuid,
|
|
||||||
update: u.resources
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} */
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -236,16 +236,7 @@ Roll.replaceFormulaData = function (formula, data = {}, { missing, warn = false
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getDamageKey = damage => {
|
export const getDamageKey = damage => {
|
||||||
switch (damage) {
|
return ['none', 'minor', 'major', 'severe'][damage];
|
||||||
case 3:
|
|
||||||
return 'severe';
|
|
||||||
case 2:
|
|
||||||
return 'major';
|
|
||||||
case 1:
|
|
||||||
return 'minor';
|
|
||||||
case 0:
|
|
||||||
return 'none';
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getDamageLabel = damage => {
|
export const getDamageLabel = damage => {
|
||||||
|
|
@ -253,16 +244,12 @@ export const getDamageLabel = damage => {
|
||||||
};
|
};
|
||||||
|
|
||||||
export const damageKeyToNumber = key => {
|
export const damageKeyToNumber = key => {
|
||||||
switch (key) {
|
return {
|
||||||
case 'severe':
|
'none': 0,
|
||||||
return 3;
|
'minor': 1,
|
||||||
case 'major':
|
'major': 2,
|
||||||
return 2;
|
'severe': 3
|
||||||
case 'minor':
|
}[key];
|
||||||
return 1;
|
|
||||||
case 'none':
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function constructHTMLButton({
|
export default function constructHTMLButton({
|
||||||
|
|
|
||||||
|
|
@ -104,6 +104,40 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
multi-select {
|
||||||
|
position: relative;
|
||||||
|
height: 34px;
|
||||||
|
.tags {
|
||||||
|
justify-content: flex-start;
|
||||||
|
margin: 5px;
|
||||||
|
height: inherit;
|
||||||
|
.tag {
|
||||||
|
box-shadow: 0 0 0 1.1em #E5E5E5 inset;
|
||||||
|
vertical-align: top;
|
||||||
|
box-sizing: border-box;
|
||||||
|
max-width: 100%;
|
||||||
|
padding: 0.3em 0 0.3em 0.5em;
|
||||||
|
color: black;
|
||||||
|
border-radius: 3px;
|
||||||
|
white-space: nowrap;
|
||||||
|
transition: .13s ease-out;
|
||||||
|
height: 22px;
|
||||||
|
font-size: .9rem;
|
||||||
|
gap: 0.5em;
|
||||||
|
z-index: 1;
|
||||||
|
.remove {
|
||||||
|
font-size: 10px;
|
||||||
|
margin-inline: auto 4.6666666667px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
position: absolute;
|
||||||
|
height: inherit;
|
||||||
|
outline: initial;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
p {
|
p {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,12 +10,12 @@
|
||||||
<div class='status-value'>
|
<div class='status-value'>
|
||||||
<p><input class="bar-input" name="system.resources.hitPoints.value" value="{{source.system.resources.hitPoints.value}}" type="number"></p>
|
<p><input class="bar-input" name="system.resources.hitPoints.value" value="{{source.system.resources.hitPoints.value}}" type="number"></p>
|
||||||
<p>/</p>
|
<p>/</p>
|
||||||
<p class="bar-label">{{source.system.resources.hitPoints.max}}</p>
|
<p class="bar-label">{{source.system.resources.hitPoints.maxTotal}}</p>
|
||||||
</div>
|
</div>
|
||||||
<progress
|
<progress
|
||||||
class='progress-bar'
|
class='progress-bar'
|
||||||
value='{{source.system.resources.hitPoints.value}}'
|
value='{{source.system.resources.hitPoints.value}}'
|
||||||
max='{{source.system.resources.hitPoints.max}}'
|
max='{{source.system.resources.hitPoints.maxTotal}}'
|
||||||
></progress>
|
></progress>
|
||||||
<div class="status-label">
|
<div class="status-label">
|
||||||
<h4>HP</h4>
|
<h4>HP</h4>
|
||||||
|
|
@ -26,12 +26,12 @@
|
||||||
<div class='status-value'>
|
<div class='status-value'>
|
||||||
<p><input class="bar-input" name="system.resources.stress.value" value="{{source.system.resources.stress.value}}" type="number"></p>
|
<p><input class="bar-input" name="system.resources.stress.value" value="{{source.system.resources.stress.value}}" type="number"></p>
|
||||||
<p>/</p>
|
<p>/</p>
|
||||||
<p class="bar-label">{{source.system.resources.stress.max}}</p>
|
<p class="bar-label">{{source.system.resources.stress.maxTotal}}</p>
|
||||||
</div>
|
</div>
|
||||||
<progress
|
<progress
|
||||||
class='progress-bar stress-color'
|
class='progress-bar stress-color'
|
||||||
value='{{source.system.resources.stress.value}}'
|
value='{{source.system.resources.stress.value}}'
|
||||||
max='{{source.system.resources.stress.max}}'
|
max='{{source.system.resources.stress.maxTotal}}'
|
||||||
></progress>
|
></progress>
|
||||||
<div class="status-label">
|
<div class="status-label">
|
||||||
<h4>Stress</h4>
|
<h4>Stress</h4>
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,11 @@
|
||||||
<span> - </span>
|
<span> - </span>
|
||||||
{{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
|
{{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
|
||||||
{{!-- ({{localize (concat 'DAGGERHEART.CONFIG.DamageType.' item.system.attack.damage.parts.0.type '.abbreviation')}}) --}}
|
{{!-- ({{localize (concat 'DAGGERHEART.CONFIG.DamageType.' item.system.attack.damage.parts.0.type '.abbreviation')}}) --}}
|
||||||
{{#with (lookup @root.config.GENERAL.damageTypes item.system.attack.damage.parts.0.type)}}
|
{{#each item.system.attack.damage.parts.0.type as | type | }}
|
||||||
{{#each icon}}
|
{{#with (lookup @root.config.GENERAL.damageTypes type)}}
|
||||||
<i class="fa-solid {{this}}"></i>
|
<i class="fa-solid {{icon}}"></i>
|
||||||
{{/each}}
|
{{/with}}
|
||||||
{{/with}}
|
{{/each}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
|
|
@ -32,7 +32,11 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="tag">
|
<div class="tag">
|
||||||
{{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
|
{{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
|
||||||
({{localize (concat 'DAGGERHEART.CONFIG.DamageType.' item.system.attack.damage.parts.0.type '.abbreviation')}})
|
(
|
||||||
|
{{#each item.system.attack.damage.parts.0.type}}
|
||||||
|
{{localize (concat 'DAGGERHEART.CONFIG.DamageType.' this '.abbreviation')}}
|
||||||
|
{{/each}}
|
||||||
|
)
|
||||||
</div>
|
</div>
|
||||||
<div class="tag">
|
<div class="tag">
|
||||||
{{localize (concat 'DAGGERHEART.CONFIG.Burden.' item.system.burden)}}
|
{{localize (concat 'DAGGERHEART.CONFIG.Burden.' item.system.burden)}}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,11 @@
|
||||||
{{localize (concat 'DAGGERHEART.CONFIG.Range.' source.system.attack.range '.name')}}
|
{{localize (concat 'DAGGERHEART.CONFIG.Range.' source.system.attack.range '.name')}}
|
||||||
<span>-</span>
|
<span>-</span>
|
||||||
{{source.system.attack.damage.parts.0.value.dice}}{{#if source.system.attack.damage.parts.0.value.bonus}} + {{source.system.attack.damage.parts.0.value.bonus}}{{/if}}
|
{{source.system.attack.damage.parts.0.value.dice}}{{#if source.system.attack.damage.parts.0.value.bonus}} + {{source.system.attack.damage.parts.0.value.bonus}}{{/if}}
|
||||||
({{localize (concat 'DAGGERHEART.CONFIG.DamageType.' source.system.attack.damage.parts.0.type '.abbreviation')}})
|
(
|
||||||
|
{{#each source.system.attack.damage.parts.0.type}}
|
||||||
|
{{localize (concat 'DAGGERHEART.CONFIG.DamageType.' this '.abbreviation')}}
|
||||||
|
{{/each}}
|
||||||
|
)
|
||||||
<span>-</span>
|
<span>-</span>
|
||||||
{{localize (concat 'DAGGERHEART.CONFIG.Burden.' source.system.burden)}}
|
{{localize (concat 'DAGGERHEART.CONFIG.Burden.' source.system.burden)}}
|
||||||
</h3>
|
</h3>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue