From 5952fdd9a467d672f882fff4cd0f735b0a3d724c Mon Sep 17 00:00:00 2001 From: Simon Ward <simonward@mac.com> Date: Sat, 6 Apr 2024 19:27:32 -0700 Subject: [PATCH] Fix description of Flawed Orb of Gold Dragonkind (#14393) --- packs/age-of-ashes-bestiary/emaliza-zandivar.json | 2 +- packs/equipment/flawed-orb-of-gold-dragonkind.json | 2 +- src/module/actor/modifiers.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packs/age-of-ashes-bestiary/emaliza-zandivar.json b/packs/age-of-ashes-bestiary/emaliza-zandivar.json index e9743e5aeec..d8c4008e6a9 100644 --- a/packs/age-of-ashes-bestiary/emaliza-zandivar.json +++ b/packs/age-of-ashes-bestiary/emaliza-zandivar.json @@ -3830,7 +3830,7 @@ }, "containerId": null, "description": { - "value": "<p>Each of the legendary <em>Orbs of Dragonkind</em> contains the essence and personality of a powerful dragon. The <em>Orb of Gold Dragonkind</em> was the most powerful of them all, until it was shattered by Mengkare's draconic breath. Reconstructed at great expense by enslaved spellcasters toiling under the Scarlet Triad's watch, the <em>Flawed Orb of Gold Dragonkind</em> is a shadow of its prior self, yet it remains a potent weapon against dragons of all types.</p>\n<p>While carried, the <em>Flawed Orb of Gold Dragonkind</em> grants its owner resistance 30 to the Breath Weapons of gold dragons. The owner also can sense if there are any dragons within 10 miles, or any gold dragons within 100 miles. When within 1 mile of a dragon, they can determine the direction to the dragon and the dragon's age category (such as young, ancient, or wyrm).</p>\n<p><strong>Activate</strong> <span class=\"action-glyph\">2</span> envision, Interact</p>\n<p><strong>Frequency</strong> Three times per day</p>\n<hr />\n<p><strong>Effect</strong> You attempt to overwhelm a dragon's mind-while you cannot control the dragon, you can render it immobile for a short time. Choose a dragon within 60 feet; the dragon can attempt to resist the orb with a @Check[type:will|dc:30] saving throw (or higher with <em>orb shards</em>). Gold dragons take a -4 circumstance penalty to this saving throw. Any stun from this activation ends if the dragon is attacked or otherwise subject to a hostile act other than that of the orb.</p>\n<hr />\n<p><strong>Critical Success</strong> The dragon is unaffected.</p>\n<p><strong>Success</strong> The dragon is stunned 3.</p>\n<p><strong>Failure</strong> The dragon is stunned for as long as the orb's wielder Sustains the Activation.</p>\n<p><strong>Critical Failure</strong> As failure, but hostile actions don't end the dragon's stun.</p>\n<p><strong>Destruction</strong> The <em>Flawed Orb of Gold Dragonkind</em> is resilient, but its imperfect nature leaves it vulnerable. It can be damaged or even destroyed by mundane attacks (Hardness 40, HP 200, BT 100). It has weakness 30 to the Breath Weapons and Strikes of gold dragons.</p>" + "value": "<p>Each of the legendary <em>Orbs of Dragonkind</em> contains the essence and personality of a powerful dragon. The <em>Orb of Gold Dragonkind</em> was the most powerful of them all, until it was shattered by Mengkare's draconic breath. Reconstructed at great expense by enslaved spellcasters toiling under the Scarlet Triad's watch, the <em>Flawed Orb of Gold Dragonkind</em> is a shadow of its prior self, yet it remains a potent weapon against dragons of all types.</p>\n<p>While carried, the <em>Flawed Orb of Gold Dragonkind</em> grants its owner resistance 30 to the Breath Weapons of gold dragons. The owner also can sense if there are any dragons within 10 miles, or any gold dragons within 100 miles. When within 1 mile of a dragon, they can determine the direction to the dragon and the dragon's age category (such as young, ancient, or wyrm).</p>\n<hr />\n<p><strong>Activate</strong> <span class=\"action-glyph\">2</span> envision, Interact</p>\n<p><strong>Frequency</strong> Three times per day</p>\n<p><strong>Effect</strong> You attempt to overwhelm a dragon's mind-while you cannot control the dragon, you can render it immobile for a short time. Choose a dragon within 60 feet; the dragon can attempt to resist the orb with a @Check[type:will|dc:30] saving throw (or higher with <em>orb shards</em>). Gold dragons take a -4 circumstance penalty to this saving throw. Any stun from this activation ends if the dragon is attacked or otherwise subject to a hostile act other than that of the orb.</p>\n<hr />\n<p><strong>Critical Success</strong> The dragon is unaffected.</p>\n<p><strong>Success</strong> The dragon is @UUID[Compendium.pf2e.conditionitems.Item.Stunned]{Stunned 3}.</p>\n<p><strong>Failure</strong> The dragon is stunned for as long as the orb's wielder Sustains the Activation.</p>\n<p><strong>Critical Failure</strong> As failure, but hostile actions don't end the dragon's stun.</p>\n<hr />\n<p><strong>Destruction</strong> The <em>Flawed Orb of Gold Dragonkind</em> is resilient, but its imperfect nature leaves it vulnerable. It can be damaged or even destroyed by mundane attacks (Hardness 40, HP 200, BT 100). It has weakness 30 to the Breath Weapons and Strikes of gold dragons.</p>" }, "equipped": { "carryType": "worn", diff --git a/packs/equipment/flawed-orb-of-gold-dragonkind.json b/packs/equipment/flawed-orb-of-gold-dragonkind.json index 9f1308a044a..6f0c76e210b 100644 --- a/packs/equipment/flawed-orb-of-gold-dragonkind.json +++ b/packs/equipment/flawed-orb-of-gold-dragonkind.json @@ -9,7 +9,7 @@ }, "containerId": null, "description": { - "value": "<p>Each of the legendary <em>Orbs of Dragonkind</em> contains the essence and personality of a powerful dragon. The <em>Orb of Gold Dragonkind</em> was the most powerful of them all, until it was shattered by Mengkare's draconic breath. Reconstructed at great expense by enslaved spellcasters toiling under the Scarlet Triad's watch, the <em>Flawed Orb of Gold Dragonkind</em> is a shadow of its prior self, yet it remains a potent weapon against dragons of all types.</p>\n<p>While carried, the <em>Flawed Orb of Gold Dragonkind</em> grants its owner resistance 30 to the Breath Weapons of gold dragons. The owner also can sense if there are any dragons within 10f gold dragons. The owner also can sense if there are any dragons within 10 miles, or any gold dragons within 100 miles. When within 1 mile of a dragon, they can determine the direction to the dragon and the dragon's age category (such as young, ancient, or wyrm).</p>\n<p><strong>Activate</strong> <span class=\"action-glyph\">2</span> envision, Interact</p>\n<p><strong>Frequency</strong> Three times per day</p>\n<hr />\n<p><strong>Effect</strong> You attempt to overwhelm a dragon's mind-while you cannot control the dragon, you can render it immobile for a short time. Choose a dragon within 60 feet; the dragon can attempt to resist the orb with a @Check[type:will|dc:30] saving throw (or higher with <em>orb shards</em>). Gold dragons take a -4 circumstance penalty to this saving throw. Any stun from this activation ends if the dragon is attacked or otherwise subject to a hostile act other than that of the orb.</p>\n<hr />\n<p><strong>Critical Success</strong> The dragon is unaffected.</p>\n<p><strong>Success</strong> The dragon is @UUID[Compendium.pf2e.conditionitems.Item.Stunned]{Stunned 3}.</p>\n<p><strong>Failure</strong> The dragon is stunned for as long as the orb's wielder Sustains the Activation.</p>\n<p><strong>Critical Failure</strong> As failure, but hostile actions don't end the dragon's stun.</p>\n<p><strong>Destruction</strong> The <em>Flawed Orb of Gold Dragonkind</em> is resilient, but its imperfect nature leaves it vulnerable. It can be damaged or even destroyed by mundane attacks (Hardness 40, HP 200, BT 100). It has weakness 30 to the Breath Weapons and Strikes of gold dragons.</p>" + "value": "<p>Each of the legendary <em>Orbs of Dragonkind</em> contains the essence and personality of a powerful dragon. The <em>Orb of Gold Dragonkind</em> was the most powerful of them all, until it was shattered by Mengkare's draconic breath. Reconstructed at great expense by enslaved spellcasters toiling under the Scarlet Triad's watch, the <em>Flawed Orb of Gold Dragonkind</em> is a shadow of its prior self, yet it remains a potent weapon against dragons of all types.</p>\n<p>While carried, the <em>Flawed Orb of Gold Dragonkind</em> grants its owner resistance 30 to the Breath Weapons of gold dragons. The owner also can sense if there are any dragons within 10 miles, or any gold dragons within 100 miles. When within 1 mile of a dragon, they can determine the direction to the dragon and the dragon's age category (such as young, ancient, or wyrm).</p>\n<hr />\n<p><strong>Activate</strong> <span class=\"action-glyph\">2</span> envision, Interact</p>\n<p><strong>Frequency</strong> Three times per day</p>\n<p><strong>Effect</strong> You attempt to overwhelm a dragon's mind-while you cannot control the dragon, you can render it immobile for a short time. Choose a dragon within 60 feet; the dragon can attempt to resist the orb with a @Check[type:will|dc:30] saving throw (or higher with <em>orb shards</em>). Gold dragons take a -4 circumstance penalty to this saving throw. Any stun from this activation ends if the dragon is attacked or otherwise subject to a hostile act other than that of the orb.</p>\n<hr />\n<p><strong>Critical Success</strong> The dragon is unaffected.</p>\n<p><strong>Success</strong> The dragon is @UUID[Compendium.pf2e.conditionitems.Item.Stunned]{Stunned 3}.</p>\n<p><strong>Failure</strong> The dragon is stunned for as long as the orb's wielder Sustains the Activation.</p>\n<p><strong>Critical Failure</strong> As failure, but hostile actions don't end the dragon's stun.</p>\n<hr />\n<p><strong>Destruction</strong> The <em>Flawed Orb of Gold Dragonkind</em> is resilient, but its imperfect nature leaves it vulnerable. It can be damaged or even destroyed by mundane attacks (Hardness 40, HP 200, BT 100). It has weakness 30 to the Breath Weapons and Strikes of gold dragons.</p>" }, "hardness": 0, "hp": { diff --git a/src/module/actor/modifiers.ts b/src/module/actor/modifiers.ts index 6cc560e15b1..7422662f6b8 100644 --- a/src/module/actor/modifiers.ts +++ b/src/module/actor/modifiers.ts @@ -239,7 +239,7 @@ class ModifierPF2e implements RawModifier { /** Return a copy of this ModifierPF2e instance */ clone(data: Partial<ModifierObjectParams> = {}, options: { test?: Set<string> | string[] } = {}): ModifierPF2e { - const clone = new ModifierPF2e(fu.mergeObject({ ...this, modifier: this.#originalValue, ...data })); + const clone = new ModifierPF2e({ ...this, modifier: this.#originalValue, ...data }); if (options.test) clone.test(options.test); return clone;