0.25.2

2024-11-22 11:23:29 +01:00 · 2022-09-17 12:33:21 +02:00 · 2022-09-17 12:33:21 +02:00 · fad752c51c
commit fad752c51c
parent 1d90190882
89 changed files with 3688 additions and 1858 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -1,19 +1,24 @@
-# 0.25.1
-> Fixes and Improvements for 0.25.0
+# 0.25.2
+> Fixes and Improvements for 0.25

 Improvements
- Animate notifications when they appear and disappear
- Allow clicking on notifications to make them go away
- Search for custom content recursively, rather than in just the topmost folder
- Increased rendering performance, especially when rotating and moving the camera while zoomed out
+- Also follow a person when left-clicking their button again while they're already selected
+- When saving custom households, files will now append a number rather than a large amount of dashes if they conflict
+- Animate notifications when they appear and disappear (0.25.1)
+- Allow clicking on notifications to make them go away (0.25.1)
+- Search for custom content recursively, rather than in just the topmost folder (0.25.1)
+- Increased rendering performance, especially when rotating and moving the camera while zoomed out (0.25.1)

 Fixes
- Fixed roofs being duplicated when undoing and redoing
- Fixed a rare crash when a Tiny tries to face another Tiny in a conversation
+- Fixed a rare crash when opening an interaction menu too fast
+- Fixed the skill book action not being able to be loaded from disk, causing an exception
+- Fixed options not saving when pressing the X button on them
+- Fixed roofs being duplicated when undoing and redoing (0.25.1)
+- Fixed a rare crash when a Tiny tries to face another Tiny in a conversation (0.25.1)

 API
- Added the ability for mods to add an options file and menu
- Added a proper build script to the Example Mod, allowing for more control and ease of use when modding
+- Added the ability for mods to add an options file and menu (0.25.1)
+- Added a proper build script to the Example Mod, allowing for more control and ease of use when modding (0.25.1)

 # 0.25.0
 ![](media/changelog/0.25.0.png)
--- a/docs/api/.manifest
+++ b/docs/api/.manifest
@ -209,7 +209,6 @@
  "TinyLife.Actions.ActionType.ReadNewspaper": "TinyLife.Actions.ActionType.yml",
  "TinyLife.Actions.ActionType.ReadSkillBook": "TinyLife.Actions.ActionType.yml",
  "TinyLife.Actions.ActionType.Register(TinyLife.Actions.ActionType.TypeSettings)": "TinyLife.Actions.ActionType.yml",
-  "TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings})": "TinyLife.Actions.ActionType.yml",
  "TinyLife.Actions.ActionType.Repair": "TinyLife.Actions.ActionType.yml",
  "TinyLife.Actions.ActionType.ResearchBusinessPlans": "TinyLife.Actions.ActionType.yml",
  "TinyLife.Actions.ActionType.ResearchProgrammingPatterns": "TinyLife.Actions.ActionType.yml",
@ -369,11 +368,11 @@
  "TinyLife.Actions.Behaviors.MultiActionBehavior.CreateFirstActions": "TinyLife.Actions.Behaviors.MultiActionBehavior.yml",
  "TinyLife.Actions.Behaviors.MultiActionBehavior.CreateLastActions": "TinyLife.Actions.Behaviors.MultiActionBehavior.yml",
  "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior": "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.yml",
-  "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})": "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.yml",
+  "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})": "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.yml",
  "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.CreateFirstActions": "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.yml",
  "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.GetNextAction(TinyLife.Actions.CompletionType)": "TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.yml",
  "TinyLife.Actions.Behaviors.ReadBehavior": "TinyLife.Actions.Behaviors.ReadBehavior.yml",
-  "TinyLife.Actions.Behaviors.ReadBehavior.#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})": "TinyLife.Actions.Behaviors.ReadBehavior.yml",
+  "TinyLife.Actions.Behaviors.ReadBehavior.#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})": "TinyLife.Actions.Behaviors.ReadBehavior.yml",
  "TinyLife.Actions.Behaviors.ReadBehavior.CanMultitask(TinyLife.Actions.Action)": "TinyLife.Actions.Behaviors.ReadBehavior.yml",
  "TinyLife.Actions.Behaviors.ReadBehavior.FullyInProgress": "TinyLife.Actions.Behaviors.ReadBehavior.yml",
  "TinyLife.Actions.Behaviors.ReadBehavior.Initialize": "TinyLife.Actions.Behaviors.ReadBehavior.yml",
@ -1024,10 +1023,8 @@
  "TinyLife.Goals.AutoGoalInfo.Triggers": "TinyLife.Goals.AutoGoalInfo.yml",
  "TinyLife.Goals.AutoTriggerGoal": "TinyLife.Goals.AutoTriggerGoal.yml",
  "TinyLife.Goals.AutoTriggerGoal.#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)": "TinyLife.Goals.AutoTriggerGoal.yml",
-  "TinyLife.Goals.AutoTriggerGoal.AutoInfo": "TinyLife.Goals.AutoTriggerGoal.yml",
  "TinyLife.Goals.AutoTriggerGoal.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)": "TinyLife.Goals.AutoTriggerGoal.yml",
  "TinyLife.Goals.AutoTriggerGoal.Trigger(System.Object)": "TinyLife.Goals.AutoTriggerGoal.yml",
-  "TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)": "TinyLife.Goals.AutoTriggerGoal.yml",
  "TinyLife.Goals.AutoTriggerGoal`1": "TinyLife.Goals.AutoTriggerGoal-1.yml",
  "TinyLife.Goals.AutoTriggerGoal`1.#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)": "TinyLife.Goals.AutoTriggerGoal-1.yml",
  "TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)": "TinyLife.Goals.AutoTriggerGoal-1.yml",
@ -1056,6 +1053,9 @@
  "TinyLife.Goals.Goal.Reset": "TinyLife.Goals.Goal.yml",
  "TinyLife.Goals.Goal.Set": "TinyLife.Goals.Goal.yml",
  "TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)": "TinyLife.Goals.Goal.yml",
+  "TinyLife.Goals.Goal`1": "TinyLife.Goals.Goal-1.yml",
+  "TinyLife.Goals.Goal`1.#ctor(TinyLife.Goals.GoalSet,`0)": "TinyLife.Goals.Goal-1.yml",
+  "TinyLife.Goals.Goal`1.Info": "TinyLife.Goals.Goal-1.yml",
  "TinyLife.Goals.GoalInfo": "TinyLife.Goals.GoalInfo.yml",
  "TinyLife.Goals.GoalInfo.#ctor(System.String,System.Func{TinyLife.Goals.GoalSet,TinyLife.Goals.GoalInfo,TinyLife.Goals.Goal})": "TinyLife.Goals.GoalInfo.yml",
  "TinyLife.Goals.GoalInfo.Construct(TinyLife.Goals.GoalSet)": "TinyLife.Goals.GoalInfo.yml",
@ -1177,15 +1177,14 @@
  "TinyLife.Goals.MemoryType.#ctor(System.String)": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.Construct(TinyLife.Objects.Person,System.Nullable{System.TimeSpan})": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.ConstructedType": "TinyLife.Goals.MemoryType.yml",
-  "TinyLife.Goals.MemoryType.CreativeAction": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.FamilySocial": "TinyLife.Goals.MemoryType.yml",
-  "TinyLife.Goals.MemoryType.LogicalAction": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.Name": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.PromotionOrRaise": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.PublishFailure": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.Register(TinyLife.Goals.MemoryType)": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.SocialAction": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.MemoryType.Types": "TinyLife.Goals.MemoryType.yml",
+  "TinyLife.Goals.MemoryType.UsedSkillCategory": "TinyLife.Goals.MemoryType.yml",
  "TinyLife.Goals.Project": "TinyLife.Goals.Project.yml",
  "TinyLife.Goals.Project.#ctor(TinyLife.Objects.Person,System.String,System.String)": "TinyLife.Goals.Project.yml",
  "TinyLife.Goals.Project.ActionSettings": "TinyLife.Goals.Project.ActionSettings.yml",
@ -1263,14 +1262,18 @@
  "TinyLife.Mods.Mod.Icon": "TinyLife.Mods.Mod.yml",
  "TinyLife.Mods.Mod.Initialize(ExtremelySimpleLogger.Logger,MLEM.Data.Content.RawContentManager,MLEM.Data.RuntimeTexturePacker,TinyLife.Mods.ModInfo)": "TinyLife.Mods.Mod.yml",
  "TinyLife.Mods.Mod.Name": "TinyLife.Mods.Mod.yml",
+  "TinyLife.Mods.Mod.PopulateOptions(MLEM.Ui.Elements.Group,TinyLife.Mods.ModInfo)": "TinyLife.Mods.Mod.yml",
  "TinyLife.Mods.ModInfo": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModInfo.Content": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModInfo.Dispose": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModInfo.Finalize": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModInfo.Harmony": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModInfo.Id": "TinyLife.Mods.ModInfo.yml",
+  "TinyLife.Mods.ModInfo.LoadOptions``1(System.Func{``0})": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModInfo.Logger": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModInfo.Mod": "TinyLife.Mods.ModInfo.yml",
+  "TinyLife.Mods.ModInfo.OptionsFile": "TinyLife.Mods.ModInfo.yml",
+  "TinyLife.Mods.ModInfo.SaveOptions``1(``0)": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModInfo.ToString": "TinyLife.Mods.ModInfo.yml",
  "TinyLife.Mods.ModLoader": "TinyLife.Mods.ModLoader.yml",
  "TinyLife.Mods.ModLoader.GetModsFolder": "TinyLife.Mods.ModLoader.yml",
@ -1610,7 +1613,6 @@
  "TinyLife.Objects.FurnitureType.Puddle": "TinyLife.Objects.FurnitureType.yml",
  "TinyLife.Objects.FurnitureType.Puzzle": "TinyLife.Objects.FurnitureType.yml",
  "TinyLife.Objects.FurnitureType.Register(TinyLife.Objects.FurnitureType.TypeSettings)": "TinyLife.Objects.FurnitureType.yml",
-  "TinyLife.Objects.FurnitureType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Objects.FurnitureType.TypeSettings})": "TinyLife.Objects.FurnitureType.yml",
  "TinyLife.Objects.FurnitureType.Rotations": "TinyLife.Objects.FurnitureType.yml",
  "TinyLife.Objects.FurnitureType.Sandbox": "TinyLife.Objects.FurnitureType.yml",
  "TinyLife.Objects.FurnitureType.Settings": "TinyLife.Objects.FurnitureType.yml",
@ -2011,7 +2013,8 @@
  "TinyLife.Objects.Person.GetRelationship(TinyLife.Objects.Person,System.Boolean)": "TinyLife.Objects.Person.yml",
  "TinyLife.Objects.Person.GetSkill(TinyLife.Skills.SkillType,System.Boolean)": "TinyLife.Objects.Person.yml",
  "TinyLife.Objects.Person.GetSkillLevel(TinyLife.Skills.SkillType)": "TinyLife.Objects.Person.yml",
-  "TinyLife.Objects.Person.GetSkillPercentage(TinyLife.Skills.SkillType)": "TinyLife.Objects.Person.yml",
+  "TinyLife.Objects.Person.GetSkillPointPercentage(TinyLife.Skills.SkillType)": "TinyLife.Objects.Person.yml",
+  "TinyLife.Objects.Person.GetSkillTotalPercentage(TinyLife.Skills.SkillType)": "TinyLife.Objects.Person.yml",
  "TinyLife.Objects.Person.GetTimeSinceMemory(TinyLife.Goals.MemoryType)": "TinyLife.Objects.Person.yml",
  "TinyLife.Objects.Person.GetWalkSpeed": "TinyLife.Objects.Person.yml",
  "TinyLife.Objects.Person.GoToExitRoad": "TinyLife.Objects.Person.yml",
@ -2421,20 +2424,20 @@
  "TinyLife.Skills.Skill": "TinyLife.Skills.Skill.yml",
  "TinyLife.Skills.Skill.#ctor(TinyLife.Skills.SkillType)": "TinyLife.Skills.Skill.yml",
  "TinyLife.Skills.Skill.Level": "TinyLife.Skills.Skill.yml",
-  "TinyLife.Skills.Skill.LevelPercentage": "TinyLife.Skills.Skill.yml",
  "TinyLife.Skills.Skill.PointPercentage": "TinyLife.Skills.Skill.yml",
  "TinyLife.Skills.Skill.PointsToNextLevel": "TinyLife.Skills.Skill.yml",
  "TinyLife.Skills.Skill.RequiredPointsToNextLevel": "TinyLife.Skills.Skill.yml",
+  "TinyLife.Skills.Skill.TotalPercentage": "TinyLife.Skills.Skill.yml",
  "TinyLife.Skills.Skill.Type": "TinyLife.Skills.Skill.yml",
  "TinyLife.Skills.SkillCategory": "TinyLife.Skills.SkillCategory.yml",
  "TinyLife.Skills.SkillCategory.Creative": "TinyLife.Skills.SkillCategory.yml",
  "TinyLife.Skills.SkillCategory.Logical": "TinyLife.Skills.SkillCategory.yml",
-  "TinyLife.Skills.SkillCategory.None": "TinyLife.Skills.SkillCategory.yml",
  "TinyLife.Skills.SkillCategory.Physical": "TinyLife.Skills.SkillCategory.yml",
  "TinyLife.Skills.SkillCategory.Social": "TinyLife.Skills.SkillCategory.yml",
  "TinyLife.Skills.SkillType": "TinyLife.Skills.SkillType.yml",
  "TinyLife.Skills.SkillType.#ctor(System.String,MLEM.Textures.TextureRegion,System.Int32,TinyLife.Skills.SkillCategory)": "TinyLife.Skills.SkillType.yml",
  "TinyLife.Skills.SkillType.AdditionalEarnedActions": "TinyLife.Skills.SkillType.yml",
+  "TinyLife.Skills.SkillType.AllCategories": "TinyLife.Skills.SkillType.yml",
  "TinyLife.Skills.SkillType.Baking": "TinyLife.Skills.SkillType.yml",
  "TinyLife.Skills.SkillType.Categories": "TinyLife.Skills.SkillType.yml",
  "TinyLife.Skills.SkillType.Charisma": "TinyLife.Skills.SkillType.yml",
@ -2758,6 +2761,7 @@
  "TinyLife.Utilities.ColorScheme.Water": "TinyLife.Utilities.ColorScheme.yml",
  "TinyLife.Utilities.ColorScheme.White": "TinyLife.Utilities.ColorScheme.yml",
  "TinyLife.Utilities.Extensions": "TinyLife.Utilities.Extensions.yml",
+  "TinyLife.Utilities.Extensions.AddGamepadScrolling(MLEM.Ui.Elements.Panel)": "TinyLife.Utilities.Extensions.yml",
  "TinyLife.Utilities.Extensions.AddHoverAnimation(MLEM.Ui.Elements.Button)": "TinyLife.Utilities.Extensions.yml",
  "TinyLife.Utilities.Extensions.BothCompleted(TinyLife.Actions.CompletionType,System.Func{TinyLife.Actions.CompletionType})": "TinyLife.Utilities.Extensions.yml",
  "TinyLife.Utilities.Extensions.BothValid(TinyLife.Actions.CanExecuteResult,System.Func{TinyLife.Actions.CanExecuteResult})": "TinyLife.Utilities.Extensions.yml",
--- a/docs/api/TinyLife.Actions.ActionType.AiSettings.yml
+++ b/docs/api/TinyLife.Actions.ActionType.AiSettings.yml
@ -24,7 +24,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AiSettings
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 374
+    startLine: 360
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -66,7 +66,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SolvedNeeds
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 382
+    startLine: 368
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -99,7 +99,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PassivePriority
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 390
+    startLine: 376
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -132,7 +132,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanDoRandomly
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 397
+    startLine: 383
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -165,7 +165,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanDoAtAnyPoint
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 404
+    startLine: 390
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -198,7 +198,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NeedsFreeActionSpot
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 410
+    startLine: 396
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
--- a/docs/api/TinyLife.Actions.ActionType.CanExecuteDelegate.yml
+++ b/docs/api/TinyLife.Actions.ActionType.CanExecuteDelegate.yml
@ -19,7 +19,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanExecuteDelegate
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 218
+    startLine: 204
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
--- a/docs/api/TinyLife.Actions.ActionType.TypeSettings.yml
+++ b/docs/api/TinyLife.Actions.ActionType.TypeSettings.yml
@ -43,7 +43,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TypeSettings
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 223
+    startLine: 209
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -89,7 +89,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 228
+    startLine: 214
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -122,7 +122,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NameWithoutCategory
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 233
+    startLine: 219
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -160,7 +160,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Categories
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 238
+    startLine: 224
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -198,7 +198,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Texture
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 243
+    startLine: 229
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -231,7 +231,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Context
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 248
+    startLine: 234
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -264,7 +264,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanExecute
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 254
+    startLine: 240
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -297,7 +297,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ConstructedType
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 259
+    startLine: 245
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -330,7 +330,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ConstructorArguments
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 264
+    startLine: 250
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -363,7 +363,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Varieties
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 272
+    startLine: 258
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -396,7 +396,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Ai
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 277
+    startLine: 263
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -429,7 +429,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsInappropriateElsewhere
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 282
+    startLine: 268
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -462,7 +462,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IconName
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 288
+    startLine: 274
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -495,7 +495,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetDisplayName
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 294
+    startLine: 280
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -528,7 +528,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredSkill
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 300
+    startLine: 286
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -561,7 +561,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredAges
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 304
+    startLine: 290
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -594,7 +594,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredEmotion
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 309
+    startLine: 295
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -627,7 +627,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredPersonality
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 314
+    startLine: 300
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -660,7 +660,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IgnoreObjectConditions
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 320
+    startLine: 306
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -693,7 +693,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredPartnerEmployment
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 326
+    startLine: 312
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -726,7 +726,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredJob
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 331
+    startLine: 317
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -759,7 +759,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 341
+    startLine: 327
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -801,7 +801,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetData
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 352
+    startLine: 338
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -839,13 +839,13 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetData
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 358
+    startLine: 344
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
  example: []
  syntax:
-    content: public T GetData<T>(string key)
+    content: public readonly T GetData<T>(string key)
    parameters:
    - id: key
      type: System.String
@ -860,6 +860,7 @@ items:
  nameWithType.vb: ActionType.TypeSettings.GetData(Of T)(String)
  modifiers.csharp:
  - public
+  - readonly
  modifiers.vb:
  - Public
  fullName.vb: TinyLife.Actions.ActionType.TypeSettings.GetData(Of T)(System.String)
@ -882,21 +883,22 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetDataKeys
    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 363
+    startLine: 349
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
  example: []
  syntax:
-    content: public IReadOnlyCollection<string> GetDataKeys()
+    content: public readonly IEnumerable<string> GetDataKeys()
    return:
-      type: System.Collections.Generic.IReadOnlyCollection{System.String}
-    content.vb: Public Function GetDataKeys As IReadOnlyCollection(Of String)
+      type: System.Collections.Generic.IEnumerable{System.String}
+    content.vb: Public Function GetDataKeys As IEnumerable(Of String)
  overload: TinyLife.Actions.ActionType.TypeSettings.GetDataKeys*
  implements:
  - MLEM.Misc.IGenericDataHolder.GetDataKeys
  modifiers.csharp:
  - public
+  - readonly
  modifiers.vb:
  - Public
 references:
@ -2473,21 +2475,21 @@ references:
  - name: )
    nameWithType: )
    fullName: )
- uid: System.Collections.Generic.IReadOnlyCollection{System.String}
-  commentId: T:System.Collections.Generic.IReadOnlyCollection{System.String}
+- uid: System.Collections.Generic.IEnumerable{System.String}
+  commentId: T:System.Collections.Generic.IEnumerable{System.String}
  parent: System.Collections.Generic
-  definition: System.Collections.Generic.IReadOnlyCollection`1
-  name: IReadOnlyCollection<String>
-  nameWithType: IReadOnlyCollection<String>
-  fullName: System.Collections.Generic.IReadOnlyCollection<System.String>
-  nameWithType.vb: IReadOnlyCollection(Of String)
-  fullName.vb: System.Collections.Generic.IReadOnlyCollection(Of System.String)
-  name.vb: IReadOnlyCollection(Of String)
+  definition: System.Collections.Generic.IEnumerable`1
+  name: IEnumerable<String>
+  nameWithType: IEnumerable<String>
+  fullName: System.Collections.Generic.IEnumerable<System.String>
+  nameWithType.vb: IEnumerable(Of String)
+  fullName.vb: System.Collections.Generic.IEnumerable(Of System.String)
+  name.vb: IEnumerable(Of String)
  spec.csharp:
-  - uid: System.Collections.Generic.IReadOnlyCollection`1
-    name: IReadOnlyCollection
-    nameWithType: IReadOnlyCollection
-    fullName: System.Collections.Generic.IReadOnlyCollection
+  - uid: System.Collections.Generic.IEnumerable`1
+    name: IEnumerable
+    nameWithType: IEnumerable
+    fullName: System.Collections.Generic.IEnumerable
    isExternal: true
  - name: <
    nameWithType: <
@ -2501,10 +2503,10 @@ references:
    nameWithType: '>'
    fullName: '>'
  spec.vb:
-  - uid: System.Collections.Generic.IReadOnlyCollection`1
-    name: IReadOnlyCollection
-    nameWithType: IReadOnlyCollection
-    fullName: System.Collections.Generic.IReadOnlyCollection
+  - uid: System.Collections.Generic.IEnumerable`1
+    name: IEnumerable
+    nameWithType: IEnumerable
+    fullName: System.Collections.Generic.IEnumerable
    isExternal: true
  - name: '(Of '
    nameWithType: '(Of '
@ -2517,20 +2519,20 @@ references:
  - name: )
    nameWithType: )
    fullName: )
- uid: System.Collections.Generic.IReadOnlyCollection`1
-  commentId: T:System.Collections.Generic.IReadOnlyCollection`1
+- uid: System.Collections.Generic.IEnumerable`1
+  commentId: T:System.Collections.Generic.IEnumerable`1
  isExternal: true
-  name: IReadOnlyCollection<T>
-  nameWithType: IReadOnlyCollection<T>
-  fullName: System.Collections.Generic.IReadOnlyCollection<T>
-  nameWithType.vb: IReadOnlyCollection(Of T)
-  fullName.vb: System.Collections.Generic.IReadOnlyCollection(Of T)
-  name.vb: IReadOnlyCollection(Of T)
+  name: IEnumerable<T>
+  nameWithType: IEnumerable<T>
+  fullName: System.Collections.Generic.IEnumerable<T>
+  nameWithType.vb: IEnumerable(Of T)
+  fullName.vb: System.Collections.Generic.IEnumerable(Of T)
+  name.vb: IEnumerable(Of T)
  spec.csharp:
-  - uid: System.Collections.Generic.IReadOnlyCollection`1
-    name: IReadOnlyCollection
-    nameWithType: IReadOnlyCollection
-    fullName: System.Collections.Generic.IReadOnlyCollection
+  - uid: System.Collections.Generic.IEnumerable`1
+    name: IEnumerable
+    nameWithType: IEnumerable
+    fullName: System.Collections.Generic.IEnumerable
    isExternal: true
  - name: <
    nameWithType: <
@ -2542,10 +2544,10 @@ references:
    nameWithType: '>'
    fullName: '>'
  spec.vb:
-  - uid: System.Collections.Generic.IReadOnlyCollection`1
-    name: IReadOnlyCollection
-    nameWithType: IReadOnlyCollection
-    fullName: System.Collections.Generic.IReadOnlyCollection
+  - uid: System.Collections.Generic.IEnumerable`1
+    name: IEnumerable
+    nameWithType: IEnumerable
+    fullName: System.Collections.Generic.IEnumerable
    isExternal: true
  - name: '(Of '
    nameWithType: '(Of '
--- a/docs/api/TinyLife.Actions.ActionType.yml
+++ b/docs/api/TinyLife.Actions.ActionType.yml
@ -172,7 +172,6 @@ items:
  - TinyLife.Actions.ActionType.ReadNewspaper
  - TinyLife.Actions.ActionType.ReadSkillBook
  - TinyLife.Actions.ActionType.Register(TinyLife.Actions.ActionType.TypeSettings)
-  - TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings})
  - TinyLife.Actions.ActionType.Repair
  - TinyLife.Actions.ActionType.ResearchBusinessPlans
  - TinyLife.Actions.ActionType.ResearchProgrammingPatterns
@ -681,50 +680,6 @@ items:
  modifiers.vb:
  - Public
  - Shared
- uid: TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings})
-  commentId: M:TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings})
-  id: RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings})
-  parent: TinyLife.Actions.ActionType
-  langs:
-  - csharp
-  - vb
-  name: RegisterAll(IEnumerable<ActionType.TypeSettings>)
-  nameWithType: ActionType.RegisterAll(IEnumerable<ActionType.TypeSettings>)
-  fullName: TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable<TinyLife.Actions.ActionType.TypeSettings>)
-  type: Method
-  source:
-    remote:
-      path: TinyLife/Actions/ActionType.cs
-      branch: main
-      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: RegisterAll
-    path: ../TinyLife/Actions/ActionType.cs
-    startLine: 201
-  assemblies:
-  - Tiny Life
-  namespace: TinyLife.Actions
-  summary: "\nA helper method that is a mass registering version of <xref href=\"TinyLife.Actions.ActionType.Register(TinyLife.Actions.ActionType.TypeSettings)\" data-throw-if-not-resolved=\"false\"></xref>\n"
-  example: []
-  syntax:
-    content: public static ActionType[] RegisterAll(IEnumerable<ActionType.TypeSettings> settings)
-    parameters:
-    - id: settings
-      type: System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings}
-      description: The settings that the action types should have
-    return:
-      type: TinyLife.Actions.ActionType[]
-      description: The registered action type instances
-    content.vb: Public Shared Function RegisterAll(settings As IEnumerable(Of ActionType.TypeSettings)) As ActionType()
-  overload: TinyLife.Actions.ActionType.RegisterAll*
-  nameWithType.vb: ActionType.RegisterAll(IEnumerable(Of ActionType.TypeSettings))
-  modifiers.csharp:
-  - public
-  - static
-  modifiers.vb:
-  - Public
-  - Shared
-  fullName.vb: TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable(Of TinyLife.Actions.ActionType.TypeSettings))
-  name.vb: RegisterAll(IEnumerable(Of ActionType.TypeSettings))
 - uid: TinyLife.Actions.ActionType.DebugTeleport
  commentId: F:TinyLife.Actions.ActionType.DebugTeleport
  id: DebugTeleport
@ -9516,53 +9471,6 @@ references:
  name: Register
  nameWithType: ActionType.Register
  fullName: TinyLife.Actions.ActionType.Register
- uid: TinyLife.Actions.ActionType.RegisterAll*
-  commentId: Overload:TinyLife.Actions.ActionType.RegisterAll
-  name: RegisterAll
-  nameWithType: ActionType.RegisterAll
-  fullName: TinyLife.Actions.ActionType.RegisterAll
- uid: System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings}
-  commentId: T:System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings}
-  parent: System.Collections.Generic
-  definition: System.Collections.Generic.IEnumerable`1
-  name: IEnumerable<ActionType.TypeSettings>
-  nameWithType: IEnumerable<ActionType.TypeSettings>
-  fullName: System.Collections.Generic.IEnumerable<TinyLife.Actions.ActionType.TypeSettings>
-  nameWithType.vb: IEnumerable(Of ActionType.TypeSettings)
-  fullName.vb: System.Collections.Generic.IEnumerable(Of TinyLife.Actions.ActionType.TypeSettings)
-  name.vb: IEnumerable(Of ActionType.TypeSettings)
-  spec.csharp:
-  - uid: System.Collections.Generic.IEnumerable`1
-    name: IEnumerable
-    nameWithType: IEnumerable
-    fullName: System.Collections.Generic.IEnumerable
-    isExternal: true
-  - name: <
-    nameWithType: <
-    fullName: <
-  - uid: TinyLife.Actions.ActionType.TypeSettings
-    name: ActionType.TypeSettings
-    nameWithType: ActionType.TypeSettings
-    fullName: TinyLife.Actions.ActionType.TypeSettings
-  - name: '>'
-    nameWithType: '>'
-    fullName: '>'
-  spec.vb:
-  - uid: System.Collections.Generic.IEnumerable`1
-    name: IEnumerable
-    nameWithType: IEnumerable
-    fullName: System.Collections.Generic.IEnumerable
-    isExternal: true
-  - name: '(Of '
-    nameWithType: '(Of '
-    fullName: '(Of '
-  - uid: TinyLife.Actions.ActionType.TypeSettings
-    name: ActionType.TypeSettings
-    nameWithType: ActionType.TypeSettings
-    fullName: TinyLife.Actions.ActionType.TypeSettings
-  - name: )
-    nameWithType: )
-    fullName: )
 - uid: TinyLife.Actions.ActionType[]
  isExternal: true
  name: ActionType[]
--- a/docs/api/TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.yml
+++ b/docs/api/TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.yml
@ -5,7 +5,7 @@ items:
  id: PickUpOrSpawnBehavior
  parent: TinyLife.Actions.Behaviors
  children:
-  - TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
+  - TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
  - TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.CreateFirstActions
  - TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.GetNextAction(TinyLife.Actions.CompletionType)
  langs:
@ -64,16 +64,16 @@ items:
  modifiers.vb:
  - Public
  - Class
- uid: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
-  commentId: M:TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
-  id: '#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})'
+- uid: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
+  commentId: M:TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
+  id: '#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})'
  parent: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior
  langs:
  - csharp
  - vb
-  name: PickUpOrSpawnBehavior(Action, FurnitureType, Int32[], Func<Furniture, Boolean>)
-  nameWithType: PickUpOrSpawnBehavior.PickUpOrSpawnBehavior(Action, FurnitureType, Int32[], Func<Furniture, Boolean>)
-  fullName: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.PickUpOrSpawnBehavior(TinyLife.Actions.Action, TinyLife.Objects.FurnitureType, System.Int32[], System.Func<TinyLife.Objects.Furniture, System.Boolean>)
+  name: PickUpOrSpawnBehavior(Action, Func<FurnitureType>, Int32[], Func<Furniture, Boolean>)
+  nameWithType: PickUpOrSpawnBehavior.PickUpOrSpawnBehavior(Action, Func<FurnitureType>, Int32[], Func<Furniture, Boolean>)
+  fullName: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.PickUpOrSpawnBehavior(TinyLife.Actions.Action, System.Func<TinyLife.Objects.FurnitureType>, System.Int32[], System.Func<TinyLife.Objects.Furniture, System.Boolean>)
  type: Constructor
  source:
    remote:
@ -89,13 +89,13 @@ items:
  summary: "\nCreates a new pick up or spawn behavior with the given settings.\n"
  example: []
  syntax:
-    content: public PickUpOrSpawnBehavior(Action action, FurnitureType itemToSpawn, int[] colorsToSpawn = null, Func<Furniture, bool> isValid = null)
+    content: public PickUpOrSpawnBehavior(Action action, Func<FurnitureType> itemToSpawn, int[] colorsToSpawn = null, Func<Furniture, bool> isValid = null)
    parameters:
    - id: action
      type: TinyLife.Actions.Action
      description: The action.
    - id: itemToSpawn
-      type: TinyLife.Objects.FurnitureType
+      type: System.Func{TinyLife.Objects.FurnitureType}
      description: The item to spawn, or pick up.
    - id: colorsToSpawn
      type: System.Int32[]
@ -103,19 +103,19 @@ items:
    - id: isValid
      type: System.Func{TinyLife.Objects.Furniture,System.Boolean}
      description: Whether the item that we&apos;re trying to pick up is valid. If this is null, the item is checked against the <code data-dev-comment-type="paramref" class="paramref">itemToSpawn</code>.
-    content.vb: Public Sub New(action As Action, itemToSpawn As FurnitureType, colorsToSpawn As Integer() = Nothing, isValid As Func(Of Furniture, Boolean) = Nothing)
+    content.vb: Public Sub New(action As Action, itemToSpawn As Func(Of FurnitureType), colorsToSpawn As Integer() = Nothing, isValid As Func(Of Furniture, Boolean) = Nothing)
  overload: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.#ctor*
  exceptions:
  - type: System.ArgumentNullException
    commentId: T:System.ArgumentNullException
    description: Thrown if the <code data-dev-comment-type="paramref" class="paramref">itemToSpawn</code> is null.
-  nameWithType.vb: PickUpOrSpawnBehavior.PickUpOrSpawnBehavior(Action, FurnitureType, Int32(), Func(Of Furniture, Boolean))
+  nameWithType.vb: PickUpOrSpawnBehavior.PickUpOrSpawnBehavior(Action, Func(Of FurnitureType), Int32(), Func(Of Furniture, Boolean))
  modifiers.csharp:
  - public
  modifiers.vb:
  - Public
-  fullName.vb: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.PickUpOrSpawnBehavior(TinyLife.Actions.Action, TinyLife.Objects.FurnitureType, System.Int32(), System.Func(Of TinyLife.Objects.Furniture, System.Boolean))
-  name.vb: PickUpOrSpawnBehavior(Action, FurnitureType, Int32(), Func(Of Furniture, Boolean))
+  fullName.vb: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.PickUpOrSpawnBehavior(TinyLife.Actions.Action, System.Func(Of TinyLife.Objects.FurnitureType), System.Int32(), System.Func(Of TinyLife.Objects.Furniture, System.Boolean))
+  name.vb: PickUpOrSpawnBehavior(Action, Func(Of FurnitureType), Int32(), Func(Of Furniture, Boolean))
 - uid: TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.CreateFirstActions
  commentId: M:TinyLife.Actions.Behaviors.PickUpOrSpawnBehavior.CreateFirstActions
  id: CreateFirstActions
@ -888,12 +888,48 @@ references:
  name: Action
  nameWithType: Action
  fullName: TinyLife.Actions.Action
- uid: TinyLife.Objects.FurnitureType
-  commentId: T:TinyLife.Objects.FurnitureType
-  parent: TinyLife.Objects
-  name: FurnitureType
-  nameWithType: FurnitureType
-  fullName: TinyLife.Objects.FurnitureType
+- uid: System.Func{TinyLife.Objects.FurnitureType}
+  commentId: T:System.Func{TinyLife.Objects.FurnitureType}
+  parent: System
+  definition: System.Func`1
+  name: Func<FurnitureType>
+  nameWithType: Func<FurnitureType>
+  fullName: System.Func<TinyLife.Objects.FurnitureType>
+  nameWithType.vb: Func(Of FurnitureType)
+  fullName.vb: System.Func(Of TinyLife.Objects.FurnitureType)
+  name.vb: Func(Of FurnitureType)
+  spec.csharp:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Objects.FurnitureType
+    name: FurnitureType
+    nameWithType: FurnitureType
+    fullName: TinyLife.Objects.FurnitureType
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Objects.FurnitureType
+    name: FurnitureType
+    nameWithType: FurnitureType
+    fullName: TinyLife.Objects.FurnitureType
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: System.Int32[]
  isExternal: true
  name: Int32[]
