From a9299371afed1e9b339123e1148a5095c7583e80 Mon Sep 17 00:00:00 2001
From: Asgard <95163444+AsgardXIV@users.noreply.github.com>
Date: Sat, 14 May 2022 20:54:05 -0600
Subject: [PATCH] Voice support

---
 Anamnesis/Actor/Pages/ActionPage.xaml         |  2 -
 Anamnesis/Actor/Pages/ActionPage.xaml.cs      | 11 ++-
 Anamnesis/Actor/Pages/CharacterPage.xaml      | 79 +++++++--------
 Anamnesis/Actor/Pages/CharacterPage.xaml.cs   | 96 ++++++++++++++-----
 .../Actor/Views/CharacterModelEditor.xaml     |  4 +-
 Anamnesis/Actor/Views/ItemView.xaml.cs        |  2 +-
 Anamnesis/GameData/Excel/CharaMakeType.cs     |  9 ++
 Anamnesis/Languages/en.json                   |  1 +
 Anamnesis/Memory/ActorBasicMemory.cs          |  4 +
 Anamnesis/Memory/ActorMemory.cs               |  7 +-
 Anamnesis/Memory/ActorModelMemory.cs          |  4 +-
 11 files changed, 139 insertions(+), 80 deletions(-)

diff --git a/Anamnesis/Actor/Pages/ActionPage.xaml b/Anamnesis/Actor/Pages/ActionPage.xaml
index 5678a7e53..01fd40303 100644
--- a/Anamnesis/Actor/Pages/ActionPage.xaml
+++ b/Anamnesis/Actor/Pages/ActionPage.xaml
@@ -84,8 +84,6 @@
 											   Style="{StaticResource Label}" />
 
                         <ComboBox Grid.Row="2" Grid.Column="1" ItemsSource="{Binding LipSyncTypes, Mode=OneTime}" SelectedValue="{Binding Actor.Animation.LipsOverride, Mode=TwoWay}" SelectedValuePath="AnimationId" DisplayMemberPath="DisplayName" />
-
-                        
                     </Grid>
                 </GroupBox>
             </StackPanel>
diff --git a/Anamnesis/Actor/Pages/ActionPage.xaml.cs b/Anamnesis/Actor/Pages/ActionPage.xaml.cs
index 326f32525..90328190b 100644
--- a/Anamnesis/Actor/Pages/ActionPage.xaml.cs
+++ b/Anamnesis/Actor/Pages/ActionPage.xaml.cs
@@ -27,8 +27,7 @@ public ActionPage()
 
 		this.ContentArea.DataContext = this;
 
-		// Grab "no animation" and all "speak/" animations, which are the only ones valid in this slot
-		this.LipSyncTypes = GameDataService.ActionTimelines.Where(x => x.AnimationId == 0 || (x.Key?.StartsWith("speak/") ?? false));
+		this.LipSyncTypes = this.GenerateLipList();
 	}
 
 	public GposeService GposeService => GposeService.Instance;
@@ -36,6 +35,7 @@ public ActionPage()
 	public PoseService PoseService => PoseService.Instance;
 	public ActorMemory? Actor { get; private set; }
 	public IEnumerable<ActionTimeline> LipSyncTypes { get; private set; }
+
 	public UserAnimationOverride AnimationOverride { get; private set; } = new();
 
 	public ConditionalWeakTable<ActorMemory, UserAnimationOverride> UserAnimationOverrides { get; private set; } = new();
@@ -78,6 +78,13 @@ private void OnActorChanged(ActorMemory? actor)
 		}
 	}
 
+	private IEnumerable<ActionTimeline> GenerateLipList()
+	{
+		// Grab "no animation" and all "speak/" animations, which are the only ones valid in this slot
+		IEnumerable<ActionTimeline> lips = GameDataService.ActionTimelines.Where(x => x.AnimationId == 0 || (x.Key?.StartsWith("speak/") ?? false));
+		return lips;
+	}
+
 	private void OnBaseAnimationSearchClicked(object sender, RoutedEventArgs e)
 	{
 		if (this.Actor == null)
diff --git a/Anamnesis/Actor/Pages/CharacterPage.xaml b/Anamnesis/Actor/Pages/CharacterPage.xaml
index 64fb307f4..a3b7c38a2 100644
--- a/Anamnesis/Actor/Pages/CharacterPage.xaml
+++ b/Anamnesis/Actor/Pages/CharacterPage.xaml
@@ -57,7 +57,7 @@
 
 					<Button Click="OnRaceGearClicked"
 							Style="{StaticResource TransparentIconButton}"
-							Visibility="{Binding Actor.IsPlayer, Converter={StaticResource B2V}}">
+							Visibility="{Binding Actor.IsHuman, Converter={StaticResource B2V}}">
 
 						<Button.ToolTip>
 							<XivToolsWpf:TextBlock Key="Character_Equipment_RaceGear" />
@@ -69,7 +69,7 @@
 
 					<Button Click="OnNpcSmallclothesClicked"
 							Style="{StaticResource TransparentIconButton}"
-							Visibility="{Binding Actor.IsPlayer, Converter={StaticResource B2V}}">
+							Visibility="{Binding Actor.IsHuman, Converter={StaticResource B2V}}">
 
 						<Button.ToolTip>
 							<XivToolsWpf:TextBlock Key="Character_Equipment_NpcSmallclothes" />
@@ -138,6 +138,7 @@
 							<RowDefinition />
 							<RowDefinition />
 							<RowDefinition />
+                            <RowDefinition />
 						</Grid.RowDefinitions>
 
 						<XivToolsWpf:TextBlock Key="Character_Actor_Nickname"
@@ -151,44 +152,6 @@
 								 Style="{StaticResource MaterialDesignTextBox}"
 								 Text="{Binding Actor.Nickname, UpdateSourceTrigger=PropertyChanged}"/>
 
-						<!--<XivToolsWpf:TextBlock Key="Character_Actor_EntityType"
-											   Grid.Row="2"
-											   Grid.Column="0"
-											   Style="{StaticResource Label}" />
-						<Grid Grid.Row="2"
-							  Grid.Column="1"
-							  Margin="0,2,0,0">
-							<ComboBox ItemsSource="{Binding Source={x:Static anaMem:ActorType.AllActorTypes}}" SelectedIndex="{Binding Actor.ObjectKindInt}">
-								<ComboBox.ItemContainerStyle>
-									<Style TargetType="{x:Type ComboBoxItem}">
-										<Setter Property="IsEnabled" Value="{Binding IsSupportedType}"/>
-									</Style>
-								</ComboBox.ItemContainerStyle>
-								
-								<ComboBox.ItemTemplate>
-									<DataTemplate>
-										<TextBlock Text="{Binding Name}" />
-									</DataTemplate>
-								</ComboBox.ItemTemplate>
-							</ComboBox>
-						</Grid>
-
-						<XivToolsWpf:TextBlock Key="Character_Actor_Model"
-											   Grid.Row="3"
-											   Grid.Column="0"
-											   Style="{StaticResource Label}" />
-						<Grid Grid.Row="3"
-							  Grid.Column="1"
-							  Margin="0,2,0,0"
-							  IsEnabled="{Binding Actor.IsOverworldActor}">
-
-							<XivToolsWpf:NumberBox Value="{Binding Actor.ModelType}"
-							   Minimum="0"
-							   Maximum="10000"
-							   Buttons="True" />
-
-						</Grid>-->
-
 						<XivToolsWpf:TextBlock Key="Character_Actor_Alpha"
 											   Grid.Row="4"
 											   Grid.Column="0"
@@ -201,13 +164,43 @@
 											   TickFrequency="0.1"
 											   Value="{Binding Actor.Transparency}" />
 
-
-						<XivToolsWpf:TextBlock Key="SubActor_Title"
+                        <XivToolsWpf:TextBlock Key="Character_Actor_Voice"
 											   Grid.Row="5"
 											   Grid.Column="0"
 											   Style="{StaticResource Label}" />
+                        <ComboBox Grid.Row="5" Grid.Column="1" ItemsSource="{Binding VoiceEntries, Mode=OneTime}" SelectedValue="{Binding Actor.Voice, Mode=TwoWay}" IsEnabled="{Binding Actor.IsPlayer}" SelectedValuePath="VoiceId">
+                            <ComboBox.GroupStyle>
+                                <GroupStyle>
+                                    <GroupStyle.HeaderTemplate>
+                                        <DataTemplate>
+                                            <XivToolsWpf:TextBlock
+											   Style="{StaticResource Label}"
+                                               HorizontalAlignment="Left"
+                                               FontStyle="Italic"
+                                               FontWeight="Bold"
+                                               FontSize="13"
+                                               Padding="10,5"
+                                               Text="{Binding Name}" 
+                                                />
+
+                                        </DataTemplate>
+                                    </GroupStyle.HeaderTemplate>
+                                </GroupStyle>
+                            </ComboBox.GroupStyle>
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding VoiceName}"/>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+
+
+                        <XivToolsWpf:TextBlock Key="SubActor_Title"
+											   Grid.Row="6"
+											   Grid.Column="0"
+											   Style="{StaticResource Label}" />
 
