Improvements to class features and the importer (#108)

* Handle NPC stats with damage bonus/penalty.
Closes #104.

* Handle warrior attack bonus not being a dice expression.
Closes #103.

* Add title to upper level sheet header.
Closes #99.

* Handle missing weapons and avoid confusing armor with missing weapons.

* Update details.sheetClass when the sheet class changes.

* Implement the option to backstab for any character.
Closes #94, Closes #102

* Format fixes.

* Refactor crit and fumble lookups into their own functions.

* Show crit and fumble roll and formula.
Closes #98

* Support applying damage/healing from any chat card with a dice roll.
Closes #106

* Add comments for rollCrit and rollFumble.

* Prompt for confirmation before deleting items from actor sheets.
Closes #77

* Cleric disapproval implementation.
Allow selection of a compendium for disapproval tables in the system
settings.
Add field for selection of a disapproval table on the cleric sheet.
Disapproval Range label increases disapproval range.
Disapproval Table label rolls for disapproval (with prompt for the dice
formula)
Macros for Disapproval Range and Disapproval Table
Closes #58

* Update system.json - version 0.17 compatible with Foundry 0.7.7

* Hide Purple Sorcerer link on NPC import form.
Closes #107

* Implement a setting to enable the standard dice roll/table draw chat
cards for attack and damage rolls, and crits and fumbles.
Closes #93

* Highlight disapproval automatically for clerics.
Migrate a flag into cleric spells that are implemented as skill checks
to check for disapproval.

Author: mooped

lang/en.json

@@ -48,6 +48,7 @@
   "DCC.AlignmentL": "Lawful",
   "DCC.AlignmentN": "Neutral",
   "DCC.Ammunition": "Ammunition",
+  "DCC.ApplyDisapprovalMacroName": "Increase Disapproval Range",
   "DCC.Armor": "Armor",
   "DCC.ArmorClass": "Armor Class",
   "DCC.ArmorPropertiesACBonus": "AC Bonus",
@@ -58,11 +59,13 @@
   "DCC.Attack": "Attack",
   "DCC.AttackBonus": "Attack Bonus",
   "DCC.AttackPl": "Attacks",
+  "DCC.AttackRoll": "Attack Roll",
   "DCC.AttackRollEmote": "Attacks with their {weaponName} and hits AC {rollHTML} for {damageRollHTML}  points of damage!{crit}{fumble}",
   "DCC.Attributes": "Attributes",
   "DCC.Attuned": "Attuned",
   "DCC.Background": "Background",
   "DCC.Backstab": "Backstab",
+  "DCC.BackstabRoll": "Backstab Roll",
   "DCC.BackstabEmote": "Backstabs with their {weaponName} and hits AC {rollHTML} for {damageRollHTML}  points of damage!{crit}{fumble}",
   "DCC.BadValueFormulaWarning": "Bad formula in item value field!",
   "DCC.BaseACAbilityConfig": "Base AC Ability",
@@ -184,17 +187,24 @@
   "DCC.DamageLightning": "Lightning",
   "DCC.DamagePiercing": "Piercing",
   "DCC.DamagePoison": "Poison",
+  "DCC.DamageRoll": "Damage Roll",
   "DCC.DamageSlashing": "Slashing",
   "DCC.Day": "Day",
   "DCC.DeedRoll": "Deed Roll",
   "DCC.Default": "Default",
   "DCC.DefaultAbilityCheck": "Default Ability Check",
   "DCC.Deity": "Deity",
+  "DCC.DeleteItem": "Delete this item from the sheet?",
+  "DCC.DeleteItemExplain": "This will remove the item and cannot be undone.",
   "DCC.Description": "Description",
   "DCC.Details": "Details",
   "DCC.DisableTrap": "Disable Trap",
   "DCC.Disadvantage": "Disadvantage",
+  "DCC.DisapprovalFormulaWarning": "Invalid roll formula for disapproval '{formula}'.",
   "DCC.DisapprovalRange": "Disapproval Range",
+  "DCC.DisapprovalRoll": "Disapproval Roll",
+  "DCC.DisapprovalRollFormula": "Disapproval Roll",
+  "DCC.DisapprovalTable": "Disapproval Table",
   "DCC.DisguiseSelf": "Disguise Self",
   "DCC.DistAny": "Any",
   "DCC.DistFt": "Feet",
@@ -391,6 +401,7 @@
   "DCC.Roll": "Roll",
   "DCC.RollAttackBonusConfig": "Roll Attack Bonus",
   "DCC.RollAttackBonusInfo": "Use @ab in ToHit or Damage for last roll",
+  "DCC.RollDisapprovalMacroName": "Roll for Disapproval",
   "DCC.RollExample": "e.g. +1d4",
   "DCC.RollMode": "Roll Mode",
   "DCC.RollSituationalBonus": "Situational Bonus?",
@@ -408,10 +419,17 @@
   "DCC.Senses": "Senses",
   "DCC.SettingCriticalHitsCompendium": "Critical Hits Compendium",
   "DCC.SettingCriticalHitsCompendiumHint": "Compendium to look in for critical hit tables - table name must start with Crit Table XXX (where XXX is the actor's crit table)",
+  "DCC.SettingDeleteItem": "Prompt for Item Deletion",
+  "DCC.SettingDeleteItemHint": "Ask for confirmation before deleting equipment, spells, or custom skills from character sheets.",
+  "DCC.SettingDisapprovalTablesCompendium": "Disapproval Tables Compendium",
+  "DCC.SettingDisapprovalTablesCompendiumHint": "Compendium to look in for critical hit tables. The specific table to use is selectable from the Cleric sheet.",
   "DCC.SettingFumbleTable": "Fumble Table",
   "DCC.SettingFumbleTableHint": "Roll Table to use for fumbles - must be in a compendium pack",
+  "DCC.SettingStandardDiceRoller": "Use standard chat cards for dice rolls",
+  "DCC.SettingStandardDiceRollerHint": "Use Foundry's standard cards to display attack, damage, crit, and fumble rolls instead of the custom card.",
   "DCC.SheetConfig": "Sheet Configuration",
   "DCC.ShieldBash": "Shield Bash",
+  "DCC.ShowBackstabConfig": "Show Backstab",
   "DCC.ShowMaxAbilitiesConfig": "Show Max Abilities",
   "DCC.ShowSkillsConfig": "Show Custom Skills Tab",
   "DCC.ShowSpellsConfig": "Show Custom Spells Tab",
@@ -528,6 +546,7 @@
   "DCC.TraitToolProf": "Tool Proficiencies",
   "DCC.TraitWeaponProf": "Weapon Proficiencies",
   "DCC.Treasure": "Treasure",
+  "DCC.Title": "Title",
   "DCC.TurnUnholy": "Turn Unholy",
   "DCC.TwoWeaponFighting": "Two Weapon Fighting",
   "DCC.Type": "Type",

module/__tests__/npc-parser.test.js

@@ -248,3 +248,41 @@ test('familiar', () => {
   }
   expect(parsedNPC).toMatchObject(expected)
 })
