From e81b42c85bb792bd68597dc8612876402e69e655 Mon Sep 17 00:00:00 2001 From: Vlyan Date: Fri, 20 Aug 2021 13:25:30 +0200 Subject: [PATCH] Force 0 if range/damage/deadliness is null --- system/scripts/gm/gm-monitor.js | 2 +- system/scripts/item.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/system/scripts/gm/gm-monitor.js b/system/scripts/gm/gm-monitor.js index d76416b..b69bd66 100644 --- a/system/scripts/gm/gm-monitor.js +++ b/system/scripts/gm/gm-monitor.js @@ -267,7 +267,7 @@ export class GmMonitor extends FormApplication { const display = (e) => { return ( e.name + - ` ( ${e.data.data.range || 0}` + + ` ( ${e.data.data.range}` + ` / ${e.data.data.damage}` + ` / ${e.data.data.deadliness})` ); diff --git a/system/scripts/item.js b/system/scripts/item.js index 80416de..c055501 100644 --- a/system/scripts/item.js +++ b/system/scripts/item.js @@ -78,6 +78,13 @@ export class ItemL5r5e extends Item { this.addEmbedItem(item, { save: false, newId: false, addBonusToActor: false }); }); } + + // Sanitize some values + if (this.data.type === "weapon") { + this.data.data.range = this.data.data.range || 0; + this.data.data.damage = this.data.data.damage || 0; + this.data.data.deadliness = this.data.data.deadliness || 0; + } } // ***** parent ids management *****