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 Potion of Acid Resistance equipment effects #18516

Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions build/uuid-redirects.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"Compendium.pf2e.equipment-effects.Item.kgotU0sFmtAHYySB": "Compendium.pf2e.equipment-effects.Item.Effect: Eagle Eye Elixir",
"Compendium.pf2e.equipment-effects.Item.kkDbalYEavzRpYlp": "Compendium.pf2e.equipment-effects.Item.Effect: Antiplague",
"Compendium.pf2e.equipment-effects.Item.KtQXsv7mCvMMGXdK": "Compendium.pf2e.equipment-effects.Item.Effect: Life-Boosting Oil",
"Compendium.pf2e.equipment-effects.Item.LhNZNHvmSs54c3Lj": "Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance",
"Compendium.pf2e.equipment-effects.Item.LH0IDLLF4RsT3KvM": "Compendium.pf2e.equipment-effects.Item.Effect: Energized Cartridge",
"Compendium.pf2e.equipment-effects.Item.M3EFomnN5xArdQmV": "Compendium.pf2e.equipment-effects.Item.Effect: Healer's Gel",
"Compendium.pf2e.equipment-effects.Item.M5veiDPQNQBevg7m": "Compendium.pf2e.equipment-effects.Item.Effect: Numbing Tonic",
Expand All @@ -137,6 +138,7 @@
"Compendium.pf2e.equipment-effects.Item.q1EhQ716bPSgJVnC": "Compendium.pf2e.equipment-effects.Item.Effect: Bravo's Brew",
"Compendium.pf2e.equipment-effects.Item.q58ahUEjUzTXffRN": "Compendium.pf2e.equipment-effects.Item.Effect: Perfect Droplet - Armor",
"Compendium.pf2e.equipment-effects.Item.qFT6TJU5EObpoixe": "Compendium.pf2e.equipment-effects.Item.Effect: Ghostcaller's Planchette - Armor",
"Compendium.pf2e.equipment-effects.Item.QTmnUgiJnPli1dS0": "Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance",
"Compendium.pf2e.equipment-effects.Item.QuZ5frBMJF3gi7RY": "Compendium.pf2e.equipment-effects.Item.Effect: Antidote",
"Compendium.pf2e.equipment-effects.Item.qVKrrKpTghgMIuGH": "Compendium.pf2e.equipment-effects.Item.Effect: Antiplague",
"Compendium.pf2e.equipment-effects.Item.QXJLvL2k3WqlF0SN": "Compendium.pf2e.equipment-effects.Item.Effect: Grim Sandglass - Armor",
Expand All @@ -146,6 +148,7 @@
"Compendium.pf2e.equipment-effects.Item.RLsdvhmTh64Mmty9": "Compendium.pf2e.equipment-effects.Item.Effect: Frost Vial",
"Compendium.pf2e.equipment-effects.Item.rnVjsjav50CHwMVr": "Compendium.pf2e.equipment-effects.Item.Effect: Blood Booster",
"Compendium.pf2e.equipment-effects.Item.RxtpVyOywdrt29Q6": "Compendium.pf2e.equipment-effects.Item.Effect: Desolation Locket - Armor",
"Compendium.pf2e.equipment-effects.Item.sEa4TGXGBxku1V7o": "Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance",
"Compendium.pf2e.equipment-effects.Item.SpUT3mCa2NVKruJ9": "Compendium.pf2e.equipment-effects.Item.Effect: Life-Boosting Oil",
"Compendium.pf2e.equipment-effects.Item.T38SHe842S43a8bB": "Compendium.pf2e.equipment-effects.Item.Effect: Beastmaster's Sigil - Ranged Weapon",
"Compendium.pf2e.equipment-effects.Item.tcHG8NlsYmHdziko": "Compendium.pf2e.equipment-effects.Item.Effect: Grim Sandglass - Weapon",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

