Fix mortal+shield again

module/config/system.mjs

@@ -53,10 +53,12 @@ export const MORTAL_CHOICES = {
   "shirefolk": {label: "Shire Folk", value: "Shire Folk", defenseBonus: 2},
   "Elf": {label: "Elf", value: "Elf", defenseBonus: 0},
   "Half-orc": {label: "Half-Orc", value: "Half-Orc", defenseBonus: 0},
+  "Half-Orc": {label: "Half-Orc", value: "Half-Orc", defenseBonus: 0},
   "Dwarf": {label: "Dwarf", value: "Dwarf", defenseBonus: 0},
   "Half-elf": {label: "Half-Elf", value: "Half-Elf", defenseBonus: 0},
   "Gnome": {label: "Gnome", value: "Gnome", defenseBonus: 2},
   "Shire Folk": {label: "Shire Folk", value: "Shire Folk", defenseBonus: 2},
+  "Shire folk": {label: "Shire Folk", value: "Shire Folk", defenseBonus: 2},
   "Mankind": {label: "Human", value: "Human", defenseBonus: 0},
 }
 
@@ -96,7 +98,7 @@ export const RANGE_CHOICES = {
   "extreme": {label: "Extreme (+20)", value: "+20"},
   "beyondskill": {label: "Beyond Skill (+25)", value: "+25"}
 }
-  
+
 export const ATTACKER_AIM_CHOICES = {
   "simple": {label: "Simple (+0)", value: "0"},
   "careful": {label: "Careful (-4)", value: "-4"},
@@ -119,7 +121,7 @@ export const INITIATIVE_DICE_CHOICES_PER_CLASS = {
     { "name": "Aware of the enemy, can hear them but not see (2D4)", "value": "2D4" },
     { "name": "Aware and know exactly where the enemy is (2D3)", "value": "2D3" }
   ],
-  "fighter": [ 
+  "fighter": [
     { "name": "Asleep or totally distracted (1D12)", "value": "1D12" },
     { "name": "Awake but unsuspecting (1D8)", "value": "1D8" },
     { "name": "Declared Ready on Alert (1D6)", "value": "1D6" },
@@ -163,7 +165,7 @@ export const CHAR_CLASSES = {
   "rogue": "Rogue",
   "ranger": "Ranger",
   "cleric": "Cleric",
-  "magicuser": "Magic User"  
+  "magicuser": "Magic User"
 }
 
 export const CHAR_CLASSES_DEFINES = {
@@ -176,7 +178,7 @@ export const CHAR_CLASSES_DEFINES = {
 }
 
 export const DICE_VALUES = {
-  "d3": "D3",  
+  "d3": "D3",
   "d4": "D4",
   "d6": "D6",
   "d8": "D8",
@@ -191,7 +193,8 @@ export const CHARACTERISTIC_DEFENSE = [ "int", "wis", "dex" ]
 export const CHARACTERISTIC_DAMAGE = [ "str" ]
 
 export const DEFENSE_DICE_VALUES = {
-  "d3": "D3",  
+  "0": "0",
+  "d3": "D3",
   "d4": "D4",
   "d6": "D6",
   "d8": "D8",
@@ -280,7 +283,7 @@ export const SYSTEM = {
   id: SYSTEM_ID,
   CHARACTERISTICS: CHARACTER.CHARACTERISTICS,
   CHARACTERISTICS_TABLES: CHARACTERISTICS.TABLES,
-  CHARACTERISTICS_MAJOR: CHARACTERISTICS.MAJOR, 
+  CHARACTERISTICS_MAJOR: CHARACTERISTICS.MAJOR,
   MONSTER_CHARACTERISTICS: MONSTER.MONSTER_CHARACTERISTICS,
   MONSTER_RESIST: MONSTER.MONSTER_RESIST,
   MONSTER_SAVES: MONSTER.MONSTER_SAVES,

module/models/shield.mjs

@@ -8,7 +8,7 @@ export default class LethalFantasyShield extends foundry.abstract.TypeDataModel
     schema.description = new fields.HTMLField({ required: true, textSearch: true })
     schema.defense = new fields.StringField({required: true, initial: "d4", choices: SYSTEM.SHIELD_DEFENSE_DICE})
     schema.movementreduction = new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 })
-    schema.hascover = new fields.BooleanField({ required: true, initial: false }) 
+    schema.hascover = new fields.BooleanField({ required: true, initial: false })
 
     schema.standing = new fields.SchemaField({
       min: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }),

module/models/weapon.mjs

@@ -9,33 +9,33 @@ export default class LethalFantasySkill extends foundry.abstract.TypeDataModel {
     schema.description = new fields.HTMLField({ required: true, textSearch: true })
     schema.weaponType = new fields.StringField({ required: true, initial: "melee", choices: SYSTEM.WEAPON_TYPE })
     schema.weaponClass = new fields.StringField({ required: true, initial: "shortblade", choices: SYSTEM.WEAPON_CLASS })
-    
+
-    schema.damageType = new fields.SchemaField({  
+    schema.damageType = new fields.SchemaField({
       typeP: new fields.BooleanField(),
       typeB: new fields.BooleanField(),
       typeS: new fields.BooleanField()
     })
-    schema.damage = new fields.SchemaField({  
+    schema.damage = new fields.SchemaField({
       damageS: new fields.StringField({required: true, initial: ""}),
       damageM: new fields.StringField({required: true, initial: ""})
     })
     schema.applyStrengthDamageBonus = new fields.BooleanField({ required: true, initial: true })
-    
+
     schema.hands = new fields.StringField({ required: true, initial: "1", choices: {"1": "1", "2": "2"} })
     schema.isAgile = new fields.BooleanField({ required: true, initial: false })
-    
+
     schema.defenseMax = new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 })
     schema.secondsToAttack = new fields.StringField({required: true, initial: ""})
     schema.combatProgressionDice = new fields.StringField({required: true, initial: "d4", choices: SYSTEM.COMBAT_PROGRESSION_DICE})
 
-    schema.speed = new fields.SchemaField({  
+    schema.speed = new fields.SchemaField({
       simpleAim: new fields.StringField({required: true, initial: ""}),
       carefulAim: new fields.StringField({required: true, initial: ""}),
       focusedAim: new fields.StringField({required: true, initial: ""})
     })
 
     schema.defense = new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 })
-    schema.weaponRange = new fields.SchemaField({  
+    schema.weaponRange = new fields.SchemaField({
       pointBlank: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }),
       short: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }),
       medium: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }),
@@ -44,7 +44,7 @@ export default class LethalFantasySkill extends foundry.abstract.TypeDataModel {
       outOfSkill: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 })
     })
 
-    schema.bonuses = new fields.SchemaField({ 
+    schema.bonuses = new fields.SchemaField({
       attackBonus: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }),
       damageBonus: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }),
       defenseBonus: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 })