Added block via shield properties

src/calculator/stat_applications.ts

@@ -17,7 +17,7 @@ const applications: { [key: string]: Application } = {
     type: 'flat',
   },
   'additional_block_%': {
-    classification: [],
+    classification: ['block'],
     type: 'flat',
   },
   'additional_block_chance_against_projectiles_%': {
@@ -653,7 +653,7 @@ const applications: { [key: string]: Application } = {
     type: 'inc',
   },
   'local_additional_block_chance_%': {
-    classification: [],
+    classification: ['local', 'block'],
     type: 'flat',
   },
   local_always_hit: {

src/containers/item/components/properties/ShieldProperties.ts

@@ -0,0 +1,19 @@
+import ArmourProperties from './ArmourProperties';
+import Stat from '../../../../calculator/Stat';
+import ValueRange from '../../../../calculator/ValueRange';
+import Value from '../../../../calculator/Value';
+
+export default class ShieldProperties extends ArmourProperties {
+  public block() {
+    const { shield_type } = this.parent.baseitem;
+
+    if (shield_type === undefined) {
+      throw new Error('shield_type not set in baseitem');
+    }
+
+    const { block } = shield_type;
+    const base_block = new Value([block, block], ['local', 'block'])
+
+    return base_block.augmentWith(Object.values(this.parent.stats())).compute();
+  }
+}

src/containers/item/components/properties/__tests__/ShieldProperties.ts

@@ -0,0 +1,33 @@
+import { createTables } from '../../../../../__fixtures__/util';
+import ShieldProperties from '../ShieldProperties';
+
+const { items, mods } = createTables();
+
+it('should consider have a base block', () => {
+  const buckler = items.fromName('Goathide Buckler');
+
+  expect((buckler.properties as ShieldProperties).block().value).toEqual(25);
+});
+
+it('should consider stats that improve block', () => {
+  const eva_shield = items
+    .fromName('Goathide Buckler')
+    .addMod(mods.fromId('AdditionalBlockChance1'));
+  expect((eva_shield.properties as ShieldProperties).block().value).toEqual([
+    26,
+    28,
+  ]);
+
+  const str_shield = items
+    .fromName('Goathide Buckler')
+    .addMod(mods.fromId('AdditionalBlockChance1'))
+    .addMod(
+      mods.fromId(
+        'LocalIncreasedPhysicalDamageReductionRatingPercentAndAdditionalBlockChance1',
+      ),
+    );
+  expect((str_shield.properties as ShieldProperties).block().value).toEqual([
+    28,
+    30,
+  ]);
+});

src/containers/item/components/properties/build.ts

@@ -1,9 +1,12 @@
 import ItemProperties, { Builder } from './Properties';
 import ArmourProperties from './ArmourProperties';
+import ShieldProperties from './ShieldProperties';
 import Item from '../..';
 
 export default function build(item: Item, builder: Builder): ItemProperties {
-  if (item.meta_data.isA('AbstractArmour')) {
+  if (item.meta_data.isA('AbstractShield')) {
+    return new ShieldProperties(item, builder);
+  } else if (item.meta_data.isA('AbstractArmour')) {
     return new ArmourProperties(item, builder);
   } else {
     return new ItemProperties(item, builder);