slaguru666/zero-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: weapon roll crash on NPC actors with embedded weapons

Browse Source 
NPC actors have flat attribute numbers (e.g. strength: 3) not objects
({value: 3}) and no system.skills object at all. Both _onWeaponRoll
and _onRoll were crashing when Group NPC-generated actors used their
attack buttons.

Fix:
- Read attributes via typeof check — flat number used directly,
  object uses .value — so NPC stat values are used correctly
- skills accessed via system.skills?.[skill] optional chaining so
  missing skills object returns 0 rather than throwing TypeError
This commit is contained in:
tevans
2026-06-03 17:57:41 +01:00
parent 5482acd2f9
commit 2713db753f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zero-engine.mjs
+8 -4
View File
@@ -1003,8 +1003,9 @@ class ZeroEngineActorSheet extends foundry.appv1.sheets.ActorSheet {
const skill = button.dataset.skill;
const attribute = button.dataset.attribute;
const skillValue = parseInt(this.actor.system.skills[skill]?.value) || 0;
const attributeValue = parseInt(this.actor.system.attributes[attribute]?.value) || 2;
const skillValue = parseInt(this.actor.system.skills?.[skill]?.value) || 0;
const rawAttrRoll = this.actor.system.attributes?.[attribute];
const attributeValue = (typeof rawAttrRoll === 'object' ? parseInt(rawAttrRoll?.value) : parseInt(rawAttrRoll)) || 2;
const armorMods = this._getArmorRollModifiers(this.actor, { attribute, skill });
const drugMods = this._getDrugRollModifiers(this.actor, { attribute, skill });
const racialMods = this._getRacialDiceBonus(this.actor, { skill, attribute });
@@ -1402,8 +1403,11 @@ class ZeroEngineActorSheet extends foundry.appv1.sheets.ActorSheet {
const attribute = isMelee ? "strength" : "agility";
const skill = isMelee ? "melee" : "marksmanship";
const attrValue = parseInt(this.actor.system.attributes[attribute]?.value) || 2;
const skillValue = parseInt(this.actor.system.skills[skill]?.value) || 0;
// Attributes: characters store { value: N }, NPCs store a flat number.
const rawAttr = this.actor.system.attributes?.[attribute];
const attrValue = (typeof rawAttr === 'object' ? parseInt(rawAttr?.value) : parseInt(rawAttr)) || 2;
// Skills: NPC actors have no skills object — fall back to 0.
const skillValue = parseInt(this.actor.system.skills?.[skill]?.value) || 0;
const attrLabel = attribute.charAt(0).toUpperCase() + attribute.slice(1);
const skillLabel = skill.charAt(0).toUpperCase() + skill.slice(1);
const gearBonus = parseInt(weaponData.gearBonus) || 0;