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

Core/PacketIO: Named a bunch of unknown/unused fields

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/806611075659ddde60f3003763e442a46d70f993)
This commit is contained in:
Hondacrx
2024-11-17 13:07:52 -05:00
parent ba80dede79
commit 447c222665
41 changed files with 525 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/AreaTrigger/AreaTrigger.cs
+2 -2
View File
@@ -176,8 +176,8 @@ namespace Game.Entities
VisualAnim visualAnim = areaTriggerData.ModifyValue(m_areaTriggerData.VisualAnim);
SetUpdateFieldValue(visualAnim.ModifyValue(visualAnim.AnimationDataID), GetCreateProperties().AnimId);
SetUpdateFieldValue(visualAnim.ModifyValue(visualAnim.AnimKitID), GetCreateProperties().AnimKitId);
if (GetCreateProperties() != null && GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.Unk3))
SetUpdateFieldValue(visualAnim.ModifyValue(visualAnim.Field_C), true);
if (GetCreateProperties() != null && GetCreateProperties().Flags.HasFlag(AreaTriggerCreatePropertiesFlag.VisualAnimIsDecay))
SetUpdateFieldValue(visualAnim.ModifyValue(visualAnim.IsDecay), true);
if (caster != null)
PhasingHandler.InheritPhaseShift(this, caster);
Source/Game/Entities/GameObject/GameObject.cs
+3 -3
View File
@@ -2267,12 +2267,12 @@ namespace Game.Entities
return;
//required lvl checks!
var userLevels = Global.DB2Mgr.GetContentTuningData(info.ContentTuningId, player.m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
var userLevels = Global.DB2Mgr.GetContentTuningData(info.ContentTuningId, player.m_playerData.CtrOptions.GetValue().ConditionalFlags);
if (userLevels.HasValue)
if (player.GetLevel() < userLevels.Value.MaxLevel)
return;
var targetLevels = Global.DB2Mgr.GetContentTuningData(info.ContentTuningId, targetPlayer.m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
var targetLevels = Global.DB2Mgr.GetContentTuningData(info.ContentTuningId, targetPlayer.m_playerData.CtrOptions.GetValue().ConditionalFlags);
if (targetLevels.HasValue)
if (targetPlayer.GetLevel() < targetLevels.Value.MaxLevel)
return;
@@ -3826,7 +3826,7 @@ namespace Game.Entities
Player player = target.ToPlayer();
if (player != null)
{
var userLevels = Global.DB2Mgr.GetContentTuningData(GetGoInfo().ContentTuningId, player.m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
var userLevels = Global.DB2Mgr.GetContentTuningData(GetGoInfo().ContentTuningId, player.m_playerData.CtrOptions.GetValue().ConditionalFlags);
if (userLevels.HasValue)
return (byte)Math.Clamp(player.GetLevel(), userLevels.Value.MinLevel, userLevels.Value.MaxLevel);
}
Source/Game/Entities/Item/Item.cs
+1 -1
View File
@@ -2436,7 +2436,7 @@ namespace Game.Entities
{
uint maxLevel = (uint)Global.DB2Mgr.GetCurveXAxisRange(item.GetBonus().PlayerLevelToItemLevelCurveId).Item2;
var contentTuning = Global.DB2Mgr.GetContentTuningData(item.GetBonus().ContentTuningId, player.m_playerData.CtrOptions._value.ContentTuningConditionMask, true);
var contentTuning = Global.DB2Mgr.GetContentTuningData(item.GetBonus().ContentTuningId, player.m_playerData.CtrOptions._value.ConditionalFlags, true);
if (contentTuning.HasValue)
maxLevel = Math.Min(maxLevel, (uint)contentTuning.Value.MaxLevel);
Source/Game/Entities/Item/ItemBonusManager.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Game.Entities
if (mapDifficulty.ItemContextPickerID != 0)
{
uint contentTuningId = Global.DB2Mgr.GetRedirectedContentTuningId((uint)mapDifficulty.ContentTuningID, player.m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
uint contentTuningId = Global.DB2Mgr.GetRedirectedContentTuningId((uint)mapDifficulty.ContentTuningID, player.m_playerData.CtrOptions.GetValue().ConditionalFlags);
ItemContextPickerEntryRecord selectedPickerEntry = null;
foreach (var itemContextPickerEntry in CliDB.ItemContextPickerEntryStorage.Values)
Source/Game/Entities/Object/Update/UpdateFields.cs
+13 -13
View File
@@ -2748,22 +2748,22 @@ namespace Game.Entities
public class CTROptions
{
public uint ContentTuningConditionMask;
public uint Field_4;
public uint ExpansionLevelMask;
public uint ConditionalFlags;
public uint FactionGroup;
public uint ChromieTimeExpansionMask;
public void WriteCreate(WorldPacket data, Player owner, Player receiver)
{
data.WriteUInt32(ContentTuningConditionMask);
data.WriteUInt32(Field_4);
data.WriteUInt32(ExpansionLevelMask);
data.WriteUInt32(ConditionalFlags);
data.WriteUInt32(FactionGroup);
data.WriteUInt32(ChromieTimeExpansionMask);
}
public void WriteUpdate(WorldPacket data, bool ignoreChangesMask, Player owner, Player receiver)
{
data.WriteUInt32(ContentTuningConditionMask);
data.WriteUInt32(Field_4);
data.WriteUInt32(ExpansionLevelMask);
data.WriteUInt32(ConditionalFlags);
data.WriteUInt32(FactionGroup);
data.WriteUInt32(ChromieTimeExpansionMask);
}
}
@@ -8050,7 +8050,7 @@ namespace Game.Entities
public class VisualAnim : HasChangesMask
{
public UpdateField<bool> Field_C = new(0, 1);
public UpdateField<bool> IsDecay = new(0, 1);
public UpdateField<int> AnimationDataID = new(0, 2);
public UpdateField<uint> AnimKitID = new(0, 3);
public UpdateField<uint> AnimProgress = new(0, 4);
@@ -8062,7 +8062,7 @@ namespace Game.Entities
data.WriteInt32(AnimationDataID);
data.WriteUInt32(AnimKitID);
data.WriteUInt32(AnimProgress);
data.WriteBit(Field_C);
data.WriteBit(IsDecay);
data.FlushBits();
}
@@ -8078,7 +8078,7 @@ namespace Game.Entities
{
if (changesMask[1])
{
data.WriteBit(Field_C);
data.WriteBit(IsDecay);
}
}
data.FlushBits();
@@ -8102,7 +8102,7 @@ namespace Game.Entities
public override void ClearChangesMask()
{
ClearChangesMask(Field_C);
ClearChangesMask(IsDecay);
ClearChangesMask(AnimationDataID);
ClearChangesMask(AnimKitID);
ClearChangesMask(AnimProgress);
Source/Game/Entities/Object/WorldObject.cs
+4 -4
View File
@@ -552,7 +552,7 @@ namespace Game.Entities
bool hasAttached = createProperties != null && createProperties.Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasAttached);
bool hasFaceMovementDir = createProperties != null && createProperties.Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasFaceMovementDir);
bool hasFollowsTerrain = createProperties != null && createProperties.Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasFollowsTerrain);
bool hasUnk1 = createProperties != null && createProperties.Flags.HasFlag(AreaTriggerCreatePropertiesFlag.Unk1);
bool hasAlwaysExterior = createProperties != null && createProperties.Flags.HasFlag(AreaTriggerCreatePropertiesFlag.AlwaysExterior);
bool hasUnknown1025 = false;
bool hasTargetRollPitchYaw = createProperties != null && createProperties.Flags.HasFlag(AreaTriggerCreatePropertiesFlag.HasTargetRollPitchYaw);
bool hasScaleCurveID = createProperties != null && createProperties.ScaleCurveId != 0;
@@ -569,7 +569,7 @@ namespace Game.Entities
data.WriteBit(hasAttached);
data.WriteBit(hasFaceMovementDir);
data.WriteBit(hasFollowsTerrain);
data.WriteBit(hasUnk1);
data.WriteBit(hasAlwaysExterior);
data.WriteBit(hasUnknown1025);
data.WriteBit(hasTargetRollPitchYaw);
data.WriteBit(hasScaleCurveID);
@@ -4052,7 +4052,7 @@ namespace Game.Entities
public uint TransportID;
public float Magnitude;
public MovementForceType Type;
public int Unused910;
public int MovementForceID;
public void Read(WorldPacket data)
{
@@ -4061,7 +4061,7 @@ namespace Game.Entities
Direction = data.ReadVector3();
TransportID = data.ReadUInt32();
Magnitude = data.ReadFloat();
Unused910 = data.ReadInt32();
MovementForceID = data.ReadInt32();
Type = (MovementForceType)data.ReadBits<byte>(2);
}
Source/Game/Entities/Player/Player.Items.cs
+5 -5
View File
@@ -2444,7 +2444,7 @@ namespace Game.Entities
packet.Item = new ItemInstance(item);
packet.QuestLogItemID = item.GetTemplate().QuestLogItemId;
packet.ProxyItemID = item.GetTemplate().QuestLogItemId;
packet.Quantity = quantity;
packet.QuantityInInventory = GetItemCount(item.GetEntry());
@@ -2460,15 +2460,15 @@ namespace Game.Entities
packet.ItemGUID = item.GetGUID();
packet.Pushed = pushed;
packet.DisplayText = ItemPushResult.DisplayType.Normal;
packet.ChatNotifyType = ItemPushResult.DisplayType.Normal;
packet.Created = created;
//packet.IsBonusRoll;
if (dungeonEncounterId != 0)
{
packet.DisplayText = ItemPushResult.DisplayType.EncounterLoot;
packet.DungeonEncounterID = (int)dungeonEncounterId;
packet.IsEncounterLoot = true;
packet.ChatNotifyType = ItemPushResult.DisplayType.EncounterLoot;
packet.EncounterID = (int)dungeonEncounterId;
packet.IsPersonalLoot = true;
}
if (broadcast && GetGroup() != null && !item.GetTemplate().HasFlag(ItemFlags3.DontReportLootLogToParty))
Source/Game/Entities/Player/Player.Quest.cs
+5 -5
View File
@@ -41,7 +41,7 @@ namespace Game.Entities
int GetQuestMinLevel(uint contentTuningId)
{
var questLevels = Global.DB2Mgr.GetContentTuningData(contentTuningId, m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
var questLevels = Global.DB2Mgr.GetContentTuningData(contentTuningId, m_playerData.CtrOptions.GetValue().ConditionalFlags);
if (questLevels.HasValue)
{
ChrRacesRecord race = CliDB.ChrRacesStorage.LookupByKey(GetRace());
@@ -65,7 +65,7 @@ namespace Game.Entities
public int GetQuestLevel(uint contentTuningId)
{
var questLevels = Global.DB2Mgr.GetContentTuningData(contentTuningId, m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
var questLevels = Global.DB2Mgr.GetContentTuningData(contentTuningId, m_playerData.CtrOptions.GetValue().ConditionalFlags);
if (questLevels.HasValue)
{
int minLevel = GetQuestMinLevel(contentTuningId);
@@ -3269,11 +3269,11 @@ namespace Game.Entities
packet.Slot = InventorySlots.Bag0;
packet.SlotInBag = 0;
packet.Item.ItemID = itemTemplate.GetId();
packet.QuestLogItemID = itemTemplate.QuestLogItemId;
packet.ProxyItemID = itemTemplate.QuestLogItemId;
packet.Quantity = count;
packet.QuantityInInventory = (uint)GetQuestObjectiveData(obj);
packet.DisplayText = ItemPushResult.DisplayType.EncounterLoot;
packet.Unused_1017 = true;
packet.ChatNotifyType = ItemPushResult.DisplayType.EncounterLoot;
packet.FakeQuestItem = true;
if (GetGroup() != null && !itemTemplate.HasFlag(ItemFlags3.DontReportLootLogToParty))
GetGroup().BroadcastPacket(packet, true);
Source/Game/Entities/Player/Player.cs
+2 -2
View File
@@ -1871,7 +1871,7 @@ namespace Game.Entities
LFGDungeonsRecord dungeon = DB2Mgr.GetLfgDungeon(map.GetId(), map.GetDifficultyID());
if (dungeon != null)
{
var dungeonLevels = DB2Mgr.GetContentTuningData(dungeon.ContentTuningID, m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
var dungeonLevels = DB2Mgr.GetContentTuningData(dungeon.ContentTuningID, m_playerData.CtrOptions.GetValue().ConditionalFlags);
if (dungeonLevels.HasValue)
if (dungeonLevels.Value.TargetLevelMax == ObjectMgr.GetMaxLevelForExpansion(Expansion.WrathOfTheLichKing))
ChampioningFaction = GetChampioningFaction();
@@ -6492,7 +6492,7 @@ namespace Game.Entities
UpdateCriteria(CriteriaType.RevealWorldMapOverlay, GetAreaId());
var areaLevels = DB2Mgr.GetContentTuningData(areaEntry.ContentTuningID, m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
var areaLevels = DB2Mgr.GetContentTuningData(areaEntry.ContentTuningID, m_playerData.CtrOptions.GetValue().ConditionalFlags);
if (areaLevels.HasValue)
{
if (IsMaxLevel())