mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-21 15:27:47 -04:00
Core/DataStores: Updated db2 structures to 9.1.5
This commit is contained in:
@@ -335,7 +335,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
|
||||
// ChrCustomizationChoice.db2
|
||||
PrepareStatement(HOTFIX_SEL_CHR_CUSTOMIZATION_CHOICE, "SELECT Name, ID, ChrCustomizationOptionID, ChrCustomizationReqID, SortOrder, UiOrderIndex, "
|
||||
"Flags, SwatchColor1, SwatchColor2 FROM chr_customization_choice WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
"Flags, AddedInPatch, SwatchColor1, SwatchColor2 FROM chr_customization_choice WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_CHR_CUSTOMIZATION_CHOICE, "SELECT MAX(ID) + 1 FROM chr_customization_choice", CONNECTION_SYNCH);
|
||||
PREPARE_LOCALE_STMT(HOTFIX_SEL_CHR_CUSTOMIZATION_CHOICE, "SELECT ID, Name_lang FROM chr_customization_choice_locale"
|
||||
" WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
|
||||
@@ -354,7 +354,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
|
||||
// ChrCustomizationOption.db2
|
||||
PrepareStatement(HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION, "SELECT Name, ID, SecondaryID, Flags, ChrModelID, SortIndex, ChrCustomizationCategoryID, "
|
||||
"OptionType, BarberShopCostModifier, ChrCustomizationID, ChrCustomizationReqID, UiOrderIndex FROM chr_customization_option"
|
||||
"OptionType, BarberShopCostModifier, ChrCustomizationID, ChrCustomizationReqID, UiOrderIndex, AddedInPatch FROM chr_customization_option"
|
||||
" WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION, "SELECT MAX(ID) + 1 FROM chr_customization_option", CONNECTION_SYNCH);
|
||||
PREPARE_LOCALE_STMT(HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION, "SELECT ID, Name_lang FROM chr_customization_option_locale"
|
||||
@@ -407,8 +407,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
" WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
|
||||
|
||||
// CinematicCamera.db2
|
||||
PrepareStatement(HOTFIX_SEL_CINEMATIC_CAMERA, "SELECT ID, OriginX, OriginY, OriginZ, SoundID, OriginFacing, FileDataID FROM cinematic_camera"
|
||||
" WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PrepareStatement(HOTFIX_SEL_CINEMATIC_CAMERA, "SELECT ID, OriginX, OriginY, OriginZ, SoundID, OriginFacing, FileDataID, Unknown915"
|
||||
" FROM cinematic_camera WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_CINEMATIC_CAMERA, "SELECT MAX(ID) + 1 FROM cinematic_camera", CONNECTION_SYNCH);
|
||||
|
||||
// CinematicSequences.db2
|
||||
@@ -581,8 +581,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_FACTION_TEMPLATE, "SELECT MAX(ID) + 1 FROM faction_template", CONNECTION_SYNCH);
|
||||
|
||||
// FriendshipRepReaction.db2
|
||||
PrepareStatement(HOTFIX_SEL_FRIENDSHIP_REP_REACTION, "SELECT ID, Reaction, FriendshipRepID, ReactionThreshold FROM friendship_rep_reaction"
|
||||
" WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PrepareStatement(HOTFIX_SEL_FRIENDSHIP_REP_REACTION, "SELECT ID, Reaction, FriendshipRepID, ReactionThreshold, OverrideColor"
|
||||
" FROM friendship_rep_reaction WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_FRIENDSHIP_REP_REACTION, "SELECT MAX(ID) + 1 FROM friendship_rep_reaction", CONNECTION_SYNCH);
|
||||
PREPARE_LOCALE_STMT(HOTFIX_SEL_FRIENDSHIP_REP_REACTION, "SELECT ID, Reaction_lang FROM friendship_rep_reaction_locale"
|
||||
" WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
|
||||
@@ -723,8 +723,9 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
|
||||
// Heirloom.db2
|
||||
PrepareStatement(HOTFIX_SEL_HEIRLOOM, "SELECT SourceText, ID, ItemID, LegacyUpgradedItemID, StaticUpgradedItemID, SourceTypeEnum, Flags, "
|
||||
"LegacyItemID, UpgradeItemID1, UpgradeItemID2, UpgradeItemID3, UpgradeItemID4, UpgradeItemBonusListID1, UpgradeItemBonusListID2, "
|
||||
"UpgradeItemBonusListID3, UpgradeItemBonusListID4 FROM heirloom WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
"LegacyItemID, UpgradeItemID1, UpgradeItemID2, UpgradeItemID3, UpgradeItemID4, UpgradeItemID5, UpgradeItemID6, UpgradeItemBonusListID1, "
|
||||
"UpgradeItemBonusListID2, UpgradeItemBonusListID3, UpgradeItemBonusListID4, UpgradeItemBonusListID5, UpgradeItemBonusListID6 FROM heirloom"
|
||||
" WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_HEIRLOOM, "SELECT MAX(ID) + 1 FROM heirloom", CONNECTION_SYNCH);
|
||||
PREPARE_LOCALE_STMT(HOTFIX_SEL_HEIRLOOM, "SELECT ID, SourceText_lang FROM heirloom_locale WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
|
||||
|
||||
@@ -756,7 +757,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
|
||||
// Item.db2
|
||||
PrepareStatement(HOTFIX_SEL_ITEM, "SELECT ID, ClassID, SubclassID, Material, InventoryType, SheatheType, SoundOverrideSubclassID, IconFileDataID, "
|
||||
"ItemGroupSoundsID, ModifiedCraftingReagentItemID FROM item WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
"ItemGroupSoundsID, ContentTuningID, ModifiedCraftingReagentItemID FROM item WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_ITEM, "SELECT MAX(ID) + 1 FROM item", CONNECTION_SYNCH);
|
||||
|
||||
// ItemAppearance.db2
|
||||
@@ -991,7 +992,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_KEYCHAIN, "SELECT MAX(ID) + 1 FROM keychain", CONNECTION_SYNCH);
|
||||
|
||||
// KeystoneAffix.db2
|
||||
PrepareStatement(HOTFIX_SEL_KEYSTONE_AFFIX, "SELECT ID, Name, Description, FiledataID FROM keystone_affix WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PrepareStatement(HOTFIX_SEL_KEYSTONE_AFFIX, "SELECT Name, Description, ID, FiledataID FROM keystone_affix WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_KEYSTONE_AFFIX, "SELECT MAX(ID) + 1 FROM keystone_affix", CONNECTION_SYNCH);
|
||||
PREPARE_LOCALE_STMT(HOTFIX_SEL_KEYSTONE_AFFIX, "SELECT ID, Name_lang, Description_lang FROM keystone_affix_locale WHERE (`VerifiedBuild` > 0) = ?"
|
||||
" AND locale = ?", CONNECTION_SYNCH);
|
||||
@@ -1050,8 +1051,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
"PvpLongDescription_lang FROM map_locale WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
|
||||
|
||||
// MapChallengeMode.db2
|
||||
PrepareStatement(HOTFIX_SEL_MAP_CHALLENGE_MODE, "SELECT Name, ID, MapID, Flags, ExpansionLevel, CriteriaCount1, CriteriaCount2, CriteriaCount3"
|
||||
" FROM map_challenge_mode WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PrepareStatement(HOTFIX_SEL_MAP_CHALLENGE_MODE, "SELECT Name, ID, MapID, Flags, ExpansionLevel, RequiredWorldStateID, CriteriaCount1, "
|
||||
"CriteriaCount2, CriteriaCount3 FROM map_challenge_mode WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_MAP_CHALLENGE_MODE, "SELECT MAX(ID) + 1 FROM map_challenge_mode", CONNECTION_SYNCH);
|
||||
PREPARE_LOCALE_STMT(HOTFIX_SEL_MAP_CHALLENGE_MODE, "SELECT ID, Name_lang FROM map_challenge_mode_locale WHERE (`VerifiedBuild` > 0) = ?"
|
||||
" AND locale = ?", CONNECTION_SYNCH);
|
||||
@@ -1223,7 +1224,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
PREPARE_LOCALE_STMT(HOTFIX_SEL_QUEST_INFO, "SELECT ID, InfoName_lang FROM quest_info_locale WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
|
||||
|
||||
// QuestLineXQuest.db2
|
||||
PrepareStatement(HOTFIX_SEL_QUEST_LINE_X_QUEST, "SELECT ID, QuestLineID, QuestID, OrderIndex FROM quest_line_x_quest"
|
||||
PrepareStatement(HOTFIX_SEL_QUEST_LINE_X_QUEST, "SELECT ID, QuestLineID, QuestID, OrderIndex, Flags FROM quest_line_x_quest"
|
||||
" WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_QUEST_LINE_X_QUEST, "SELECT MAX(ID) + 1 FROM quest_line_x_quest", CONNECTION_SYNCH);
|
||||
|
||||
@@ -1286,7 +1287,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
" AND locale = ?", CONNECTION_SYNCH);
|
||||
|
||||
// SceneScript.db2
|
||||
PrepareStatement(HOTFIX_SEL_SCENE_SCRIPT, "SELECT ID, FirstSceneScriptID, NextSceneScriptID FROM scene_script WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PrepareStatement(HOTFIX_SEL_SCENE_SCRIPT, "SELECT ID, FirstSceneScriptID, NextSceneScriptID, Unknown915 FROM scene_script"
|
||||
" WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_SCENE_SCRIPT, "SELECT MAX(ID) + 1 FROM scene_script", CONNECTION_SYNCH);
|
||||
|
||||
// SceneScriptGlobalText.db2
|
||||
@@ -1294,7 +1296,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_SCENE_SCRIPT_GLOBAL_TEXT, "SELECT MAX(ID) + 1 FROM scene_script_global_text", CONNECTION_SYNCH);
|
||||
|
||||
// SceneScriptPackage.db2
|
||||
PrepareStatement(HOTFIX_SEL_SCENE_SCRIPT_PACKAGE, "SELECT ID, Name FROM scene_script_package WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PrepareStatement(HOTFIX_SEL_SCENE_SCRIPT_PACKAGE, "SELECT ID, Name, Unknown915 FROM scene_script_package WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
|
||||
PREPARE_MAX_ID_STMT(HOTFIX_SEL_SCENE_SCRIPT_PACKAGE, "SELECT MAX(ID) + 1 FROM scene_script_package", CONNECTION_SYNCH);
|
||||
|
||||
// SceneScriptText.db2
|
||||
|
||||
@@ -843,7 +843,7 @@ void CriteriaHandler::UpdateCriteria(CriteriaType type, uint64 miscValue1 /*= 0*
|
||||
case CriteriaType::SocketAnySoulbindConduit:
|
||||
case CriteriaType::ObtainAnyItemWithCurrencyValue:
|
||||
case CriteriaType::EarnExpansionLevel:
|
||||
case CriteriaType::LearnTransmog:
|
||||
case CriteriaType::LearnTransmog:
|
||||
default:
|
||||
break; // Not implemented yet :(
|
||||
}
|
||||
@@ -1609,7 +1609,7 @@ bool CriteriaHandler::RequirementsSatisfied(Criteria const* criteria, uint64 mis
|
||||
if (!miscValue1 || !miscValue2 || int64(miscValue2) < 0
|
||||
|| miscValue1 != uint32(criteria->Entry->Asset.CurrencyID))
|
||||
return false;
|
||||
break;
|
||||
break;
|
||||
case CriteriaType::WinArena:
|
||||
if (miscValue1 != uint32(criteria->Entry->Asset.MapID))
|
||||
return false;
|
||||
@@ -1672,7 +1672,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6
|
||||
{
|
||||
uint32 reqValue = modifier->Asset;
|
||||
uint32 secondaryAsset = modifier->SecondaryAsset;
|
||||
uint32 tertiaryAsset = modifier->TertiaryAsset;
|
||||
int32 tertiaryAsset = modifier->TertiaryAsset;
|
||||
|
||||
switch (ModifierTreeType(modifier->Type))
|
||||
{
|
||||
@@ -2413,7 +2413,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6
|
||||
GarrBuildingEntry const* followerBuilding = sGarrBuildingStore.LookupEntry(follower.PacketInfo.CurrentBuildingID);
|
||||
if (!followerBuilding)
|
||||
return false;
|
||||
return followerBuilding->BuildingType == secondaryAsset && follower.HasAbility(reqValue);;
|
||||
return followerBuilding->BuildingType == int32(secondaryAsset) && follower.HasAbility(reqValue);;
|
||||
});
|
||||
if (followerCount < 1)
|
||||
return false;
|
||||
@@ -2432,7 +2432,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6
|
||||
GarrBuildingEntry const* followerBuilding = sGarrBuildingStore.LookupEntry(follower.PacketInfo.CurrentBuildingID);
|
||||
if (!followerBuilding)
|
||||
return false;
|
||||
return followerBuilding->BuildingType == secondaryAsset && follower.HasAbility(reqValue);;
|
||||
return followerBuilding->BuildingType == int32(secondaryAsset) && follower.HasAbility(reqValue);;
|
||||
});
|
||||
if (followerCount < 1)
|
||||
return false;
|
||||
@@ -2450,7 +2450,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6
|
||||
GarrBuildingEntry const* followerBuilding = sGarrBuildingStore.LookupEntry(follower.PacketInfo.CurrentBuildingID);
|
||||
if (!followerBuilding)
|
||||
return false;
|
||||
return followerBuilding->BuildingType == secondaryAsset;
|
||||
return followerBuilding->BuildingType == int32(secondaryAsset);
|
||||
});
|
||||
if (followerCount < 1)
|
||||
return false;
|
||||
@@ -2467,7 +2467,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6
|
||||
continue;
|
||||
|
||||
GarrBuildingEntry const* building = sGarrBuildingStore.LookupEntry(plot->BuildingInfo.PacketInfo->GarrBuildingID);
|
||||
if (!building || building->UpgradeLevel < reqValue || building->BuildingType != secondaryAsset)
|
||||
if (!building || building->UpgradeLevel < reqValue || building->BuildingType != int32(secondaryAsset))
|
||||
continue;
|
||||
|
||||
return true;
|
||||
@@ -2531,7 +2531,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6
|
||||
continue;
|
||||
|
||||
GarrBuildingEntry const* building = sGarrBuildingStore.LookupEntry(plot->BuildingInfo.PacketInfo->GarrBuildingID);
|
||||
if (!building || building->UpgradeLevel != secondaryAsset || building->BuildingType != reqValue)
|
||||
if (!building || building->UpgradeLevel != secondaryAsset || building->BuildingType != int32(reqValue))
|
||||
continue;
|
||||
|
||||
return true;
|
||||
@@ -2933,7 +2933,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6
|
||||
case ModifierTreeType::GarrisonFollowerType: // 187
|
||||
{
|
||||
GarrFollowerEntry const* garrFollower = sGarrFollowerStore.LookupEntry(miscValue1);
|
||||
if (!garrFollower || garrFollower->GarrFollowerTypeID != reqValue)
|
||||
if (!garrFollower || garrFollower->GarrFollowerTypeID != int32(reqValue))
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
@@ -4011,7 +4011,7 @@ char const* CriteriaMgr::GetCriteriaTypeString(CriteriaType type)
|
||||
return "GuildAttainedLevel";
|
||||
case CriteriaType::CreatedItemsByCastingSpell:
|
||||
return "CreatedItemsByCastingSpell";
|
||||
case CriteriaType::FishInAnyPool:
|
||||
case CriteriaType::FishInAnyPool:
|
||||
return "FishInAnyPool";
|
||||
case CriteriaType::GuildBankTabsPurchased:
|
||||
return "GuildBankTabsPurchased";
|
||||
|
||||
@@ -639,7 +639,7 @@ struct AzeritePowerSetMemberLoadInfo
|
||||
{ true, FT_INT, "AzeritePowerSetID" },
|
||||
{ true, FT_INT, "AzeritePowerID" },
|
||||
{ true, FT_INT, "Class" },
|
||||
{ true, FT_INT, "Tier" },
|
||||
{ true, FT_BYTE, "Tier" },
|
||||
{ true, FT_INT, "OrderIndex" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, AzeritePowerSetMemberMeta::Instance(), HOTFIX_SEL_AZERITE_POWER_SET_MEMBER);
|
||||
@@ -1086,6 +1086,7 @@ struct ChrCustomizationChoiceLoadInfo
|
||||
{ false, FT_SHORT, "SortOrder" },
|
||||
{ false, FT_SHORT, "UiOrderIndex" },
|
||||
{ true, FT_INT, "Flags" },
|
||||
{ true, FT_INT, "AddedInPatch" },
|
||||
{ true, FT_INT, "SwatchColor1" },
|
||||
{ true, FT_INT, "SwatchColor2" },
|
||||
};
|
||||
@@ -1151,6 +1152,7 @@ struct ChrCustomizationOptionLoadInfo
|
||||
{ true, FT_INT, "ChrCustomizationID" },
|
||||
{ true, FT_INT, "ChrCustomizationReqID" },
|
||||
{ true, FT_INT, "UiOrderIndex" },
|
||||
{ true, FT_INT, "AddedInPatch" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, ChrCustomizationOptionMeta::Instance(), HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION);
|
||||
return &loadInfo;
|
||||
@@ -1351,6 +1353,7 @@ struct CinematicCameraLoadInfo
|
||||
{ false, FT_INT, "SoundID" },
|
||||
{ false, FT_FLOAT, "OriginFacing" },
|
||||
{ false, FT_INT, "FileDataID" },
|
||||
{ true, FT_INT, "Unknown915" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, CinematicCameraMeta::Instance(), HOTFIX_SEL_CINEMATIC_CAMERA);
|
||||
return &loadInfo;
|
||||
@@ -2054,6 +2057,7 @@ struct FriendshipRepReactionLoadInfo
|
||||
{ false, FT_STRING, "Reaction" },
|
||||
{ false, FT_INT, "FriendshipRepID" },
|
||||
{ false, FT_SHORT, "ReactionThreshold" },
|
||||
{ true, FT_INT, "OverrideColor" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, FriendshipRepReactionMeta::Instance(), HOTFIX_SEL_FRIENDSHIP_REP_REACTION);
|
||||
return &loadInfo;
|
||||
@@ -2148,10 +2152,10 @@ struct GarrAbilityLoadInfo
|
||||
{ false, FT_STRING, "Name" },
|
||||
{ false, FT_STRING, "Description" },
|
||||
{ false, FT_BYTE, "GarrAbilityCategoryID" },
|
||||
{ false, FT_BYTE, "GarrFollowerTypeID" },
|
||||
{ true, FT_BYTE, "GarrFollowerTypeID" },
|
||||
{ true, FT_INT, "IconFileDataID" },
|
||||
{ false, FT_SHORT, "FactionChangeGarrAbilityID" },
|
||||
{ false, FT_SHORT, "Flags" },
|
||||
{ true, FT_INT, "Flags" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, GarrAbilityMeta::Instance(), HOTFIX_SEL_GARR_ABILITY);
|
||||
return &loadInfo;
|
||||
@@ -2170,7 +2174,7 @@ struct GarrBuildingLoadInfo
|
||||
{ false, FT_STRING, "Description" },
|
||||
{ false, FT_STRING, "Tooltip" },
|
||||
{ false, FT_BYTE, "GarrTypeID" },
|
||||
{ false, FT_BYTE, "BuildingType" },
|
||||
{ true, FT_BYTE, "BuildingType" },
|
||||
{ true, FT_INT, "HordeGameObjectID" },
|
||||
{ true, FT_INT, "AllianceGameObjectID" },
|
||||
{ true, FT_INT, "GarrSiteID" },
|
||||
@@ -2188,7 +2192,7 @@ struct GarrBuildingLoadInfo
|
||||
{ false, FT_SHORT, "GarrAbilityID" },
|
||||
{ false, FT_SHORT, "BonusGarrAbilityID" },
|
||||
{ false, FT_SHORT, "GoldCost" },
|
||||
{ false, FT_BYTE, "Flags" },
|
||||
{ true, FT_INT, "Flags" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, GarrBuildingMeta::Instance(), HOTFIX_SEL_GARR_BUILDING);
|
||||
return &loadInfo;
|
||||
@@ -2226,7 +2230,7 @@ struct GarrClassSpecLoadInfo
|
||||
{ false, FT_SHORT, "UiTextureAtlasMemberID" },
|
||||
{ false, FT_SHORT, "GarrFollItemSetID" },
|
||||
{ false, FT_BYTE, "FollowerClassLimit" },
|
||||
{ false, FT_BYTE, "Flags" },
|
||||
{ true, FT_INT, "Flags" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, GarrClassSpecMeta::Instance(), HOTFIX_SEL_GARR_CLASS_SPEC);
|
||||
return &loadInfo;
|
||||
@@ -2244,14 +2248,14 @@ struct GarrFollowerLoadInfo
|
||||
{ false, FT_STRING, "AllianceSourceText" },
|
||||
{ false, FT_STRING, "TitleName" },
|
||||
{ false, FT_BYTE, "GarrTypeID" },
|
||||
{ false, FT_BYTE, "GarrFollowerTypeID" },
|
||||
{ true, FT_BYTE, "GarrFollowerTypeID" },
|
||||
{ true, FT_INT, "HordeCreatureID" },
|
||||
{ true, FT_INT, "AllianceCreatureID" },
|
||||
{ false, FT_BYTE, "HordeGarrFollRaceID" },
|
||||
{ false, FT_BYTE, "AllianceGarrFollRaceID" },
|
||||
{ true, FT_INT, "HordeGarrClassSpecID" },
|
||||
{ true, FT_INT, "AllianceGarrClassSpecID" },
|
||||
{ false, FT_BYTE, "Quality" },
|
||||
{ true, FT_BYTE, "Quality" },
|
||||
{ false, FT_BYTE, "FollowerLevel" },
|
||||
{ false, FT_SHORT, "ItemLevelWeapon" },
|
||||
{ false, FT_SHORT, "ItemLevelArmor" },
|
||||
@@ -2269,7 +2273,7 @@ struct GarrFollowerLoadInfo
|
||||
{ false, FT_INT, "HordeSlottingBroadcastTextID" },
|
||||
{ false, FT_INT, "AllySlottingBroadcastTextID" },
|
||||
{ false, FT_BYTE, "ChrClassID" },
|
||||
{ false, FT_BYTE, "Flags" },
|
||||
{ true, FT_INT, "Flags" },
|
||||
{ false, FT_BYTE, "Gender" },
|
||||
{ true, FT_INT, "AutoCombatantID" },
|
||||
{ true, FT_INT, "CovenantID" },
|
||||
@@ -2312,7 +2316,7 @@ struct GarrMissionLoadInfo
|
||||
{ false, FT_FLOAT, "WorldPosY" },
|
||||
{ false, FT_BYTE, "GarrTypeID" },
|
||||
{ false, FT_BYTE, "GarrMissionTypeID" },
|
||||
{ false, FT_BYTE, "GarrFollowerTypeID" },
|
||||
{ true, FT_BYTE, "GarrFollowerTypeID" },
|
||||
{ false, FT_BYTE, "MaxFollowers" },
|
||||
{ false, FT_INT, "MissionCost" },
|
||||
{ false, FT_SHORT, "MissionCostCurrencyTypesID" },
|
||||
@@ -2332,7 +2336,7 @@ struct GarrMissionLoadInfo
|
||||
{ false, FT_INT, "OvermaxRewardPackID" },
|
||||
{ false, FT_BYTE, "FollowerDeathChance" },
|
||||
{ false, FT_INT, "AreaID" },
|
||||
{ false, FT_INT, "Flags" },
|
||||
{ true, FT_INT, "Flags" },
|
||||
{ false, FT_FLOAT, "AutoMissionScalar" },
|
||||
{ true, FT_INT, "AutoMissionScalarCurveID" },
|
||||
{ true, FT_INT, "AutoCombatantEnvCasterID" },
|
||||
@@ -2591,10 +2595,14 @@ struct HeirloomLoadInfo
|
||||
{ true, FT_INT, "UpgradeItemID2" },
|
||||
{ true, FT_INT, "UpgradeItemID3" },
|
||||
{ true, FT_INT, "UpgradeItemID4" },
|
||||
{ true, FT_INT, "UpgradeItemID5" },
|
||||
{ true, FT_INT, "UpgradeItemID6" },
|
||||
{ false, FT_SHORT, "UpgradeItemBonusListID1" },
|
||||
{ false, FT_SHORT, "UpgradeItemBonusListID2" },
|
||||
{ false, FT_SHORT, "UpgradeItemBonusListID3" },
|
||||
{ false, FT_SHORT, "UpgradeItemBonusListID4" },
|
||||
{ false, FT_SHORT, "UpgradeItemBonusListID5" },
|
||||
{ false, FT_SHORT, "UpgradeItemBonusListID6" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, HeirloomMeta::Instance(), HOTFIX_SEL_HEIRLOOM);
|
||||
return &loadInfo;
|
||||
@@ -2744,6 +2752,7 @@ struct ItemLoadInfo
|
||||
{ true, FT_BYTE, "SoundOverrideSubclassID" },
|
||||
{ true, FT_INT, "IconFileDataID" },
|
||||
{ false, FT_BYTE, "ItemGroupSoundsID" },
|
||||
{ true, FT_INT, "ContentTuningID" },
|
||||
{ true, FT_INT, "ModifiedCraftingReagentItemID" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, ItemMeta::Instance(), HOTFIX_SEL_ITEM);
|
||||
@@ -2758,7 +2767,7 @@ struct ItemAppearanceLoadInfo
|
||||
static DB2FieldMeta const fields[] =
|
||||
{
|
||||
{ false, FT_INT, "ID" },
|
||||
{ false, FT_BYTE, "DisplayType" },
|
||||
{ true, FT_INT, "DisplayType" },
|
||||
{ true, FT_INT, "ItemDisplayInfoID" },
|
||||
{ true, FT_INT, "DefaultIconFileDataID" },
|
||||
{ true, FT_INT, "UiOrder" },
|
||||
@@ -3215,10 +3224,10 @@ struct ItemModifiedAppearanceLoadInfo
|
||||
{
|
||||
{ false, FT_INT, "ID" },
|
||||
{ true, FT_INT, "ItemID" },
|
||||
{ false, FT_BYTE, "ItemAppearanceModifierID" },
|
||||
{ false, FT_SHORT, "ItemAppearanceID" },
|
||||
{ false, FT_BYTE, "OrderIndex" },
|
||||
{ true, FT_BYTE, "TransmogSourceTypeEnum" },
|
||||
{ true, FT_INT, "ItemAppearanceModifierID" },
|
||||
{ true, FT_INT, "ItemAppearanceID" },
|
||||
{ true, FT_INT, "OrderIndex" },
|
||||
{ false, FT_BYTE, "TransmogSourceTypeEnum" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, ItemModifiedAppearanceMeta::Instance(), HOTFIX_SEL_ITEM_MODIFIED_APPEARANCE);
|
||||
return &loadInfo;
|
||||
@@ -3456,8 +3465,8 @@ struct ItemSparseLoadInfo
|
||||
{ false, FT_BYTE, "RequiredPVPMedal" },
|
||||
{ false, FT_BYTE, "RequiredPVPRank" },
|
||||
{ true, FT_BYTE, "RequiredLevel" },
|
||||
{ false, FT_BYTE, "InventoryType" },
|
||||
{ false, FT_BYTE, "OverallQualityID" },
|
||||
{ true, FT_BYTE, "InventoryType" },
|
||||
{ true, FT_BYTE, "OverallQualityID" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, ItemSparseMeta::Instance(), HOTFIX_SEL_ITEM_SPARSE);
|
||||
return &loadInfo;
|
||||
@@ -3670,9 +3679,9 @@ struct KeystoneAffixLoadInfo
|
||||
{
|
||||
static DB2FieldMeta const fields[] =
|
||||
{
|
||||
{ false, FT_INT, "ID" },
|
||||
{ false, FT_STRING, "Name" },
|
||||
{ false, FT_STRING, "Description" },
|
||||
{ false, FT_INT, "ID" },
|
||||
{ true, FT_INT, "FiledataID" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, KeystoneAffixMeta::Instance(), HOTFIX_SEL_KEYSTONE_AFFIX);
|
||||
@@ -3956,6 +3965,7 @@ struct MapChallengeModeLoadInfo
|
||||
{ false, FT_SHORT, "MapID" },
|
||||
{ false, FT_BYTE, "Flags" },
|
||||
{ false, FT_INT, "ExpansionLevel" },
|
||||
{ true, FT_INT, "RequiredWorldStateID" },
|
||||
{ true, FT_SHORT, "CriteriaCount1" },
|
||||
{ true, FT_SHORT, "CriteriaCount2" },
|
||||
{ true, FT_SHORT, "CriteriaCount3" },
|
||||
@@ -4638,7 +4648,7 @@ struct QuestInfoLoadInfo
|
||||
{ false, FT_INT, "ID" },
|
||||
{ false, FT_STRING, "InfoName" },
|
||||
{ true, FT_BYTE, "Type" },
|
||||
{ false, FT_BYTE, "Modifiers" },
|
||||
{ true, FT_INT, "Modifiers" },
|
||||
{ false, FT_SHORT, "Profession" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, QuestInfoMeta::Instance(), HOTFIX_SEL_QUEST_INFO);
|
||||
@@ -4656,6 +4666,7 @@ struct QuestLineXQuestLoadInfo
|
||||
{ false, FT_INT, "QuestLineID" },
|
||||
{ false, FT_INT, "QuestID" },
|
||||
{ false, FT_INT, "OrderIndex" },
|
||||
{ true, FT_INT, "Flags" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, QuestLineXQuestMeta::Instance(), HOTFIX_SEL_QUEST_LINE_X_QUEST);
|
||||
return &loadInfo;
|
||||
@@ -4903,6 +4914,7 @@ struct SceneScriptLoadInfo
|
||||
{ false, FT_INT, "ID" },
|
||||
{ false, FT_SHORT, "FirstSceneScriptID" },
|
||||
{ false, FT_SHORT, "NextSceneScriptID" },
|
||||
{ true, FT_INT, "Unknown915" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, SceneScriptMeta::Instance(), HOTFIX_SEL_SCENE_SCRIPT);
|
||||
return &loadInfo;
|
||||
@@ -4932,6 +4944,7 @@ struct SceneScriptPackageLoadInfo
|
||||
{
|
||||
{ false, FT_INT, "ID" },
|
||||
{ false, FT_STRING_NOT_LOCALIZED, "Name" },
|
||||
{ true, FT_INT, "Unknown915" },
|
||||
};
|
||||
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, SceneScriptPackageMeta::Instance(), HOTFIX_SEL_SCENE_SCRIPT_PACKAGE);
|
||||
return &loadInfo;
|
||||
@@ -5287,7 +5300,7 @@ struct SpellEffectLoadInfo
|
||||
{ true, FT_SHORT, "EffectAura" },
|
||||
{ true, FT_INT, "DifficultyID" },
|
||||
{ true, FT_INT, "EffectIndex" },
|
||||
{ true, FT_INT, "Effect" },
|
||||
{ false, FT_INT, "Effect" },
|
||||
{ false, FT_FLOAT, "EffectAmplitude" },
|
||||
{ true, FT_INT, "EffectAttributes" },
|
||||
{ true, FT_INT, "EffectAuraPeriod" },
|
||||
@@ -6184,8 +6197,8 @@ struct UiMapLoadInfo
|
||||
{ false, FT_INT, "ID" },
|
||||
{ true, FT_INT, "ParentUiMapID" },
|
||||
{ true, FT_INT, "Flags" },
|
||||
{ true, FT_INT, "System" },
|
||||
{ true, FT_INT, "Type" },
|
||||
{ false, FT_INT, "System" },
|
||||
{ false, FT_INT, "Type" },
|
||||
{ true, FT_INT, "BountySetID" },
|
||||
{ false, FT_INT, "BountyDisplayLocation" },
|
||||
{ true, FT_INT, "VisibilityPlayerConditionID" },
|
||||
@@ -6460,7 +6473,7 @@ struct WorldEffectLoadInfo
|
||||
{ false, FT_INT, "ID" },
|
||||
{ false, FT_INT, "QuestFeedbackEffectID" },
|
||||
{ false, FT_BYTE, "WhenToDisplay" },
|
||||
{ true, FT_BYTE, "TargetType" },
|
||||
{ false, FT_BYTE, "TargetType" },
|
||||
{ true, FT_INT, "TargetAsset" },
|
||||
{ false, FT_INT, "PlayerConditionID" },
|
||||
{ false, FT_SHORT, "CombatConditionID" },
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -395,7 +395,7 @@ struct AzeritePowerSetMemberEntry
|
||||
int32 AzeritePowerSetID;
|
||||
int32 AzeritePowerID;
|
||||
int32 Class;
|
||||
int32 Tier;
|
||||
int8 Tier;
|
||||
int32 OrderIndex;
|
||||
};
|
||||
|
||||
@@ -654,6 +654,7 @@ struct ChrCustomizationChoiceEntry
|
||||
uint16 SortOrder;
|
||||
uint16 UiOrderIndex;
|
||||
int32 Flags;
|
||||
int32 AddedInPatch;
|
||||
int32 SwatchColor[2];
|
||||
};
|
||||
|
||||
@@ -694,6 +695,7 @@ struct ChrCustomizationOptionEntry
|
||||
int32 ChrCustomizationID;
|
||||
int32 ChrCustomizationReqID;
|
||||
int32 UiOrderIndex;
|
||||
int32 AddedInPatch;
|
||||
};
|
||||
|
||||
struct ChrCustomizationReqEntry
|
||||
@@ -832,6 +834,7 @@ struct CinematicCameraEntry
|
||||
uint32 SoundID; // Sound ID (voiceover for cinematic)
|
||||
float OriginFacing; // Orientation in map used for basis for M2 co
|
||||
uint32 FileDataID; // Model
|
||||
int32 Unknown915;
|
||||
};
|
||||
|
||||
struct CinematicSequencesEntry
|
||||
@@ -1509,6 +1512,7 @@ struct FriendshipRepReactionEntry
|
||||
LocalizedString Reaction;
|
||||
uint32 FriendshipRepID;
|
||||
uint16 ReactionThreshold;
|
||||
int32 OverrideColor;
|
||||
};
|
||||
|
||||
struct FriendshipReputationEntry
|
||||
@@ -1557,10 +1561,10 @@ struct GarrAbilityEntry
|
||||
LocalizedString Name;
|
||||
LocalizedString Description;
|
||||
uint8 GarrAbilityCategoryID;
|
||||
uint8 GarrFollowerTypeID;
|
||||
int8 GarrFollowerTypeID;
|
||||
int32 IconFileDataID;
|
||||
uint16 FactionChangeGarrAbilityID;
|
||||
uint16 Flags;
|
||||
int32 Flags;
|
||||
};
|
||||
|
||||
struct GarrBuildingEntry
|
||||
@@ -1571,7 +1575,7 @@ struct GarrBuildingEntry
|
||||
LocalizedString Description;
|
||||
LocalizedString Tooltip;
|
||||
uint8 GarrTypeID;
|
||||
uint8 BuildingType;
|
||||
int8 BuildingType;
|
||||
int32 HordeGameObjectID;
|
||||
int32 AllianceGameObjectID;
|
||||
int32 GarrSiteID;
|
||||
@@ -1589,7 +1593,7 @@ struct GarrBuildingEntry
|
||||
uint16 GarrAbilityID;
|
||||
uint16 BonusGarrAbilityID;
|
||||
uint16 GoldCost;
|
||||
uint8 Flags;
|
||||
int32 Flags;
|
||||
};
|
||||
|
||||
struct GarrBuildingPlotInstEntry
|
||||
@@ -1610,7 +1614,7 @@ struct GarrClassSpecEntry
|
||||
uint16 UiTextureAtlasMemberID;
|
||||
uint16 GarrFollItemSetID;
|
||||
uint8 FollowerClassLimit;
|
||||
uint8 Flags;
|
||||
int32 Flags;
|
||||
};
|
||||
|
||||
struct GarrFollowerEntry
|
||||
@@ -1620,14 +1624,14 @@ struct GarrFollowerEntry
|
||||
LocalizedString AllianceSourceText;
|
||||
LocalizedString TitleName;
|
||||
uint8 GarrTypeID;
|
||||
uint8 GarrFollowerTypeID;
|
||||
int8 GarrFollowerTypeID;
|
||||
int32 HordeCreatureID;
|
||||
int32 AllianceCreatureID;
|
||||
uint8 HordeGarrFollRaceID;
|
||||
uint8 AllianceGarrFollRaceID;
|
||||
int32 HordeGarrClassSpecID;
|
||||
int32 AllianceGarrClassSpecID;
|
||||
uint8 Quality;
|
||||
int8 Quality;
|
||||
uint8 FollowerLevel;
|
||||
uint16 ItemLevelWeapon;
|
||||
uint16 ItemLevelArmor;
|
||||
@@ -1645,7 +1649,7 @@ struct GarrFollowerEntry
|
||||
uint32 HordeSlottingBroadcastTextID;
|
||||
uint32 AllySlottingBroadcastTextID;
|
||||
uint8 ChrClassID;
|
||||
uint8 Flags;
|
||||
int32 Flags;
|
||||
uint8 Gender;
|
||||
int32 AutoCombatantID;
|
||||
int32 CovenantID;
|
||||
@@ -1670,7 +1674,7 @@ struct GarrMissionEntry
|
||||
DBCPosition2D WorldPos;
|
||||
uint8 GarrTypeID;
|
||||
uint8 GarrMissionTypeID;
|
||||
uint8 GarrFollowerTypeID;
|
||||
int8 GarrFollowerTypeID;
|
||||
uint8 MaxFollowers;
|
||||
uint32 MissionCost;
|
||||
uint16 MissionCostCurrencyTypesID;
|
||||
@@ -1690,7 +1694,7 @@ struct GarrMissionEntry
|
||||
uint32 OvermaxRewardPackID;
|
||||
uint8 FollowerDeathChance;
|
||||
uint32 AreaID;
|
||||
uint32 Flags;
|
||||
int32 Flags;
|
||||
float AutoMissionScalar;
|
||||
int32 AutoMissionScalarCurveID;
|
||||
int32 AutoCombatantEnvCasterID;
|
||||
@@ -1822,8 +1826,8 @@ struct HeirloomEntry
|
||||
int8 SourceTypeEnum;
|
||||
uint8 Flags;
|
||||
int32 LegacyItemID;
|
||||
int32 UpgradeItemID[4];
|
||||
uint16 UpgradeItemBonusListID[4];
|
||||
int32 UpgradeItemID[6];
|
||||
uint16 UpgradeItemBonusListID[6];
|
||||
};
|
||||
|
||||
#define MAX_HOLIDAY_DURATIONS 10
|
||||
@@ -1884,13 +1888,14 @@ struct ItemEntry
|
||||
int8 SoundOverrideSubclassID;
|
||||
int32 IconFileDataID;
|
||||
uint8 ItemGroupSoundsID;
|
||||
int32 ContentTuningID;
|
||||
int32 ModifiedCraftingReagentItemID;
|
||||
};
|
||||
|
||||
struct ItemAppearanceEntry
|
||||
{
|
||||
uint32 ID;
|
||||
uint8 DisplayType;
|
||||
int32 DisplayType;
|
||||
int32 ItemDisplayInfoID;
|
||||
int32 DefaultIconFileDataID;
|
||||
int32 UiOrder;
|
||||
@@ -2116,10 +2121,10 @@ struct ItemModifiedAppearanceEntry
|
||||
{
|
||||
uint32 ID;
|
||||
int32 ItemID;
|
||||
uint8 ItemAppearanceModifierID;
|
||||
uint16 ItemAppearanceID;
|
||||
uint8 OrderIndex;
|
||||
int8 TransmogSourceTypeEnum;
|
||||
int32 ItemAppearanceModifierID;
|
||||
int32 ItemAppearanceID;
|
||||
int32 OrderIndex;
|
||||
uint8 TransmogSourceTypeEnum;
|
||||
};
|
||||
|
||||
struct ItemModifiedAppearanceExtraEntry
|
||||
@@ -2251,8 +2256,8 @@ struct ItemSparseEntry
|
||||
uint8 RequiredPVPMedal;
|
||||
uint8 RequiredPVPRank;
|
||||
int8 RequiredLevel;
|
||||
uint8 InventoryType;
|
||||
uint8 OverallQualityID;
|
||||
int8 InventoryType;
|
||||
int8 OverallQualityID;
|
||||
};
|
||||
|
||||
struct ItemSpecEntry
|
||||
@@ -2355,9 +2360,9 @@ struct KeychainEntry
|
||||
|
||||
struct KeystoneAffixEntry
|
||||
{
|
||||
uint32 ID;
|
||||
LocalizedString Name;
|
||||
LocalizedString Description;
|
||||
uint32 ID;
|
||||
int32 FiledataID;
|
||||
};
|
||||
|
||||
@@ -2531,6 +2536,7 @@ struct MapChallengeModeEntry
|
||||
uint16 MapID;
|
||||
uint8 Flags;
|
||||
uint32 ExpansionLevel;
|
||||
int32 RequiredWorldStateID; // maybe?
|
||||
int16 CriteriaCount[3];
|
||||
};
|
||||
|
||||
@@ -2905,7 +2911,7 @@ struct QuestInfoEntry
|
||||
uint32 ID;
|
||||
LocalizedString InfoName;
|
||||
int8 Type;
|
||||
uint8 Modifiers;
|
||||
int32 Modifiers;
|
||||
uint16 Profession;
|
||||
};
|
||||
|
||||
@@ -2915,6 +2921,7 @@ struct QuestLineXQuestEntry
|
||||
uint32 QuestLineID;
|
||||
uint32 QuestID;
|
||||
uint32 OrderIndex;
|
||||
int32 Flags;
|
||||
};
|
||||
|
||||
struct QuestMoneyRewardEntry
|
||||
@@ -3030,6 +3037,7 @@ struct SceneScriptEntry
|
||||
uint32 ID;
|
||||
uint16 FirstSceneScriptID;
|
||||
uint16 NextSceneScriptID;
|
||||
int32 Unknown915;
|
||||
};
|
||||
|
||||
struct SceneScriptGlobalTextEntry
|
||||
@@ -3043,6 +3051,7 @@ struct SceneScriptPackageEntry
|
||||
{
|
||||
uint32 ID;
|
||||
char const* Name;
|
||||
int32 Unknown915;
|
||||
};
|
||||
|
||||
struct SceneScriptTextEntry
|
||||
@@ -3252,7 +3261,7 @@ struct SpellEffectEntry
|
||||
int16 EffectAura;
|
||||
int32 DifficultyID;
|
||||
int32 EffectIndex;
|
||||
int32 Effect;
|
||||
uint32 Effect;
|
||||
float EffectAmplitude;
|
||||
int32 EffectAttributes;
|
||||
int32 EffectAuraPeriod;
|
||||
@@ -3723,8 +3732,8 @@ struct UiMapEntry
|
||||
uint32 ID;
|
||||
int32 ParentUiMapID;
|
||||
int32 Flags;
|
||||
int32 System;
|
||||
int32 Type;
|
||||
uint32 System;
|
||||
uint32 Type;
|
||||
int32 BountySetID;
|
||||
uint32 BountyDisplayLocation;
|
||||
int32 VisibilityPlayerConditionID;
|
||||
@@ -3883,7 +3892,7 @@ struct VehicleSeatEntry
|
||||
int16 CameraModeID;
|
||||
|
||||
inline bool HasFlag(VehicleSeatFlags flag) const { return !!(Flags & flag); }
|
||||
inline bool HasFlag(VehicleSeatFlagsB flag) const { return !!(Flags & flag); }
|
||||
inline bool HasFlag(VehicleSeatFlagsB flag) const { return !!(FlagsB & flag); }
|
||||
|
||||
inline bool CanEnterOrExit() const { return HasFlag(VehicleSeatFlags(VEHICLE_SEAT_FLAG_CAN_ENTER_OR_EXIT | VEHICLE_SEAT_FLAG_CAN_CONTROL | VEHICLE_SEAT_FLAG_SHOULD_USE_VEH_SEAT_EXIT_ANIM_ON_VOLUNTARY_EXIT)); }
|
||||
inline bool CanSwitchFromSeat() const { return HasFlag(VEHICLE_SEAT_FLAG_CAN_SWITCH); }
|
||||
@@ -3919,7 +3928,7 @@ struct WorldEffectEntry
|
||||
uint32 ID;
|
||||
uint32 QuestFeedbackEffectID;
|
||||
uint8 WhenToDisplay;
|
||||
int8 TargetType;
|
||||
uint8 TargetType;
|
||||
int32 TargetAsset;
|
||||
uint32 PlayerConditionID;
|
||||
uint16 CombatConditionID;
|
||||
|
||||
@@ -191,7 +191,7 @@ enum AzeriteTierUnlockSetFlags
|
||||
AZERITE_TIER_UNLOCK_SET_FLAG_DEFAULT = 0x1
|
||||
};
|
||||
|
||||
#define BATTLE_PET_SPECIES_MAX_ID 3159
|
||||
#define BATTLE_PET_SPECIES_MAX_ID 3189
|
||||
|
||||
enum class BattlePetSpeciesFlags : uint16
|
||||
{
|
||||
@@ -1493,7 +1493,7 @@ enum class SpellShapeshiftFormFlags : int32
|
||||
|
||||
DEFINE_ENUM_FLAG(SpellShapeshiftFormFlags);
|
||||
|
||||
#define TaxiMaskSize 338
|
||||
#define TaxiMaskSize 339
|
||||
typedef std::array<uint8, TaxiMaskSize> TaxiMask;
|
||||
|
||||
enum TotemCategoryType
|
||||
|
||||
@@ -1390,6 +1390,8 @@ enum SpellEffectName
|
||||
SPELL_EFFECT_COMPLETE_CAMPAIGN = 283, // Flags all quests as completed that are assigned to campaign (MiscValueA)
|
||||
SPELL_EFFECT_SEND_CHAT_MESSAGE = 284, // MiscValue[0] = BroadcastTextID, MiscValue[1] = ChatType
|
||||
SPELL_EFFECT_MODIFY_KEYSTONE_2 = 285,
|
||||
SPELL_EFFECT_GRANT_BATTLEPET_EXPERIENCE = 286,
|
||||
SPELL_EFFECT_SET_GARRISON_FOLLOWER_LEVEL = 287,
|
||||
TOTAL_SPELL_EFFECTS
|
||||
};
|
||||
|
||||
|
||||
@@ -367,6 +367,8 @@ NonDefaultConstructible<SpellEffectHandlerFn> SpellEffectHandlers[TOTAL_SPELL_EF
|
||||
&Spell::EffectNULL, //283 SPELL_EFFECT_COMPLETE_CAMPAIGN
|
||||
&Spell::EffectSendChatMessage, //284 SPELL_EFFECT_SEND_CHAT_MESSAGE
|
||||
&Spell::EffectNULL, //285 SPELL_EFFECT_MODIFY_KEYSTONE_2
|
||||
&Spell::EffectNULL, //286 SPELL_EFFECT_GRANT_BATTLEPET_EXPERIENCE
|
||||
&Spell::EffectNULL, //287 SPELL_EFFECT_SET_GARRISON_FOLLOWER_LEVEL
|
||||
};
|
||||
|
||||
void Spell::EffectNULL()
|
||||
|
||||
@@ -1070,6 +1070,8 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] =
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 283 SPELL_EFFECT_COMPLETE_CAMPAIGN
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 284 SPELL_EFFECT_SEND_CHAT_MESSAGE
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 285 SPELL_EFFECT_MODIFY_KEYSTONE_2
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 284 SPELL_EFFECT_GRANT_BATTLEPET_EXPERIENCE
|
||||
{EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 285 SPELL_EFFECT_SET_GARRISON_FOLLOWER_LEVEL
|
||||
};
|
||||
|
||||
SpellInfo::SpellInfo(SpellNameEntry const* spellName, ::Difficulty difficulty, SpellInfoLoadHelper const& data)
|
||||
|
||||
@@ -190,6 +190,7 @@ DB2FileInfo const DBFilesClientList[] =
|
||||
{ 1278239, "ComponentTextureFileData.db2" },
|
||||
{ 3501965, "ConditionalContentTuning.db2" },
|
||||
{ 1709409, "ConfigurationWarning.db2" },
|
||||
{ 4281307, "ContentRestrictionRuleSet.db2" },
|
||||
{ 1962930, "ContentTuning.db2" },
|
||||
{ 2976765, "ContentTuningXExpected.db2" },
|
||||
{ 1587153, "Contribution.db2" },
|
||||
@@ -214,6 +215,7 @@ DB2FileInfo const DBFilesClientList[] =
|
||||
{ 1365368, "CreatureModelData.db2" },
|
||||
{ 1125666, "CreatureMovementInfo.db2" },
|
||||
{ 1344466, "CreatureSoundData.db2" },
|
||||
{ 4178576, "CreatureSoundFidget.db2" },
|
||||
{ 1131315, "CreatureType.db2" },
|
||||
{ 1587158, "CreatureXContribution.db2" },
|
||||
{ 1864302, "CreatureXDisplayInfo.db2" },
|
||||
@@ -232,8 +234,8 @@ DB2FileInfo const DBFilesClientList[] =
|
||||
{ 1279099, "DeclinedWordCases.db2" },
|
||||
{ 1122116, "DestructibleModelData.db2" },
|
||||
{ 922722, "DeviceBlacklist.db2" },
|
||||
{ 925422, "DeviceDefaultSettings.db2" },
|
||||
{ 1352127, "Difficulty.db2" },
|
||||
{ 4279827, "DisplaySeason.db2" },
|
||||
{ 1304325, "DissolveEffect.db2" },
|
||||
{ 922720, "DriverBlacklist.db2" },
|
||||
{ 1347279, "DungeonEncounter.db2" },
|
||||
@@ -339,6 +341,7 @@ DB2FileInfo const DBFilesClientList[] =
|
||||
{ 1308499, "GroundEffectTexture.db2" },
|
||||
{ 974813, "GroupFinderActivity.db2" },
|
||||
{ 974814, "GroupFinderActivityGrp.db2" },
|
||||
{ 4206623, "GroupFinderActivityXPvpBracket.db2" },
|
||||
{ 974812, "GroupFinderCategory.db2" },
|
||||
{ 1286526, "GuildColorBackground.db2" },
|
||||
{ 1286527, "GuildColorBorder.db2" },
|
||||
@@ -437,6 +440,7 @@ DB2FileInfo const DBFilesClientList[] =
|
||||
{ 1135058, "LFGDungeonGroup.db2" },
|
||||
{ 1361033, "LFGDungeons.db2" },
|
||||
{ 982805, "LFGRoleRequirement.db2" },
|
||||
{ 4281309, "LabelXContentRestrictRuleSet.db2" },
|
||||
{ 984702, "LanguageWords.db2" },
|
||||
{ 1135325, "Languages.db2" },
|
||||
{ 1339818, "LfgDungeonsGroupingMap.db2" },
|
||||
@@ -468,7 +472,6 @@ DB2FileInfo const DBFilesClientList[] =
|
||||
{ 1375801, "ManifestInterfaceData.db2" },
|
||||
{ 1375804, "ManifestInterfaceItemIcon.db2" },
|
||||
{ 1267335, "ManifestInterfaceTOCData.db2" },
|
||||
{ 1375802, "ManifestMP3.db2" },
|
||||
{ 1349477, "Map.db2" },
|
||||
{ 1597466, "MapCelestialBody.db2" },
|
||||
{ 801709, "MapChallengeMode.db2" },
|
||||
@@ -493,6 +496,7 @@ DB2FileInfo const DBFilesClientList[] =
|
||||
{ 921760, "Mount.db2" },
|
||||
{ 1114709, "MountCapability.db2" },
|
||||
{ 2923510, "MountEquipment.db2" },
|
||||
{ 1114674, "MountType.db2" },
|
||||
{ 1114715, "MountTypeXCapability.db2" },
|
||||
{ 1576117, "MountXDisplay.db2" },
|
||||
{ 3989477, "MountXSpellVisualKitPicker.db2" },
|
||||
|
||||
Reference in New Issue
Block a user