Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/DataStores: Updated hotfix packet structures to 9.1.5

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/78e627e413cb4ff34402fbb2e7a4668d434cd226)
This commit is contained in:
hondacrx
2021-11-07 16:29:55 -05:00
parent 7b052d7594
commit f6fd48e57f
2 changed files with 143 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/DB2Manager.cs
+124 -104
View File
@@ -663,7 +663,7 @@ namespace Game.DataStorage
{ {
uint oldMSTime = Time.GetMSTime(); uint oldMSTime = Time.GetMSTime();
SQLResult result = DB.Hotfix.Query("SELECT Id, TableHash, RecordId, Status FROM hotfix_data ORDER BY Id"); SQLResult result = DB.Hotfix.Query("SELECT Id, UniqueId, TableHash, RecordId, Status FROM hotfix_data ORDER BY Id");
if (result.IsEmpty()) if (result.IsEmpty())
{ {
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 hotfix info entries."); Log.outInfo(LogFilter.ServerLoading, "Loaded 0 hotfix info entries.");
@@ -676,9 +676,10 @@ namespace Game.DataStorage
do do
{ {
int id = result.Read<int>(0); int id = result.Read<int>(0);
uint tableHash = result.Read<uint>(1); uint uniqueId = result.Read<uint>(1);
int recordId = result.Read<int>(2); uint tableHash = result.Read<uint>(2);
HotfixRecord.Status status = (HotfixRecord.Status)result.Read<byte>(3); int recordId = result.Read<int>(3);
HotfixRecord.Status status = (HotfixRecord.Status)result.Read<byte>(4);
if (status == HotfixRecord.Status.Valid && !_storage.ContainsKey(tableHash)) if (status == HotfixRecord.Status.Valid && !_storage.ContainsKey(tableHash))
{ {
if (!_hotfixBlob.Any(p => p.ContainsKey((tableHash, recordId)))) if (!_hotfixBlob.Any(p => p.ContainsKey((tableHash, recordId))))
@@ -691,7 +692,8 @@ namespace Game.DataStorage
HotfixRecord hotfixRecord = new(); HotfixRecord hotfixRecord = new();
hotfixRecord.TableHash = tableHash; hotfixRecord.TableHash = tableHash;
hotfixRecord.RecordID = recordId; hotfixRecord.RecordID = recordId;
hotfixRecord.HotfixID = id; hotfixRecord.ID.PushID = id;
hotfixRecord.ID.UniqueID = uniqueId;
hotfixRecord.HotfixStatus = status; hotfixRecord.HotfixStatus = status;
_hotfixData.Add(id, hotfixRecord); _hotfixData.Add(id, hotfixRecord);
deletedRecords[(tableHash, recordId)] = status == HotfixRecord.Status.RecordRemoved; deletedRecords[(tableHash, recordId)] = status == HotfixRecord.Status.RecordRemoved;
@@ -1096,22 +1098,22 @@ namespace Game.DataStorage
case 1: case 1:
return points.Count < 4 ? CurveInterpolationMode.Cosine : CurveInterpolationMode.CatmullRom; return points.Count < 4 ? CurveInterpolationMode.Cosine : CurveInterpolationMode.CatmullRom;
case 2: case 2:
{
switch (points.Count)
{ {
switch (points.Count) case 1:
{ return CurveInterpolationMode.Constant;
case 1: case 2:
return CurveInterpolationMode.Constant; return CurveInterpolationMode.Linear;
case 2: case 3:
return CurveInterpolationMode.Linear; return CurveInterpolationMode.Bezier3;
case 3: case 4:
return CurveInterpolationMode.Bezier3; return CurveInterpolationMode.Bezier4;
case 4: default:
return CurveInterpolationMode.Bezier4; break;
default:
break;
}
return CurveInterpolationMode.Bezier;
} }
return CurveInterpolationMode.Bezier;
}
case 3: case 3:
return CurveInterpolationMode.Cosine; return CurveInterpolationMode.Cosine;
default: default:
@@ -1131,96 +1133,96 @@ namespace Game.DataStorage
switch (DetermineCurveType(curve, points)) switch (DetermineCurveType(curve, points))
{ {
case CurveInterpolationMode.Linear: case CurveInterpolationMode.Linear:
{ {
int pointIndex = 0; int pointIndex = 0;
while (pointIndex < points.Count && points[pointIndex].Pos.X <= x) while (pointIndex < points.Count && points[pointIndex].Pos.X <= x)
++pointIndex; ++pointIndex;
if (pointIndex == 0) if (pointIndex == 0)
return points[0].Pos.Y; return points[0].Pos.Y;
if (pointIndex >= points.Count) if (pointIndex >= points.Count)
return points.Last().Pos.Y; return points.Last().Pos.Y;
float xDiff = points[pointIndex].Pos.X - points[pointIndex - 1].Pos.X; float xDiff = points[pointIndex].Pos.X - points[pointIndex - 1].Pos.X;
if (xDiff == 0.0) if (xDiff == 0.0)
return points[pointIndex].Pos.Y; return points[pointIndex].Pos.Y;
return (((x - points[pointIndex - 1].Pos.X) / xDiff) * (points[pointIndex].Pos.Y - points[pointIndex - 1].Pos.Y)) + points[pointIndex - 1].Pos.Y; return (((x - points[pointIndex - 1].Pos.X) / xDiff) * (points[pointIndex].Pos.Y - points[pointIndex - 1].Pos.Y)) + points[pointIndex - 1].Pos.Y;
} }
case CurveInterpolationMode.Cosine: case CurveInterpolationMode.Cosine:
{ {
int pointIndex = 0; int pointIndex = 0;
while (pointIndex < points.Count && points[pointIndex].Pos.X <= x) while (pointIndex < points.Count && points[pointIndex].Pos.X <= x)
++pointIndex; ++pointIndex;
if (pointIndex == 0) if (pointIndex == 0)
return points[0].Pos.Y; return points[0].Pos.Y;
if (pointIndex >= points.Count) if (pointIndex >= points.Count)
return points.Last().Pos.Y; return points.Last().Pos.Y;
float xDiff = points[pointIndex].Pos.X - points[pointIndex - 1].Pos.X; float xDiff = points[pointIndex].Pos.X - points[pointIndex - 1].Pos.X;
if (xDiff == 0.0) if (xDiff == 0.0)
return points[pointIndex].Pos.Y; return points[pointIndex].Pos.Y;
return (float)((points[pointIndex].Pos.Y - points[pointIndex - 1].Pos.Y) * (1.0f - Math.Cos((x - points[pointIndex - 1].Pos.X) / xDiff * Math.PI)) * 0.5f) + points[pointIndex - 1].Pos.Y; return (float)((points[pointIndex].Pos.Y - points[pointIndex - 1].Pos.Y) * (1.0f - Math.Cos((x - points[pointIndex - 1].Pos.X) / xDiff * Math.PI)) * 0.5f) + points[pointIndex - 1].Pos.Y;
} }
case CurveInterpolationMode.CatmullRom: case CurveInterpolationMode.CatmullRom:
{ {
int pointIndex = 1; int pointIndex = 1;
while (pointIndex < points.Count && points[pointIndex].Pos.X <= x) while (pointIndex < points.Count && points[pointIndex].Pos.X <= x)
++pointIndex; ++pointIndex;
if (pointIndex == 1) if (pointIndex == 1)
return points[1].Pos.Y; return points[1].Pos.Y;
if (pointIndex >= points.Count - 1) if (pointIndex >= points.Count - 1)
return points[^2].Pos.Y; return points[^2].Pos.Y;
float xDiff = points[pointIndex].Pos.X - points[pointIndex - 1].Pos.X; float xDiff = points[pointIndex].Pos.X - points[pointIndex - 1].Pos.X;
if (xDiff == 0.0) if (xDiff == 0.0)
return points[pointIndex].Pos.Y; return points[pointIndex].Pos.Y;
float mu = (x - points[pointIndex - 1].Pos.X) / xDiff; float mu = (x - points[pointIndex - 1].Pos.X) / xDiff;
float a0 = -0.5f * points[pointIndex - 2].Pos.Y + 1.5f * points[pointIndex - 1].Pos.Y - 1.5f * points[pointIndex].Pos.Y + 0.5f * points[pointIndex + 1].Pos.Y; float a0 = -0.5f * points[pointIndex - 2].Pos.Y + 1.5f * points[pointIndex - 1].Pos.Y - 1.5f * points[pointIndex].Pos.Y + 0.5f * points[pointIndex + 1].Pos.Y;
float a1 = points[pointIndex - 2].Pos.Y - 2.5f * points[pointIndex - 1].Pos.Y + 2.0f * points[pointIndex].Pos.Y - 0.5f * points[pointIndex + 1].Pos.Y; float a1 = points[pointIndex - 2].Pos.Y - 2.5f * points[pointIndex - 1].Pos.Y + 2.0f * points[pointIndex].Pos.Y - 0.5f * points[pointIndex + 1].Pos.Y;
float a2 = -0.5f * points[pointIndex - 2].Pos.Y + 0.5f * points[pointIndex].Pos.Y; float a2 = -0.5f * points[pointIndex - 2].Pos.Y + 0.5f * points[pointIndex].Pos.Y;
float a3 = points[pointIndex - 1].Pos.Y; float a3 = points[pointIndex - 1].Pos.Y;
return a0 * mu * mu * mu + a1 * mu * mu + a2 * mu + a3; return a0 * mu * mu * mu + a1 * mu * mu + a2 * mu + a3;
} }
case CurveInterpolationMode.Bezier3: case CurveInterpolationMode.Bezier3:
{ {
float xDiff = points[2].Pos.X - points[0].Pos.X; float xDiff = points[2].Pos.X - points[0].Pos.X;
if (xDiff == 0.0) if (xDiff == 0.0)
return points[1].Pos.Y; return points[1].Pos.Y;
float mu = (x - points[0].Pos.X) / xDiff; float mu = (x - points[0].Pos.X) / xDiff;
return ((1.0f - mu) * (1.0f - mu) * points[0].Pos.Y) + (1.0f - mu) * 2.0f * mu * points[1].Pos.Y + mu * mu * points[2].Pos.Y; return ((1.0f - mu) * (1.0f - mu) * points[0].Pos.Y) + (1.0f - mu) * 2.0f * mu * points[1].Pos.Y + mu * mu * points[2].Pos.Y;
} }
case CurveInterpolationMode.Bezier4: case CurveInterpolationMode.Bezier4:
{ {
float xDiff = points[3].Pos.X - points[0].Pos.X; float xDiff = points[3].Pos.X - points[0].Pos.X;
if (xDiff == 0.0) if (xDiff == 0.0)
return points[1].Pos.Y; return points[1].Pos.Y;
float mu = (x - points[0].Pos.X) / xDiff; float mu = (x - points[0].Pos.X) / xDiff;
return (1.0f - mu) * (1.0f - mu) * (1.0f - mu) * points[0].Pos.Y return (1.0f - mu) * (1.0f - mu) * (1.0f - mu) * points[0].Pos.Y
+ 3.0f * mu * (1.0f - mu) * (1.0f - mu) * points[1].Pos.Y + 3.0f * mu * (1.0f - mu) * (1.0f - mu) * points[1].Pos.Y
+ 3.0f * mu * mu * (1.0f - mu) * points[2].Pos.Y + 3.0f * mu * mu * (1.0f - mu) * points[2].Pos.Y
+ mu * mu * mu * points[3].Pos.Y; + mu * mu * mu * points[3].Pos.Y;
} }
case CurveInterpolationMode.Bezier: case CurveInterpolationMode.Bezier:
{
float xDiff = points.Last().Pos.X - points[0].Pos.X;
if (xDiff == 0.0f)
return points.Last().Pos.Y;
float[] tmp = new float[points.Count];
for (int c = 0; c < points.Count; ++c)
tmp[c] = points[c].Pos.Y;
float mu = (x - points[0].Pos.X) / xDiff;
int i = points.Count - 1;
while (i > 0)
{ {
float xDiff = points.Last().Pos.X - points[0].Pos.X; for (int k = 0; k < i; ++k)
if (xDiff == 0.0f)
return points.Last().Pos.Y;
float[] tmp = new float[points.Count];
for (int c = 0; c < points.Count; ++c)
tmp[c] = points[c].Pos.Y;
float mu = (x - points[0].Pos.X) / xDiff;
int i = points.Count - 1;
while (i > 0)
{ {
for (int k = 0; k < i; ++k) float val = tmp[k] + mu * (tmp[k + 1] - tmp[k]);
{ tmp[k] = val;
float val = tmp[k] + mu * (tmp[k + 1] - tmp[k]);
tmp[k] = val;
}
--i;
} }
return tmp[0]; --i;
} }
return tmp[0];
}
case CurveInterpolationMode.Constant: case CurveInterpolationMode.Constant:
return points[0].Pos.Y; return points[0].Pos.Y;
default: default:
@@ -1889,7 +1891,7 @@ namespace Game.DataStorage
public List<QuestPackageItemRecord> GetQuestPackageItems(uint questPackageID) public List<QuestPackageItemRecord> GetQuestPackageItems(uint questPackageID)
{ {
if( _questPackages.ContainsKey(questPackageID)) if (_questPackages.ContainsKey(questPackageID))
return _questPackages[questPackageID].Item1; return _questPackages[questPackageID].Item1;
return null; return null;
@@ -2340,7 +2342,7 @@ namespace Game.DataStorage
MultiMap<int, HotfixRecord> _hotfixData = new(); MultiMap<int, HotfixRecord> _hotfixData = new();
Dictionary<(uint tableHash, int recordId), byte[]>[] _hotfixBlob = new Dictionary<(uint tableHash, int recordId), byte[]>[(int)Locale.Total]; Dictionary<(uint tableHash, int recordId), byte[]>[] _hotfixBlob = new Dictionary<(uint tableHash, int recordId), byte[]>[(int)Locale.Total];
MultiMap<uint, Tuple<uint, AllowedHotfixOptionalData>> _allowedHotfixOptionalData = new(); MultiMap<uint, Tuple<uint, AllowedHotfixOptionalData>> _allowedHotfixOptionalData = new();
MultiMap<(uint tableHash, int recordId), HotfixOptionalData>[]_hotfixOptionalData = new MultiMap<(uint tableHash, int recordId), HotfixOptionalData>[(int)Locale.Total]; MultiMap<(uint tableHash, int recordId), HotfixOptionalData>[] _hotfixOptionalData = new MultiMap<(uint tableHash, int recordId), HotfixOptionalData>[(int)Locale.Total];
MultiMap<uint, uint> _areaGroupMembers = new(); MultiMap<uint, uint> _areaGroupMembers = new();
MultiMap<uint, ArtifactPowerRecord> _artifactPowers = new(); MultiMap<uint, ArtifactPowerRecord> _artifactPowers = new();
@@ -2378,7 +2380,7 @@ namespace Game.DataStorage
Dictionary<uint, ItemChildEquipmentRecord> _itemChildEquipment = new(); Dictionary<uint, ItemChildEquipmentRecord> _itemChildEquipment = new();
ItemClassRecord[] _itemClassByOldEnum = new ItemClassRecord[19]; ItemClassRecord[] _itemClassByOldEnum = new ItemClassRecord[19];
List<uint> _itemsWithCurrencyCost = new(); List<uint> _itemsWithCurrencyCost = new();
MultiMap<uint, ItemLimitCategoryConditionRecord> _itemCategoryConditions = new(); MultiMap<uint, ItemLimitCategoryConditionRecord> _itemCategoryConditions = new();
MultiMap<uint, ItemLevelSelectorQualityRecord> _itemLevelQualitySelectorQualities = new(); MultiMap<uint, ItemLevelSelectorQualityRecord> _itemLevelQualitySelectorQualities = new();
Dictionary<uint, ItemModifiedAppearanceRecord> _itemModifiedAppearancesByItem = new(); Dictionary<uint, ItemModifiedAppearanceRecord> _itemModifiedAppearancesByItem = new();
MultiMap<uint, uint> _itemToBonusTree = new(); MultiMap<uint, uint> _itemToBonusTree = new();
@@ -2586,21 +2588,21 @@ namespace Game.DataStorage
{ {
public uint TableHash; public uint TableHash;
public int RecordID; public int RecordID;
public int HotfixID; public HotfixId ID;
public Status HotfixStatus = Status.Invalid; public Status HotfixStatus = Status.Invalid;
public void Write(WorldPacket data) public void Write(WorldPacket data)
{ {
ID.Write(data);
data.WriteUInt32(TableHash); data.WriteUInt32(TableHash);
data.WriteInt32(RecordID); data.WriteInt32(RecordID);
data.WriteInt32(HotfixID);
} }
public void Read(WorldPacket data) public void Read(WorldPacket data)
{ {
ID.Read(data);
TableHash = data.ReadUInt32(); TableHash = data.ReadUInt32();
RecordID = data.ReadInt32(); RecordID = data.ReadInt32();
HotfixID = data.ReadInt32();
} }
public enum Status public enum Status
@@ -2613,6 +2615,24 @@ namespace Game.DataStorage
} }
} }
public struct HotfixId
{
public int PushID;
public uint UniqueID;
public void Write(WorldPacket data)
{
data.WriteInt32(PushID);
data.WriteUInt32(UniqueID);
}
public void Read(WorldPacket data)
{
PushID = data.ReadInt32();
UniqueID = data.ReadUInt32();
}
}
public class HotfixOptionalData public class HotfixOptionalData
{ {
public uint Key; public uint Key;
Source/Game/Networking/Packets/HotfixPackets.cs
+2 -2
View File
@@ -89,8 +89,8 @@ namespace Game.Networking.Packets
_worldPacket.WriteUInt32(VirtualRealmAddress); _worldPacket.WriteUInt32(VirtualRealmAddress);
_worldPacket.WriteInt32(Hotfixes.Keys.Count); _worldPacket.WriteInt32(Hotfixes.Keys.Count);
foreach (var key in Hotfixes.Keys) foreach (var record in Hotfixes.Values)
_worldPacket.WriteInt32(key); record.ID.Write(_worldPacket);
} }
public uint VirtualRealmAddress; public uint VirtualRealmAddress;