Fix for NPC rendering

TEdit · Oct 27, 2022 · 290476f · 290476f
1 parent c948f91
commit 290476f
Show file tree

Hide file tree

Showing 11 changed files with 7,166 additions and 36 deletions.
diff --git a/src/SettingsFileUpdater/Program.cs b/src/SettingsFileUpdater/Program.cs
@@ -59,7 +59,7 @@ static void Main(string[] args)
 
             var bestiaryNpcs = wrapper.GetBestiaryData().ToList();
 
-            using (var stream = new FileStream("bestiaryData.json", FileMode.Create, FileAccess.Write))
+            using (var stream = new FileStream("..\\..\\..\\..\\bestiaryData.json", FileMode.Create, FileAccess.Write))
             {
                 JsonSerializer.Serialize(stream, bestiaryNpcs, new JsonSerializerOptions { WriteIndented = true});
             }

diff --git a/src/SettingsFileUpdater/TerrariaHost/NpcData.cs b/src/SettingsFileUpdater/TerrariaHost/NpcData.cs
@@ -10,6 +10,7 @@ public class NpcData
         public bool CanTalk { get; set; }
         public bool IsCritter { get; set; }
         public bool IsKillCredit { get; set; }
+        public bool IsTownNpc { get; set; }
         public int BestiaryDisplayIndex { get; set; }
     }
 }
diff --git a/src/SettingsFileUpdater/TerrariaHost/TerrariaWrapper.cs b/src/SettingsFileUpdater/TerrariaHost/TerrariaWrapper.cs
@@ -346,6 +346,7 @@ public IEnumerable<NpcData> GetNPCData()
                 {
                     Id = npc.netID,
                     BannerId = killId,
+                    IsTownNpc = npc.townNPC,
                     FullName = npc.FullName,
                     Name = Localize(npc.FullName),
                     BestiaryId = npc.GetBestiaryCreditId(),
@@ -449,6 +450,7 @@ public IEnumerable<NpcData> GetBestiaryData()
                 {
                     Id = npc.netID,
                     BannerId = killId,
+                    IsTownNpc = npc.townNPC,
                     BestiaryDisplayIndex = info.BestiaryDisplayIndex,
                     FullName = npc.FullName,
                     Name = Localize(npc.FullName),