From 45c73d48a588a3fc0bb77a00aa4967d8cdeb5468 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 15 Sep 2021 16:21:50 -0700 Subject: [PATCH] Remove DefaultValue spec, clarify some props --- .../Holders/PlacementZone8AdvancedTipHolder.cs | 4 ++-- .../Holders/PlacementZone8BerryTreeHolder.cs | 6 +++--- .../Holders/PlacementZone8FlightAnchorHolder.cs | 4 ++-- .../Zone/Holders/PlacementZone8PopupHolder.cs | 2 +- .../Zone/Holders/PlacementZone8SpeciesHolder.cs | 8 ++++---- .../Holders/PlacementZone8StaticObjectsHolder.cs | 16 ++++++++-------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8AdvancedTipHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8AdvancedTipHolder.cs index d32552c1..ef00e16e 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8AdvancedTipHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8AdvancedTipHolder.cs @@ -65,7 +65,7 @@ public class PlacementZone8_F14_B [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F14_Union { - [FlatBufferItem(00, DefaultValue = true)] public bool Field_00 { get; set; } = true; + [FlatBufferItem(00)] public bool Field_00 { get; set; } = true; [FlatBufferItem(01)] public PlacementZone8_F14_Sub Field_01 { get; set; } } @@ -73,6 +73,6 @@ public class PlacementZone8_F14_Union public class PlacementZone8_F14_Sub { [FlatBufferItem(00)] public float Field_00 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused - [FlatBufferItem(01, DefaultValue = 130f)] public float Field_01 { get; set; } + [FlatBufferItem(01)] public float Field_01 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8BerryTreeHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8BerryTreeHolder.cs index 8fc13834..c1e9d3ca 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8BerryTreeHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8BerryTreeHolder.cs @@ -66,14 +66,14 @@ public class PlacementZone8_F22_BoolObject14 public class PlacementZone_F22_Inner { [FlatBufferItem(00)] public float Field_00 { get => 0; set { if (value != 0) throw new ArgumentException("Not Observed"); } } // unused - [FlatBufferItem(01, DefaultValue = 150f)] public float Field_01 { get; set; } + [FlatBufferItem(01)] public float Field_01 { get; set; } } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8BerryTreeRandom { [FlatBufferItem(0)] public ulong Hash { get; set; } - [FlatBufferItem(1)] public uint Field_01 { get; set; } // rate - [FlatBufferItem(2)] public uint Field_02 { get; set; } + [FlatBufferItem(1)] public uint Rate { get; set; } + [FlatBufferItem(2)] public uint Quantity { get; set; } // always 1? } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs index 8f5988e7..05b089e0 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs @@ -13,11 +13,11 @@ namespace pkNX.Structures.FlatBuffers [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8FlightAnchorHolder { - [FlatBufferItem(00)] public PlacementZone8_F11 FlightAnchor { get; set; } + [FlatBufferItem(00)] public PlacementZone8FlightAnchor FlightAnchor { get; set; } } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] - public class PlacementZone8_F11 + public class PlacementZone8FlightAnchor { [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Placement { get; set; } [FlatBufferItem(01)] public ulong UnlockFlagHash { get; set; } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PopupHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PopupHolder.cs index 34bb0e76..cbe8b203 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PopupHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PopupHolder.cs @@ -40,7 +40,7 @@ public class PlacementZone8_F24_Table { [FlatBufferItem(00)] public ulong Hash_00 { get; set; } [FlatBufferItem(01)] public ulong Hash_01 { get; set; } - [FlatBufferItem(02)] public uint Hash_02 { get; set; } + [FlatBufferItem(02)] public uint Field_02 { get; set; } // multiples of 10, usually +10 from previous entry. } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs index f664553c..9796b38d 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs @@ -33,9 +33,9 @@ public class PlacementZone8SpeciesHolder [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(13)] public int Field_13 { get; set; } - [FlatBufferItem(14)] public int Field_14 { get; set; } - [FlatBufferItem(15)] public byte Num_15 { get; set; } + [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}" : "")}"; } @@ -87,7 +87,7 @@ public class PlacementZone8_F02_Inner [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(05)] public byte Num_05 { get; set; } + [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; } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StaticObjectsHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StaticObjectsHolder.cs index 7f9be903..18814bee 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StaticObjectsHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8StaticObjectsHolder.cs @@ -23,7 +23,7 @@ public class PlacementZoneStaticObject8 { [FlatBufferItem(0)] public PlacementZoneStaticObjectIdentifier8 Identifier { get; set; } [FlatBufferItem(1)] public uint Field_01 { get; set; } - [FlatBufferItem(2)] public uint Field_02 { 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; } @@ -52,7 +52,7 @@ public class PlacementZoneStaticObjectIdentifier8 public class PlacementZoneStaticObjectSpawn8 { [FlatBufferItem(0)] public ulong SpawnID { get; set; } - [FlatBufferItem(1)] public string Description { get; set; } + [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; } @@ -74,12 +74,12 @@ public IEnumerable GetSummary(EncounterStatic8[] statics, IReadOnlyList< [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZoneStaticObjectUnknown8 { - [FlatBufferItem(0)] public uint Field_0 { get; set; } - [FlatBufferItem(1)] public uint Field_1 { get; set; } - [FlatBufferItem(2)] public uint Field_2 { get; set; } - [FlatBufferItem(3)] public uint Field_3 { get; set; } - [FlatBufferItem(4)] public float Field_4 { get; set; } + [FlatBufferItem(0)] public uint Field_00 { get; set; } + [FlatBufferItem(1)] public float Field_01 { get; set; } // unused, assumed same shape as other i4f + [FlatBufferItem(2)] public float Field_02 { get; set; } // unused, assumed same shape as other i4f + [FlatBufferItem(3)] public float Field_03 { get; set; } // unused, assumed same shape as other i4f + [FlatBufferItem(4)] public float Field_04 { get; set; } - public override string ToString() => $"{Field_0} {Field_1} {Field_2} {Field_3} {Field_4}"; + public override string ToString() => $"{Field_00} {Field_01} {Field_02} {Field_03} {Field_04}"; } }