mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-17 15:39:02 +01:00
Merge branch 'main' into feature/death-moves
This commit is contained in:
commit
a071626e43
5 changed files with 5 additions and 5 deletions
|
|
@ -240,7 +240,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
|
||||||
|
|
||||||
game.system.registeredTriggers.unregisterTriggers(triggersToRemove, this.parent.uuid);
|
game.system.registeredTriggers.unregisterTriggers(triggersToRemove, this.parent.uuid);
|
||||||
|
|
||||||
if (!(this.parent.parent.token instanceof game.system.api.documents.DhToken)) {
|
if (this.parent.parent && !(this.parent.parent.token instanceof game.system.api.documents.DhToken)) {
|
||||||
for (const token of this.parent.parent.getActiveTokens()) {
|
for (const token of this.parent.parent.getActiveTokens()) {
|
||||||
game.system.registeredTriggers.unregisterTriggers(
|
game.system.registeredTriggers.unregisterTriggers(
|
||||||
triggersToRemove,
|
triggersToRemove,
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ export default class RegisteredTriggers extends Map {
|
||||||
|
|
||||||
unregisterItemTriggers(items) {
|
unregisterItemTriggers(items) {
|
||||||
for (const item of items) {
|
for (const item of items) {
|
||||||
if (!item.system.actions.size) continue;
|
if (!item.system.actions?.size) continue;
|
||||||
|
|
||||||
const triggers = (item.system.actions ?? []).reduce((acc, action) => {
|
const triggers = (item.system.actions ?? []).reduce((acc, action) => {
|
||||||
acc.push(...action.triggers.map(x => x.trigger));
|
acc.push(...action.triggers.map(x => x.trigger));
|
||||||
|
|
|
||||||
|
|
@ -217,7 +217,7 @@ export default class DHItem extends foundry.documents.Item {
|
||||||
|
|
||||||
game.system.registeredTriggers.unregisterTriggers(triggerKeys, this.uuid);
|
game.system.registeredTriggers.unregisterTriggers(triggerKeys, this.uuid);
|
||||||
|
|
||||||
if (!(this.actor.parent instanceof game.system.api.documents.DhToken)) {
|
if (this.actor && !(this.actor.parent instanceof game.system.api.documents.DhToken)) {
|
||||||
for (const token of this.actor.getActiveTokens()) {
|
for (const token of this.actor.getActiveTokens()) {
|
||||||
game.system.registeredTriggers.unregisterTriggers(triggerKeys, `${token.document.uuid}.${this.uuid}`);
|
game.system.registeredTriggers.unregisterTriggers(triggerKeys, `${token.document.uuid}.${this.uuid}`);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@
|
||||||
"name": "Bold Presence",
|
"name": "Bold Presence",
|
||||||
"img": "icons/magic/holy/barrier-shield-winged-blue.webp",
|
"img": "icons/magic/holy/barrier-shield-winged-blue.webp",
|
||||||
"origin": "Compendium.daggerheart.domains.Item.tdsL00yTSLNgZWs6",
|
"origin": "Compendium.daggerheart.domains.Item.tdsL00yTSLNgZWs6",
|
||||||
"transfer": false,
|
"transfer": true,
|
||||||
"_id": "2XEYhuAcRGTtqvED",
|
"_id": "2XEYhuAcRGTtqvED",
|
||||||
"type": "base",
|
"type": "base",
|
||||||
"system": {
|
"system": {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"id": "daggerheart",
|
"id": "daggerheart",
|
||||||
"title": "Daggerheart",
|
"title": "Daggerheart",
|
||||||
"description": "An unofficial implementation of the Daggerheart system",
|
"description": "An unofficial implementation of the Daggerheart system",
|
||||||
"version": "1.5.2",
|
"version": "1.5.4",
|
||||||
"compatibility": {
|
"compatibility": {
|
||||||
"minimum": "13.346",
|
"minimum": "13.346",
|
||||||
"verified": "13.351",
|
"verified": "13.351",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue