Add town events

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Unreleased
+
+### Added
+
+### Changed
+- Fixed a rather pesky and persistent bug where changing racial or religious weights would not be reflected in the town.
+
 ## 2.8.14
 
 ### Added

lib/faction/createRivals.ts

@@ -1,6 +1,6 @@
 import { dice } from '../src/dice'
-import { repeat, sumWeights } from '../src/utils'
-import { validateWeight, weightRandom } from '../src/weightRandom'
+import { repeat } from '../src/utils'
+import { sumWeights, validateWeight, weightRandom } from '../src/weightRandom'
 import { WeightRecord } from '../types'
 import { factionData } from './factionData'
 import { Faction } from './_common'

lib/faction/setFactionJoinStats.ts

@@ -1,8 +1,8 @@
-import { assign, sumWeights } from '../src/utils'
+import { assign } from '../src/utils'
 import { random } from '../src/random'
 import { Faction } from './_common'
 import { factionData } from './factionData'
-import { weightRandom } from '../src/weightRandom'
+import { sumWeights, weightRandom } from '../src/weightRandom'
 
 export function setFactionJoinStats (faction: Faction): void {
   console.log('determining joining stats...')

lib/faction/setFactionResources.ts

@@ -2,8 +2,8 @@ import { defineRollDataGetter } from '../src/defineRollDataGetter'
 import { dice, fm } from '../src/dice'
 import { random } from '../src/random'
 import { ThresholdTable } from '../src/rollFromTable'
-import { repeat, sumWeights, keys, clamp } from '../src/utils'
-import { weightRandom } from '../src/weightRandom'
+import { repeat, keys, clamp } from '../src/utils'
+import { weightRandom, sumWeights } from '../src/weightRandom'
 import { WeightRecord } from '../types'
 import { factionData, FactionResource } from './factionData'
 import { Faction } from './_common'

lib/index.ts

@@ -87,6 +87,7 @@ export * from './npc-generation/setAge'
 export * from './npc-generation/setRace'
 export * from './npc-generation/swapNPCs'
 export * from './npc-generation/npcFinances'
+export * from './npc-generation/randomiseNPC'
 
 export * from './npc-generation/traits/createPersonality'
 export * from './npc-generation/traits/getTraits'
@@ -170,6 +171,8 @@ export * from './town/getTownArcana'
 export * from './town/getTownEconomics'
 export * from './town/getTownLaw'
 export * from './town/getTownMaterial'
+export * from './town/getTownType'
+export * from './town/getRaceReadout'
 export * from '../src/Town/js/getTownMilitary'
 export * from './town/getTownWelfare'
 export * from './town/politicsWeightedRoll'
@@ -180,4 +183,6 @@ export * from './town/roads'
 export * from './town/townRender'
 export * from './town/updateTownSocioPolitics'
 export * from './town/townDemographics'
+export * from './town/getDemographicPercentile'
+export * from './town/setBaseDemographics'
 export * from './types'

lib/npc-generation/randomiseNPC.test.ts

@@ -0,0 +1,14 @@
+// import { GenderName } from './genderData'
+// import { AgeName, RaceName, raceTraits } from './raceTraits'
+// import { randomiseNPC } from './randomiseNPC'
+
+// test('Randomise NPC base attributes', () => {
+//   const genderArray: GenderName[] = ['man', 'woman']
+//   const raceArray = Object.keys(raceTraits) as RaceName[]
+//   const ageStageArray: AgeName[] = ['child', 'young adult', 'settled adult', 'elderly']
+//   const npc = randomiseNPC()
+//   expect(genderArray).toContain(npc.gender)
+//   expect(raceArray).toContain(npc.race)
+//   expect(ageStageArray).toContain(npc.ageStage)
+//   expect(Object.keys(npc)).toContain(['ageStage', 'gender', 'race'])
+// })

lib/npc-generation/randomiseNPC.ts

@@ -0,0 +1,15 @@
+import { GenderName } from './genderData'
+import { AgeName, RaceName, raceTraits } from './raceTraits'
+import { random } from '../src/random'
+
+export const randomiseNPC = () => {
+  return {
+    gender: random(['man', 'woman']),
+    race: random(Object.keys(raceTraits)),
+    ageStage: random(['young adult', 'young adult', 'young adult', 'settled adult', 'settled adult', 'settled adult', 'elderly'])
+  } as {
+    gender: GenderName,
+    race: RaceName,
+    ageStage: AgeName
+  }
+}

lib/src/utils.ts

@@ -1,6 +1,5 @@
-import { DeepReadonly, WeightRecord } from '../types'
+import { DeepReadonly } from '../types'
 import { randomFloat } from './randomFloat'
-import { validateWeight } from './weightRandom'
 
 /**
  * An alternative, stricter typed version of `Object.keys`.
@@ -147,18 +146,3 @@ export function repeat (fn: (index: number) => void, times: number) {
 export function capitalizeFirstLetter (text: string) {
   return text.charAt(0).toUpperCase() + text.slice(1)
 }
-
-export function sumWeights<T extends string> (
-  defaultWeights: WeightRecord<T>,
-  customWeights: WeightRecord<T>
-) {
-  const finalWeights: WeightRecord<T> = {}
-
-  for (const name of keys(customWeights)) {
-    const weight = validateWeight(customWeights[name])
-    const defaultWeight = defaultWeights[name] ?? 0
-    finalWeights[name] = defaultWeight + weight
-  }
-
-  return finalWeights
-}

lib/src/weightRandom.ts

@@ -31,3 +31,18 @@ export function validateWeight (weight?: number) {
   }
   throw new TypeError(`Weight "${weight}" is not a number.`)
 }
+
+export function sumWeights<T extends string> (
+  defaultWeights: WeightRecord<T>,
+  customWeights: WeightRecord<T>
+) {
+  const finalWeights: WeightRecord<T> = {}
+
+  for (const name of keys(customWeights)) {
+    const weight = validateWeight(customWeights[name])
+    const defaultWeight = defaultWeights[name] ?? 0
+    finalWeights[name] = defaultWeight + weight
+  }
+
+  return finalWeights
+}