Merge branch 'resolve-injected-damage-type' into 'master'

Pass `damageType` property on `FlatModifier` REs through `resolveInjectedProperties` See merge request hooking/foundry-vtt---pathfinder-2e!6178
foundryvtt · Nov 27, 2021 · 4dfa0aa · 4dfa0aa
2 parents 2eda30f + a9973d6
commit 4dfa0aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/module/rules/elements/flat-modifier.ts b/src/module/rules/elements/flat-modifier.ts
@@ -34,7 +34,7 @@ class FlatModifierRuleElement extends RuleElementPF2e {
  );
  modifier.label = this.label;
  if (this.data.damageType) {
- modifier.damageType = this.data.damageType;
+ modifier.damageType = this.resolveInjectedProperties(this.data.damageType);
  }
  if (this.data.damageCategory) {
  modifier.damageCategory = this.data.damageCategory;

diff --git a/src/util/misc.ts b/src/util/misc.ts
@@ -218,7 +218,7 @@ export function sluggify(label: string, { camel = null }: { camel?: "dromedary"
  }
  case "dromedary":
  return label
- .replace(/'/g, "")
+ .replace(/[^-\w\s]/g, "")
  .replace(/[-_]+/g, " ")
  .replace(/(?:^\w|[A-Z]|\b\w)/g, (part, index) =>
  index === 0 ? part.toLowerCase() : part.toUpperCase()