Skip to content

Commit 083b2d5

Browse files
committed
Update lodestone-data-exports
1 parent 60eb09f commit 083b2d5

File tree

5 files changed

+37
-27
lines changed

5 files changed

+37
-27
lines changed

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -436,3 +436,5 @@ healthchecksdb
436436
MigrationBackup/
437437

438438
# End of https://www.gitignore.io/api/rider,dotnetcore,visualstudio
439+
440+
flatc.exe

Diff for: NetStone.GameData.Packs/Internal/ClassJobTable.cs

+30-22
Original file line numberDiff line numberDiff line change
@@ -54,56 +54,64 @@ public struct ClassJob : IFlatbufferObject
5454
public ClassJob __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
5555

5656
public uint Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } }
57-
public string NameEn { get { int o = __p.__offset(6); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
57+
public uint Parent { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } }
58+
public uint JobIndex { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } }
59+
public string NameEn { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
5860
#if ENABLE_SPAN_T
59-
public Span<byte> GetNameEnBytes() { return __p.__vector_as_span<byte>(6, 1); }
61+
public Span<byte> GetNameEnBytes() { return __p.__vector_as_span<byte>(10, 1); }
6062
#else
61-
public ArraySegment<byte>? GetNameEnBytes() { return __p.__vector_as_arraysegment(6); }
63+
public ArraySegment<byte>? GetNameEnBytes() { return __p.__vector_as_arraysegment(10); }
6264
#endif
63-
public byte[] GetNameEnArray() { return __p.__vector_as_array<byte>(6); }
64-
public string NameFr { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
65+
public byte[] GetNameEnArray() { return __p.__vector_as_array<byte>(10); }
66+
public string NameFr { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
6567
#if ENABLE_SPAN_T
66-
public Span<byte> GetNameFrBytes() { return __p.__vector_as_span<byte>(8, 1); }
68+
public Span<byte> GetNameFrBytes() { return __p.__vector_as_span<byte>(12, 1); }
6769
#else
68-
public ArraySegment<byte>? GetNameFrBytes() { return __p.__vector_as_arraysegment(8); }
70+
public ArraySegment<byte>? GetNameFrBytes() { return __p.__vector_as_arraysegment(12); }
6971
#endif
70-
public byte[] GetNameFrArray() { return __p.__vector_as_array<byte>(8); }
71-
public string NameDe { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
72+
public byte[] GetNameFrArray() { return __p.__vector_as_array<byte>(12); }
73+
public string NameDe { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
7274
#if ENABLE_SPAN_T
73-
public Span<byte> GetNameDeBytes() { return __p.__vector_as_span<byte>(10, 1); }
75+
public Span<byte> GetNameDeBytes() { return __p.__vector_as_span<byte>(14, 1); }
7476
#else
75-
public ArraySegment<byte>? GetNameDeBytes() { return __p.__vector_as_arraysegment(10); }
77+
public ArraySegment<byte>? GetNameDeBytes() { return __p.__vector_as_arraysegment(14); }
7678
#endif
77-
public byte[] GetNameDeArray() { return __p.__vector_as_array<byte>(10); }
78-
public string NameJa { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
79+
public byte[] GetNameDeArray() { return __p.__vector_as_array<byte>(14); }
80+
public string NameJa { get { int o = __p.__offset(16); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
7981
#if ENABLE_SPAN_T
80-
public Span<byte> GetNameJaBytes() { return __p.__vector_as_span<byte>(12, 1); }
82+
public Span<byte> GetNameJaBytes() { return __p.__vector_as_span<byte>(16, 1); }
8183
#else
82-
public ArraySegment<byte>? GetNameJaBytes() { return __p.__vector_as_arraysegment(12); }
84+
public ArraySegment<byte>? GetNameJaBytes() { return __p.__vector_as_arraysegment(16); }
8385
#endif
84-
public byte[] GetNameJaArray() { return __p.__vector_as_array<byte>(12); }
86+
public byte[] GetNameJaArray() { return __p.__vector_as_array<byte>(16); }
8587

8688
public static Offset<FFXIV.ClassJob> CreateClassJob(FlatBufferBuilder builder,
8789
uint Id = 0,
90+
uint Parent = 0,
91+
uint JobIndex = 0,
8892
StringOffset NameEnOffset = default(StringOffset),
8993
StringOffset NameFrOffset = default(StringOffset),
9094
StringOffset NameDeOffset = default(StringOffset),
9195
StringOffset NameJaOffset = default(StringOffset)) {
92-
builder.StartTable(5);
96+
builder.StartTable(7);
9397
ClassJob.AddNameJa(builder, NameJaOffset);
9498
ClassJob.AddNameDe(builder, NameDeOffset);
9599
ClassJob.AddNameFr(builder, NameFrOffset);
96100
ClassJob.AddNameEn(builder, NameEnOffset);
101+
ClassJob.AddJobIndex(builder, JobIndex);
102+
ClassJob.AddParent(builder, Parent);
97103
ClassJob.AddId(builder, Id);
98104
return ClassJob.EndClassJob(builder);
99105
}
100106

101-
public static void StartClassJob(FlatBufferBuilder builder) { builder.StartTable(5); }
107+
public static void StartClassJob(FlatBufferBuilder builder) { builder.StartTable(7); }
102108
public static void AddId(FlatBufferBuilder builder, uint Id) { builder.AddUint(0, Id, 0); }
103-
public static void AddNameEn(FlatBufferBuilder builder, StringOffset NameEnOffset) { builder.AddOffset(1, NameEnOffset.Value, 0); }
104-
public static void AddNameFr(FlatBufferBuilder builder, StringOffset NameFrOffset) { builder.AddOffset(2, NameFrOffset.Value, 0); }
105-
public static void AddNameDe(FlatBufferBuilder builder, StringOffset NameDeOffset) { builder.AddOffset(3, NameDeOffset.Value, 0); }
106-
public static void AddNameJa(FlatBufferBuilder builder, StringOffset NameJaOffset) { builder.AddOffset(4, NameJaOffset.Value, 0); }
109+
public static void AddParent(FlatBufferBuilder builder, uint Parent) { builder.AddUint(1, Parent, 0); }
110+
public static void AddJobIndex(FlatBufferBuilder builder, uint JobIndex) { builder.AddUint(2, JobIndex, 0); }
111+
public static void AddNameEn(FlatBufferBuilder builder, StringOffset NameEnOffset) { builder.AddOffset(3, NameEnOffset.Value, 0); }
112+
public static void AddNameFr(FlatBufferBuilder builder, StringOffset NameFrOffset) { builder.AddOffset(4, NameFrOffset.Value, 0); }
113+
public static void AddNameDe(FlatBufferBuilder builder, StringOffset NameDeOffset) { builder.AddOffset(5, NameDeOffset.Value, 0); }
114+
public static void AddNameJa(FlatBufferBuilder builder, StringOffset NameJaOffset) { builder.AddOffset(6, NameJaOffset.Value, 0); }
107115
public static Offset<FFXIV.ClassJob> EndClassJob(FlatBufferBuilder builder) {
108116
int o = builder.EndTable();
109117
return new Offset<FFXIV.ClassJob>(o);

Diff for: NetStone.GameData.Packs/Internal/ItemTable.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public struct ItemTable : IFlatbufferObject
1919
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }
2020
public ItemTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
2121

22-
public readonly FFXIV.Item? Items(int j) { int o = __p.__offset(4); return o != 0 ? (FFXIV.Item?)(new FFXIV.Item()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; }
22+
public FFXIV.Item? Items(int j) { int o = __p.__offset(4); return o != 0 ? (FFXIV.Item?)(new FFXIV.Item()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; }
2323
public int ItemsLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } }
2424
public FFXIV.Item? ItemsByKey(uint key) { int o = __p.__offset(4); return o != 0 ? FFXIV.Item.__lookup_by_key(__p.__vector(o), key, __p.bb) : null; }
2525

@@ -136,4 +136,4 @@ public static VectorOffset CreateSortedVectorOfItem(FlatBufferBuilder builder, O
136136
};
137137

138138

139-
}
139+
}

Diff for: compile-fbs.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ echo Packing data exports...
88
#go-bindata -o internal/pack/exports/gamedata.go -prefix "lodestone-data-exports/pack" -ignore="(LICENSE|README.md|.git|.gitignore|meta.json|LodestoneDataExporter.*|schema|.vscode)" lodestone-data-exports/...
99
#sed -i "s/package main/package exports/g" internal/pack/exports/gamedata.go
1010

11-
#find ./NetStone/GameData/Internal/ -type f -exec sed -i 's/using global::FlatBuffers;/using global::Google.FlatBuffers;/g' {} \;
12-
#find ./NetStone/GameData/Internal/ -type f -exec sed -i 's/FFXIV/NetStone.GameData.Internal/g' {} \;
11+
find -D exec ./NetStone.GameData.Packs/Internal/ -type f -exec sed -i 's/using global::Google.FlatBuffers;/using global::FlatBuffers;/g' {} \;
12+
#find -D exec ./NetStone.GameData.Packs/Internal/ -type f -exec sed -i 's/FFXIV/NetStone.GameData.Internal/g' {} \;
1313

1414
echo Done!

0 commit comments

Comments
 (0)