Add range-increment and range-max to ItemAlteration (#17898)

foundryvtt · Jan 29, 2025 · 0b8e739 · 0b8e739
1 parent ee6dbe0
commit 0b8e739
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/src/module/rules/rule-element/item-alteration/alteration.ts b/src/module/rules/rule-element/item-alteration/alteration.ts
@@ -14,6 +14,7 @@ import { AELikeChangeMode, AELikeRuleElement } from "../ae-like.ts";
 import type { RuleElementPF2e } from "../base.ts";
 import { ResolvableValueField } from "../data.ts";
 import { ITEM_ALTERATION_VALIDATORS } from "./schemas.ts";
+import { WeaponRangeIncrement } from "@item/weapon/types.ts";
 
 class ItemAlteration extends foundry.abstract.DataModel<RuleElementPF2e, ItemAlterationSchema> {
     static VALID_PROPERTIES = [
@@ -39,6 +40,8 @@ class ItemAlteration extends foundry.abstract.DataModel<RuleElementPF2e, ItemAlt
         "other-tags",
         "pd-recovery-dc",
         "persistent-damage",
+        "range-increment",
+        "range-max",
         "rarity",
         "speed-penalty",
         "strength",
@@ -403,6 +406,24 @@ class ItemAlteration extends foundry.abstract.DataModel<RuleElementPF2e, ItemAlt
                 }
                 return;
             }
+            case "range-increment": {
+                const validator = ITEM_ALTERATION_VALIDATORS[this.property];
+                if (!validator.isValid(data)) return;
+                if (!data.item.system.range) return;
+                const rangeIncrement = data.item.system.range;
+                const newValue = AELikeRuleElement.getNewValue(this.mode, rangeIncrement, data.alteration.value);
+                data.item.system.range = newValue as WeaponRangeIncrement;
+                return;
+            }
+            case "range-max": {
+                const validator = ITEM_ALTERATION_VALIDATORS[this.property];
+                if (!validator.isValid(data)) return;
+                if (!data.item.system.maxRange) return;
+                const maxRange = data.item.system.maxRange;
+                const newValue = AELikeRuleElement.getNewValue(this.mode, maxRange, data.alteration.value);
+                data.item.system.maxRange = newValue;
+                return;
+            }
         }
     }
 

diff --git a/src/module/rules/rule-element/item-alteration/schemas.ts b/src/module/rules/rule-element/item-alteration/schemas.ts
@@ -416,6 +416,30 @@ const ITEM_ALTERATION_VALIDATORS = {
             choices: RARITIES,
         } as const),
     }),
+    "range-increment": new ItemAlterationValidator({
+        itemType: new fields.StringField({ required: true, choices: ["weapon"] }),
+        mode: new fields.StringField({
+            required: true,
+            choices: ["add", "multiply", "override", "remove", "subtract"],
+        }),
+        value: new fields.NumberField({
+            required: true,
+            nullable: false,
+            initial: undefined,
+        } as const),
+    }),
+    "range-max": new ItemAlterationValidator({
+        itemType: new fields.StringField({ required: true, choices: ["weapon"] }),
+        mode: new fields.StringField({
+            required: true,
+            choices: ["add", "multiply", "override", "remove", "subtract"],
+        }),
+        value: new fields.NumberField({
+            required: true,
+            nullable: false,
+            initial: undefined,
+        } as const),
+    }),
     "frequency-max": new ItemAlterationValidator({
         itemType: new fields.StringField({ required: true, choices: ["action", "feat"] }),
         mode: new fields.StringField({