diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/PlacementArea8Archive.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/PlacementArea8Archive.cs index 5d476e87..277a472c 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/PlacementArea8Archive.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/PlacementArea8Archive.cs @@ -6,7 +6,6 @@ // 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,11 +13,11 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementArea8Archive : IFlatBufferArchive { - [FlatBufferItem(00)] public PlacementZone8[] Table { get; set; } + [FlatBufferItem(00)] public PlacementZone8[] Table { get; set; } = Array.Empty(); [FlatBufferItem(01)] public ulong Hash { get; set; } - [FlatBufferItem(02)] public string Description { get; set; } - [FlatBufferItem(03)] public string OtherDescription { get; set; } - [FlatBufferItem(04)] public PlacementArea8_F04 Unknown { get; set; } + [FlatBufferItem(02)] public string Description { get; set; } = ""; + [FlatBufferItem(03)] public string OtherDescription { get; set; } = ""; + [FlatBufferItem(04)] public PlacementArea8_F04 Unknown { get; set; } = new(); [FlatBufferItem(05)] public float Field_05 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(06)] public float Field_06 { get; set; } [FlatBufferItem(07)] public float Field_07 { get; set; } @@ -38,7 +37,7 @@ public class PlacementArea8Archive : IFlatBufferArchive [FlatBufferItem(21)] public float Field_21 { get; set; } [FlatBufferItem(22)] public float Field_22 { get; set; } [FlatBufferItem(23)] public float Field_23 { get; set; } - [FlatBufferItem(24)] public PlacementArea8_F24 Field_24 { get; set; } + [FlatBufferItem(24)] public PlacementArea8_F24 Field_24 { get; set; } = new(); [FlatBufferItem(25)] public uint Field_25 { get; set; } // 3000 [FlatBufferItem(26)] public float Field_26 { get; set; } [FlatBufferItem(27)] public byte Field_27 { get; set; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/PlacementArea8_F24.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/PlacementArea8_F24.cs index e1e11dcc..1b3eac3c 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/PlacementArea8_F24.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/PlacementArea8_F24.cs @@ -5,7 +5,6 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { @@ -13,7 +12,7 @@ namespace pkNX.Structures.FlatBuffers public class PlacementArea8_F24 { [FlatBufferItem(00)] public byte Field_00 { get; set; } - [FlatBufferItem(01)] public PlacementAreaUnknownTiny8 Field_01 { get; set; } + [FlatBufferItem(01)] public PlacementAreaUnknownTiny8 Field_01 { get; set; } = new(); [FlatBufferItem(02)] public float Field_02 { get; set; } public override string ToString() => $"{Field_00}, {Field_02}: {Field_01}"; diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8BerryTreeHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8BerryTreeHolder.cs index 7c7d479b..9f19ab3b 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8BerryTreeHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8BerryTreeHolder.cs @@ -6,7 +6,6 @@ // 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,34 +13,34 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8BerryTreeHolder { - [FlatBufferItem(00)] public PlacementZone8_F22_0 Field_00 { get; set; } // meta - [FlatBufferItem(01)] public PlacementZone8BerryTreeRandom[] Field_01 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F22_0 Field_00 { get; set; } = new(); // meta + [FlatBufferItem(01)] public PlacementZone8BerryTreeRandom[] Field_01 { get; set; } = Array.Empty(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F22_0 { - [FlatBufferItem(00)] public PlacementZone8_F22_0_0 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F22_0_0 Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F22_0_0 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(01)] public string Field_01 { get; set; } // none have this - [FlatBufferItem(02)] public string Field_02 { get; set; } // none have this + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); + [FlatBufferItem(01)] public string Field_01 { get; set; } = ""; // none have this + [FlatBufferItem(02)] public string Field_02 { 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 - [FlatBufferItem(06)] public string Field_06 { get; set; } // none have this + [FlatBufferItem(05)] public string Field_05 { get; set; } = ""; // none have this + [FlatBufferItem(06)] public string Field_06 { get; set; } = ""; // none have this [FlatBufferItem(07)] public float Field_07 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(08)] public float Field_08 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(09)] public float Field_09 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(10)] public float Field_10 { get; set; } - [FlatBufferItem(11)] public PlacementZone8_F22_Sub Field_11 { get; set; } + [FlatBufferItem(11)] public PlacementZone8_F22_Sub Field_11 { get; set; } = new(); [FlatBufferItem(12)] public uint Field_12 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused - [FlatBufferItem(13)] public PlacementZone8_F22_Sub Field_13 { get; set; } - [FlatBufferItem(14)] public PlacementZone8_F22_BoolObject14 Field_14 { get; set; } + [FlatBufferItem(13)] public PlacementZone8_F22_Sub Field_13 { get; set; } = new(); + [FlatBufferItem(14)] public PlacementZone8_F22_BoolObject14 Field_14 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -58,7 +57,7 @@ public class PlacementZone8_F22_Sub public class PlacementZone8_F22_BoolObject14 { [FlatBufferItem(0)] public byte Type { get; set; } - [FlatBufferItem(1)] public PlacementZone_F22_Inner Object { get; set; } + [FlatBufferItem(1)] public PlacementZone_F22_Inner Object { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8EnvironmentHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8EnvironmentHolder.cs index 0a058461..861862c7 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8EnvironmentHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8EnvironmentHolder.cs @@ -1,3 +1,4 @@ +using System; using System.ComponentModel; using FlatSharp.Attributes; // ReSharper disable UnusedAutoPropertyAccessor.Global @@ -5,7 +6,6 @@ // 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 @@ -13,16 +13,16 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8EnvironmentHolder { - [FlatBufferItem(00)] public PlacementZone8_F10 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F10 Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F10 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(01)] public PlacementZone8_V3f[] Field_01 { get; set; } - [FlatBufferItem(02)] public string PlayName { get; set; } - [FlatBufferItem(03)] public string StopName { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); + [FlatBufferItem(01)] public PlacementZone8_V3f[] Field_01 { get; set; } = Array.Empty(); + [FlatBufferItem(02)] public string PlayName { get; set; } = ""; + [FlatBufferItem(03)] public string StopName { get; set; } = ""; [FlatBufferItem(04)] public float Field_04 { get; set; } [FlatBufferItem(05)] public int Field_05 { get; set; } [FlatBufferItem(06)] public int Field_06 { get; set; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FieldItemHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FieldItemHolder.cs index 0bda1120..e8cbd4a8 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FieldItemHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FieldItemHolder.cs @@ -1,3 +1,4 @@ +using System; using System.ComponentModel; using FlatSharp.Attributes; // ReSharper disable UnusedAutoPropertyAccessor.Global @@ -5,7 +6,6 @@ // 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 @@ -13,28 +13,28 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8FieldItemHolder { - [FlatBufferItem(00)] public PlacementZone8FieldItem Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8FieldItem Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8FieldItem { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong Hash_01 { get; set; } - [FlatBufferItem(02)] public string Field_02 { get; set; } + [FlatBufferItem(02)] public string Field_02 { get; set; } = ""; [FlatBufferItem(03)] public float Field_03 { get; set; } [FlatBufferItem(04)] public float Field_04 { get; set; } [FlatBufferItem(05)] public ulong Hash_05 { get; set; } - [FlatBufferItem(06)] public ulong[] Flags { get; set; } - [FlatBufferItem(07)] public uint[] Items { get; set; } + [FlatBufferItem(06)] public ulong[] Flags { get; set; } = Array.Empty(); + [FlatBufferItem(07)] public uint[] Items { get; set; } = Array.Empty(); [FlatBufferItem(08)] public byte Quantity { get; set; } - [FlatBufferItem(09)] public PlacementZone8FieldItem_A Field_09 { get; set; } + [FlatBufferItem(09)] public PlacementZone8FieldItem_A Field_09 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8FieldItem_A { [FlatBufferItem(00)] public bool Field_00 { get; set; } - [FlatBufferItem(01)] public FlatDummyObject Field_01 { get; set; } + [FlatBufferItem(01)] public FlatDummyObject Field_01 { get; set; } = new(); } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FishingPointHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FishingPointHolder.cs index 7981b9e6..f693492f 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FishingPointHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FishingPointHolder.cs @@ -5,20 +5,19 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8FishingPointHolder { - [FlatBufferItem(00)] public PlacementZone8FishingPoint Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8FishingPoint Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8FishingPoint { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public float Field_01 { get; set; } [FlatBufferItem(02)] public float Field_02 { get; set; } [FlatBufferItem(03)] public float Field_03 { get; set; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs index 05b089e0..e40d175f 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs @@ -5,7 +5,6 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { @@ -13,13 +12,13 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8FlightAnchorHolder { - [FlatBufferItem(00)] public PlacementZone8FlightAnchor FlightAnchor { get; set; } + [FlatBufferItem(00)] public PlacementZone8FlightAnchor FlightAnchor { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8FlightAnchor { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Placement { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Placement { get; set; } = new(); [FlatBufferItem(01)] public ulong UnlockFlagHash { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8HiddenItemHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8HiddenItemHolder.cs index 32acfb27..55d2bd37 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8HiddenItemHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8HiddenItemHolder.cs @@ -1,3 +1,4 @@ +using System; using System.ComponentModel; using FlatSharp.Attributes; // ReSharper disable UnusedAutoPropertyAccessor.Global @@ -5,7 +6,6 @@ // 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 @@ -13,15 +13,15 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8HiddenItemHolder { - [FlatBufferItem(00)] public PlacementZone8HiddenItem Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8HiddenItem Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8HiddenItem { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(01)] public PlacementZone8HiddenItemValue Field_01 { get; set; } - [FlatBufferItem(02)] public PlacementZone8HiddenItemChance[] Field_02 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); + [FlatBufferItem(01)] public PlacementZone8HiddenItemValue Field_01 { get; set; } = new(); + [FlatBufferItem(02)] public PlacementZone8HiddenItemChance[] Field_02 { get; set; } = Array.Empty(); [FlatBufferItem(03)] public int Field_03 { get; set; } [FlatBufferItem(04)] public uint Field_04 { get; set; } [FlatBufferItem(05)] public float Field_05 { get; set; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8IKStepHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8IKStepHolder.cs index ec9e89c8..5d239d10 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8IKStepHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8IKStepHolder.cs @@ -6,7 +6,6 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { @@ -14,7 +13,7 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8IKStepHolder { - [FlatBufferItem(00)] public PlacementZone8_F25 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F25 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public byte Field_01 { get; set; } [FlatBufferItem(02)] public byte Field_02 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(03)] public byte Field_03 { get; set; } @@ -23,9 +22,9 @@ public class PlacementZone8IKStepHolder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F25 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong Field_01 { get; set; } - [FlatBufferItem(02)] public PlacementZone8_F25_X Field_02 { get; set; } + [FlatBufferItem(02)] public PlacementZone8_F25_X Field_02 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8LadderHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8LadderHolder.cs index 13343998..50802d36 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8LadderHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8LadderHolder.cs @@ -5,21 +5,20 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8LadderHolder { - [FlatBufferItem(00)] public PlacementZone8Ladder Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8Ladder Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8Ladder { - [FlatBufferItem(0)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(1)] public PlacementZone8_F23_Sub Field_01 { get; set; } + [FlatBufferItem(0)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); + [FlatBufferItem(1)] public PlacementZone8_F23_Sub Field_01 { get; set; } = new(); [FlatBufferItem(2)] public int Field_02 { get; set; } // 1 [FlatBufferItem(3)] public int Field_03 { get; set; } // 10 } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8MovementPathHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8MovementPathHolder.cs index e50c98ab..5a945592 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8MovementPathHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8MovementPathHolder.cs @@ -1,3 +1,4 @@ +using System; using System.ComponentModel; using FlatSharp.Attributes; // ReSharper disable UnusedAutoPropertyAccessor.Global @@ -5,7 +6,6 @@ // 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 @@ -13,12 +13,12 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8MovementPathHolder { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong PathName { get; set; } [FlatBufferItem(02)] public uint Field_02 { get; set; } [FlatBufferItem(03)] public uint Field_03 { get; set; } [FlatBufferItem(04)] public bool Field_04 { get; set; } - [FlatBufferItem(05)] public PlacementZone8_V3f[] Field_05 { get; set; } + [FlatBufferItem(05)] public PlacementZone8_V3f[] Field_05 { get; set; } = Array.Empty(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8NPCHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8NPCHolder.cs index 5ee10d3b..af3c8ff4 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8NPCHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8NPCHolder.cs @@ -6,20 +6,19 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8NPCHolder { - [FlatBufferItem(00)] public PlacementZone8NPC Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8NPC Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8NPC { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong Hash_01 { get; set; } [FlatBufferItem(02)] public ulong Message { get; set; } [FlatBufferItem(03)] public uint Field_03 { get; set; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8NestHoleHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8NestHoleHolder.cs index 4b449f3f..5738c2db 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8NestHoleHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8NestHoleHolder.cs @@ -6,15 +6,13 @@ // 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 { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8NestHoleHolder { - [FlatBufferItem(00)] public PlacementZone8_F21_A Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F21_A Field_00 { get; set; } = new(); [FlatBufferItem(01)] public bool Field_01 { get; set; } [FlatBufferItem(02)] public int Field_02 { get; set; } // 0,2,6,270,64,12 [FlatBufferItem(03)] public ulong Common { get; set; } @@ -28,27 +26,27 @@ public class PlacementZone8NestHoleHolder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F21_A { - [FlatBufferItem(00)] public PlacementZone8_F21_B Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F21_B Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F21_B { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(01)] public string Field_01 { get; set; } // none have this - [FlatBufferItem(02)] public string Field_02 { get; set; } // none have this + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); + [FlatBufferItem(01)] public string Field_01 { get; set; } = ""; // none have this + [FlatBufferItem(02)] public string Field_02 { 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 - [FlatBufferItem(06)] public string Field_06 { get; set; } // none have this + [FlatBufferItem(05)] public string Field_05 { get; set; } = ""; // none have this + [FlatBufferItem(06)] public string Field_06 { get; set; } = ""; // none have this [FlatBufferItem(07)] public float Field_07 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(08)] public float Field_08 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(09)] public float Field_09 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(10)] public float Field_10 { get; set; } - [FlatBufferItem(11)] public PlacementZone8_F21_IntFloat Field_11 { get; set; } + [FlatBufferItem(11)] public PlacementZone8_F21_IntFloat Field_11 { get; set; } = new(); [FlatBufferItem(12)] public uint Field_12 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused - [FlatBufferItem(13)] public PlacementZone8_F21_IntFloat Field_13 { get; set; } - [FlatBufferItem(14)] public PlacementZone8_F21_BoolObject14 Field_14 { get; set; } + [FlatBufferItem(13)] public PlacementZone8_F21_IntFloat Field_13 { get; set; } = new(); + [FlatBufferItem(14)] public PlacementZone8_F21_BoolObject14 Field_14 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -65,7 +63,7 @@ public class PlacementZone8_F21_IntFloat public class PlacementZone8_F21_BoolObject14 { [FlatBufferItem(0)] public byte Type { get; set; } - [FlatBufferItem(1)] public PlacementZone_F21_Inner Object { get; set; } + [FlatBufferItem(1)] public PlacementZone_F21_Inner Object { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8OtherNPCHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8OtherNPCHolder.cs index 3e139f5d..3908cbc5 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8OtherNPCHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8OtherNPCHolder.cs @@ -6,7 +6,6 @@ // 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 @@ -15,7 +14,7 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8OtherNPCHolder { - [FlatBufferItem(00)] public PlacementZone8_F16 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F16 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public uint Field_01 { get; set; } [FlatBufferItem(02)] public ulong Hash_02 { get; set; } [FlatBufferItem(03)] public ulong Hash_03 { get; set; } @@ -26,7 +25,7 @@ public class PlacementZone8OtherNPCHolder [FlatBufferItem(08)] public uint Field_08 { get; set; } [FlatBufferItem(09)] public uint Field_09 { get; set; } [FlatBufferItem(10)] public float Field_10 { get; set; } - [FlatBufferItem(11)] public PlacementZone8_F02_Nine Field_11 { get; set; } + [FlatBufferItem(11)] public PlacementZone8_F02_Nine Field_11 { get; set; } = new(); [FlatBufferItem(12)] public uint Field_12 { get; set; } [FlatBufferItem(13)] public uint Field_13 { get; set; } [FlatBufferItem(14)] public uint Field_14 { get; set; } @@ -48,20 +47,20 @@ public class PlacementZone8_F16_ArrayEntry [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F16 { - [FlatBufferItem(00)] public PlacementZone8_F16_A Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F16_A Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F16_A { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong Hash_01 { get; set; } [FlatBufferItem(02)] public ulong Hash_02 { get; set; } [FlatBufferItem(03)] public ulong Hash_03 { get; set; } - [FlatBufferItem(04)] public PlacementZone8_F16_IntFloat Field_04 { get; set; } + [FlatBufferItem(04)] public PlacementZone8_F16_IntFloat Field_04 { get; set; } = new(); [FlatBufferItem(05)] public byte Byte_05 { get; set; } [FlatBufferItem(06)] public ulong Hash_06 { get; set; } - [FlatBufferItem(07)] public PlacementZone8_F16_IntFloat Field_07 { get; set; } + [FlatBufferItem(07)] public PlacementZone8_F16_IntFloat Field_07 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8ParticleHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8ParticleHolder.cs index c81d909e..9e954271 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8ParticleHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8ParticleHolder.cs @@ -5,14 +5,13 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8ParticleHolder { - [FlatBufferItem(00)] public PlacementZone8Particle Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8Particle Field_00 { get; set; } = new(); public override string ToString() => Field_00.ParticleFile; } @@ -20,8 +19,8 @@ public class PlacementZone8ParticleHolder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8Particle { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(01)] public string ParticleFile { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); + [FlatBufferItem(01)] public string ParticleFile { get; set; } = ""; [FlatBufferItem(02)] public uint Number { get; set; } // 1200 for birds? } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PokeCenterSpawnAnchorHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PokeCenterSpawnAnchorHolder.cs index 02ccc5e8..f6c8e9d8 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PokeCenterSpawnAnchorHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PokeCenterSpawnAnchorHolder.cs @@ -5,19 +5,18 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8PokeCenterSpawnAnchorHolder { - [FlatBufferItem(00)] public PlacementZone8_F12 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F12 Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F12 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PopupHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PopupHolder.cs index 16239bbe..33a6b38a 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PopupHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PopupHolder.cs @@ -6,7 +6,6 @@ // 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,21 +13,21 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8PopupHolder { - [FlatBufferItem(00)] public PlacementZone8_F24 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F24 Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F24 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(01)] public PlacementZone8_F24_IntFloat Field_01 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); + [FlatBufferItem(01)] public PlacementZone8_F24_IntFloat Field_01 { get; set; } = new(); [FlatBufferItem(02)] public float Field_02 { get; set; } [FlatBufferItem(03)] public float Field_03 { get; set; } [FlatBufferItem(04)] public float Field_04 { get; set; } [FlatBufferItem(05)] public float Field_05 { get; set; } [FlatBufferItem(06)] public ulong Hash_06 { get; set; } - [FlatBufferItem(07)] public string Field_07 { get; set; } // none have this - [FlatBufferItem(08)] public PlacementZone8_F24_Table[] Hash_08 { get; set; } + [FlatBufferItem(07)] public string Field_07 { get; set; } = ""; // none have this + [FlatBufferItem(08)] public PlacementZone8_F24_Table[] Hash_08 { get; set; } = Array.Empty(); [FlatBufferItem(09)] public float Field_09 { get; set; } [FlatBufferItem(10)] public float Field_10 { get; set; } [FlatBufferItem(11)] public float Field_11 { get; set; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8QuadrantHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8QuadrantHolder.cs index dce15489..78a6d22c 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8QuadrantHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8QuadrantHolder.cs @@ -6,7 +6,6 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { @@ -14,15 +13,15 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8QuadrantHolder { - [FlatBufferItem(00)] public PlacementZone8_F17 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F17 Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F17 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong Hash_01 { get; set; } - [FlatBufferItem(02)] public PlacementZone8_F17_Sub Field_02 { get; set; } + [FlatBufferItem(02)] public PlacementZone8_F17_Sub Field_02 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8RotomRallyEntry.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8RotomRallyEntry.cs index 004a6ff6..496604ff 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8RotomRallyEntry.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8RotomRallyEntry.cs @@ -5,7 +5,6 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { @@ -13,7 +12,7 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8RotomRallyEntry { - [FlatBufferItem(0)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(0)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(1)] public uint Field_01 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs index 2fdfdaf8..fcb902d2 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs @@ -6,7 +6,6 @@ // 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,8 +13,8 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8SpeciesHolder { - [FlatBufferItem(00)] public PlacementZone8_F02 Field_00 { get; set; } - [FlatBufferItem(01)] public PlacementZone8_F02_Field1 Field_01 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F02 Field_00 { get; set; } = new(); + [FlatBufferItem(01)] public PlacementZone8_F02_Field1 Field_01 { get; set; } = new(); [Description("Species Model to load")] [FlatBufferItem(02)] public uint Species { get; set; } @@ -33,12 +32,36 @@ public class PlacementZone8SpeciesHolder [FlatBufferItem(09)] public ulong Hash_09 { get; set; } [FlatBufferItem(10)] public FlatDummyEntry[] Field_10 { get; set; } = Array.Empty(); // none have this [FlatBufferItem(11)] public float Field_11 { get; set; } - [FlatBufferItem(12)] public PlacementZone8_F02_Nine Field_12 { get; set; } + [FlatBufferItem(12)] public PlacementZone8_F02_Nine Field_12 { get; set; } = new(); [FlatBufferItem(13)] public int Field_13 { get; set; } // 0, 1, 3, 4 [FlatBufferItem(14)] public int Field_14 { get; set; } // 6, 11, 14 or 0 [FlatBufferItem(15)] public byte Num_15 { get; set; } // 0 or 1 (bool?) public override string ToString() => $"{(Species)Species}{(Form != 0 ? $"-{Form}" : "")}"; + + public PlacementZone8SpeciesHolder() { } + + public PlacementZone8SpeciesHolder Clone() => new(this); + + public PlacementZone8SpeciesHolder(PlacementZone8SpeciesHolder other) : this() + { + Field_00 = other.Field_00.Clone(); + Field_01 = other.Field_01.Clone(); + Field_12 = other.Field_12.Clone(); + + Species = other.Species; + Form = other.Form; + Gender = other.Gender; + Shiny = other.Shiny; + Unused2 = other.Unused2; + Hash_07 = other.Hash_07; + Hash_08 = other.Hash_08; + Hash_09 = other.Hash_09; + Field_11 = other.Field_11; + Field_13 = other.Field_13; + Field_14 = other.Field_14; + Num_15 = other.Num_15; + } } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -54,12 +77,26 @@ public class PlacementZone8_F02_Nine [FlatBufferItem(07)] public ulong Hash_07 { get; set; } [FlatBufferItem(08)] public uint Field_08 { get; set; } [FlatBufferItem(09)] public uint Field_09 { get; set; } + + public PlacementZone8_F02_Nine Clone() => new() + { + Field_00 = Field_00, + Field_01 = Field_01, + Field_02 = Field_02, + Field_03 = Field_03, + Hash_04 = Hash_04, + Field_05 = Field_05, + Field_06 = Field_06, + Hash_07 = Hash_07, + Field_08 = Field_08, + Field_09 = Field_09, + }; } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F02 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong Hash_01 { get; set; } [FlatBufferItem(02)] public ulong Hash_02 { get; set; } [FlatBufferItem(03)] public ulong Hash_03 { get; set; } @@ -68,38 +105,81 @@ public class PlacementZone8_F02 [FlatBufferItem(06)] public uint Field_06 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(07)] public uint Field_07 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(08)] public uint Field_08 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused - [FlatBufferItem(09)] public FlatDummyObject Field_09 { get; set; } // no fields present in any existing + [FlatBufferItem(09)] public FlatDummyObject Field_09 { get; set; } = new(); // no fields present in any existing [FlatBufferItem(10)] public uint Field_10 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused - [FlatBufferItem(11)] public FlatDummyObject Field_11 { get; set; } // no fields present in any existing + [FlatBufferItem(11)] public FlatDummyObject Field_11 { get; set; } = new(); // no fields present in any existing [FlatBufferItem(12)] public ulong Hash_12 { get; set; } + + public PlacementZone8_F02 Clone() + { + return new() + { + Field_00 = Field_00.Clone(), + Hash_01 = Hash_01, + Hash_02 = Hash_02, + Hash_03 = Hash_03, + Hash_04 = Hash_04, + Field_05 = Field_05, + Field_06 = Field_06, + Field_07 = Field_07, + Field_08 = Field_08, + Field_09 = Field_09.Clone(), + Field_10 = Field_10, + Field_11 = Field_11.Clone(), + Hash_12 = Hash_12, + }; + } } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F02_Field1 { - [FlatBufferItem(00)] public PlacementZone8_F02_Inner Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F02_Inner Field_00 { get; set; } = new(); + + public PlacementZone8_F02_Field1 Clone() => new() { Field_00 = Field_00.Clone() }; } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F02_Inner { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong Hash_01 { get; set; } [FlatBufferItem(02)] public ulong Hash_02 { get; set; } [FlatBufferItem(03)] public ulong Hash_03 { get; set; } - [FlatBufferItem(04)] public PlacementZone8_F02_IntFloat Field_04 { get; set; } + [FlatBufferItem(04)] public PlacementZone8_F02_IntFloat Field_04 { get; set; } = new(); [FlatBufferItem(05)] public byte Num_05 { get; set; } // 0 or 1 (bool?) [FlatBufferItem(06)] public ulong Hash_06 { get; set; } - [FlatBufferItem(07)] public PlacementZone8_F02_IntFloat Field_07 { get; set; } + [FlatBufferItem(07)] public PlacementZone8_F02_IntFloat Field_07 { get; set; } = new(); + + public PlacementZone8_F02_Inner Clone() => new() + { + Field_00 = Field_00.Clone(), + Hash_01 = Hash_01, + Hash_02 = Hash_02, + Hash_03 = Hash_03, + Field_04 = Field_04.Clone(), + Num_05 = Num_05, + Hash_06 = Hash_06, + Field_07 = Field_07.Clone(), + }; } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F02_IntFloat { - [FlatBufferItem(00)] public int Field_00 { get; set; } + [FlatBufferItem(00)] public int Field_00 { get; set; } [FlatBufferItem(01)] public float Field_01 { get; set; } [FlatBufferItem(02)] public float Field_02 { get; set; } [FlatBufferItem(03)] public float Field_03 { get; set; } [FlatBufferItem(04)] public float Field_04 { get; set; } + + public PlacementZone8_F02_IntFloat Clone() => new() + { + Field_00 = Field_00, + Field_01 = Field_01, + Field_02 = Field_02, + Field_03 = Field_03, + Field_04 = Field_04, + }; } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StaticObjectsHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StaticObjectsHolder.cs index 18814bee..cbd54189 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StaticObjectsHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StaticObjectsHolder.cs @@ -7,7 +7,6 @@ // 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 @@ -15,20 +14,20 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8StaticObjectsHolder { - [FlatBufferItem(0)] public PlacementZoneStaticObject8 Object { get; set; } + [FlatBufferItem(0)] public PlacementZoneStaticObject8 Object { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZoneStaticObject8 { - [FlatBufferItem(0)] public PlacementZoneStaticObjectIdentifier8 Identifier { get; set; } + [FlatBufferItem(0)] public PlacementZoneStaticObjectIdentifier8 Identifier { get; set; } = new(); [FlatBufferItem(1)] public uint Field_01 { get; set; } [FlatBufferItem(2)] public uint Rate { get; set; } // usually 100, but [FlatBufferItem(3)] public uint Field_03 { get; set; } [FlatBufferItem(4)] public byte Field_04 { get; set; } - [FlatBufferItem(5)] public PlacementZoneStaticObjectSpawn8[] Spawns { get; set; } - [FlatBufferItem(6)] public PlacementZoneStaticObjectUnknown8 Field_06 { get; set; } - [FlatBufferItem(7)] public PlacementZoneStaticObjectUnknown8 Field_07 { get; set; } + [FlatBufferItem(5)] public PlacementZoneStaticObjectSpawn8[] Spawns { get; set; } = Array.Empty(); + [FlatBufferItem(6)] public PlacementZoneStaticObjectUnknown8 Field_06 { get; set; } = new(); + [FlatBufferItem(7)] public PlacementZoneStaticObjectUnknown8 Field_07 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -52,10 +51,10 @@ public class PlacementZoneStaticObjectIdentifier8 public class PlacementZoneStaticObjectSpawn8 { [FlatBufferItem(0)] public ulong SpawnID { get; set; } - [FlatBufferItem(1)] public string Behavior { get; set; } // passed to Lua script for animating + [FlatBufferItem(1)] public string Behavior { get; set; } = ""; // passed to Lua script for animating [FlatBufferItem(2)] public ulong Field_02 { get; set; } // default hash for all, likely empty string [FlatBufferItem(3)] public uint Field_03 { get; set; } - [FlatBufferItem(4)] public PlacementZoneStaticObjectUnknown8 Field_04 { get; set; } + [FlatBufferItem(4)] public PlacementZoneStaticObjectUnknown8 Field_04 { get; set; } = new(); public IEnumerable GetSummary(EncounterStatic8[] statics, IReadOnlyList species) { diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StepJumpHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StepJumpHolder.cs index 4edf529b..e3f42e55 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StepJumpHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StepJumpHolder.cs @@ -5,20 +5,19 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8StepJumpHolder { - [FlatBufferItem(00)] public PlacementZone8StepJump Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8StepJump Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8StepJump { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public float Field_01 { get; set; } [FlatBufferItem(02)] public float Field_02 { get; set; } [FlatBufferItem(03)] public float Field_03 { get; set; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SymbolSpawnHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SymbolSpawnHolder.cs index d34e1d66..966330f5 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SymbolSpawnHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SymbolSpawnHolder.cs @@ -5,7 +5,6 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { @@ -13,18 +12,18 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8SymbolSpawnHolder { - [FlatBufferItem(00)] public PlacementZone8SymbolSpawn Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8SymbolSpawn Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8SymbolSpawn { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public int Field_01 { get; set; } - [FlatBufferItem(02)] public PlacementZone8_F20_Sub Field_02 { get; set; } - [FlatBufferItem(03)] public PlacementZone8_F20_Sub Field_03 { get; set; } - [FlatBufferItem(04)] public PlacementZone8_F20_Sub Field_04 { get; set; } - [FlatBufferItem(05)] public PlacementZone8_F20_Sub Field_05 { get; set; } + [FlatBufferItem(02)] public PlacementZone8_F20_Sub Field_02 { get; set; } = new(); + [FlatBufferItem(03)] public PlacementZone8_F20_Sub Field_03 { get; set; } = new(); + [FlatBufferItem(04)] public PlacementZone8_F20_Sub Field_04 { get; set; } = new(); + [FlatBufferItem(05)] public PlacementZone8_F20_Sub Field_05 { get; set; } = new(); [FlatBufferItem(06)] public int Field_06 { get; set; } [FlatBufferItem(07)] public ulong SymbolHash { get; set; } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TrainerHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TrainerHolder.cs index 499fa02d..731056b4 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TrainerHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TrainerHolder.cs @@ -6,7 +6,6 @@ // 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,14 +13,14 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8TrainerHolder { - [FlatBufferItem(00)] public PlacementZone8_F08 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZone8_F08 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public float Field_01 { get; set; } [FlatBufferItem(02)] public ulong TrainerID { get; set; } [FlatBufferItem(03)] public ulong Hash_03 { get; set; } [FlatBufferItem(04)] public ulong MovementPath { get; set; } [FlatBufferItem(05)] public PlacementZone8_F08_ArrayEntry[] Unknown { get; set; } = Array.Empty(); [FlatBufferItem(06)] public uint Field_06 { get; set; } - [FlatBufferItem(07)] public PlacementZone8_F08_Nine Field_07 { get; set; } + [FlatBufferItem(07)] public PlacementZone8_F08_Nine Field_07 { get; set; } = new(); [FlatBufferItem(08)] public uint Field_08 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(09)] public uint Field_09 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(10)] public uint Field_10 { get; set; } @@ -58,20 +57,20 @@ public class PlacementZone8_F08_Nine [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F08 { - [FlatBufferItem(0)] public PlacementZone8_F08_A Field_00 { get; set; } + [FlatBufferItem(0)] public PlacementZone8_F08_A Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F08_A { - [FlatBufferItem(0)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(0)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(1)] public ulong Hash_01 { get; set; } [FlatBufferItem(2)] public ulong Hash_02 { get; set; } [FlatBufferItem(3)] public ulong Hash_03 { get; set; } - [FlatBufferItem(4)] public PlacementZone8_F08_IntFloat Field_04 { get; set; } + [FlatBufferItem(4)] public PlacementZone8_F08_IntFloat Field_04 { get; set; } = new(); [FlatBufferItem(5)] public uint Field_06 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused [FlatBufferItem(6)] public ulong Hash_06 { get; set; } - [FlatBufferItem(7)] public PlacementZone8_F08_IntFloat Field_07 { get; set; } + [FlatBufferItem(7)] public PlacementZone8_F08_IntFloat Field_07 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TrainerTipHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TrainerTipHolder.cs index 336e2ea7..33db15eb 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TrainerTipHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TrainerTipHolder.cs @@ -5,27 +5,26 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8TrainerTipHolder { - [FlatBufferItem(00)] public PlacementZoneTrainerTip Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneTrainerTip Field_00 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZoneTrainerTip { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public float Field_01 { get; set; } [FlatBufferItem(02)] public float Field_02 { get; set; } [FlatBufferItem(03)] public float Field_03 { get; set; } [FlatBufferItem(04)] public float Field_04 { get; set; } [FlatBufferItem(05)] public ulong Field_05 { get; set; } - [FlatBufferItem(06)] public PlacementZone8_F09 Field_06 { get; set; } - [FlatBufferItem(07)] public PlacementZone8_F09_Union Field_07 { get; set; } + [FlatBufferItem(06)] public PlacementZone8_F09 Field_06 { get; set; } = new(); + [FlatBufferItem(07)] public PlacementZone8_F09_Union Field_07 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -49,7 +48,7 @@ public class PlacementZone8_F09 public class PlacementZone8_F09_Union { [FlatBufferItem(00)] public byte Field_00 { get; set; } - [FlatBufferItem(01)] public PlacementZone8_F09_Sub Field_06 { get; set; } + [FlatBufferItem(01)] public PlacementZone8_F09_Sub Field_06 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TriggerHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TriggerHolder.cs index 4db76ba3..c7141fad 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TriggerHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TriggerHolder.cs @@ -5,7 +5,6 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { @@ -13,16 +12,16 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8TriggerHolder { - [FlatBufferItem(0)] public PlacementZone8Trigger Object { get; set; } + [FlatBufferItem(0)] public PlacementZone8Trigger Object { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8Trigger { - [FlatBufferItem(0)] public PlacementZoneDeepX8 Field_00 { get; set; } + [FlatBufferItem(0)] public PlacementZoneDeepX8 Field_00 { get; set; } = new(); [FlatBufferItem(1)] public ulong TriggerName { get; set; } [FlatBufferItem(2)] public uint Field_02 { get; set; } - [FlatBufferItem(3)] public PlacementZoneDeepY8 Field_03 { get; set; } + [FlatBufferItem(3)] public PlacementZoneDeepY8 Field_03 { get; set; } = new(); [FlatBufferItem(4)] public uint Field_04 { get; set; } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8UnitObjectHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8UnitObjectHolder.cs index ef86f34c..e5df8792 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8UnitObjectHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8UnitObjectHolder.cs @@ -6,8 +6,6 @@ // 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 { @@ -15,7 +13,7 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8UnitObjectHolder { - [FlatBufferItem(00)] public PlacementZone8UnitObject Object { get; set; } + [FlatBufferItem(00)] public PlacementZone8UnitObject Object { get; set; } = new(); public override string ToString() => Object.Model; } @@ -23,21 +21,21 @@ public class PlacementZone8UnitObjectHolder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8UnitObject { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } - [FlatBufferItem(01)] public string Model { get; set; } - [FlatBufferItem(02)] public string Animation { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); + [FlatBufferItem(01)] public string Model { get; set; } = ""; + [FlatBufferItem(02)] public string Animation { 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 - [FlatBufferItem(06)] public string Field_06 { get; set; } // none have this + [FlatBufferItem(05)] public string Field_05 { get; set; } = ""; // none have this + [FlatBufferItem(06)] public string Field_06 { get; set; } = ""; // none have this [FlatBufferItem(07)] public float Field_07 { get; set; } [FlatBufferItem(08)] public float Field_08 { get; set; } [FlatBufferItem(09)] public float Field_09 { get; set; } [FlatBufferItem(10)] public float Field_10 { get; set; } - [FlatBufferItem(11)] public PlacementZoneDeepY8 Unknown { get; set; } + [FlatBufferItem(11)] public PlacementZoneDeepY8 Unknown { get; set; } = new(); [FlatBufferItem(12)] public byte Number { get; set; } - [FlatBufferItem(13)] public PlacementZone8UnitObjectDetails Details { get; set; } - [FlatBufferItem(14)] public PlacementZone8UnitObjectToggle Dummy { get; set; } + [FlatBufferItem(13)] public PlacementZone8UnitObjectDetails Details { get; set; } = new(); + [FlatBufferItem(14)] public PlacementZone8UnitObjectToggle Dummy { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] @@ -61,7 +59,7 @@ public class PlacementZone8UnitObjectDetails public class PlacementZone8UnitObjectToggle { [FlatBufferItem(00)] public bool Field_00 { get; set; } - [FlatBufferItem(01)] public PlacementZone8UnitObjectInner Field_01 { get; set; } + [FlatBufferItem(01)] public PlacementZone8UnitObjectInner Field_01 { get; set; } = new(); } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8WarpHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8WarpHolder.cs index c4c8f8e1..69e98a74 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8WarpHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8WarpHolder.cs @@ -6,14 +6,13 @@ // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global -#nullable disable namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8WarpHolder { - [FlatBufferItem(00)] public PlacementZoneWarp8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneWarp8 Field_00 { get; set; } = new(); public override string ToString() => $"{Field_00.OtherAreaName} via {Field_00.ModelName}"; } @@ -21,18 +20,18 @@ public class PlacementZone8WarpHolder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZoneWarp8 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [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 OtherAreaName { get; set; } = ""; + [FlatBufferItem(03)] public string ModelName { get; set; } = ""; + [FlatBufferItem(04)] public string Animation { 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; } - [FlatBufferItem(10)] public string SoundEffect1 { get; set; } - [FlatBufferItem(11)] public string SoundEffect2 { get; set; } + [FlatBufferItem(09)] public PlacementZoneWarpDetails8 SubMeta { get; set; } = new(); + [FlatBufferItem(10)] public string SoundEffect1 { get; set; } = ""; + [FlatBufferItem(11)] public string SoundEffect2 { 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 1c4644e2..2c22ca6f 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs @@ -7,7 +7,6 @@ // 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 @@ -15,34 +14,34 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8 { - [FlatBufferItem(00)] public PlacementZoneMeta8 Meta { get; set; } - [FlatBufferItem(01)] public PlacementZone8UnitObjectHolder[] UnitObjects { get; set; } - [FlatBufferItem(02)] public PlacementZone8SpeciesHolder[] Critters { get; set; } - [FlatBufferItem(03)] public PlacementZone8WarpHolder[] Warps { get; set; } - [FlatBufferItem(04)] public PlacementZone8StepJumpHolder[] StepJumps { get; set; } - [FlatBufferItem(05)] public PlacementZone8ParticleHolder[] Particles { get; set; } - [FlatBufferItem(06)] public PlacementZone8FieldItemHolder[] FieldItems { get; set; } - [FlatBufferItem(07)] public PlacementZone8TriggerHolder[] Triggers { get; set; } - [FlatBufferItem(08)] public PlacementZone8TrainerHolder[] Trainers { get; set; } - [FlatBufferItem(09)] public PlacementZone8TrainerTipHolder[] TrainerTips { get; set; } - [FlatBufferItem(10)] public PlacementZone8EnvironmentHolder[] Environments { get; set; } - [FlatBufferItem(11)] public PlacementZone8FlightAnchorHolder[] FlyTo { get; set; } - [FlatBufferItem(12)] public PlacementZone8PokeCenterSpawnAnchorHolder[] PokeCenterAnchor { get; set; } - [FlatBufferItem(13)] public PlacementZone8NPCHolder[] NPCType1 { get; set; } - [FlatBufferItem(14)] public PlacementZone8AdvancedTipHolder[] AdvancedTips { get; set; } - [FlatBufferItem(15)] public PlacementZone8MovementPathHolder[] Paths { get; set; } - [FlatBufferItem(16)] public PlacementZone8OtherNPCHolder[] NPCType2 { get; set; } - [FlatBufferItem(17)] public PlacementZone8QuadrantHolder[] Quadrants { get; set; } - [FlatBufferItem(18)] public PlacementZone8FishingPointHolder[] FishingPoint { get; set; } - [FlatBufferItem(19)] public PlacementZone8HiddenItemHolder[] HiddenItems { get; set; } - [FlatBufferItem(20)] public PlacementZone8SymbolSpawnHolder[] Symbols { get; set; } - [FlatBufferItem(21)] public PlacementZone8NestHoleHolder[] Nests { get; set; } - [FlatBufferItem(22)] public PlacementZone8BerryTreeHolder[] BerryTrees { get; set; } - [FlatBufferItem(23)] public PlacementZone8LadderHolder[] Ladders { get; set; } - [FlatBufferItem(24)] public PlacementZone8PopupHolder[] Popups { get; set; } - [FlatBufferItem(25)] public PlacementZone8IKStepHolder[] IKStep { get; set; } - [FlatBufferItem(26)] public PlacementZone8StaticObjectsHolder[] StaticObjects { get; set; } - [FlatBufferItem(27)] public PlacementZone8RotomRallyEntry[] RotomRally { get; set; } + [FlatBufferItem(00)] public PlacementZoneMeta8 Meta { get; set; } = new(); + [FlatBufferItem(01)] public PlacementZone8UnitObjectHolder[] UnitObjects { get; set; } = Array.Empty(); + [FlatBufferItem(02)] public PlacementZone8SpeciesHolder[] Critters { get; set; } = Array.Empty(); + [FlatBufferItem(03)] public PlacementZone8WarpHolder[] Warps { get; set; } = Array.Empty(); + [FlatBufferItem(04)] public PlacementZone8StepJumpHolder[] StepJumps { get; set; } = Array.Empty(); + [FlatBufferItem(05)] public PlacementZone8ParticleHolder[] Particles { get; set; } = Array.Empty(); + [FlatBufferItem(06)] public PlacementZone8FieldItemHolder[] FieldItems { get; set; } = Array.Empty(); + [FlatBufferItem(07)] public PlacementZone8TriggerHolder[] Triggers { get; set; } = Array.Empty(); + [FlatBufferItem(08)] public PlacementZone8TrainerHolder[] Trainers { get; set; } = Array.Empty(); + [FlatBufferItem(09)] public PlacementZone8TrainerTipHolder[] TrainerTips { get; set; } = Array.Empty(); + [FlatBufferItem(10)] public PlacementZone8EnvironmentHolder[] Environments { get; set; } = Array.Empty(); + [FlatBufferItem(11)] public PlacementZone8FlightAnchorHolder[] FlyTo { get; set; } = Array.Empty(); + [FlatBufferItem(12)] public PlacementZone8PokeCenterSpawnAnchorHolder[] PokeCenterAnchor { get; set; } = Array.Empty(); + [FlatBufferItem(13)] public PlacementZone8NPCHolder[] NPCType1 { get; set; } = Array.Empty(); + [FlatBufferItem(14)] public PlacementZone8AdvancedTipHolder[] AdvancedTips { get; set; } = Array.Empty(); + [FlatBufferItem(15)] public PlacementZone8MovementPathHolder[] Paths { get; set; } = Array.Empty(); + [FlatBufferItem(16)] public PlacementZone8OtherNPCHolder[] NPCType2 { get; set; } = Array.Empty(); + [FlatBufferItem(17)] public PlacementZone8QuadrantHolder[] Quadrants { get; set; } = Array.Empty(); + [FlatBufferItem(18)] public PlacementZone8FishingPointHolder[] FishingPoint { get; set; } = Array.Empty(); + [FlatBufferItem(19)] public PlacementZone8HiddenItemHolder[] HiddenItems { get; set; } = Array.Empty(); + [FlatBufferItem(20)] public PlacementZone8SymbolSpawnHolder[] Symbols { get; set; } = Array.Empty(); + [FlatBufferItem(21)] public PlacementZone8NestHoleHolder[] Nests { get; set; } = Array.Empty(); + [FlatBufferItem(22)] public PlacementZone8BerryTreeHolder[] BerryTrees { get; set; } = Array.Empty(); + [FlatBufferItem(23)] public PlacementZone8LadderHolder[] Ladders { get; set; } = Array.Empty(); + [FlatBufferItem(24)] public PlacementZone8PopupHolder[] Popups { get; set; } = Array.Empty(); + [FlatBufferItem(25)] public PlacementZone8IKStepHolder[] IKStep { get; set; } = Array.Empty(); + [FlatBufferItem(26)] public PlacementZone8StaticObjectsHolder[] StaticObjects { get; set; } = Array.Empty(); + [FlatBufferItem(27)] public PlacementZone8RotomRallyEntry[] RotomRally { get; set; } = Array.Empty(); public override string ToString() => Meta.ZoneID.ToString("X16"); @@ -67,17 +66,19 @@ public class PlacementZone8 var ident = obj.Identifier; yield return $" {objects[ident.SpawnerID]}:"; yield return $" Location: ({ident.LocationX}, {ident.LocationY}, {ident.LocationZ})"; - if (obj.Spawns?.Length == 0) + if (obj.Spawns.Length == 0) { yield return " No spawns."; // shouldn't hit here, if we have a holder we should have a spawn to hold. yield break; } var s = obj.Spawns; - if (Array.TrueForAll(s, z => z.SpawnID == s[0].SpawnID)) + var first = s[0]; + var spawnId = first.SpawnID; + if (Array.TrueForAll(s, z => z.SpawnID == spawnId)) { yield return " All Weather:"; - foreach (var line in s[0].GetSummary(statics, species)) + foreach (var line in first.GetSummary(statics, species)) yield return $" {line}"; } else @@ -98,12 +99,12 @@ public class PlacementZone8 [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZoneMeta8 { - [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } = new(); [FlatBufferItem(01)] public ulong ZoneID { get; set; } [FlatBufferItem(02)] public ulong Hash_02 { get; set; } - [FlatBufferItem(03)] public string Field_03 { get; set; } // none have this + [FlatBufferItem(03)] public string Field_03 { get; set; } = ""; // none have this [FlatBufferItem(04)] public uint Field_04 { get; set; } - [FlatBufferItem(05)] public string Music { get; set; } + [FlatBufferItem(05)] public string Music { get; set; } = ""; [FlatBufferItem(06)] public float Field_06 { get; set; } [FlatBufferItem(07)] public ulong Hash_07 { get; set; } [FlatBufferItem(08)] public ulong Hash_08 { get; set; } @@ -124,16 +125,32 @@ public class PlacementZoneMetaTripleXYZ8 [FlatBufferItem(00)] public float LocationX { get; set; } [FlatBufferItem(01)] public float LocationY { get; set; } [FlatBufferItem(02)] public float LocationZ { get; set; } - [FlatBufferItem(03)] public float Field_03 { get; set; } // assumed - [FlatBufferItem(04)] public float Field_04 { get; set; } - [FlatBufferItem(05)] public float Field_05 { get; set; } // assumed - [FlatBufferItem(06)] public float Field_06 { get; set; } - [FlatBufferItem(07)] public float Field_07 { get; set; } - [FlatBufferItem(08)] public float Field_08 { get; set; } - [FlatBufferItem(09)] public ulong Hash_09 { get; set; } - [FlatBufferItem(10)] public ulong Hash_10 { get; set; } - [FlatBufferItem(11)] public ulong Hash_11 { get; set; } + [FlatBufferItem(03)] public float Field_03 { get; set; } // assumed + [FlatBufferItem(04)] public float Field_04 { get; set; } + [FlatBufferItem(05)] public float Field_05 { get; set; } // assumed + [FlatBufferItem(06)] public float Field_06 { get; set; } + [FlatBufferItem(07)] public float Field_07 { get; set; } + [FlatBufferItem(08)] public float Field_08 { get; set; } + [FlatBufferItem(09)] public ulong Hash_09 { get; set; } + [FlatBufferItem(10)] public ulong Hash_10 { get; set; } + [FlatBufferItem(11)] public ulong Hash_11 { get; set; } public override string ToString() => $"{Hash_09:X16}"; + + public PlacementZoneMetaTripleXYZ8 Clone() => new() + { + LocationX = LocationX, + LocationY = LocationY, + LocationZ = LocationZ, + Field_03 = Field_03, + Field_04 = Field_04, + Field_05 = Field_05, + Field_06 = Field_06, + Field_07 = Field_07, + Field_08 = Field_08, + Hash_09 = Hash_09, + Hash_10 = Hash_10, + Hash_11 = Hash_11, + }; } } diff --git a/pkNX.Structures.FlatBuffers/Util/FlatDummyObject.cs b/pkNX.Structures.FlatBuffers/Util/FlatDummyObject.cs index 42582fdf..7f94d659 100644 --- a/pkNX.Structures.FlatBuffers/Util/FlatDummyObject.cs +++ b/pkNX.Structures.FlatBuffers/Util/FlatDummyObject.cs @@ -23,5 +23,7 @@ public byte Field_00 } public override string ToString() => "UNUSED OBJECT: NO FIELD DATA"; + + public FlatDummyObject Clone() => this; } }