Merge branch 'master' of https://github.com/ryceg/Eigengrau-s-Essenti…

…al-Establishment-Generator

Signed-off-by: ryceg <[email protected]>

.github/workflows/release.yml

@@ -40,8 +40,8 @@ jobs:
       - name: Copy main map
         run: cp -r ./gh-pages/main.js.map ./
 
-      - name: Create TypeDocs
-        run: yarn typedoc
+      # - name: Create TypeDocs
+      #   run: yarn typedoc
 
       - name: Deploy
         uses: JamesIves/[email protected]

.vscode/settings.json

@@ -3,6 +3,15 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
+  "search.exclude": {
+    "**/node_modules": true,
+    "**/bower_components": true,
+    "**/*.code-search": true,
+    "src/init.js": true,
+    "gh-pages/**": true,
+    "/src/Tools/Exports/example.json": true,
+    "/yarn.lock": true
+  },
   "editor.formatOnSave": false,
   "prettier.semi": false,
   "highlight.maxMatches": 250,

.vscode/twine-macros.twee-config.yaml

@@ -11,8 +11,7 @@ sugarcube-2:
 
     # misc
     numberslider: {}
-    numberbox:
-      container: true
+    numberbox: {}
     notify:
       container: true
     fadein:

CHANGELOG.md

@@ -4,6 +4,21 @@ 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/).
 
+## 2.8.11
+
+### Added
+- Some of the NPC stats are now editable.
+
+### Changed 
+- Fixed racial description while editing town demographics not updating.
+- Fixed an annoying issue where the period at the end of the sentence for racial and religious demographics would be pushed to a new line.
+- Made the dropcap on NPC profile pages standardized
+- The text following the dropcap on the NPC profile page is no longer indented weirdly.
+- Fixed NPC gender not changing or refreshing properly when editing.
+- Fixed buildings not working in the nav bar.
+- Made the profiles just pass the ID as a string, which should be slightly faster.
+
+
 ## 2.8.10
 
 ### Added

lib/index.ts

@@ -70,6 +70,7 @@ export * from './npc-generation/createDescriptors'
 export * from './npc-generation/createSocialClass'
 export * from './npc-generation/createLifestyleStandards'
 export * from './npc-generation/socialClass'
+export * from './npc-generation/genderData'
 export * from './npc-generation/createName'
 export * from './npc-generation/createNamesake'
 export * from './npc-generation/createReligiosity'
@@ -125,7 +126,6 @@ export * from './src/findInContainer'
 export * from './src/findProfession'
 export * from './src/firstCharacter'
 export * from './src/flora'
-export * from './src/genderData'
 export * from './src/getRandomValue'
 export * from './src/getIllustration'
 export * from './src/inventory'

lib/npc-generation/_common.ts

@@ -3,7 +3,7 @@ import { ReligionStrength } from '../religion/religion'
 import { ProfessionName, ProfessionSector, ProfessionType } from './professions'
 import { LifestyleStandardName } from './lifestyleStandards'
 import { Virtues } from './traits/getTraits'
-import { GenderName } from '../src/genderData'
+import { GenderName } from '../npc-generation/genderData'
 import { BackgroundName } from './backgroundTraits'
 import { ClassName } from './classTraits'
 import { RaceName, AgeName } from './raceTraits'

lib/npc-generation/createName.ts

@@ -1,4 +1,4 @@
-import { GenderName } from '../src/genderData'
+import { GenderName } from '../npc-generation/genderData'
 import { random } from '../src/random'
 import { capitalizeFirstLetter } from '../src/utils'
 import { RaceName, raceTraits } from './raceTraits'

lib/npc-generation/createNamesake.ts

@@ -1,4 +1,4 @@
-import { fetchGender } from '../../lib/src/genderData'
+import { fetchGender } from '../../lib/npc-generation/genderData'
 import { Town } from '../town/_common'
 import { createName } from './createName'
 import { fetchRace } from './fetchRace'

lib/src/genderData.ts → lib/npc-generation/genderData.ts

@@ -5,7 +5,7 @@ import { NPC } from '../npc-generation/_common'
 export type BinaryGender = 'man' | 'woman'
 export type GenderName = 'man' | 'woman' | 'nonbinary' | 'entity'
 