-						<StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="1" Margin="0, 6, 0, 0">
+						<StackPanel Orientation="Horizontal" Grid.Row="6" Grid.Column="1" Margin="0, 6, 0, 0">
 							<views:SubActorEditor Actor="{Binding Actor}" SubActor="{Binding Actor.Mount}" SubActorType="Mount" Margin="3,0"/>
 							<views:SubActorEditor Actor="{Binding Actor}" SubActor="{Binding Actor.Companion}" SubActorType="Companion" Margin="3,0"/>
 							<views:SubActorEditor Actor="{Binding Actor}" SubActor="{Binding Actor.Ornament}" SubActorType="Ornament" Margin="3,0"/>
diff --git a/Anamnesis/Actor/Pages/CharacterPage.xaml.cs b/Anamnesis/Actor/Pages/CharacterPage.xaml.cs
index 55d6457a2..c20a7dda0 100644
--- a/Anamnesis/Actor/Pages/CharacterPage.xaml.cs
+++ b/Anamnesis/Actor/Pages/CharacterPage.xaml.cs
@@ -4,14 +4,17 @@
 namespace Anamnesis.Actor.Pages;
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using Anamnesis.Actor.Utilities;
 using Anamnesis.Actor.Views;
 using Anamnesis.Files;
 using Anamnesis.GameData;
+using Anamnesis.GameData.Excel;
 using Anamnesis.Keyboard;
 using Anamnesis.Memory;
 using Anamnesis.Services;
@@ -36,9 +39,12 @@ public CharacterPage()
 		this.ContentArea.DataContext = this;
 
 		HotkeyService.RegisterHotkeyHandler("CharacterPage.ClearEquipment", () => this.OnClearClicked());
+
+		this.VoiceEntries = this.GenerateVoiceList();
 	}
 
 	public ActorMemory? Actor { get; private set; }
