cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-03-07 14:36:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed so edit/view/delete of potential adversary is handled if the adversary Actor has been removed from the world

Browse source
This commit is contained in:
WBHarry 2025-07-02 21:51:31 +02:00
parent 750282aeec
commit a314876b40
4 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lang/en.json
View file

@ -403,6 +403,9 @@
"label": "Event",
"description": ""
}
},
"Notifications": {
"AdversaryMissing": "The linked adversary doesn't exist in the world."
}
},
"Domains": {

19
module/applications/sheets/actors/environment.mjs
View file

@ -12,7 +12,6 @@ export default class DhpEnvironment extends DaggerheartSheet(ActorSheetV2) {
actions: {
addAdversary: this.addAdversary,
deleteProperty: this.deleteProperty,
viewAdversary: this.viewAdversary,
openSettings: this.openSettings,
useItem: this.useItem,
toChat: this.toChat
@ -103,14 +102,24 @@ export default class DhpEnvironment extends DaggerheartSheet(ActorSheetV2) {
this.render();
}
static async viewAdversary(_, button) {
const adversary = await foundry.utils.fromUuid(button.dataset.adversary);
async viewAdversary(_, button) {
const target = button.closest('[data-item-uuid]');
const adversary = await foundry.utils.fromUuid(target.dataset.itemUuid);
if (!adversary) {
ui.notifications.warn(game.i18n.localize('DAGGERHEART.Environment.Notifications.AdversaryMissing'));
return;
}
adversary.sheet.render(true);
}
static async useItem(event) {
static async useItem(event, button) {
const action = this.getAction(event);
action.use(event);
if (!action) {
await this.viewAdversary(event, button);
} else {
action.use(event);
}
}
static async toChat(event) {

9
module/applications/sheets/applications/environment-settings.mjs
View file

@ -181,13 +181,20 @@ export default class DHEnvironmentSettings extends HandlebarsApplicationMixin(Ap
static async #viewAdversary(_, button) {
const adversary = await foundry.utils.fromUuid(button.dataset.adversary);
if (!adversary) {
ui.notifications.warn(game.i18n.localize('DAGGERHEART.Environment.Notifications.AdversaryMissing'));
return;
}
adversary.sheet.render(true);
}
static async #deleteAdversary(event, target) {
const adversaryKey = target.dataset.adversary;
const path = `system.potentialAdversaries.${target.dataset.potentialAdversary}.adversaries`;
const newAdversaries = foundry.utils.getProperty(this.actor, path).filter(x => x.uuid !== adversaryKey);
const newAdversaries = foundry.utils
.getProperty(this.actor, path)
.filter(x => x && (x?.uuid ?? x) !== adversaryKey);
await this.actor.update({ [path]: newAdversaries });
this.render();
}

2
templates/sheets/global/partials/inventory-item.hbs
View file

@ -1,4 +1,4 @@
<li class="inventory-item" data-item-id="{{item.id}}" data-companion="{{companion}}">
<li class="inventory-item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-companion="{{companion}}">
<img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" data-action="useItem"/>
<div class="item-label">
<div class="item-name">{{item.name}}</div>