Merge pull request dmdorman#558 from phBalance/phBalance/remove-rules…

…-property Remove rules property
phBalance · Dec 27, 2023 · bb2e2d0 · bb2e2d0
2 parents 6b7fdfd + e172c36
commit bb2e2d0
Show file tree

Hide file tree

Showing 16 changed files with 605 additions and 606 deletions.
diff --git a/module/actor/actor.js b/module/actor/actor.js
@@ -1648,11 +1648,6 @@ export class HeroSystem6eActor extends Actor {
             await this.update(changes);
         }
 
-        // Item Effects
-        // for (const item of this.items.contents) {
-        //     createEffects(item)
-        // }
-
         // Initiative Characteristic
         if (this.system.initiativeCharacteristic === undefined) {
             if (

diff --git a/module/item/item-attack.js b/module/item/item-attack.js
@@ -57,7 +57,7 @@ export async function AttackOptions(item) {
 
     // Uses Tk
     let tkItems = item.actor.items.filter(
-        (o) => o.system.rules == "TELEKINESIS",
+        (o) => o.system.XMLID == "TELEKINESIS",
     );
     let tkStr = 0;
     for (const item of tkItems) {

diff --git a/module/item/item.js b/module/item/item.js
@@ -3010,7 +3010,7 @@ export class HeroSystem6eItem extends Item {
         }
 
         const configPowerInfo = getPowerInfo({
-            xmlid: skillData.XMLID || skillData.rules,
+            xmlid: skillData.XMLID,
             actor: this.actor,
         });