cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 23:49:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into feature/death-moves

Browse source
This commit is contained in:
Chris Ryan 2026-01-16 20:30:05 +10:00
commit 6ea09551fe
19 changed files with 49 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/applications/sheets/actors/character.mjs
View file

@ -712,7 +712,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
headerTitle: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
ability: abilityLabel
}),
effects: Array.from(await this.document.allApplicableEffects()),
effects: await game.system.api.data.actions.actionsTypes.base.getEffects(this.document),
roll: {
trait: button.dataset.attribute,
type: 'trait'

5
module/applications/sheets/api/application-mixin.mjs
View file

@ -505,7 +505,10 @@ export default function DHApplicationMixin(Base) {
const doc = await getDocFromElement(target),
action = doc?.system?.attack ?? doc;
const config = action.prepareConfig(event);
config.effects = Array.from(await this.document.allApplicableEffects());
config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(
this.document,
doc
);
config.hasRoll = false;
return action && action.workflow.get('damage').execute(config, null, true);
}

28
module/data/action/baseAction.mjs
View file

@ -198,7 +198,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
let config = this.prepareConfig(event);
if (!config) return;
await this.addEffects(config);
config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(this.actor, this.item);
if (Hooks.call(`${CONFIG.DH.id}.preUseAction`, this, config) === false) return;
@ -266,14 +266,26 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
return config;
}
/** */
async addEffects(config) {
let effects = [];
if (this.actor) {
effects = Array.from(await this.actor.allApplicableEffects());
}
/**
* Get the all potentially applicable effects on the actor
* @param {DHActor} actor The actor performing the action
* @param {DHItem|DhActor} effectParent The parent of the effect
* @returns {DhActiveEffect[]}
*/
static async getEffects(actor, effectParent) {
if (!actor) return [];
config.effects = effects;
return Array.from(await actor.allApplicableEffects()).filter(effect => {
/* Effects on weapons only ever apply for the weapon itself */
if (effect.parent.type === 'weapon') {
/* Unless they're secondary - then they apply only to other primary weapons */
if (effect.parent.system.secondary) {
if (effectParent?.type !== 'weapon' || effectParent?.system.secondary) return false;
} else if (effectParent?.id !== effect.parent.id) return false;
}
return !effect.isSuppressed;
});
}
/**

15
module/documents/chatMessage.mjs
View file

@ -167,7 +167,9 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
const config = foundry.utils.deepClone(this.system);
config.event = event;
if (this.system.action) {
await this.system.action.addEffects(config);
const actor = await foundry.utils.fromUuid(config.source.actor);
const item = actor?.items.get(config.source.item) ?? null;
config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(actor, item);
await this.system.action.workflow.get('damage')?.execute(config, this._id, true);
}
@ -201,7 +203,16 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelectedOrPerm'));
this.consumeOnSuccess();
this.system.action?.workflow.get('applyDamage')?.execute(config, targets, true);
if (this.system.action) this.system.action.workflow.get('applyDamage')?.execute(config, targets, true);
else {
for (const target of targets) {
const actor = await foundry.utils.fromUuid(target.actorId);
if (!actor) continue;
if (this.system.hasHealing) actor.takeHealing(this.system.damage);
else actor.takeDamage(this.system.damage);
}
}
}
async onRollSave(event) {

13
src/packs/items/weapons/weapon_Advanced_Greatstaff_4UzxqfkwF8gDSdu7.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "sGVVxSM68Fmr1sSM",
"type": "base",
"system": {},

10
src/packs/items/weapons/weapon_Advanced_Greatsword_MAC6YWTo4lzSotQc.json
View file

@ -118,16 +118,6 @@
"key": "system.evasion",
"mode": 2,
"value": "-1"
},
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"_id": "E0PjC15OP55vIype",

13
src/packs/items/weapons/weapon_Double_Flail_xm1yU7k58fMgXxRR.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "DCie5eR1dZH2Qvln",
"type": "base",
"system": {},

13
src/packs/items/weapons/weapon_Elder_Bow_JdWcn9W1edhAEInL.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "sZ1XotFlGdkPPDG4",
"type": "base",
"system": {},

13
src/packs/items/weapons/weapon_Floating_Bladeshards_3vti3xfo0wJND7ew.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "T831j6kZiMnpMNmv",
"type": "base",
"system": {},

13
src/packs/items/weapons/weapon_Gilded_Falchion_VwcOgqnzjf9LBj2S.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "ir4iKLIQ4CH1Qckn",
"type": "base",
"system": {},

13
src/packs/items/weapons/weapon_Greatbow_MXBpbqQsZFln4rZk.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "K4VgrDjVj1U1m9Ie",
"type": "base",
"system": {},

13
src/packs/items/weapons/weapon_Greatstaff_Yk8pTEmyLLi4095S.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "904orawScurM9GjG",
"type": "base",
"system": {},

10
src/packs/items/weapons/weapon_Greatsword_70ysaFJDREwTgvZa.json
View file

@ -118,16 +118,6 @@
"key": "system.evasion",
"mode": 2,
"value": "-1"
},
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"_id": "cffkpiwGpEGhjiUC",

13
src/packs/items/weapons/weapon_Improved_Greatstaff_LCuTrYXi4lhg6LqW.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "hnayB09P25ZW3gVY",
"type": "base",
"system": {},

10
src/packs/items/weapons/weapon_Improved_Greatsword_FPX4ouDrxXiQ5MDf.json
View file

@ -118,16 +118,6 @@
"key": "system.evasion",
"mode": 2,
"value": "-1"
},
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"_id": "2nl35v8sPAudiOIb",

13
src/packs/items/weapons/weapon_Legendary_Greatstaff_jDtvEabkHY1GFgfc.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "OV1Ly7vX4owBUgLQ",
"type": "base",
"system": {},

10
src/packs/items/weapons/weapon_Legendary_Greatsword_zMZ46F9VR7zdTxb9.json
View file

@ -118,16 +118,6 @@
"key": "system.evasion",
"mode": 2,
"value": "-1"
},
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"_id": "oRCiXSElN5xufUfn",

13
src/packs/items/weapons/weapon_Mage_Orb_XKBmBUEoGLdLcuqQ.json
View file

@ -113,18 +113,7 @@
"name": "Powerful",
"description": "On a successful attack, roll an additional damage die and discard the lowest result.",
"img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
"changes": [
{
"key": "system.bonuses.damage.primaryWeapon.extraDice",
"mode": 2,
"value": "1"
},
{
"key": "system.rules.weapon.dropLowestDamageDice",
"mode": 5,
"value": "1"
}
],
"changes": [],
"_id": "2J6vzNUel78JFypp",
"type": "base",
"system": {},

2
system.json
View file

@ -2,7 +2,7 @@
"id": "daggerheart",
"title": "Daggerheart",
"description": "An unofficial implementation of the Daggerheart system",
"version": "1.5.1",
"version": "1.5.2",
"compatibility": {
"minimum": "13.346",
"verified": "13.351",