Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Condense Jyoti's Feather spellheart equipment effects #17895

Merged
merged 4 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build/uuid-redirects.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"Compendium.pf2e.equipment-effects.Item.EwHufLQI1z1QzqZU": "Compendium.pf2e.equipment-effects.Item.Effect: Jolt Coil - Weapon",
"Compendium.pf2e.equipment-effects.Item.F8nQOLVWmpp9G5hZ": "Compendium.pf2e.equipment-effects.Item.Effect: Dragon's Blood Pudding",
"Compendium.pf2e.equipment-effects.Item.FbFl95WRpzrrijh3": "Compendium.pf2e.equipment-effects.Item.Effect: Aeon Stone Resonance (Amplifying)",
"Compendium.pf2e.equipment-effects.Item.gaEXUewHgPpM3zfW": "Compendium.pf2e.equipment-effects.Item.Effect: Jyoti's Feather - Armor",
"Compendium.pf2e.equipment-effects.Item.GAU5xqIEe2D280TB": "Compendium.pf2e.equipment-effects.Item.Effect: Clay Sphere - Armor",
"Compendium.pf2e.equipment-effects.Item.gU3uZE2ihLnpQN0b": "Compendium.pf2e.equipment-effects.Item.Effect: Beastmaster's Sigil - Melee Weapon",
"Compendium.pf2e.equipment-effects.Item.gZOED4T3o6giterN": "Compendium.pf2e.equipment-effects.Item.Effect: Beastmaster's Sigil - Armor",
Expand Down Expand Up @@ -121,10 +122,13 @@
"Compendium.pf2e.equipment-effects.Item.viCX9fZzTWGuoO85": "Compendium.pf2e.equipment-effects.Item.Effect: Cloak of Elvenkind",
"Compendium.pf2e.equipment-effects.Item.vKooOkXHvtqCgZYg": "Compendium.pf2e.equipment-effects.Item.Effect: Energized Cartridge",
"Compendium.pf2e.equipment-effects.Item.vOU4Yv2MyAfYBbmF": "Compendium.pf2e.equipment-effects.Item.Effect: Aeon Stone Resonance (Amplifying)",
"Compendium.pf2e.equipment-effects.Item.wcjEjFKLcPisk4jK": "Compendium.pf2e.equipment-effects.Item.Effect: Jyoti's Feather - Weapon",
"Compendium.pf2e.equipment-effects.Item.WGmrfhdQzlNzyMrq": "Compendium.pf2e.equipment-effects.Item.Effect: Jyoti's Feather - Weapon",
"Compendium.pf2e.equipment-effects.Item.wTZnKkT0K4Tdy8mD": "Compendium.pf2e.equipment-effects.Item.Effect: Bravo's Brew",
"Compendium.pf2e.equipment-effects.Item.xSw7cTboMvP8sJAq": "Compendium.pf2e.equipment-effects.Item.Effect: Beastmaster's Sigil - Melee Weapon",
"Compendium.pf2e.equipment-effects.Item.XwCBalKJf3CiEiFa": "Compendium.pf2e.other-effects.Item.Effect: Treat Poison",
"Compendium.pf2e.equipment-effects.Item.XWenziR7J3mwKV4W": "Compendium.pf2e.other-effects.Item.Effect: Treat Poison",
"Compendium.pf2e.equipment-effects.Item.YAZ1iri403S8XcrH": "Compendium.pf2e.equipment-effects.Item.Effect: Jyoti's Feather - Armor",
"Compendium.pf2e.equipment-effects.Item.YflZZ7EG7JJkdX0d": "Compendium.pf2e.equipment-effects.Item.Effect: Jolt Coil - Armor",
"Compendium.pf2e.equipment-effects.Item.yvabfuAO74pvH8hh": "Compendium.pf2e.equipment-effects.Item.Effect: Aeon Stone Resonance (Amplifying)",
"Compendium.pf2e.equipment-effects.Item.Yxssrnh9UZJAM0V7": "Compendium.pf2e.equipment-effects.Item.Effect: Elixir of Life",
Expand Down
51 changes: 0 additions & 51 deletions packs/equipment-effects/effect-jyotis-feather-armor-greater.json

This file was deleted.

51 changes: 0 additions & 51 deletions packs/equipment-effects/effect-jyotis-feather-armor-major.json

This file was deleted.

74 changes: 71 additions & 3 deletions packs/equipment-effects/effect-jyotis-feather-armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Effect: Jyoti's Feather - Armor",
"system": {
"description": {
"value": "<p>Granted by @UUID[Compendium.pf2e.equipment-srd.Item.Jyoti's Feather]</p>\n<p>You gain a +2 item bonus to saving throws against death effects and void energy.</p>"
"value": "<p>Granted by @UUID[Compendium.pf2e.equipment-srd.Item.Jyoti's Feather], @UUID[Compendium.pf2e.equipment-srd.Item.Jyoti's Feather (Greater)], @UUID[Compendium.pf2e.equipment-srd.Item.Jyoti's Feather (Major)]</p>\n<p>You gain am item bonus to saving throws against death effects and void energy.</p>"
simonward marked this conversation as resolved.
Show resolved Hide resolved
},
"duration": {
"expiry": null,
Expand All @@ -21,19 +21,87 @@
"title": "Pathfinder Treasure Vault"
},
"rules": [
{
"adjustName": false,
"choices": [
{
"predicate": [
{
"or": [
"parent:origin:item:slug:jyotis-feather",
{
"not": "parent:origin:item"
}
]
}
],
"value": "Compendium.pf2e.equipment-srd.Item.Jyoti's Feather"
},
{
"predicate": [
{
"or": [
"parent:origin:item:slug:jyotis-feather-greater",
{
"not": "parent:origin:item"
}
]
}
],
"value": "Compendium.pf2e.equipment-srd.Item.Jyoti's Feather (Greater)"
},
{
"predicate": [
{
"or": [
"parent:origin:item:slug:jyotis-feather-major",
{
"not": "parent:origin:item"
}
]
}
],
"value": "Compendium.pf2e.equipment-srd.Item.Jyoti's Feather (Major)"
}
],
"key": "ChoiceSet",
"prompt": "PF2E.SpecificRule.Prompt.EquipmentVariety",
"rollOption": "jyotis-feather"
},
{
"key": "FlatModifier",
"predicate": [
{
"or": [
"death",
"void"
"item:trait:death",
"item:trait:void"
]
}
],
"selector": "saving-throw",
"slug": "jyotis-feather-bonus",
"type": "item",
"value": 2
},
{
"key": "AdjustModifier",
"mode": "upgrade",
"predicate": [
"jyotis-feather:jyotis-feather-greater"
],
"selector": "saving-throw",
"slug": "jyotis-feather-bonus",
"value": 3
},
{
"key": "AdjustModifier",
"mode": "upgrade",
"predicate": [
"jyotis-feather:jyotis-feather-major"
],
"selector": "saving-throw",
"slug": "jyotis-feather-bonus",
"value": 4
}
],
"start": {
Expand Down
63 changes: 0 additions & 63 deletions packs/equipment-effects/effect-jyotis-feather-weapon-greater.json

This file was deleted.

63 changes: 0 additions & 63 deletions packs/equipment-effects/effect-jyotis-feather-weapon-major.json

This file was deleted.

Loading
Loading