@ -983,6 +1019,45 @@ references:
  name: TinyLife.Actions
  nameWithType: TinyLife.Actions
  fullName: TinyLife.Actions
+- uid: System.Func`1
+  commentId: T:System.Func`1
+  isExternal: true
+  name: Func<TResult>
+  nameWithType: Func<TResult>
+  fullName: System.Func<TResult>
+  nameWithType.vb: Func(Of TResult)
+  fullName.vb: System.Func(Of TResult)
+  name.vb: Func(Of TResult)
+  spec.csharp:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TResult
+    nameWithType: TResult
+    fullName: TResult
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TResult
+    nameWithType: TResult
+    fullName: TResult
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: System.Func`2
  commentId: T:System.Func`2
  isExternal: true
--- a/docs/api/TinyLife.Actions.Behaviors.ReadBehavior.yml
+++ b/docs/api/TinyLife.Actions.Behaviors.ReadBehavior.yml
@ -5,7 +5,7 @@ items:
  id: ReadBehavior
  parent: TinyLife.Actions.Behaviors
  children:
-  - TinyLife.Actions.Behaviors.ReadBehavior.#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
+  - TinyLife.Actions.Behaviors.ReadBehavior.#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
  - TinyLife.Actions.Behaviors.ReadBehavior.CanMultitask(TinyLife.Actions.Action)
  - TinyLife.Actions.Behaviors.ReadBehavior.FullyInProgress
  - TinyLife.Actions.Behaviors.ReadBehavior.Initialize
@ -103,16 +103,16 @@ items:
  - Public
  - Overrides
  - ReadOnly
- uid: TinyLife.Actions.Behaviors.ReadBehavior.#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
-  commentId: M:TinyLife.Actions.Behaviors.ReadBehavior.#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
-  id: '#ctor(TinyLife.Actions.Action,TinyLife.Objects.FurnitureType,System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})'
+- uid: TinyLife.Actions.Behaviors.ReadBehavior.#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
+  commentId: M:TinyLife.Actions.Behaviors.ReadBehavior.#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})
+  id: '#ctor(TinyLife.Actions.Action,System.Func{TinyLife.Objects.FurnitureType},System.Int32[],System.Func{TinyLife.Objects.Furniture,System.Boolean})'
  parent: TinyLife.Actions.Behaviors.ReadBehavior
  langs:
  - csharp
  - vb
-  name: ReadBehavior(Action, FurnitureType, Int32[], Func<Furniture, Boolean>)
-  nameWithType: ReadBehavior.ReadBehavior(Action, FurnitureType, Int32[], Func<Furniture, Boolean>)
-  fullName: TinyLife.Actions.Behaviors.ReadBehavior.ReadBehavior(TinyLife.Actions.Action, TinyLife.Objects.FurnitureType, System.Int32[], System.Func<TinyLife.Objects.Furniture, System.Boolean>)
+  name: ReadBehavior(Action, Func<FurnitureType>, Int32[], Func<Furniture, Boolean>)
+  nameWithType: ReadBehavior.ReadBehavior(Action, Func<FurnitureType>, Int32[], Func<Furniture, Boolean>)
+  fullName: TinyLife.Actions.Behaviors.ReadBehavior.ReadBehavior(TinyLife.Actions.Action, System.Func<TinyLife.Objects.FurnitureType>, System.Int32[], System.Func<TinyLife.Objects.Furniture, System.Boolean>)
  type: Constructor
  source:
    remote:
@ -128,13 +128,13 @@ items:
  summary: "\nCreates a new pick up or spawn behavior with the given settings.\n"
  example: []
  syntax:
-    content: public ReadBehavior(Action action, FurnitureType itemToSpawn, int[] colorsToSpawn = null, Func<Furniture, bool> isValid = null)
+    content: public ReadBehavior(Action action, Func<FurnitureType> itemToSpawn, int[] colorsToSpawn = null, Func<Furniture, bool> isValid = null)
    parameters:
    - id: action
      type: TinyLife.Actions.Action
      description: The action.
    - id: itemToSpawn
-      type: TinyLife.Objects.FurnitureType
+      type: System.Func{TinyLife.Objects.FurnitureType}
      description: The item to spawn, or pick up.
    - id: colorsToSpawn
      type: System.Int32[]
@ -142,19 +142,19 @@ items:
    - id: isValid
      type: System.Func{TinyLife.Objects.Furniture,System.Boolean}
      description: Whether the item that we&apos;re trying to pick up is valid. If this is null, the item is checked against the <code data-dev-comment-type="paramref" class="paramref">itemToSpawn</code>.
-    content.vb: Public Sub New(action As Action, itemToSpawn As FurnitureType, colorsToSpawn As Integer() = Nothing, isValid As Func(Of Furniture, Boolean) = Nothing)
+    content.vb: Public Sub New(action As Action, itemToSpawn As Func(Of FurnitureType), colorsToSpawn As Integer() = Nothing, isValid As Func(Of Furniture, Boolean) = Nothing)
  overload: TinyLife.Actions.Behaviors.ReadBehavior.#ctor*
  exceptions:
  - type: System.ArgumentNullException
    commentId: T:System.ArgumentNullException
    description: Thrown if the <code data-dev-comment-type="paramref" class="paramref">itemToSpawn</code> is null.
-  nameWithType.vb: ReadBehavior.ReadBehavior(Action, FurnitureType, Int32(), Func(Of Furniture, Boolean))
+  nameWithType.vb: ReadBehavior.ReadBehavior(Action, Func(Of FurnitureType), Int32(), Func(Of Furniture, Boolean))
  modifiers.csharp:
  - public
  modifiers.vb:
  - Public
-  fullName.vb: TinyLife.Actions.Behaviors.ReadBehavior.ReadBehavior(TinyLife.Actions.Action, TinyLife.Objects.FurnitureType, System.Int32(), System.Func(Of TinyLife.Objects.Furniture, System.Boolean))
-  name.vb: ReadBehavior(Action, FurnitureType, Int32(), Func(Of Furniture, Boolean))
+  fullName.vb: TinyLife.Actions.Behaviors.ReadBehavior.ReadBehavior(TinyLife.Actions.Action, System.Func(Of TinyLife.Objects.FurnitureType), System.Int32(), System.Func(Of TinyLife.Objects.Furniture, System.Boolean))
+  name.vb: ReadBehavior(Action, Func(Of FurnitureType), Int32(), Func(Of Furniture, Boolean))
 - uid: TinyLife.Actions.Behaviors.ReadBehavior.Initialize
  commentId: M:TinyLife.Actions.Behaviors.ReadBehavior.Initialize
  id: Initialize
@ -978,12 +978,48 @@ references:
  name: Action
  nameWithType: Action
  fullName: TinyLife.Actions.Action
- uid: TinyLife.Objects.FurnitureType
-  commentId: T:TinyLife.Objects.FurnitureType
-  parent: TinyLife.Objects
-  name: FurnitureType
-  nameWithType: FurnitureType
-  fullName: TinyLife.Objects.FurnitureType
+- uid: System.Func{TinyLife.Objects.FurnitureType}
+  commentId: T:System.Func{TinyLife.Objects.FurnitureType}
+  parent: System
+  definition: System.Func`1
+  name: Func<FurnitureType>
+  nameWithType: Func<FurnitureType>
+  fullName: System.Func<TinyLife.Objects.FurnitureType>
+  nameWithType.vb: Func(Of FurnitureType)
+  fullName.vb: System.Func(Of TinyLife.Objects.FurnitureType)
+  name.vb: Func(Of FurnitureType)
+  spec.csharp:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Objects.FurnitureType
+    name: FurnitureType
+    nameWithType: FurnitureType
+    fullName: TinyLife.Objects.FurnitureType
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Objects.FurnitureType
+    name: FurnitureType
+    nameWithType: FurnitureType
+    fullName: TinyLife.Objects.FurnitureType
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: System.Int32[]
  isExternal: true
  name: Int32[]
@ -1073,6 +1109,45 @@ references:
  name: TinyLife.Actions
  nameWithType: TinyLife.Actions
  fullName: TinyLife.Actions
+- uid: System.Func`1
+  commentId: T:System.Func`1
+  isExternal: true
+  name: Func<TResult>
+  nameWithType: Func<TResult>
+  fullName: System.Func<TResult>
+  nameWithType.vb: Func(Of TResult)
+  fullName.vb: System.Func(Of TResult)
+  name.vb: Func(Of TResult)
+  spec.csharp:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TResult
+    nameWithType: TResult
+    fullName: TResult
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TResult
+    nameWithType: TResult
+    fullName: TResult
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: System.Func`2
  commentId: T:System.Func`2
  isExternal: true
--- a/docs/api/TinyLife.Actions.SocialAction.StartPartnerAction.yml
+++ b/docs/api/TinyLife.Actions.SocialAction.StartPartnerAction.yml
@ -22,7 +22,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: StartPartnerAction
    path: ../TinyLife/Actions/SocialAction.cs
-    startLine: 188
+    startLine: 190
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -121,7 +121,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Actions/SocialAction.cs
-    startLine: 191
+    startLine: 193
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -157,7 +157,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Initialize
    path: ../TinyLife/Actions/SocialAction.cs
-    startLine: 194
+    startLine: 196
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
@ -192,7 +192,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsCompleted
    path: ../TinyLife/Actions/SocialAction.cs
-    startLine: 219
+    startLine: 221
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
--- a/docs/api/TinyLife.Actions.SocialAction.yml
+++ b/docs/api/TinyLife.Actions.SocialAction.yml
@ -980,7 +980,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: InvokeForBoth
    path: ../TinyLife/Actions/SocialAction.cs
-    startLine: 183
+    startLine: 185
  assemblies:
  - Tiny Life
  namespace: TinyLife.Actions
--- a/docs/api/TinyLife.Emotions.EmotionType.TypeCategory.yml
+++ b/docs/api/TinyLife.Emotions.EmotionType.TypeCategory.yml
@ -22,7 +22,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TypeCategory
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 93
+    startLine: 92
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -57,7 +57,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Negative
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 98
+    startLine: 97
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -91,7 +91,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Positive
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 102
+    startLine: 101
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Neutral
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 106
+    startLine: 105
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
--- a/docs/api/TinyLife.Emotions.EmotionType.yml
+++ b/docs/api/TinyLife.Emotions.EmotionType.yml
@ -41,7 +41,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: EmotionType
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 18
+    startLine: 17
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -92,7 +92,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 25
+    startLine: 24
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -129,7 +129,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Fine
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 28
+    startLine: 27
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -164,7 +164,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Uncomfortable
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 29
+    startLine: 28
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -199,7 +199,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Asleep
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 30
+    startLine: 29
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -234,7 +234,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Happy
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 31
+    startLine: 30
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -269,7 +269,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Embarrassed
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 32
+    startLine: 31
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -304,7 +304,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Sad
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 33
+    startLine: 32
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -339,7 +339,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Bored
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 34
+    startLine: 33
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -374,7 +374,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Frisky
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 35
+    startLine: 34
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -409,7 +409,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Creative
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 36
+    startLine: 35
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -444,7 +444,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Focused
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 37
+    startLine: 36
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -479,7 +479,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Stunned
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 38
+    startLine: 37
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -514,7 +514,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Angry
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 39
+    startLine: 38
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -549,7 +549,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Energetic
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 40
+    startLine: 39
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -584,7 +584,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Uneasy
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 41
+    startLine: 40
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -619,7 +619,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Relaxed
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 42
+    startLine: 41
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -654,7 +654,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 48
+    startLine: 47
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -689,7 +689,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 52
+    startLine: 51
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -724,7 +724,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Color
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 57
+    startLine: 56
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -759,7 +759,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Category
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 62
+    startLine: 61
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -794,7 +794,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 71
+    startLine: 70
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
@ -839,7 +839,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Emotions/EmotionType.cs
-    startLine: 83
+    startLine: 82
  assemblies:
  - Tiny Life
  namespace: TinyLife.Emotions
--- a/docs/api/TinyLife.Goals..yml
+++ b/docs/api/TinyLife.Goals..yml
@ -53,12 +53,12 @@ items:
 references:
 - uid: TinyLife.Goals.AutoTriggerGoal`1
  commentId: T:TinyLife.Goals.AutoTriggerGoal`1
-  name: AutoTriggerGoal<T>
-  nameWithType: AutoTriggerGoal<T>
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>
-  nameWithType.vb: AutoTriggerGoal(Of T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T)
-  name.vb: AutoTriggerGoal(Of T)
+  name: AutoTriggerGoal<TValue>
+  nameWithType: AutoTriggerGoal<TValue>
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>
+  nameWithType.vb: AutoTriggerGoal(Of TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue)
+  name.vb: AutoTriggerGoal(Of TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1
    name: AutoTriggerGoal
@ -67,9 +67,9 @@ references:
  - name: <
    nameWithType: <
    fullName: <
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: '>'
    nameWithType: '>'
    fullName: '>'
@ -81,9 +81,9 @@ references:
  - name: '(Of '
    nameWithType: '(Of '
    fullName: '(Of '
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
--- a/docs/api/TinyLife.Goals.Achievement.yml
+++ b/docs/api/TinyLife.Goals.Achievement.yml
@ -27,7 +27,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Achievement
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 157
+    startLine: 156
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -82,7 +82,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Type
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 164
+    startLine: 163
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -127,7 +127,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Goals
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 168
+    startLine: 167
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -180,7 +180,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Completed
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 174
+    startLine: 173
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -233,7 +233,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 183
+    startLine: 182
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -272,7 +272,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Update
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 195
+    startLine: 194
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -316,7 +316,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CreateElement
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 205
+    startLine: 204
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -353,7 +353,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Validate
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 224
+    startLine: 223
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -390,7 +390,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Complete
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 232
+    startLine: 231
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
--- a/docs/api/TinyLife.Goals.AchievementType.yml
+++ b/docs/api/TinyLife.Goals.AchievementType.yml
@ -30,7 +30,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AchievementType
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 28
+    startLine: 27
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -81,7 +81,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 35
+    startLine: 34
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -118,7 +118,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SomeoneDiesOnYourLot
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 38
+    startLine: 37
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -153,7 +153,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DieOnPublicLot
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 39
+    startLine: 38
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -188,7 +188,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 66
+    startLine: 65
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -223,7 +223,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 70
+    startLine: 69
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -258,7 +258,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Goals
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 75
+    startLine: 74
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -293,7 +293,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DisplayName
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 80
+    startLine: 79
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -330,7 +330,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 88
+    startLine: 87
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -372,7 +372,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 96
+    startLine: 95
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -414,7 +414,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Construct
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 106
+    startLine: 105
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -451,7 +451,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Goals/Achievement.cs
-    startLine: 115
+    startLine: 114
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
--- a/docs/api/TinyLife.Goals.AmountGoal.yml
+++ b/docs/api/TinyLife.Goals.AmountGoal.yml
@ -40,6 +40,7 @@ items:
  - System.Object
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder
  - TinyLife.Goals.Goal
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
  - TinyLife.Goals.AutoTriggerGoal
  - TinyLife.Goals.AutoTriggerGoal{System.Single}
  implements:
@ -47,11 +48,10 @@ items:
  inheritedMembers:
  - TinyLife.Goals.AutoTriggerGoal{System.Single}.Trigger(System.Object)
  - TinyLife.Goals.AutoTriggerGoal{System.Single}.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
-  - TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  - TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
  - TinyLife.Goals.Goal.Name
  - TinyLife.Goals.Goal.Set
-  - TinyLife.Goals.Goal.Info
+  - TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
@ -290,6 +290,46 @@ references:
  name: Goal
  nameWithType: Goal
  fullName: TinyLife.Goals.Goal
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  commentId: T:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  parent: TinyLife.Goals
+  definition: TinyLife.Goals.Goal`1
+  name: Goal<AutoGoalInfo>
+  nameWithType: Goal<AutoGoalInfo>
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>
+  nameWithType.vb: Goal(Of AutoGoalInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo)
+  name.vb: Goal(Of AutoGoalInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.AutoTriggerGoal
  commentId: T:TinyLife.Goals.AutoTriggerGoal
  parent: TinyLife.Goals
@ -457,48 +497,15 @@ references:
  - name: )
    nameWithType: )
    fullName: )
- uid: TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  commentId: P:TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: AutoInfo
-  nameWithType: AutoTriggerGoal.AutoInfo
-  fullName: TinyLife.Goals.AutoTriggerGoal.AutoInfo
- uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  commentId: M:TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: Validate(GoalSet)
-  nameWithType: AutoTriggerGoal.Validate(GoalSet)
-  fullName: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  spec.csharp:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
-  spec.vb:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  commentId: P:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  parent: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  definition: TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<AutoGoalInfo>.Info
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>.Info
+  nameWithType.vb: Goal(Of AutoGoalInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo).Info
 - uid: TinyLife.Goals.Goal.Name
  commentId: F:TinyLife.Goals.Goal.Name
  parent: TinyLife.Goals.Goal
@ -511,12 +518,42 @@ references:
  name: Set
  nameWithType: Goal.Set
  fullName: TinyLife.Goals.Goal.Set
- uid: TinyLife.Goals.Goal.Info
-  commentId: P:TinyLife.Goals.Goal.Info
+- uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  commentId: M:TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  parent: TinyLife.Goals.Goal
-  name: Info
-  nameWithType: Goal.Info
-  fullName: TinyLife.Goals.Goal.Info
+  name: Validate(GoalSet)
+  nameWithType: Goal.Validate(GoalSet)
+  fullName: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
@ -972,14 +1009,50 @@ references:
  name: MLEM.Data.Json
  nameWithType: MLEM.Data.Json
  fullName: MLEM.Data.Json
