From f49d223e7bd4c88effa568d3cd6c4689cd84b90f Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 22 Apr 2020 23:22:06 -0700 Subject: [PATCH] Indirectly get villager name Villager[Index] != Villager that inhabits House[Index] Closes #99 --- NHSE.WinForms/Subforms/Map/VillagerHouseEditor.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/NHSE.WinForms/Subforms/Map/VillagerHouseEditor.cs b/NHSE.WinForms/Subforms/Map/VillagerHouseEditor.cs index f9ec9e1..bcf2c8e 100644 --- a/NHSE.WinForms/Subforms/Map/VillagerHouseEditor.cs +++ b/NHSE.WinForms/Subforms/Map/VillagerHouseEditor.cs @@ -52,12 +52,14 @@ private void PG_Item_PropertyValueChanged(object s, PropertyValueChangedEventArg LB_Items.Items[Index] = GetHouseSummary(Houses[Index]); } - private string GetHouseSummary(VillagerHouse house) + private string GetHouseSummary(VillagerHouse house) => $"{GetVillagerName(house)}'s House"; + + private string GetVillagerName(VillagerHouse house) { var villagerIndex = house.NPC1; var v = (uint) villagerIndex >= Villagers.Count ? "???" : Villagers[villagerIndex].InternalName; var name = GameInfo.Strings.GetVillager(v); - return $"{name}'s House"; + return name; } private void B_DumpHouse_Click(object sender, EventArgs e) @@ -75,8 +77,7 @@ private void B_DumpHouse_Click(object sender, EventArgs e) return; } - var v = (uint)Index >= Villagers.Count ? "???" : Villagers[Index].InternalName; - var name = GameInfo.Strings.GetVillager(v); + var name = GetVillagerName(Houses[Index]); using var sfd = new SaveFileDialog { Filter = "New Horizons Villager House (*.nhvh)|*.nhvh|All files (*.*)|*.*", @@ -92,8 +93,7 @@ private void B_DumpHouse_Click(object sender, EventArgs e) private void B_LoadHouse_Click(object sender, EventArgs e) { - var v = (uint)Index >= Villagers.Count ? "???" : Villagers[Index].InternalName; - var name = GameInfo.Strings.GetVillager(v); + var name = GetVillagerName(Houses[Index]); using var ofd = new OpenFileDialog { Filter = "New Horizons Villager House (*.nhvh)|*.nhvh|All files (*.*)|*.*",