+
+/* Test damage modifiers */
+test('bonusguy', () => {
+  const parsedNPC = parseNPC('Bonus Guy: Init -1; Atk big club +3 melee (1d4+2) or small club -2 melee (1d4 - 3); AC 13; HD 1d8+2; MV 30’; Act 1d20; SV Fort +2, Ref +1, Will -2; AL C.')
+  const expected = {
+    name: 'Bonus Guy',
+    'data.attributes.init.value': '-1',
+    'data.attributes.ac.value': '13',
+    'data.attributes.hitDice.value': '1d8+2',
+    'data.attributes.speed.value': '30’',
+    'data.config.actionDice': '1d20',
+    'data.saves.frt.value': '+2',
+    'data.saves.ref.value': '+1',
+    'data.saves.wil.value': '-2',
+    'data.details.alignment': 'c',
+    items: [
+      {
+        name: 'big club',
+        type: 'weapon',
+        data: {
+          toHit: '+3',
+          damage: '1d4+2',
+          melee: true
+        }
+      },
+      {
+        name: 'small club',
+        type: 'weapon',
+        data: {
+          toHit: '-2',
+          damage: '1d4 - 3',
+          melee: true
+        }
+      }
+    ]
+  }
+  expect(parsedNPC).toMatchObject(expected)
+})

