Fix Character types, refactor

src/knave/Character.test.ts

@@ -1,3 +1,4 @@
+import { vi } from 'vitest'
 import KnaveCharacter from './Character'
 
 vi.mock('../dice/Dice')
@@ -7,101 +8,42 @@ vi.mock('../dice/Randomization')
 
 describe('KnaveCharacter', () => {
   describe('generate()', () => {
-    let generatedCharacter: KnaveCharacter
-
-    beforeEach(() => {
-      generatedCharacter = new KnaveCharacter()
-    })
-
     test('generates a level 1 character by default', () => {
+      const generatedCharacter = new KnaveCharacter()
       expect(generatedCharacter.level).toBe(1)
     })
 
     describe('abilities', () => {
-      describe('charisma', () => {
-        test('generates a random charisma', () => {
-          expect(generatedCharacter.charisma.bonus).toBeLessThanOrEqual(6)
-          expect(generatedCharacter.charisma.bonus).toBeGreaterThanOrEqual(1)
-        })
-
-        test('has a charisma defense that is 10 higher than the bonus', () => {
-          expect(generatedCharacter.charisma.defense).toEqual(
-            generatedCharacter.charisma.bonus + 10,
-          )
-        })
-      })
-
-      describe('constitution', () => {
-        test('generates a random constitution', () => {
-          expect(generatedCharacter.constitution.bonus).toBeLessThanOrEqual(6)
-          expect(generatedCharacter.constitution.bonus).toBeGreaterThanOrEqual(
-            1,
-          )
-        })
-
-        test('has a constitution defense that is 10 higher than the bonus', () => {
-          expect(generatedCharacter.constitution.defense).toEqual(
-            generatedCharacter.constitution.bonus + 10,
-          )
-        })
-      })
-
-      describe('dexterity', () => {
-        test('generates a random dexterity', () => {
-          expect(generatedCharacter.dexterity.bonus).toBeLessThanOrEqual(6)
-          expect(generatedCharacter.dexterity.bonus).toBeGreaterThanOrEqual(1)
-        })
-
-        test('has a dexterity defense that is 10 higher than the bonus', () => {
-          expect(generatedCharacter.dexterity.defense).toEqual(
-            generatedCharacter.dexterity.bonus + 10,
-          )
-        })
-      })
-
-      describe('intelligence', () => {
-        test('generates a random intelligence', () => {
-          expect(generatedCharacter.intelligence.bonus).toBeLessThanOrEqual(6)
-          expect(generatedCharacter.intelligence.bonus).toBeGreaterThanOrEqual(
-            1,
-          )
-        })
-
-        test('has a intelligence defense that is 10 higher than the bonus', () => {
-          expect(generatedCharacter.intelligence.defense).toEqual(
-            generatedCharacter.intelligence.bonus + 10,
-          )
-        })
-      })
-
-      describe('strength', () => {
-        test('generates a random strength', () => {
-          expect(generatedCharacter.strength.bonus).toBeLessThanOrEqual(6)
-          expect(generatedCharacter.strength.bonus).toBeGreaterThanOrEqual(1)
-        })
-
-        test('has a strength defense that is 10 higher than the bonus', () => {
-          expect(generatedCharacter.strength.defense).toEqual(
-            generatedCharacter.strength.bonus + 10,
-          )
-        })
-      })
-
-      describe('wisdom', () => {
-        test('generates a random wisdom', () => {
-          expect(generatedCharacter.wisdom.bonus).toBeLessThanOrEqual(6)
-          expect(generatedCharacter.wisdom.bonus).toBeGreaterThanOrEqual(1)
-        })
+      const abilityNames = [
+        'charisma',
+        'constitution',
+        'dexterity',
+        'intelligence',
+        'strength',
+        'wisdom',
+      ]
+      test.each(abilityNames)(
+        'generates a random %s bonus between 1-6 (inclusive)',
+        ability => {
+          const generatedCharacter = new KnaveCharacter()
+          expect(generatedCharacter[ability].bonus).toBeLessThanOrEqual(6)
+          expect(generatedCharacter[ability].bonus).toBeGreaterThanOrEqual(1)
+        },
+      )
 
-        test('has a wisdom defense that is 10 higher than the bonus', () => {
-          expect(generatedCharacter.wisdom.defense).toEqual(
-            generatedCharacter.wisdom.bonus + 10,
+      test.each(abilityNames)(
+        'generates a %s defense that is 10 higher than the bonus',
+        ability => {
+          const generatedCharacter = new KnaveCharacter()
+          expect(generatedCharacter[ability].defense).toEqual(
+            generatedCharacter[ability].bonus + 10,
           )
-        })
-      })
+        },
+      )
 
       describe('abilityScores', () => {
         test('has a getter method to get all ability scores', () => {
+          const generatedCharacter = new KnaveCharacter()
           const abilities = generatedCharacter.abilityScores
           const abilityNames = Object.keys(abilities)
           expect(abilityNames.sort()).toEqual([
@@ -117,30 +59,36 @@ describe('KnaveCharacter', () => {
     })
 
     test('has a number of item slots equal to the constitution defense', () => {
+      const generatedCharacter = new KnaveCharacter()
       expect(generatedCharacter.itemSlots).toBe(
         generatedCharacter.constitution.defense,
       )
     })
 
     test('has a randomly generated starting copper pieces', () => {
+      const generatedCharacter = new KnaveCharacter()
       expect(generatedCharacter.copperPieces).toBeGreaterThanOrEqual(23)
       expect(generatedCharacter.copperPieces).toBeLessThanOrEqual(38)
     })
 
     test('has a maxHP stat between 1 and 8', () => {
+      const generatedCharacter = new KnaveCharacter()
       expect(generatedCharacter.maxHp).toBeGreaterThanOrEqual(1)
       expect(generatedCharacter.maxHp).toBeLessThanOrEqual(8)
     })
 
     test('generates a list of items', () => {
+      const generatedCharacter = new KnaveCharacter()
       expect(generatedCharacter.items.length).toBeGreaterThan(1)
     })
 
     test('randomly generates armor', () => {
+      const generatedCharacter = new KnaveCharacter()
       expect(generatedCharacter.armor).toBeTruthy()
     })
 
     test('randomly generates a weapon', () => {
+      const generatedCharacter = new KnaveCharacter()
       expect(generatedCharacter.weapon).toBeTruthy()
     })
   })

src/knave/Character.ts

@@ -1,8 +1,25 @@
 import { KnaveDescription, KnaveGear } from './'
 import { Dice } from '../dice'
+import type { Traits } from './Description'
+import type { ArmorItem, GearItem, WeaponItem } from './Gear'
+
+type Abilities = Record<AbilityName, Ability>
+
+type AbilityName =
+  | 'charisma'
+  | 'constitution'
+  | 'dexterity'
+  | 'intelligence'
+  | 'strength'
+  | 'wisdom'
+
+type Ability = {
+  bonus: number
+  defense: number
+}
 
 class Character {
-  public armor: IArmor = {
+  public armor: ArmorItem = {
     count: 0,
     defense: 0,
     name: '',
@@ -11,11 +28,11 @@ class Character {
     type: 'armor',
   }
   public copperPieces: number = 0
-  public items: IGear[] = [{ name: '', count: 0, type: 'food', slots: 0 }]
+  public items: GearItem[] = [{ name: '', count: 0, type: 'food', slots: 0 }]
   public itemSlots: number = 13
   public level: number = 1
   public maxHp: number = 4
-  public traits: ITraits = {
+  public traits: Traits = {
     physique: '',
     face: '',
     skin: '',
@@ -27,17 +44,17 @@ class Character {
     background: '',
     misfortune: '',
   }
-  public weapon: IWeapon = {
-    count: 1,
-    damage: 'd6',
-    hand: 1,
+  public weapon: WeaponItem = {
+    count: 0,
+    damage: '',
+    hand: 0,
     name: '',
     quality: 0,
     slots: 1,
     type: 'weapon',
   }
 
-  private abilities: IAbilities = {
+  private abilities: Abilities = {
     charisma: { bonus: 3, defense: 13 },
     constitution: { bonus: 3, defense: 13 },
     dexterity: { bonus: 3, defense: 13 },
@@ -103,9 +120,22 @@ class Character {
     return Dice.roll(8)
   }
 
-  private generateAbilities = (): IAbilities => {
-    const [charisma, constitution, dexterity, intelligence, strength, wisdom] =
-      Array(6).fill(undefined).map(this.rollAbilityScore)
+  private generateAbilities = (): Abilities => {
+    const {
+      charisma,
+      constitution,
+      dexterity,
+      intelligence,
+      strength,
+      wisdom,
+    } = {
+      charisma: this.rollAbilityScore(),
+      constitution: this.rollAbilityScore(),
+      dexterity: this.rollAbilityScore(),
+      intelligence: this.rollAbilityScore(),
+      strength: this.rollAbilityScore(),
+      wisdom: this.rollAbilityScore(),
+    }
 
     const abilities = {
       charisma: { bonus: charisma, defense: charisma + 10 },
@@ -124,7 +154,7 @@ class Character {
     return Math.min(...rolls)
   }
 
-  private generateTraits = (): ITraits => {
+  private generateTraits = (): Traits => {
     return new KnaveDescription().traits
   }
 }

src/knave/Description.ts

@@ -13,7 +13,7 @@ export type Noun =
   | 'background'
   | 'misfortune'
 
-type Traits = Record<Noun, string>
+export type Traits = Record<Noun, string>
 
 class Description {
   public traits: Traits

src/knave/Gear.ts

@@ -12,12 +12,12 @@ export type GearItem = {
   type: GearType
 }
 
-type ArmorItem = GearItem & {
+export type ArmorItem = GearItem & {
   quality: number
   defense: number
 }
 
-type WeaponItem = GearItem & {
+export type WeaponItem = GearItem & {
   damage: string
   hand: number
   quality: number