diff --git a/pkNX.Structures.FlatBuffers/Gen8/Other/PokeResourceTable.cs b/pkNX.Structures.FlatBuffers/Gen8/Other/PokeResourceTable.cs index 62ec8e2a..c2c3b71d 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Other/PokeResourceTable.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Other/PokeResourceTable.cs @@ -29,9 +29,9 @@ public class PokeResourceMeta public class PokeModelConfig { [FlatBufferItem(00)] public PokeModelMeta Meta { get; set; } - [FlatBufferItem(01)] public string ModelPath { get; set; } - [FlatBufferItem(02)] public string ConfigPath { get; set; } - [FlatBufferItem(03)] public string ArchivePath { get; set; } + [FlatBufferItem(01)] public string PathModel { get; set; } + [FlatBufferItem(02)] public string PathConfig { get; set; } + [FlatBufferItem(03)] public string PathArchive { get; set; } [FlatBufferItem(04)] public AnimationConfigStringTuple[] Animations { get; set; } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Other/SymbolBehavior.cs b/pkNX.Structures.FlatBuffers/Gen8/Other/SymbolBehavior.cs index fbd49e68..1465c461 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Other/SymbolBehavior.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Other/SymbolBehavior.cs @@ -1,11 +1,11 @@ -using System.ComponentModel; +using System; +using System.ComponentModel; using FlatSharp.Attributes; // ReSharper disable UnusedAutoPropertyAccessor.Global // ReSharper disable ClassNeverInstantiated.Global // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable #pragma warning disable CA1819 // Properties should not return arrays namespace pkNX.Structures.FlatBuffers @@ -14,7 +14,7 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class SymbolBehaveRoot : IFlatBufferArchive { - [FlatBufferItem(00)] public SymbolBehave[] Table { get; set; } + [FlatBufferItem(00)] public SymbolBehave[] Table { get; set; } = Array.Empty(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -24,7 +24,7 @@ public class SymbolBehave [FlatBufferItem(00)] public float Field_00 {get; set;} [FlatBufferItem(01)] public float Field_01 {get; set;} - [FlatBufferItem(02)] public string ModelPart {get; set;} + [FlatBufferItem(02)] public string ModelPart {get; set;} = ""; [FlatBufferItem(03)] public float Field_03 {get; set;} [FlatBufferItem(04)] public ulong Hash1 {get; set;} [FlatBufferItem(05)] public ulong Hash2 {get; set;} @@ -44,7 +44,7 @@ public class SymbolBehave [FlatBufferItem(19)] public float Field_19 {get; set;} [FlatBufferItem(20)] public float Field_20 {get; set;} [FlatBufferItem(21)] public float Field_21 {get; set;} - [FlatBufferItem(22)] public string SpeciesNameJPN {get; set;} + [FlatBufferItem(22)] public string SpeciesNameJPN {get; set;} = ""; // internal name [FlatBufferItem(23)] public float Field_23 {get; set;} [FlatBufferItem(24)] public float Field_24 {get; set;} [FlatBufferItem(25)] public float Field_25 {get; set;} @@ -53,7 +53,7 @@ public class SymbolBehave [FlatBufferItem(28)] public float Field_28 {get; set;} // unused default, assumed float [FlatBufferItem(29)] public int Field_29 {get; set;} [FlatBufferItem(30)] public int Field_30 {get; set;} // unused default, assumed int - [FlatBufferItem(31)] public string Behavior {get; set;} + [FlatBufferItem(31)] public string Behavior {get; set;} = ""; [FlatBufferItem(32)] public int Field_32 {get; set;} [FlatBufferItem(33)] public int Field_33 {get; set;} // unused default, assumed int [FlatBufferItem(34)] public int Field_34 {get; set;} // unused default, assumed int diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8AdvancedTipHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8AdvancedTipHolder.cs index 79a04add..6d69ef57 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8AdvancedTipHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8AdvancedTipHolder.cs @@ -30,8 +30,8 @@ public class PlacementZone8AdvancedTip public class PlacementZone8_F14 { [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(01)] public string Model { get; set; } - [FlatBufferItem(02)] public string Field_02 { get; set; } // none have this + [FlatBufferItem(01)] public string NameModel { get; set; } + [FlatBufferItem(02)] public string NameAnimation { get; set; } // none have this [FlatBufferItem(03)] public float Field_03 { get; set; } [FlatBufferItem(04)] public float Field_04 { get; set; } [FlatBufferItem(05)] public string Field_05 { get; set; } // none have this diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8OtherNPCHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8OtherNPCHolder.cs index 4be24be7..22251511 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8OtherNPCHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8OtherNPCHolder.cs @@ -35,7 +35,7 @@ public class PlacementZone8OtherNPCHolder public override string ToString() { var ident = Field_00.Field_00.Identifier; - return $"{ident.ObjectNameHash:X16} v{ModelVariant} @ {ident.Location3f}"; + return $"{ident.HashObjectName:X16} v{ModelVariant} @ {ident.Location3f}"; } public PlacementZone8OtherNPCHolder Clone() => new() @@ -87,23 +87,23 @@ public class PlacementZone8_F16_A { [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Identifier { get; set; } = new(); [FlatBufferItem(01)] public ulong Hash_01 { get; set; } - [FlatBufferItem(02)] public ulong ModelHash { get; set; } + [FlatBufferItem(02)] public ulong HashModel { get; set; } [FlatBufferItem(03)] public ulong Hash_03 { get; set; } [FlatBufferItem(04)] public PlacementZone8_F16_IntFloat Field_04 { get; set; } = new(); [FlatBufferItem(05)] public bool Flag_05 { get; set; } - [FlatBufferItem(06)] public ulong Hash_06 { get; set; } + [FlatBufferItem(06)] public ulong HashMessage { get; set; } [FlatBufferItem(07)] public PlacementZone8_F16_IntFloat Field_07 { get; set; } = new(); public PlacementZone8_F16_A Clone() => new() { Identifier = Identifier.Clone(), Hash_01 = Hash_01, - ModelHash = ModelHash, + HashModel = HashModel, Hash_03 = Hash_03, Field_04 = Field_04.Clone(), Flag_05 = Flag_05, - Hash_06 = Hash_06, - Field_07 = Field_07.Clone() + HashMessage = HashMessage, + Field_07 = Field_07.Clone(), }; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8UnitObjectHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8UnitObjectHolder.cs index e5df8792..7f4db186 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8UnitObjectHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8UnitObjectHolder.cs @@ -15,15 +15,15 @@ public class PlacementZone8UnitObjectHolder { [FlatBufferItem(00)] public PlacementZone8UnitObject Object { get; set; } = new(); - public override string ToString() => Object.Model; + public override string ToString() => Object.NameModel; } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8UnitObject { [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); - [FlatBufferItem(01)] public string Model { get; set; } = ""; - [FlatBufferItem(02)] public string Animation { get; set; } = ""; + [FlatBufferItem(01)] public string NameModel { get; set; } = ""; + [FlatBufferItem(02)] public string NameAnimation { get; set; } = ""; [FlatBufferItem(03)] public float Field_03 { get; set; } [FlatBufferItem(04)] public float Field_04 { get; set; } [FlatBufferItem(05)] public string Field_05 { get; set; } = ""; // none have this diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8WarpHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8WarpHolder.cs index 69e98a74..b37bc8e3 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8WarpHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8WarpHolder.cs @@ -14,7 +14,7 @@ public class PlacementZone8WarpHolder { [FlatBufferItem(00)] public PlacementZoneWarp8 Field_00 { get; set; } = new(); - public override string ToString() => $"{Field_00.OtherAreaName} via {Field_00.ModelName}"; + public override string ToString() => $"{Field_00.NameAreaOther} via {Field_00.NameModel}"; } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -22,16 +22,16 @@ public class PlacementZoneWarp8 { [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong Hash_01 { get; set; } - [FlatBufferItem(02)] public string OtherAreaName { get; set; } = ""; - [FlatBufferItem(03)] public string ModelName { get; set; } = ""; - [FlatBufferItem(04)] public string Animation { get; set; } = ""; + [FlatBufferItem(02)] public string NameAreaOther { get; set; } = ""; + [FlatBufferItem(03)] public string NameModel { get; set; } = ""; + [FlatBufferItem(04)] public string NameAnimation { get; set; } = ""; [FlatBufferItem(05)] public int Field_05 { get; set; } [FlatBufferItem(06)] public float Field_06 { get; set; } [FlatBufferItem(07)] public bool Field_07 { get; set; } [FlatBufferItem(08)] public ulong Hash_08 { get; set; } [FlatBufferItem(09)] public PlacementZoneWarpDetails8 SubMeta { get; set; } = new(); - [FlatBufferItem(10)] public string SoundEffect1 { get; set; } = ""; - [FlatBufferItem(11)] public string SoundEffect2 { get; set; } = ""; + [FlatBufferItem(10)] public string NameSoundEffect1 { get; set; } = ""; + [FlatBufferItem(11)] public string NameSoundEffect2 { get; set; } = ""; } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs index c2f794fa..08ec8986 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs @@ -64,7 +64,7 @@ public class PlacementZone8 { var obj = sym.Object; var ident = obj.Identifier; - yield return $" {objects[ident.ObjectNameHash]}:"; + yield return $" {objects[ident.HashObjectName]}:"; yield return $" Location: {ident.Location3f}"; if (obj.SymbolHash is (0xCBF29CE484222645 or 0)) { @@ -72,7 +72,7 @@ public class PlacementZone8 break; } - var line = $"SymbolHash: {obj.SymbolHash:X16}, ObjectHash:{obj.Identifier.ObjectNameHash:X16}, {nameof(PlacementZone8SymbolSpawn.Field_06)}: {obj.Field_06}, {nameof(PlacementZone8SymbolSpawn.Field_01)}: {obj.Field_01}"; + var line = $"SymbolHash: {obj.SymbolHash:X16}, ObjectHash:{obj.Identifier.HashObjectName:X16}, {nameof(PlacementZone8SymbolSpawn.Field_06)}: {obj.Field_06}, {nameof(PlacementZone8SymbolSpawn.Field_01)}: {obj.Field_01}"; yield return $" {line}"; } @@ -80,7 +80,7 @@ public class PlacementZone8 { var obj = so.Object; var ident = obj.Identifier; - yield return $" {objects[ident.ObjectNameHash]}:"; + yield return $" {objects[ident.HashObjectName]}:"; yield return $" Location: {ident.Location3f}"; if (obj.Spawns.Length == 0) { @@ -132,7 +132,7 @@ public class PlacementZoneMeta8 [FlatBufferItem(14)] public byte Field_14 { get; set; } [FlatBufferItem(15)] public int Num_15 { get; set; } - public override string ToString() => $"{Field_00.ObjectNameHash:X16}"; + public override string ToString() => $"{Field_00.HashObjectName:X16}"; } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -147,7 +147,7 @@ public class PlacementZoneMetaTripleXYZ8 [FlatBufferItem(06)] public float ScaleX { get; set; } [FlatBufferItem(07)] public float ScaleY { get; set; } [FlatBufferItem(08)] public float ScaleZ { get; set; } - [FlatBufferItem(09)] public ulong ObjectNameHash { get; set; } + [FlatBufferItem(09)] public ulong HashObjectName { get; set; } [FlatBufferItem(10)] public ulong Hash_10 { get; set; } [FlatBufferItem(11)] public ulong Hash_11 { get; set; } @@ -160,7 +160,7 @@ public void Upscale(float factor) ScaleZ *= factor; } - public override string ToString() => $"{ObjectNameHash:X16} @ {Location3f}"; + public override string ToString() => $"{HashObjectName:X16} @ {Location3f}"; public PlacementZoneMetaTripleXYZ8 Clone() => new() { @@ -173,7 +173,7 @@ public PlacementZoneMetaTripleXYZ8 Clone() => new() ScaleX = ScaleX, ScaleY = ScaleY, ScaleZ = ScaleZ, - ObjectNameHash = ObjectNameHash, + HashObjectName = HashObjectName, Hash_10 = Hash_10, Hash_11 = Hash_11, };