From 161a88ced0cf5f383811457a4a051c3b2e1cea45 Mon Sep 17 00:00:00 2001
From: Rhys <36913739+ryceg@users.noreply.github.com>
Date: Sun, 11 Apr 2021 13:19:53 +1000
Subject: [PATCH] Minor-fixes (#567)

### Added
- Button to edit pantheon in dropdown religion percentage list
- Clearer delineation of what is and isn't Patron content.
- Automatic removal of analytics for local-run copies
- Automatic unlocking of Patreon content on local copies

### Changed
- Made Patreon paywall deactivate if being run locally.
- Fixed error with town editing
- Fixed sidebar popups not showing up
- Fixed error with faction editing
- Fixed error with editing town biome
---
 CHANGELOG.md                                  |  17 ++
 lib/buildings/deleteBuildingRelationship.ts   |   3 +-
 lib/religion/getPantheon.ts                   |  35 ++--
 lib/src/badges.ts                             |   2 +-
 lib/src/getIllustration.ts                    |  18 +-
 lib/src/terrain.ts                            | 171 ++++++++++++------
 src/Factions/components/FactionSliders.twee   |  48 +++--
 src/Meta/ImportDiscriminator.twee             |  10 +
 src/Meta/ImportPatreon.twee                   |  11 ++
 src/NPCGeneration/NPCProfile/NPCProfile.twee  |   2 +-
 src/Religion/EditPantheon.twee                |  44 +++++
 src/Religion/ImportPantheon.twee              |  22 ---
 src/Settings/Breadcrumb.twee                  |   8 +-
 src/Settings/PassageHeader.twee               |   6 +-
 src/Settings/Setting.js                       |  35 +++-
 src/Settings/StoryStuff/StoryAuthor.twee      |   8 +-
 src/Settings/StoryStuff/StoryMenu.twee        |   6 +-
 src/Settings/StoryStuff/StoryTest.twee        |   2 +
 src/Settings/Tippy/tooltips.ts                |  13 +-
 src/Start/BriefDescription.twee               |   2 +-
 src/Start/CustomStart/BiomeGeneration.twee    |   4 +-
 src/Start/ReligionPercentageList.twee         |   2 +-
 src/Start/Start.twee                          |   2 +-
 src/Start/StoryInit.twee                      |   8 +-
 .../components-edit/EditSociopolitics.twee    |   5 +-
 src/Town/components-edit/TownEdit.twee        |   2 +-
 src/Town/js/createTown.ts                     |  16 +-
 src/Town/js/createTownBiome.ts                |   2 +-
 28 files changed, 357 insertions(+), 147 deletions(-)
 create mode 100644 src/Meta/ImportDiscriminator.twee
 create mode 100644 src/Meta/ImportPatreon.twee
 create mode 100644 src/Religion/EditPantheon.twee
 delete mode 100644 src/Religion/ImportPantheon.twee
 create mode 100644 src/Settings/StoryStuff/StoryTest.twee

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c481eb006..bbd48f97e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@ 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.1
+
+### Added
+- Button to edit pantheon in dropdown religion percentage list
+- Clearer delineation of what is and isn't Patron content.
+- Automatic removal of analytics for local-run copies
+- Automatic unlocking of Patreon content on local copies
+- Prepositions for terrain, to make it sound more natural.
+
+### Changed
+- Made Patreon paywall deactivate if being run locally.
+- Fixed error with town editing
+- Fixed sidebar popups not showing up
+- Fixed error with faction editing
+- Fixed error with editing town biome 
+- Fixed local / online hosting images error (hopefully)
+
 ## 2.8
 
 ### Added
diff --git a/lib/buildings/deleteBuildingRelationship.ts b/lib/buildings/deleteBuildingRelationship.ts
index 42e773e32..89d03e529 100644
--- a/lib/buildings/deleteBuildingRelationship.ts
+++ b/lib/buildings/deleteBuildingRelationship.ts
@@ -2,8 +2,9 @@ import { NPC } from '../npc-generation/_common'
 import { Town } from '../town/_common'
 import { Building } from './_common'
 import { findReciprocalRelationships } from './findReciprocalRelationships'
+import { Faction } from '@lib'
 
-export function deleteReciprocalRelationship (town: Town, building: Building | null, npc: NPC | null) {
+export function deleteReciprocalRelationship (town: Town, building: Building | Faction | null, npc: NPC | null) {
   const relationships = findReciprocalRelationships(town, building, npc, 'building')
 
   for (const relationship of relationships) {
diff --git a/lib/religion/getPantheon.ts b/lib/religion/getPantheon.ts
index 6bbe3413f..93f1beb44 100644
--- a/lib/religion/getPantheon.ts
+++ b/lib/religion/getPantheon.ts
@@ -3,59 +3,62 @@ import { Town } from '../../lib/town/_common'
 import { compileWeightToPercentile, getDeityPercentagesList, getTownDeityWeightings } from './createTownReligion'
 import { Pantheon, religion } from './religion'
 
-export const getDeity = (town: Town, deity: string) => {
+export const getDeity = (town: Town, deity: string, customPantheon?: Pantheon) => {
   return findInArray(
-    getPantheon(town).gods, 'name', deity)
+    getPantheon(town, customPantheon).gods, 'name', deity)
 }
 
-export const getPantheon = (town: Town): Pantheon => {
-  if (isUsingCustomPantheon(town)) return getCustomPantheon(town)
+export const getPantheon = (town: Town, customPantheon?: Pantheon): Pantheon => {
+  if (isUsingCustomPantheon(town)) return getCustomPantheon(town, customPantheon)
   return religion.pantheon[town.religion.pantheon]
 }
 
-export const getPantheonNames = (town: Town) => {
-  return Object.keys(getAllPantheons(town))
+export const getPantheonNames = (town: Town, customPantheon?: Pantheon) => {
+  return Object.keys(getAllPantheons(town, customPantheon))
 }
 
-export const getAllPantheons = (town: Town) => {
+export const getAllPantheons = (town: Town, customPantheon?: Pantheon) => {
   const pantheons: Record<string, Pantheon> = Object.assign({}, religion.pantheon)
-  if (seeIfCustomPantheonExists(town)) pantheons[getCustomPantheon(town).name] = getCustomPantheon(town)
+  if (seeIfCustomPantheonExists(town, customPantheon)) pantheons[getCustomPantheon(town, customPantheon).name] = getCustomPantheon(town, customPantheon)
   return pantheons
 }
 
+/** If the pantheon being used doesn't exist in the data, it's obviously custom. */
 export const isUsingCustomPantheon = (town: Town) => {
   if (religion.pantheon[town.religion.pantheon]) return false
   return true
 }
 
-export const seeIfCustomPantheonExists = (town: Town): boolean => {
+export const seeIfCustomPantheonExists = (town: Town, customPantheon?: Pantheon): boolean => {
+  if (customPantheon) return true
   if (town.religion.customPantheon) return true
   return false
 }
 
-export const getCustomPantheon = (town: Town): Pantheon => {
+export const getCustomPantheon = (town: Town, customPantheon?: Pantheon): Pantheon => {
   if (town.religion.customPantheon) return town.religion.customPantheon
+  if (customPantheon) return customPantheon
   throw new Error('Custom panthon not defined!')
 }
 
-export const getPantheonPercentages = (town: Town) => {
+export const getPantheonPercentages = (town: Town, customPantheon?: Pantheon) => {
   console.log('Getting pantheon percentages...')
   return compileWeightToPercentile(
-    getTownDeityWeightings(town, getPantheon(town).gods)
+    getTownDeityWeightings(town, getPantheon(town, customPantheon).gods)
   )
 }
 
-export const getCulledPantheonPercentages = (town: Town) => {
+export const getCulledPantheonPercentages = (town: Town, customPantheon?: Pantheon) => {
   console.log('Getting pantheon percentages...')
   const temp = compileWeightToPercentile(
-    getTownDeityWeightings(town, getPantheon(town).gods)
+    getTownDeityWeightings(town, getPantheon(town, customPantheon).gods)
   )
   return Object.fromEntries(
     Object.entries(temp).filter(([, value]) => value > 0))
 }
 
-export const getPantheonPercentagesReadout = (town: Town) => {
-  const deities: [string, number][] = getDeityPercentagesList(getPantheonPercentages(town))
+export const getPantheonPercentagesReadout = (town: Town, customPantheon?: Pantheon) => {
+  const deities: [string, number][] = getDeityPercentagesList(getPantheonPercentages(town, customPantheon))
   let text = ''
   for (const [deity, percentage] of deities) {
     if (percentage > 0) {
diff --git a/lib/src/badges.ts b/lib/src/badges.ts
index 9db1866a9..3308fdaf3 100644
--- a/lib/src/badges.ts
+++ b/lib/src/badges.ts
@@ -269,7 +269,7 @@ export const badges = {
     },
     commitsSinceLastUpdate: {
       alt: 'Commits since last update',
-      source: '/github/commits-since/ryceg/Eigengrau-s-Essential-Establishment-Generator/2.7',
+      source: '/github/commits-since/ryceg/Eigengrau-s-Essential-Establishment-Generator/2.8',
       logo: 'github',
       color: '6cc644'
     },
diff --git a/lib/src/getIllustration.ts b/lib/src/getIllustration.ts
index 70491f77f..4dce18e07 100644
--- a/lib/src/getIllustration.ts
+++ b/lib/src/getIllustration.ts
@@ -9,21 +9,31 @@ type Illustration =
 export const getIllustration = (illustration: Illustration, alt: string) => {
   let img = '<img '
   img += 'id="illustration" '
-  img += `src="../src/Resources/img/hero/${illustration}.jpg" `
+  const path = getPath()
+
+  img += `src="${path}src/Resources/img/hero/${illustration}.jpg" `
   // If it's in production, then we can add the srcset options, otherwise we might as well omit it.
-  if (process.env.NODE_ENV === 'production' && location.origin !== 'file://') img += `srcset="../src/Resources/img/hero/${illustration}-x360.jpg 360w, ../src/Resources/img/hero/${illustration}-x411.jpg 411w, ../src/Resources/img/hero/${illustration}-x500.jpg 500w, ../src/Resources/img/hero/${illustration}-x576.jpg 576w, ../src/Resources/img/hero/${illustration}-x768.jpg 768w, ../src/Resources/img/hero/${illustration}-x992.jpg 992w, ../src/Resources/img/hero/${illustration}-x1200.jpg 1200w, ../src/Resources/img/hero/${illustration}.jpg" `
+  if (process.env.NODE_ENV === 'production' && location.origin !== 'file://') img += `srcset="${path}src/Resources/img/hero/${illustration}-x360.jpg 360w, ${path}src/Resources/img/hero/${illustration}-x411.jpg 411w, ${path}src/Resources/img/hero/${illustration}-x500.jpg 500w, ${path}src/Resources/img/hero/${illustration}-x576.jpg 576w, ${path}src/Resources/img/hero/${illustration}-x768.jpg 768w, ${path}src/Resources/img/hero/${illustration}-x992.jpg 992w, ${path}src/Resources/img/hero/${illustration}-x1200.jpg 1200w, ${path}src/Resources/img/hero/${illustration}.jpg" `
   img += `alt="${alt || `An image depicting ${lib.articles.output(illustration)}, created by artist Juho Huttunen.`}" `
   img += '/>'
   return img
 }
 
+const getPath = () => {
+  if (process.env.NODE_ENV === 'production' && location.origin !== 'file://') {
+    return './'
+  }
+  return '../'
+}
+
 // It would obviously be preferable to output actual <img>s instead of having it render via SugarCube.
 // Unfortunately, I am not a clever man, and cannot figure it out.
 export const getImage = (illustration: Illustration) => {
   const img = document.createElement('img')
+  const path = getPath()
   img.id = 'illustration'
-  img.src = `../src/Resources/img/hero/${illustration}.jpg`
-  img.srcset = `../src/Resources/img/hero/${illustration}-x360.jpg 360w, ../src/Resources/img/hero/${illustration}-x411.jpg 411w, ../src/Resources/img/hero/${illustration}-x500.jpg 500w, ../src/Resources/img/hero/${illustration}-x576.jpg 576w, ../src/Resources/img/hero/${illustration}-x768.jpg 768w, ../src/Resources/img/hero/${illustration}-x992.jpg 992w, ../src/Resources/img/hero/${illustration}-x1200.jpg 1200w, ../src/Resources/img/hero/${illustration}.jpg`
+  img.src = `${path}src/Resources/img/hero/${illustration}.jpg`
+  img.srcset = `${path}src/Resources/img/hero/${illustration}-x360.jpg 360w, ${path}src/Resources/img/hero/${illustration}-x411.jpg 411w, ${path}src/Resources/img/hero/${illustration}-x500.jpg 500w, ${path}src/Resources/img/hero/${illustration}-x576.jpg 576w, ${path}src/Resources/img/hero/${illustration}-x768.jpg 768w, ${path}src/Resources/img/hero/${illustration}-x992.jpg 992w, ${path}src/Resources/img/hero/${illustration}-x1200.jpg 1200w, ${path}src/Resources/img/hero/${illustration}.jpg`
   img.alt = `An image depicting ${lib.articles.output(illustration)}, created by artist Juho Huttunen.`
   return img
 }
diff --git a/lib/src/terrain.ts b/lib/src/terrain.ts
index fe8d722e7..b67c739f4 100644
--- a/lib/src/terrain.ts
+++ b/lib/src/terrain.ts
@@ -6,9 +6,9 @@ export type Biome = 'temperate' | 'tropical' | 'arid' | 'polar'
 export type Seasons = 'spring' | 'summer' | 'autumn' | 'winter'
 
 export interface TerrainData {
+  start: WeightRecord<Locations>
   weather: WeatherData
-   start: string[]
-   location: Record<string, LocationData>
+  location: Record<string, LocationData>
 }
 
 interface WeatherData {
@@ -26,6 +26,7 @@ interface TempVariation {
   temperatureTimer(): number
 }
 interface LocationData {
+  preposition: string
   precipitationIntensity: number
   origin: string[]
   vegetation: Record<string, number>
@@ -33,8 +34,17 @@ interface LocationData {
   possibleMaterials: string[]
 }
 
+// function makeTerrain<T extends X> () {
 export const terrain: Record<Biome, TerrainData> = {
   temperate: {
+    start: {
+      'seashore': 4,
+      'forest': 2,
+      'river coast': 2,
+      'hills': 1,
+      'plains': 1,
+      'mountains': 1
+    },
     weather: {
       tempVariation: {
         95: {
@@ -88,11 +98,11 @@ export const terrain: Record<Biome, TerrainData> = {
           baseTemp: 60
         }
       }
-    },
-    start: ['seashore', 'seashore', 'seashore', 'seashore', 'forest', 'forest', 'hills', 'plains', 'mountains', 'river coast', 'river coast'],
+    } as WeatherData,
     location: {
       // town.Name is located in the _
       'seashore': {
+        preposition: 'on',
         precipitationIntensity: 3,
         // town.Name grew around _
         origin: [
@@ -117,10 +127,11 @@ export const terrain: Record<Biome, TerrainData> = {
           'shrubs': 1,
           'bush': 1,
           'windswept trees': 1
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       },
       'forest': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -152,10 +163,11 @@ export const terrain: Record<Biome, TerrainData> = {
           'alder trees': 1,
           'cypress trees': 1,
           'yew trees': 1
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob']
       },
       'hills': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -176,10 +188,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob']
       },
       'plains': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a wide, navigable river',
@@ -197,10 +210,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob']
       },
       'mountains': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -220,10 +234,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob']
       },
       'river coast': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a coastal harbor',
@@ -239,12 +254,22 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob']
       }
     }
   },
   tropical: {
+    start: {
+      'seacoast': 1,
+      'forest': 1,
+      'river coast': 2,
+      'jungle': 1,
+      'volcanic field': 1,
+      'hills': 1,
+      'plains': 1,
+      'mountains': 1
+    },
     weather: {
       tempVariation: {
         85: {
@@ -290,10 +315,10 @@ export const terrain: Record<Biome, TerrainData> = {
           baseTemp: 75
         }
       }
-    },
-    start: ['seacoast', 'forest', 'hills', 'plains', 'mountains', 'river coast', 'jungle', 'volcanic field'],
+    } as WeatherData,
     location: {
       'seacoast': {
+        preposition: 'on',
         precipitationIntensity: 3,
         origin: [
           'a coastal harbor',
@@ -315,10 +340,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'forest': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -340,10 +366,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'hills': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -362,10 +389,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'plains': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a wide, navigable river',
@@ -383,11 +411,12 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
 
       },
       'mountains': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -407,10 +436,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'river coast': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a coastal harbor',
@@ -426,10 +456,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'jungle': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a river navigable by small craft',
@@ -447,10 +478,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'volcanic field': {
+        preposition: 'on',
         precipitationIntensity: 3,
         origin: [
           'a large freshwater lake',
@@ -471,12 +503,21 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'cobblestone', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       }
     }
   },
   arid: {
+    start: {
+      'oasis': 2,
+      'river coast': 2,
+      'desert': 1,
+      'wastelant': 1,
+      'hills': 1,
+      'plains': 1,
+      'mountains': 1
+    },
     weather: {
       tempVariation: {
         95: {
@@ -530,10 +571,10 @@ export const terrain: Record<Biome, TerrainData> = {
           baseTemp: 75
         }
       }
-    },
-    start: ['desert', 'hills', 'plains', 'mountains', 'river coast', 'wasteland', 'oasis'],
+    } as WeatherData,
     location: {
       'desert': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a coastal harbor',
@@ -547,19 +588,18 @@ export const terrain: Record<Biome, TerrainData> = {
           'a well-traveled crossroads',
           'a water source and a well-traveled road'],
         vegetation: {
-          desolate: 3,
-          sparse: 1,
-          lush: 4,
-          thick: 3
+          desolate: 5,
+          sparse: 4
         },
         plants: {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw']
       },
       'forest': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -575,17 +615,18 @@ export const terrain: Record<Biome, TerrainData> = {
         vegetation: {
           desolate: 2,
           sparse: 1,
-          lush: 3,
+          lush: 2,
           thick: 6
         },
         plants: {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'hills': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -606,10 +647,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'plains': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a wide, navigable river',
@@ -619,19 +661,18 @@ export const terrain: Record<Biome, TerrainData> = {
           'a well-traveled crossroads',
           'a water source and a well-traveled road'],
         vegetation: {
-          desolate: 5,
-          sparse: 5,
-          lush: 1,
-          thick: 1
+          desolate: 3,
+          sparse: 5
         },
         plants: {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'mountains': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -645,17 +686,17 @@ export const terrain: Record<Biome, TerrainData> = {
         vegetation: {
           desolate: 5,
           sparse: 5,
-          lush: 1,
-          thick: 1
+          lush: 1
         },
         plants: {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'river coast': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a coastal harbor',
@@ -672,10 +713,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       },
       'wasteland': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a road traveled by merchants on the way to another, larger city',
@@ -692,10 +734,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob']
       },
       'oasis': {
+        preposition: 'in',
         precipitationIntensity: 1,
         origin: [
           'a series of natural springs',
@@ -714,12 +757,22 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone', 'plaster', 'gypsum', 'adobe', 'daub', 'cob', 'straw', 'terra cotta', 'clay']
       }
     }
   },
   polar: {
+    start: {
+      'seacoast': 2,
+      'forest': 2,
+      'river coast': 1,
+      'hills': 1,
+      'plains': 1,
+      'mountains': 1,
+      'tundra': 1,
+      'ice sheet': 1
+    },
     weather: {
       tempVariation: {
         100: {
@@ -773,10 +826,10 @@ export const terrain: Record<Biome, TerrainData> = {
           baseTemp: 30
         }
       }
-    },
-    start: ['seacoast', 'forest', 'hills', 'plains', 'mountains', 'river coast', 'tundra', 'ice sheet', 'seacoast'],
+    } as WeatherData,
     location: {
       'seacoast': {
+        preposition: 'on',
         precipitationIntensity: 3,
         origin: [
           'a coastal harbor',
@@ -799,10 +852,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       },
       'forest': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -825,10 +879,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       },
       'hills': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -849,10 +904,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       },
       'plains': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a wide, navigable river',
@@ -871,10 +927,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       },
       'mountains': {
+        preposition: 'in',
         precipitationIntensity: 2,
         origin: [
           'a large freshwater lake',
@@ -895,10 +952,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       },
       'river coast': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a coastal harbor',
@@ -915,10 +973,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       },
       'tundra': {
+        preposition: 'on',
         precipitationIntensity: 2,
         origin: [
           'a wide, navigable river',
@@ -936,10 +995,11 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       },
       'ice sheet': {
+        preposition: 'on',
         precipitationIntensity: 3,
         origin: [
           'a wide, navigable river',
@@ -957,9 +1017,18 @@ export const terrain: Record<Biome, TerrainData> = {
           shrubs: 1,
           bush: 1,
           trees: 2
-        },
+        } as WeightRecord<string>,
         possibleMaterials: ['hewn rock', 'stone', 'cobblestone', 'wood', 'brick', 'limestone']
       }
     }
   }
 }
+// return terrain
+// }
+
+// export const terrain = makeTerrain()
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type UnionKeys<T> = T extends any ? keyof T : never
+type Terrain = typeof terrain
+export type Locations = UnionKeys<Terrain[keyof Terrain]['location']>
diff --git a/src/Factions/components/FactionSliders.twee b/src/Factions/components/FactionSliders.twee
index 5b91996a6..027940355 100644
--- a/src/Factions/components/FactionSliders.twee
+++ b/src/Factions/components/FactionSliders.twee
@@ -1,7 +1,8 @@
-:: FactionSliders [force-one-column]
-\<<set $currentPassage to $town.factions[$currentPassage.key]>>
-\<<run $("body").on("change", ".type", function() {
+:: FactionSliders [force-one-column, nobr]
+<<set $currentPassage to $town.factions[$currentPassage.key]>>
+<<run $("body").on("change", [".type"], function() {
   $(document).trigger(":liveupdate");
+  tippy('[data-tippy-content]');
 });>>
 <<liveblock>>
     <<link "reroll">>
@@ -9,7 +10,7 @@
     <</link>> -- <span class="auto-update"><label name="Rename the faction"><<textbox "$town.factions[$currentPassage.key].name" $town.factions[$currentPassage.key].name>></label></span> -- <<button "Delete $currentPassage.name" Start>><<run setup.deleteFaction($town, $town.factions[$currentPassage.key])>><</button>>
 <</liveblock>>
 
-<label for="listbox-townfactionscurrentpassagekeytype">Type:</label> <span class="type"><<listbox "$town.factions[$currentPassage.key].type" autoselect>><<optionsfrom Object.keys(lib.factionData)>><</listbox>></span>
+<label for="listbox-townfactionscurrentpassagekeytype">Type:</label> <span class="type"><<listbox "$town.factions[$currentPassage.key].type" autoselect>><<optionsfrom Object.keys(lib.factionData.types)>><</listbox>></span>
 <table>
   <tr>
     <th>Attribute Slider</th>
@@ -19,10 +20,31 @@
   <<if _obj.isHidden>><<continue>><<else>><tr><td class="tip" @data-tippy-content=lib.factionSliders[_key].description><label for="numberslider-townfactionscurrentpassagekeyrollkey"><<print lib.factionSliders[_key].preceding>></label></td><td style="21vw"> <<numberslider "$town.factions[$currentPassage.key].roll[_key]" $town.factions[$currentPassage.key].roll[_key] 1 100 1>></td></tr><</if>>
   <</capture>><</for>>
 </table>
-<<liveblock>><label for="listbox-townfactionscurrentpassagekeymotivation">Motivation:</label> <<listbox "$town.factions[$currentPassage.key].motivation" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$town.factions[$currentPassage.key].type].motivation)>><</listbox>>
-<label for="listbox-townfactionscurrentpassagekeymemberstrait">Member's Trait:</label> <<listbox "$town.factions[$currentPassage.key].membersTrait" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$town.factions[$currentPassage.key].type].membersTrait)>><</listbox>>
-<label for="listbox-townfactionscurrentpassagekeyleadershiptype">Leadership Type:</label> <<listbox "$town.factions[$currentPassage.key].leadershipType" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$town.factions[$currentPassage.key].type].leader.format)>><</listbox>>
-<label for="listbox-townfactionscurrentpassagekeyjoiningrequirement">Joining Requirement:</label> <<listbox "$town.factions[$currentPassage.key].joiningRequirement" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$currentPassage.type].joiningRequirement).concatUnique([
+<<liveblock>>
+<p><label for="listbox-townfactionscurrentpassagekeymotivation">Motivation:</label> <<listbox "$town.factions[$currentPassage.key].motivation" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$town.factions[$currentPassage.key].type].motivation)>><</listbox>></p>
+<p><label for="listbox-townfactionscurrentpassagekeymemberstrait">Member's Trait:</label> <<listbox "$town.factions[$currentPassage.key].membersTrait" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$town.factions[$currentPassage.key].type].membersTrait)>><</listbox>></p>
+<p><label for="listbox-townfactionscurrentpassagekeyleadershiptype">Leadership Type:</label> <<listbox "$town.factions[$currentPassage.key].leadershipType" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$town.factions[$currentPassage.key].type].leader.format)>><</listbox>></p>
+/* <p><<if $town.factions[$currentPassage.key].leadershipType === 'individual'>>
+<label for='listbox-townfactionscurrentpassagekeyleader'>Leader:</label>
+<<set _newLeader to $npcs[$town.factions[$currentPassage.key].leader.key].name>>
+  <<listbox "_newLeader" autoselect>>
+    <<optionsfrom Object.values($npcs).map(el => el.name)>>
+  <</listbox>>
+<<if $town.factions[$currentPassage.key].leader.name !== _newLeader>><<button "Save">>
+  <<run lib.deleteReciprocalRelationship($town, $town.factions[$currentPassage.key], lib.findInContainer($npcs)('name', $town.factions[$currentPassage.key].leader.name))>>
+  <<run lib.createReciprocalRelationship(
+    $town, 
+    $town.factions[$currentPassage.key], 
+    lib.findInContainer($npcs)('name', _newLeader), {
+      relationship: 'head of faction',
+      reciprocalRelationship: 'controlled faction',
+      description: _newLeader + ' is the leader of ' + $town.factions[$currentPassage.key].name + ', and is ' + $town.factions[$currentPassage.key].leaderCompetence + '.'}
+  )>>
+  <<set $town.factions[$currentPassage.key].leader to lib.findInContainer($npcs, 'name', _newLeader)>>
+  <</button>>
+<</if>>
+<</if>></p> */
+<p><label for="listbox-townfactionscurrentpassagekeyjoiningrequirement">Joining Requirement:</label> <<listbox "$town.factions[$currentPassage.key].joiningRequirement" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$currentPassage.type].joiningRequirement).concatUnique([
   'a display of bravery',
   'a display of loyalty',
   'a display of skill',
@@ -32,14 +54,14 @@
   'referral by an existing member',
   'referral by several members',
   'some social status',
-  'to be called on for a favour'])>><</listbox>>
-<label for="listbox-townfactionscurrentpassagekeyjoininginitiation">Joining Initiation: </label><<listbox "$town.factions[$currentPassage.key].joiningInitiation" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$currentPassage.type].joiningInitiation).concatUnique([
+  'to be called on for a favour'])>><</listbox>></p>
+<p><label for="listbox-townfactionscurrentpassagekeyjoininginitiation">Joining Initiation: </label><<listbox "$town.factions[$currentPassage.key].joiningInitiation" autoselect>><<optionsfrom Object.keys(lib.factionData.types[$currentPassage.type].joiningInitiation).concatUnique([
   'a mission',
   'a secret ritual',
   'a secret task',
   'a simple form to be filled',
   'an oath to be taken',
-  'nothing particularly interesting'])>><</listbox>><</liveblock>>
-
-
+  'nothing particularly interesting'])>><</listbox>></p><</liveblock>>
+<br>
+<<run tippy('[data-tippy-content]')>>
 <<button "Save" FactionProfile>><<set $town.factions[$currentPassage.key] to setup.createFaction($town, $town.factions[$currentPassage.key])>><</button>>
\ No newline at end of file
diff --git a/src/Meta/ImportDiscriminator.twee b/src/Meta/ImportDiscriminator.twee
new file mode 100644
index 000000000..49e61cb6c
--- /dev/null
+++ b/src/Meta/ImportDiscriminator.twee
@@ -0,0 +1,10 @@
+:: ImportDiscriminator
+<<include "Auth">><<if State.metadata.get('patreonPass') === $_>><<run setup.openDialog({
+      header: 'Pantheon Setup',
+      passage: 'EditPantheon',
+      rerender: true
+    })>><<else>><<run setup.openDialog({
+      header: 'Patreon Only',
+      passage: 'ImportPatreon',
+      rerender: true
+    })>><</if>>
\ No newline at end of file
diff --git a/src/Meta/ImportPatreon.twee b/src/Meta/ImportPatreon.twee
new file mode 100644
index 000000000..20bb98828
--- /dev/null
+++ b/src/Meta/ImportPatreon.twee
@@ -0,0 +1,11 @@
+:: ImportPatreon
+<<set _retorts to ['Not quite- did you spell it wrong?', 'Try again.', 'Third time is not the charm, apparently.',,,,,,,,, 'It is pretty obvious that you have not paid',,,,,, 'Please consider chucking me $5',,,, 'I spent a long time on this',,,,, "If you can't be bothered, then there's always hosting locally!",,,, '...but we both know that the chances of you doing that are very low...',,,,,,, 'So come on, the button is right [[here|https://www.patreon.com/eigengrausgenerator/membership]]!',,,'Or, you can always post the generator on Reddit, etc.',,,,,'If you submit it to a blog, then I will send you a key!',,,,,"Plus, this feature gets unlocked for everyone at 150 patrons!",,,,,,,,,,,,, '...',,,, '...',,,, "You're just having fun now.",,,, "You think this is some kind of game?!",,,,,,,,,,, "Well it isn't! It's a TOWN GENERATOR.",,,,,,,,, 'NOT a game.',,,,,,,,,,,,,,, 'But, I admit that it is kinda fun to write these messages.',,,,,,,, 'I wonder if anyone is actually going to read them.',,,, 'Probably not.',,,, 'But then again, maybe!',,,,,,, 'But you should probably just quit.',, 'The whole schtick of talking through the error message is kinda getting old',,,,,,, "Plus, I can't really think of anything else witty to say.",,,,,,,, "Or even vaguely amusing, for that matter.",,,,,,,,,,,,,,,,,,,,,,, 'Go watch a movie or something!',,,, 'Or, I dunno, pay for the patreon?',,,,,,, 'That could be fun!',,,,,,,,,,, "Don't knock it until you try it!",,,,, 'Okay, I give up.',,,,,,,,,,,, 'You really want the password?',,,,,,, 'Fine.',,,,,,,,, 'Have it.',,,,,, 'I suppose you deserve something for god knows how many clicks.',,,,,,,,,,,,, 'Okay, stop clicking super fast.', "It's this next one",, "It's embedded in this YouTube video: https://www.youtube.com/watch?v=YddwkMJG1Jo"]>><<set _temp to lib.random(['Abracadabra', 'Please?', 'Expecto Patron!', 'Open Sesame', 'I cast Knock', 'I use thieves tools'])>><<set _i to 0>>
+This is a [[Hero tier Patron|https://www.patreon.com/join/eigengrausgenerator?]] only feature.
+
+However, I'm not one for hard content walls; if you are not a Patreon supporter, you can access it by compiling from source, which is downloadable from our GitHub.
+
+Eigengrau's Generator runs on a "goal based content unlocking" system, where paywalls come down when we hit Patreon milestones. So, it's in your best interests to spread the word! Send the blog to Kotaku, Geek and Sundry, and any other blog, and tell them to cover it!
+
+If you are a Hero tier Patron, take a look at the [[membership page|https://www.patreon.com/eigengrausgenerator/membership]], and enter the code below:
+
+<<textbox "$tovvn" _temp autofocus>> -- <<button "Submit">><<include "Auth">><<if $tovvn === $_>><<run Dialog.close()>><<else>><<replace "#result">> -- <<if _i < _retorts.length>><<print _retorts[_i]>><<elseif _i > 100>><<print "I promise you, there's nothing further.">><<else>><</if>><<set _i++>><</replace>><</if>><</button>> <span id="result"></span>
diff --git a/src/NPCGeneration/NPCProfile/NPCProfile.twee b/src/NPCGeneration/NPCProfile/NPCProfile.twee
index b16c6efb6..7162a3056 100644
--- a/src/NPCGeneration/NPCProfile/NPCProfile.twee
+++ b/src/NPCGeneration/NPCProfile/NPCProfile.twee
@@ -7,7 +7,7 @@
 \<<if def $currentNPC.vocalPattern>><<print $currentNPC.heshe.toUpperFirst()>> $currentNPC.vocalPattern. <</if>>
 \<<if lib.getTraitsReadout($currentNPC)>><<print $currentNPC.heshe.toUpperFirst()>> is <<print lib.getTraitsReadout($currentNPC)>> <</if>>
 \When $currentNPC.heshe is relaxed, $currentNPC.heshe is $currentNPC.calmTrait. In moments of stress, $currentNPC.heshe becomes $currentNPC.stressTrait. 
-\Religion-wise, $currentNPC.firstName is <<print lib.createTippyFull(lib.getReligiosityDescription($town, $currentNPC), lib.articles.output($currentNPC.religion.strength))>> of <<set _deity to lib.getDeity($town, $currentNPC.religion.deity)>><<profile _deity>>. 
+\Religion-wise, $currentNPC.firstName is <<print lib.createTippyFull(lib.getReligiosityDescription($town, $currentNPC), lib.articles.output($currentNPC.religion.strength))>> of <<set _deity to lib.getDeity($town, $currentNPC.religion.deity, State.metadata.get('pantheon'))>><<profile _deity>>. 
 \<p><<if lib.isBreakingGenderNorms($town, $currentNPC) && $currentNPC.roll.professionLuck > 0>>Despite sexism against $currentNPC.himher, <<elseif lib.isBreakingGenderNorms($town, $currentNPC) && $currentNPC.roll.professionLuck < 0>>Perhaps due to sexism, <</if>>$currentNPC.professionSuccess, with a background of being <<print lib.articles.output($currentNPC.background)>>. 
 \<<if lib.socialClass[$currentNPC.socialClass].lifestyle.includes(lib.npcLifestyleStandard($town, $currentNPC).lifestyleStandard)>>
   \<<print $currentNPC.heshe.toUpperFirst()>> belongs to the <<print lib.createTippyFull($currentNPC.firstName + " " + lib.npcLifestyleStandard($town, $currentNPC).lifestyleDescription, $currentNPC.socialClass)>> social class
diff --git a/src/Religion/EditPantheon.twee b/src/Religion/EditPantheon.twee
new file mode 100644
index 000000000..0234d4edc
--- /dev/null
+++ b/src/Religion/EditPantheon.twee
@@ -0,0 +1,44 @@
+:: EditPantheon [nobr]
+<<run $("body").on("change", ["button", 'input'], function() {
+  $(document).trigger(":liveupdate");
+});>>
+<<lb>><<if State.metadata.get('patreonPass') === $_>><<set _isPatron to true>><<import '$town.religion.customPantheon' 'json' 'Import Custom Pantheon'>><<else>><<set _isPatron to false>><<button "Import (Patreon Only)">><<run setup.openDialog({
+      header: 'Patreon Only',
+      passage: 'ImportPatreon',
+      rerender: true
+    })>><</button>><</if>> --
+<<listbox "$town.religion.pantheon" autoselect>><<optionsfrom lib.getPantheonNames($town, State.metadata.get('pantheon'))>><</listbox>>
+<<if def $town.religion.customPantheon or State.metadata.has('pantheon')>>
+<<run State.metadata.set('pantheon', $town.religion.customPantheon)>>
+ -- 
+  <<button "Delete custom pantheon">>
+    <<if lib.isUsingCustomPantheon($town, State.metadata.get('pantheon'))>>
+      <<set $town.religion.pantheon to 'greek'>>
+    <</if>>
+    <<set $town.religion.customPantheon to {}>><<update>>
+  <<run State.metadata.delete('pantheon')>>
+  <</button>>
+<</if>> -- <<button "Refresh">><<update>><</button>>
+<ol>
+<<if _isPatron === false>><li>Join the Patreon at the Hero or higher tier [[here|https://www.patreon.com/join/eigengrausgenerator?]]</li>
+<li>Find the code in the [[welcome note|https://www.patreon.com/eigengrausgenerator/membership]]</li>
+<li>Enter it <<link "here">><<run setup.openDialog({
+      header: 'Patreon Only',
+      passage: 'ImportPatreon',
+      rerender: true
+    })>><</link>></li>
+<</if>>
+<li>Import custom pantheon as a valid {{{.json}}} file. You can access a template of the pantheon {{{.json}}} file online, or in our Discord server.</li>
+<li>Select desired pantheon from the drop-down menu.</li>
+</ol>
+<hr>
+<<if lib.isUsingCustomPantheon($town, State.metadata.get('pantheon')) === false>><details style="height:270px; overflow:auto"><summary>Current Pantheon Data for <b><<print lib.getPantheon($town, State.metadata.get('pantheon')).name>></b> loaded:</summary>
+<<print JSON.stringify(lib.getPantheon($town, State.metadata.get('pantheon')))>>
+</details>
+<hr><</if>>
+Custom patheon name: <<if lib.seeIfCustomPantheonExists($town, State.metadata.get('pantheon'))>><b><<print lib.getCustomPantheon($town, State.metadata.get('pantheon')).name>></b>
+<details style="height:90%; overflow:auto"><summary>Custom Pantheon Data:</summary>
+<<print JSON.stringify(lib.getCustomPantheon($town, State.metadata.get('pantheon')))>>
+</details>
+<<else>>none currently loaded<</if>>
+<</lb>>
\ No newline at end of file
diff --git a/src/Religion/ImportPantheon.twee b/src/Religion/ImportPantheon.twee
deleted file mode 100644
index 26e656b93..000000000
--- a/src/Religion/ImportPantheon.twee
+++ /dev/null
@@ -1,22 +0,0 @@
-:: ImportPantheon
-<<run $("body").on("change", ["button"], function() {
-  $(document).trigger(":liveupdate");
-});>>
-\<<import '$town.religion.customPantheon' 'json' 'Import Custom Pantheon'>> -- <<lb>>
-\<<listbox "$town.religion.pantheon" autoselect>><<optionsfrom lib.getPantheonNames($town)>><</listbox>>
-\<<if def $town.religion.customPantheon>> -- <<button "Delete custom pantheon">><<if lib.isUsingCustomPantheon($town)>><<set $town.religion.pantheon to 'greek'>><</if>>
-\<<set $town.religion.customPantheon to {}>><<update>>
-\<</button>><</if>>
-1. Import custom pantheon as a valid {{{.json}}} file. You can access a template of the pantheon {{{.json}}} file online, or in our Discord server.
-2. Select desired pantheon from the drop-down menu.
-----
-<<if lib.isUsingCustomPantheon($town) === false>><details style="height:270px; overflow:auto"><summary>Current Pantheon Data for <b><<print lib.getPantheon($town).name>></b> loaded:</summary>
-\<<print JSON.stringify(lib.getPantheon($town))>>
-</details>
-----<</if>>
-\Custom patheon name: <<if State.metadata.has('pantheon')>><b><<print lib.getCustomPantheon($town).name>></b>
-<details style="height:90%; overflow:auto"><summary>Custom Pantheon Data:</summary>
-\<<print JSON.stringify(lib.getCustomPantheon($town))>>
-</details>
-<<else>>none currently loaded<</if>>
-<</lb>>
\ No newline at end of file
diff --git a/src/Settings/Breadcrumb.twee b/src/Settings/Breadcrumb.twee
index 4b64ab5cc..0bc22085f 100644
--- a/src/Settings/Breadcrumb.twee
+++ b/src/Settings/Breadcrumb.twee
@@ -1,5 +1,5 @@
 :: Breadcrumb
-<<nobr>><<liveblock>>
+<<liveblock>><<nobr>>
   <<set $town.ignoreGender to settings.ignoreGender>>
     <nav><<link "The $town.type of $town.name">>
       <<if $town.generated === 'biome'>><<set $town to setup.createTown($town)>><</if>>
@@ -11,7 +11,7 @@
 <<for _i, _passage range $history>><<set _link to lib.toTitleCase(_passage.linkDescription)>>
   <<capture _i, _passage, _link>>
     <<if _i < $history.length - 1>>
-        \<nav class="breadcrumb-link">
+        <nav class="breadcrumb-link">
           <<link _link _passage.passageName>>
             <<set $currentPassage to _passage.data>>
             <<run $history.length = _i>>
@@ -22,8 +22,8 @@
   <</capture>>
 <</for>>
 <<if def $history.last()>>
-  \<nav class="breadcrumb-link last">
+  <nav class="breadcrumb-link last">
     <<print lib.toTitleCase($history.last().linkDescription)>>
   </nav>
 <</if>>
-<</liveblock>><</nobr>>
\ No newline at end of file
+<</nobr>><</liveblock>>
\ No newline at end of file
diff --git a/src/Settings/PassageHeader.twee b/src/Settings/PassageHeader.twee
index 370e5baa5..09987b4a0 100644
--- a/src/Settings/PassageHeader.twee
+++ b/src/Settings/PassageHeader.twee
@@ -1,6 +1,2 @@
 :: PassageHeader
-<<nobr>>
-<header id="passage-header">
-  <<include "Breadcrumb">>
-</header>
-<</nobr>>
\ No newline at end of file
+<header id="passage-header"><<include "Breadcrumb">></header>
\ No newline at end of file
diff --git a/src/Settings/Setting.js b/src/Settings/Setting.js
index 283ad5915..0c1c5803c 100644
--- a/src/Settings/Setting.js
+++ b/src/Settings/Setting.js
@@ -11,7 +11,7 @@ $(document).on(':dialogopened', function () {
     },
     () => setup.openDialog({
       header: 'Pantheon Setup',
-      passage: 'ImportPantheon',
+      passage: 'EditPantheon',
       rerender: true
     })
     )
@@ -26,9 +26,42 @@ $(document).on(':dialogopened', function () {
       Dialog.close()
     }
     )
+    setup.addSettingButton({
+      target: 'tutorial',
+      name: 'patreon',
+      description: patreonContent(),
+      buttonDescription: buttonName()
+    },
+    () => {
+      if (isPatron()) {
+        return window.open('https://www.patreon.com/join/eigengrausgenerator?', 'Patreon')
+      } else {
+        setup.openDialog({
+          header: 'Patreon Content',
+          passage: 'ImportPatreon',
+          rerender: true
+        })
+      }
+    }
+    )
   }
 })
 
+function buttonName () {
+  if (isPatron()) return 'Visit Patreon page'
+  return 'Enter Code'
+}
+
+function isPatron () {
+  if (State.metadata.get('patreonPass') === State.variables._) return true
+  return false
+}
+
+function patreonContent () {
+  if (isPatron()) return 'Patreon content is unlocked.'
+  return 'Patreon content is not currently unlocked.'
+}
+
 Setting.addHeader('Content Settings')
 
 Setting.addToggle('darkMode', {
diff --git a/src/Settings/StoryStuff/StoryAuthor.twee b/src/Settings/StoryStuff/StoryAuthor.twee
index 293019038..2c26ae05e 100644
--- a/src/Settings/StoryStuff/StoryAuthor.twee
+++ b/src/Settings/StoryStuff/StoryAuthor.twee
@@ -2,14 +2,14 @@
 Created by /u/rcgy
 <span class="version">v[[setup.data.versionNumber|https://github.com/ryceg/Eigengrau-s-Essential-Establishment-Generator/blob/master/CHANGELOG.md]]</span>
 <<nobr>><<if settings.hideAds !== true>>
-<span class="tip" data-tippy-content="Thank you for your continued support!" id="patreon">
+<span class="tip sidebarAds" data-tippy-content="Thank you for your continued support!" id="patreon">
     <<print lib.createBadge(lib.badges.stats.patreonSupporters, {imgArgs: 'style=width:100%'})>>
     /* , imgArgs: "style='width:100%'" */
 </span>
-<span class="tip" data-tippy-content="Come join our community!" id='discord'>
+<span class="tip sidebarAds" data-tippy-content="Come join our community!" id='discord'>
     <<print lib.createBadge(lib.badges.stats.discordOnline, {imgArgs: 'style=width:100%'})>>
 </span>
-<span class="tip" data-tippy-content="Check out the repository!" id='github'>
+<span class="tip sidebarAds" data-tippy-content="Check out the repository!" id='github'>
     <<print setup.data.badges.github>>
 </span>
 <div id="fun">
@@ -17,5 +17,5 @@ Created by /u/rcgy
     $(output).append(setup.data.badges.fun);
   <</script>>
 </div>
-
+<<run tippy('.sidebarAds')>>
 <</if>><</nobr>>
\ No newline at end of file
diff --git a/src/Settings/StoryStuff/StoryMenu.twee b/src/Settings/StoryStuff/StoryMenu.twee
index c31f0fddc..5970583f4 100644
--- a/src/Settings/StoryStuff/StoryMenu.twee
+++ b/src/Settings/StoryStuff/StoryMenu.twee
@@ -3,7 +3,11 @@
 
 <<link "Toolbox" Toolbox>><<run setup.history({passageName: "Toolbox", linkDescription: "Toolbox", name: "Toolbox"})>><</link>>
 
-<<link "Export to Foundry or GMBinder">><<if State.metadata.get('seenPatreon') === true>><<goto "OutputEverything">><<else>><<goto "Survey">><</if>><</link>>
+<<link "Export to Foundry or GMBinder">><<include "Auth">><<if State.metadata.get('patreonPass') === $_>><<goto 'OutputEverything'>><<else>><<run setup.openDialog({
+      header: 'Patreon Only',
+      passage: 'ImportPatreon',
+      rerender: true
+    })>><</if>><</link>>
 
 [[Submit a bug or suggestion|https://github.com/ryceg/Eigengrau-s-Essential-Establishment-Generator/issues/new/choose]]
 
diff --git a/src/Settings/StoryStuff/StoryTest.twee b/src/Settings/StoryStuff/StoryTest.twee
new file mode 100644
index 000000000..0b4967ca3
--- /dev/null
+++ b/src/Settings/StoryStuff/StoryTest.twee
@@ -0,0 +1,2 @@
+:: Auth
+<<if State.variables._ === $tovvn>><<set setup.data.isPatron to true>><<run State.metadata.set('patreonPass', $tovvn)>><<notify 5000>>Patreon features unlocked! Thank you :)<</notify>><</if>>
\ No newline at end of file
diff --git a/src/Settings/Tippy/tooltips.ts b/src/Settings/Tippy/tooltips.ts
index 39934acd8..cc276e28e 100644
--- a/src/Settings/Tippy/tooltips.ts
+++ b/src/Settings/Tippy/tooltips.ts
@@ -106,7 +106,7 @@ export const createPercentageTooltip = (source: HTMLElement, target: string, per
   const tip = $(`<span class='tip dotted'>${content}</span>`)
   tippy(tip.get(0), {
     content: source,
-    interactive: false,
+    interactive: true,
     allowHTML: true
   })
   const htmlTarget = Array.from(document.getElementsByClassName(target))
@@ -127,6 +127,17 @@ export function createReligionHTML (percentages: Record<string, number>, target:
   const list = lib.formatPercentile(array as [string, number][])
   const html = lib.formatAsList(list)
   createPercentageTooltip(html, target, percentages, lib.getPredominantReligion(State.variables.town, percentages).amountDescriptive)
+  const button = $('<button/>', {
+    text: 'Edit',
+    click () {
+      setup.openDialog({
+        header: 'Edit Pantheon',
+        passage: 'EditPantheon',
+        rerender: true
+      })
+    }
+  })
+  $(button).appendTo(html)
 }
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
diff --git a/src/Start/BriefDescription.twee b/src/Start/BriefDescription.twee
index 8b92baf48..21f02936c 100644
--- a/src/Start/BriefDescription.twee
+++ b/src/Start/BriefDescription.twee
@@ -1,6 +1,6 @@
 :: BriefDescription
 <h1 class='town-name'>The <<print $town.type.toUpperFirst()>> of $town.name</h1>
-\<p role="main">$town.name is <<print lib.articles.output(lib.createTippyFull("With a population of " + $town.population + ".", $town.type))>> located in the $town.terrain $town.location, where the vegetation is $town.vegetation. $town.name grew around $town.origin, and is comprised <<nobr>>
+\<p role="main">$town.name is <<print lib.articles.output(lib.createTippyFull("With a population of " + $town.population + ".", $town.type))>> located <<print lib.terrain[$town.terrain].location[$town.location].preposition>> the $town.terrain $town.location, where the vegetation is $town.vegetation. $town.name grew around $town.origin, and is comprised <<nobr>>
 <<include "RacesPercentageList">>. They are 
 <<if $town.ignoreGender is false>><<print lib.articles.find($town.equality)>> <<print lib.createTippyFull($town.equalityDescription, $town.equality)>> 
 <<else>>
diff --git a/src/Start/CustomStart/BiomeGeneration.twee b/src/Start/CustomStart/BiomeGeneration.twee
index 84910bc57..dd415fbbc 100644
--- a/src/Start/CustomStart/BiomeGeneration.twee
+++ b/src/Start/CustomStart/BiomeGeneration.twee
@@ -10,7 +10,7 @@
 <</liveblock>>
 <<button "Refresh">><<update>><<replace "#refresh">><<include "BiomeGenerationRefresh">><</replace>><</button>>
 <span id="refresh"><<include "BiomeGenerationRefresh">></span><</nobr>>
-----
+<hr>
 <<nobr>><details open><summary>Attributes</summary>
 <table>
   <tr>
@@ -28,7 +28,7 @@
 <tr><td class="tip" data-tippy-content="How sexist is their society?">Sexist (in favour of <span class="tip" data-tippy-content="Which is the dominant gender? Note that the degree of dominance is determined by its equality, not this dropdown."><label name="Town dominant gender" for="listbox-towndominantgender"><<listbox "$town.dominantGender" autoselect>><<option "man">><<option "woman">><</listbox>></label>)</span> -- Total Egalitarianism:</td><td style="21vw"> <<numberslider "$town.roll.equality" $town.roll.equality 1 100 1>></td></tr>
 </table>
 </details><</nobr>>
-----
+<hr>
 <<nobr>><details open><summary>Racial Demographics</summary>
 <<liveblock>><<run lib.updateDemographics($town, $town._baseDemographics)>>$town.name is <<print lib.articles.output(setup.getTownType($town))>> comprised <<print lib.getPredominantRace($town._demographicPercentile).amountDescriptive>>.
 <span class="races-slider tip" data-tippy-content="How many people live here?">Town Population: <<numberslider "$town.population" $town.population 30 12000 10>></span>
diff --git a/src/Start/ReligionPercentageList.twee b/src/Start/ReligionPercentageList.twee
index e43b2a0c8..1f8b32f04 100644
--- a/src/Start/ReligionPercentageList.twee
+++ b/src/Start/ReligionPercentageList.twee
@@ -1,2 +1,2 @@
 :: ReligionPercentageList
-<span class='tippy-religion-percentage'></span><<timed 0s>><<run setup.createReligionHTML(lib.getCulledPantheonPercentages($town), 'tippy-religion-percentage')>><</timed>>
\ No newline at end of file
+<span class='tippy-religion-percentage'></span><<timed 0s>><<run setup.createReligionHTML(lib.getCulledPantheonPercentages($town, State.metadata.get('pantheon')), 'tippy-religion-percentage')>><</timed>>
\ No newline at end of file
diff --git a/src/Start/Start.twee b/src/Start/Start.twee
index 3bf8a452c..1600843ed 100644
--- a/src/Start/Start.twee
+++ b/src/Start/Start.twee
@@ -6,4 +6,4 @@
 <<include "CreateBuilding">>
 <span id="buildings" role="list"><<include "RoadsList">></span>
 <<run console.log($town)>>
-<<include "Popup">>
+<<include "Popup">>
\ No newline at end of file
diff --git a/src/Start/StoryInit.twee b/src/Start/StoryInit.twee
index e19032f6c..d4c22870b 100644
--- a/src/Start/StoryInit.twee
+++ b/src/Start/StoryInit.twee
@@ -5,8 +5,7 @@
 <<run setup.init()>>
 
 <<set setup.data to {
-	isPatreon: [true, false].random(),
-	versionNumber: "2.8",
+	versionNumber: "2.8.1",
 	badges: {
 		github: lib.createBadge([
 			lib.badges.stats.githubForks, 
@@ -45,7 +44,10 @@
 			<<set $town to setup.createTown($town)>>
 	<</if>>
 <</if>>
-
+<<set _t to lib.books.normal>><<set $_ to ''>>
+<<for _i = 0; _i < 16; _i++>><<set State.variables._ += _t[_i][4]>><</for>>
+<<if location.origin === 'file://'>><<set settings.disableAnalytics to true>><<run memorize('patreonPass', $_)>><<notify 10000>>Patreon features are unlocked since you're running locally.<</notify>>
+<</if>>
 <<script>>
   const $fun = $(`<span id="fun" class="tip" />`).appendTo('#fun-container');
   const $badge = $(`<span id="badge" />`)
diff --git a/src/Town/components-edit/EditSociopolitics.twee b/src/Town/components-edit/EditSociopolitics.twee
index 1a141a2be..b7e10e2ce 100644
--- a/src/Town/components-edit/EditSociopolitics.twee
+++ b/src/Town/components-edit/EditSociopolitics.twee
@@ -1,5 +1,4 @@
 :: EditSociopolitics
-<span class="tip" data-tippy-content="How does the economy work?"><label name="Town economic ideology" for="listbox-towneconomicideology"><<listbox "$town.economicIdeology" autoselect>><<optionsfrom $listboxes.economicIdeology>><</listbox>></label></span>\
+<<include "ListboxOptions">><span class="tip" data-tippy-content="How does the economy work?"><label name="Town economic ideology" for="listbox-towneconomicideology"><<listbox "$town.economicIdeology" autoselect>><<optionsfrom $listboxes.economicIdeology>><</listbox>></label></span>\
 <span class="tip" data-tippy-content="Who leads the people?"><label name="Town political ideology" for="listbox-townpoliticalideology"><<listbox "$town.politicalIdeology" autoselect>><<optionsfrom $listboxes.politicalIdeology>><</listbox>></label></span>\
-<span class="tip" data-tippy-content="Why do they rule? Are they elected, or born into power?"><label name="Town political source" for="listbox-townpoliticalsource"><<listbox "$town.politicalSource" autoselect>><<optionsfrom $listboxes.politicalSource>><</listbox>></label></span>\
-\
\ No newline at end of file
+<span class="tip" data-tippy-content="Why do they rule? Are they elected, or born into power?"><label name="Town political source" for="listbox-townpoliticalsource"><<listbox "$town.politicalSource" autoselect>><<optionsfrom $listboxes.politicalSource>><</listbox>></label></span>\
\ No newline at end of file
diff --git a/src/Town/components-edit/TownEdit.twee b/src/Town/components-edit/TownEdit.twee
index a82f74707..4bfd159a4 100644
--- a/src/Town/components-edit/TownEdit.twee
+++ b/src/Town/components-edit/TownEdit.twee
@@ -6,7 +6,7 @@
 <</nobr>>
 <<include "EditSociopolitics">>
 <<include "EditSliders">>
-----
+<hr>
 <<nobr>>
 <<include "EditRaces">>
 <<include "EditReligion">><<timed 0s>><<run tippy('[data-tippy-content]')>><</timed>><</nobr>>
diff --git a/src/Town/js/createTown.ts b/src/Town/js/createTown.ts
index 1253c36f2..ae51f0120 100644
--- a/src/Town/js/createTown.ts
+++ b/src/Town/js/createTown.ts
@@ -1,15 +1,14 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 import { BinaryGender, RollArray, Town, TownBasics, TownRollData, TownRolls, TownType } from '@lib'
 
 export const createTown = (base: TownBasics) => {
   const type = base.type || lib.random(['hamlet', 'hamlet', 'village', 'village', 'village', 'town', 'town', 'town', 'city', 'city'])
   const terrain = base.terrain || lib.random(['temperate', 'temperate', 'temperate', 'tropical', 'polar', 'arid'])
   const season = base.currentSeason || lib.random(['summer', 'autumn', 'winter', 'spring'])
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   const townName = base.name || setup.createTownName(base)
   console.groupCollapsed(`${townName} is loading...`)
   console.log(base)
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   if (!base) base = setup.createTownBiome()
   const economicIdeology = base.economicIdeology || lib.politicsWeightedRoll(type, 'economicIdeology')
@@ -26,10 +25,9 @@ export const createTown = (base: TownBasics) => {
       land: 5,
       tithe: 1
     },
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
     // @ts-ignore
     get type () {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       return getTownType(this)
     },
@@ -54,6 +52,11 @@ export const createTown = (base: TownBasics) => {
     get religionPercentages () {
       return lib.getPantheonPercentages(this as unknown as Town)
     },
+    set religionPercentages (data: Record<string, number>) {
+      console.warn('Trying to set religion percentages, which is a read-only!')
+      console.log(this.religionPercentages)
+      console.log(data)
+    },
     set religionProbabilities (data: Record<string, number>) {
       console.groupCollapsed('Setting religion probabilities!')
       this.religion._probabilities = data
@@ -204,22 +207,17 @@ export const createTown = (base: TownBasics) => {
 
   lib.clampRolls(town.roll)
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   const genderRollData = lib.townData.rollData.equality[town.dominantGender] as TownRollData
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   lib.defineRollDataGetter(town, genderRollData.rolls as RollArray, 'equality', 'equality', 1)
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   lib.defineRollDataGetter(town, genderRollData.rolls as RollArray, 'equalityDescription', 'equality', 2)
   const possibleMaterials = lib.terrain[town.terrain].location[town.location].possibleMaterials
   town.townMaterial = lib.getTownMaterial(possibleMaterials, town.roll.wealth, town.roll.size)
   lib.setMaterialProbability(town as unknown as Town, possibleMaterials)
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   setup.createStartBuildings(town)
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   setup.createStartFactions(town)
   setup.findPoliceSource(town as unknown as Town)
diff --git a/src/Town/js/createTownBiome.ts b/src/Town/js/createTownBiome.ts
index fdb4a5a30..d66d46246 100644
--- a/src/Town/js/createTownBiome.ts
+++ b/src/Town/js/createTownBiome.ts
@@ -65,7 +65,7 @@ export const createTownBiome = (base: Partial<Town> = {}): TownBasics => {
         })
         return this._demographicPercentile
       },
-      location: lib.random(lib.terrain[terrain].start),
+      location: lib.weightRandom(lib.terrain[terrain].start),
       primaryCrop: lib.random(lib.townData.misc.primaryCrop),
       primaryExport: lib.random(lib.townData.misc.primaryExport),
       landmark: lib.random(lib.townData.misc.landmark),