-interface GenderPronouns {
+export interface GenderPronouns {
     godgoddess: string
     title: string
     domTitle: string

lib/npc-generation/npcFinances.ts

@@ -13,18 +13,18 @@ export function wageVariation (town: Town, npc: NPC): number {
 
 export function npcGrossIncome (town: Town, npc: NPC): number {
   // TODO add hobbies
-  console.log(`Returning ${npc.name}'s gross income...`)
+  // console.log(`Returning ${npc.name}'s gross income...`)
   const profession = findProfession(town, npc)
   return Math.round(calcPercentage(profession.dailyWage, (wageVariation(town, npc), (town.roll.wealth - 50) / 3)))
 }
 
 export function npcNetIncome (town: Town, npc: NPC): number {
-  console.log(`Returning ${npc.name}'s net income...`)
+  // console.log(`Returning ${npc.name}'s net income...`)
   return Math.round(calcPercentage(npcGrossIncome(town, npc), -npcTaxRate(town, npc)))
 }
 
 export function npcLifestyleStandard (town: Town, npc: NPC): LifestyleStandard {
-  console.log(`Returning ${npc.name}'s lifestyle standard...`)
+  // console.log(`Returning ${npc.name}'s lifestyle standard...`)
   const income = npcNetIncome(town, npc)
   for (const lifestyleStandard of Object.values(lifestyleStandards)) {
     if (income >= lifestyleStandard.incomeThreshold) {
@@ -35,7 +35,7 @@ export function npcLifestyleStandard (town: Town, npc: NPC): LifestyleStandard {
 }
 
 export function npcLifestyleExpenses (town: Town, npc: NPC): number {
-  console.log(`Returning ${npc.name}'s lifestyle expenses...`)
+  // console.log(`Returning ${npc.name}'s lifestyle expenses...`)
   const income = npcGrossIncome(town, npc)
   return Math.round(income * (npcLifestyleStandard(town, npc).dailyWagePercentage / 100))
 }
@@ -45,7 +45,7 @@ export function npcTotalLifestyleExpenses (town: Town, npc: NPC): number {
 }
 
 export function npcProfit (town: Town, npc: NPC): number {
-  console.log(`Returning ${npc.name}'s profit...`)
+  // console.log(`Returning ${npc.name}'s profit...`)
   return Math.round(npcNetIncome(town, npc) - npcTotalLifestyleExpenses(town, npc))
 }
 

lib/npc-generation/raceTraits.ts

@@ -1,6 +1,6 @@
 import { ThresholdTable } from '../src/rollFromTable'
 import { dice } from '../src/dice'
-import { GenderName } from '../src/genderData'
+import { GenderName } from '../npc-generation/genderData'
 
 export type RaceName = 'dragonborn' | 'dwarf' | 'elf' | 'gnome' | 'half-elf' | 'halfling' | 'half-orc' | 'human' | 'tiefling' | 'goblin' | 'orc' | 'lizardfolk'
 

lib/npc-generation/setRace.ts

@@ -2,7 +2,7 @@
 import { random } from '../src/random'
 import { closestMatch } from '../src/closestMatch'
 import { ThresholdTable } from '../src/rollFromTable'
-import { GenderName } from '../src/genderData'
+import { GenderName } from '../npc-generation/genderData'
 
 import { bmiDescriptions } from './bmiDescriptions'
 import { GenderTraits, RaceName, raceTraits } from './raceTraits'
@@ -38,55 +38,65 @@ export function setRace (npc: NPC) {
 
   npc.heightInches = baseHeight + heightModifier
   npc.weightPounds = baseWeight + (heightModifier * weightModifier)
-  npc.bmi = Math.trunc((npc.weightPounds / (npc.heightInches * npc.heightInches)) * raceData.bmiModifier)
-  npc.weight = npc.weight || closestMatch(bmiDescriptions, 'weight', 'bmi', 'muscleMass', npc.bmi, npc.muscleMass)
+}
+
+export const getNPCBMI = (weightPounds: number, heightInches: number, bmiModifier = 703) => {
+  return Math.trunc((weightPounds / (heightInches * heightInches)) * bmiModifier)
+}
 
+export const getNPCWeight = (bmi: number, muscleMass: number) => {
+  return closestMatch(bmiDescriptions, 'weight', 'bmi', 'muscleMass', bmi, muscleMass)
+}
+
+export const getNPCHeight = (heightInches: number) => {
+  let resultantHeight = ''
+  const heightChart: ThresholdTable = [
+    [84, 'giraffe-like'],
+    [78, 'towering'],
+    [77, 'extremely tall'],
+    [76, 'very tall'],
+    [75, 'rather tall'],
+    [74, 'quite tall'],
+    [73, 'reasonably tall'],
+    [72, 'tall'],
+    [71, 'taller than average'],
+    [70, 'average sized'],
+    [69, 'medium sized'],
+    [68, 'on the short side'],
+    [67, 'somewhat short'],
+    [66, 'relatively short'],
+    [65, 'short-ish'],
+    [64, 'short'],
+    [63, 'short'],
+    [62, 'rather short'],
+    [61, 'barely five foot'],
+    [60, 'quite short'],
+    [59, 'rather small'],
+    [58, 'really short'],
+    [57, 'pint sized'],
+    [56, 'quite small'],
+    [55, 'small'],
+    [54, 'squat'],
+    [53, 'somewhat squat'],
+    [52, 'quite squat'],
+    [50, 'rather squat'],
+    [48, 'somewhat tiny'],
+    [46, 'rather small'],
+    [44, 'rather tall (compared to a halfling)'],
+    [42, 'tall (compared to a halfling)'],
+    [40, 'barely a metre'],
+    [38, 'diminutive'],
+    [36, 'quite diminutive'],
+    [34, 'adorably short'],
+    [32, 'tiny'],
+    [30, 'so so tiny'],
+    [0, 'impossibly small']
+  ]
   for (const [height, description] of heightChart) {
-    if (height >= npc.heightInches) {
-      npc.height = description
+    if (height >= heightInches) {
+      resultantHeight = description
     }
   }
+  if (!resultantHeight) resultantHeight = 'average'
+  return resultantHeight
 }
-
-const heightChart: ThresholdTable = [
-  [84, 'giraffe-like'],
-  [78, 'towering'],
-  [77, 'extremely tall'],
-  [76, 'very tall'],
-  [75, 'rather tall'],
-  [74, 'quite tall'],
-  [73, 'reasonably tall'],
-  [72, 'tall'],
-  [71, 'taller than average'],
-  [70, 'average sized'],
-  [69, 'medium sized'],
-  [68, 'on the short side'],
-  [67, 'somewhat short'],
-  [66, 'relatively short'],
-  [65, 'short-ish'],
-  [64, 'short'],
-  [63, 'short'],
-  [62, 'rather short'],
-  [61, 'barely five foot'],
-  [60, 'quite short'],
-  [59, 'rather small'],
-  [58, 'really short'],
-  [57, 'pint sized'],
-  [56, 'quite small'],
-  [55, 'small'],
-  [54, 'squat'],
-  [53, 'somewhat squat'],
-  [52, 'quite squat'],
-  [50, 'rather squat'],
-  [48, 'somewhat tiny'],
-  [46, 'rather small'],
-  [44, 'rather tall (compared to a halfling)'],
-  [42, 'tall (for a halfling)'],
-  [40, 'barely a metre'],
-  [38, 'diminutive'],
-  [36, 'quite diminutive'],
-  [34, 'adorably short'],
-  [32, 'tiny'],
-  [30, 'so so tiny'],
-  [0, 'impossibly small']
-]

lib/npc-generation/traits/getTraits.ts

@@ -64,7 +64,7 @@ const getInverseTrait = (trait: VirtuesVices) => {
 
 export const getTrait = (trait: VirtuesVices, npc: NPC, humanized?: boolean) => {
   const sanitizedVirtue = getVirtue(trait)
-  if (sanitizedVirtue.wasVice === false) return sanitizeTraitValues(npc.roll.traits[trait as Virtues])
+  if (sanitizedVirtue.wasVice === false) return sanitizeTraitValues(npc.roll.traits[trait as Virtues], humanized)
   const correspondingVirtue = getVirtue(trait)
   return sanitizeTraitValues(npc.roll.traits[correspondingVirtue.virtue], humanized)
 }

lib/town/_common.ts

@@ -9,7 +9,7 @@ import { Weather } from '../src/weather'
 import { townData, TownType, PoliticalIdeology, EconomicIdeology } from './townData'
 import { EconomicIdeologyIST, PoliticalIdeologyIC } from './updateTownSocioPolitics'
 import { Pantheon, PantheonTypes } from 'lib/religion/religion'
-import { GenderName } from '../../lib/src/genderData'
+import { GenderName } from '../../lib/npc-generation/genderData'
 import { Biome, Seasons } from '../../lib/src/terrain'
 
 export type PoliticalSource = keyof typeof townData.politicalSource

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "eigengraus-essential-establishment-generator",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "description": "Eigengrau's Essential Establishment Generator",
   "main": "main.txt",
   "repository": {

src/Alchemist/AlchemistOutput.twee

@@ -6,7 +6,7 @@
 <<set $associatedNPC to $npcs[$building.associatedNPC.key]>>
 <span class='flex-line'><<button "Edit $building.name" $building.initPassage>><</button>></span>
 <h1 class="interactive-only">$building.name</h1><span @id="$building.key"></span><p>You enter $building.name, <<print lib.articles.output($building.structure.alchemistDescriptor)>>. <<print lib.closestMatch(lib.alchemistData.get.lookAround($building), 'note', 'cleanliness', 'wealth', $building.roll.cleanliness, $building.roll.wealth)>> There is a chemist behind the shop counter currently <<print $associatedNPC.idle.random()>>.</p>
-<section><h3>Chemist</h3><p>The $associatedNPC.weight chemist <<print $associatedNPC.greeting.random()>> <<print ['when you come inside', 'after finishing with another customer', 'as soon as you come through the door', 'when you come up to the counter', 'while you look around'].random()>>. <<print $associatedNPC.heshe.toUpperFirst()>> introduces $associatedNPC.himherself as <<profile $associatedNPC>>, the $associatedNPC.owner of the shop, and asks what $associatedNPC.heshe can do for you.</p>
+<section><h3>Chemist</h3><p><<print lib.articles.output($associatedNPC.descriptor)>> <<print $associatedNPC.greeting.random()>> <<print ['when you come inside', 'after finishing with another customer', 'as soon as you come through the door', 'when you come up to the counter', 'while you look around'].random()>>. <<print $associatedNPC.heshe.toUpperFirst()>> introduces $associatedNPC.himherself as <<profile $associatedNPC>>, the $associatedNPC.owner of the shop, and asks what $associatedNPC.heshe can do for you.</p>
 <<linkreplace "Talk with $associatedNPC.name" t8n>>
 <h6>$associatedNPC.name</h6><<include "ChemistTalk">><</linkreplace>></section>
 <span class="interactive-only"><<link "Generate plothook">><<set $associatedNPC.plot to setup.alchemistMission($town)>><</link>></span><<liveblock>><<if def $associatedNPC.plot>><div id="plothook"><<print ["When you say that you're adventurers, $associatedNPC.hisher $associatedNPC.eyes eyes light up, and $associatedNPC.heshe says", "You chat for a while, and then $associatedNPC.firstName says ", "You discuss business, and when you talk about your adventures, $associatedNPC.firstName asks "].random()>> "$associatedNPC.plot"</div><</if>><</liveblock>>

src/Alchemist/ChemistTalk.twee

@@ -1,2 +1,2 @@
 :: ChemistTalk [nobr]
-$associatedNPC.firstName looks <<print $associatedNPC.currentMood.random()>>, and idly shifts a box of <<print lib.alchemistData.ingredients.random()>> as $associatedNPC.heshe talks. The $associatedNPC.raceNote <<print $associatedNPC.chitchat.random()>> as you peruse the shop. $associatedNPC.firstName tells you that $associatedNPC.heshe is working on <<print lib.articles.output($building.brew.potionPurpose)>>, and points to the <<linkappend $building.brew.containerDescription t8n>>. Looking inside the $building.brew.vesselType, you see <<print lib.articles.output($building.brew.liquidDescription)>> bubbling away<</linkappend>>.
+$associatedNPC.firstName looks <<print setup.npcData.currentMood.random()>>, and idly shifts a box of <<print lib.alchemistData.ingredients.random()>> as $associatedNPC.heshe talks. The $associatedNPC.raceNote <<print $associatedNPC.chitchat.random()>> as you peruse the shop. $associatedNPC.firstName tells you that $associatedNPC.heshe is working on <<print lib.articles.output($building.brew.potionPurpose)>>, and points to the <<linkappend $building.brew.containerDescription t8n>>. Looking inside the $building.brew.vesselType, you see <<print lib.articles.output($building.brew.liquidDescription)>> bubbling away<</linkappend>>.

src/Blacksmith/BlacksmithTalk.twee

@@ -1,6 +1,6 @@
 :: BlacksmithTalk
 <<linkreplace "<h4>Talk with $associatedNPC.name</h4>" t8n>>
-<h6>$associatedNPC.name</h6>$associatedNPC.firstName looks <<print $associatedNPC.currentMood.random()>>, and while you chat, $associatedNPC.heshe moves around the shop, preparing a new project for work. $associatedNPC.firstName <<print ["loves working in $building.name", "hates working in $building.name", "finds working in the $building.name boring", "finds working in the smithy fun", "finds working in the $building.name rather lonely", "wishes $associatedNPC.heshe could go adventuring instead of working here"].random()>>, and says that the patrons of $building.name are <<print ["alright, especially the farmers, who are pretty decent blokes", "a bit stingy, especially the farmers", "somewhat stingy", "fine, but rather dull", "way too exciting for $associatedNPC.firstName's tastes", "nice and friendly", "nice and friendly, but rather boring- nothing interesting is ever ordered", "just a bunch of hicks", "a bunch of weirdos", "pretty normal stock, nothing out of the ordinary", "a bit rude and stuck up", "fairly generous with their coin"].random()>>.
+<h6>$associatedNPC.name</h6>$associatedNPC.firstName looks <<print setup.npcData.currentMood.random()>>, and while you chat, $associatedNPC.heshe moves around the shop, preparing a new project for work. $associatedNPC.firstName <<print ["loves working in $building.name", "hates working in $building.name", "finds working in the $building.name boring", "finds working in the smithy fun", "finds working in the $building.name rather lonely", "wishes $associatedNPC.heshe could go adventuring instead of working here"].random()>>, and says that the patrons of $building.name are <<print ["alright, especially the farmers, who are pretty decent blokes", "a bit stingy, especially the farmers", "somewhat stingy", "fine, but rather dull", "way too exciting for $associatedNPC.firstName's tastes", "nice and friendly", "nice and friendly, but rather boring- nothing interesting is ever ordered", "just a bunch of hicks", "a bunch of weirdos", "pretty normal stock, nothing out of the ordinary", "a bit rude and stuck up", "fairly generous with their coin"].random()>>.
 /* <span class="click-and-remove-link"><<link "What are you working on?">><<set $associatedNPC.currentProject to setup.createBlacksmithProject($town, $building, $associatedNPC)>><<update>><</link>></span> */
 /* <span class="click-and-remove-link"><<link "Test">><<set $associatedNPC.currentProject to "GREAT SUCCESS">><<update>><</link>></span> */
 <<liveblock>><<if def $associatedNPC.currentProject>><span id="currentProject">$associatedNPC.currentProject</span><</if>><</liveblock>><</linkreplace>>

src/Blacksmith/js/blacksmithProject.ts

@@ -12,7 +12,7 @@ export const createBlacksmithProject = function (town: Town, smithy: Smithy, bla
       function (town: Town) {
         // @ts-ignore
         const market = lib.findInArray(town.buildings, 'buildingType', 'market') || setup.createNewBuilding(town, 'Market')
-        return `${lib.articles.output(lib.random(weapon))} to sell at ${setup.profile(market, 'the markets', 'town.buildings')} ${["in a couple day's time", 'soon', 'tomorrow', 'next Saturday', 'the day after tomorrow'].random()}.`
+        return `${lib.articles.output(lib.random(weapon))} to sell at ${setup.profile(market, 'the markets')} ${["in a couple day's time", 'soon', 'tomorrow', 'next Saturday', 'the day after tomorrow'].random()}.`
       }
     },
     {
@@ -50,7 +50,7 @@ export const createBlacksmithProject = function (town: Town, smithy: Smithy, bla
       function (town: Town) {
         // @ts-ignore
         const market = lib.findInArray(town.buildings, 'buildingType', 'market') || setup.createNewBuilding(town, 'Market')
-        return `some ${mundane.random()} to sell at ${setup.profile(market, 'the markets', 'town.buildings')} ${["in a couple day's time", 'soon', 'tomorrow', 'next Saturday', 'the day after tomorrow'].random()}.`
+        return `some ${mundane.random()} to sell at ${setup.profile(market, 'the markets')} ${["in a couple day's time", 'soon', 'tomorrow', 'next Saturday', 'the day after tomorrow'].random()}.`
       }
     },
     {
@@ -122,7 +122,7 @@ export const createBlacksmithProject = function (town: Town, smithy: Smithy, bla
       function (town: Town) {
         // @ts-ignore
         const building = lib.findInArray(town.buildings, 'buildingType', 'temple') || setup.createNewBuilding(town, 'Temple')
-        return `an ornamental ${lib.random(weapon)} for ${setup.profile(building.associatedNPC, 'the priest')} of ${setup.profile(building, building.name, 'town.buildings')}.`
+        return `an ornamental ${lib.random(weapon)} for ${setup.profile(building.associatedNPC, 'the priest')} of ${setup.profile(building)}.`
       }
     }
   ]

src/Buildings/Components/CreateNewNPC.twee

@@ -19,7 +19,7 @@
     <</button>>
     <<liveblock>>
         <<if $currentPassage.randomNPC>>
-        <div id="NPC" class="descriptive">
+        <div id="NPC" class="descriptive no-indent">
             <h3>$currentPassage.randomNPC.name</h3>
             <<print lib.firstCharacter(lib.articles.output($currentPassage.randomNPC.descriptor).toUpperFirst())>> is currently <<print $currentPassage.randomNPC.idle.random()>> in the corner. 
             You strike up conversation with $currentPassage.randomNPC.himher, and the $currentPassage.randomNPC.descriptor introduces $currentPassage.randomNPC.himherself as