+	public ListCollectionView VoiceEntries { get; private set; }
 
 	private void OnLoaded(object sender, RoutedEventArgs e)
 	{
@@ -50,23 +56,56 @@ private void OnDataContextChanged(object sender, DependencyPropertyChangedEventA
 		this.OnActorChanged(this.DataContext as ActorMemory);
 	}
 
+	private ListCollectionView GenerateVoiceList()
+	{
+		List<VoiceEntry> entries = new();
+		foreach (var makeType in GameDataService.CharacterMakeTypes)
+		{
+			if (makeType == null)
+				continue;
+
+			if (makeType.Tribe == 0)
+				continue;
+
+			Tribe? tribe = GameDataService.Tribes.GetRow((uint)makeType.Tribe);
+
+			if (tribe == null)
+				continue;
+
+			int voiceCount = makeType.Voices!.Count;
+			for (int i = 0; i < voiceCount; i++)
+			{
+				byte voiceId = makeType.Voices[i]!;
+				VoiceEntry entry = new();
+				entry.VoiceName = $"Voice #{i + 1} ({voiceId})";
+				entry.VoiceCategory = $"{makeType.Race}, {tribe.Masculine} ({makeType.Gender})";
+				entry.VoiceId = voiceId;
+				entries.Add(entry);
+			}
+		}
+
+		ListCollectionView voices = new ListCollectionView(entries);
+		voices.GroupDescriptions.Add(new PropertyGroupDescription("VoiceCategory"));
+		return voices;
+	}
+
 	private void OnClearClicked(object? sender = null, RoutedEventArgs? e = null)
 	{
 		if (this.Actor == null)
 			return;
 
-		this.Actor.MainHand?.Clear(this.Actor.IsPlayer);
-		this.Actor.OffHand?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Arms?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Chest?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Ear?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Feet?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Head?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Legs?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.LFinger?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Neck?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.RFinger?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Wrist?.Clear(this.Actor.IsPlayer);
+		this.Actor.MainHand?.Clear(this.Actor.IsHuman);
+		this.Actor.OffHand?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Arms?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Chest?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Ear?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Feet?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Head?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Legs?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.LFinger?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Neck?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.RFinger?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Wrist?.Clear(this.Actor.IsHuman);
 
 		this.Actor?.ModelObject?.Weapons?.Hide();
 		this.Actor?.ModelObject?.Weapons?.SubModel?.Hide();
@@ -77,18 +116,18 @@ private void OnNpcSmallclothesClicked(object sender, RoutedEventArgs e)
 		if (this.Actor == null)
 			return;
 
-		if (!this.Actor.IsPlayer)
+		if (!this.Actor.IsHuman)
 		{
 			this.OnClearClicked(sender, e);
 			return;
 		}
 
-		this.Actor.Equipment?.Ear?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Head?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.LFinger?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Neck?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.RFinger?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Wrist?.Clear(this.Actor.IsPlayer);
+		this.Actor.Equipment?.Ear?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Head?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.LFinger?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Neck?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.RFinger?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Wrist?.Clear(this.Actor.IsHuman);
 		this.Actor.Equipment?.Arms?.Equip(ItemUtility.NpcBodyItem);
 		this.Actor.Equipment?.Chest?.Equip(ItemUtility.NpcBodyItem);
 		this.Actor.Equipment?.Legs?.Equip(ItemUtility.NpcBodyItem);
@@ -133,12 +172,12 @@ private void OnRaceGearClicked(object sender, RoutedEventArgs e)
 			this.Actor.Equipment?.Feet?.Equip(feet);
 		}
 
-		this.Actor.Equipment?.Ear?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Head?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.LFinger?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Neck?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.RFinger?.Clear(this.Actor.IsPlayer);
-		this.Actor.Equipment?.Wrist?.Clear(this.Actor.IsPlayer);
+		this.Actor.Equipment?.Ear?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Head?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.LFinger?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Neck?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.RFinger?.Clear(this.Actor.IsHuman);
+		this.Actor.Equipment?.Wrist?.Clear(this.Actor.IsHuman);
 	}
 
 	private async void OnLoadClicked(object sender, RoutedEventArgs e)
@@ -321,4 +360,11 @@ private void OnActorChanged(ActorMemory? actor)
 			this.IsEnabled = hasValidSelection;
 		});
 	}
+
+	public class VoiceEntry
+	{
+		public byte VoiceId { get; set; }
+		public string VoiceName { get; set; } = string.Empty;
+		public string VoiceCategory { get; set; } = string.Empty;
+	}
 }