module/__tests__/pc-parser.test.js

@@ -1466,3 +1466,111 @@ Spells: (Spell Check: d20+5)
   }
   expect(parsedNPC).toMatchObject(expected)
 })
+
+/* Missing weapons test */
+test('underarmed_warrior', () => {
+  const parsedNPC = parsePC(
+`Generator Settings
+Source: Rulebook | Roll Mode: 3d6 | HP: normal | HP-up: normal | Augur: normal
+
+Lawful Warrior (1st level)
+Occupation: Confidence artist
+Strength: 13 (+1)
+Agility: 11 (0)
+Stamina: 15 (+1)
+Personality: 14 (+1)
+Intelligence: 9 (0)
+Luck: 9 (0)
+
+HP: 13; Speed: 30; Init: 1
+Ref: 1; Fort: 2; Will: 1
+
+Base Attack Mod: d3
+Attack Dice: 1d20; Crit Die/Table: 1d12/III
+Occupation Weapon: Dagger melee d3+1 (dmg 1d4+1+deed)
+Main Weapon:
+Secondary Weapon:
+
+AC: (10) (Unarmored (+0) Check penalty (0) Fumble die (d4))
+Equipment: Sack (large) (12 cp)
+Trade good: Quality cloak
+Starting Funds: 33 cp + 30 gp
+Lucky sign: Righteous heart (Turn unholy checks) (+0)
+Languages: Common
+Warrior trait: Lucky weapon - choose one weapon that you apply your luck mod to`
+  )
+  const expected = {
+    'data.attributes.init.value': '1',
+    'data.attributes.speed.value': '30',
+    'data.details.occupation.value': 'Confidence artist',
+    'data.attributes.ac.value': '10',
+    'data.attributes.hp.value': '13',
+    'data.attributes.hp.max': '13',
+    'data.attributes.critical.die': '1d12',
+    'data.attributes.critical.table': 'III',
+    'data.abilities.str.value': '13',
+    'data.abilities.agl.value': '11',
+    'data.abilities.sta.value': '15',
+    'data.abilities.per.value': '14',
+    'data.abilities.int.value': '9',
+    'data.abilities.lck.value': '9',
+    'data.abilities.str.max': '13',
+    'data.abilities.agl.max': '11',
+    'data.abilities.sta.max': '15',
+    'data.abilities.per.max': '14',
+    'data.abilities.int.max': '9',
+    'data.abilities.lck.max': '9',
+    'data.class.className': 'Warrior',
+    'data.config.actionDice': '1d20',
+    'data.details.alignment': 'l',
+    'data.details.attackBonus': 'd3',
+    'data.details.birthAugur': 'Righteous heart (Turn unholy checks) (+0)',
+    'data.details.languages': 'Common',
+    'data.details.level.value': '1',
+    'data.saves.frt.value': '2',
+    'data.saves.ref.value': '1',
+    'data.saves.wil.value': '1',
+    items: [
+      {
+        name: 'Dagger',
+        type: 'weapon',
+        data: {
+          toHit: 'd3+1',
+          damage: '1d4+1+@ab',
+          melee: true
+        }
+      },
+      {
+        name: 'Unarmored',
+        type: 'armor',
+        data: {
+          acBonus: '+0',
+          checkPenalty: '0',
+          fumbleDie: '1d4'
+        }
+      },
+      {
+        name: 'Sack (large) (12 cp)',
+        type: 'equipment'
+      },
+      {
+        name: 'Quality cloak',
+        type: 'equipment'
+      },
+      {
+        name: 'Coins',
+        type: 'treasure',
+        data: {
+          value: {
+            pp: '0',
+            ep: '0',
+            gp: '30',
+            sp: '0',
+            cp: '33'
+          },
+          isCoins: true
+        }
+      }]
+  }
+  expect(parsedNPC).toMatchObject(expected)
+})