Replace several string rules selections references with numerical ref…

…erences (#16632)
foundryvtt · Sep 23, 2024 · 9c6357a · 9c6357a
1 parent 9d2cfad
commit 9c6357a
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 52 deletions.
diff --git a/packs/bestiary-effects/effect-leaders-command.json b/packs/bestiary-effects/effect-leaders-command.json
@@ -46,7 +46,7 @@
                 "key": "FlatModifier",
                 "selector": "{item|flags.pf2e.rulesSelections.leadersCommand.selector}",
                 "type": "status",
-                "value": "{item|flags.pf2e.rulesSelections.leadersCommand.value}"
+                "value": "@item.flags.pf2e.rulesSelections.leadersCommand.value"
             }
         ],
         "start": {

diff --git a/packs/bestiary-effects/effect-share-pain.json b/packs/bestiary-effects/effect-share-pain.json
@@ -7,7 +7,7 @@
             "value": "<p>The creature takes a status penalty to its Speeds based on its save result.</p>"
         },
         "duration": {
-            "expiry": "turn-start",
+            "expiry": null,
             "sustained": false,
             "unit": "unlimited",
             "value": -1
@@ -25,7 +25,7 @@
                 "key": "FlatModifier",
                 "selector": "speed",
                 "type": "status",
-                "value": "{item|flags.pf2e.rulesSelections.pain}"
+                "value": "@item.flags.pf2e.rulesSelections.pain"
             },
             {
                 "choices": [

diff --git a/packs/feat-effects/effect-acupuncturist.json b/packs/feat-effects/effect-acupuncturist.json
@@ -4,13 +4,13 @@
     "name": "Effect: Acupuncturist",
     "system": {
         "description": {
-            "value": "<p><strong>Access</strong> Tian Xia origin</p><hr /><p>You've studied the routes by which qi flows through the body. The needles stored in your healer's tools can manipulate its flow and improve health when applied to specific meridian points. You spend a day studying an ally to attempt a @Check[medicine] check to improve their qi against a standard DC for your ally's level. The ally is then immune to all uses of Acupuncturist for 1 week.</p><hr /><p><strong>Critical Success</strong> You grant your ally the choice of a +2 circumstance bonus to one downtime activity skill check within the next week, or the ability to roll twice on their next saving throw within the next week against an affliction and take the higher result; this is a fortune effect.</p>\n<p><strong>Success</strong> You grant your ally a +1 circumstance bonus to one downtime activity skill check within the next week.</p>\n<p><strong>Critical Failure</strong> Your ally takes a –1 circumstance penalty to all downtime activity skill checks within the next week.</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Acupuncturist]</p>\n<p>You grant your ally the choice of a circumstance bonus to one downtime activity skill check. On a critical failure, your ally takes a –1 circumstance penalty to all downtime activity skill checks instead.</p>"
         },
         "duration": {
-            "expiry": null,
+            "expiry": "turn-start",
             "sustained": false,
-            "unit": "unlimited",
-            "value": -1
+            "unit": "days",
+            "value": 7
         },
         "level": {
             "value": 1
@@ -46,7 +46,7 @@
                 ],
                 "selector": "skill-check",
                 "type": "circumstance",
-                "value": "{item|flags.pf2e.rulesSelections.acupuncturist}"
+                "value": "@item.flags.pf2e.rulesSelections.acupuncturist"
             }
         ],
         "start": {

diff --git a/packs/feat-effects/effect-hamstringing-strike.json b/packs/feat-effects/effect-hamstringing-strike.json
@@ -40,7 +40,7 @@
                 "key": "FlatModifier",
                 "selector": "speed",
                 "type": "status",
-                "value": "{item|flags.pf2e.rulesSelections.hamstringingStrike}"
+                "value": "@item.flags.pf2e.rulesSelections.hamstringingStrike"
             }
         ],
         "start": {

diff --git a/packs/spell-effects/spell-effect-diabolic-edict.json b/packs/spell-effects/spell-effect-diabolic-edict.json
@@ -4,7 +4,7 @@
     "name": "Spell Effect: Diabolic Edict",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Diabolic Edict]</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Diabolic Edict]</p>\n<p>The target gains a +1 status bonus to attack rolls and skill checks related to performing a particular task. If it refuses to perform the task you proclaimed, it instead takes a -1 status penalty to all its attack rolls and skill checks.</p>"
         },
         "duration": {
             "expiry": "turn-start",
@@ -24,65 +24,57 @@
             {
                 "choices": [
                     {
-                        "label": "Accept",
-                        "value": "1"
+                        "label": "PF2E.SpecificRule.Sorcerer.DiabolicEdict.Accept",
+                        "value": "accept"
                     },
                     {
-                        "label": "Refuse",
-                        "value": "-1"
+                        "label": "PF2E.SpecificRule.Sorcerer.DiabolicEdict.Refuse",
+                        "value": "refuse"
                     }
                 ],
-                "flag": "edict",
                 "key": "ChoiceSet",
-                "prompt": "PF2E.SpecificRule.Sorcerer.DiabolicEdict.Prompt"
+                "prompt": "PF2E.SpecificRule.Sorcerer.DiabolicEdict.Prompt",
+                "rollOption": "diabolic-edict"
             },
             {
-                "domain": "all",
                 "key": "RollOption",
                 "label": "PF2E.SpecificRule.Sorcerer.DiabolicEdict.Label",
-                "option": "diabolic-edict-agree",
+                "option": "perform-diabolic-edict",
                 "predicate": [
-                    {
-                        "gte": [
-                            "{item|flags.pf2e.rulesSelections.edict}",
-                            1
-                        ]
-                    }
+                    "diabolic-edict:accept"
                 ],
                 "toggleable": true
             },
             {
-                "hideIfDisabled": true,
                 "key": "FlatModifier",
-                "label": "PF2E.SpecificRule.Sorcerer.DiabolicEdict.Bonus",
                 "predicate": [
-                    "diabolic-edict-agree"
+                    {
+                        "or": [
+                            "perform-diabolic-edict",
+                            "diabolic-edict:refuse"
+                        ]
+                    }
                 ],
                 "selector": [
-                    "attack",
+                    "attack-roll",
                     "skill-check"
                 ],
+                "slug": "diabolic-edict",
                 "type": "status",
-                "value": "{item|flags.pf2e.rulesSelections.edict}"
+                "value": 1
             },
             {
-                "hideIfDisabled": true,
-                "key": "FlatModifier",
-                "label": "PF2E.SpecificRule.Sorcerer.DiabolicEdict.Penalty",
+                "key": "AdjustModifier",
+                "mode": "downgrade",
                 "predicate": [
-                    {
-                        "lt": [
-                            "{item|flags.pf2e.rulesSelections.edict}",
-                            1
-                        ]
-                    }
+                    "diabolic-edict:refuse"
                 ],
-                "selector": [
-                    "attack",
+                "selectors": [
+                    "attack-roll",
                     "skill-check"
                 ],
-                "type": "status",
-                "value": "{item|flags.pf2e.rulesSelections.edict}"
+                "slug": "diabolic-edict",
+                "value": -1
             }
         ],
         "start": {

diff --git a/packs/spell-effects/spell-effect-wish-twisted-form-failure.json b/packs/spell-effects/spell-effect-wish-twisted-form-failure.json
@@ -4,7 +4,7 @@
     "name": "Spell Effect: Wish-Twisted Form (Failure)",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Wish-Twisted Form].</p>\n<p>Implemented Effects:</p>\n<ul>\n<li>The target gains weakness 5 to the chosen damage type.</li>\n<li>The target takes a -10-foot status penalty to all its Speeds.</li>\n<li>The target takes a -1 status penalty to its saving throws.</li>\n</ul>\n<p>Unimplemented Effects:</p>\n<ul>\n<li>The target's resistances are reduced by 5.</li>\n</ul>\n<hr />\n<p><strong>Heightened (+1)</strong> Increase the weakness and the reduction to resistances by 1.</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Wish-Twisted Form].</p>\n<p>The target gains weakness to the chosen damage type, it takes a -10-foot status penalty to all its Speeds, and a -1 status penalty to its saving throws. On a critical failure, the target also takes a -1 status penalty to AC.</p>"
         },
         "duration": {
             "expiry": "turn-start",
@@ -24,7 +24,7 @@
             {
                 "key": "Weakness",
                 "type": "{item|flags.pf2e.rulesSelections.wishTwistedFormDamageType}",
-                "value": "{item|system.level.value}"
+                "value": "@item.level"
             },
             {
                 "key": "FlatModifier",
@@ -81,22 +81,26 @@
                 "choices": [
                     {
                         "label": "PF2E.Check.Result.Degree.Check.failure",
-                        "value": 0
+                        "value": "failure"
                     },
                     {
                         "label": "PF2E.Check.Result.Degree.Check.criticalFailure",
-                        "value": -1
+                        "value": "critical-failure"
                     }
                 ],
-                "flag": "wishTwistedFormDegree",
                 "key": "ChoiceSet",
-                "prompt": "PF2E.SpecificRule.Prompt.DegreeOfSuccess"
+                "prompt": "PF2E.SpecificRule.Prompt.DegreeOfSuccess",
+                "rollOption": "wish-twisted-form"
             },
             {
+                "hideIfDisabled": true,
                 "key": "FlatModifier",
+                "predicate": [
+                    "wish-twisted-form:critical-failure"
+                ],
                 "selector": "ac",
                 "type": "status",
-                "value": "{item|flags.pf2e.rulesSelections.wishTwistedFormDegree}"
+                "value": -1
             }
         ],
         "start": {

diff --git a/packs/spell-effects/spell-effect-wish-twisted-form-success.json b/packs/spell-effects/spell-effect-wish-twisted-form-success.json
@@ -4,7 +4,7 @@
     "name": "Spell Effect: Wish-Twisted Form (Success)",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Wish-Twisted Form].</p>\n<p>Implemented Effects:</p>\n<ul>\n<li>The target gains weakness 5 to the chosen damage type.</li>\n<li>The target takes a -10-foot status penalty to all its Speeds.</li>\n<li>The target takes a -1 status penalty to its saving throws.</li>\n</ul>\n<p>Unimplemented Effects:</p>\n<ul>\n<li>The target's resistances are reduced by 5.</li>\n</ul>\n<hr />\n<p><strong>Heightened (+1)</strong> Increase the weakness and the reduction to resistances by 1.</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Wish-Twisted Form].</p>\n<p>The target gains weakness to the chosen damage type, it takes a -10-foot status penalty to all its Speeds, and a -1 status penalty to its saving throws.</p>"
         },
         "duration": {
             "expiry": "turn-start",
@@ -24,7 +24,7 @@
             {
                 "key": "Weakness",
                 "type": "{item|flags.pf2e.rulesSelections.wishTwistedFormDamageType}",
-                "value": "{item|system.level.value}"
+                "value": "@item.level"
             },
             {
                 "key": "FlatModifier",

diff --git a/packs/spells/hearts-desire.json b/packs/spells/hearts-desire.json
@@ -16,7 +16,7 @@
             }
         },
         "description": {
-            "value": "<p>You surround your target with wondrous illusions of their greatest desires, which distract them from reality. The target must attempt a Will save.</p>\n<hr />\n<p><strong>Critical Success</strong> The target disbelieves the illusion and is unaffected.</p>\n<p><strong>Success</strong> For 1 round, the target is @UUID[Compendium.pf2e.conditionitems.Item.Stupefied]{Stupefied 2} and takes a -2 status penalty to any checks it makes to determine the effects of reactions.</p>\n<p><strong>Failure</strong> For 1 minute, the target is @UUID[Compendium.pf2e.conditionitems.Item.Stupefied]{Stupefied 2} and can't use reactions.</p>\n<p><strong>Critical Failure</strong> As failure, and all spaces are difficult terrain for the target.</p>\n<hr />\n<p><strong>Heightened (+2)</strong> You can target one additional creature.</p>"
+            "value": "<p>You surround your target with wondrous illusions of their greatest desires, which distract them from reality. The target must attempt a Will save.</p><hr /><p><strong>Critical Success</strong> The target disbelieves the illusion and is unaffected.</p>\n<p><strong>Success</strong> For 1 round, the target is @UUID[Compendium.pf2e.conditionitems.Item.Stupefied]{Stupefied 2} and takes a -2 status penalty to any checks it makes to determine the effects of reactions.</p>\n<p><strong>Failure</strong> For 1 minute, the target is stupefied 2 and can't use reactions.</p>\n<p><strong>Critical Failure</strong> As failure, and all spaces are difficult terrain for the target.</p><hr /><p><strong>Heightened (+2)</strong> You can target one additional creature.</p>"
         },
         "duration": {
             "sustained": false,