cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-12 11:41:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

164 - Add Hope/Fear formula

Browse source
This commit is contained in:
Dapoolp 2025-06-25 16:16:47 +02:00
parent aacaf516b2
commit 8423ab6776
9 changed files with 125 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/applications/config/Action.mjs
View file

@ -67,6 +67,8 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
context.getRealIndex = this.getRealIndex.bind(this);
context.disableOption = this.disableOption.bind(this);
context.isNPC = this.action.actor && this.action.actor.type !== 'character';
context.hasRoll = this.action.hasRoll();
console.log(context)
return context;
}

3
module/applications/costSelectionDialog.mjs
View file

@ -42,13 +42,12 @@ export default class CostSelectionDialog extends HandlebarsApplicationMixin(Appl
}
async _prepareContext(_options) {
console.log(this.costs);
const updatedCosts = this.action.calcCosts(this.costs),
updatedUses = this.action.calcUses(this.uses);
return {
costs: updatedCosts,
uses: updatedUses,
canUse: this.action.getRealCosts(updatedCosts)?.hasCost && this.action.hasUses(updatedUses)
canUse: this.action.hasCost(updatedCosts) && this.action.hasUses(updatedUses)
};
}

4
module/applications/roll.mjs
View file

@ -28,10 +28,6 @@ export class DHRoll extends Roll {
this.applyKeybindings(config);
// let roll;
// if(config.dialog?.configure === false) {
// roll = new this('', config.actor, config);
// } else {
if (config.dialog.configure !== false) {
// Open Roll Dialog
const DialogClass = config.dialog?.class ?? this.DefaultDialog;

51
module/data/action/action.mjs
View file

@ -129,7 +129,9 @@ export class DHBaseAction extends foundry.abstract.DataModel {
initial: SYSTEM.GENERAL.healingTypes.hitPoints.id,
label: 'Healing'
}),
value: new fields.EmbeddedDataField(DHActionDiceData)
resultBased: new fields.BooleanField({ initial: false, label: "DAGGERHEART.Actions.Settings.ResultBased.label" }),
value: new fields.EmbeddedDataField(DHActionDiceData),
valueAlt: new fields.EmbeddedDataField(DHActionDiceData),
})
},
extraSchemas = {};
@ -228,7 +230,8 @@ export class DHBaseAction extends foundry.abstract.DataModel {
...config,
...(await this.getCost(config))
};
if (!this.hasRoll() && (!config.costs.hasCost || !this.hasUses(config.uses)))
if ((!this.hasRoll() || config.event.shiftKey) && (!this.hasCost(config.costs) || !this.hasUses(config.uses)))
return ui.notifications.warn("You don't have the resources to use that action.");
// Proceed with Roll
@ -245,7 +248,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
/* ROLL */
hasRoll() {
// return this.roll?.type && this.roll?.trait;
return this.roll?.type;
return !!this.roll?.type;
}
async proceedRoll(config) {
@ -269,9 +272,9 @@ export class DHBaseAction extends foundry.abstract.DataModel {
/* COST */
async getCost(config) {
let costs = this.cost?.length ? foundry.utils.deepClone(this.cost) : { values: [], hasCost: true };
let costs = this.cost?.length ? foundry.utils.deepClone(this.cost) : [];
let uses = this.getUses();
if (!config.event.shiftKey && !this.hasRoll()) {
if (!config.event.shiftKey && !this.hasRoll() && !(!costs.length && !uses)) {
const dialogClosed = new Promise((resolve, _) => {
new CostSelectionDialog(costs, uses, this, resolve).render(true);
});
@ -282,7 +285,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
getRealCosts(costs) {
const realCosts = costs?.length ? costs.filter(c => c.enabled) : [];
return { values: realCosts, hasCost: this.hasCost(realCosts) };
return realCosts;
}
calcCosts(costs) {
@ -296,7 +299,8 @@ export class DHBaseAction extends foundry.abstract.DataModel {
}
hasCost(costs) {
return costs.reduce((a, c) => a && this.actor.system.resources[c.type]?.value >= (c.total ?? c.value), true);
const realCosts = this.getRealCosts(costs);
return realCosts.reduce((a, c) => a && this.actor.system.resources[c.type]?.value >= (c.total ?? c.value), true);
}
async spendCost(config) {
@ -314,13 +318,14 @@ export class DHBaseAction extends foundry.abstract.DataModel {
}
getUses() {
if (!this.uses) return { hasUse: true };
if (!this.uses?.max) return null;
const uses = foundry.utils.deepClone(this.uses);
if (!uses.value) uses.value = 0;
return uses;
}
calcUses(uses) {
if(!uses) return null;
return {
...uses,
enabled: uses.hasOwnProperty('enabled') ? uses.enabled : true
@ -328,7 +333,8 @@ export class DHBaseAction extends foundry.abstract.DataModel {
}
hasUses(uses) {
return !uses.enabled || uses.value + 1 <= uses.max;
if(!uses) return true;
return (uses.hasOwnProperty('enabled') && !uses.enabled) || uses.value + 1 <= uses.max;
}
/* USES */
@ -430,8 +436,14 @@ export class DHDamageAction extends DHBaseAction {
return await this.rollDamage(event, config);
}
getFormulaValue(part, data) {
let formulaValue = part.value;
if(this.hasRoll() && part.resultBased && data.system.roll.result.duality === -1) return part.valueAlt;
return formulaValue;
}
async rollDamage(event, data) {
let formula = this.damage.parts.map(p => p.getFormula(this.actor)).join(' + ');
let formula = this.damage.parts.map(p => this.getFormulaValue(p, data).getFormula(this.actor)).join(' + ');
if (!formula || formula == '') return;
let roll = { formula: formula, total: formula },
@ -475,9 +487,11 @@ export class DHAttackAction extends DHDamageAction {
getParentDamage() {
return {
multiplier: 'proficiency',
dice: this.item?.system?.damage.value,
bonus: this.item?.system?.damage.bonus ?? 0,
value: {
multiplier: 'proficiency',
dice: this.item?.system?.damage.value,
bonus: this.item?.system?.damage.bonus ?? 0
},
type: this.item?.system?.damage.type,
base: true
};
@ -498,13 +512,20 @@ export class DHHealingAction extends DHBaseAction {
return await this.rollHealing(event, config);
}
getFormulaValue(data) {
let formulaValue = this.healing.value;
if(this.hasRoll() && this.healing.resultBased && data.system.roll.result.duality === -1) return this.healing.valueAlt;
return formulaValue;
}
async rollHealing(event, data) {
let formula = this.healing.value.getFormula(this.actor);
let formulaValue = this.getFormulaValue(data),
formula = formulaValue.getFormula(this.actor);
if (!formula || formula == '') return;
let roll = { formula: formula, total: formula },
bonusDamage = [];
const config = {
title: game.i18n.format('DAGGERHEART.Chat.HealingRoll.Title', {
healing: game.i18n.localize(SYSTEM.GENERAL.healingTypes[this.healing.type].label)

9
module/data/action/actionDice.mjs
View file

@ -40,11 +40,11 @@ export class DHDamageField extends fields.SchemaField {
}
}
export class DHDamageData extends DHActionDiceData {
export class DHDamageData extends foundry.abstract.DataModel {
/** @override */
static defineSchema() {
return {
...super.defineSchema(),
// ...super.defineSchema(),
base: new fields.BooleanField({ initial: false, readonly: true, label: 'Base' }),
type: new fields.StringField({
choices: SYSTEM.GENERAL.damageTypes,
@ -52,7 +52,10 @@ export class DHDamageData extends DHActionDiceData {
label: 'Type',
nullable: false,
required: true
})
}),
resultBased: new fields.BooleanField({ initial: false, label: "DAGGERHEART.Actions.Settings.ResultBased.label" }),
value: new fields.EmbeddedDataField(DHActionDiceData),
valueAlt: new fields.EmbeddedDataField(DHActionDiceData),
};
}
}

2
module/dialogs/d20RollDialog.mjs
View file

@ -61,7 +61,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
if (this.config.costs?.length) {
const updatedCosts = this.action.calcCosts(this.config.costs);
context.costs = updatedCosts;
context.canRoll = this.action.getRealCosts(updatedCosts)?.hasCost;
context.canRoll = this.action.hasCost(updatedCosts);
}
if (this.config.uses?.max) {
context.uses = this.action.calcUses(this.config.uses);