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

Core: SOme code cleanup, more to follow.

Browse Source
This commit is contained in:
hondacrx
2021-03-20 22:48:48 -04:00
parent 62f554f2e0
commit 62ec699ec6
318 changed files with 5080 additions and 5125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Item/AzeriteEmpoweredItem.cs
+5 -5
View File
@@ -165,7 +165,7 @@ namespace Game.Entities
public override void BuildValuesCreate(WorldPacket data, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt8((byte)flags);
m_objectData.WriteCreate(buffer, flags, this, target);
@@ -179,7 +179,7 @@ namespace Game.Entities
public override void BuildValuesUpdate(WorldPacket data, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
if (m_values.HasChanged(TypeId.Object))
m_objectData.WriteUpdate(buffer, flags, this, target);
@@ -198,7 +198,7 @@ namespace Game.Entities
void BuildValuesUpdateForPlayerWithMask(UpdateData data, UpdateMask requestedObjectMask, UpdateMask requestedItemMask, UpdateMask requestedAzeriteEmpoweredItemMask, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
UpdateMask valuesMask = new((int)TypeId.Max);
if (requestedObjectMask.IsAnySet())
valuesMask.Set((int)TypeId.Object);
@@ -209,7 +209,7 @@ namespace Game.Entities
if (requestedAzeriteEmpoweredItemMask.IsAnySet())
valuesMask.Set((int)TypeId.AzeriteEmpoweredItem);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt32(valuesMask.GetBlock(0));
if (valuesMask[(int)TypeId.Object])
@@ -221,7 +221,7 @@ namespace Game.Entities
if (valuesMask[(int)TypeId.AzeriteEmpoweredItem])
m_azeriteEmpoweredItemData.WriteUpdate(buffer, requestedAzeriteEmpoweredItemMask, true, this, target);
WorldPacket buffer1 = new WorldPacket();
WorldPacket buffer1 = new();
buffer1.WriteUInt8((byte)UpdateType.Values);
buffer1.WritePackedGuid(GetGUID());
buffer1.WriteUInt32(buffer.GetSize());
Source/Game/Entities/Item/AzeriteItem.cs
+15 -15
View File
@@ -230,7 +230,7 @@ namespace Game.Entities
{
// count weeks from 14.01.2020
DateTime now = GameTime.GetDateAndTime();
DateTime beginDate = new DateTime(2020, 1, 14);
DateTime beginDate = new(2020, 1, 14);
uint knowledge = 0;
while (beginDate < now && knowledge < PlayerConst.MaxAzeriteItemKnowledgeLevel)
{
@@ -293,7 +293,7 @@ namespace Game.Entities
SetState(ItemUpdateState.Changed, owner);
}
PlayerAzeriteItemGains xpGain = new PlayerAzeriteItemGains();
PlayerAzeriteItemGains xpGain = new();
xpGain.ItemGUID = GetGUID();
xpGain.XP = xp;
owner.SendPacket(xpGain);
@@ -362,7 +362,7 @@ namespace Game.Entities
if (index < 0)
{
UnlockedAzeriteEssence unlockedEssence = new UnlockedAzeriteEssence();
UnlockedAzeriteEssence unlockedEssence = new();
unlockedEssence.AzeriteEssenceID = azeriteEssenceId;
unlockedEssence.Rank = rank;
AddDynamicUpdateFieldValue(m_values.ModifyValue(m_azeriteItemData).ModifyValue(m_azeriteItemData.UnlockedEssences), unlockedEssence);
@@ -385,7 +385,7 @@ namespace Game.Entities
public void CreateSelectedAzeriteEssences(uint specializationId)
{
SelectedAzeriteEssences selectedEssences = new SelectedAzeriteEssences();
SelectedAzeriteEssences selectedEssences = new();
selectedEssences.ModifyValue(selectedEssences.SpecializationID).SetValue(specializationId);
selectedEssences.ModifyValue(selectedEssences.Enabled).SetValue(true);
AddDynamicUpdateFieldValue(m_values.ModifyValue(m_azeriteItemData).ModifyValue(m_azeriteItemData.SelectedEssences), selectedEssences);
@@ -426,7 +426,7 @@ namespace Game.Entities
public override void BuildValuesCreate(WorldPacket data, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt8((byte)flags);
m_objectData.WriteCreate(buffer, flags, this, target);
@@ -440,7 +440,7 @@ namespace Game.Entities
public override void BuildValuesUpdate(WorldPacket data, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
if (m_values.HasChanged(TypeId.Object))
m_objectData.WriteUpdate(buffer, flags, this, target);
@@ -458,18 +458,18 @@ namespace Game.Entities
public override void BuildValuesUpdateWithFlag(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateMask valuesMask = new UpdateMask(14);
UpdateMask valuesMask = new(14);
valuesMask.Set((int)TypeId.Item);
valuesMask.Set((int)TypeId.AzeriteItem);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt32(valuesMask.GetBlock(0));
UpdateMask mask = new UpdateMask(40);
UpdateMask mask = new(40);
m_itemData.AppendAllowedFieldsMaskForFlag(mask, flags);
m_itemData.WriteUpdate(buffer, mask, true, this, target);
UpdateMask mask2 = new UpdateMask(9);
UpdateMask mask2 = new(9);
m_azeriteItemData.AppendAllowedFieldsMaskForFlag(mask2, flags);
m_azeriteItemData.WriteUpdate(buffer, mask2, true, this, target);
@@ -480,7 +480,7 @@ namespace Game.Entities
void BuildValuesUpdateForPlayerWithMask(UpdateData data, UpdateMask requestedObjectMask, UpdateMask requestedItemMask, UpdateMask requestedAzeriteItemMask, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
UpdateMask valuesMask = new((int)TypeId.Max);
if (requestedObjectMask.IsAnySet())
valuesMask.Set((int)TypeId.Object);
@@ -492,7 +492,7 @@ namespace Game.Entities
if (requestedAzeriteItemMask.IsAnySet())
valuesMask.Set((int)TypeId.AzeriteItem);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt32(valuesMask.GetBlock(0));
if (valuesMask[(int)TypeId.Object])
@@ -504,7 +504,7 @@ namespace Game.Entities
if (valuesMask[(int)TypeId.AzeriteItem])
m_azeriteItemData.WriteUpdate(buffer, requestedAzeriteItemMask, true, this, target);
WorldPacket buffer1 = new WorldPacket();
WorldPacket buffer1 = new();
buffer1.WriteUInt8((byte)UpdateType.Values);
buffer1.WritePackedGuid(GetGUID());
buffer1.WriteUInt32(buffer.GetSize());
@@ -555,8 +555,8 @@ namespace Game.Entities
public ulong Xp;
public uint Level;
public uint KnowledgeLevel;
public List<uint> AzeriteItemMilestonePowers = new List<uint>();
public List<AzeriteEssencePowerRecord> UnlockedAzeriteEssences = new List<AzeriteEssencePowerRecord>();
public List<uint> AzeriteItemMilestonePowers = new();
public List<AzeriteEssencePowerRecord> UnlockedAzeriteEssences = new();
public AzeriteItemSelectedEssencesData[] SelectedAzeriteEssences = new AzeriteItemSelectedEssencesData[4];
}
}
Source/Game/Entities/Item/Bag.cs
+5 -5
View File
@@ -175,7 +175,7 @@ namespace Game.Entities
public override void BuildValuesCreate(WorldPacket data, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt8((byte)flags);
m_objectData.WriteCreate(buffer, flags, this, target);
@@ -189,7 +189,7 @@ namespace Game.Entities
public override void BuildValuesUpdate(WorldPacket data, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt32(m_values.GetChangedObjectTypeMask());
if (m_values.HasChanged(TypeId.Object))
@@ -208,7 +208,7 @@ namespace Game.Entities
void BuildValuesUpdateForPlayerWithMask(UpdateData data, UpdateMask requestedObjectMask, UpdateMask requestedItemMask, UpdateMask requestedContainerMask, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
UpdateMask valuesMask = new((int)TypeId.Max);
if (requestedObjectMask.IsAnySet())
valuesMask.Set((int)TypeId.Object);
@@ -219,7 +219,7 @@ namespace Game.Entities
if (requestedContainerMask.IsAnySet())
valuesMask.Set((int)TypeId.Container);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt32(valuesMask.GetBlock(0));
if (valuesMask[(int)TypeId.Object])
@@ -231,7 +231,7 @@ namespace Game.Entities
if (valuesMask[(int)TypeId.Container])
m_containerData.WriteUpdate(buffer, requestedContainerMask, true, this, target);
WorldPacket buffer1 = new WorldPacket();
WorldPacket buffer1 = new();
buffer1.WriteUInt8((byte)UpdateType.Values);
buffer1.WritePackedGuid(GetGUID());
buffer1.WriteUInt32(buffer.GetSize());
Source/Game/Entities/Item/Item.cs
+26 -26
View File
@@ -159,7 +159,7 @@ namespace Game.Entities
stmt.AddValue(++index, GetCount());
stmt.AddValue(++index, (uint)m_itemData.Expiration);
StringBuilder ss = new StringBuilder();
StringBuilder ss = new();
for (byte i = 0; i < m_itemData.SpellCharges.GetSize() && i < _bonusData.EffectCount; ++i)
ss.AppendFormat("{0} ", GetSpellCharges(i));
@@ -215,7 +215,7 @@ namespace Game.Entities
if (gemData.ItemId != 0)
{
stmt.AddValue(1 + i * gemFields, (uint)gemData.ItemId);
StringBuilder gemBonusListIDs = new StringBuilder();
StringBuilder gemBonusListIDs = new();
foreach (ushort bonusListID in gemData.BonusListIDs)
{
if (bonusListID != 0)
@@ -446,7 +446,7 @@ namespace Game.Entities
SetContext((ItemContext)fields.Read<byte>(17));
var bonusListString = new StringArray(fields.Read<string>(18), ' ');
List<uint> bonusListIDs = new List<uint>();
List<uint> bonusListIDs = new();
for (var i = 0; i < bonusListString.Length; ++i)
{
if (uint.TryParse(bonusListString[i], out uint bonusListID))
@@ -1006,7 +1006,7 @@ namespace Game.Entities
SpellItemEnchantmentRecord gemEnchant = CliDB.SpellItemEnchantmentStorage.LookupByKey(gemProperties.EnchantId);
if (gemEnchant != null)
{
BonusData gemBonus = new BonusData(gemTemplate);
BonusData gemBonus = new(gemTemplate);
foreach (var bonusListId in gem.BonusListIDs)
gemBonus.AddBonusList(bonusListId);
@@ -1117,7 +1117,7 @@ namespace Game.Entities
public void SendUpdateSockets()
{
SocketGemsSuccess socketGems = new SocketGemsSuccess();
SocketGemsSuccess socketGems = new();
socketGems.Item = GetGUID();
GetOwner().SendPacket(socketGems);
@@ -1129,7 +1129,7 @@ namespace Game.Entities
if (duration == 0)
return;
ItemTimeUpdate itemTimeUpdate = new ItemTimeUpdate();
ItemTimeUpdate itemTimeUpdate = new();
itemTimeUpdate.ItemGuid = GetGUID();
itemTimeUpdate.DurationLeft = duration;
owner.SendPacket(itemTimeUpdate);
@@ -1213,7 +1213,7 @@ namespace Game.Entities
public override void BuildValuesCreate(WorldPacket data, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
m_objectData.WriteCreate(buffer, flags, this, target);
m_itemData.WriteCreate(buffer, flags, this, target);
@@ -1226,7 +1226,7 @@ namespace Game.Entities
public override void BuildValuesUpdate(WorldPacket data, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
if (m_values.HasChanged(TypeId.Object))
m_objectData.WriteUpdate(buffer, flags, this, target);
@@ -1242,11 +1242,11 @@ namespace Game.Entities
public override void BuildValuesUpdateWithFlag(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateMask valuesMask = new UpdateMask(14);
UpdateMask valuesMask = new(14);
valuesMask.Set((int)TypeId.Item);
WorldPacket buffer = new WorldPacket();
UpdateMask mask = new UpdateMask(40);
WorldPacket buffer = new();
UpdateMask mask = new(40);
buffer.WriteUInt32(valuesMask.GetBlock(0));
m_itemData.AppendAllowedFieldsMaskForFlag(mask, flags);
@@ -1259,7 +1259,7 @@ namespace Game.Entities
void BuildValuesUpdateForPlayerWithMask(UpdateData data, UpdateMask requestedObjectMask, UpdateMask requestedItemMask, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
UpdateMask valuesMask = new((int)TypeId.Max);
if (requestedObjectMask.IsAnySet())
valuesMask.Set((int)TypeId.Object);
@@ -1267,7 +1267,7 @@ namespace Game.Entities
if (requestedItemMask.IsAnySet())
valuesMask.Set((int)TypeId.Item);
WorldPacket buffer = new WorldPacket();
WorldPacket buffer = new();
buffer.WriteUInt32(valuesMask.GetBlock(0));
if (valuesMask[(int)TypeId.Object])
@@ -1276,7 +1276,7 @@ namespace Game.Entities
if (valuesMask[(int)TypeId.Item])
m_itemData.WriteUpdate(buffer, requestedItemMask, true, this, target);
WorldPacket buffer1 = new WorldPacket();
WorldPacket buffer1 = new();
buffer1.WriteUInt8((byte)UpdateType.Values);
buffer1.WritePackedGuid(GetGUID());
buffer1.WriteUInt32(buffer.GetSize());
@@ -1332,7 +1332,7 @@ namespace Game.Entities
if (!HasItemFlag(ItemFieldFlags.Refundable))
return;
ItemExpirePurchaseRefund itemExpirePurchaseRefund = new ItemExpirePurchaseRefund();
ItemExpirePurchaseRefund itemExpirePurchaseRefund = new();
itemExpirePurchaseRefund.ItemGUID = GetGUID();
owner.SendPacket(itemExpirePurchaseRefund);
@@ -1922,7 +1922,7 @@ namespace Game.Entities
{
if (modifierIndex == -1)
{
ItemMod mod = new ItemMod();
ItemMod mod = new();
mod.Value = value;
mod.Type = (byte)modifier;
@@ -2052,7 +2052,7 @@ namespace Game.Entities
int index = m_artifactPowerIdToIndex.Count;
m_artifactPowerIdToIndex[artifactPower.ArtifactPowerId] = (ushort)index;
ArtifactPower powerField = new ArtifactPower();
ArtifactPower powerField = new();
powerField.ArtifactPowerId = (ushort)artifactPower.ArtifactPowerId;
powerField.PurchasedRank = artifactPower.PurchasedRank;
powerField.CurrentRankWithBonus = artifactPower.CurrentRankWithBonus;
@@ -2081,7 +2081,7 @@ namespace Game.Entities
if (m_artifactPowerIdToIndex.ContainsKey(artifactPower.Id))
continue;
ArtifactPowerData powerData = new ArtifactPowerData();
ArtifactPowerData powerData = new();
powerData.ArtifactPowerId = artifactPower.Id;
powerData.PurchasedRank = 0;
powerData.CurrentRankWithBonus = (byte)((artifactPower.Flags & ArtifactPowerFlag.First) == ArtifactPowerFlag.First ? 1 : 0);
@@ -2232,7 +2232,7 @@ namespace Game.Entities
SetArtifactXP(m_itemData.ArtifactXP + amount);
ArtifactXpGain artifactXpGain = new ArtifactXpGain();
ArtifactXpGain artifactXpGain = new();
artifactXpGain.ArtifactGUID = GetGUID();
artifactXpGain.Amount = amount;
owner.SendPacket(artifactXpGain);
@@ -2641,11 +2641,11 @@ namespace Game.Entities
string m_text;
bool mb_in_trade;
long m_lastPlayedTimeUpdate;
List<ObjectGuid> allowedGUIDs = new List<ObjectGuid>();
List<ObjectGuid> allowedGUIDs = new();
uint m_randomBonusListId; // store separately to easily find which bonus list is the one randomly given for stat rerolling
ObjectGuid m_childItem;
Dictionary<uint, ushort> m_artifactPowerIdToIndex = new Dictionary<uint, ushort>();
Array<uint> m_gemScalingLevels = new Array<uint>(ItemConst.MaxGemSockets);
Dictionary<uint, ushort> m_artifactPowerIdToIndex = new();
Array<uint> m_gemScalingLevels = new(ItemConst.MaxGemSockets);
#endregion
}
@@ -2673,7 +2673,7 @@ namespace Game.Entities
{
public uint ItemSetID;
public uint EquippedItemCount;
public List<ItemSetSpellRecord> SetBonuses = new List<ItemSetSpellRecord>();
public List<ItemSetSpellRecord> SetBonuses = new();
}
public class BonusData
@@ -2916,12 +2916,12 @@ namespace Game.Entities
public ulong Xp;
public uint ArtifactAppearanceId;
public uint ArtifactTierId;
public List<ArtifactPowerData> ArtifactPowers = new List<ArtifactPowerData>();
public List<ArtifactPowerData> ArtifactPowers = new();
}
public class AzeriteEmpoweredData
{
public Array<int> SelectedAzeritePowers = new Array<int>(SharedConst.MaxAzeriteEmpoweredTier);
public Array<int> SelectedAzeritePowers = new(SharedConst.MaxAzeriteEmpoweredTier);
}
class ItemAdditionalLoadInfo
@@ -2953,7 +2953,7 @@ namespace Game.Entities
info.Artifact.ArtifactAppearanceId = artifactResult.Read<uint>(2);
info.Artifact.ArtifactTierId = artifactResult.Read<uint>(3);
ArtifactPowerData artifactPowerData = new ArtifactPowerData();
ArtifactPowerData artifactPowerData = new();
artifactPowerData.ArtifactPowerId = artifactResult.Read<uint>(4);
artifactPowerData.PurchasedRank = artifactResult.Read<byte>(5);
Source/Game/Entities/Item/ItemEnchantment.cs
+3 -3
View File
@@ -160,12 +160,12 @@ namespace Game.Entities
return 0;
}
static Dictionary<uint, RandomBonusListIds> _storage = new Dictionary<uint, RandomBonusListIds>();
static Dictionary<uint, RandomBonusListIds> _storage = new();
}
public class RandomBonusListIds
{
public List<uint> BonusListIDs = new List<uint>();
public List<double> Chances = new List<double>();
public List<uint> BonusListIDs = new();
public List<double> Chances = new();
}
}
Source/Game/Entities/Item/ItemTemplate.cs
+1 -1
View File
@@ -328,7 +328,7 @@ namespace Game.Entities
}
public uint MaxDurability;
public List<ItemEffectRecord> Effects = new List<ItemEffectRecord>();
public List<ItemEffectRecord> Effects = new();
// extra fields, not part of db2 files
public uint ScriptId;