Merge pull request dmdorman#790 from phBalance/phBalance/aoe-problem

Fix regressions
phBalance · Mar 4, 2024 · f0b7ebc · f0b7ebc
2 parents 0f6c55d + a0a6177
commit f0b7ebc
Show file tree

Hide file tree

Showing 4 changed files with 223 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - 5e now shows proper lift capacities for STR values under 5. [#709](https://github.com/dmdorman/hero6e-foundryvtt/issues/709)
 - Skill levels now apply when rolling skills. Skill rolls can now auto succeed or fail.
 - A number of perks/talents/disadvantages/complications should now be rollable and can be dragged to the macro bar too.
+- AOE no longer needs to be associated with an attack power. [#779](https://github.com/dmdorman/hero6e-foundryvtt/issues/779)
 
 ## Version 3.0.59
 

diff --git a/module/config.js b/module/config.js
@@ -282,7 +282,7 @@ HERO.powers5e = [];
  */
 function addPower(powerDescription6e, powerOverrideFor5e) {
     if (powerDescription6e) {
-        HERO.powers6e.push(powerDescription6e);
+        HERO.powers6e.push(foundry.utils.deepClone(powerDescription6e));
     }
 
     if (powerOverrideFor5e) {
@@ -1159,7 +1159,7 @@ function addPower(powerDescription6e, powerOverrideFor5e) {
         {
             key: "KNOWLEDGE_SKILL",
             type: ["skill"],
-            behaviors: [],
+            behaviors: ["success"],
             costPerLevel: 1,
         },
         {},
@@ -1309,7 +1309,7 @@ function addPower(powerDescription6e, powerOverrideFor5e) {
         {
             key: "PROFESSIONAL_SKILL",
             type: ["skill"],
-            behaviors: [],
+            behaviors: ["success"],
         },
         {},
     );

diff --git a/module/item/item.js b/module/item/item.js
@@ -1152,6 +1152,11 @@ export class HeroSystem6eItem extends Item {
             }
         }
 
+        const aoeModifier = this.getAoeModifier();
+        if (aoeModifier) {
+            this.buildAoeAttackParameters(aoeModifier);
+        }
+
         if (this.system.XMLID == "COMBAT_LEVELS") {
             // Make sure CSLs are defined
             this.system.csl = {};
@@ -3236,11 +3241,6 @@ export class HeroSystem6eItem extends Item {
             this.system.extraDice = "one-pip";
         }
 
-        const aoeModifier = this.getAoeModifier();
-        if (aoeModifier) {
-            this.buildAoeAttackParameters(aoeModifier);
-        }
-
         // TODO: Investigate why this is required. It is wrong for 1/2d6 vs d6-1.
         if (xmlid === "HKA" || this.system.EFFECT?.indexOf("KILLING") > -1) {
             this.system.killing = true;