Core/DataStores: Updated db2 structures to 9.1.5

Port From (https://github.com/TrinityCore/TrinityCore/commit/d52c00a8fe79186013980af0e2caa3fd13c0c5fa)
This commit is contained in:
hondacrx
2021-11-07 15:53:12 -05:00
parent 4f700e6f8d
commit f2e56ccb41
26 changed files with 123 additions and 47 deletions
+1 -1
View File
@@ -892,7 +892,7 @@ namespace Game
var itemModifiedAppearance = CliDB.ItemModifiedAppearanceStorage.LookupByKey(bucketAppearance.Item1);
if (itemModifiedAppearance != null)
{
if (!knownAppearanceIds.Contains(itemModifiedAppearance.ItemAppearanceID))
if (!knownAppearanceIds.Contains((uint)itemModifiedAppearance.ItemAppearanceID))
{
hasAll = false;
break;
+1 -1
View File
@@ -395,7 +395,7 @@ namespace Game.DataStorage
public uint AzeritePowerSetID;
public int AzeritePowerID;
public int Class;
public int Tier;
public byte Tier;
public uint OrderIndex;
}
@@ -134,6 +134,7 @@ namespace Game.DataStorage
public ushort SortOrder;
public ushort UiOrderIndex;
public int Flags;
public int AddedInPatch;
public int[] SwatchColor = new int[2];
}
@@ -174,6 +175,7 @@ namespace Game.DataStorage
public int ChrCustomizationID;
public int ChrCustomizationReqID;
public int UiOrderIndex;
public int AddedInPatch;
}
public sealed class ChrCustomizationReqRecord
@@ -310,6 +312,7 @@ namespace Game.DataStorage
public uint SoundID; // Sound ID (voiceover for cinematic)
public float OriginFacing; // Orientation in map used for basis for M2 co
public uint FileDataID; // Model
public int Unknown915;
}
public sealed class CinematicSequencesRecord
@@ -106,6 +106,7 @@ namespace Game.DataStorage
public LocalizedString Reaction;
public uint FriendshipRepID;
public ushort ReactionThreshold;
public int OverrideColor;
}
public sealed class FriendshipReputationRecord
+8 -8
View File
@@ -63,7 +63,7 @@ namespace Game.DataStorage
public string Name;
public string Description;
public byte GarrAbilityCategoryID;
public byte GarrFollowerTypeID;
public sbyte GarrFollowerTypeID;
public int IconFileDataID;
public ushort FactionChangeGarrAbilityID;
public GarrisonAbilityFlags Flags;
@@ -77,7 +77,7 @@ namespace Game.DataStorage
public string Description;
public string Tooltip;
public byte GarrTypeID;
public byte BuildingType;
public sbyte BuildingType;
public uint HordeGameObjectID;
public uint AllianceGameObjectID;
public int GarrSiteID;
@@ -116,7 +116,7 @@ namespace Game.DataStorage
public ushort UiTextureAtlasMemberID;
public ushort GarrFollItemSetID;
public byte FollowerClassLimit;
public byte Flags;
public int Flags;
}
public sealed class GarrFollowerRecord
@@ -126,14 +126,14 @@ namespace Game.DataStorage
public string AllianceSourceText;
public string TitleName;
public byte GarrTypeID;
public byte GarrFollowerTypeID;
public sbyte GarrFollowerTypeID;
public int HordeCreatureID;
public int AllianceCreatureID;
public byte HordeGarrFollRaceID;
public byte AllianceGarrFollRaceID;
public uint HordeGarrClassSpecID;
public uint AllianceGarrClassSpecID;
public byte Quality;
public sbyte Quality;
public byte FollowerLevel;
public ushort ItemLevelWeapon;
public ushort ItemLevelArmor;
@@ -151,7 +151,7 @@ namespace Game.DataStorage
public uint HordeSlottingBroadcastTextID;
public uint AllySlottingBroadcastTextID;
public byte ChrClassID;
public byte Flags;
public int Flags;
public byte Gender;
public int AutoCombatantID;
public int CovenantID;
@@ -176,7 +176,7 @@ namespace Game.DataStorage
public Vector2 WorldPos;
public byte GarrTypeID;
public byte GarrMissionTypeID;
public byte GarrFollowerTypeID;
public sbyte GarrFollowerTypeID;
public byte MaxFollowers;
public uint MissionCost;
public ushort MissionCostCurrencyTypesID;
@@ -196,7 +196,7 @@ namespace Game.DataStorage
public uint OvermaxRewardPackID;
public byte FollowerDeathChance;
public uint AreaID;
public uint Flags;
public int Flags;
public float AutoMissionScalar;
public int AutoMissionScalarCurveID;
public int AutoCombatantEnvCasterID;
+2 -2
View File
@@ -29,8 +29,8 @@ namespace Game.DataStorage
public sbyte SourceTypeEnum;
public byte Flags;
public int LegacyItemID;
public int[] UpgradeItemID = new int[4];
public ushort[] UpgradeItemBonusListID = new ushort[4];
public int[] UpgradeItemID = new int[6];
public ushort[] UpgradeItemBonusListID = new ushort[6];
}
public sealed class HolidaysRecord
+7 -6
View File
@@ -57,13 +57,14 @@ namespace Game.DataStorage
public sbyte SoundOverrideSubclassID;
public int IconFileDataID;
public byte ItemGroupSoundsID;
public int ContentTuningID;
public int ModifiedCraftingReagentItemID;
}
public sealed class ItemAppearanceRecord
{
public uint Id;
public byte DisplayType;
public int DisplayType;
public uint ItemDisplayInfoID;
public int DefaultIconFileDataID;
public int UiOrder;
@@ -265,10 +266,10 @@ namespace Game.DataStorage
{
public uint Id;
public uint ItemID;
public byte ItemAppearanceModifierID;
public ushort ItemAppearanceID;
public byte OrderIndex;
public sbyte TransmogSourceTypeEnum;
public int ItemAppearanceModifierID;
public int ItemAppearanceID;
public int OrderIndex;
public byte TransmogSourceTypeEnum;
}
public sealed class ItemModifiedAppearanceExtraRecord
@@ -399,7 +400,7 @@ namespace Game.DataStorage
public byte RequiredPVPRank;
public sbyte RequiredLevel;
public InventoryType inventoryType;
public byte OverallQualityID;
public sbyte OverallQualityID;
}
public sealed class ItemSpecRecord
+2 -2
View File
@@ -25,9 +25,9 @@ namespace Game.DataStorage
public sealed class KeystoneAffixRecord
{
public uint Id;
public LocalizedString Name;
public LocalizedString Description;
public uint Id;
public int FiledataID;
}
}
}
@@ -98,6 +98,7 @@ namespace Game.DataStorage
public ushort MapID;
public byte Flags;
public uint ExpansionLevel;
public int RequiredWorldStateID; // maybe?
public short[] CriteriaCount = new short[3];
}
+2 -1
View File
@@ -30,7 +30,7 @@ namespace Game.DataStorage
public uint Id;
public LocalizedString InfoName;
public sbyte Type;
public byte Modifiers;
public int Modifiers;
public ushort Profession;
}
@@ -40,6 +40,7 @@ namespace Game.DataStorage
public uint QuestLineID;
public uint QuestID;
public uint OrderIndex;
public int Flags;
}
public sealed class QuestMoneyRewardRecord
@@ -58,6 +58,7 @@ namespace Game.DataStorage
public uint Id;
public ushort FirstSceneScriptID;
public ushort NextSceneScriptID;
public int Unknown915;
}
public sealed class SceneScriptGlobalTextRecord
@@ -71,6 +72,7 @@ namespace Game.DataStorage
{
public uint Id;
public string Name;
public int Unknown915;
}
public sealed class SceneScriptTextRecord
+1 -1
View File
@@ -25,7 +25,7 @@ namespace Game.DataStorage
public uint Id;
public int ParentUiMapID;
public int Flags;
public int System;
public uint System;
public UiMapType Type;
public int BountySetID;
public uint BountyDisplayLocation;
+1 -1
View File
@@ -44,7 +44,7 @@ namespace Game.DataStorage
public uint Id;
public uint QuestFeedbackEffectID;
public byte WhenToDisplay;
public int TargetType;
public byte TargetType;
public int TargetAsset;
public uint PlayerConditionID;
public ushort CombatConditionID;
+1 -1
View File
@@ -1991,7 +1991,7 @@ namespace Game.Entities
ItemModifiedAppearanceRecord transmog = CliDB.ItemModifiedAppearanceStorage.LookupByKey(itemModifiedAppearanceId);
if (transmog != null)
return transmog.ItemAppearanceModifierID;
return (ushort)transmog.ItemAppearanceModifierID;
return (ushort)GetAppearanceModId();
}
@@ -784,7 +784,7 @@ namespace Game.Entities
{
List<uint> appearances = new();
foreach (int id in _appearances)
appearances.Add(CliDB.ItemModifiedAppearanceStorage.LookupByKey(id).ItemAppearanceID);
appearances.Add((uint)CliDB.ItemModifiedAppearanceStorage.LookupByKey(id).ItemAppearanceID);
return appearances;
}
+1 -1
View File
@@ -52,7 +52,7 @@ namespace Game.Garrisons
_garrisonBuildingPlotInstances[MathFunctions.MakePair64(buildingPlotInst.GarrBuildingID, buildingPlotInst.GarrSiteLevelPlotInstID)] = buildingPlotInst.Id;
foreach (GarrBuildingRecord building in CliDB.GarrBuildingStorage.Values)
_garrisonBuildingsByType.Add(building.BuildingType, building.Id);
_garrisonBuildingsByType.Add((byte)building.BuildingType, building.Id);
for (var i = 0; i < 2; ++i)
_garrisonFollowerAbilities[i] = new Dictionary<uint, GarrAbilities>();
+2 -2
View File
@@ -430,7 +430,7 @@ namespace Game.Garrisons
if (constructing.UpgradeLevel > 1)
{
// Restore previous level building
uint restored = Global.GarrisonMgr.GetPreviousLevelBuilding(constructing.BuildingType, constructing.UpgradeLevel);
uint restored = Global.GarrisonMgr.GetPreviousLevelBuilding((byte)constructing.BuildingType, constructing.UpgradeLevel);
Cypher.Assert(restored != 0);
GarrisonPlaceBuildingResult placeBuildingResult = new();
@@ -500,7 +500,7 @@ namespace Game.Garrisons
Follower follower = new();
follower.PacketInfo.DbID = dbId;
follower.PacketInfo.GarrFollowerID = garrFollowerId;
follower.PacketInfo.Quality = followerEntry.Quality; // TODO: handle magic upgrades
follower.PacketInfo.Quality = (uint)followerEntry.Quality; // TODO: handle magic upgrades
follower.PacketInfo.FollowerLevel = followerEntry.FollowerLevel;
follower.PacketInfo.ItemLevelWeapon = followerEntry.ItemLevelWeapon;
follower.PacketInfo.ItemLevelArmor = followerEntry.ItemLevelArmor;
+1 -1
View File
@@ -2213,7 +2213,7 @@ namespace Game
equipmentInfo.Items[i].ItemId, equipmentInfo.Items[i].AppearanceModId, i + 1, i + 1, entry, id);
ItemModifiedAppearanceRecord defaultAppearance = Global.DB2Mgr.GetDefaultItemModifiedAppearance(equipmentInfo.Items[i].ItemId);
if (defaultAppearance != null)
equipmentInfo.Items[i].AppearanceModId = defaultAppearance.ItemAppearanceModifierID;
equipmentInfo.Items[i].AppearanceModId = (ushort)defaultAppearance.ItemAppearanceModifierID;
else
equipmentInfo.Items[i].AppearanceModId = 0;
continue;
+2
View File
@@ -4686,6 +4686,8 @@ namespace Game.Spells
new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 283 SPELL_EFFECT_COMPLETE_CAMPAIGN
new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 284 SPELL_EFFECT_SEND_CHAT_MESSAGE
new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 285 SPELL_EFFECT_MODIFY_KEYSTONE_2
new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 284 SPELL_EFFECT_GRANT_BATTLEPET_EXPERIENCE
new StaticData(SpellEffectImplicitTargetTypes.None, SpellTargetObjectTypes.None), // 285 SPELL_EFFECT_SET_GARRISON_FOLLOWER_LEVEL
};
#region Fields