+- uid: TinyLife.Goals.Goal`1
+  commentId: T:TinyLife.Goals.Goal`1
+  name: Goal<TInfo>
+  nameWithType: Goal<TInfo>
+  fullName: TinyLife.Goals.Goal<TInfo>
+  nameWithType.vb: Goal(Of TInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo)
+  name.vb: Goal(Of TInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.AutoTriggerGoal`1
  commentId: T:TinyLife.Goals.AutoTriggerGoal`1
-  name: AutoTriggerGoal<T>
-  nameWithType: AutoTriggerGoal<T>
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>
-  nameWithType.vb: AutoTriggerGoal(Of T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T)
-  name.vb: AutoTriggerGoal(Of T)
+  name: AutoTriggerGoal<TValue>
+  nameWithType: AutoTriggerGoal<TValue>
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>
+  nameWithType.vb: AutoTriggerGoal(Of TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue)
+  name.vb: AutoTriggerGoal(Of TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1
    name: AutoTriggerGoal
@ -988,9 +1061,9 @@ references:
  - name: <
    nameWithType: <
    fullName: <
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: '>'
    nameWithType: '>'
    fullName: '>'
@ -1002,9 +1075,9 @@ references:
  - name: '(Of '
    nameWithType: '(Of '
    fullName: '(Of '
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
@ -1018,15 +1091,15 @@ references:
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
  isExternal: true
  name: Trigger(Object)
-  nameWithType: AutoTriggerGoal<T>.Trigger(Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(System.Object)
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(Object)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(System.Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(System.Object)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
    name: Trigger
-    nameWithType: AutoTriggerGoal<T>.Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
+    nameWithType: AutoTriggerGoal<TValue>.Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
  - name: (
    nameWithType: (
    fullName: (
@ -1041,8 +1114,8 @@ references:
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
    name: Trigger
-    nameWithType: AutoTriggerGoal(Of T).Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
+    nameWithType: AutoTriggerGoal(Of TValue).Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
  - name: (
    nameWithType: (
    fullName: (
@ -1058,15 +1131,15 @@ references:
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
  isExternal: true
  name: CanTrigger(Object, GoalTrigger, Object)
-  nameWithType: AutoTriggerGoal<T>.CanTrigger(Object, GoalTrigger, Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
-  nameWithType.vb: AutoTriggerGoal(Of T).CanTrigger(Object, GoalTrigger, Object)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.CanTrigger(Object, GoalTrigger, Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).CanTrigger(Object, GoalTrigger, Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
    name: CanTrigger
-    nameWithType: AutoTriggerGoal<T>.CanTrigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.CanTrigger
+    nameWithType: AutoTriggerGoal<TValue>.CanTrigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.CanTrigger
  - name: (
    nameWithType: (
    fullName: (
@ -1096,8 +1169,8 @@ references:
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
    name: CanTrigger
-    nameWithType: AutoTriggerGoal(Of T).CanTrigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).CanTrigger
+    nameWithType: AutoTriggerGoal(Of TValue).CanTrigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).CanTrigger
  - name: (
    nameWithType: (
    fullName: (
@ -1124,6 +1197,13 @@ references:
  - name: )
    nameWithType: )
    fullName: )
+- uid: TinyLife.Goals.Goal`1.Info
+  commentId: P:TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<TInfo>.Info
+  fullName: TinyLife.Goals.Goal<TInfo>.Info
+  nameWithType.vb: Goal(Of TInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Info
 - uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  name: JsonCopy<T>(T)
@ -1343,36 +1423,36 @@ references:
  fullName: TinyLife.Goals.AmountGoal.Trigger
 - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
-  name: Trigger(T)
-  nameWithType: AutoTriggerGoal<T>.Trigger(T)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(T)
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(T)
+  name: Trigger(TValue)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(TValue)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(TValue)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
    name: Trigger
-    nameWithType: AutoTriggerGoal<T>.Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
+    nameWithType: AutoTriggerGoal<TValue>.Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
  - name: (
    nameWithType: (
    fullName: (
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
    name: Trigger
-    nameWithType: AutoTriggerGoal(Of T).Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
+    nameWithType: AutoTriggerGoal(Of TValue).Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
  - name: (
    nameWithType: (
    fullName: (
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
--- a/docs/api/TinyLife.Goals.AutoGoalInfo.yml
+++ b/docs/api/TinyLife.Goals.AutoGoalInfo.yml
@ -1169,36 +1169,36 @@ references:
  fullName: TinyLife.Goals.GoalTrigger
 - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
-  name: Trigger(T)
-  nameWithType: AutoTriggerGoal<T>.Trigger(T)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(T)
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(T)
+  name: Trigger(TValue)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(TValue)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(TValue)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
    name: Trigger
-    nameWithType: AutoTriggerGoal<T>.Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
+    nameWithType: AutoTriggerGoal<TValue>.Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
  - name: (
    nameWithType: (
    fullName: (
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
    name: Trigger
-    nameWithType: AutoTriggerGoal(Of T).Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
+    nameWithType: AutoTriggerGoal(Of TValue).Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
  - name: (
    nameWithType: (
    fullName: (
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
--- a/docs/api/TinyLife.Goals.AutoTriggerGoal-1.yml
+++ b/docs/api/TinyLife.Goals.AutoTriggerGoal-1.yml
@ -12,9 +12,9 @@ items:
  langs:
  - csharp
  - vb
-  name: AutoTriggerGoal<T>
-  nameWithType: AutoTriggerGoal<T>
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>
+  name: AutoTriggerGoal<TValue>
+  nameWithType: AutoTriggerGoal<TValue>
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>
  type: Class
  source:
    remote:
@ -23,24 +23,25 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AutoTriggerGoal
    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 50
+    startLine: 35
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
  summary: "\nAn auto-triggered goal is intended to be used with <xref href=\"TinyLife.Goals.AutoGoalInfo\" data-throw-if-not-resolved=\"false\"></xref>. This is the base class for all auto-triggered goals.\nAuto-triggered goals do not need to be called, triggered or referenced manually, since they get triggered automatically based on a <xref href=\"TinyLife.Goals.GoalTrigger\" data-throw-if-not-resolved=\"false\"></xref>.\n"
  example: []
  syntax:
-    content: 'public abstract class AutoTriggerGoal<T> : AutoTriggerGoal, IGenericDataHolder'
+    content: 'public abstract class AutoTriggerGoal<TValue> : AutoTriggerGoal, IGenericDataHolder'
    typeParameters:
-    - id: T
+    - id: TValue
    content.vb: >-
-      Public MustInherit Class AutoTriggerGoal(Of T)
+      Public MustInherit Class AutoTriggerGoal(Of TValue)
          Inherits AutoTriggerGoal
          Implements IGenericDataHolder
  inheritance:
  - System.Object
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder
  - TinyLife.Goals.Goal
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
  - TinyLife.Goals.AutoTriggerGoal
  derivedClasses:
  - TinyLife.Goals.AmountGoal
@ -49,14 +50,13 @@ items:
  implements:
  - MLEM.Misc.IGenericDataHolder
  inheritedMembers:
-  - TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  - TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
  - TinyLife.Goals.Goal.Name
  - TinyLife.Goals.Goal.Set
-  - TinyLife.Goals.Goal.Info
  - TinyLife.Goals.Goal.GetProgress
  - TinyLife.Goals.Goal.Reset
  - TinyLife.Goals.Goal.GetDisplayedProgress
+  - TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
@ -69,7 +69,7 @@ items:
  - System.Object.ToString
  extensionMethods:
  - TinyLife.Goals.AutoTriggerGoal`1.TinyLife.Utilities.Extensions.JsonCopy``1
-  nameWithType.vb: AutoTriggerGoal(Of T)
+  nameWithType.vb: AutoTriggerGoal(Of TValue)
  modifiers.csharp:
  - public
  - abstract
@ -78,8 +78,8 @@ items:
  - Public
  - MustInherit
  - Class
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T)
-  name.vb: AutoTriggerGoal(Of T)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue)
+  name.vb: AutoTriggerGoal(Of TValue)
 - uid: TinyLife.Goals.AutoTriggerGoal`1.#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)
  id: '#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)'
@ -88,8 +88,8 @@ items:
  - csharp
  - vb
  name: AutoTriggerGoal(GoalSet, AutoGoalInfo)
-  nameWithType: AutoTriggerGoal<T>.AutoTriggerGoal(GoalSet, AutoGoalInfo)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.AutoTriggerGoal(TinyLife.Goals.GoalSet, TinyLife.Goals.AutoGoalInfo)
+  nameWithType: AutoTriggerGoal<TValue>.AutoTriggerGoal(GoalSet, AutoGoalInfo)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.AutoTriggerGoal(TinyLife.Goals.GoalSet, TinyLife.Goals.AutoGoalInfo)
  type: Constructor
  source:
    remote:
@ -98,7 +98,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 53
+    startLine: 38
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -112,12 +112,12 @@ items:
      type: TinyLife.Goals.AutoGoalInfo
    content.vb: Protected Sub New(set As GoalSet, info As AutoGoalInfo)
  overload: TinyLife.Goals.AutoTriggerGoal`1.#ctor*
-  nameWithType.vb: AutoTriggerGoal(Of T).AutoTriggerGoal(GoalSet, AutoGoalInfo)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).AutoTriggerGoal(GoalSet, AutoGoalInfo)
  modifiers.csharp:
  - protected
  modifiers.vb:
  - Protected
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).AutoTriggerGoal(TinyLife.Goals.GoalSet, TinyLife.Goals.AutoGoalInfo)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).AutoTriggerGoal(TinyLife.Goals.GoalSet, TinyLife.Goals.AutoGoalInfo)
 - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
  id: Trigger(`0)
@ -125,9 +125,9 @@ items:
  langs:
  - csharp
  - vb
-  name: Trigger(T)
-  nameWithType: AutoTriggerGoal<T>.Trigger(T)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(T)
+  name: Trigger(TValue)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(TValue)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(TValue)
  type: Method
  source:
    remote:
@ -136,27 +136,27 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Trigger
    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 56
+    startLine: 41
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
  summary: "\nCauses this auto-triggered goal to be triggered.\nThis method should only be called if <xref href=\"TinyLife.Goals.AutoTriggerGoal.CanTrigger(System.Object%2cTinyLife.Goals.GoalTrigger%2cSystem.Object)\" data-throw-if-not-resolved=\"false\"></xref> returns <xref uid=\"langword_csharp_true\" name=\"true\" href=\"\"></xref>.\n"
  example: []
  syntax:
-    content: public abstract void Trigger(T value)
+    content: public abstract void Trigger(TValue value)
    parameters:
    - id: value
-      type: '{T}'
-    content.vb: Public MustOverride Sub Trigger(value As T)
+      type: '{TValue}'
+    content.vb: Public MustOverride Sub Trigger(value As TValue)
  overload: TinyLife.Goals.AutoTriggerGoal`1.Trigger*
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(T)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(TValue)
  modifiers.csharp:
  - public
  - abstract
  modifiers.vb:
  - Public
  - MustOverride
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(T)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(TValue)
 - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
  id: Trigger(System.Object)
@ -165,8 +165,8 @@ items:
  - csharp
  - vb
  name: Trigger(Object)
-  nameWithType: AutoTriggerGoal<T>.Trigger(Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(System.Object)
  type: Method
  source:
    remote:
@ -175,7 +175,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Trigger
    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 59
+    startLine: 44
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -190,7 +190,7 @@ items:
    content.vb: Public NotOverridable Overrides Sub Trigger(value As Object)
  overridden: TinyLife.Goals.AutoTriggerGoal.Trigger(System.Object)
  overload: TinyLife.Goals.AutoTriggerGoal`1.Trigger*
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(Object)
  modifiers.csharp:
  - public
  - sealed
@ -199,7 +199,7 @@ items:
  - Public
  - Overrides
  - NotOverridable
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(System.Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(System.Object)
 - uid: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
  id: CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
@ -208,8 +208,8 @@ items:
  - csharp
  - vb
  name: CanTrigger(Object, GoalTrigger, Object)
-  nameWithType: AutoTriggerGoal<T>.CanTrigger(Object, GoalTrigger, Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.CanTrigger(Object, GoalTrigger, Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
  type: Method
  source:
    remote:
@ -218,7 +218,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanTrigger
    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 64
+    startLine: 49
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -242,14 +242,14 @@ items:
    content.vb: Public Overrides Function CanTrigger(obj As Object, trigger As GoalTrigger, value As Object) As Boolean
  overridden: TinyLife.Goals.AutoTriggerGoal.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
  overload: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger*
-  nameWithType.vb: AutoTriggerGoal(Of T).CanTrigger(Object, GoalTrigger, Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).CanTrigger(Object, GoalTrigger, Object)
  modifiers.csharp:
  - public
  - override
  modifiers.vb:
  - Public
  - Overrides
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
 references:
 - uid: TinyLife.Goals
  commentId: N:TinyLife.Goals
@ -276,6 +276,46 @@ references:
  name: Goal
  nameWithType: Goal
  fullName: TinyLife.Goals.Goal
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  commentId: T:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  parent: TinyLife.Goals
+  definition: TinyLife.Goals.Goal`1
+  name: Goal<AutoGoalInfo>
+  nameWithType: Goal<AutoGoalInfo>
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>
+  nameWithType.vb: Goal(Of AutoGoalInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo)
+  name.vb: Goal(Of AutoGoalInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.AutoTriggerGoal
  commentId: T:TinyLife.Goals.AutoTriggerGoal
  parent: TinyLife.Goals
@ -289,48 +329,15 @@ references:
  name: IGenericDataHolder
  nameWithType: IGenericDataHolder
  fullName: MLEM.Misc.IGenericDataHolder
- uid: TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  commentId: P:TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: AutoInfo
-  nameWithType: AutoTriggerGoal.AutoInfo
-  fullName: TinyLife.Goals.AutoTriggerGoal.AutoInfo
- uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  commentId: M:TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: Validate(GoalSet)
-  nameWithType: AutoTriggerGoal.Validate(GoalSet)
-  fullName: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  spec.csharp:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
-  spec.vb:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  commentId: P:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  parent: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  definition: TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<AutoGoalInfo>.Info
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>.Info
+  nameWithType.vb: Goal(Of AutoGoalInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo).Info
 - uid: TinyLife.Goals.Goal.Name
  commentId: F:TinyLife.Goals.Goal.Name
  parent: TinyLife.Goals.Goal
@ -343,12 +350,6 @@ references:
  name: Set
  nameWithType: Goal.Set
  fullName: TinyLife.Goals.Goal.Set
- uid: TinyLife.Goals.Goal.Info
-  commentId: P:TinyLife.Goals.Goal.Info
-  parent: TinyLife.Goals.Goal
-  name: Info
-  nameWithType: Goal.Info
-  fullName: TinyLife.Goals.Goal.Info
 - uid: TinyLife.Goals.Goal.GetProgress
  commentId: M:TinyLife.Goals.Goal.GetProgress
  parent: TinyLife.Goals.Goal
@ -433,6 +434,42 @@ references:
  - name: )
    nameWithType: )
    fullName: )
+- uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  commentId: M:TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  parent: TinyLife.Goals.Goal
+  name: Validate(GoalSet)
+  nameWithType: Goal.Validate(GoalSet)
+  fullName: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
@ -848,17 +885,17 @@ references:
  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  parent: TinyLife.Utilities.Extensions
  definition: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
-  name: JsonCopy<AutoTriggerGoal<T>>()
-  nameWithType: Extensions.JsonCopy<AutoTriggerGoal<T>>()
-  fullName: TinyLife.Utilities.Extensions.JsonCopy<TinyLife.Goals.AutoTriggerGoal<T>>()
-  nameWithType.vb: Extensions.JsonCopy(Of AutoTriggerGoal(Of T))()
-  fullName.vb: TinyLife.Utilities.Extensions.JsonCopy(Of TinyLife.Goals.AutoTriggerGoal(Of T))()
-  name.vb: JsonCopy(Of AutoTriggerGoal(Of T))()
+  name: JsonCopy<AutoTriggerGoal<TValue>>()
+  nameWithType: Extensions.JsonCopy<AutoTriggerGoal<TValue>>()
+  fullName: TinyLife.Utilities.Extensions.JsonCopy<TinyLife.Goals.AutoTriggerGoal<TValue>>()
+  nameWithType.vb: Extensions.JsonCopy(Of AutoTriggerGoal(Of TValue))()
+  fullName.vb: TinyLife.Utilities.Extensions.JsonCopy(Of TinyLife.Goals.AutoTriggerGoal(Of TValue))()
+  name.vb: JsonCopy(Of AutoTriggerGoal(Of TValue))()
  spec.csharp:
  - uid: TinyLife.Utilities.Extensions.JsonCopy``1
-    name: JsonCopy<AutoTriggerGoal<T>>
-    nameWithType: Extensions.JsonCopy<AutoTriggerGoal<T>>
-    fullName: TinyLife.Utilities.Extensions.JsonCopy<TinyLife.Goals.AutoTriggerGoal<T>>
+    name: JsonCopy<AutoTriggerGoal<TValue>>
+    nameWithType: Extensions.JsonCopy<AutoTriggerGoal<TValue>>
+    fullName: TinyLife.Utilities.Extensions.JsonCopy<TinyLife.Goals.AutoTriggerGoal<TValue>>
  - name: (
    nameWithType: (
    fullName: (
@ -867,9 +904,9 @@ references:
    fullName: )
  spec.vb:
  - uid: TinyLife.Utilities.Extensions.JsonCopy``1
-    name: JsonCopy(Of AutoTriggerGoal(Of T))
-    nameWithType: Extensions.JsonCopy(Of AutoTriggerGoal(Of T))
-    fullName: TinyLife.Utilities.Extensions.JsonCopy(Of TinyLife.Goals.AutoTriggerGoal(Of T))
+    name: JsonCopy(Of AutoTriggerGoal(Of TValue))
+    nameWithType: Extensions.JsonCopy(Of AutoTriggerGoal(Of TValue))
+    fullName: TinyLife.Utilities.Extensions.JsonCopy(Of TinyLife.Goals.AutoTriggerGoal(Of TValue))
  - name: (
    nameWithType: (
    fullName: (
@ -888,12 +925,55 @@ references:
  name: MLEM.Data.Json
  nameWithType: MLEM.Data.Json
  fullName: MLEM.Data.Json
+- uid: TinyLife.Goals.Goal`1
+  commentId: T:TinyLife.Goals.Goal`1
+  name: Goal<TInfo>
+  nameWithType: Goal<TInfo>
+  fullName: TinyLife.Goals.Goal<TInfo>
+  nameWithType.vb: Goal(Of TInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo)
+  name.vb: Goal(Of TInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Misc
  commentId: N:MLEM.Misc
  isExternal: true
  name: MLEM.Misc
  nameWithType: MLEM.Misc
  fullName: MLEM.Misc
+- uid: TinyLife.Goals.Goal`1.Info
+  commentId: P:TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<TInfo>.Info
+  fullName: TinyLife.Goals.Goal<TInfo>.Info
+  nameWithType.vb: Goal(Of TInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Info
 - uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  name: JsonCopy<T>(T)
@ -944,10 +1024,10 @@ references:
 - uid: TinyLife.Goals.AutoTriggerGoal`1.#ctor*
  commentId: Overload:TinyLife.Goals.AutoTriggerGoal`1.#ctor
  name: AutoTriggerGoal
-  nameWithType: AutoTriggerGoal<T>.AutoTriggerGoal
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.AutoTriggerGoal
-  nameWithType.vb: AutoTriggerGoal(Of T).AutoTriggerGoal
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).AutoTriggerGoal
+  nameWithType: AutoTriggerGoal<TValue>.AutoTriggerGoal
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.AutoTriggerGoal
+  nameWithType.vb: AutoTriggerGoal(Of TValue).AutoTriggerGoal
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).AutoTriggerGoal
 - uid: TinyLife.Goals.GoalSet
  commentId: T:TinyLife.Goals.GoalSet
  parent: TinyLife.Goals
@ -964,15 +1044,15 @@ references:
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
  isExternal: true
  name: Trigger(Object)
-  nameWithType: AutoTriggerGoal<T>.Trigger(Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(System.Object)
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(Object)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(System.Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(System.Object)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
    name: Trigger
-    nameWithType: AutoTriggerGoal<T>.Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
+    nameWithType: AutoTriggerGoal<TValue>.Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
  - name: (
    nameWithType: (
    fullName: (
@ -987,8 +1067,8 @@ references:
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
    name: Trigger
-    nameWithType: AutoTriggerGoal(Of T).Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
+    nameWithType: AutoTriggerGoal(Of TValue).Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
  - name: (
    nameWithType: (
    fullName: (
@ -1003,20 +1083,21 @@ references:
 - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger*
  commentId: Overload:TinyLife.Goals.AutoTriggerGoal`1.Trigger
  name: Trigger
-  nameWithType: AutoTriggerGoal<T>.Trigger
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
- uid: '{T}'
-  commentId: '!:T'
-  definition: T
-  name: T
-  nameWithType: T
-  fullName: T
- uid: T
-  name: T
-  nameWithType: T
-  fullName: T
+  nameWithType: AutoTriggerGoal<TValue>.Trigger
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
+- uid: '{TValue}'
+  commentId: '!:TValue'
+  definition: TValue
+  name: TValue
+  nameWithType: TValue
+  fullName: TValue
+- uid: TValue
+  commentId: '!:TValue'
+  name: TValue
+  nameWithType: TValue
+  fullName: TValue
 - uid: TinyLife.Goals.AutoTriggerGoal.Trigger(System.Object)
  commentId: M:TinyLife.Goals.AutoTriggerGoal.Trigger(System.Object)
  parent: TinyLife.Goals.AutoTriggerGoal
@ -1128,10 +1209,10 @@ references:
 - uid: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger*
  commentId: Overload:TinyLife.Goals.AutoTriggerGoal`1.CanTrigger
  name: CanTrigger
-  nameWithType: AutoTriggerGoal<T>.CanTrigger
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.CanTrigger
-  nameWithType.vb: AutoTriggerGoal(Of T).CanTrigger
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).CanTrigger
+  nameWithType: AutoTriggerGoal<TValue>.CanTrigger
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.CanTrigger
+  nameWithType.vb: AutoTriggerGoal(Of TValue).CanTrigger
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).CanTrigger
 - uid: TinyLife.Goals.GoalTrigger
  commentId: T:TinyLife.Goals.GoalTrigger
  parent: TinyLife.Goals
--- a/docs/api/TinyLife.Goals.AutoTriggerGoal.yml
+++ b/docs/api/TinyLife.Goals.AutoTriggerGoal.yml
@ -6,10 +6,8 @@ items:
  parent: TinyLife.Goals
  children:
  - TinyLife.Goals.AutoTriggerGoal.#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)
-  - TinyLife.Goals.AutoTriggerGoal.AutoInfo
  - TinyLife.Goals.AutoTriggerGoal.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
  - TinyLife.Goals.AutoTriggerGoal.Trigger(System.Object)
-  - TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
  langs:
  - csharp
  - vb
@ -31,27 +29,29 @@ items:
  summary: "\nAn auto-triggered goal is intended to be used with <xref href=\"TinyLife.Goals.AutoGoalInfo\" data-throw-if-not-resolved=\"false\"></xref>. This is the base class for all auto-triggered goals.\nAuto-triggered goals do not need to be called, triggered or referenced manually, since they get triggered automatically based on a <xref href=\"TinyLife.Goals.GoalTrigger\" data-throw-if-not-resolved=\"false\"></xref>.\n"
  example: []
  syntax:
-    content: 'public abstract class AutoTriggerGoal : Goal, IGenericDataHolder'
+    content: 'public abstract class AutoTriggerGoal : Goal<AutoGoalInfo>, IGenericDataHolder'
    content.vb: >-
      Public MustInherit Class AutoTriggerGoal
-          Inherits Goal
+          Inherits Goal(Of AutoGoalInfo)
          Implements IGenericDataHolder
  inheritance:
  - System.Object
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder
  - TinyLife.Goals.Goal
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
  derivedClasses:
  - TinyLife.Goals.AutoTriggerGoal`1
  - TinyLife.Goals.DistinctGoal
  implements:
  - MLEM.Misc.IGenericDataHolder
  inheritedMembers:
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
  - TinyLife.Goals.Goal.Name
  - TinyLife.Goals.Goal.Set
-  - TinyLife.Goals.Goal.Info
  - TinyLife.Goals.Goal.GetProgress
  - TinyLife.Goals.Goal.Reset
  - TinyLife.Goals.Goal.GetDisplayedProgress
+  - TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
@ -72,43 +72,6 @@ items:
  - Public
  - MustInherit
  - Class
- uid: TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  commentId: P:TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  id: AutoInfo
-  parent: TinyLife.Goals.AutoTriggerGoal
-  langs:
-  - csharp
-  - vb
-  name: AutoInfo
-  nameWithType: AutoTriggerGoal.AutoInfo
-  fullName: TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  type: Property
-  source:
-    remote:
-      path: TinyLife/Goals/AutoTriggerGoal.cs
-      branch: main
-      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: AutoInfo
-    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 13
-  assemblies:
-  - Tiny Life
-  namespace: TinyLife.Goals
-  summary: "\nThe underlying <xref href=\"TinyLife.Goals.GoalInfo\" data-throw-if-not-resolved=\"false\"></xref>, but cast to an <xref href=\"TinyLife.Goals.AutoGoalInfo\" data-throw-if-not-resolved=\"false\"></xref>\n"
-  example: []
-  syntax:
-    content: protected AutoGoalInfo AutoInfo { get; }
-    parameters: []
-    return:
-      type: TinyLife.Goals.AutoGoalInfo
-    content.vb: Protected ReadOnly Property AutoInfo As AutoGoalInfo
-  overload: TinyLife.Goals.AutoTriggerGoal.AutoInfo*
-  modifiers.csharp:
-  - protected
-  - get
-  modifiers.vb:
-  - Protected
-  - ReadOnly
 - uid: TinyLife.Goals.AutoTriggerGoal.#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)
  commentId: M:TinyLife.Goals.AutoTriggerGoal.#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)
  id: '#ctor(TinyLife.Goals.GoalSet,TinyLife.Goals.AutoGoalInfo)'
@ -127,24 +90,24 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 16
+    startLine: 11
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
  example: []
  syntax:
-    content: public AutoTriggerGoal(GoalSet set, AutoGoalInfo info)
+    content: protected AutoTriggerGoal(GoalSet set, AutoGoalInfo info)
    parameters:
    - id: set
      type: TinyLife.Goals.GoalSet
    - id: info
      type: TinyLife.Goals.AutoGoalInfo
-    content.vb: Public Sub New(set As GoalSet, info As AutoGoalInfo)
+    content.vb: Protected Sub New(set As GoalSet, info As AutoGoalInfo)
  overload: TinyLife.Goals.AutoTriggerGoal.#ctor*
  modifiers.csharp:
-  - public
+  - protected
  modifiers.vb:
-  - Public
+  - Protected
 - uid: TinyLife.Goals.AutoTriggerGoal.Trigger(System.Object)
  commentId: M:TinyLife.Goals.AutoTriggerGoal.Trigger(System.Object)
  id: Trigger(System.Object)
@ -163,7 +126,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Trigger
    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 25
+    startLine: 18
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -201,7 +164,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanTrigger
    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 35
+    startLine: 28
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -230,48 +193,6 @@ items:
  modifiers.vb:
  - Public
  - Overridable
- uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  commentId: M:TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  id: Validate(TinyLife.Goals.GoalSet)
-  parent: TinyLife.Goals.AutoTriggerGoal
-  langs:
-  - csharp
-  - vb
-  name: Validate(GoalSet)
-  nameWithType: AutoTriggerGoal.Validate(GoalSet)
-  fullName: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  type: Method
-  source:
-    remote:
-      path: TinyLife/Goals/AutoTriggerGoal.cs
-      branch: main
-      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: Validate
-    path: ../TinyLife/Goals/AutoTriggerGoal.cs
-    startLine: 40
-  assemblies:
-  - Tiny Life
-  namespace: TinyLife.Goals
-  summary: "\nValidates this goal when loading the underlying <xref href=\"TinyLife.Goals.GoalSet\" data-throw-if-not-resolved=\"false\"></xref> from disk\n"
-  example: []
-  syntax:
-    content: public override bool Validate(GoalSet set)
-    parameters:
-    - id: set
-      type: TinyLife.Goals.GoalSet
-      description: The underlying goal set
-    return:
-      type: System.Boolean
-      description: Whether this goal is considered to be valid
-    content.vb: Public Overrides Function Validate(set As GoalSet) As Boolean
-  overridden: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
-  overload: TinyLife.Goals.AutoTriggerGoal.Validate*
-  modifiers.csharp:
-  - public
-  - override
-  modifiers.vb:
-  - Public
-  - Overrides
 references:
 - uid: TinyLife.Goals.AutoGoalInfo
  commentId: T:TinyLife.Goals.AutoGoalInfo
@ -310,6 +231,46 @@ references:
  name: Goal
  nameWithType: Goal
  fullName: TinyLife.Goals.Goal
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  commentId: T:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  parent: TinyLife.Goals
+  definition: TinyLife.Goals.Goal`1
+  name: Goal<AutoGoalInfo>
+  nameWithType: Goal<AutoGoalInfo>
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>
+  nameWithType.vb: Goal(Of AutoGoalInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo)
+  name.vb: Goal(Of AutoGoalInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Misc.IGenericDataHolder
  commentId: T:MLEM.Misc.IGenericDataHolder
  parent: MLEM.Misc
@ -317,6 +278,15 @@ references:
  name: IGenericDataHolder
  nameWithType: IGenericDataHolder
  fullName: MLEM.Misc.IGenericDataHolder
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  commentId: P:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  parent: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  definition: TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<AutoGoalInfo>.Info
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>.Info
+  nameWithType.vb: Goal(Of AutoGoalInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo).Info
 - uid: TinyLife.Goals.Goal.Name
  commentId: F:TinyLife.Goals.Goal.Name
  parent: TinyLife.Goals.Goal
@ -329,12 +299,6 @@ references:
  name: Set
  nameWithType: Goal.Set
  fullName: TinyLife.Goals.Goal.Set
- uid: TinyLife.Goals.Goal.Info
-  commentId: P:TinyLife.Goals.Goal.Info
-  parent: TinyLife.Goals.Goal
-  name: Info
-  nameWithType: Goal.Info
-  fullName: TinyLife.Goals.Goal.Info
 - uid: TinyLife.Goals.Goal.GetProgress
  commentId: M:TinyLife.Goals.Goal.GetProgress
  parent: TinyLife.Goals.Goal
@ -419,6 +383,42 @@ references:
  - name: )
    nameWithType: )
    fullName: )
+- uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  commentId: M:TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  parent: TinyLife.Goals.Goal
+  name: Validate(GoalSet)
+  nameWithType: Goal.Validate(GoalSet)
+  fullName: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
@ -874,12 +874,55 @@ references:
  name: MLEM.Data.Json
  nameWithType: MLEM.Data.Json
  fullName: MLEM.Data.Json
+- uid: TinyLife.Goals.Goal`1
+  commentId: T:TinyLife.Goals.Goal`1
+  name: Goal<TInfo>
+  nameWithType: Goal<TInfo>
+  fullName: TinyLife.Goals.Goal<TInfo>
+  nameWithType.vb: Goal(Of TInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo)
+  name.vb: Goal(Of TInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Misc
  commentId: N:MLEM.Misc
  isExternal: true
  name: MLEM.Misc
  nameWithType: MLEM.Misc
  fullName: MLEM.Misc
+- uid: TinyLife.Goals.Goal`1.Info
+  commentId: P:TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<TInfo>.Info
+  fullName: TinyLife.Goals.Goal<TInfo>.Info
+  nameWithType.vb: Goal(Of TInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Info
 - uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  name: JsonCopy<T>(T)
@ -927,17 +970,6 @@ references:
  name: TinyLife.Utilities
  nameWithType: TinyLife.Utilities
  fullName: TinyLife.Utilities
- uid: TinyLife.Goals.GoalInfo
-  commentId: T:TinyLife.Goals.GoalInfo
-  parent: TinyLife.Goals
-  name: GoalInfo
-  nameWithType: GoalInfo
-  fullName: TinyLife.Goals.GoalInfo
- uid: TinyLife.Goals.AutoTriggerGoal.AutoInfo*
-  commentId: Overload:TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  name: AutoInfo
-  nameWithType: AutoTriggerGoal.AutoInfo
-  fullName: TinyLife.Goals.AutoTriggerGoal.AutoInfo
 - uid: TinyLife.Goals.AutoTriggerGoal.#ctor*
  commentId: Overload:TinyLife.Goals.AutoTriggerGoal.#ctor
  name: AutoTriggerGoal
@ -1080,44 +1112,3 @@ references:
  name: Boolean
  nameWithType: Boolean
  fullName: System.Boolean
- uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
-  commentId: M:TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
-  parent: TinyLife.Goals.Goal
-  name: Validate(GoalSet)
-  nameWithType: Goal.Validate(GoalSet)
-  fullName: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
-  spec.csharp:
-  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: Goal.Validate
-    fullName: TinyLife.Goals.Goal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
-  spec.vb:
-  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: Goal.Validate
-    fullName: TinyLife.Goals.Goal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
- uid: TinyLife.Goals.AutoTriggerGoal.Validate*
-  commentId: Overload:TinyLife.Goals.AutoTriggerGoal.Validate
-  name: Validate
-  nameWithType: AutoTriggerGoal.Validate
-  fullName: TinyLife.Goals.AutoTriggerGoal.Validate
--- a/docs/api/TinyLife.Goals.ConditionedGoal.yml
+++ b/docs/api/TinyLife.Goals.ConditionedGoal.yml
@ -40,6 +40,7 @@ items:
  - System.Object
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder
  - TinyLife.Goals.Goal
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
  - TinyLife.Goals.AutoTriggerGoal
  - TinyLife.Goals.AutoTriggerGoal{System.Boolean}
  implements:
@ -47,11 +48,10 @@ items:
  inheritedMembers:
  - TinyLife.Goals.AutoTriggerGoal{System.Boolean}.Trigger(System.Object)
  - TinyLife.Goals.AutoTriggerGoal{System.Boolean}.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
-  - TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  - TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
  - TinyLife.Goals.Goal.Name
  - TinyLife.Goals.Goal.Set
-  - TinyLife.Goals.Goal.Info
+  - TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
@ -290,6 +290,46 @@ references:
  name: Goal
  nameWithType: Goal
  fullName: TinyLife.Goals.Goal
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  commentId: T:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  parent: TinyLife.Goals
+  definition: TinyLife.Goals.Goal`1
+  name: Goal<AutoGoalInfo>
+  nameWithType: Goal<AutoGoalInfo>
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>
+  nameWithType.vb: Goal(Of AutoGoalInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo)
+  name.vb: Goal(Of AutoGoalInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.AutoTriggerGoal
  commentId: T:TinyLife.Goals.AutoTriggerGoal
  parent: TinyLife.Goals
@ -457,48 +497,15 @@ references:
  - name: )
    nameWithType: )
    fullName: )
- uid: TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  commentId: P:TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: AutoInfo
-  nameWithType: AutoTriggerGoal.AutoInfo
-  fullName: TinyLife.Goals.AutoTriggerGoal.AutoInfo
- uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  commentId: M:TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: Validate(GoalSet)
-  nameWithType: AutoTriggerGoal.Validate(GoalSet)
-  fullName: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  spec.csharp:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
-  spec.vb:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  commentId: P:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  parent: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  definition: TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<AutoGoalInfo>.Info
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>.Info
+  nameWithType.vb: Goal(Of AutoGoalInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo).Info
 - uid: TinyLife.Goals.Goal.Name
  commentId: F:TinyLife.Goals.Goal.Name
  parent: TinyLife.Goals.Goal
@ -511,12 +518,42 @@ references:
  name: Set
  nameWithType: Goal.Set
  fullName: TinyLife.Goals.Goal.Set
- uid: TinyLife.Goals.Goal.Info
-  commentId: P:TinyLife.Goals.Goal.Info
+- uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  commentId: M:TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  parent: TinyLife.Goals.Goal
-  name: Info
-  nameWithType: Goal.Info
-  fullName: TinyLife.Goals.Goal.Info
+  name: Validate(GoalSet)
+  nameWithType: Goal.Validate(GoalSet)
+  fullName: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
@ -972,14 +1009,50 @@ references:
  name: MLEM.Data.Json
  nameWithType: MLEM.Data.Json
  fullName: MLEM.Data.Json
+- uid: TinyLife.Goals.Goal`1
+  commentId: T:TinyLife.Goals.Goal`1
+  name: Goal<TInfo>
+  nameWithType: Goal<TInfo>
+  fullName: TinyLife.Goals.Goal<TInfo>
+  nameWithType.vb: Goal(Of TInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo)
+  name.vb: Goal(Of TInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.AutoTriggerGoal`1
  commentId: T:TinyLife.Goals.AutoTriggerGoal`1
-  name: AutoTriggerGoal<T>
-  nameWithType: AutoTriggerGoal<T>
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>
-  nameWithType.vb: AutoTriggerGoal(Of T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T)
-  name.vb: AutoTriggerGoal(Of T)
+  name: AutoTriggerGoal<TValue>
+  nameWithType: AutoTriggerGoal<TValue>
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>
+  nameWithType.vb: AutoTriggerGoal(Of TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue)
+  name.vb: AutoTriggerGoal(Of TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1
    name: AutoTriggerGoal
@ -988,9 +1061,9 @@ references:
  - name: <
    nameWithType: <
    fullName: <
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: '>'
    nameWithType: '>'
    fullName: '>'
@ -1002,9 +1075,9 @@ references:
  - name: '(Of '
    nameWithType: '(Of '
    fullName: '(Of '
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
@ -1018,15 +1091,15 @@ references:
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
  isExternal: true
  name: Trigger(Object)
-  nameWithType: AutoTriggerGoal<T>.Trigger(Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(System.Object)
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(Object)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(System.Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(System.Object)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
    name: Trigger
-    nameWithType: AutoTriggerGoal<T>.Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
+    nameWithType: AutoTriggerGoal<TValue>.Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
  - name: (
    nameWithType: (
    fullName: (
@ -1041,8 +1114,8 @@ references:
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
    name: Trigger
-    nameWithType: AutoTriggerGoal(Of T).Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
+    nameWithType: AutoTriggerGoal(Of TValue).Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
  - name: (
    nameWithType: (
    fullName: (
@ -1058,15 +1131,15 @@ references:
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
  isExternal: true
  name: CanTrigger(Object, GoalTrigger, Object)
-  nameWithType: AutoTriggerGoal<T>.CanTrigger(Object, GoalTrigger, Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
-  nameWithType.vb: AutoTriggerGoal(Of T).CanTrigger(Object, GoalTrigger, Object)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.CanTrigger(Object, GoalTrigger, Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).CanTrigger(Object, GoalTrigger, Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
    name: CanTrigger
-    nameWithType: AutoTriggerGoal<T>.CanTrigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.CanTrigger
+    nameWithType: AutoTriggerGoal<TValue>.CanTrigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.CanTrigger
  - name: (
    nameWithType: (
    fullName: (
@ -1096,8 +1169,8 @@ references:
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
    name: CanTrigger
-    nameWithType: AutoTriggerGoal(Of T).CanTrigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).CanTrigger
+    nameWithType: AutoTriggerGoal(Of TValue).CanTrigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).CanTrigger
  - name: (
    nameWithType: (
    fullName: (
@ -1124,6 +1197,13 @@ references:
  - name: )
    nameWithType: )
    fullName: )
+- uid: TinyLife.Goals.Goal`1.Info
+  commentId: P:TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<TInfo>.Info
+  fullName: TinyLife.Goals.Goal<TInfo>.Info
+  nameWithType.vb: Goal(Of TInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Info
 - uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  name: JsonCopy<T>(T)
@ -1350,36 +1430,36 @@ references:
  fullName: System.Boolean
 - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
-  name: Trigger(T)
-  nameWithType: AutoTriggerGoal<T>.Trigger(T)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(T)
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(T)
+  name: Trigger(TValue)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(TValue)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(TValue)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
    name: Trigger
-    nameWithType: AutoTriggerGoal<T>.Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
+    nameWithType: AutoTriggerGoal<TValue>.Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
  - name: (
    nameWithType: (
    fullName: (
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
    name: Trigger
-    nameWithType: AutoTriggerGoal(Of T).Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
+    nameWithType: AutoTriggerGoal(Of TValue).Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
  - name: (
    nameWithType: (
    fullName: (
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
--- a/docs/api/TinyLife.Goals.DistinctGoal.yml
+++ b/docs/api/TinyLife.Goals.DistinctGoal.yml
@ -42,14 +42,14 @@ items:
  - System.Object
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder
  - TinyLife.Goals.Goal
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
  - TinyLife.Goals.AutoTriggerGoal
  implements:
  - MLEM.Misc.IGenericDataHolder
  inheritedMembers:
-  - TinyLife.Goals.AutoTriggerGoal.AutoInfo
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
  - TinyLife.Goals.Goal.Name
  - TinyLife.Goals.Goal.Set
-  - TinyLife.Goals.Goal.Info
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
@ -249,7 +249,7 @@ items:
      type: System.Boolean
      description: Whether this goal is considered to be valid
    content.vb: Public Overrides Function Validate(set As GoalSet) As Boolean
-  overridden: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
+  overridden: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  overload: TinyLife.Goals.DistinctGoal.Validate*
  modifiers.csharp:
  - public
@ -379,6 +379,46 @@ references:
  name: Goal
  nameWithType: Goal
  fullName: TinyLife.Goals.Goal
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  commentId: T:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  parent: TinyLife.Goals
+  definition: TinyLife.Goals.Goal`1
+  name: Goal<AutoGoalInfo>
+  nameWithType: Goal<AutoGoalInfo>
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>
+  nameWithType.vb: Goal(Of AutoGoalInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo)
+  name.vb: Goal(Of AutoGoalInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.AutoTriggerGoal
  commentId: T:TinyLife.Goals.AutoTriggerGoal
  parent: TinyLife.Goals
@ -392,12 +432,15 @@ references:
  name: IGenericDataHolder
  nameWithType: IGenericDataHolder
  fullName: MLEM.Misc.IGenericDataHolder
- uid: TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  commentId: P:TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: AutoInfo
-  nameWithType: AutoTriggerGoal.AutoInfo
-  fullName: TinyLife.Goals.AutoTriggerGoal.AutoInfo
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  commentId: P:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  parent: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  definition: TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<AutoGoalInfo>.Info
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>.Info
+  nameWithType.vb: Goal(Of AutoGoalInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo).Info
 - uid: TinyLife.Goals.Goal.Name
  commentId: F:TinyLife.Goals.Goal.Name
  parent: TinyLife.Goals.Goal
@ -410,12 +453,6 @@ references:
  name: Set
  nameWithType: Goal.Set
  fullName: TinyLife.Goals.Goal.Set
- uid: TinyLife.Goals.Goal.Info
-  commentId: P:TinyLife.Goals.Goal.Info
-  parent: TinyLife.Goals.Goal
-  name: Info
-  nameWithType: Goal.Info
-  fullName: TinyLife.Goals.Goal.Info
 - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
@ -871,12 +908,55 @@ references:
  name: MLEM.Data.Json
  nameWithType: MLEM.Data.Json
  fullName: MLEM.Data.Json
+- uid: TinyLife.Goals.Goal`1
+  commentId: T:TinyLife.Goals.Goal`1
+  name: Goal<TInfo>
+  nameWithType: Goal<TInfo>
+  fullName: TinyLife.Goals.Goal<TInfo>
+  nameWithType.vb: Goal(Of TInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo)
+  name.vb: Goal(Of TInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Misc
  commentId: N:MLEM.Misc
  isExternal: true
  name: MLEM.Misc
  nameWithType: MLEM.Misc
  fullName: MLEM.Misc
+- uid: TinyLife.Goals.Goal`1.Info
+  commentId: P:TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<TInfo>.Info
+  fullName: TinyLife.Goals.Goal<TInfo>.Info
+  nameWithType.vb: Goal(Of TInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Info
 - uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  name: JsonCopy<T>(T)
@ -1048,17 +1128,17 @@ references:
  name: String
  nameWithType: String
  fullName: System.String
- uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  commentId: M:TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  parent: TinyLife.Goals.AutoTriggerGoal
+- uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  commentId: M:TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  parent: TinyLife.Goals.Goal
  name: Validate(GoalSet)
-  nameWithType: AutoTriggerGoal.Validate(GoalSet)
-  fullName: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
+  nameWithType: Goal.Validate(GoalSet)
+  fullName: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  spec.csharp:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
  - name: (
    nameWithType: (
    fullName: (
@ -1070,10 +1150,10 @@ references:
    nameWithType: )
    fullName: )
  spec.vb:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
  - name: (
    nameWithType: (
    fullName: (
--- a/docs/api/TinyLife.Goals.Goal-1.yml
+++ b/docs/api/TinyLife.Goals.Goal-1.yml
@ -0,0 +1,861 @@
+### YamlMime:ManagedReference
+items:
+- uid: TinyLife.Goals.Goal`1
+  commentId: T:TinyLife.Goals.Goal`1
+  id: Goal`1
+  parent: TinyLife.Goals
+  children:
+  - TinyLife.Goals.Goal`1.#ctor(TinyLife.Goals.GoalSet,`0)
+  - TinyLife.Goals.Goal`1.Info
+  langs:
+  - csharp
+  - vb
+  name: Goal<TInfo>
+  nameWithType: Goal<TInfo>
+  fullName: TinyLife.Goals.Goal<TInfo>
+  type: Class
+  source:
+    remote:
+      path: TinyLife/Goals/Goal.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: Goal
+    path: ../TinyLife/Goals/Goal.cs
+    startLine: 73
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Goals
+  summary: "\nA goal is a component of a <xref href=\"TinyLife.Goals.GoalSet\" data-throw-if-not-resolved=\"false\"></xref> which can be completed.\nA goal has an underlying <xref href=\"TinyLife.Goals.GoalInfo\" data-throw-if-not-resolved=\"false\"></xref> that it is constructed from.\n"
+  example: []
+  syntax:
+    content: 'public abstract class Goal<TInfo> : Goal, IGenericDataHolder where TInfo : GoalInfo'
+    typeParameters:
+    - id: TInfo
+    content.vb: >-
+      Public MustInherit Class Goal(Of TInfo As GoalInfo)
+          Inherits Goal
+          Implements IGenericDataHolder
+  inheritance:
+  - System.Object
+  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder
+  - TinyLife.Goals.Goal
+  derivedClasses:
+  - TinyLife.Goals.AutoTriggerGoal
+  implements:
+  - MLEM.Misc.IGenericDataHolder
+  inheritedMembers:
+  - TinyLife.Goals.Goal.Name
+  - TinyLife.Goals.Goal.Set
+  - TinyLife.Goals.Goal.GetProgress
+  - TinyLife.Goals.Goal.Reset
+  - TinyLife.Goals.Goal.GetDisplayedProgress
+  - TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
+  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
+  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
+  - System.Object.Equals(System.Object)
+  - System.Object.Equals(System.Object,System.Object)
+  - System.Object.GetHashCode
+  - System.Object.GetType
+  - System.Object.MemberwiseClone
+  - System.Object.ReferenceEquals(System.Object,System.Object)
+  - System.Object.ToString
+  extensionMethods:
+  - TinyLife.Goals.Goal`1.TinyLife.Utilities.Extensions.JsonCopy``1
+  nameWithType.vb: Goal(Of TInfo)
+  modifiers.csharp:
+  - public
+  - abstract
+  - class
+  modifiers.vb:
+  - Public
+  - MustInherit
+  - Class
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo)
+  name.vb: Goal(Of TInfo)
+- uid: TinyLife.Goals.Goal`1.Info
+  commentId: P:TinyLife.Goals.Goal`1.Info
+  id: Info
+  parent: TinyLife.Goals.Goal`1
+  langs:
+  - csharp
+  - vb
+  name: Info
+  nameWithType: Goal<TInfo>.Info
+  fullName: TinyLife.Goals.Goal<TInfo>.Info
+  type: Property
+  source:
+    remote:
+      path: TinyLife/Goals/Goal.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: Info
+    path: ../TinyLife/Goals/Goal.cs
+    startLine: 76
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Goals
+  summary: "\nThe underlying goal info that this goal has been constructed from\n"
+  example: []
+  syntax:
+    content: public TInfo Info { get; }
+    parameters: []
+    return:
+      type: '{TInfo}'
+    content.vb: Public ReadOnly Property Info As TInfo
+  overload: TinyLife.Goals.Goal`1.Info*
+  nameWithType.vb: Goal(Of TInfo).Info
+  modifiers.csharp:
+  - public
+  - get
+  modifiers.vb:
+  - Public
+  - ReadOnly
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Info
+- uid: TinyLife.Goals.Goal`1.#ctor(TinyLife.Goals.GoalSet,`0)
+  commentId: M:TinyLife.Goals.Goal`1.#ctor(TinyLife.Goals.GoalSet,`0)
+  id: '#ctor(TinyLife.Goals.GoalSet,`0)'
+  parent: TinyLife.Goals.Goal`1
+  langs:
+  - csharp
+  - vb
+  name: Goal(GoalSet, TInfo)
+  nameWithType: Goal<TInfo>.Goal(GoalSet, TInfo)
+  fullName: TinyLife.Goals.Goal<TInfo>.Goal(TinyLife.Goals.GoalSet, TInfo)
+  type: Constructor
+  source:
+    remote:
+      path: TinyLife/Goals/Goal.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: .ctor
+    path: ../TinyLife/Goals/Goal.cs
+    startLine: 79
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Goals
+  example: []
+  syntax:
+    content: protected Goal(GoalSet set, TInfo info)
+    parameters:
+    - id: set
+      type: TinyLife.Goals.GoalSet
+    - id: info
+      type: '{TInfo}'
+    content.vb: Protected Sub New(set As GoalSet, info As TInfo)
+  overload: TinyLife.Goals.Goal`1.#ctor*
+  nameWithType.vb: Goal(Of TInfo).Goal(GoalSet, TInfo)
+  modifiers.csharp:
+  - protected
+  modifiers.vb:
+  - Protected
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Goal(TinyLife.Goals.GoalSet, TInfo)
+references:
+- uid: TinyLife.Goals
+  commentId: N:TinyLife.Goals
+  name: TinyLife.Goals
+  nameWithType: TinyLife.Goals
+  fullName: TinyLife.Goals
+- uid: System.Object
+  commentId: T:System.Object
+  parent: System
+  isExternal: true
+  name: Object
+  nameWithType: Object
+  fullName: System.Object
+- uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
+  commentId: T:MLEM.Data.Json.JsonTypeSafeGenericDataHolder
+  parent: MLEM.Data.Json
+  isExternal: true
+  name: JsonTypeSafeGenericDataHolder
+  nameWithType: JsonTypeSafeGenericDataHolder
+  fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
+- uid: TinyLife.Goals.Goal
+  commentId: T:TinyLife.Goals.Goal
+  parent: TinyLife.Goals
+  name: Goal
+  nameWithType: Goal
+  fullName: TinyLife.Goals.Goal
+- uid: MLEM.Misc.IGenericDataHolder
+  commentId: T:MLEM.Misc.IGenericDataHolder
+  parent: MLEM.Misc
+  isExternal: true
+  name: IGenericDataHolder
+  nameWithType: IGenericDataHolder
+  fullName: MLEM.Misc.IGenericDataHolder
+- uid: TinyLife.Goals.Goal.Name
+  commentId: F:TinyLife.Goals.Goal.Name
+  parent: TinyLife.Goals.Goal
+  name: Name
+  nameWithType: Goal.Name
+  fullName: TinyLife.Goals.Goal.Name
+- uid: TinyLife.Goals.Goal.Set
+  commentId: P:TinyLife.Goals.Goal.Set
+  parent: TinyLife.Goals.Goal
+  name: Set
+  nameWithType: Goal.Set
+  fullName: TinyLife.Goals.Goal.Set
+- uid: TinyLife.Goals.Goal.GetProgress
+  commentId: M:TinyLife.Goals.Goal.GetProgress
+  parent: TinyLife.Goals.Goal
+  name: GetProgress()
+  nameWithType: Goal.GetProgress()
+  fullName: TinyLife.Goals.Goal.GetProgress()
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.GetProgress
+    name: GetProgress
+    nameWithType: Goal.GetProgress
+    fullName: TinyLife.Goals.Goal.GetProgress
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.GetProgress
+    name: GetProgress
+    nameWithType: Goal.GetProgress
+    fullName: TinyLife.Goals.Goal.GetProgress
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: TinyLife.Goals.Goal.Reset
+  commentId: M:TinyLife.Goals.Goal.Reset
+  parent: TinyLife.Goals.Goal
+  name: Reset()
+  nameWithType: Goal.Reset()
+  fullName: TinyLife.Goals.Goal.Reset()
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.Reset
+    name: Reset
+    nameWithType: Goal.Reset
+    fullName: TinyLife.Goals.Goal.Reset
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.Reset
+    name: Reset
+    nameWithType: Goal.Reset
+    fullName: TinyLife.Goals.Goal.Reset
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: TinyLife.Goals.Goal.GetDisplayedProgress
+  commentId: M:TinyLife.Goals.Goal.GetDisplayedProgress
+  parent: TinyLife.Goals.Goal
+  name: GetDisplayedProgress()
+  nameWithType: Goal.GetDisplayedProgress()
+  fullName: TinyLife.Goals.Goal.GetDisplayedProgress()
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.GetDisplayedProgress
+    name: GetDisplayedProgress
+    nameWithType: Goal.GetDisplayedProgress
+    fullName: TinyLife.Goals.Goal.GetDisplayedProgress
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.GetDisplayedProgress
+    name: GetDisplayedProgress
+    nameWithType: Goal.GetDisplayedProgress
+    fullName: TinyLife.Goals.Goal.GetDisplayedProgress
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  commentId: M:TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  parent: TinyLife.Goals.Goal
+  name: Validate(GoalSet)
+  nameWithType: Goal.Validate(GoalSet)
+  fullName: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
+  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
+  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
+  isExternal: true
+  name: SetData(String, Object)
+  nameWithType: JsonTypeSafeGenericDataHolder.SetData(String, Object)
+  fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String, System.Object)
+  spec.csharp:
+  - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
+    name: SetData
+    nameWithType: JsonTypeSafeGenericDataHolder.SetData
+    fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.String
+    name: String
+    nameWithType: String
+    fullName: System.String
+    isExternal: true
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
+    name: SetData
+    nameWithType: JsonTypeSafeGenericDataHolder.SetData
+    fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.String
+    name: String
+    nameWithType: String
+    fullName: System.String
+    isExternal: true
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
+  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
+  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
+  isExternal: true
+  name: GetData<T>(String)
+  nameWithType: JsonTypeSafeGenericDataHolder.GetData<T>(String)
+  fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData<T>(System.String)
+  nameWithType.vb: JsonTypeSafeGenericDataHolder.GetData(Of T)(String)
+  fullName.vb: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData(Of T)(System.String)
+  name.vb: GetData(Of T)(String)
+  spec.csharp:
+  - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
+    name: GetData<T>
+    nameWithType: JsonTypeSafeGenericDataHolder.GetData<T>
+    fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData<T>
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.String
+    name: String
+    nameWithType: String
+    fullName: System.String
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
+    name: GetData(Of T)
+    nameWithType: JsonTypeSafeGenericDataHolder.GetData(Of T)
+    fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData(Of T)
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.String
+    name: String
+    nameWithType: String
+    fullName: System.String
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
+  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
+  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
+  isExternal: true
+  name: GetDataKeys()
+  nameWithType: JsonTypeSafeGenericDataHolder.GetDataKeys()
+  fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys()
+  spec.csharp:
+  - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
+    name: GetDataKeys
+    nameWithType: JsonTypeSafeGenericDataHolder.GetDataKeys
+    fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
+    name: GetDataKeys
+    nameWithType: JsonTypeSafeGenericDataHolder.GetDataKeys
+    fullName: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Object.Equals(System.Object)
+  commentId: M:System.Object.Equals(System.Object)
+  parent: System.Object
+  isExternal: true
+  name: Equals(Object)
+  nameWithType: Object.Equals(Object)
+  fullName: System.Object.Equals(System.Object)
+  spec.csharp:
+  - uid: System.Object.Equals(System.Object)
+    name: Equals
+    nameWithType: Object.Equals
+    fullName: System.Object.Equals
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: System.Object.Equals(System.Object)
+    name: Equals
+    nameWithType: Object.Equals
+    fullName: System.Object.Equals
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Object.Equals(System.Object,System.Object)
+  commentId: M:System.Object.Equals(System.Object,System.Object)
+  parent: System.Object
+  isExternal: true
+  name: Equals(Object, Object)
+  nameWithType: Object.Equals(Object, Object)
+  fullName: System.Object.Equals(System.Object, System.Object)
+  spec.csharp:
+  - uid: System.Object.Equals(System.Object,System.Object)
+    name: Equals
+    nameWithType: Object.Equals
+    fullName: System.Object.Equals
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: System.Object.Equals(System.Object,System.Object)
+    name: Equals
+    nameWithType: Object.Equals
+    fullName: System.Object.Equals
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Object.GetHashCode
+  commentId: M:System.Object.GetHashCode
+  parent: System.Object
+  isExternal: true
+  name: GetHashCode()
+  nameWithType: Object.GetHashCode()
+  fullName: System.Object.GetHashCode()
+  spec.csharp:
+  - uid: System.Object.GetHashCode
+    name: GetHashCode
+    nameWithType: Object.GetHashCode
+    fullName: System.Object.GetHashCode
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: System.Object.GetHashCode
+    name: GetHashCode
+    nameWithType: Object.GetHashCode
+    fullName: System.Object.GetHashCode
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Object.GetType
+  commentId: M:System.Object.GetType
+  parent: System.Object
+  isExternal: true
+  name: GetType()
+  nameWithType: Object.GetType()
+  fullName: System.Object.GetType()
+  spec.csharp:
+  - uid: System.Object.GetType
+    name: GetType
+    nameWithType: Object.GetType
+    fullName: System.Object.GetType
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: System.Object.GetType
+    name: GetType
+    nameWithType: Object.GetType
+    fullName: System.Object.GetType
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Object.MemberwiseClone
+  commentId: M:System.Object.MemberwiseClone
+  parent: System.Object
+  isExternal: true
+  name: MemberwiseClone()
+  nameWithType: Object.MemberwiseClone()
+  fullName: System.Object.MemberwiseClone()
+  spec.csharp:
+  - uid: System.Object.MemberwiseClone
+    name: MemberwiseClone
+    nameWithType: Object.MemberwiseClone
+    fullName: System.Object.MemberwiseClone
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: System.Object.MemberwiseClone
+    name: MemberwiseClone
+    nameWithType: Object.MemberwiseClone
+    fullName: System.Object.MemberwiseClone
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Object.ReferenceEquals(System.Object,System.Object)
+  commentId: M:System.Object.ReferenceEquals(System.Object,System.Object)
+  parent: System.Object
+  isExternal: true
+  name: ReferenceEquals(Object, Object)
+  nameWithType: Object.ReferenceEquals(Object, Object)
+  fullName: System.Object.ReferenceEquals(System.Object, System.Object)
+  spec.csharp:
+  - uid: System.Object.ReferenceEquals(System.Object,System.Object)
+    name: ReferenceEquals
+    nameWithType: Object.ReferenceEquals
+    fullName: System.Object.ReferenceEquals
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: System.Object.ReferenceEquals(System.Object,System.Object)
+    name: ReferenceEquals
+    nameWithType: Object.ReferenceEquals
+    fullName: System.Object.ReferenceEquals
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - uid: System.Object
+    name: Object
+    nameWithType: Object
+    fullName: System.Object
+    isExternal: true
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Object.ToString
+  commentId: M:System.Object.ToString
+  parent: System.Object
+  isExternal: true
+  name: ToString()
+  nameWithType: Object.ToString()
+  fullName: System.Object.ToString()
+  spec.csharp:
+  - uid: System.Object.ToString
+    name: ToString
+    nameWithType: Object.ToString
+    fullName: System.Object.ToString
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: System.Object.ToString
+    name: ToString
+    nameWithType: Object.ToString
+    fullName: System.Object.ToString
+    isExternal: true
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: TinyLife.Goals.Goal`1.TinyLife.Utilities.Extensions.JsonCopy``1
+  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
+  parent: TinyLife.Utilities.Extensions
+  definition: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
+  name: JsonCopy<Goal<TInfo>>()
+  nameWithType: Extensions.JsonCopy<Goal<TInfo>>()
+  fullName: TinyLife.Utilities.Extensions.JsonCopy<TinyLife.Goals.Goal<TInfo>>()
+  nameWithType.vb: Extensions.JsonCopy(Of Goal(Of TInfo))()
+  fullName.vb: TinyLife.Utilities.Extensions.JsonCopy(Of TinyLife.Goals.Goal(Of TInfo))()
+  name.vb: JsonCopy(Of Goal(Of TInfo))()
+  spec.csharp:
+  - uid: TinyLife.Utilities.Extensions.JsonCopy``1
+    name: JsonCopy<Goal<TInfo>>
+    nameWithType: Extensions.JsonCopy<Goal<TInfo>>
+    fullName: TinyLife.Utilities.Extensions.JsonCopy<TinyLife.Goals.Goal<TInfo>>
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Utilities.Extensions.JsonCopy``1
+    name: JsonCopy(Of Goal(Of TInfo))
+    nameWithType: Extensions.JsonCopy(Of Goal(Of TInfo))
+    fullName: TinyLife.Utilities.Extensions.JsonCopy(Of TinyLife.Goals.Goal(Of TInfo))
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System
+  commentId: N:System
+  isExternal: true
+  name: System
+  nameWithType: System
+  fullName: System
+- uid: MLEM.Data.Json
+  commentId: N:MLEM.Data.Json
+  isExternal: true
+  name: MLEM.Data.Json
+  nameWithType: MLEM.Data.Json
+  fullName: MLEM.Data.Json
+- uid: MLEM.Misc
+  commentId: N:MLEM.Misc
+  isExternal: true
+  name: MLEM.Misc
+  nameWithType: MLEM.Misc
+  fullName: MLEM.Misc
+- uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
+  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
+  name: JsonCopy<T>(T)
+  nameWithType: Extensions.JsonCopy<T>(T)
+  fullName: TinyLife.Utilities.Extensions.JsonCopy<T>(T)
+  nameWithType.vb: Extensions.JsonCopy(Of T)(T)
+  fullName.vb: TinyLife.Utilities.Extensions.JsonCopy(Of T)(T)
+  name.vb: JsonCopy(Of T)(T)
+  spec.csharp:
+  - uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
+    name: JsonCopy<T>
+    nameWithType: Extensions.JsonCopy<T>
+    fullName: TinyLife.Utilities.Extensions.JsonCopy<T>
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: T
+    nameWithType: T
+    fullName: T
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
+    name: JsonCopy(Of T)
+    nameWithType: Extensions.JsonCopy(Of T)
+    fullName: TinyLife.Utilities.Extensions.JsonCopy(Of T)
+  - name: (
+    nameWithType: (
+    fullName: (
+  - name: T
+    nameWithType: T
+    fullName: T
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: TinyLife.Utilities.Extensions
+  commentId: T:TinyLife.Utilities.Extensions
+  parent: TinyLife.Utilities
+  name: Extensions
+  nameWithType: Extensions
+  fullName: TinyLife.Utilities.Extensions
+- uid: TinyLife.Utilities
+  commentId: N:TinyLife.Utilities
+  name: TinyLife.Utilities
+  nameWithType: TinyLife.Utilities
+  fullName: TinyLife.Utilities
+- uid: TinyLife.Goals.Goal.Info
+  commentId: P:TinyLife.Goals.Goal.Info
+  parent: TinyLife.Goals.Goal
+  name: Info
+  nameWithType: Goal.Info
+  fullName: TinyLife.Goals.Goal.Info
+- uid: TinyLife.Goals.Goal`1.Info*
+  commentId: Overload:TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<TInfo>.Info
+  fullName: TinyLife.Goals.Goal<TInfo>.Info
+  nameWithType.vb: Goal(Of TInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Info
+- uid: '{TInfo}'
+  commentId: '!:TInfo'
+  definition: TInfo
+  name: TInfo
+  nameWithType: TInfo
+  fullName: TInfo
+- uid: TInfo
+  name: TInfo
+  nameWithType: TInfo
+  fullName: TInfo
+- uid: TinyLife.Goals.Goal`1.#ctor*
+  commentId: Overload:TinyLife.Goals.Goal`1.#ctor
+  name: Goal
+  nameWithType: Goal<TInfo>.Goal
+  fullName: TinyLife.Goals.Goal<TInfo>.Goal
+  nameWithType.vb: Goal(Of TInfo).Goal
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Goal
+- uid: TinyLife.Goals.GoalSet
+  commentId: T:TinyLife.Goals.GoalSet
+  parent: TinyLife.Goals
+  name: GoalSet
+  nameWithType: GoalSet
+  fullName: TinyLife.Goals.GoalSet
--- a/docs/api/TinyLife.Goals.Goal.yml
+++ b/docs/api/TinyLife.Goals.Goal.yml
@ -48,7 +48,7 @@ items:
  - System.Object
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder
  derivedClasses:
-  - TinyLife.Goals.AutoTriggerGoal
+  - TinyLife.Goals.Goal`1
  - TinyLife.Goals.ManualProgressGoal
  implements:
  - MLEM.Misc.IGenericDataHolder
--- a/docs/api/TinyLife.Goals.JobType.yml
+++ b/docs/api/TinyLife.Goals.JobType.yml
@ -55,7 +55,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: JobType
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 30
+    startLine: 29
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -117,7 +117,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 38
+    startLine: 37
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -154,7 +154,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PrimarySchoolStudent
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 41
+    startLine: 40
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -189,7 +189,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Businessperson
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 53
+    startLine: 52
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -224,7 +224,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Firefighter
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 62
+    startLine: 61
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -259,7 +259,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Doctor
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 71
+    startLine: 70
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -294,7 +294,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Programmer
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 80
+    startLine: 79
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -329,7 +329,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RetailWorker
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 89
+    startLine: 88
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -364,7 +364,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Teacher
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 98
+    startLine: 97
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -399,7 +399,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Scientist
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 107
+    startLine: 106
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -434,7 +434,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 121
+    startLine: 120
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -469,7 +469,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 125
+    startLine: 124
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -504,7 +504,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HourlyPay
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 130
+    startLine: 129
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -539,7 +539,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WorkHours
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 135
+    startLine: 134
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -574,7 +574,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OffWorkDays
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 140
+    startLine: 139
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -609,7 +609,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredPromotionSkills
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 145
+    startLine: 144
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -646,7 +646,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: MaxLevel
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 149
+    startLine: 148
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -683,7 +683,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HasSpecialLocalization
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 154
+    startLine: 153
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -720,7 +720,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredAges
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 159
+    startLine: 158
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -757,7 +757,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanQuitOrBeFired
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 164
+    startLine: 163
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -794,7 +794,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DailyTasks
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 169
+    startLine: 168
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -831,7 +831,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DailyTaskImportance
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 174
+    startLine: 173
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -868,7 +868,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ChoicePrompts
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 178
+    startLine: 177
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -905,7 +905,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SourceString
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 180
+    startLine: 179
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -944,7 +944,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 190
+    startLine: 189
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -995,7 +995,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Construct
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 204
+    startLine: 203
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1037,7 +1037,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsTimeToWork
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 214
+    startLine: 213
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1078,7 +1078,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ToScheduleString
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 223
+    startLine: 222
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1118,7 +1118,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetDisplayName
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 237
+    startLine: 236
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1162,7 +1162,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetRequiredPromotionSkills
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 249
+    startLine: 248
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1203,7 +1203,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnWorkStartsInAnHour
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 264
+    startLine: 263
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1241,7 +1241,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnWorkHoursOver
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 275
+    startLine: 274
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1279,7 +1279,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnWorkFinished
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 285
+    startLine: 284
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1320,7 +1320,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnWorkStarted
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 296
+    startLine: 295
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1361,7 +1361,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnLevelChanged
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 304
+    startLine: 303
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1402,7 +1402,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnRaiseReceived
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 314
+    startLine: 313
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1440,7 +1440,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Goals/JobType.cs
-    startLine: 326
+    startLine: 325
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
--- a/docs/api/TinyLife.Goals.LifeGoal.Instance.yml
+++ b/docs/api/TinyLife.Goals.LifeGoal.Instance.yml
@ -29,7 +29,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Instance
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 193
+    startLine: 192
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -84,7 +84,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Goal
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 200
+    startLine: 199
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -129,7 +129,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CurrentGoals
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 204
+    startLine: 203
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -176,7 +176,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: StageIndex
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 211
+    startLine: 210
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -223,7 +223,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Person
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 216
+    startLine: 215
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -260,7 +260,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Stage
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 221
+    startLine: 220
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -297,7 +297,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Completed
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 225
+    startLine: 224
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -334,7 +334,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 233
+    startLine: 232
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -376,7 +376,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Update
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 243
+    startLine: 242
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -408,7 +408,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Advance
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 253
+    startLine: 252
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -440,7 +440,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Validate
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 278
+    startLine: 277
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
--- a/docs/api/TinyLife.Goals.LifeGoal.yml
+++ b/docs/api/TinyLife.Goals.LifeGoal.yml
@ -37,7 +37,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LifeGoal
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 24
+    startLine: 23
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -88,7 +88,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Goals
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 31
+    startLine: 30
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Chef
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 34
+    startLine: 33
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -160,7 +160,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SmartKid
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 46
+    startLine: 45
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -195,7 +195,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GymRat
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 58
+    startLine: 57
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -230,7 +230,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HouseholdHero
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 70
+    startLine: 69
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -265,7 +265,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ComputerAddict
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 82
+    startLine: 81
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -300,7 +300,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FriendOfEveryone
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 94
+    startLine: 93
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -335,7 +335,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Millionaire
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 104
+    startLine: 103
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -370,7 +370,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CapableCarpenter
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 116
+    startLine: 115
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -405,7 +405,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnAdvanced
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 133
+    startLine: 132
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -440,7 +440,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnCompleted
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 137
+    startLine: 136
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -475,7 +475,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 142
+    startLine: 141
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -510,7 +510,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Stages
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 146
+    startLine: 145
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -545,7 +545,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RewardPersonality
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 151
+    startLine: 150
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -580,7 +580,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AllowedAges
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 156
+    startLine: 155
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -617,7 +617,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 164
+    startLine: 163
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -662,7 +662,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsCompleted
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 175
+    startLine: 174
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -701,7 +701,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Goals/LifeGoal.cs
-    startLine: 184
+    startLine: 183
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
--- a/docs/api/TinyLife.Goals.Memory.yml
+++ b/docs/api/TinyLife.Goals.Memory.yml
@ -25,7 +25,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Memory
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 85
+    startLine: 87
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -88,7 +88,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Type
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 92
+    startLine: 94
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -133,7 +133,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TimeOccured
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 97
+    startLine: 99
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -178,7 +178,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Person
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 102
+    startLine: 104
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -215,7 +215,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TimeSinceOccured
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 106
+    startLine: 108
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -252,7 +252,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 115
+    startLine: 117
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -294,7 +294,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Validate
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 127
+    startLine: 129
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
--- a/docs/api/TinyLife.Goals.MemoryType.yml
+++ b/docs/api/TinyLife.Goals.MemoryType.yml
@ -8,15 +8,14 @@ items:
  - TinyLife.Goals.MemoryType.#ctor(System.String)
  - TinyLife.Goals.MemoryType.Construct(TinyLife.Objects.Person,System.Nullable{System.TimeSpan})
  - TinyLife.Goals.MemoryType.ConstructedType
-  - TinyLife.Goals.MemoryType.CreativeAction
  - TinyLife.Goals.MemoryType.FamilySocial
-  - TinyLife.Goals.MemoryType.LogicalAction
  - TinyLife.Goals.MemoryType.Name
  - TinyLife.Goals.MemoryType.PromotionOrRaise
  - TinyLife.Goals.MemoryType.PublishFailure
  - TinyLife.Goals.MemoryType.Register(TinyLife.Goals.MemoryType)
  - TinyLife.Goals.MemoryType.SocialAction
  - TinyLife.Goals.MemoryType.Types
+  - TinyLife.Goals.MemoryType.UsedSkillCategory
  langs:
  - csharp
  - vb
@ -31,7 +30,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: MemoryType
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 16
+    startLine: 18
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -82,7 +81,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 23
+    startLine: 25
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -119,7 +118,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PublishFailure
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 26
+    startLine: 28
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -136,41 +135,6 @@ items:
  - Public
  - Shared
  - ReadOnly
- uid: TinyLife.Goals.MemoryType.LogicalAction
-  commentId: F:TinyLife.Goals.MemoryType.LogicalAction
-  id: LogicalAction
-  parent: TinyLife.Goals.MemoryType
-  langs:
-  - csharp
-  - vb
-  name: LogicalAction
-  nameWithType: MemoryType.LogicalAction
-  fullName: TinyLife.Goals.MemoryType.LogicalAction
-  type: Field
-  source:
-    remote:
-      path: TinyLife/Goals/Memory.cs
-      branch: main
-      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: LogicalAction
-    path: ../TinyLife/Goals/Memory.cs
-    startLine: 27
-  assemblies:
-  - Tiny Life
-  namespace: TinyLife.Goals
-  syntax:
-    content: public static readonly MemoryType LogicalAction
-    return:
-      type: TinyLife.Goals.MemoryType
-    content.vb: Public Shared ReadOnly LogicalAction As MemoryType
-  modifiers.csharp:
-  - public
-  - static
-  - readonly
-  modifiers.vb:
-  - Public
-  - Shared
-  - ReadOnly
 - uid: TinyLife.Goals.MemoryType.SocialAction
  commentId: F:TinyLife.Goals.MemoryType.SocialAction
  id: SocialAction
@ -189,7 +153,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SocialAction
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 28
+    startLine: 29
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -224,7 +188,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PromotionOrRaise
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 29
+    startLine: 30
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -241,41 +205,6 @@ items:
  - Public
  - Shared
  - ReadOnly
- uid: TinyLife.Goals.MemoryType.CreativeAction
-  commentId: F:TinyLife.Goals.MemoryType.CreativeAction
-  id: CreativeAction
-  parent: TinyLife.Goals.MemoryType
-  langs:
-  - csharp
-  - vb
-  name: CreativeAction
-  nameWithType: MemoryType.CreativeAction
-  fullName: TinyLife.Goals.MemoryType.CreativeAction
-  type: Field
-  source:
-    remote:
-      path: TinyLife/Goals/Memory.cs
-      branch: main
-      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: CreativeAction
-    path: ../TinyLife/Goals/Memory.cs
-    startLine: 30
-  assemblies:
-  - Tiny Life
-  namespace: TinyLife.Goals
-  syntax:
-    content: public static readonly MemoryType CreativeAction
-    return:
-      type: TinyLife.Goals.MemoryType
-    content.vb: Public Shared ReadOnly CreativeAction As MemoryType
-  modifiers.csharp:
-  - public
-  - static
-  - readonly
-  modifiers.vb:
-  - Public
-  - Shared
-  - ReadOnly
 - uid: TinyLife.Goals.MemoryType.FamilySocial
  commentId: F:TinyLife.Goals.MemoryType.FamilySocial
  id: FamilySocial
@ -311,6 +240,41 @@ items:
  - Public
  - Shared
  - ReadOnly
+- uid: TinyLife.Goals.MemoryType.UsedSkillCategory
+  commentId: F:TinyLife.Goals.MemoryType.UsedSkillCategory
+  id: UsedSkillCategory
+  parent: TinyLife.Goals.MemoryType
+  langs:
+  - csharp
+  - vb
+  name: UsedSkillCategory
+  nameWithType: MemoryType.UsedSkillCategory
+  fullName: TinyLife.Goals.MemoryType.UsedSkillCategory
+  type: Field
+  source:
+    remote:
+      path: TinyLife/Goals/Memory.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: UsedSkillCategory
+    path: ../TinyLife/Goals/Memory.cs
+    startLine: 32
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Goals
+  syntax:
+    content: public static readonly Dictionary<SkillCategory, MemoryType> UsedSkillCategory
+    return:
+      type: System.Collections.Generic.Dictionary{TinyLife.Skills.SkillCategory,TinyLife.Goals.MemoryType}
+    content.vb: Public Shared ReadOnly UsedSkillCategory As Dictionary(Of SkillCategory, MemoryType)
+  modifiers.csharp:
+  - public
+  - static
+  - readonly
+  modifiers.vb:
+  - Public
+  - Shared
+  - ReadOnly
 - uid: TinyLife.Goals.MemoryType.Name
  commentId: F:TinyLife.Goals.MemoryType.Name
  id: Name
@ -329,7 +293,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 37
+    startLine: 39
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -364,7 +328,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ConstructedType
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 41
+    startLine: 43
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -401,7 +365,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 47
+    startLine: 49
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -437,7 +401,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Construct
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 58
+    startLine: 60
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -486,7 +450,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Goals/Memory.cs
-    startLine: 73
+    startLine: 75
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
@ -1013,6 +977,119 @@ references:
  name: MemoryType
  nameWithType: MemoryType
  fullName: TinyLife.Goals.MemoryType
+- uid: System.Collections.Generic.Dictionary{TinyLife.Skills.SkillCategory,TinyLife.Goals.MemoryType}
+  commentId: T:System.Collections.Generic.Dictionary{TinyLife.Skills.SkillCategory,TinyLife.Goals.MemoryType}
+  parent: System.Collections.Generic
+  definition: System.Collections.Generic.Dictionary`2
+  name: Dictionary<SkillCategory, MemoryType>
+  nameWithType: Dictionary<SkillCategory, MemoryType>
+  fullName: System.Collections.Generic.Dictionary<TinyLife.Skills.SkillCategory, TinyLife.Goals.MemoryType>
+  nameWithType.vb: Dictionary(Of SkillCategory, MemoryType)
+  fullName.vb: System.Collections.Generic.Dictionary(Of TinyLife.Skills.SkillCategory, TinyLife.Goals.MemoryType)
+  name.vb: Dictionary(Of SkillCategory, MemoryType)
+  spec.csharp:
+  - uid: System.Collections.Generic.Dictionary`2
+    name: Dictionary
+    nameWithType: Dictionary
+    fullName: System.Collections.Generic.Dictionary
+    isExternal: true
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Skills.SkillCategory
+    name: SkillCategory
+    nameWithType: SkillCategory
+    fullName: TinyLife.Skills.SkillCategory
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - uid: TinyLife.Goals.MemoryType
+    name: MemoryType
+    nameWithType: MemoryType
+    fullName: TinyLife.Goals.MemoryType
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: System.Collections.Generic.Dictionary`2
+    name: Dictionary
+    nameWithType: Dictionary
+    fullName: System.Collections.Generic.Dictionary
+    isExternal: true
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Skills.SkillCategory
+    name: SkillCategory
+    nameWithType: SkillCategory
+    fullName: TinyLife.Skills.SkillCategory
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - uid: TinyLife.Goals.MemoryType
+    name: MemoryType
+    nameWithType: MemoryType
+    fullName: TinyLife.Goals.MemoryType
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Collections.Generic.Dictionary`2
+  commentId: T:System.Collections.Generic.Dictionary`2
+  isExternal: true
+  name: Dictionary<TKey, TValue>
+  nameWithType: Dictionary<TKey, TValue>
+  fullName: System.Collections.Generic.Dictionary<TKey, TValue>
+  nameWithType.vb: Dictionary(Of TKey, TValue)
+  fullName.vb: System.Collections.Generic.Dictionary(Of TKey, TValue)
+  name.vb: Dictionary(Of TKey, TValue)
+  spec.csharp:
+  - uid: System.Collections.Generic.Dictionary`2
+    name: Dictionary
+    nameWithType: Dictionary
+    fullName: System.Collections.Generic.Dictionary
+    isExternal: true
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TKey
+    nameWithType: TKey
+    fullName: TKey
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: System.Collections.Generic.Dictionary`2
+    name: Dictionary
+    nameWithType: Dictionary
+    fullName: System.Collections.Generic.Dictionary
+    isExternal: true
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TKey
+    nameWithType: TKey
+    fullName: TKey
+  - name: ', '
+    nameWithType: ', '
+    fullName: ', '
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Collections.Generic
+  commentId: N:System.Collections.Generic
+  isExternal: true
+  name: System.Collections.Generic
+  nameWithType: System.Collections.Generic
+  fullName: System.Collections.Generic
 - uid: System.String
  commentId: T:System.String
  parent: System
--- a/docs/api/TinyLife.Goals.Project.yml
+++ b/docs/api/TinyLife.Goals.Project.yml
@ -740,7 +740,7 @@ items:
  assemblies:
  - Tiny Life
  namespace: TinyLife.Goals
-  summary: "\nCreates a set of action settings (which can be registered using <xref href=\"TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable%7bTinyLife.Actions.ActionType.TypeSettings%7d)\" data-throw-if-not-resolved=\"false\"></xref>) that involve creating, continuing and scrapping projects of a specified type.\nIt is recommended to use the provided non-default constructor of <xref href=\"TinyLife.Goals.Project.ActionSettings\" data-throw-if-not-resolved=\"false\"></xref> for this method.\n"
+  summary: "\nCreates a set of action settings (which can be registered using <xref href=\"TinyLife.Actions.ActionType.Register(TinyLife.Actions.ActionType.TypeSettings)\" data-throw-if-not-resolved=\"false\"></xref>) that involve creating, continuing and scrapping projects of a specified type.\nIt is recommended to use the provided non-default constructor of <xref href=\"TinyLife.Goals.Project.ActionSettings\" data-throw-if-not-resolved=\"false\"></xref> for this method.\n"
  example: []
  syntax:
    content: public static IEnumerable<ActionType.TypeSettings> CreateActions(Project.ActionSettings settings)
@ -1783,8 +1783,8 @@ references:
  name: SetDailyPay
  nameWithType: Project.SetDailyPay
  fullName: TinyLife.Goals.Project.SetDailyPay
- uid: TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings})
-  commentId: M:TinyLife.Actions.ActionType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Actions.ActionType.TypeSettings})
+- uid: TinyLife.Actions.ActionType.Register(TinyLife.Actions.ActionType.TypeSettings)
+  commentId: M:TinyLife.Actions.ActionType.Register(TinyLife.Actions.ActionType.TypeSettings)
  isExternal: true
 - uid: TinyLife.Goals.Project.ActionSettings
  commentId: T:TinyLife.Goals.Project.ActionSettings
--- a/docs/api/TinyLife.Goals.TimedGoal.yml
+++ b/docs/api/TinyLife.Goals.TimedGoal.yml
@ -40,6 +40,7 @@ items:
  - System.Object
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder
  - TinyLife.Goals.Goal
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
  - TinyLife.Goals.AutoTriggerGoal
  - TinyLife.Goals.AutoTriggerGoal{System.TimeSpan}
  implements:
@ -47,11 +48,10 @@ items:
  inheritedMembers:
  - TinyLife.Goals.AutoTriggerGoal{System.TimeSpan}.Trigger(System.Object)
  - TinyLife.Goals.AutoTriggerGoal{System.TimeSpan}.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
-  - TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  - TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
+  - TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
  - TinyLife.Goals.Goal.Name
  - TinyLife.Goals.Goal.Set
-  - TinyLife.Goals.Goal.Info
+  - TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetData``1(System.String)
  - MLEM.Data.Json.JsonTypeSafeGenericDataHolder.GetDataKeys
@ -290,6 +290,46 @@ references:
  name: Goal
  nameWithType: Goal
  fullName: TinyLife.Goals.Goal
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  commentId: T:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  parent: TinyLife.Goals
+  definition: TinyLife.Goals.Goal`1
+  name: Goal<AutoGoalInfo>
+  nameWithType: Goal<AutoGoalInfo>
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>
+  nameWithType.vb: Goal(Of AutoGoalInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo)
+  name.vb: Goal(Of AutoGoalInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - uid: TinyLife.Goals.AutoGoalInfo
+    name: AutoGoalInfo
+    nameWithType: AutoGoalInfo
+    fullName: TinyLife.Goals.AutoGoalInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.AutoTriggerGoal
  commentId: T:TinyLife.Goals.AutoTriggerGoal
  parent: TinyLife.Goals
@ -457,48 +497,15 @@ references:
  - name: )
    nameWithType: )
    fullName: )
- uid: TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  commentId: P:TinyLife.Goals.AutoTriggerGoal.AutoInfo
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: AutoInfo
-  nameWithType: AutoTriggerGoal.AutoInfo
-  fullName: TinyLife.Goals.AutoTriggerGoal.AutoInfo
- uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  commentId: M:TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  parent: TinyLife.Goals.AutoTriggerGoal
-  name: Validate(GoalSet)
-  nameWithType: AutoTriggerGoal.Validate(GoalSet)
-  fullName: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-  spec.csharp:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
-  spec.vb:
-  - uid: TinyLife.Goals.AutoTriggerGoal.Validate(TinyLife.Goals.GoalSet)
-    name: Validate
-    nameWithType: AutoTriggerGoal.Validate
-    fullName: TinyLife.Goals.AutoTriggerGoal.Validate
-  - name: (
-    nameWithType: (
-    fullName: (
-  - uid: TinyLife.Goals.GoalSet
-    name: GoalSet
-    nameWithType: GoalSet
-    fullName: TinyLife.Goals.GoalSet
-  - name: )
-    nameWithType: )
-    fullName: )
+- uid: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  commentId: P:TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}.Info
+  parent: TinyLife.Goals.Goal{TinyLife.Goals.AutoGoalInfo}
+  definition: TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<AutoGoalInfo>.Info
+  fullName: TinyLife.Goals.Goal<TinyLife.Goals.AutoGoalInfo>.Info
+  nameWithType.vb: Goal(Of AutoGoalInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TinyLife.Goals.AutoGoalInfo).Info
 - uid: TinyLife.Goals.Goal.Name
  commentId: F:TinyLife.Goals.Goal.Name
  parent: TinyLife.Goals.Goal
@ -511,12 +518,42 @@ references:
  name: Set
  nameWithType: Goal.Set
  fullName: TinyLife.Goals.Goal.Set
- uid: TinyLife.Goals.Goal.Info
-  commentId: P:TinyLife.Goals.Goal.Info
+- uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  commentId: M:TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
  parent: TinyLife.Goals.Goal
-  name: Info
-  nameWithType: Goal.Info
-  fullName: TinyLife.Goals.Goal.Info
+  name: Validate(GoalSet)
+  nameWithType: Goal.Validate(GoalSet)
+  fullName: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
+  spec.vb:
+  - uid: TinyLife.Goals.Goal.Validate(TinyLife.Goals.GoalSet)
+    name: Validate
+    nameWithType: Goal.Validate
+    fullName: TinyLife.Goals.Goal.Validate
+  - name: (
+    nameWithType: (
+    fullName: (
+  - uid: TinyLife.Goals.GoalSet
+    name: GoalSet
+    nameWithType: GoalSet
+    fullName: TinyLife.Goals.GoalSet
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  commentId: M:MLEM.Data.Json.JsonTypeSafeGenericDataHolder.SetData(System.String,System.Object)
  parent: MLEM.Data.Json.JsonTypeSafeGenericDataHolder
@ -972,14 +1009,50 @@ references:
  name: MLEM.Data.Json
  nameWithType: MLEM.Data.Json
  fullName: MLEM.Data.Json
+- uid: TinyLife.Goals.Goal`1
+  commentId: T:TinyLife.Goals.Goal`1
+  name: Goal<TInfo>
+  nameWithType: Goal<TInfo>
+  fullName: TinyLife.Goals.Goal<TInfo>
+  nameWithType.vb: Goal(Of TInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo)
+  name.vb: Goal(Of TInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.AutoTriggerGoal`1
  commentId: T:TinyLife.Goals.AutoTriggerGoal`1
-  name: AutoTriggerGoal<T>
-  nameWithType: AutoTriggerGoal<T>
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>
-  nameWithType.vb: AutoTriggerGoal(Of T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T)
-  name.vb: AutoTriggerGoal(Of T)
+  name: AutoTriggerGoal<TValue>
+  nameWithType: AutoTriggerGoal<TValue>
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>
+  nameWithType.vb: AutoTriggerGoal(Of TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue)
+  name.vb: AutoTriggerGoal(Of TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1
    name: AutoTriggerGoal
@ -988,9 +1061,9 @@ references:
  - name: <
    nameWithType: <
    fullName: <
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: '>'
    nameWithType: '>'
    fullName: '>'
@ -1002,9 +1075,9 @@ references:
  - name: '(Of '
    nameWithType: '(Of '
    fullName: '(Of '
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
@ -1018,15 +1091,15 @@ references:
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
  isExternal: true
  name: Trigger(Object)
-  nameWithType: AutoTriggerGoal<T>.Trigger(Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(System.Object)
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(Object)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(System.Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(System.Object)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
    name: Trigger
-    nameWithType: AutoTriggerGoal<T>.Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
+    nameWithType: AutoTriggerGoal<TValue>.Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
  - name: (
    nameWithType: (
    fullName: (
@ -1041,8 +1114,8 @@ references:
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(System.Object)
    name: Trigger
-    nameWithType: AutoTriggerGoal(Of T).Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
+    nameWithType: AutoTriggerGoal(Of TValue).Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
  - name: (
    nameWithType: (
    fullName: (
@ -1058,15 +1131,15 @@ references:
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
  isExternal: true
  name: CanTrigger(Object, GoalTrigger, Object)
-  nameWithType: AutoTriggerGoal<T>.CanTrigger(Object, GoalTrigger, Object)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
-  nameWithType.vb: AutoTriggerGoal(Of T).CanTrigger(Object, GoalTrigger, Object)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
+  nameWithType: AutoTriggerGoal<TValue>.CanTrigger(Object, GoalTrigger, Object)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).CanTrigger(Object, GoalTrigger, Object)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).CanTrigger(System.Object, TinyLife.Goals.GoalTrigger, System.Object)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
    name: CanTrigger
-    nameWithType: AutoTriggerGoal<T>.CanTrigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.CanTrigger
+    nameWithType: AutoTriggerGoal<TValue>.CanTrigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.CanTrigger
  - name: (
    nameWithType: (
    fullName: (
@ -1096,8 +1169,8 @@ references:
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.CanTrigger(System.Object,TinyLife.Goals.GoalTrigger,System.Object)
    name: CanTrigger
-    nameWithType: AutoTriggerGoal(Of T).CanTrigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).CanTrigger
+    nameWithType: AutoTriggerGoal(Of TValue).CanTrigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).CanTrigger
  - name: (
    nameWithType: (
    fullName: (
@ -1124,6 +1197,13 @@ references:
  - name: )
    nameWithType: )
    fullName: )
+- uid: TinyLife.Goals.Goal`1.Info
+  commentId: P:TinyLife.Goals.Goal`1.Info
+  name: Info
+  nameWithType: Goal<TInfo>.Info
+  fullName: TinyLife.Goals.Goal<TInfo>.Info
+  nameWithType.vb: Goal(Of TInfo).Info
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo).Info
 - uid: TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  commentId: M:TinyLife.Utilities.Extensions.JsonCopy``1(``0)
  name: JsonCopy<T>(T)
@ -1350,36 +1430,36 @@ references:
  fullName: System.TimeSpan
 - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
  commentId: M:TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
-  name: Trigger(T)
-  nameWithType: AutoTriggerGoal<T>.Trigger(T)
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger(T)
-  nameWithType.vb: AutoTriggerGoal(Of T).Trigger(T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger(T)
+  name: Trigger(TValue)
+  nameWithType: AutoTriggerGoal<TValue>.Trigger(TValue)
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger(TValue)
+  nameWithType.vb: AutoTriggerGoal(Of TValue).Trigger(TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger(TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
    name: Trigger
-    nameWithType: AutoTriggerGoal<T>.Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal<T>.Trigger
+    nameWithType: AutoTriggerGoal<TValue>.Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal<TValue>.Trigger
  - name: (
    nameWithType: (
    fullName: (
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
  spec.vb:
  - uid: TinyLife.Goals.AutoTriggerGoal`1.Trigger(`0)
    name: Trigger
-    nameWithType: AutoTriggerGoal(Of T).Trigger
-    fullName: TinyLife.Goals.AutoTriggerGoal(Of T).Trigger
+    nameWithType: AutoTriggerGoal(Of TValue).Trigger
+    fullName: TinyLife.Goals.AutoTriggerGoal(Of TValue).Trigger
  - name: (
    nameWithType: (
    fullName: (
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
--- a/docs/api/TinyLife.Goals.yml
+++ b/docs/api/TinyLife.Goals.yml
@ -14,6 +14,7 @@ items:
  - TinyLife.Goals.ConditionedGoal
  - TinyLife.Goals.DistinctGoal
  - TinyLife.Goals.Goal
+  - TinyLife.Goals.Goal`1
  - TinyLife.Goals.GoalInfo
  - TinyLife.Goals.GoalSet
  - TinyLife.Goals.GoalSetInfo
@ -64,12 +65,12 @@ references:
  fullName: TinyLife.Goals.AutoTriggerGoal
 - uid: TinyLife.Goals.AutoTriggerGoal`1
  commentId: T:TinyLife.Goals.AutoTriggerGoal`1
-  name: AutoTriggerGoal<T>
-  nameWithType: AutoTriggerGoal<T>
-  fullName: TinyLife.Goals.AutoTriggerGoal<T>
-  nameWithType.vb: AutoTriggerGoal(Of T)
-  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of T)
-  name.vb: AutoTriggerGoal(Of T)
+  name: AutoTriggerGoal<TValue>
+  nameWithType: AutoTriggerGoal<TValue>
+  fullName: TinyLife.Goals.AutoTriggerGoal<TValue>
+  nameWithType.vb: AutoTriggerGoal(Of TValue)
+  fullName.vb: TinyLife.Goals.AutoTriggerGoal(Of TValue)
+  name.vb: AutoTriggerGoal(Of TValue)
  spec.csharp:
  - uid: TinyLife.Goals.AutoTriggerGoal`1
    name: AutoTriggerGoal
@ -78,9 +79,9 @@ references:
  - name: <
    nameWithType: <
    fullName: <
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: '>'
    nameWithType: '>'
    fullName: '>'
@ -92,9 +93,9 @@ references:
  - name: '(Of '
    nameWithType: '(Of '
    fullName: '(Of '
-  - name: T
-    nameWithType: T
-    fullName: T
+  - name: TValue
+    nameWithType: TValue
+    fullName: TValue
  - name: )
    nameWithType: )
    fullName: )
@ -114,6 +115,42 @@ references:
  name: Goal
  nameWithType: Goal
  fullName: TinyLife.Goals.Goal
+- uid: TinyLife.Goals.Goal`1
+  commentId: T:TinyLife.Goals.Goal`1
+  name: Goal<TInfo>
+  nameWithType: Goal<TInfo>
+  fullName: TinyLife.Goals.Goal<TInfo>
+  nameWithType.vb: Goal(Of TInfo)
+  fullName.vb: TinyLife.Goals.Goal(Of TInfo)
+  name.vb: Goal(Of TInfo)
+  spec.csharp:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal
+    nameWithType: Goal
+    fullName: TinyLife.Goals.Goal
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TInfo
+    nameWithType: TInfo
+    fullName: TInfo
+  - name: )
+    nameWithType: )
+    fullName: )
 - uid: TinyLife.Goals.GoalInfo
  commentId: T:TinyLife.Goals.GoalInfo
  parent: TinyLife.Goals
--- a/docs/api/TinyLife.Mods.Mod.yml
+++ b/docs/api/TinyLife.Mods.Mod.yml
@ -11,6 +11,7 @@ items:
  - TinyLife.Mods.Mod.Icon
  - TinyLife.Mods.Mod.Initialize(ExtremelySimpleLogger.Logger,MLEM.Data.Content.RawContentManager,MLEM.Data.RuntimeTexturePacker,TinyLife.Mods.ModInfo)
  - TinyLife.Mods.Mod.Name
+  - TinyLife.Mods.Mod.PopulateOptions(MLEM.Ui.Elements.Group,TinyLife.Mods.ModInfo)
  langs:
  - csharp
  - vb
@ -299,6 +300,47 @@ items:
  modifiers.vb:
  - Public
  - Overridable
+- uid: TinyLife.Mods.Mod.PopulateOptions(MLEM.Ui.Elements.Group,TinyLife.Mods.ModInfo)
+  commentId: M:TinyLife.Mods.Mod.PopulateOptions(MLEM.Ui.Elements.Group,TinyLife.Mods.ModInfo)
+  id: PopulateOptions(MLEM.Ui.Elements.Group,TinyLife.Mods.ModInfo)
+  parent: TinyLife.Mods.Mod
+  langs:
+  - csharp
+  - vb
+  name: PopulateOptions(Group, ModInfo)
+  nameWithType: Mod.PopulateOptions(Group, ModInfo)
+  fullName: TinyLife.Mods.Mod.PopulateOptions(MLEM.Ui.Elements.Group, TinyLife.Mods.ModInfo)
+  type: Method
+  source:
+    remote:
+      path: TinyLife/Mods/Mod.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: PopulateOptions
+    path: ../TinyLife/Mods/Mod.cs
+    startLine: 74
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Mods
+  summary: "\nPopulates this mod&apos;s options section, which can be found in the Mods section of the game&apos;s main and in-game menus.\nIf any elements are added to the <code data-dev-comment-type=\"paramref\" class=\"paramref\">group</code> provided, a button will display next to this mod to open its options.\nThis mod can create, add, and load custom options using <xref href=\"TinyLife.Mods.ModInfo.LoadOptions%60%601(System.Func%7b%60%600%7d)\" data-throw-if-not-resolved=\"false\"></xref> and <xref href=\"TinyLife.Mods.ModInfo.SaveOptions%60%601(%60%600)\" data-throw-if-not-resolved=\"false\"></xref>.\n"
+  example: []
+  syntax:
+    content: public virtual void PopulateOptions(Group group, ModInfo info)
+    parameters:
+    - id: group
+      type: MLEM.Ui.Elements.Group
+      description: The group to add options to.
+    - id: info
+      type: TinyLife.Mods.ModInfo
+      description: The game&apos;s mod info.
+    content.vb: Public Overridable Sub PopulateOptions(group As Group, info As ModInfo)
+  overload: TinyLife.Mods.Mod.PopulateOptions*
+  modifiers.csharp:
+  - public
+  - virtual
+  modifiers.vb:
+  - Public
+  - Overridable
 references:
 - uid: TinyLife.Mods.Mod
  commentId: T:TinyLife.Mods.Mod
@ -915,3 +957,27 @@ references:
  name: System.Collections.Generic
  nameWithType: System.Collections.Generic
  fullName: System.Collections.Generic
+- uid: TinyLife.Mods.ModInfo.LoadOptions``1(System.Func{``0})
+  commentId: M:TinyLife.Mods.ModInfo.LoadOptions``1(System.Func{``0})
+  isExternal: true
+- uid: TinyLife.Mods.ModInfo.SaveOptions``1(``0)
+  commentId: M:TinyLife.Mods.ModInfo.SaveOptions``1(``0)
+  isExternal: true
+- uid: TinyLife.Mods.Mod.PopulateOptions*
+  commentId: Overload:TinyLife.Mods.Mod.PopulateOptions
+  name: PopulateOptions
+  nameWithType: Mod.PopulateOptions
+  fullName: TinyLife.Mods.Mod.PopulateOptions
+- uid: MLEM.Ui.Elements.Group
+  commentId: T:MLEM.Ui.Elements.Group
+  parent: MLEM.Ui.Elements
+  isExternal: true
+  name: Group
+  nameWithType: Group
+  fullName: MLEM.Ui.Elements.Group
+- uid: MLEM.Ui.Elements
+  commentId: N:MLEM.Ui.Elements
+  isExternal: true
+  name: MLEM.Ui.Elements
+  nameWithType: MLEM.Ui.Elements
+  fullName: MLEM.Ui.Elements
--- a/docs/api/TinyLife.Mods.ModInfo.yml
+++ b/docs/api/TinyLife.Mods.ModInfo.yml
@ -10,8 +10,11 @@ items:
  - TinyLife.Mods.ModInfo.Finalize
  - TinyLife.Mods.ModInfo.Harmony
  - TinyLife.Mods.ModInfo.Id
+  - TinyLife.Mods.ModInfo.LoadOptions``1(System.Func{``0})
  - TinyLife.Mods.ModInfo.Logger
  - TinyLife.Mods.ModInfo.Mod
+  - TinyLife.Mods.ModInfo.OptionsFile
+  - TinyLife.Mods.ModInfo.SaveOptions``1(``0)
  - TinyLife.Mods.ModInfo.ToString
  langs:
  - csharp
@ -27,7 +30,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ModInfo
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 138
+    startLine: 146
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -75,7 +78,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Id
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 143
+    startLine: 151
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -110,7 +113,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Mod
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 147
+    startLine: 155
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -145,7 +148,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Logger
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 152
+    startLine: 160
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -180,7 +183,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Content
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 157
+    startLine: 165
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -215,7 +218,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Harmony
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 161
+    startLine: 169
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -232,6 +235,41 @@ items:
  modifiers.vb:
  - Public
  - ReadOnly
+- uid: TinyLife.Mods.ModInfo.OptionsFile
+  commentId: F:TinyLife.Mods.ModInfo.OptionsFile
+  id: OptionsFile
+  parent: TinyLife.Mods.ModInfo
+  langs:
+  - csharp
+  - vb
+  name: OptionsFile
+  nameWithType: ModInfo.OptionsFile
+  fullName: TinyLife.Mods.ModInfo.OptionsFile
+  type: Field
+  source:
+    remote:
+      path: TinyLife/Mods/ModLoader.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: OptionsFile
+    path: ../TinyLife/Mods/ModLoader.cs
+    startLine: 173
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Mods
+  summary: "\nThe options file for this mod. This is used in <xref href=\"TinyLife.Mods.ModInfo.LoadOptions%60%601(System.Func%7b%60%600%7d)\" data-throw-if-not-resolved=\"false\"></xref> and <xref href=\"TinyLife.Mods.ModInfo.SaveOptions%60%601(%60%600)\" data-throw-if-not-resolved=\"false\"></xref>.\n"
+  example: []
+  syntax:
+    content: public readonly FileInfo OptionsFile
+    return:
+      type: System.IO.FileInfo
+    content.vb: Public ReadOnly OptionsFile As FileInfo
+  modifiers.csharp:
+  - public
+  - readonly
+  modifiers.vb:
+  - Public
+  - ReadOnly
 - uid: TinyLife.Mods.ModInfo.Finalize
  commentId: M:TinyLife.Mods.ModInfo.Finalize
  id: Finalize
@ -250,7 +288,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Finalize
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 174
+    startLine: 188
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -281,7 +319,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Dispose
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 179
+    startLine: 193
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -314,7 +352,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ToString
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 186
+    startLine: 200
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -332,6 +370,93 @@ items:
  modifiers.vb:
  - Public
  - Overrides
+- uid: TinyLife.Mods.ModInfo.SaveOptions``1(``0)
+  commentId: M:TinyLife.Mods.ModInfo.SaveOptions``1(``0)
+  id: SaveOptions``1(``0)
+  parent: TinyLife.Mods.ModInfo
+  langs:
+  - csharp
+  - vb
+  name: SaveOptions<T>(T)
+  nameWithType: ModInfo.SaveOptions<T>(T)
+  fullName: TinyLife.Mods.ModInfo.SaveOptions<T>(T)
+  type: Method
+  source:
+    remote:
+      path: TinyLife/Mods/ModLoader.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: SaveOptions
+    path: ../TinyLife/Mods/ModLoader.cs
+    startLine: 215
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Mods
+  summary: "\nSaves the given options into this mod&apos;s <xref href=\"TinyLife.Mods.ModInfo.OptionsFile\" data-throw-if-not-resolved=\"false\"></xref>.\nTo save custom options, you can create a custom class, each of whose members will be saved by this method.\nThis method uses a <xref href=\"TinyLife.SaveHandler.CreateSerializer(System.EventHandler%7bNewtonsoft.Json.Serialization.ErrorEventArgs%7d)\" data-throw-if-not-resolved=\"false\"></xref> JSON serializer, so using <xref href=\"System.Runtime.Serialization.DataContractAttribute\" data-throw-if-not-resolved=\"false\"></xref> and <xref href=\"System.Runtime.Serialization.DataMemberAttribute\" data-throw-if-not-resolved=\"false\"></xref> attributes is supported.\n"
+  example: []
+  syntax:
+    content: public void SaveOptions<T>(T options)
+    parameters:
+    - id: options
+      type: '{T}'
+      description: The options to save.
+    typeParameters:
+    - id: T
+      description: The type of the options to save.
+    content.vb: Public Sub SaveOptions(Of T)(options As T)
+  overload: TinyLife.Mods.ModInfo.SaveOptions*
+  nameWithType.vb: ModInfo.SaveOptions(Of T)(T)
+  modifiers.csharp:
+  - public
+  modifiers.vb:
+  - Public
+  fullName.vb: TinyLife.Mods.ModInfo.SaveOptions(Of T)(T)
+  name.vb: SaveOptions(Of T)(T)
+- uid: TinyLife.Mods.ModInfo.LoadOptions``1(System.Func{``0})
+  commentId: M:TinyLife.Mods.ModInfo.LoadOptions``1(System.Func{``0})
+  id: LoadOptions``1(System.Func{``0})
+  parent: TinyLife.Mods.ModInfo
+  langs:
+  - csharp
+  - vb
+  name: LoadOptions<T>(Func<T>)
+  nameWithType: ModInfo.LoadOptions<T>(Func<T>)
+  fullName: TinyLife.Mods.ModInfo.LoadOptions<T>(System.Func<T>)
+  type: Method
+  source:
+    remote:
+      path: TinyLife/Mods/ModLoader.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: LoadOptions
+    path: ../TinyLife/Mods/ModLoader.cs
+    startLine: 234
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Mods
+  summary: "\nLoads options of the given type from this mod&apos;s <xref href=\"TinyLife.Mods.ModInfo.OptionsFile\" data-throw-if-not-resolved=\"false\"></xref>.\nTo load custom options, you can create a custom class, each of whose members will be loaded by this method.\nThis method uses a <xref href=\"TinyLife.SaveHandler.CreateSerializer(System.EventHandler%7bNewtonsoft.Json.Serialization.ErrorEventArgs%7d)\" data-throw-if-not-resolved=\"false\"></xref> JSON serializer, so using <xref href=\"System.Runtime.Serialization.DataContractAttribute\" data-throw-if-not-resolved=\"false\"></xref> and <xref href=\"System.Runtime.Serialization.DataMemberAttribute\" data-throw-if-not-resolved=\"false\"></xref> attributes is supported.\n"
+  example: []
+  syntax:
+    content: public T LoadOptions<T>(Func<T> createDefaultInstance)
+    parameters:
+    - id: createDefaultInstance
+      type: System.Func{{T}}
+      description: ''
+    typeParameters:
+    - id: T
+      description: ''
+    return:
+      type: '{T}'
+      description: ''
+    content.vb: Public Function LoadOptions(Of T)(createDefaultInstance As Func(Of T)) As T
+  overload: TinyLife.Mods.ModInfo.LoadOptions*
+  nameWithType.vb: ModInfo.LoadOptions(Of T)(Func(Of T))
+  modifiers.csharp:
+  - public
+  modifiers.vb:
+  - Public
+  fullName.vb: TinyLife.Mods.ModInfo.LoadOptions(Of T)(System.Func(Of T))
+  name.vb: LoadOptions(Of T)(Func(Of T))
 references:
 - uid: TinyLife.Mods.ModInfo.Mod
  commentId: F:TinyLife.Mods.ModInfo.Mod
@ -743,6 +868,25 @@ references:
  name: HarmonyLib
  nameWithType: HarmonyLib
  fullName: HarmonyLib
+- uid: TinyLife.Mods.ModInfo.LoadOptions``1(System.Func{``0})
+  commentId: M:TinyLife.Mods.ModInfo.LoadOptions``1(System.Func{``0})
+  isExternal: true
+- uid: TinyLife.Mods.ModInfo.SaveOptions``1(``0)
+  commentId: M:TinyLife.Mods.ModInfo.SaveOptions``1(``0)
+  isExternal: true
+- uid: System.IO.FileInfo
+  commentId: T:System.IO.FileInfo
+  parent: System.IO
+  isExternal: true
+  name: FileInfo
+  nameWithType: FileInfo
+  fullName: System.IO.FileInfo
+- uid: System.IO
+  commentId: N:System.IO
+  isExternal: true
+  name: System.IO
+  nameWithType: System.IO
+  fullName: System.IO
 - uid: TinyLife.Mods.ModInfo.Finalize*
  commentId: Overload:TinyLife.Mods.ModInfo.Finalize
  name: Finalize
@ -820,3 +964,128 @@ references:
  name: ToString
  nameWithType: ModInfo.ToString
  fullName: TinyLife.Mods.ModInfo.ToString
+- uid: TinyLife.Mods.ModInfo.OptionsFile
+  commentId: F:TinyLife.Mods.ModInfo.OptionsFile
+  isExternal: true
+- uid: TinyLife.SaveHandler.CreateSerializer(System.EventHandler{Newtonsoft.Json.Serialization.ErrorEventArgs})
+  commentId: M:TinyLife.SaveHandler.CreateSerializer(System.EventHandler{Newtonsoft.Json.Serialization.ErrorEventArgs})
+  isExternal: true
+- uid: System.Runtime.Serialization.DataContractAttribute
+  commentId: T:System.Runtime.Serialization.DataContractAttribute
+  parent: System.Runtime.Serialization
+  isExternal: true
+  name: DataContractAttribute
+  nameWithType: DataContractAttribute
+  fullName: System.Runtime.Serialization.DataContractAttribute
+- uid: System.Runtime.Serialization.DataMemberAttribute
+  commentId: T:System.Runtime.Serialization.DataMemberAttribute
+  parent: System.Runtime.Serialization
+  isExternal: true
+  name: DataMemberAttribute
+  nameWithType: DataMemberAttribute
+  fullName: System.Runtime.Serialization.DataMemberAttribute
+- uid: TinyLife.Mods.ModInfo.SaveOptions*
+  commentId: Overload:TinyLife.Mods.ModInfo.SaveOptions
+  name: SaveOptions
+  nameWithType: ModInfo.SaveOptions
+  fullName: TinyLife.Mods.ModInfo.SaveOptions
+- uid: '{T}'
+  commentId: '!:T'
+  definition: T
+  name: T
+  nameWithType: T
+  fullName: T
+- uid: System.Runtime.Serialization
+  commentId: N:System.Runtime.Serialization
+  isExternal: true
+  name: System.Runtime.Serialization
+  nameWithType: System.Runtime.Serialization
+  fullName: System.Runtime.Serialization
+- uid: T
+  name: T
+  nameWithType: T
+  fullName: T
+- uid: TinyLife.Mods.ModInfo.LoadOptions*
+  commentId: Overload:TinyLife.Mods.ModInfo.LoadOptions
+  name: LoadOptions
+  nameWithType: ModInfo.LoadOptions
+  fullName: TinyLife.Mods.ModInfo.LoadOptions
+- uid: System.Func{{T}}
+  commentId: T:System.Func{``0}
+  parent: System
+  definition: System.Func`1
+  name: Func<T>
+  nameWithType: Func<T>
+  fullName: System.Func<T>
+  nameWithType.vb: Func(Of T)
+  fullName.vb: System.Func(Of T)
+  name.vb: Func(Of T)
+  spec.csharp:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: T
+    nameWithType: T
+    fullName: T
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: T
+    nameWithType: T
+    fullName: T
+  - name: )
+    nameWithType: )
+    fullName: )
+- uid: System.Func`1
+  commentId: T:System.Func`1
+  isExternal: true
+  name: Func<TResult>
+  nameWithType: Func<TResult>
+  fullName: System.Func<TResult>
+  nameWithType.vb: Func(Of TResult)
+  fullName.vb: System.Func(Of TResult)
+  name.vb: Func(Of TResult)
+  spec.csharp:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: <
+    nameWithType: <
+    fullName: <
+  - name: TResult
+    nameWithType: TResult
+    fullName: TResult
+  - name: '>'
+    nameWithType: '>'
+    fullName: '>'
+  spec.vb:
+  - uid: System.Func`1
+    name: Func
+    nameWithType: Func
+    fullName: System.Func
+    isExternal: true
+  - name: '(Of '
+    nameWithType: '(Of '
+    fullName: '(Of '
+  - name: TResult
+    nameWithType: TResult
+    fullName: TResult
+  - name: )
+    nameWithType: )
+    fullName: )
--- a/docs/api/TinyLife.Mods.ModLoader.yml
+++ b/docs/api/TinyLife.Mods.ModLoader.yml
@ -21,7 +21,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ModLoader
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 21
+    startLine: 24
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -65,7 +65,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TryGetModInfo
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 33
+    startLine: 36
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
@ -112,7 +112,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetModsFolder
    path: ../TinyLife/Mods/ModLoader.cs
-    startLine: 41
+    startLine: 44
  assemblies:
  - Tiny Life
  namespace: TinyLife.Mods
--- a/docs/api/TinyLife.Need.yml
+++ b/docs/api/TinyLife.Need.yml
@ -24,7 +24,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Need
    path: ../TinyLife/Need.cs
-    startLine: 20
+    startLine: 19
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -79,7 +79,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Max
    path: ../TinyLife/Need.cs
-    startLine: 26
+    startLine: 25
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -114,7 +114,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Type
    path: ../TinyLife/Need.cs
-    startLine: 32
+    startLine: 31
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -159,7 +159,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Value
    path: ../TinyLife/Need.cs
-    startLine: 37
+    startLine: 36
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -206,7 +206,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Percentage
    path: ../TinyLife/Need.cs
-    startLine: 45
+    startLine: 44
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -243,7 +243,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Need.cs
-    startLine: 55
+    startLine: 54
  assemblies:
  - Tiny Life
  namespace: TinyLife
--- a/docs/api/TinyLife.NeedType.yml
+++ b/docs/api/TinyLife.NeedType.yml
@ -34,7 +34,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NeedType
    path: ../TinyLife/Need.cs
-    startLine: 66
+    startLine: 65
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -88,7 +88,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Need.cs
-    startLine: 74
+    startLine: 73
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Energy
    path: ../TinyLife/Need.cs
-    startLine: 76
+    startLine: 75
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -160,7 +160,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Hunger
    path: ../TinyLife/Need.cs
-    startLine: 81
+    startLine: 80
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -195,7 +195,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Social
    path: ../TinyLife/Need.cs
-    startLine: 82
+    startLine: 81
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -230,7 +230,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Toilet
    path: ../TinyLife/Need.cs
-    startLine: 85
+    startLine: 84
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -265,7 +265,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Hygiene
    path: ../TinyLife/Need.cs
-    startLine: 86
+    startLine: 85
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -300,7 +300,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Entertainment
    path: ../TinyLife/Need.cs
-    startLine: 87
+    startLine: 86
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -335,7 +335,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Need.cs
-    startLine: 94
+    startLine: 93
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -370,7 +370,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PassiveReduction
    path: ../TinyLife/Need.cs
-    startLine: 98
+    startLine: 97
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -405,7 +405,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NeedLowAction
    path: ../TinyLife/Need.cs
-    startLine: 102
+    startLine: 101
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -440,7 +440,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NeedLowTime
    path: ../TinyLife/Need.cs
-    startLine: 106
+    startLine: 105
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -475,7 +475,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SolveImportance
    path: ../TinyLife/Need.cs
-    startLine: 111
+    startLine: 110
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -510,7 +510,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SourceString
    path: ../TinyLife/Need.cs
-    startLine: 113
+    startLine: 112
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -549,7 +549,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Need.cs
-    startLine: 123
+    startLine: 122
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -600,7 +600,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Need.cs
-    startLine: 136
+    startLine: 135
  assemblies:
  - Tiny Life
  namespace: TinyLife
--- a/docs/api/TinyLife.Objects.AgeGroup.yml
+++ b/docs/api/TinyLife.Objects.AgeGroup.yml
@ -21,7 +21,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AgeGroup
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2649
+    startLine: 2659
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -67,7 +67,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Child
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2657
+    startLine: 2667
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -101,7 +101,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Adult
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2663
+    startLine: 2673
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Clothes.yml
+++ b/docs/api/TinyLife.Objects.Clothes.yml
@ -40,7 +40,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Clothes
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 22
+    startLine: 21
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -94,7 +94,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 29
+    startLine: 28
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -131,7 +131,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Layers
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 33
+    startLine: 32
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -168,7 +168,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AllIntentions
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 37
+    startLine: 36
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -205,7 +205,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ReferencePrice
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 42
+    startLine: 41
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -240,7 +240,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 216
+    startLine: 215
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -275,7 +275,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Layer
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 220
+    startLine: 219
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -310,7 +310,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TextureRegions
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 226
+    startLine: 225
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -345,7 +345,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Colors
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 231
+    startLine: 230
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -380,7 +380,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Price
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 236
+    startLine: 235
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -415,7 +415,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Intentions
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 240
+    startLine: 239
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -450,7 +450,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 245
+    startLine: 244
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -487,7 +487,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NonBuyable
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 250
+    startLine: 249
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -524,7 +524,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Ages
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 255
+    startLine: 254
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -561,7 +561,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DepthFunction
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 260
+    startLine: 259
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -598,7 +598,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TextureBehaviorLayer
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 265
+    startLine: 264
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -635,7 +635,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RandomWeight
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 271
+    startLine: 270
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -672,7 +672,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RandomColorWeight
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 276
+    startLine: 275
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -709,7 +709,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 287
+    startLine: 286
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -763,7 +763,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetPrice
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 311
+    startLine: 310
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -800,7 +800,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 319
+    startLine: 318
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -838,7 +838,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetClothes
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 330
+    startLine: 329
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.ClothesIntention.yml
+++ b/docs/api/TinyLife.Objects.ClothesIntention.yml
@ -30,7 +30,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ClothesIntention
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 574
+    startLine: 573
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -77,7 +77,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: None
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 578
+    startLine: 577
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -109,7 +109,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Everyday
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 579
+    startLine: 578
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -141,7 +141,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Party
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 580
+    startLine: 579
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -173,7 +173,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Formal
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 581
+    startLine: 580
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -205,7 +205,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Workout
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 582
+    startLine: 581
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -237,7 +237,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Swimwear
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 583
+    startLine: 582
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -269,7 +269,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Sleep
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 584
+    startLine: 583
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -301,7 +301,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Summer
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 585
+    startLine: 584
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -333,7 +333,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Winter
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 586
+    startLine: 585
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -365,7 +365,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Work
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 587
+    startLine: 586
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -397,7 +397,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Safety
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 588
+    startLine: 587
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.ClothesLayer.yml
+++ b/docs/api/TinyLife.Objects.ClothesLayer.yml
@ -31,7 +31,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ClothesLayer
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 515
+    startLine: 514
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -79,7 +79,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Body
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 521
+    startLine: 520
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -113,7 +113,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Eyes
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 525
+    startLine: 524
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -147,7 +147,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Pants
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 529
+    startLine: 528
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -181,7 +181,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Arms
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 533
+    startLine: 532
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -215,7 +215,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Shirt
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 537
+    startLine: 536
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -249,7 +249,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Accessories
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 541
+    startLine: 540
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -283,7 +283,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FacialHair
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 545
+    startLine: 544
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -317,7 +317,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Hair
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 549
+    startLine: 548
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -351,7 +351,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HeadAccessories
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 553
+    startLine: 552
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -385,7 +385,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FaceAccessories
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 557
+    startLine: 556
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -419,7 +419,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ArmAccessories
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 562
+    startLine: 561
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -453,7 +453,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Shoes
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 566
+    startLine: 565
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.FurnitureType.TypeSettings.yml
+++ b/docs/api/TinyLife.Objects.FurnitureType.TypeSettings.yml
@ -54,7 +54,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TypeSettings
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 422
+    startLine: 408
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -100,7 +100,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 427
+    startLine: 413
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -133,7 +133,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Size
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 431
+    startLine: 417
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -166,7 +166,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Categories
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 435
+    startLine: 421
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -199,7 +199,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ActionSpots
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 440
+    startLine: 426
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -232,7 +232,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ObjectSpots
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 445
+    startLine: 431
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -265,7 +265,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ColorSchemes
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 450
+    startLine: 436
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -298,7 +298,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ColorMap
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 455
+    startLine: 441
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -331,7 +331,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DefaultColors
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 460
+    startLine: 446
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -364,7 +364,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DefaultRotation
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 464
+    startLine: 450
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -397,7 +397,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ConstructedType
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 470
+    startLine: 456
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -430,7 +430,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Price
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 474
+    startLine: 460
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -463,7 +463,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: BuyableVariations
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 480
+    startLine: 466
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -496,7 +496,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HeldScale
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 484
+    startLine: 470
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -529,7 +529,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HeldPivot
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 489
+    startLine: 475
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -562,7 +562,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DecorativeRating
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 496
+    startLine: 482
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -595,7 +595,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 501
+    startLine: 487
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -628,7 +628,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Reliability
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 507
+    startLine: 493
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -661,7 +661,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: BrokenBehavior
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 512
+    startLine: 498
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -694,7 +694,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ElectricityRating
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 517
+    startLine: 503
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -727,7 +727,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WaterRating
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 522
+    startLine: 508
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -760,7 +760,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: EfficiencyModifier
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 527
+    startLine: 513
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -793,7 +793,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RestoreNeedModifier
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 532
+    startLine: 518
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -826,7 +826,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Visibility
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 538
+    startLine: 524
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -859,7 +859,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Tab
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 543
+    startLine: 529
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -892,7 +892,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TextureName
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 548
+    startLine: 534
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -925,7 +925,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LightSettings
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 553
+    startLine: 539
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -958,7 +958,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DirtyOverlayTextureName
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 560
+    startLine: 546
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -991,7 +991,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DistanceFromObstructions
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 566
+    startLine: 552
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -1024,7 +1024,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetDisplayName
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 571
+    startLine: 557
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -1057,7 +1057,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanExecuteAction
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 576
+    startLine: 562
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -1090,7 +1090,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsAllowedInSpot
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 581
+    startLine: 567
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -1123,7 +1123,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 593
+    startLine: 579
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -1174,7 +1174,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetData
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 615
+    startLine: 601
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -1212,13 +1212,13 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetData
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 621
+    startLine: 607
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
  example: []
  syntax:
-    content: public T GetData<T>(string key)
+    content: public readonly T GetData<T>(string key)
    parameters:
    - id: key
      type: System.String
@ -1233,6 +1233,7 @@ items:
  nameWithType.vb: FurnitureType.TypeSettings.GetData(Of T)(String)
  modifiers.csharp:
  - public
+  - readonly
  modifiers.vb:
  - Public
  fullName.vb: TinyLife.Objects.FurnitureType.TypeSettings.GetData(Of T)(System.String)
@ -1255,21 +1256,22 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetDataKeys
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 626
+    startLine: 612
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
  example: []
  syntax:
-    content: public IReadOnlyCollection<string> GetDataKeys()
+    content: public readonly IEnumerable<string> GetDataKeys()
    return:
-      type: System.Collections.Generic.IReadOnlyCollection{System.String}
-    content.vb: Public Function GetDataKeys As IReadOnlyCollection(Of String)
+      type: System.Collections.Generic.IEnumerable{System.String}
+    content.vb: Public Function GetDataKeys As IEnumerable(Of String)
  overload: TinyLife.Objects.FurnitureType.TypeSettings.GetDataKeys*
  implements:
  - MLEM.Misc.IGenericDataHolder.GetDataKeys
  modifiers.csharp:
  - public
+  - readonly
  modifiers.vb:
  - Public
 references:
@ -2971,21 +2973,21 @@ references:
  - name: )
    nameWithType: )
    fullName: )
- uid: System.Collections.Generic.IReadOnlyCollection{System.String}
-  commentId: T:System.Collections.Generic.IReadOnlyCollection{System.String}
+- uid: System.Collections.Generic.IEnumerable{System.String}
+  commentId: T:System.Collections.Generic.IEnumerable{System.String}
  parent: System.Collections.Generic
-  definition: System.Collections.Generic.IReadOnlyCollection`1
-  name: IReadOnlyCollection<String>
-  nameWithType: IReadOnlyCollection<String>
-  fullName: System.Collections.Generic.IReadOnlyCollection<System.String>
-  nameWithType.vb: IReadOnlyCollection(Of String)
-  fullName.vb: System.Collections.Generic.IReadOnlyCollection(Of System.String)
-  name.vb: IReadOnlyCollection(Of String)
+  definition: System.Collections.Generic.IEnumerable`1
+  name: IEnumerable<String>
+  nameWithType: IEnumerable<String>
+  fullName: System.Collections.Generic.IEnumerable<System.String>
+  nameWithType.vb: IEnumerable(Of String)
+  fullName.vb: System.Collections.Generic.IEnumerable(Of System.String)
+  name.vb: IEnumerable(Of String)
  spec.csharp:
-  - uid: System.Collections.Generic.IReadOnlyCollection`1
-    name: IReadOnlyCollection
-    nameWithType: IReadOnlyCollection
-    fullName: System.Collections.Generic.IReadOnlyCollection
+  - uid: System.Collections.Generic.IEnumerable`1
+    name: IEnumerable
+    nameWithType: IEnumerable
+    fullName: System.Collections.Generic.IEnumerable
    isExternal: true
  - name: <
    nameWithType: <
@ -2999,10 +3001,10 @@ references:
    nameWithType: '>'
    fullName: '>'
  spec.vb:
-  - uid: System.Collections.Generic.IReadOnlyCollection`1
-    name: IReadOnlyCollection
-    nameWithType: IReadOnlyCollection
-    fullName: System.Collections.Generic.IReadOnlyCollection
+  - uid: System.Collections.Generic.IEnumerable`1
+    name: IEnumerable
+    nameWithType: IEnumerable
+    fullName: System.Collections.Generic.IEnumerable
    isExternal: true
  - name: '(Of '
    nameWithType: '(Of '
@ -3015,20 +3017,20 @@ references:
  - name: )
    nameWithType: )
    fullName: )
- uid: System.Collections.Generic.IReadOnlyCollection`1
-  commentId: T:System.Collections.Generic.IReadOnlyCollection`1
+- uid: System.Collections.Generic.IEnumerable`1
+  commentId: T:System.Collections.Generic.IEnumerable`1
  isExternal: true
-  name: IReadOnlyCollection<T>
-  nameWithType: IReadOnlyCollection<T>
-  fullName: System.Collections.Generic.IReadOnlyCollection<T>
-  nameWithType.vb: IReadOnlyCollection(Of T)
-  fullName.vb: System.Collections.Generic.IReadOnlyCollection(Of T)
-  name.vb: IReadOnlyCollection(Of T)
+  name: IEnumerable<T>
+  nameWithType: IEnumerable<T>
+  fullName: System.Collections.Generic.IEnumerable<T>
+  nameWithType.vb: IEnumerable(Of T)
+  fullName.vb: System.Collections.Generic.IEnumerable(Of T)
+  name.vb: IEnumerable(Of T)
  spec.csharp:
-  - uid: System.Collections.Generic.IReadOnlyCollection`1
-    name: IReadOnlyCollection
-    nameWithType: IReadOnlyCollection
-    fullName: System.Collections.Generic.IReadOnlyCollection
+  - uid: System.Collections.Generic.IEnumerable`1
+    name: IEnumerable
+    nameWithType: IEnumerable
+    fullName: System.Collections.Generic.IEnumerable
    isExternal: true
  - name: <
    nameWithType: <
@ -3040,10 +3042,10 @@ references:
    nameWithType: '>'
    fullName: '>'
  spec.vb:
-  - uid: System.Collections.Generic.IReadOnlyCollection`1
-    name: IReadOnlyCollection
-    nameWithType: IReadOnlyCollection
-    fullName: System.Collections.Generic.IReadOnlyCollection
+  - uid: System.Collections.Generic.IEnumerable`1
+    name: IEnumerable
+    nameWithType: IEnumerable
+    fullName: System.Collections.Generic.IEnumerable
    isExternal: true
  - name: '(Of '
    nameWithType: '(Of '
--- a/docs/api/TinyLife.Objects.FurnitureType.yml
+++ b/docs/api/TinyLife.Objects.FurnitureType.yml
@ -105,7 +105,6 @@ items:
  - TinyLife.Objects.FurnitureType.Puddle
  - TinyLife.Objects.FurnitureType.Puzzle
  - TinyLife.Objects.FurnitureType.Register(TinyLife.Objects.FurnitureType.TypeSettings)
-  - TinyLife.Objects.FurnitureType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Objects.FurnitureType.TypeSettings})
  - TinyLife.Objects.FurnitureType.Rotations
  - TinyLife.Objects.FurnitureType.Sandbox
  - TinyLife.Objects.FurnitureType.Settings
@ -1270,50 +1269,6 @@ items:
  modifiers.vb:
  - Public
  - Shared
- uid: TinyLife.Objects.FurnitureType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Objects.FurnitureType.TypeSettings})
-  commentId: M:TinyLife.Objects.FurnitureType.RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Objects.FurnitureType.TypeSettings})
-  id: RegisterAll(System.Collections.Generic.IEnumerable{TinyLife.Objects.FurnitureType.TypeSettings})
-  parent: TinyLife.Objects.FurnitureType
-  langs:
-  - csharp
-  - vb
-  name: RegisterAll(IEnumerable<FurnitureType.TypeSettings>)
-  nameWithType: FurnitureType.RegisterAll(IEnumerable<FurnitureType.TypeSettings>)
-  fullName: TinyLife.Objects.FurnitureType.RegisterAll(System.Collections.Generic.IEnumerable<TinyLife.Objects.FurnitureType.TypeSettings>)
-  type: Method
-  source:
-    remote:
-      path: TinyLife/Objects/FurnitureType.cs
-      branch: main
-      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: RegisterAll
-    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 364
-  assemblies:
-  - Tiny Life
-  namespace: TinyLife.Objects
-  summary: "\nRegisters a set of custom furniture type and returns them\n"
-  example: []
-  syntax:
-    content: public static FurnitureType[] RegisterAll(IEnumerable<FurnitureType.TypeSettings> settings)
-    parameters:
-    - id: settings
-      type: System.Collections.Generic.IEnumerable{TinyLife.Objects.FurnitureType.TypeSettings}
-      description: The settings to apply to the custom furniture type
-    return:
-      type: TinyLife.Objects.FurnitureType[]
-      description: The registered furniture types
-    content.vb: Public Shared Function RegisterAll(settings As IEnumerable(Of FurnitureType.TypeSettings)) As FurnitureType()
-  overload: TinyLife.Objects.FurnitureType.RegisterAll*
-  nameWithType.vb: FurnitureType.RegisterAll(IEnumerable(Of FurnitureType.TypeSettings))
-  modifiers.csharp:
-  - public
-  - static
-  modifiers.vb:
-  - Public
-  - Shared
-  fullName.vb: TinyLife.Objects.FurnitureType.RegisterAll(System.Collections.Generic.IEnumerable(Of TinyLife.Objects.FurnitureType.TypeSettings))
-  name.vb: RegisterAll(IEnumerable(Of FurnitureType.TypeSettings))
 - uid: TinyLife.Objects.FurnitureType.GetTextures(System.String,System.Int32,System.Func{MLEM.Misc.Direction2,System.Boolean})
  commentId: M:TinyLife.Objects.FurnitureType.GetTextures(System.String,System.Int32,System.Func{MLEM.Misc.Direction2,System.Boolean})
  id: GetTextures(System.String,System.Int32,System.Func{MLEM.Misc.Direction2,System.Boolean})
@ -1332,7 +1287,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetTextures
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 378
+    startLine: 371
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -1382,7 +1337,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetTexture
    path: ../TinyLife/Objects/FurnitureType.cs
-    startLine: 401
+    startLine: 394
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -8633,77 +8588,6 @@ references:
  name: FurnitureType
  nameWithType: FurnitureType
  fullName: TinyLife.Objects.FurnitureType
- uid: TinyLife.Objects.FurnitureType.RegisterAll*
-  commentId: Overload:TinyLife.Objects.FurnitureType.RegisterAll
-  name: RegisterAll
-  nameWithType: FurnitureType.RegisterAll
-  fullName: TinyLife.Objects.FurnitureType.RegisterAll
- uid: System.Collections.Generic.IEnumerable{TinyLife.Objects.FurnitureType.TypeSettings}
-  commentId: T:System.Collections.Generic.IEnumerable{TinyLife.Objects.FurnitureType.TypeSettings}
-  parent: System.Collections.Generic
-  definition: System.Collections.Generic.IEnumerable`1
-  name: IEnumerable<FurnitureType.TypeSettings>
-  nameWithType: IEnumerable<FurnitureType.TypeSettings>
-  fullName: System.Collections.Generic.IEnumerable<TinyLife.Objects.FurnitureType.TypeSettings>
-  nameWithType.vb: IEnumerable(Of FurnitureType.TypeSettings)
-  fullName.vb: System.Collections.Generic.IEnumerable(Of TinyLife.Objects.FurnitureType.TypeSettings)
-  name.vb: IEnumerable(Of FurnitureType.TypeSettings)
-  spec.csharp:
-  - uid: System.Collections.Generic.IEnumerable`1
-    name: IEnumerable
-    nameWithType: IEnumerable
-    fullName: System.Collections.Generic.IEnumerable
-    isExternal: true
-  - name: <
-    nameWithType: <
-    fullName: <
-  - uid: TinyLife.Objects.FurnitureType.TypeSettings
-    name: FurnitureType.TypeSettings
-    nameWithType: FurnitureType.TypeSettings
-    fullName: TinyLife.Objects.FurnitureType.TypeSettings
-  - name: '>'
-    nameWithType: '>'
-    fullName: '>'
-  spec.vb:
-  - uid: System.Collections.Generic.IEnumerable`1
-    name: IEnumerable
-    nameWithType: IEnumerable
-    fullName: System.Collections.Generic.IEnumerable
-    isExternal: true
-  - name: '(Of '
-    nameWithType: '(Of '
-    fullName: '(Of '
-  - uid: TinyLife.Objects.FurnitureType.TypeSettings
-    name: FurnitureType.TypeSettings
-    nameWithType: FurnitureType.TypeSettings
-    fullName: TinyLife.Objects.FurnitureType.TypeSettings
-  - name: )
-    nameWithType: )
-    fullName: )
- uid: TinyLife.Objects.FurnitureType[]
-  isExternal: true
-  name: FurnitureType[]
-  nameWithType: FurnitureType[]
-  fullName: TinyLife.Objects.FurnitureType[]
-  nameWithType.vb: FurnitureType()
-  fullName.vb: TinyLife.Objects.FurnitureType()
-  name.vb: FurnitureType()
-  spec.csharp:
-  - uid: TinyLife.Objects.FurnitureType
-    name: FurnitureType
-    nameWithType: FurnitureType
-    fullName: TinyLife.Objects.FurnitureType
-  - name: '[]'
-    nameWithType: '[]'
-    fullName: '[]'
-  spec.vb:
-  - uid: TinyLife.Objects.FurnitureType
-    name: FurnitureType
-    nameWithType: FurnitureType
-    fullName: TinyLife.Objects.FurnitureType
-  - name: ()
-    nameWithType: ()
-    fullName: ()
 - uid: MLEM.Misc.Direction2Helper.Adjacent
  commentId: F:MLEM.Misc.Direction2Helper.Adjacent
  isExternal: true
@ -8955,6 +8839,30 @@ references:
  name: GetTexture
  nameWithType: FurnitureType.GetTexture
  fullName: TinyLife.Objects.FurnitureType.GetTexture
+- uid: TinyLife.Objects.FurnitureType[]
+  isExternal: true
+  name: FurnitureType[]
+  nameWithType: FurnitureType[]
+  fullName: TinyLife.Objects.FurnitureType[]
+  nameWithType.vb: FurnitureType()
+  fullName.vb: TinyLife.Objects.FurnitureType()
+  name.vb: FurnitureType()
+  spec.csharp:
+  - uid: TinyLife.Objects.FurnitureType
+    name: FurnitureType
+    nameWithType: FurnitureType
+    fullName: TinyLife.Objects.FurnitureType
+  - name: '[]'
+    nameWithType: '[]'
+    fullName: '[]'
+  spec.vb:
+  - uid: TinyLife.Objects.FurnitureType
+    name: FurnitureType
+    nameWithType: FurnitureType
+    fullName: TinyLife.Objects.FurnitureType
+  - name: ()
+    nameWithType: ()
+    fullName: ()
 - uid: System.Collections.Generic.Dictionary{TinyLife.Objects.FurnitureType,TinyLife.Skills.SkillType}
  commentId: T:System.Collections.Generic.Dictionary{TinyLife.Objects.FurnitureType,TinyLife.Skills.SkillType}
  parent: System.Collections.Generic
--- a/docs/api/TinyLife.Objects.LifeSpan.yml
+++ b/docs/api/TinyLife.Objects.LifeSpan.yml
@ -25,7 +25,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LifeSpan
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2671
+    startLine: 2681
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -61,7 +61,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: VeryShort
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2674
+    startLine: 2684
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -93,7 +93,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Short
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2675
+    startLine: 2685
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Normal
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2676
+    startLine: 2686
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -157,7 +157,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Long
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2677
+    startLine: 2687
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -189,7 +189,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: VeryLong
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2678
+    startLine: 2688
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -221,7 +221,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Infinite
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2679
+    startLine: 2689
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Outfit.yml
+++ b/docs/api/TinyLife.Objects.Outfit.yml
@ -25,7 +25,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Outfit
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 404
+    startLine: 403
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -80,7 +80,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Clothes
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 412
+    startLine: 411
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Intentions
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 418
+    startLine: 417
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -168,7 +168,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 424
+    startLine: 423
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -207,7 +207,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetIntentionPercentage
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 434
+    startLine: 433
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -246,7 +246,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: EnsureIntentionsMatch
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 452
+    startLine: 451
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -282,7 +282,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetRandomClothesItem
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 472
+    startLine: 471
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.ActionUpdateDelegate.yml
+++ b/docs/api/TinyLife.Objects.Person.ActionUpdateDelegate.yml
@ -19,7 +19,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ActionUpdateDelegate
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2535
+    startLine: 2545
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.DeathReason.yml
+++ b/docs/api/TinyLife.Objects.Person.DeathReason.yml
@ -23,7 +23,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DeathReason
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2600
+    startLine: 2610
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -58,7 +58,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Starvation
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2606
+    startLine: 2616
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -92,7 +92,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: InexplicableReasons
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2611
+    startLine: 2621
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -126,7 +126,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Electrocution
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2616
+    startLine: 2626
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -160,7 +160,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TooMuchProtein
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2620
+    startLine: 2630
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.EfficiencyModifierDelegate.yml
+++ b/docs/api/TinyLife.Objects.Person.EfficiencyModifierDelegate.yml
@ -19,7 +19,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: EfficiencyModifierDelegate
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2520
+    startLine: 2530
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.EmotionModifiersChangedDelegate.yml
+++ b/docs/api/TinyLife.Objects.Person.EmotionModifiersChangedDelegate.yml
@ -19,7 +19,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: EmotionModifiersChangedDelegate
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2545
+    startLine: 2555
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.PassiveActionPriorityDelegate.yml
+++ b/docs/api/TinyLife.Objects.Person.PassiveActionPriorityDelegate.yml
@ -19,7 +19,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PassiveActionPriorityDelegate
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2530
+    startLine: 2540
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.Pose.yml
+++ b/docs/api/TinyLife.Objects.Person.Pose.yml
@ -29,7 +29,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Pose
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2550
+    startLine: 2560
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -65,7 +65,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Standing
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2555
+    startLine: 2565
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -99,7 +99,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Walking
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2559
+    startLine: 2569
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -133,7 +133,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Sitting
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2563
+    startLine: 2573
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -167,7 +167,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Laying
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2568
+    startLine: 2578
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -201,7 +201,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SittingGround
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2573
+    startLine: 2583
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -235,7 +235,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WorkingStanding
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2577
+    startLine: 2587
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -269,7 +269,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WorkingSitting
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2581
+    startLine: 2591
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -303,7 +303,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WorkingSittingGround
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2585
+    startLine: 2595
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -337,7 +337,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Running
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2589
+    startLine: 2599
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -371,7 +371,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: StandingArmsOut
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2593
+    startLine: 2603
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.RestoreNeedDelegate.yml
+++ b/docs/api/TinyLife.Objects.Person.RestoreNeedDelegate.yml
@ -19,7 +19,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RestoreNeedDelegate
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2540
+    startLine: 2550
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.WalkSpeedDelegate.yml
+++ b/docs/api/TinyLife.Objects.Person.WalkSpeedDelegate.yml
@ -19,7 +19,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WalkSpeedDelegate
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2525
+    startLine: 2535
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.Person.yml
+++ b/docs/api/TinyLife.Objects.Person.yml
@ -67,7 +67,8 @@ items:
  - TinyLife.Objects.Person.GetRelationship(TinyLife.Objects.Person,System.Boolean)
  - TinyLife.Objects.Person.GetSkill(TinyLife.Skills.SkillType,System.Boolean)
  - TinyLife.Objects.Person.GetSkillLevel(TinyLife.Skills.SkillType)
-  - TinyLife.Objects.Person.GetSkillPercentage(TinyLife.Skills.SkillType)
+  - TinyLife.Objects.Person.GetSkillPointPercentage(TinyLife.Skills.SkillType)
+  - TinyLife.Objects.Person.GetSkillTotalPercentage(TinyLife.Skills.SkillType)
  - TinyLife.Objects.Person.GetTimeSinceMemory(TinyLife.Goals.MemoryType)
  - TinyLife.Objects.Person.GetWalkSpeed
  - TinyLife.Objects.Person.GoToExitRoad
@ -932,7 +933,7 @@ items:
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
-  summary: "\nA set of <xref href=\"TinyLife.Goals.Memory\" data-throw-if-not-resolved=\"false\"></xref> instances that this person currently has or tracks.\nTo edit and query this collection easily, <xref href=\"TinyLife.Objects.Person.AddMemory%60%601(TinyLife.Goals.MemoryType%2cSystem.Boolean%2cSystem.Nullable%7bSystem.TimeSpan%7d)\" data-throw-if-not-resolved=\"false\"></xref>, <xref href=\"TinyLife.Objects.Person.GetMemories%60%601(TinyLife.Goals.MemoryType)\" data-throw-if-not-resolved=\"false\"></xref> and <xref href=\"TinyLife.Objects.Person.GetTimeSinceMemory(TinyLife.Goals.MemoryType)\" data-throw-if-not-resolved=\"false\"></xref> can be used.\n"
+  summary: "\nA set of <xref href=\"TinyLife.Goals.Memory\" data-throw-if-not-resolved=\"false\"></xref> instances that this person currently has or tracks.\nTo edit and query this collection easily, <xref href=\"TinyLife.Objects.Person.AddMemory%60%601(TinyLife.Goals.MemoryType%2cSystem.Boolean%2cSystem.Nullable%7bSystem.TimeSpan%7d)\" data-throw-if-not-resolved=\"false\"></xref>/>, <xref href=\"TinyLife.Objects.Person.GetMemories%60%601(TinyLife.Goals.MemoryType)\" data-throw-if-not-resolved=\"false\"></xref> and <xref href=\"TinyLife.Objects.Person.GetTimeSinceMemory(TinyLife.Goals.MemoryType)\" data-throw-if-not-resolved=\"false\"></xref> can be used.\n"
  example: []
  syntax:
    content: >-
@ -4498,41 +4499,80 @@ items:
  - public
  modifiers.vb:
  - Public
- uid: TinyLife.Objects.Person.GetSkillPercentage(TinyLife.Skills.SkillType)
-  commentId: M:TinyLife.Objects.Person.GetSkillPercentage(TinyLife.Skills.SkillType)
-  id: GetSkillPercentage(TinyLife.Skills.SkillType)
+- uid: TinyLife.Objects.Person.GetSkillTotalPercentage(TinyLife.Skills.SkillType)
+  commentId: M:TinyLife.Objects.Person.GetSkillTotalPercentage(TinyLife.Skills.SkillType)
+  id: GetSkillTotalPercentage(TinyLife.Skills.SkillType)
  parent: TinyLife.Objects.Person
  langs:
  - csharp
  - vb
-  name: GetSkillPercentage(SkillType)
-  nameWithType: Person.GetSkillPercentage(SkillType)
-  fullName: TinyLife.Objects.Person.GetSkillPercentage(TinyLife.Skills.SkillType)
+  name: GetSkillTotalPercentage(SkillType)
+  nameWithType: Person.GetSkillTotalPercentage(SkillType)
+  fullName: TinyLife.Objects.Person.GetSkillTotalPercentage(TinyLife.Skills.SkillType)
  type: Method
  source:
    remote:
      path: TinyLife/Objects/Person.cs
      branch: main
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: GetSkillPercentage
+    id: GetSkillTotalPercentage
    path: ../TinyLife/Objects/Person.cs
    startLine: 1371
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
-  summary: "\nReturns the total skill level percentage of the given skill for this person.\nThis is a shorthand for <xref href=\"TinyLife.Skills.Skill.LevelPercentage\" data-throw-if-not-resolved=\"false\"></xref>.\n"
+  summary: "\nReturns the total skill level percentage of the given skill for this person.\nThis is a shorthand for <xref href=\"TinyLife.Skills.Skill.TotalPercentage\" data-throw-if-not-resolved=\"false\"></xref>.\n"
  example: []
  syntax:
-    content: public float GetSkillPercentage(SkillType type)
+    content: public float GetSkillTotalPercentage(SkillType type)
    parameters:
    - id: type
      type: TinyLife.Skills.SkillType
      description: The type of skill to query
    return:
      type: System.Single
-      description: The person&apos;s skill level percentage
-    content.vb: Public Function GetSkillPercentage(type As SkillType) As Single
-  overload: TinyLife.Objects.Person.GetSkillPercentage*
+      description: The person&apos;s total skill level percentage
+    content.vb: Public Function GetSkillTotalPercentage(type As SkillType) As Single
+  overload: TinyLife.Objects.Person.GetSkillTotalPercentage*
+  modifiers.csharp:
+  - public
+  modifiers.vb:
+  - Public
+- uid: TinyLife.Objects.Person.GetSkillPointPercentage(TinyLife.Skills.SkillType)
+  commentId: M:TinyLife.Objects.Person.GetSkillPointPercentage(TinyLife.Skills.SkillType)
+  id: GetSkillPointPercentage(TinyLife.Skills.SkillType)
+  parent: TinyLife.Objects.Person
+  langs:
+  - csharp
+  - vb
+  name: GetSkillPointPercentage(SkillType)
+  nameWithType: Person.GetSkillPointPercentage(SkillType)
+  fullName: TinyLife.Objects.Person.GetSkillPointPercentage(TinyLife.Skills.SkillType)
+  type: Method
+  source:
+    remote:
+      path: TinyLife/Objects/Person.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: GetSkillPointPercentage
+    path: ../TinyLife/Objects/Person.cs
+    startLine: 1381
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Objects
+  summary: "\nReturns the percentage that this person has in the given skill&apos;s current level.\nThis is a shorthand for <xref href=\"TinyLife.Skills.Skill.PointPercentage\" data-throw-if-not-resolved=\"false\"></xref>.\n"
+  example: []
+  syntax:
+    content: public float GetSkillPointPercentage(SkillType type)
+    parameters:
+    - id: type
+      type: TinyLife.Skills.SkillType
+      description: The type of skill to query
+    return:
+      type: System.Single
+      description: The person&apos;s skill point percentage
+    content.vb: Public Function GetSkillPointPercentage(type As SkillType) As Single
+  overload: TinyLife.Objects.Person.GetSkillPointPercentage*
  modifiers.csharp:
  - public
  modifiers.vb:
@ -4555,7 +4595,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetSkillLevel
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1381
+    startLine: 1391
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4594,7 +4634,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HasSkillLevel
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1391
+    startLine: 1401
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4636,7 +4676,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GainSkill
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1403
+    startLine: 1413
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4681,7 +4721,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DepleteNeed
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1419
+    startLine: 1429
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4723,7 +4763,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HasPersonality
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1430
+    startLine: 1440
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4762,7 +4802,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: EnqueueAction
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1444
+    startLine: 1454
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4816,7 +4856,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CancelAction
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1479
+    startLine: 1489
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4861,7 +4901,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FindPathAsync
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1499
+    startLine: 1509
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4912,7 +4952,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetHeldObject
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1509
+    startLine: 1519
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -4955,7 +4995,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetHeldObject
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1521
+    startLine: 1531
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5008,7 +5048,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetHeldObject
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1535
+    startLine: 1545
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5044,7 +5084,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetHeldActionInfo
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1548
+    startLine: 1558
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5079,7 +5119,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ToCreatedByString
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1556
+    startLine: 1566
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5114,7 +5154,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Die
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1566
+    startLine: 1576
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5153,7 +5193,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AddEmotion
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1652
+    startLine: 1662
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5204,7 +5244,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RemoveEmotion
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1675
+    startLine: 1685
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5243,7 +5283,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LowerEmotion
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1696
+    startLine: 1706
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5288,7 +5328,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LowerEmotionModifier
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1715
+    startLine: 1725
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5333,7 +5373,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HasEmotionModifier
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1731
+    startLine: 1741
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5372,7 +5412,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetWalkSpeed
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1740
+    startLine: 1750
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5407,7 +5447,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetEfficiencyModifier
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1766
+    startLine: 1776
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5455,7 +5495,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HasHouseholdMember
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1818
+    startLine: 1828
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5494,7 +5534,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HasHouseholdMember
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1823
+    startLine: 1833
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5532,7 +5572,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetProjects
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1833
+    startLine: 1843
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5571,7 +5611,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetProject
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1843
+    startLine: 1853
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5613,7 +5653,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: StartProject
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1852
+    startLine: 1862
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5652,7 +5692,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetPassiveActionPriority
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1864
+    startLine: 1874
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5691,7 +5731,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetRandomOutfit
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1886
+    startLine: 1896
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5730,7 +5770,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetCurrentOutfit
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1898
+    startLine: 1908
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5769,7 +5809,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetCurrentOutfit
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1914
+    startLine: 1924
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5805,7 +5845,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetNewId
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1930
+    startLine: 1940
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5850,7 +5890,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsIdMatch
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1971
+    startLine: 1981
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5889,7 +5929,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsIdMatch
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1981
+    startLine: 1991
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5928,7 +5968,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetPersonalitySkillBoost
    path: ../TinyLife/Objects/Person.cs
-    startLine: 1991
+    startLine: 2001
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -5967,7 +6007,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetCurrentGoals
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2011
+    startLine: 2021
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6002,7 +6042,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: EarnMoney
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2033
+    startLine: 2043
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6041,7 +6081,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AddMemory
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2045
+    startLine: 2055
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6093,7 +6133,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetMemories
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2058
+    startLine: 2068
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6139,7 +6179,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetTimeSinceMemory
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2068
+    startLine: 2078
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6178,7 +6218,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetDaysBeforeAging
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2082
+    startLine: 2092
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6213,7 +6253,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GoToExitRoad
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2090
+    startLine: 2100
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6245,7 +6285,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: UpdatePortraitIfDirty
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2100
+    startLine: 2110
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6277,7 +6317,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetRandomSpeakSound
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2412
+    startLine: 2422
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -6330,7 +6370,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Create
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2451
+    startLine: 2461
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -11425,14 +11465,22 @@ references:
  name: GetSkill
  nameWithType: Person.GetSkill
  fullName: TinyLife.Objects.Person.GetSkill
- uid: TinyLife.Skills.Skill.LevelPercentage
-  commentId: P:TinyLife.Skills.Skill.LevelPercentage
+- uid: TinyLife.Skills.Skill.TotalPercentage
+  commentId: P:TinyLife.Skills.Skill.TotalPercentage
  isExternal: true
- uid: TinyLife.Objects.Person.GetSkillPercentage*
-  commentId: Overload:TinyLife.Objects.Person.GetSkillPercentage
-  name: GetSkillPercentage
-  nameWithType: Person.GetSkillPercentage
-  fullName: TinyLife.Objects.Person.GetSkillPercentage
+- uid: TinyLife.Objects.Person.GetSkillTotalPercentage*
+  commentId: Overload:TinyLife.Objects.Person.GetSkillTotalPercentage
+  name: GetSkillTotalPercentage
+  nameWithType: Person.GetSkillTotalPercentage
+  fullName: TinyLife.Objects.Person.GetSkillTotalPercentage
+- uid: TinyLife.Skills.Skill.PointPercentage
+  commentId: P:TinyLife.Skills.Skill.PointPercentage
+  isExternal: true
+- uid: TinyLife.Objects.Person.GetSkillPointPercentage*
+  commentId: Overload:TinyLife.Objects.Person.GetSkillPointPercentage
+  name: GetSkillPointPercentage
+  nameWithType: Person.GetSkillPointPercentage
+  fullName: TinyLife.Objects.Person.GetSkillPointPercentage
 - uid: TinyLife.Objects.Person.GetSkillLevel*
  commentId: Overload:TinyLife.Objects.Person.GetSkillLevel
  name: GetSkillLevel
--- a/docs/api/TinyLife.Objects.SpeakStyle.yml
+++ b/docs/api/TinyLife.Objects.SpeakStyle.yml
@ -35,7 +35,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SpeakStyle
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2689
+    startLine: 2699
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -80,7 +80,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Affirmative
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2693
+    startLine: 2703
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -112,7 +112,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Angry
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2694
+    startLine: 2704
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -144,7 +144,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Annoyed
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2695
+    startLine: 2705
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -176,7 +176,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Bored
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2696
+    startLine: 2706
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -208,7 +208,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Childish
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2697
+    startLine: 2707
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -240,7 +240,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Confident
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2698
+    startLine: 2708
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -272,7 +272,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Confused
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2699
+    startLine: 2709
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -304,7 +304,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Disagreeing
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2700
+    startLine: 2710
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -336,7 +336,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Excited
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2701
+    startLine: 2711
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -368,7 +368,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Happy
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2702
+    startLine: 2712
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -400,7 +400,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Neutral
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2703
+    startLine: 2713
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -432,7 +432,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Questioning
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2704
+    startLine: 2714
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -464,7 +464,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Sad
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2705
+    startLine: 2715
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -496,7 +496,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Scared
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2706
+    startLine: 2716
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -528,7 +528,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Shocked
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2707
+    startLine: 2717
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -560,7 +560,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Thinking
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2708
+    startLine: 2718
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.VoiceStyle.yml
+++ b/docs/api/TinyLife.Objects.VoiceStyle.yml
@ -22,7 +22,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: VoiceStyle
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2717
+    startLine: 2727
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -57,7 +57,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Low
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2720
+    startLine: 2730
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -89,7 +89,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: High
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2721
+    startLine: 2731
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -121,7 +121,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Child
    path: ../TinyLife/Objects/Person.cs
-    startLine: 2722
+    startLine: 2732
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.Objects.WornClothes.yml
+++ b/docs/api/TinyLife.Objects.WornClothes.yml
@ -25,7 +25,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WornClothes
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 342
+    startLine: 341
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -80,7 +80,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Type
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 349
+    startLine: 348
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Colors
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 356
+    startLine: 355
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -168,7 +168,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FromStorage
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 361
+    startLine: 360
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -211,7 +211,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 368
+    startLine: 367
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -253,7 +253,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetColor
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 378
+    startLine: 377
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
@ -292,7 +292,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Validate
    path: ../TinyLife/Objects/Clothes.cs
-    startLine: 386
+    startLine: 385
  assemblies:
  - Tiny Life
  namespace: TinyLife.Objects
--- a/docs/api/TinyLife.PersonalityType.TypeCategory.yml
+++ b/docs/api/TinyLife.PersonalityType.TypeCategory.yml
@ -22,7 +22,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TypeCategory
    path: ../TinyLife/PersonalityType.cs
-    startLine: 220
+    startLine: 219
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -57,7 +57,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Major
    path: ../TinyLife/PersonalityType.cs
-    startLine: 225
+    startLine: 224
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -91,7 +91,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Minor
    path: ../TinyLife/PersonalityType.cs
-    startLine: 229
+    startLine: 228
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Hidden
    path: ../TinyLife/PersonalityType.cs
-    startLine: 234
+    startLine: 233
  assemblies:
  - Tiny Life
  namespace: TinyLife
--- a/docs/api/TinyLife.PersonalityType.yml
+++ b/docs/api/TinyLife.PersonalityType.yml
@ -58,7 +58,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PersonalityType
    path: ../TinyLife/PersonalityType.cs
-    startLine: 22
+    startLine: 21
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -112,7 +112,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/PersonalityType.cs
-    startLine: 30
+    startLine: 29
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -149,7 +149,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: MaxMajorsPerPerson
    path: ../TinyLife/PersonalityType.cs
-    startLine: 34
+    startLine: 33
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -186,7 +186,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Lazy
    path: ../TinyLife/PersonalityType.cs
-    startLine: 41
+    startLine: 40
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -221,7 +221,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Energetic
    path: ../TinyLife/PersonalityType.cs
-    startLine: 44
+    startLine: 43
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -256,7 +256,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Creative
    path: ../TinyLife/PersonalityType.cs
-    startLine: 48
+    startLine: 47
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -291,7 +291,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Likeable
    path: ../TinyLife/PersonalityType.cs
-    startLine: 51
+    startLine: 50
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -326,7 +326,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Mean
    path: ../TinyLife/PersonalityType.cs
-    startLine: 54
+    startLine: 53
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -361,7 +361,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Ambitious
    path: ../TinyLife/PersonalityType.cs
-    startLine: 58
+    startLine: 57
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -396,7 +396,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Thinker
    path: ../TinyLife/PersonalityType.cs
-    startLine: 62
+    startLine: 61
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -431,7 +431,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Introverted
    path: ../TinyLife/PersonalityType.cs
-    startLine: 65
+    startLine: 64
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -466,7 +466,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Extroverted
    path: ../TinyLife/PersonalityType.cs
-    startLine: 66
+    startLine: 65
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -501,7 +501,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FamilyFocused
    path: ../TinyLife/PersonalityType.cs
-    startLine: 70
+    startLine: 69
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -536,7 +536,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Foodie
    path: ../TinyLife/PersonalityType.cs
-    startLine: 75
+    startLine: 74
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -571,7 +571,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Asexual
    path: ../TinyLife/PersonalityType.cs
-    startLine: 80
+    startLine: 79
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -606,7 +606,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Aromantic
    path: ../TinyLife/PersonalityType.cs
-    startLine: 84
+    startLine: 83
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -641,7 +641,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HatesChildren
    path: ../TinyLife/PersonalityType.cs
-    startLine: 88
+    startLine: 87
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -676,7 +676,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Pescetarian
    path: ../TinyLife/PersonalityType.cs
-    startLine: 92
+    startLine: 91
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -711,7 +711,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Vegetarian
    path: ../TinyLife/PersonalityType.cs
-    startLine: 96
+    startLine: 95
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -746,7 +746,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Vegan
    path: ../TinyLife/PersonalityType.cs
-    startLine: 100
+    startLine: 99
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -781,7 +781,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: MasterChef
    path: ../TinyLife/PersonalityType.cs
-    startLine: 106
+    startLine: 105
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -816,7 +816,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SmartKid
    path: ../TinyLife/PersonalityType.cs
-    startLine: 109
+    startLine: 108
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -851,7 +851,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GymRat
    path: ../TinyLife/PersonalityType.cs
-    startLine: 113
+    startLine: 112
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -886,7 +886,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HouseholdHero
    path: ../TinyLife/PersonalityType.cs
-    startLine: 116
+    startLine: 115
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -921,7 +921,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ComputerAddict
    path: ../TinyLife/PersonalityType.cs
-    startLine: 119
+    startLine: 118
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -956,7 +956,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FriendOfEveryone
    path: ../TinyLife/PersonalityType.cs
-    startLine: 122
+    startLine: 121
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -991,7 +991,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Millionaire
    path: ../TinyLife/PersonalityType.cs
-    startLine: 126
+    startLine: 125
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1026,7 +1026,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CapableCarpenter
    path: ../TinyLife/PersonalityType.cs
-    startLine: 129
+    startLine: 128
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1061,7 +1061,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/PersonalityType.cs
-    startLine: 138
+    startLine: 137
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1096,7 +1096,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Texture
    path: ../TinyLife/PersonalityType.cs
-    startLine: 142
+    startLine: 141
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1131,7 +1131,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Incompatible
    path: ../TinyLife/PersonalityType.cs
-    startLine: 147
+    startLine: 146
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1168,7 +1168,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: BoostedSkills
    path: ../TinyLife/PersonalityType.cs
-    startLine: 154
+    startLine: 153
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1208,7 +1208,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: BoostedSkillTypes
    path: ../TinyLife/PersonalityType.cs
-    startLine: 161
+    startLine: 160
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1248,7 +1248,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AllowedAges
    path: ../TinyLife/PersonalityType.cs
-    startLine: 166
+    startLine: 165
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1285,7 +1285,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Category
    path: ../TinyLife/PersonalityType.cs
-    startLine: 170
+    startLine: 169
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1322,7 +1322,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SourceString
    path: ../TinyLife/PersonalityType.cs
-    startLine: 172
+    startLine: 171
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1361,7 +1361,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/PersonalityType.cs
-    startLine: 179
+    startLine: 178
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1400,7 +1400,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsCompatible
    path: ../TinyLife/PersonalityType.cs
-    startLine: 189
+    startLine: 188
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1439,7 +1439,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanApply
    path: ../TinyLife/PersonalityType.cs
-    startLine: 199
+    startLine: 198
  assemblies:
  - Tiny Life
  namespace: TinyLife
@ -1478,7 +1478,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/PersonalityType.cs
-    startLine: 210
+    startLine: 209
  assemblies:
  - Tiny Life
  namespace: TinyLife
--- a/docs/api/TinyLife.SaveHandler.yml
+++ b/docs/api/TinyLife.SaveHandler.yml
@ -306,7 +306,7 @@ items:
  summary: "\nCreates a new <xref href=\"Newtonsoft.Json.JsonSerializer\" data-throw-if-not-resolved=\"false\"></xref> that uses the <xref href=\"Newtonsoft.Json.JsonSerializerSettings\" data-throw-if-not-resolved=\"false\"></xref> returned in <xref href=\"TinyLife.SaveHandler.CreateSerializerSettings(System.EventHandler%7bNewtonsoft.Json.Serialization.ErrorEventArgs%7d)\" data-throw-if-not-resolved=\"false\"></xref>.\n"
  example: []
  syntax:
-    content: public static JsonSerializer CreateSerializer(EventHandler<ErrorEventArgs> errorHandler)
+    content: public static JsonSerializer CreateSerializer(EventHandler<ErrorEventArgs> errorHandler = null)
    parameters:
    - id: errorHandler
      type: System.EventHandler{Newtonsoft.Json.Serialization.ErrorEventArgs}
@ -314,7 +314,7 @@ items:
    return:
      type: Newtonsoft.Json.JsonSerializer
      description: A new <xref href="Newtonsoft.Json.JsonSerializer" data-throw-if-not-resolved="false"></xref> with some default values set.
-    content.vb: Public Shared Function CreateSerializer(errorHandler As EventHandler(Of ErrorEventArgs)) As JsonSerializer
+    content.vb: Public Shared Function CreateSerializer(errorHandler As EventHandler(Of ErrorEventArgs) = Nothing) As JsonSerializer
  overload: TinyLife.SaveHandler.CreateSerializer*
  nameWithType.vb: SaveHandler.CreateSerializer(EventHandler(Of ErrorEventArgs))
  modifiers.csharp:
--- a/docs/api/TinyLife.Skills.FoodType.ContainerType.yml
+++ b/docs/api/TinyLife.Skills.FoodType.ContainerType.yml
@ -28,7 +28,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ContainerType
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 504
+    startLine: 503
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -73,7 +73,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Plate
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 509
+    startLine: 508
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -110,7 +110,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Glass
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 516
+    startLine: 515
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -147,7 +147,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Mug
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 523
+    startLine: 522
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -184,7 +184,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 531
+    startLine: 530
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -219,7 +219,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsDrink
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 535
+    startLine: 534
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -254,7 +254,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 549
+    startLine: 548
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -305,7 +305,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetFilled
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 562
+    startLine: 561
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -346,7 +346,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetEmpty
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 571
+    startLine: 570
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -387,7 +387,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetDefaultTexture
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 580
+    startLine: 579
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
--- a/docs/api/TinyLife.Skills.FoodType.FoodIntolerance.yml
+++ b/docs/api/TinyLife.Skills.FoodType.FoodIntolerance.yml
@ -23,7 +23,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FoodIntolerance
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 590
+    startLine: 589
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -69,7 +69,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: None
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 596
+    startLine: 595
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -103,7 +103,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NotVegan
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 600
+    startLine: 599
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -137,7 +137,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NotVegetarian
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 604
+    startLine: 603
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -171,7 +171,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NotPescetarian
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 608
+    startLine: 607
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
--- a/docs/api/TinyLife.Skills.FoodType.IngredientSource.yml
+++ b/docs/api/TinyLife.Skills.FoodType.IngredientSource.yml
@ -30,7 +30,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IngredientSource
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 443
+    startLine: 442
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -75,7 +75,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Fridge
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 448
+    startLine: 447
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -112,7 +112,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ProteinShakeMaker
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 452
+    startLine: 451
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -149,7 +149,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Barbecue
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 456
+    startLine: 455
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -186,7 +186,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ChildStove
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 460
+    startLine: 459
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -223,7 +223,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CoffeeMachine
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 464
+    startLine: 463
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -260,7 +260,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Sink
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 468
+    startLine: 467
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -297,7 +297,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CafeDisplayCase
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 472
+    startLine: 471
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -334,7 +334,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 477
+    startLine: 476
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -369,7 +369,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Container
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 481
+    startLine: 480
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -404,7 +404,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnEaten
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 487
+    startLine: 486
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -441,7 +441,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 494
+    startLine: 493
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
--- a/docs/api/TinyLife.Skills.FoodType.yml
+++ b/docs/api/TinyLife.Skills.FoodType.yml
@ -50,7 +50,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FoodType
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 32
+    startLine: 31
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -101,7 +101,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 39
+    startLine: 38
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -138,7 +138,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AllIntolerances
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 43
+    startLine: 42
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -175,7 +175,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnFoodEaten
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 52
+    startLine: 51
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -210,7 +210,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 130
+    startLine: 129
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -245,7 +245,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredSkillLevel
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 134
+    startLine: 133
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -280,7 +280,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Price
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 138
+    startLine: 137
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -315,7 +315,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: FoodAmount
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 144
+    startLine: 143
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -350,7 +350,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Color
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 148
+    startLine: 147
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -385,7 +385,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Sources
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 152
+    startLine: 151
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -420,7 +420,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Intolerances
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 156
+    startLine: 155
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -455,7 +455,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredSkill
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 162
+    startLine: 161
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -492,7 +492,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AdditionalObject
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 168
+    startLine: 167
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -529,7 +529,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Container
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 172
+    startLine: 171
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -566,7 +566,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OnEaten
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 178
+    startLine: 177
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -603,7 +603,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanEatFunc
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 183
+    startLine: 182
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -640,7 +640,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanCreateFunc
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 188
+    startLine: 187
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -677,7 +677,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CustomTextureFunc
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 192
+    startLine: 191
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -714,7 +714,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanHaveCandle
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 196
+    startLine: 195
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -747,7 +747,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DisplayName
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 200
+    startLine: 199
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -784,7 +784,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 212
+    startLine: 211
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -841,7 +841,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetPrice
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 228
+    startLine: 227
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -880,7 +880,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Construct
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 243
+    startLine: 242
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -940,7 +940,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ConstructUnfinished
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 263
+    startLine: 262
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1000,7 +1000,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanEat
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 280
+    startLine: 279
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1045,7 +1045,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanCreate
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 299
+    startLine: 298
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1093,7 +1093,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetIntolerancesDescription
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 321
+    startLine: 320
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1132,7 +1132,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: InvokeOnEaten
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 336
+    startLine: 335
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1171,7 +1171,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetTexture
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 362
+    startLine: 361
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1210,7 +1210,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 370
+    startLine: 369
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1248,7 +1248,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetActions
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 384
+    startLine: 383
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1301,7 +1301,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetAllContainers
    path: ../TinyLife/Skills/FoodType.cs
-    startLine: 410
+    startLine: 409
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
--- a/docs/api/TinyLife.Skills.PaintingType.yml
+++ b/docs/api/TinyLife.Skills.PaintingType.yml
@ -26,7 +26,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PaintingType
    path: ../TinyLife/Skills/PaintingType.cs
-    startLine: 16
+    startLine: 15
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -77,7 +77,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Skills/PaintingType.cs
-    startLine: 23
+    startLine: 22
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -114,7 +114,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Skills/PaintingType.cs
-    startLine: 38
+    startLine: 37
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -149,7 +149,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LevelRange
    path: ../TinyLife/Skills/PaintingType.cs
-    startLine: 42
+    startLine: 41
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -184,7 +184,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Texture
    path: ../TinyLife/Skills/PaintingType.cs
-    startLine: 48
+    startLine: 47
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -219,7 +219,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: BaseMarkup
    path: ../TinyLife/Skills/PaintingType.cs
-    startLine: 53
+    startLine: 52
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -254,7 +254,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Skills/PaintingType.cs
-    startLine: 61
+    startLine: 60
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -299,7 +299,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Skills/PaintingType.cs
-    startLine: 72
+    startLine: 71
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
--- a/docs/api/TinyLife.Skills.Quality.yml
+++ b/docs/api/TinyLife.Skills.Quality.yml
@ -25,7 +25,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Quality
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 286
+    startLine: 288
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -64,7 +64,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Terrible
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 291
+    startLine: 293
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -98,7 +98,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Average
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 295
+    startLine: 297
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -132,7 +132,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Good
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 299
+    startLine: 301
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -166,7 +166,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Great
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 303
+    startLine: 305
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -200,7 +200,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Perfect
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 307
+    startLine: 309
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -234,7 +234,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Masterpiece
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 312
+    startLine: 314
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
--- a/docs/api/TinyLife.Skills.Skill.yml
+++ b/docs/api/TinyLife.Skills.Skill.yml
@ -7,10 +7,10 @@ items:
  children:
  - TinyLife.Skills.Skill.#ctor(TinyLife.Skills.SkillType)
  - TinyLife.Skills.Skill.Level
-  - TinyLife.Skills.Skill.LevelPercentage
  - TinyLife.Skills.Skill.PointPercentage
  - TinyLife.Skills.Skill.PointsToNextLevel
  - TinyLife.Skills.Skill.RequiredPointsToNextLevel
+  - TinyLife.Skills.Skill.TotalPercentage
  - TinyLife.Skills.Skill.Type
  langs:
  - csharp
@ -277,37 +277,37 @@ items:
  modifiers.vb:
  - Public
  - ReadOnly
- uid: TinyLife.Skills.Skill.LevelPercentage
-  commentId: P:TinyLife.Skills.Skill.LevelPercentage
-  id: LevelPercentage
+- uid: TinyLife.Skills.Skill.TotalPercentage
+  commentId: P:TinyLife.Skills.Skill.TotalPercentage
+  id: TotalPercentage
  parent: TinyLife.Skills.Skill
  langs:
  - csharp
  - vb
-  name: LevelPercentage
-  nameWithType: Skill.LevelPercentage
-  fullName: TinyLife.Skills.Skill.LevelPercentage
+  name: TotalPercentage
+  nameWithType: Skill.TotalPercentage
+  fullName: TinyLife.Skills.Skill.TotalPercentage
  type: Property
  source:
    remote:
      path: TinyLife/Skills/Skill.cs
      branch: main
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: LevelPercentage
+    id: TotalPercentage
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 60
+    startLine: 59
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
-  summary: "\nThe percentage of <xref href=\"TinyLife.Skills.Skill.Level\" data-throw-if-not-resolved=\"false\"></xref> out of the total <xref href=\"TinyLife.Skills.SkillType.MaxLevel\" data-throw-if-not-resolved=\"false\"></xref> that this skill can get to.\nNote that this value does not take into account the person&apos;s age or their <xref href=\"TinyLife.Skills.SkillType.ChildhoodMaxLevel\" data-throw-if-not-resolved=\"false\"></xref>.\nThis value is always between 0 and 1.\n"
+  summary: "\nThe percentage of the <xref href=\"TinyLife.Skills.Skill.Level\" data-throw-if-not-resolved=\"false\"></xref>, plus the <xref href=\"TinyLife.Skills.Skill.PointPercentage\" data-throw-if-not-resolved=\"false\"></xref>, out of the total <xref href=\"TinyLife.Skills.SkillType.MaxLevel\" data-throw-if-not-resolved=\"false\"></xref>.\nEssentially, this value represents the total progress that this skill has, between 0 and 1.\n"
  example: []
  syntax:
-    content: public float LevelPercentage { get; }
+    content: public float TotalPercentage { get; }
    parameters: []
    return:
      type: System.Single
-    content.vb: Public ReadOnly Property LevelPercentage As Single
-  overload: TinyLife.Skills.Skill.LevelPercentage*
+    content.vb: Public ReadOnly Property TotalPercentage As Single
+  overload: TinyLife.Skills.Skill.TotalPercentage*
  modifiers.csharp:
  - public
  - get
@ -332,7 +332,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 66
+    startLine: 65
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -796,17 +796,17 @@ references:
  name: PointPercentage
  nameWithType: Skill.PointPercentage
  fullName: TinyLife.Skills.Skill.PointPercentage
+- uid: TinyLife.Skills.Skill.PointPercentage
+  commentId: P:TinyLife.Skills.Skill.PointPercentage
+  isExternal: true
 - uid: TinyLife.Skills.SkillType.MaxLevel
  commentId: F:TinyLife.Skills.SkillType.MaxLevel
  isExternal: true
- uid: TinyLife.Skills.SkillType.ChildhoodMaxLevel
-  commentId: P:TinyLife.Skills.SkillType.ChildhoodMaxLevel
-  isExternal: true
- uid: TinyLife.Skills.Skill.LevelPercentage*
-  commentId: Overload:TinyLife.Skills.Skill.LevelPercentage
-  name: LevelPercentage
-  nameWithType: Skill.LevelPercentage
-  fullName: TinyLife.Skills.Skill.LevelPercentage
+- uid: TinyLife.Skills.Skill.TotalPercentage*
+  commentId: Overload:TinyLife.Skills.Skill.TotalPercentage
+  name: TotalPercentage
+  nameWithType: Skill.TotalPercentage
+  fullName: TinyLife.Skills.Skill.TotalPercentage
 - uid: TinyLife.Skills.Skill.#ctor*
  commentId: Overload:TinyLife.Skills.Skill.#ctor
  name: Skill
--- a/docs/api/TinyLife.Skills.SkillCategory.yml
+++ b/docs/api/TinyLife.Skills.SkillCategory.yml
@ -7,7 +7,6 @@ items:
  children:
  - TinyLife.Skills.SkillCategory.Creative
  - TinyLife.Skills.SkillCategory.Logical
-  - TinyLife.Skills.SkillCategory.None
  - TinyLife.Skills.SkillCategory.Physical
  - TinyLife.Skills.SkillCategory.Social
  langs:
@ -24,7 +23,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SkillCategory
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 253
+    startLine: 259
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -51,40 +50,6 @@ items:
  modifiers.vb:
  - Public
  - Enum
- uid: TinyLife.Skills.SkillCategory.None
-  commentId: F:TinyLife.Skills.SkillCategory.None
-  id: None
-  parent: TinyLife.Skills.SkillCategory
-  langs:
-  - csharp
-  - vb
-  name: None
-  nameWithType: SkillCategory.None
-  fullName: TinyLife.Skills.SkillCategory.None
-  type: Field
-  source:
-    remote:
-      path: TinyLife/Skills/Skill.cs
-      branch: main
-      repo: https://git.ellpeck.de/Ellpeck/TinyLife
-    id: None
-    path: ../TinyLife/Skills/Skill.cs
-    startLine: 259
-  assemblies:
-  - Tiny Life
-  namespace: TinyLife.Skills
-  summary: "\nA skill category for skills that fit into none of the other categories\n"
-  example: []
-  syntax:
-    content: None = 0
-    return:
-      type: TinyLife.Skills.SkillCategory
-  modifiers.csharp:
-  - public
-  - const
-  modifiers.vb:
-  - Public
-  - Const
 - uid: TinyLife.Skills.SkillCategory.Creative
  commentId: F:TinyLife.Skills.SkillCategory.Creative
  id: Creative
@ -103,7 +68,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Creative
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 264
+    startLine: 266
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -137,7 +102,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Logical
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 268
+    startLine: 270
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -171,7 +136,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Social
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 273
+    startLine: 275
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -205,7 +170,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Physical
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 278
+    startLine: 280
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -312,15 +277,15 @@ references:
  name: TinyLife.Utilities
  nameWithType: TinyLife.Utilities
  fullName: TinyLife.Utilities
+- uid: TinyLife.PersonalityType.Creative
+  commentId: F:TinyLife.PersonalityType.Creative
+  isExternal: true
 - uid: TinyLife.Skills.SkillCategory
  commentId: T:TinyLife.Skills.SkillCategory
  parent: TinyLife.Skills
  name: SkillCategory
  nameWithType: SkillCategory
  fullName: TinyLife.Skills.SkillCategory
- uid: TinyLife.PersonalityType.Creative
-  commentId: F:TinyLife.PersonalityType.Creative
-  isExternal: true
 - uid: TinyLife.PersonalityType.Likeable
  commentId: F:TinyLife.PersonalityType.Likeable
  isExternal: true
--- a/docs/api/TinyLife.Skills.SkillType.yml
+++ b/docs/api/TinyLife.Skills.SkillType.yml
@ -7,6 +7,7 @@ items:
  children:
  - TinyLife.Skills.SkillType.#ctor(System.String,MLEM.Textures.TextureRegion,System.Int32,TinyLife.Skills.SkillCategory)
  - TinyLife.Skills.SkillType.AdditionalEarnedActions
+  - TinyLife.Skills.SkillType.AllCategories
  - TinyLife.Skills.SkillType.Baking
  - TinyLife.Skills.SkillType.Categories
  - TinyLife.Skills.SkillType.Charisma
@ -43,7 +44,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SkillType
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 109
+    startLine: 110
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -76,6 +77,43 @@ items:
  modifiers.vb:
  - Public
  - Class
+- uid: TinyLife.Skills.SkillType.AllCategories
+  commentId: F:TinyLife.Skills.SkillType.AllCategories
+  id: AllCategories
+  parent: TinyLife.Skills.SkillType
+  langs:
+  - csharp
+  - vb
+  name: AllCategories
+  nameWithType: SkillType.AllCategories
+  fullName: TinyLife.Skills.SkillType.AllCategories
+  type: Field
+  source:
+    remote:
+      path: TinyLife/Skills/Skill.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: AllCategories
+    path: ../TinyLife/Skills/Skill.cs
+    startLine: 116
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Skills
+  summary: "\nAn array containing every defined <xref href=\"TinyLife.Skills.SkillCategory\" data-throw-if-not-resolved=\"false\"></xref>.\n"
+  example: []
+  syntax:
+    content: public static readonly SkillCategory[] AllCategories
+    return:
+      type: TinyLife.Skills.SkillCategory[]
+    content.vb: Public Shared ReadOnly AllCategories As SkillCategory()
+  modifiers.csharp:
+  - public
+  - static
+  - readonly
+  modifiers.vb:
+  - Public
+  - Shared
+  - ReadOnly
 - uid: TinyLife.Skills.SkillType.Types
  commentId: F:TinyLife.Skills.SkillType.Types
  id: Types
@ -94,7 +132,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 117
+    startLine: 123
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -131,7 +169,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Cooking
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 120
+    startLine: 126
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -166,7 +204,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Painting
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 125
+    startLine: 131
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -201,7 +239,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Charisma
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 126
+    startLine: 132
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -236,7 +274,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Humor
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 127
+    startLine: 133
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -271,7 +309,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Programming
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 128
+    startLine: 134
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -306,7 +344,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Repair
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 129
+    startLine: 135
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -341,7 +379,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Writing
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 130
+    startLine: 136
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -376,7 +414,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Gaming
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 131
+    startLine: 137
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -411,7 +449,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Fitness
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 132
+    startLine: 138
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -446,7 +484,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Cleaning
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 133
+    startLine: 139
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -481,7 +519,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Woodworking
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 134
+    startLine: 140
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -516,7 +554,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Baking
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 138
+    startLine: 144
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -551,7 +589,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Reasoning
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 143
+    startLine: 149
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -586,7 +624,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 149
+    startLine: 155
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -621,7 +659,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Texture
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 153
+    startLine: 159
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -656,7 +694,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: MaxLevel
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 158
+    startLine: 164
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -691,7 +729,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Categories
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 163
+    startLine: 169
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -726,7 +764,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ChildhoodMaxLevel
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 168
+    startLine: 174
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -763,7 +801,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AdditionalEarnedActions
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 173
+    startLine: 179
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -796,7 +834,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 182
+    startLine: 188
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -841,7 +879,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetRandomQuality
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 200
+    startLine: 206
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -892,7 +930,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetMaxLevel
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 233
+    startLine: 239
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -931,7 +969,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Skills/Skill.cs
-    startLine: 242
+    startLine: 248
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -1348,6 +1386,36 @@ references:
  name: TinyLife.Utilities
  nameWithType: TinyLife.Utilities
  fullName: TinyLife.Utilities
+- uid: TinyLife.Skills.SkillCategory
+  commentId: T:TinyLife.Skills.SkillCategory
+  parent: TinyLife.Skills
+  name: SkillCategory
+  nameWithType: SkillCategory
+  fullName: TinyLife.Skills.SkillCategory
+- uid: TinyLife.Skills.SkillCategory[]
+  isExternal: true
+  name: SkillCategory[]
+  nameWithType: SkillCategory[]
+  fullName: TinyLife.Skills.SkillCategory[]
+  nameWithType.vb: SkillCategory()
+  fullName.vb: TinyLife.Skills.SkillCategory()
+  name.vb: SkillCategory()
+  spec.csharp:
+  - uid: TinyLife.Skills.SkillCategory
+    name: SkillCategory
+    nameWithType: SkillCategory
+    fullName: TinyLife.Skills.SkillCategory
+  - name: '[]'
+    nameWithType: '[]'
+    fullName: '[]'
+  spec.vb:
+  - uid: TinyLife.Skills.SkillCategory
+    name: SkillCategory
+    nameWithType: SkillCategory
+    fullName: TinyLife.Skills.SkillCategory
+  - name: ()
+    nameWithType: ()
+    fullName: ()
 - uid: TinyLife.Skills.SkillType.Register(TinyLife.Skills.SkillType)
  commentId: M:TinyLife.Skills.SkillType.Register(TinyLife.Skills.SkillType)
  isExternal: true
@ -1499,12 +1567,6 @@ references:
  name: Int32
  nameWithType: Int32
  fullName: System.Int32
- uid: TinyLife.Skills.SkillCategory
-  commentId: T:TinyLife.Skills.SkillCategory
-  parent: TinyLife.Skills
-  name: SkillCategory
-  nameWithType: SkillCategory
-  fullName: TinyLife.Skills.SkillCategory
 - uid: TinyLife.PersonalityType.Creative
  commentId: F:TinyLife.PersonalityType.Creative
  isExternal: true
--- a/docs/api/TinyLife.Skills.WoodworkingRecipe.yml
+++ b/docs/api/TinyLife.Skills.WoodworkingRecipe.yml
@ -27,7 +27,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WoodworkingRecipe
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 20
+    startLine: 19
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -78,7 +78,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Recipes
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 27
+    startLine: 26
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -115,7 +115,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Output
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 62
+    startLine: 61
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -150,7 +150,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredLevel
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 66
+    startLine: 65
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -185,7 +185,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PriceMultiplier
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 70
+    startLine: 69
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -220,7 +220,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CraftingTime
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 75
+    startLine: 74
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -255,7 +255,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 80
+    startLine: 79
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -292,7 +292,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 89
+    startLine: 88
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
@ -337,7 +337,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Skills/WoodworkingRecipe.cs
-    startLine: 101
+    startLine: 100
  assemblies:
  - Tiny Life
  namespace: TinyLife.Skills
--- a/docs/api/TinyLife.Tools.PlayModeTool.StatType.yml
+++ b/docs/api/TinyLife.Tools.PlayModeTool.StatType.yml
@ -26,7 +26,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: StatType
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 1081
+    startLine: 1084
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -61,7 +61,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Needs
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 1084
+    startLine: 1087
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -93,7 +93,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Emotions
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 1085
+    startLine: 1088
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Skills
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 1086
+    startLine: 1089
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -157,7 +157,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Relationships
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 1087
+    startLine: 1090
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -189,7 +189,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Job
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 1088
+    startLine: 1091
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -221,7 +221,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LifeGoal
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 1089
+    startLine: 1092
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -253,7 +253,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: About
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 1090
+    startLine: 1093
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
--- a/docs/api/TinyLife.Tools.PlayModeTool.yml
+++ b/docs/api/TinyLife.Tools.PlayModeTool.yml
@ -285,7 +285,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Closed
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 287
+    startLine: 290
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -320,7 +320,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanUndoRedo
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 298
+    startLine: 301
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -358,7 +358,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Reload
    path: ../TinyLife/Tools/PlayModeTool.cs
-    startLine: 985
+    startLine: 988
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
--- a/docs/api/TinyLife.Tools.RoofTool.yml
+++ b/docs/api/TinyLife.Tools.RoofTool.yml
@ -28,7 +28,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RoofTool
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 19
+    startLine: 20
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -104,7 +104,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 30
+    startLine: 31
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -135,7 +135,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Update
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 33
+    startLine: 34
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -174,7 +174,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: InitBuildModeUi
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 113
+    startLine: 117
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -216,7 +216,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Draw
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 134
+    startLine: 138
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -258,7 +258,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ForceWallsUp
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 144
+    startLine: 148
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -296,7 +296,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanUndoRedo
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 149
+    startLine: 153
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -334,7 +334,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ShouldHighlightSelectedObject
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 154
+    startLine: 158
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -372,7 +372,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetMouseCursor
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 159
+    startLine: 163
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
@ -410,7 +410,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetMouseOffsetForCameraRotation
    path: ../TinyLife/Tools/RoofTool.cs
-    startLine: 188
+    startLine: 192
  assemblies:
  - Tiny Life
  namespace: TinyLife.Tools
--- a/docs/api/TinyLife.Uis.ControlsHint.yml
+++ b/docs/api/TinyLife.Uis.ControlsHint.yml
@ -25,7 +25,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ControlsHint
    path: ../TinyLife/Uis/ControlsHint.cs
-    startLine: 20
+    startLine: 19
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -70,7 +70,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Hints
    path: ../TinyLife/Uis/ControlsHint.cs
-    startLine: 26
+    startLine: 25
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -107,7 +107,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Uis/ControlsHint.cs
-    startLine: 71
+    startLine: 70
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -142,7 +142,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Keybind
    path: ../TinyLife/Uis/ControlsHint.cs
-    startLine: 76
+    startLine: 75
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -177,7 +177,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ShouldDisplay
    path: ../TinyLife/Uis/ControlsHint.cs
-    startLine: 80
+    startLine: 79
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -212,7 +212,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Uis/ControlsHint.cs
-    startLine: 88
+    startLine: 87
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -257,7 +257,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Uis/ControlsHint.cs
-    startLine: 99
+    startLine: 98
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
--- a/docs/api/TinyLife.Uis.CoveringGroup.yml
+++ b/docs/api/TinyLife.Uis.CoveringGroup.yml
@ -73,6 +73,8 @@ items:
  - MLEM.Ui.Elements.Element.GetGamepadNextElement
  - MLEM.Ui.Elements.Element.OnChildAdded
  - MLEM.Ui.Elements.Element.OnChildRemoved
+  - MLEM.Ui.Elements.Element.OnAddedToUi
+  - MLEM.Ui.Elements.Element.OnRemovedFromUi
  - MLEM.Ui.Elements.Element.OnDisposed
  - MLEM.Ui.Elements.Element.Children
  - MLEM.Ui.Elements.Element.AddChild``1({T},System.Int32)
@ -593,6 +595,20 @@ references:
  name: OnChildRemoved
  nameWithType: Element.OnChildRemoved
  fullName: MLEM.Ui.Elements.Element.OnChildRemoved
+- uid: MLEM.Ui.Elements.Element.OnAddedToUi
+  commentId: F:MLEM.Ui.Elements.Element.OnAddedToUi
+  parent: MLEM.Ui.Elements.Element
+  isExternal: true
+  name: OnAddedToUi
+  nameWithType: Element.OnAddedToUi
+  fullName: MLEM.Ui.Elements.Element.OnAddedToUi
+- uid: MLEM.Ui.Elements.Element.OnRemovedFromUi
+  commentId: F:MLEM.Ui.Elements.Element.OnRemovedFromUi
+  parent: MLEM.Ui.Elements.Element
+  isExternal: true
+  name: OnRemovedFromUi
+  nameWithType: Element.OnRemovedFromUi
+  fullName: MLEM.Ui.Elements.Element.OnRemovedFromUi
 - uid: MLEM.Ui.Elements.Element.OnDisposed
  commentId: F:MLEM.Ui.Elements.Element.OnDisposed
  parent: MLEM.Ui.Elements.Element
--- a/docs/api/TinyLife.Uis.InGameHint.yml
+++ b/docs/api/TinyLife.Uis.InGameHint.yml
@ -35,7 +35,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: InGameHint
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 21
+    startLine: 20
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -80,7 +80,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Hints
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 28
+    startLine: 27
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -117,7 +117,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Introduction
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 31
+    startLine: 30
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -152,7 +152,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: PersonalityTypes
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 32
+    startLine: 31
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -187,7 +187,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ClothesIntentions
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 33
+    startLine: 32
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -222,7 +222,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Interactions
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 34
+    startLine: 33
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -257,7 +257,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Outfits
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 35
+    startLine: 34
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -292,7 +292,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: InteractionPages
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 36
+    startLine: 35
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -327,7 +327,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OutOfTownActions
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 37
+    startLine: 36
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -362,7 +362,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LotEmployments
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 38
+    startLine: 37
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -397,7 +397,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 60
+    startLine: 59
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -432,7 +432,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 64
+    startLine: 63
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -467,7 +467,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Condition
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 68
+    startLine: 67
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -502,7 +502,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: HasBeenDisplayed
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 72
+    startLine: 71
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -539,7 +539,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 80
+    startLine: 79
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -584,7 +584,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Display
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 89
+    startLine: 88
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -616,7 +616,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/Uis/InGameHint.cs
-    startLine: 116
+    startLine: 115
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
--- a/docs/api/TinyLife.Uis.Menus.TransitionType.yml
+++ b/docs/api/TinyLife.Uis.Menus.TransitionType.yml
@ -21,7 +21,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: TransitionType
    path: ../TinyLife/Uis/Menus.cs
-    startLine: 787
+    startLine: 790
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -56,7 +56,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Swipe
    path: ../TinyLife/Uis/Menus.cs
-    startLine: 793
+    startLine: 796
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -90,7 +90,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Fade
    path: ../TinyLife/Uis/Menus.cs
-    startLine: 798
+    startLine: 801
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
--- a/docs/api/TinyLife.Uis.NotifType.yml
+++ b/docs/api/TinyLife.Uis.NotifType.yml
@ -24,7 +24,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: NotifType
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 254
+    startLine: 275
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -59,7 +59,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Info
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 259
+    startLine: 280
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -93,7 +93,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Warning
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 263
+    startLine: 284
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -127,7 +127,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: VeryImportant
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 268
+    startLine: 289
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -161,7 +161,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: VeryPositive
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 272
+    startLine: 293
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -195,7 +195,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Debug
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 276
+    startLine: 297
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
--- a/docs/api/TinyLife.Uis.Notifications.yml
+++ b/docs/api/TinyLife.Uis.Notifications.yml
@ -23,7 +23,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Notifications
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 23
+    startLine: 22
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -67,7 +67,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: MaxHistoryLength
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 28
+    startLine: 27
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -102,7 +102,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Add
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 53
+    startLine: 52
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -146,7 +146,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Add
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 64
+    startLine: 63
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
@ -190,7 +190,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RegisterIcon
    path: ../TinyLife/Uis/Notifications.cs
-    startLine: 74
+    startLine: 73
  assemblies:
  - Tiny Life
  namespace: TinyLife.Uis
--- a/docs/api/TinyLife.Utilities.Extensions.yml
+++ b/docs/api/TinyLife.Utilities.Extensions.yml
@ -5,6 +5,7 @@ items:
  id: Extensions
  parent: TinyLife.Utilities
  children:
+  - TinyLife.Utilities.Extensions.AddGamepadScrolling(MLEM.Ui.Elements.Panel)
  - TinyLife.Utilities.Extensions.AddHoverAnimation(MLEM.Ui.Elements.Button)
  - TinyLife.Utilities.Extensions.BothCompleted(TinyLife.Actions.CompletionType,System.Func{TinyLife.Actions.CompletionType})
  - TinyLife.Utilities.Extensions.BothValid(TinyLife.Actions.CanExecuteResult,System.Func{TinyLife.Actions.CanExecuteResult})
@ -1873,6 +1874,48 @@ items:
  modifiers.vb:
  - Public
  - Shared
+- uid: TinyLife.Utilities.Extensions.AddGamepadScrolling(MLEM.Ui.Elements.Panel)
+  commentId: M:TinyLife.Utilities.Extensions.AddGamepadScrolling(MLEM.Ui.Elements.Panel)
+  id: AddGamepadScrolling(MLEM.Ui.Elements.Panel)
+  isExtensionMethod: true
+  parent: TinyLife.Utilities.Extensions
+  langs:
+  - csharp
+  - vb
+  name: AddGamepadScrolling(Panel)
+  nameWithType: Extensions.AddGamepadScrolling(Panel)
+  fullName: TinyLife.Utilities.Extensions.AddGamepadScrolling(MLEM.Ui.Elements.Panel)
+  type: Method
+  source:
+    remote:
+      path: TinyLife/Utilities/Extensions.cs
+      branch: main
+      repo: https://git.ellpeck.de/Ellpeck/TinyLife
+    id: AddGamepadScrolling
+    path: ../TinyLife/Utilities/Extensions.cs
+    startLine: 716
+  assemblies:
+  - Tiny Life
+  namespace: TinyLife.Utilities
+  summary: "\nAdds the ability to use a gamepad to scroll to the given <xref href=\"MLEM.Ui.Elements.Panel\" data-throw-if-not-resolved=\"false\"></xref>.\n"
+  example: []
+  syntax:
+    content: public static void AddGamepadScrolling(this Panel panel)
+    parameters:
+    - id: panel
+      type: MLEM.Ui.Elements.Panel
+      description: The panel to add gamepad scrolling to.
+    content.vb: >-
+      <ExtensionAttribute>
+
+      Public Shared Sub AddGamepadScrolling(panel As Panel)
+  overload: TinyLife.Utilities.Extensions.AddGamepadScrolling*
+  modifiers.csharp:
+  - public
+  - static
+  modifiers.vb:
+  - Public
+  - Shared
 references:
 - uid: TinyLife.Utilities
  commentId: N:TinyLife.Utilities
@ -3180,3 +3223,15 @@ references:
  name: GetDaysBeforeAging
  nameWithType: Extensions.GetDaysBeforeAging
  fullName: TinyLife.Utilities.Extensions.GetDaysBeforeAging
+- uid: MLEM.Ui.Elements.Panel
+  commentId: T:MLEM.Ui.Elements.Panel
+  parent: MLEM.Ui.Elements
+  isExternal: true
+  name: Panel
+  nameWithType: Panel
+  fullName: MLEM.Ui.Elements.Panel
+- uid: TinyLife.Utilities.Extensions.AddGamepadScrolling*
+  commentId: Overload:TinyLife.Utilities.Extensions.AddGamepadScrolling
+  name: AddGamepadScrolling
+  nameWithType: Extensions.AddGamepadScrolling
+  fullName: TinyLife.Utilities.Extensions.AddGamepadScrolling
--- a/docs/api/TinyLife.World.ExportedLot.yml
+++ b/docs/api/TinyLife.World.ExportedLot.yml
@ -28,7 +28,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ExportedLot
    path: ../TinyLife/World/Lot.cs
-    startLine: 369
+    startLine: 368
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -77,7 +77,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ExportedVersion
    path: ../TinyLife/World/Lot.cs
-    startLine: 374
+    startLine: 373
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -110,7 +110,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Area
    path: ../TinyLife/World/Lot.cs
-    startLine: 378
+    startLine: 377
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -143,7 +143,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Type
    path: ../TinyLife/World/Lot.cs
-    startLine: 382
+    startLine: 381
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -176,7 +176,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Furniture
    path: ../TinyLife/World/Lot.cs
-    startLine: 386
+    startLine: 385
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -209,7 +209,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Walls
    path: ../TinyLife/World/Lot.cs
-    startLine: 390
+    startLine: 389
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -242,7 +242,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Roofs
    path: ../TinyLife/World/Lot.cs
-    startLine: 394
+    startLine: 393
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -275,7 +275,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Tiles
    path: ../TinyLife/World/Lot.cs
-    startLine: 398
+    startLine: 397
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -308,7 +308,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetPrice
    path: ../TinyLife/World/Lot.cs
-    startLine: 401
+    startLine: 400
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -345,7 +345,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetCoveredArea
    path: ../TinyLife/World/Lot.cs
-    startLine: 415
+    startLine: 414
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/TinyLife.World.Lot.yml
+++ b/docs/api/TinyLife.World.Lot.yml
@ -39,7 +39,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Lot
    path: ../TinyLife/World/Lot.cs
-    startLine: 27
+    startLine: 26
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -103,7 +103,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Id
    path: ../TinyLife/World/Lot.cs
-    startLine: 35
+    startLine: 34
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -148,7 +148,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Area
    path: ../TinyLife/World/Lot.cs
-    startLine: 39
+    startLine: 38
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -195,7 +195,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Type
    path: ../TinyLife/World/Lot.cs
-    startLine: 45
+    startLine: 44
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -232,7 +232,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Household
    path: ../TinyLife/World/Lot.cs
-    startLine: 61
+    startLine: 60
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -269,7 +269,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/World/Lot.cs
-    startLine: 66
+    startLine: 65
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -312,7 +312,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/World/Lot.cs
-    startLine: 76
+    startLine: 75
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -351,7 +351,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Validate
    path: ../TinyLife/World/Lot.cs
-    startLine: 84
+    startLine: 83
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -386,7 +386,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetObjects
    path: ../TinyLife/World/Lot.cs
-    startLine: 95
+    startLine: 94
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -427,7 +427,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetWalls
    path: ../TinyLife/World/Lot.cs
-    startLine: 108
+    startLine: 107
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -462,7 +462,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetRoofs
    path: ../TinyLife/World/Lot.cs
-    startLine: 121
+    startLine: 120
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -497,7 +497,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetDefaultTile
    path: ../TinyLife/World/Lot.cs
-    startLine: 135
+    startLine: 134
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -532,7 +532,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: AreRequirementsMet
    path: ../TinyLife/World/Lot.cs
-    startLine: 152
+    startLine: 151
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -567,7 +567,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetFrontDoor
    path: ../TinyLife/World/Lot.cs
-    startLine: 168
+    startLine: 167
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -606,7 +606,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetHomeLocation
    path: ../TinyLife/World/Lot.cs
-    startLine: 192
+    startLine: 191
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -645,7 +645,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetPrice
    path: ../TinyLife/World/Lot.cs
-    startLine: 209
+    startLine: 208
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -682,7 +682,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetWeeklyBills
    path: ../TinyLife/World/Lot.cs
-    startLine: 223
+    startLine: 222
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -717,7 +717,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Export
    path: ../TinyLife/World/Lot.cs
-    startLine: 235
+    startLine: 234
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -752,7 +752,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Import
    path: ../TinyLife/World/Lot.cs
-    startLine: 260
+    startLine: 259
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -794,7 +794,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanImport
    path: ../TinyLife/World/Lot.cs
-    startLine: 275
+    startLine: 274
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -833,7 +833,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetCoveredArea
    path: ../TinyLife/World/Lot.cs
-    startLine: 287
+    startLine: 286
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/TinyLife.World.LotEmployment.Instance.yml
+++ b/docs/api/TinyLife.World.LotEmployment.Instance.yml
@ -25,7 +25,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Instance
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 205
+    startLine: 204
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -80,7 +80,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Lot
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 211
+    startLine: 210
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -117,7 +117,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Type
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 215
+    startLine: 214
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -154,7 +154,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetManually
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 228
+    startLine: 227
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -201,7 +201,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 249
+    startLine: 248
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -246,7 +246,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Validate
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 262
+    startLine: 261
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -285,7 +285,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ShouldWorkRightNow
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 272
+    startLine: 271
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/TinyLife.World.LotEmployment.yml
+++ b/docs/api/TinyLife.World.LotEmployment.yml
@ -28,7 +28,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LotEmployment
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 24
+    startLine: 23
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -73,7 +73,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: MapWideEmployments
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 30
+    startLine: 29
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -110,7 +110,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 42
+    startLine: 41
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -145,7 +145,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Actions
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 47
+    startLine: 46
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -180,7 +180,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WorkHours
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 52
+    startLine: 51
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -215,7 +215,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsFinished
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 58
+    startLine: 57
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -252,7 +252,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IdleObjects
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 63
+    startLine: 62
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -289,7 +289,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 71
+    startLine: 70
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -334,7 +334,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetCurrentPerson
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 85
+    startLine: 84
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -376,7 +376,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SetCurrentPerson
    path: ../TinyLife/World/LotEmployment.cs
-    startLine: 98
+    startLine: 97
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/TinyLife.World.LotType.yml
+++ b/docs/api/TinyLife.World.LotType.yml
@ -37,7 +37,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: LotType
    path: ../TinyLife/World/Lot.cs
-    startLine: 425
+    startLine: 424
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -88,7 +88,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/World/Lot.cs
-    startLine: 432
+    startLine: 431
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Residential
    path: ../TinyLife/World/Lot.cs
-    startLine: 435
+    startLine: 434
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -160,7 +160,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Park
    path: ../TinyLife/World/Lot.cs
-    startLine: 438
+    startLine: 437
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -195,7 +195,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Gym
    path: ../TinyLife/World/Lot.cs
-    startLine: 441
+    startLine: 440
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -230,7 +230,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Cafe
    path: ../TinyLife/World/Lot.cs
-    startLine: 446
+    startLine: 445
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -265,7 +265,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: KidsPlayground
    path: ../TinyLife/World/Lot.cs
-    startLine: 460
+    startLine: 459
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -300,7 +300,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GenericPublicLot
    path: ../TinyLife/World/Lot.cs
-    startLine: 464
+    startLine: 463
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -335,7 +335,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/World/Lot.cs
-    startLine: 471
+    startLine: 470
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -370,7 +370,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/World/Lot.cs
-    startLine: 475
+    startLine: 474
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -405,7 +405,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: IsResidential
    path: ../TinyLife/World/Lot.cs
-    startLine: 480
+    startLine: 479
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -440,7 +440,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RequiredFurniture
    path: ../TinyLife/World/Lot.cs
-    startLine: 485
+    startLine: 484
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -475,7 +475,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetVisitPriority
    path: ../TinyLife/World/Lot.cs
-    startLine: 491
+    startLine: 490
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -510,7 +510,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Employments
    path: ../TinyLife/World/Lot.cs
-    startLine: 496
+    startLine: 495
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -547,7 +547,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: CanExecuteAction
    path: ../TinyLife/World/Lot.cs
-    startLine: 501
+    startLine: 500
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -584,7 +584,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DisplayName
    path: ../TinyLife/World/Lot.cs
-    startLine: 506
+    startLine: 505
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -621,7 +621,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/World/Lot.cs
-    startLine: 516
+    startLine: 515
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -672,7 +672,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/World/Lot.cs
-    startLine: 528
+    startLine: 527
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -712,7 +712,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetGroupVisitPriority
    path: ../TinyLife/World/Lot.cs
-    startLine: 541
+    startLine: 540
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/TinyLife.World.OpeningType.yml
+++ b/docs/api/TinyLife.World.OpeningType.yml
@ -31,7 +31,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OpeningType
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 19
+    startLine: 18
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -82,7 +82,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 27
+    startLine: 26
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -119,7 +119,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 50
+    startLine: 49
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -154,7 +154,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: WallMode
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 54
+    startLine: 53
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -189,7 +189,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Price
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 58
+    startLine: 57
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -224,7 +224,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Colors
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 62
+    startLine: 61
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -259,7 +259,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 67
+    startLine: 66
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -294,7 +294,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 75
+    startLine: 74
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -344,7 +344,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 88
+    startLine: 87
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -401,7 +401,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Draw
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 110
+    startLine: 109
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -464,7 +464,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DrawUi
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 133
+    startLine: 132
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -515,7 +515,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Construct
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 146
+    startLine: 145
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -560,7 +560,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/World/OpeningType.cs
-    startLine: 154
+    startLine: 153
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/TinyLife.World.Roof.yml
+++ b/docs/api/TinyLife.World.Roof.yml
@ -29,7 +29,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Roof
    path: ../TinyLife/World/Roof.cs
-    startLine: 228
+    startLine: 227
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -87,7 +87,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Type
    path: ../TinyLife/World/Roof.cs
-    startLine: 235
+    startLine: 234
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -132,7 +132,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Rotation
    path: ../TinyLife/World/Roof.cs
-    startLine: 240
+    startLine: 239
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -179,7 +179,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Color
    path: ../TinyLife/World/Roof.cs
-    startLine: 246
+    startLine: 245
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -224,7 +224,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Area
    path: ../TinyLife/World/Roof.cs
-    startLine: 250
+    startLine: 249
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -271,7 +271,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Wallpaper
    path: ../TinyLife/World/Roof.cs
-    startLine: 257
+    startLine: 256
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -314,7 +314,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/World/Roof.cs
-    startLine: 266
+    startLine: 265
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -359,7 +359,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetPrice
    path: ../TinyLife/World/Roof.cs
-    startLine: 275
+    startLine: 274
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -396,7 +396,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Validate
    path: ../TinyLife/World/Roof.cs
-    startLine: 283
+    startLine: 282
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -431,7 +431,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetRoofAttachedFurnitureOffset
    path: ../TinyLife/World/Roof.cs
-    startLine: 293
+    startLine: 292
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -470,7 +470,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GenerateRoof
    path: ../TinyLife/World/Roof.cs
-    startLine: 306
+    startLine: 305
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/TinyLife.World.RoofStyle.yml
+++ b/docs/api/TinyLife.World.RoofStyle.yml
@ -22,7 +22,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RoofStyle
    path: ../TinyLife/World/Roof.cs
-    startLine: 352
+    startLine: 351
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -57,7 +57,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Flat
    path: ../TinyLife/World/Roof.cs
-    startLine: 357
+    startLine: 356
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -91,7 +91,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Gable
    path: ../TinyLife/World/Roof.cs
-    startLine: 361
+    startLine: 360
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -125,7 +125,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Custom
    path: ../TinyLife/World/Roof.cs
-    startLine: 365
+    startLine: 364
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/TinyLife.World.RoofType.yml
+++ b/docs/api/TinyLife.World.RoofType.yml
@ -38,7 +38,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RoofType
    path: ../TinyLife/World/Roof.cs
-    startLine: 25
+    startLine: 24
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -89,7 +89,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Types
    path: ../TinyLife/World/Roof.cs
-    startLine: 32
+    startLine: 31
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -126,7 +126,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: ModernFlat
    path: ../TinyLife/World/Roof.cs
-    startLine: 35
+    startLine: 34
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -161,7 +161,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: OldStyleFlat
    path: ../TinyLife/World/Roof.cs
-    startLine: 36
+    startLine: 35
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -196,7 +196,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SquareShingles
    path: ../TinyLife/World/Roof.cs
-    startLine: 37
+    startLine: 36
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -231,7 +231,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Thatch
    path: ../TinyLife/World/Roof.cs
-    startLine: 38
+    startLine: 37
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -266,7 +266,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: RoundedShingles
    path: ../TinyLife/World/Roof.cs
-    startLine: 39
+    startLine: 38
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -301,7 +301,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: SheetMetal
    path: ../TinyLife/World/Roof.cs
-    startLine: 40
+    startLine: 39
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -336,7 +336,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Name
    path: ../TinyLife/World/Roof.cs
-    startLine: 46
+    startLine: 45
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -371,7 +371,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Price
    path: ../TinyLife/World/Roof.cs
-    startLine: 50
+    startLine: 49
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -406,7 +406,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Colors
    path: ../TinyLife/World/Roof.cs
-    startLine: 54
+    startLine: 53
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -441,7 +441,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Texture
    path: ../TinyLife/World/Roof.cs
-    startLine: 59
+    startLine: 58
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -476,7 +476,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Style
    path: ../TinyLife/World/Roof.cs
-    startLine: 64
+    startLine: 63
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -511,7 +511,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Icon
    path: ../TinyLife/World/Roof.cs
-    startLine: 69
+    startLine: 68
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -546,7 +546,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: .ctor
    path: ../TinyLife/World/Roof.cs
-    startLine: 80
+    startLine: 79
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -597,7 +597,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: DrawUi
    path: ../TinyLife/World/Roof.cs
-    startLine: 96
+    startLine: 95
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -644,7 +644,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Draw
    path: ../TinyLife/World/Roof.cs
-    startLine: 115
+    startLine: 114
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -703,7 +703,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetGableOffset
    path: ../TinyLife/World/Roof.cs
-    startLine: 190
+    startLine: 189
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -750,7 +750,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: GetPrice
    path: ../TinyLife/World/Roof.cs
-    startLine: 208
+    startLine: 207
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
@ -791,7 +791,7 @@ items:
      repo: https://git.ellpeck.de/Ellpeck/TinyLife
    id: Register
    path: ../TinyLife/World/Roof.cs
-    startLine: 217
+    startLine: 216
  assemblies:
  - Tiny Life
  namespace: TinyLife.World
--- a/docs/api/toc.yml
+++ b/docs/api/toc.yml
@ -192,14 +192,17 @@
  - uid: TinyLife.Goals.AutoTriggerGoal
    name: AutoTriggerGoal
  - uid: TinyLife.Goals.AutoTriggerGoal`1
-    name: AutoTriggerGoal<T>
-    name.vb: AutoTriggerGoal(Of T)
+    name: AutoTriggerGoal<TValue>
+    name.vb: AutoTriggerGoal(Of TValue)
  - uid: TinyLife.Goals.ConditionedGoal
    name: ConditionedGoal
  - uid: TinyLife.Goals.DistinctGoal
    name: DistinctGoal
  - uid: TinyLife.Goals.Goal
    name: Goal
+  - uid: TinyLife.Goals.Goal`1
+    name: Goal<TInfo>
+    name.vb: Goal(Of TInfo)
  - uid: TinyLife.Goals.GoalInfo
    name: GoalInfo
  - uid: TinyLife.Goals.GoalSet