diff --git a/Anamnesis/Actor/Views/CharacterModelEditor.xaml b/Anamnesis/Actor/Views/CharacterModelEditor.xaml
index 86d324e2b..3400a955a 100644
--- a/Anamnesis/Actor/Views/CharacterModelEditor.xaml
+++ b/Anamnesis/Actor/Views/CharacterModelEditor.xaml
@@ -37,7 +37,7 @@
 			DataHead="{Binding ModelObject.DataHead}"
 			DataPath="{Binding ModelObject.DataPath}"
 			Tribe="{Binding Customize.Tribe}"
-			IsEnabled="{Binding ModelObject.IsPlayer}"/>-->
+			IsEnabled="{Binding ModelObject.IsHuman}"/>-->
 
 		<!-- Height -->
 		<xtw:TextBlock Grid.Row="1" Key="Character_Model_Height" Style="{StaticResource Label}"/>
@@ -91,7 +91,7 @@
 		<ana:VectorEditor Grid.Row="4"
 						  Grid.Column="1"
 						  Value="{Binding ModelObject.Bust.Scale}" Expanded="False" CanLink="True" Minimum="0" Maximum="10"
-						  IsEnabled="{Binding ModelObject.IsPlayer}"/>
+						  IsEnabled="{Binding ModelObject.IsHuman}"/>
 
 	</Grid>
 </UserControl>
diff --git a/Anamnesis/Actor/Views/ItemView.xaml.cs b/Anamnesis/Actor/Views/ItemView.xaml.cs
index aab0373f3..471b1440b 100644
--- a/Anamnesis/Actor/Views/ItemView.xaml.cs
+++ b/Anamnesis/Actor/Views/ItemView.xaml.cs
@@ -150,7 +150,7 @@ private void OnSlotMouseUp(object sender, MouseButtonEventArgs e)
 
 		if (e.ChangedButton == MouseButton.Middle && e.ButtonState == MouseButtonState.Released)
 		{
-			this.ItemModel?.Clear(this.Actor.IsPlayer);
+			this.ItemModel?.Clear(this.Actor.IsHuman);
 		}
 	}
 
diff --git a/Anamnesis/GameData/Excel/CharaMakeType.cs b/Anamnesis/GameData/Excel/CharaMakeType.cs
index 540f6dcef..0a7d460e2 100644
--- a/Anamnesis/GameData/Excel/CharaMakeType.cs
+++ b/Anamnesis/GameData/Excel/CharaMakeType.cs
@@ -23,6 +23,7 @@ public class CharaMakeType : ExcelRow
 
 	public int[]? FacialFeatureOptions { get; private set; }
 	public List<ImageReference>? FacialFeatures { get; private set; }
+	public List<byte>? Voices { get; private set; }
 
 	public override void PopulateData(RowParser parser, LuminaData lumina, Language language)
 	{
@@ -41,5 +42,13 @@ public override void PopulateData(RowParser parser, LuminaData lumina, Language
 			this.FacialFeatureOptions[i] = parser.ReadColumn<int>(3291 + i);
 			this.FacialFeatures.Add(new ImageReference(this.FacialFeatureOptions[i]));
 		}
+
+		this.Voices = new List<byte>();
+
+		for (int i = 0; i < 12; i++)
+		{
+			byte voice = parser.ReadColumn<byte>(3279 + i);
+			this.Voices.Add(voice);
+		}
 	}
 }
diff --git a/Anamnesis/Languages/en.json b/Anamnesis/Languages/en.json
index 79a149ac4..ca3cbffac 100644
--- a/Anamnesis/Languages/en.json
+++ b/Anamnesis/Languages/en.json
@@ -203,6 +203,7 @@
 	"Character_Actor_EntityType": "Type",
 	"Character_Actor_Nickname": "Nickname",
 	"Character_Actor_DataPath": "Data Path",
+	"Character_Actor_Voice": "Voice",
 
 	"Character_Model_Header": "Model",
 	"Character_Model_Height": "Height",
