Skip to content

Commit f4c1819

Browse files
committed
Update data serialization to 2.0.2
1 parent f49cd41 commit f4c1819

File tree

4 files changed

+25
-1
lines changed

4 files changed

+25
-1
lines changed

XbTool/XbTool/Serialization/ReadFunctions.cs

+13
Original file line numberDiff line numberDiff line change
@@ -9527,6 +9527,11 @@ public static void SetReferences(BdatCollection tables)
95279527
item._Name = tables.btl_elementaleffect_ms.GetItemOrNull(item.Name);
95289528
}
95299529

9530+
foreach (BTL_EnAwake item in tables.BTL_EnAwake.Items)
9531+
{
9532+
item._Name = tables.btl_buff_ms.GetItemOrNull(item.Name);
9533+
}
9534+
95309535
foreach (BTL_EnBook item in tables.BTL_EnBook.Items)
95319536
{
95329537
item._BaseEnemyID = tables.CHR_EnArrange.GetItemOrNull(item.BaseEnemyID);
@@ -9873,6 +9878,7 @@ public static void SetReferences(BdatCollection tables)
98739878
item._ArtsNum9 = tables.BTL_Arts_En.GetItemOrNull(item.ArtsNum9);
98749879
item._Atr = tables.MNU_Msg_Attr.GetItemOrNull(item.Atr + 1);
98759880
item._Aura = tables.BTL_Aura.GetItemOrNull(item.Aura);
9881+
item._AwakeLev = tables.BTL_EnAwake.GetItemOrNull(item.AwakeLev);
98769882
item._ResourceID = tables.RSC_En.GetItemOrNull(item.ResourceID);
98779883
}
98789884

@@ -15351,8 +15357,15 @@ public static void SetReferences(BdatCollection tables)
1535115357

1535215358
foreach (RSC_NpcList item in tables.RSC_NpcList.Items)
1535315359
{
15360+
item._Condition1 = tables.FLD_ConditionList.GetItemOrNull(item.Condition1);
15361+
item._Condition2 = tables.FLD_ConditionList.GetItemOrNull(item.Condition2);
1535415362
item._Gender = (Gender)item.Gender;
15363+
item._Job = tables.fld_npcjobname.GetItemOrNull(item.Job);
15364+
item._MSGID = tables.fld_landmark.GetItemOrNull(item.MSGID);
15365+
item._MSGID2 = tables.fld_landmark.GetItemOrNull(item.MSGID2);
15366+
item._MSGID3 = tables.fld_landmark.GetItemOrNull(item.MSGID3);
1535515367
item._Name = tables.fld_npcname.GetItemOrNull(item.Name);
15368+
item._result = tables.fld_npcresult.GetItemOrNull(item.result);
1535615369
item._Roots = (NpcRoot)item.Roots;
1535715370
}
1535815371

XbTool/XbTool/Serialization/TypeMap.txt

+1-1
Large diffs are not rendered by default.

XbTool/XbTool/Types/BdatCollection.cs

+2
Original file line numberDiff line numberDiff line change
@@ -2704,6 +2704,7 @@ public partial class BdatCollection
27042704
public BdatTable<LabeledMessage> qst560211_ms;
27052705
public BdatTable<LabeledMessage> qst560212_ms;
27062706
public BdatTable<LabeledMessage> qst560213_ms;
2707+
public BdatTable<LabeledMessage> qst560214_ms;
27072708
public BdatTable<LabeledMessage> qst610101_ms;
27082709
public BdatTable<LabeledMessage> qst610102_ms;
27092710
public BdatTable<LabeledMessage> qst610103_ms;
@@ -4984,6 +4985,7 @@ public partial class BdatCollection
49844985
public BdatTable<LabeledMessage> tlk7000015401_ms;
49854986
public BdatTable<LabeledMessage> tlk7000015801_ms;
49864987
public BdatTable<LabeledMessage> tlk7000015901_ms;
4988+
public BdatTable<LabeledMessage> tlk7000016101_ms;
49874989
public BdatTable<LabeledMessage> tlk7900000101_ms;
49884990
public BdatTable<LabeledMessage> tlk7900000201_ms;
49894991
public BdatTable<LabeledMessage> tlk7900000202_ms;

XbTool/XbTool/Types/BdatTypes.cs

+9
Original file line numberDiff line numberDiff line change
@@ -1878,6 +1878,7 @@ public class BTL_EnAwake : BdatItem
18781878
public byte AttackBonus;
18791879
public byte RecastBonus;
18801880
public ushort ReduceElmCombo;
1881+
public Message _Name;
18811882
}
18821883

18831884
[BdatType]
@@ -3074,6 +3075,7 @@ public class CHR_EnParam : BdatItem
30743075
public BTL_Arts_En _ArtsNum9;
30753076
public MNU_Name _Atr;
30763077
public BTL_Aura _Aura;
3078+
public BTL_EnAwake _AwakeLev;
30773079
public RSC_En _ResourceID;
30783080
}
30793081

@@ -9457,8 +9459,15 @@ public class RSC_NpcList : BdatItem
94579459
public ushort MSGID3;
94589460
public ushort AreaNumber3;
94599461
public ushort result;
9462+
public FLD_ConditionList _Condition1;
9463+
public FLD_ConditionList _Condition2;
94609464
public Gender _Gender;
9465+
public Message _Job;
9466+
public Message _MSGID;
9467+
public Message _MSGID2;
9468+
public Message _MSGID3;
94619469
public Message _Name;
9470+
public Message _result;
94629471
public NpcRoot _Roots;
94639472
}
94649473

0 commit comments

Comments
 (0)