fix(rules): remove system.rules usage outside of migration

phBalance · Dec 27, 2023 · fed25a9 · fed25a9
1 parent 4e86f47
commit fed25a9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
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,
         });
 

diff --git a/module/utility/damage.js b/module/utility/damage.js
@@ -132,7 +132,7 @@ export function convertToDC(item, formula) {
     return parseInt(3 * d6Count + 2 * d3Count + pip || 0);
 }
 
-// Determine DC soley from item/attack
+// Determine DC solely from item/attack
 export function convertToDcFromItem(item, options) {
     let actor = item.actor;
     let dc = 0;
@@ -189,7 +189,7 @@ export function convertToDcFromItem(item, options) {
         // Simple +1 DC for now (checking on discord to found out rules for use AP ratio)
         dc += csl.dc;
 
-        // Each DC should roughtly be 5 active points
+        // Each DC should roughly be 5 active points
         // let dcPerAp =  ((dc * 5) / (item.system.activePointsDc || item.system.activePoints)) || 1;
         // let ratio = (dcPerAp || 5) / 5;  // Typically 1 to 1 radio
         // dc += (csl.dc * dcPerAp);
@@ -257,7 +257,7 @@ export function convertToDcFromItem(item, options) {
     // Add in TK
     if (item.system.usesTk) {
         let tkItems = actor.items.filter(
-            (o) => o.system.rules == "TELEKINESIS",
+            (o) => o.system.XMLID === "TELEKINESIS",
         );
         let str = 0;
         for (const item of tkItems) {

diff --git a/template.json b/template.json
@@ -193,7 +193,6 @@
         "templates": {
             "base": {
                 "description": "",
-                "rules": "",
                 "effect": "",
                 "cost": 0,
                 "modifiers": [],
@@ -215,14 +214,12 @@
         },
         "power": {
             "templates": ["power"],
-            "rules": "Power Description",
             "active": "false"
         },
         "equipment": {
             "templates": ["power"],
             "quantity": 1,
-            "weight": 0,
-            "rules": "Equipment Description"
+            "weight": 0
         },
         "attack": {
             "templates": ["base"],
@@ -274,19 +271,16 @@
         "perk": {
             "templates": ["base"],
             "id": "",
-            "rules": "Perk Description",
             "other": {}
         },
         "talent": {
             "templates": ["base"],
             "id": "",
-            "rules": "Talent Description",
             "other": {}
         },
         "complication": {
             "templates": ["base"],
             "id": "",
-            "rules": "Complication Description",
             "other": {
                 "levels": 0,
                 "option_alias": ""
@@ -295,7 +289,6 @@
         "martialart": {
             "templates": ["base"],
             "id": "",
-            "rules": "Martial Art Description",
             "other": {}
         }
     }