diff --git a/Anamnesis/Memory/ActorBasicMemory.cs b/Anamnesis/Memory/ActorBasicMemory.cs
index 00aa253a0..efdcfc9c5 100644
--- a/Anamnesis/Memory/ActorBasicMemory.cs
+++ b/Anamnesis/Memory/ActorBasicMemory.cs
@@ -74,12 +74,16 @@ public string Name
 		}
 	}
 
+	[DependsOn(nameof(ObjectKind))]
 	public int ObjectKindInt
 	{
 		get => (int)this.ObjectKind;
 		set => this.ObjectKind = (ActorTypes)value;
 	}
 
+	[DependsOn(nameof(ObjectKind))]
+	public bool IsPlayer => this.ObjectKind == ActorTypes.Player;
+
 	[DependsOn(nameof(ObjectIndex), nameof(Address))]
 	public bool IsValid
 	{
diff --git a/Anamnesis/Memory/ActorMemory.cs b/Anamnesis/Memory/ActorMemory.cs
index b03182ab3..f9dae5db3 100644
--- a/Anamnesis/Memory/ActorMemory.cs
+++ b/Anamnesis/Memory/ActorMemory.cs
@@ -53,6 +53,7 @@ public enum CharacterFlagDefs : byte
 	[Bind(0x09A0)] public AnimationMemory? Animation { get; set; }
 	[Bind(0x11E4)] public bool IsMotionEnabled { get; set; }
 	[Bind(0x19E0)] public float Transparency { get; set; }
+	[Bind(0x1ABA)] public byte Voice { get; set; }
 	[Bind(0x1ABC)] public byte CharacterModeRaw { get; set; }
 	[Bind(0x1ABD)] public byte CharacterModeInput { get; set; }
 	[Bind(0x1AE4)] public byte AttachmentPoint { get; set; }
@@ -66,7 +67,7 @@ public enum CharacterFlagDefs : byte
 	[DependsOn(nameof(IsValid), nameof(IsOverworldActor), nameof(Name), nameof(RenderMode))]
 	public bool CanRefresh => ActorService.Instance.CanRefreshActor(this);
 
-	public bool IsPlayer => this.ModelObject != null && this.ModelObject.IsPlayer;
+	public bool IsHuman => this.ModelObject != null && this.ModelObject.IsHuman;
 
 	[DependsOn(nameof(ModelType))]
 	public bool IsChocobo => this.ModelType == 1;
@@ -180,9 +181,9 @@ public async Task RefreshAsync()
 			this.WriteDelayedBinds();
 		}
 
-		this.RaisePropertyChanged(nameof(this.IsPlayer));
+		this.RaisePropertyChanged(nameof(this.IsHuman));
 		await Task.Delay(150);
-		this.RaisePropertyChanged(nameof(this.IsPlayer));
+		this.RaisePropertyChanged(nameof(this.IsHuman));
 	}
 
 	public void RaiseRefreshChanged()
diff --git a/Anamnesis/Memory/ActorModelMemory.cs b/Anamnesis/Memory/ActorModelMemory.cs
index 320c24b40..20f6fe10d 100644
--- a/Anamnesis/Memory/ActorModelMemory.cs
+++ b/Anamnesis/Memory/ActorModelMemory.cs
@@ -63,7 +63,7 @@ public bool ForceDrenched
 		set => this.SetFrozen(nameof(ActorModelMemory.Drenched), value, value ? 5 : 0);
 	}
 
-	public bool IsPlayer
+	public bool IsHuman
 	{
 		get
 		{
@@ -84,7 +84,7 @@ protected override bool CanRead(BindInfo bind)
 		if (bind.Name == nameof(ActorModelMemory.ExtendedAppearance))
 		{
 			// No extended appearance for anything that isn't a player!
-			if (!this.IsPlayer)
+			if (!this.IsHuman)
 			{
 				if (this.ExtendedAppearance != null)
 				{