Implement Animal Skin as written

foundryvtt · Mar 1, 2022 · e115034 · e115034
1 parent f9bea99
commit e115034
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 19 deletions.
diff --git a/packs/data/equipment.db/bracers-of-armor-i.json b/packs/data/equipment.db/bracers-of-armor-i.json
@@ -67,12 +67,14 @@
  {
  "key": "FlatModifier",
  "selector": "ac",
+ "slug": "bracers-of-armor",
  "type": "item",
  "value": 1
  },
  {
  "key": "FlatModifier",
  "selector": "saving-throw",
+ "slug": "bracers-of-armor",
  "type": "item",
  "value": 1
  },

diff --git a/packs/data/equipment.db/bracers-of-armor-ii.json b/packs/data/equipment.db/bracers-of-armor-ii.json
@@ -67,12 +67,14 @@
  {
  "key": "FlatModifier",
  "selector": "ac",
+ "slug": "bracers-of-armor",
  "type": "item",
  "value": 2
  },
  {
  "key": "FlatModifier",
  "selector": "saving-throw",
+ "slug": "bracers-of-armor",
  "type": "item",
  "value": 2
  },

diff --git a/packs/data/equipment.db/bracers-of-armor-iii.json b/packs/data/equipment.db/bracers-of-armor-iii.json
@@ -67,12 +67,14 @@
  {
  "key": "FlatModifier",
  "selector": "ac",
+ "slug": "bracers-of-armor",
  "type": "item",
  "value": 3
  },
  {
  "key": "FlatModifier",
  "selector": "saving-throw",
+ "slug": "bracers-of-armor",
  "type": "item",
  "value": 3
  },

diff --git a/packs/data/feats.db/animal-skin.json b/packs/data/feats.db/animal-skin.json
@@ -33,35 +33,69 @@
  "label": "Animal Skin",
  "value": 3
  },
+ {
+ "key": "ActiveEffectLike",
+ "mode": "upgrade",
+ "path": "flags.pf2e.animalSkinBonus",
+ "value": 2
+ },
+ {
+ "key": "ActiveEffectLike",
+ "mode": "upgrade",
+ "path": "flags.pf2e.animalSkinBonus",
+ "predicate": {
+ "all": [
+ "self:feature:greater-juggernaut"
+ ]
+ },
+ "value": 3
+ },
  {
  "key": "FlatModifier",
- "label": "Animal Skin",
  "predicate": {
  "all": [
- "rage"
+ "self:effect:rage"
  ]
  },
  "selector": "ac",
  "type": "item",
- "value": {
- "brackets": [
- {
- "end": 12,
- "value": 2
- },
- {
- "start": 13,
- "value": 3
- }
+ "value": "@actor.data.flags.pf2e.animalSkinBonus"
+ },
+ {
+ "key": "AdjustModifier",
+ "mode": "add",
+ "predicate": {
+ "all": [
+ "self:effect:rage"
  ]
- }
+ },
+ "selector": "ac",
+ "slug": "clothing-explorers",
+ "value": "@actor.data.flags.pf2e.animalSkinBonus"
  },
  {
- "key": "ActiveEffectLike",
- "mode": "override",
- "path": "flags.pf2e.rollOptions.all.animal-skin",
- "priority": 10,
- "value": true
+ "key": "AdjustModifier",
+ "mode": "add",
+ "predicate": {
+ "all": [
+ "self:effect:rage"
+ ]
+ },
+ "selector": "ac",
+ "slug": "mage-armor",
+ "value": "@actor.data.flags.pf2e.animalSkinBonus"
+ },
+ {
+ "key": "AdjustModifier",
+ "mode": "add",
+ "predicate": {
+ "all": [
+ "self:effect:rage"
+ ]
+ },
+ "selectors": "ac",
+ "slug": "bracers-of-armor",
+ "value": "@actor.data.flags.pf2e.animalSkinBonus"
  }
  ],
  "source": {

diff --git a/src/module/actor/character/index.ts b/src/module/actor/character/index.ts
@@ -483,7 +483,7 @@ export class CharacterPF2e extends CreaturePF2e {
  let armorCheckPenalty = 0;
  const proficiency = wornArmor?.category ?? "unarmored";
 
- if (wornArmor) {
+ if (wornArmor && wornArmor.acBonus > 0) {
  dexCapSources.push({ value: Number(wornArmor.dexCap ?? 0), source: wornArmor.name });
  if (wornArmor.checkPenalty) {
  // armor check penalty