108 changes: 108 additions & 0 deletions packs/equipment-effects/effect-potion-of-acid-resistance.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"_id": "k8Gt8zfPOhkYOn1A",
"img": "systems/pf2e/icons/equipment/consumables/potions/potion-of-acid-resistance.webp",
"name": "Effect: Potion of Acid Resistance",
"system": {
"description": {
"value": "<p>Granted by @UUID[Compendium.pf2e.equipment-srd.Item.Potion of Acid Resistance (Lesser)], @UUID[Compendium.pf2e.equipment-srd.Item.Potion of Acid Resistance (Moderate)], @UUID[Compendium.pf2e.equipment-srd.Item.Potion of Acid Resistance (Greater)]</p>\n<p>You gain resistance against acid damage.</p>"
},
"duration": {
"expiry": "turn-start",
"sustained": false,
"unit": "hours",
"value": 1
},
"level": {
"value": 1
},
"publication": {
"license": "ORC",
"remaster": true,
"title": "Pathfinder GM Core"
},
"rules": [
{
"adjustName": false,
"choices": [
{
"predicate": [
{
"or": [
"parent:origin:item:slug:potion-of-acid-resistance-lesser",
{
"not": "parent:origin:item"
}
]
}
],
"value": "Compendium.pf2e.equipment-srd.Item.Potion of Acid Resistance (Lesser)"
},
{
"predicate": [
{
"or": [
"parent:origin:item:slug:potion-of-acid-resistance-moderate",
{
"not": "parent:origin:item"
}
]
}
],
"value": "Compendium.pf2e.equipment-srd.Item.Potion of Acid Resistance (Moderate)"
},
{
"predicate": [
{
"or": [
"parent:origin:item:slug:potion-of-acid-resistance-greater",
{
"not": "parent:origin:item"
}
]
}
],
"value": "Compendium.pf2e.equipment-srd.Item.Potion of Acid Resistance (Greater)"
}
],
"key": "ChoiceSet",
"prompt": "PF2E.SpecificRule.Prompt.EquipmentVariety",
"rollOption": "potion-of-acid-resistance"
},
{
"key": "Resistance",
"predicate": [
"potion-of-acid-resistance:potion-of-acid-resistance-lesser"
],
"type": "acid",
"value": 5
},
{
"key": "Resistance",
"predicate": [
"potion-of-acid-resistance:potion-of-acid-resistance-moderate"
],
"type": "acid",
"value": 10
},
{
"key": "Resistance",
"predicate": [
"potion-of-acid-resistance:potion-of-acid-resistance-greater"
],
"type": "acid",
"value": 15
}
],
"start": {
"initiative": null,
"value": 0
},
"tokenIcon": {
"show": true
},
"traits": {
"value": []
}
},
"type": "effect"
}
2 changes: 1 addition & 1 deletion packs/equipment/potion-of-acid-resistance-greater.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"containerId": null,
"damage": null,
"description": {
"value": "<p><strong>Activate</strong> <span class=\"action-glyph\">A</span> (manipulate)</p>\n<hr />\n<p>Drinking this thick, fortifying potion grants resistance 15 against acid damage for 1 hour.</p>\n<p>@UUID[Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance (Greater)]</p>"
"value": "<p><strong>Activate</strong> <span class=\"action-glyph\">A</span> (manipulate)</p><hr /><p>Drinking this thick, fortifying potion grants resistance 15 against acid damage for 1 hour.</p>\n<p>@UUID[Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance]</p>"
},
"hardness": 0,
"hp": {
Expand Down
2 changes: 1 addition & 1 deletion packs/equipment/potion-of-acid-resistance-lesser.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"containerId": null,
"damage": null,
"description": {
"value": "<p><strong>Activate</strong> <span class=\"action-glyph\">A</span> (manipulate)</p>\n<hr />\n<p>Drinking this thick, fortifying potion grants resistance 5 against acid damage for 1 hour.</p>\n<p>@UUID[Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance (Lesser)]</p>"
"value": "<p><strong>Activate</strong> <span class=\"action-glyph\">A</span> (manipulate)</p><hr /><p>Drinking this thick, fortifying potion grants resistance 5 against acid damage for 1 hour.</p>\n<p>@UUID[Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance]</p>"
},
"hardness": 0,
"hp": {
Expand Down
2 changes: 1 addition & 1 deletion packs/equipment/potion-of-acid-resistance-moderate.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"containerId": null,
"damage": null,
"description": {
"value": "<p><strong>Activate</strong> <span class=\"action-glyph\">A</span> (manipulate)</p>\n<hr />\n<p>Drinking this thick, fortifying potion grants resistance 10 against acid damage for 1 hour.</p>\n<p>@UUID[Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance (Moderate)]</p>"
"value": "<p><strong>Activate</strong> <span class=\"action-glyph\">A</span> (manipulate)</p><hr /><p>Drinking this thick, fortifying potion grants resistance 10 against acid damage for 1 hour.</p>\n<p>@UUID[Compendium.pf2e.equipment-effects.Item.Effect: Potion of Acid Resistance]</p>"
},
"hardness": 0,
"hp": {
Expand Down