Lots of enhancements and bug fixes (#100)

* Update compatibleCoreVersion to 0.7.5.

* Separate die and modifier for Cast Spell From Scroll.
Separate die and modifier for initiative rolls.
Closes #65
Closes #86

* Initial implementation of rollable treasure and currency conversion (for
coins).

* Tidy value rolls and currency conversion.
Closes #80
Closes #87

* Use action die for relevant rolls.
Closes #55

* Saves are always rolled on a d20.

* Formatting pass and fix up tests to handle action die changes.

* Handle multiple action dice.
Action dice are set in the config dialog and selected from a dropdown
where the actionDice text field was.
Zeroes always use the first action dice defined in the config.
Closes #90

* Action Dice can be dragged to the macro bar to create a macro that
selects the current die.

* Add maximum fields for abilities and support showing them on the sheet.
Closes #88

* Populate ability score maximums with the initial ability score.

* Implement basic upper level character parsing.
Put some zero level fields in the right places.

* Cleric upper level import passing tests.

* Fix import of treasure items.
Avoid potential nasty infinite recursion when combining As Coins items.

* Handle upper level thieves.

* Parse upper level halfling stats.
Formatting pass.

* Upper level warrior parsing.

* Upper level wizard and dwarf parsing.

* Parse upper level Elf stats.
Closes #90

* Put back template for the 'results' field of spells.

* Validate and format speed field as a distance in feet.
Closes #97

* Remove ability label if a class doesn't have a spellCheckAbility
defined.
Closes #92

* Run formatter.

* Use roll.roll() over roll.evaluate() for compatibility with 0.6.6.

* Rename Show Max Attributes to the more correct Show Max Abilities

* Bump minimal compatible version to 0.6.6 as I'm currently testing on that and latest.

* Bump to 0.16

Author: mooped

lang/en.json

@@ -30,6 +30,7 @@
   "DCC.Action": "Action",
   "DCC.ActionAbil": "Ability Check",
   "DCC.ActionDice": "Action Dice",
+  "DCC.ActionDiceMacroName": "Action Dice ({die})",
   "DCC.ActionHeal": "Healing",
   "DCC.ActionMSAK": "Melee Spell Attack",
   "DCC.ActionMWAK": "Melee Weapon Attack",
@@ -63,6 +64,7 @@
   "DCC.Background": "Background",
   "DCC.Backstab": "Backstab",
   "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",
   "DCC.Bio": "Bio",
   "DCC.Biography": "Biography",
@@ -162,8 +164,15 @@
   "DCC.CurrencyCP": "Copper",
   "DCC.CurrencyConvert": "Convert All Currency",
   "DCC.CurrencyConvertHint": "Convert all carried currency to the highest possible denomination to reduce the amount of coinage carried by the character. Be wary, this action cannot be undone.",
+  "DCC.CurrencyEP": "Electrum",
   "DCC.CurrencyGP": "Gold",
+  "DCC.CurrencyPP": "Platinum",
   "DCC.CurrencySP": "Silver",
+  "DCC.CurrencyShortCP": "Cp.",
+  "DCC.CurrencyShortEP": "Ep.",
+  "DCC.CurrencyShortGP": "Gp.",
+  "DCC.CurrencyShortPP": "Pp.",
+  "DCC.CurrencyShortSP": "Sp.",
   "DCC.DamImm": "Damage Immunities",
   "DCC.DamRes": "Damage Resistances",
   "DCC.DamVuln": "Damage Vulnerabilities",
@@ -374,16 +383,18 @@
   "DCC.RangedWeapons": "Ranged Weapons",
   "DCC.Rarity": "Rarity",
   "DCC.Reaction": "Reaction",
+  "DCC.ReadLanguages": "Read Languages",
   "DCC.RemoveEmptyItems": "Remove empty items",
   "DCC.RemoveEmptyItemsInfo": "Remove items with zero quantity",
-  "DCC.ReadLanguages": "Read Languages",
   "DCC.RequiredMaterials": "Required Materials",
+  "DCC.ResolveValueEmote": "Rolled value of {itemName}:<br/>{pp} Pp. {ep} Ep. {gp} Gp. {sp} Sp. {cp} Cp.",
   "DCC.Roll": "Roll",
   "DCC.RollAttackBonusConfig": "Roll Attack Bonus",
   "DCC.RollAttackBonusInfo": "Use @ab in ToHit or Damage for last roll",
   "DCC.RollExample": "e.g. +1d4",
   "DCC.RollMode": "Roll Mode",
   "DCC.RollSituationalBonus": "Situational Bonus?",
+  "DCC.RollTreasureValue": "Roll Treasure Value",
   "DCC.RollUnder": "{name} (Roll Under)",
   "DCC.SameAlignment": "Same",
   "DCC.Save": "Save",
@@ -401,8 +412,9 @@
   "DCC.SettingFumbleTableHint": "Roll Table to use for fumbles - must be in a compendium pack",
   "DCC.SheetConfig": "Sheet Configuration",
   "DCC.ShieldBash": "Shield Bash",
-  "DCC.ShowSkills": "Show Custom Skills Tab",
-  "DCC.ShowSpells": "Show Custom Spells Tab",
+  "DCC.ShowMaxAbilitiesConfig": "Show Max Abilities",
+  "DCC.ShowSkillsConfig": "Show Custom Skills Tab",
+  "DCC.ShowSpellsConfig": "Show Custom Spells Tab",
   "DCC.Size": "Size",
   "DCC.SizeGargantuan": "Gargantuan",
   "DCC.SizeHuge": "Huge",

module/__tests__/actor.test.js

@@ -36,7 +36,7 @@ test('roll ability check', () => {
 
   actor.rollAbilityCheck('str')
   expect(Roll).toHaveBeenCalledTimes(1)
-  expect(Roll).toHaveBeenCalledWith('1d20+@abilMod', { abilMod: -1, critical: 20 })
+  expect(Roll).toHaveBeenCalledWith('@die+@abilMod', { die: '1d20', abilMod: -1, critical: 20 })
   expect(rollToMessageMock).toHaveBeenCalledWith({ flavor: 'AbilityStr Check', speaker: actor })
 
   // Check that rollUnder option is interpreted correctly
@@ -48,7 +48,7 @@ test('roll ability check', () => {
   // ...both ways
   actor.rollAbilityCheck('lck', { rollUnder: false })
   expect(Roll).toHaveBeenCalledTimes(3)
-  expect(Roll).toHaveBeenCalledWith('1d20+@abilMod', { abilMod: -1, critical: 20 })
+  expect(Roll).toHaveBeenCalledWith('@die+@abilMod', { die: '1d20', abilMod: -1, critical: 20 })
   expect(rollToMessageMock).toHaveBeenLastCalledWith({ flavor: 'AbilityLck Check', speaker: actor })
 })
 
@@ -57,17 +57,17 @@ test('roll saving throw', () => {
 
   actor.rollSavingThrow('frt')
   expect(Roll).toHaveBeenCalledTimes(1)
-  expect(Roll).toHaveBeenCalledWith('1d20+@saveMod', { saveMod: -1 })
+  expect(Roll).toHaveBeenCalledWith('@die+@saveMod', { die: '1d20', saveMod: -1 })
   expect(rollToMessageMock).toHaveBeenCalledWith({ flavor: 'SavesFortitude Save', speaker: actor })
 
   actor.rollSavingThrow('ref')
   expect(Roll).toHaveBeenCalledTimes(2)
-  expect(Roll).toHaveBeenCalledWith('1d20+@saveMod', { saveMod: 0 })
+  expect(Roll).toHaveBeenCalledWith('@die+@saveMod', { die: '1d20', saveMod: 0 })
   expect(rollToMessageMock).toHaveBeenCalledWith({ flavor: 'SavesReflex Save', speaker: actor })
 
   actor.rollSavingThrow('wil')
   expect(Roll).toHaveBeenCalledTimes(3)
-  expect(Roll).toHaveBeenCalledWith('1d20+@saveMod', { saveMod: +12 })
+  expect(Roll).toHaveBeenCalledWith('@die+@saveMod', { die: '1d20', saveMod: +12 })
   expect(rollToMessageMock).toHaveBeenCalledWith({ flavor: 'SavesWill Save', speaker: actor })
 })
 
@@ -76,7 +76,7 @@ test('roll initiative', () => {
 
   actor.rollInitiative()
   expect(Roll).toHaveBeenCalledTimes(1)
-  expect(Roll).toHaveBeenCalledWith('1d20+@init', { init: -1 })
+  expect(Roll).toHaveBeenCalledWith('@die+@init', { die: '1d20', init: -1 })
   expect(rollToMessageMock).toHaveBeenCalledWith({ flavor: 'Initiative', speaker: actor })
 })
 

module/__tests__/npc-parser.test.js

@@ -13,7 +13,7 @@ test('super snake', () => {
     'data.attributes.hp.value': '21',
     'data.attributes.hp.max': '21',
     'data.attributes.speed.value': '20’',
-    'data.attributes.actionDice.value': '1d20',
+    'data.config.actionDice': '1d20',
     'data.saves.frt.value': '+8',
     'data.saves.ref.value': '+4',
     'data.saves.wil.value': '+4',
@@ -44,7 +44,7 @@ test('pile of bones', () => {
     'data.attributes.hp.value': '3',
     'data.attributes.hp.max': '3',
     'data.attributes.speed.value': '5’',
-    'data.attributes.actionDice.value': '1d20',
+    'data.config.actionDice': '1d20',
     'data.saves.frt.value': '+0',
     'data.saves.ref.value': '-4',
     'data.saves.wil.value': '+1',
@@ -74,8 +74,8 @@ test('orcs', () => {
     'data.attributes.hp.value': '13',
     'data.attributes.hp.max': '13',
     'data.attributes.speed.value': '30’',
-    'data.attributes.actionDice.value': '1d20',
     'data.attributes.special.value': 'none',
+    'data.config.actionDice': '1d20',
     'data.saves.frt.value': '+3',
     'data.saves.ref.value': '+0',
     'data.saves.wil.value': '-1',
@@ -118,8 +118,8 @@ test('spider', () => {
     'data.attributes.hp.max': '20',
     'data.attributes.speed.value': '30’',
     'data.attributes.speed.other': 'climb 30’',
-    'data.attributes.actionDice.value': '1d20',
     'data.attributes.special.value': 'poison (DC 14 Fort save or additional 3d4 damage and lose 1 point of Strength, 1d4 damage if successful), create web, filled with bats',
+    'data.config.actionDice': '1d20',
     'data.saves.frt.value': '+2',
     'data.saves.ref.value': '+4',
     'data.saves.wil.value': '+0',
@@ -161,8 +161,8 @@ test('wedad', () => {
     'data.attributes.hp.value': '30',
     'data.attributes.hp.max': '30',
     'data.attributes.speed.value': 'none',
-    'data.attributes.actionDice.value': '1d20',
     'data.attributes.special.value': 'takes 2x damage from fire, can attack targets up to 20’ away with tree limbs',
+    'data.config.actionDice': '1d20',
     'data.saves.frt.value': '+6',
     'data.saves.ref.value': '-2',
     'data.saves.wil.value': '+4',
@@ -194,8 +194,8 @@ test('shortstats', () => {
     'data.attributes.hp.value': '4',
     'data.attributes.hp.max': '4',
     'data.attributes.speed.value': '30',
-    'data.attributes.actionDice.value': '1d20',
     'data.attributes.special.value': '',
+    'data.config.actionDice': '1d20',
     'data.saves.frt.value': '-2',
     'data.saves.ref.value': '+6',
     'data.saves.wil.value': '+4',
@@ -227,8 +227,8 @@ test('familiar', () => {
     'data.attributes.hp.value': '2',
     'data.attributes.hp.max': '2',
     'data.attributes.speed.value': '30',
-    'data.attributes.actionDice.value': '1d20',
     'data.attributes.special.value': '',
+    'data.config.actionDice': '1d20',
     'data.saves.frt.value': '+0',
     'data.saves.ref.value': '+0',
     'data.saves.wil.value': '+0',