adjustments to the objentry structure

Spawner objects, as shown here https://www.youtube.com/watch?v=nfbpGqJgH68
OpenKH · Nov 4, 2019 · 407c7ce · 407c7ce
1 parent c0adb2f
commit 407c7ce
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 11 deletions.
diff --git a/OpenKh.Kh2/Objentry.cs b/OpenKh.Kh2/Objentry.cs
@@ -7,7 +7,8 @@ public class Objentry
     {
         [Data] public ushort ObjectId { get; set; }
         [Data] public ushort Unknown02 { get; set; }
-        [Data] public ushort ObjectType { get; set; }
+        [Data] public byte ObjectType { get; set; }
+        [Data] public byte Unknown05{ get; set; }
         [Data] public byte Unknown06 { get; set; }
         [Data] public byte WeaponJoint { get; set; }
         [Data(Count = 32)] public byte[] ModelName { get; set; }
@@ -16,8 +17,12 @@ public class Objentry
         [Data] public ushort NeoStatus { get; set; }
         [Data] public ushort NeoMoveset { get; set; }
         [Data] public uint Unknown50 { get; set; }
-        [Data] public uint Unknown54 { get; set; }
-        [Data] public uint Unknown58 { get; set; }
+        [Data] public byte SpawnLimiter { get; set; }
+        [Data] public byte Unknown55 { get; set; }
+        [Data] public byte Unknown56{ get; set; }
+        [Data] public byte Unknown57{ get; set; }
+        [Data] public ushort SpawnObject1 { get; set; }
+        [Data] public ushort SpawnObject2 { get; set; }
         [Data] public uint Unknown5c { get; set; }
 
         public static BaseTable<Objentry> Read(Stream stream) => BaseTable<Objentry>.Read(stream);

diff --git a/OpenKh.Tools.ObjentryEditor/ViewModels/ObjentryViewModel.cs b/OpenKh.Tools.ObjentryEditor/ViewModels/ObjentryViewModel.cs
@@ -27,13 +27,14 @@ public ObjentryEntryViewModel(Objentry entry)
 
             public ushort ObjectId { get => Objentry.ObjectId; set => Objentry.ObjectId = value; }
             public ushort Unknown02 { get => Objentry.Unknown02; set => Objentry.Unknown02 = value; }
-            public ushort ObjectType { get => Objentry.ObjectType; set => Objentry.ObjectType = value; }
+            public byte ObjectType { get => Objentry.ObjectType; set => Objentry.ObjectType = value; }
+            public byte Unknown05 { get => Objentry.Unknown05; set => Objentry.Unknown05 = value; }
             public byte Unknown06 { get => Objentry.Unknown06; set => Objentry.Unknown06 = value; }
             public byte WeaponJoint { get => Objentry.WeaponJoint; set => Objentry.WeaponJoint = value; }
             public string ModelName 
             { 
                 get { return Objentry.ModelName == null ? string.Empty : Encoding.Default.GetString(Objentry.ModelName); }
-                set { Objentry.ModelName = Encoding.Default.GetBytes(value); OnPropertyChanged("Name"); } 
+                set { Objentry.ModelName = Encoding.Default.GetBytes(value); OnPropertyChanged(nameof(Name)); } 
             }
             public string AnimationName
             {
@@ -44,8 +45,12 @@ public string AnimationName
             public ushort NeoStatus { get => Objentry.NeoStatus; set => Objentry.NeoStatus = value; }
             public ushort NeoMoveset { get => Objentry.NeoMoveset; set => Objentry.NeoMoveset = value; }
             public uint Unknown50 { get => Objentry.Unknown50; set => Objentry.Unknown50 = value; }
-            public uint Unknown54 { get => Objentry.Unknown54; set => Objentry.Unknown54 = value; }
-            public uint Unknown58 { get => Objentry.Unknown58; set => Objentry.Unknown58 = value; }
+            public byte SpawnLimiter { get => Objentry.SpawnLimiter; set => Objentry.SpawnLimiter = value; }
+            public byte Unknown55 { get => Objentry.Unknown55; set => Objentry.Unknown55 = value; }
+            public byte Unknown56 { get => Objentry.Unknown56; set => Objentry.Unknown56 = value; }
+            public byte Unknown57 { get => Objentry.Unknown57; set => Objentry.Unknown57 = value; }
+            public ushort SpawnObject1 { get => Objentry.SpawnObject1; set => Objentry.SpawnObject1 = value; }
+            public ushort SpawnObject2 { get => Objentry.SpawnObject2; set => Objentry.SpawnObject2 = value; }
             public uint Unknown5c { get => Objentry.Unknown5c; set => Objentry.Unknown5c = value; }
 
             public override string ToString() => Name;

diff --git a/OpenKh.Tools.ObjentryEditor/Views/ObjentryView.xaml b/OpenKh.Tools.ObjentryEditor/Views/ObjentryView.xaml
@@ -77,6 +77,9 @@
 
                 <TextBlock Text="Object Type" Margin="{StaticResource LabelMargin}"/>
                 <TextBox Text="{Binding ObjectType, UpdateSourceTrigger=PropertyChanged}"/>
+
+                <TextBlock Text="Unknown05" Margin="{StaticResource LabelMargin}"/>
+                <TextBox Text="{Binding Unknown05, UpdateSourceTrigger=PropertyChanged}"/>
 
                 <TextBlock Text="Unknown06" Margin="{StaticResource LabelMargin}"/>
                 <TextBox Text="{Binding Unknown06, UpdateSourceTrigger=PropertyChanged}"/>
@@ -102,11 +105,23 @@
                 <TextBlock Text="Unknown50" Margin="{StaticResource LabelMargin}"/>
                 <TextBox Text="{Binding Unknown50, UpdateSourceTrigger=PropertyChanged}"/>
 
-                <TextBlock Text="Unknown54" Margin="{StaticResource LabelMargin}"/>
-                <TextBox Text="{Binding Unknown54, UpdateSourceTrigger=PropertyChanged}"/>
+                <TextBlock Text="Spawn Limiter" Margin="{StaticResource LabelMargin}"/>
+                <TextBox Text="{Binding SpawnLimiter, UpdateSourceTrigger=PropertyChanged}"/>
 
-                <TextBlock Text="Unknown58" Margin="{StaticResource LabelMargin}"/>
-                <TextBox Text="{Binding Unknown58, UpdateSourceTrigger=PropertyChanged}"/>
+                <TextBlock Text="Unknown55" Margin="{StaticResource LabelMargin}"/>
+                <TextBox Text="{Binding Unknown55, UpdateSourceTrigger=PropertyChanged}"/>
+
+                <TextBlock Text="Unknown56" Margin="{StaticResource LabelMargin}"/>
+                <TextBox Text="{Binding Unknown56, UpdateSourceTrigger=PropertyChanged}"/>
+
+                <TextBlock Text="Unknown57" Margin="{StaticResource LabelMargin}"/>
+                <TextBox Text="{Binding Unknown57, UpdateSourceTrigger=PropertyChanged}"/>
+
+                <TextBlock Text="Spawn Object 1" Margin="{StaticResource LabelMargin}"/>
+                <TextBox Text="{Binding SpawnObject1, UpdateSourceTrigger=PropertyChanged}"/>
+
+                <TextBlock Text="Spawn Object 2" Margin="{StaticResource LabelMargin}"/>
+                <TextBox Text="{Binding SpawnObject2, UpdateSourceTrigger=PropertyChanged}"/>
 
                 <TextBlock Text="Unknown5c" Margin="{StaticResource LabelMargin}"/>
                 <TextBox Text="{Binding Unknown5c, UpdateSourceTrigger=PropertyChanged}"/>