araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-21 07:22:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/DataStores: Updated ChrClassesXPowerTypes.dbc, CinematicSequences.dbc, CreatureDisplayInfo.dbc, CreatureDisplayInfoExtra.dbc structs

Browse Source
This commit is contained in:
Intel
2014-11-08 15:10:14 +02:00
parent 7c72f27b7c
commit 7b287bdf38
6 changed files with 47 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/DataStores/DBCStores.cpp
+2 -2
View File
@@ -373,10 +373,10 @@ void LoadDBCStores(const std::string& dataPath)
{
uint32 index = 0;
for (uint32 j = 0; j < MAX_POWERS; ++j)
if (PowersByClass[power->classId][j] != MAX_POWERS)
if (PowersByClass[power->ClassID][j] != MAX_POWERS)
++index;
PowersByClass[power->classId][power->power] = index;
PowersByClass[power->ClassID][power->PowerType] = index;
}
}
src/server/game/DataStores/DBCStructure.h
+36 -56
View File
@@ -770,74 +770,54 @@ struct ChrRacesEntry
struct ChrPowerTypesEntry
{
uint32 entry; // 0
uint32 classId; // 1
uint32 power; // 2
uint32 ID; // 0
uint32 ClassID; // 1
uint32 PowerType; // 2
};
/* not used
struct CinematicCameraEntry
{
uint32 id; // 0 index
char* filename; // 1
uint32 soundid; // 2 in SoundEntries.dbc or 0
float start_x; // 3
float start_y; // 4
float start_z; // 5
float unk6; // 6 speed?
};
*/
struct CinematicSequencesEntry
{
uint32 Id; // 0 index
//uint32 unk1; // 1 always 0
//uint32 cinematicCamera; // 2 id in CinematicCamera.dbc
// 3-9 always 0
uint32 ID; // 0
//uint32 SoundID; // 1
//uint32 Camera[8]; // 2-9
};
struct CreatureDisplayInfoEntry
{
uint32 Displayid; // 0 m_ID
uint32 ModelId; // 1 m_modelID
// 2 m_soundID
uint32 ExtraId; // 3 m_extendedDisplayInfoID
float scale; // 4 m_creatureModelScale
// 5 m_creatureModelAlpha
// 6-8 m_textureVariation[3]
// 9 m_portraitTextureName
// 10 m_sizeClass
// 11 m_bloodID
// 12 m_NPCSoundID
// 13 m_particleColorID
// 14 m_creatureGeosetData
// 15 m_objectEffectPackageID
// 16
uint32 ID; // 0
uint32 ModelID; // 1
//uint32 SoundID; // 2
uint32 ExtendedDisplayInfoID; // 3
float CreatureModelScale; // 4
//uint32 CreatureModelAlpha; // 5
//char* TextureVariation[3]; // 6-8
//char* PortraitTextureName; // 9
//uint32 PortraitCreatureDisplayInfoID; // 10
//uint32 SizeClass; // 11
//uint32 BloodID; // 12
//uint32 NPCSoundID; // 13
//uint32 ParticleColorID; // 14
//uint32 CreatureGeosetData; // 15
//uint32 ObjectEffectPackageID; // 16
//uint32 AnimReplacementSetID; // 17
//uint32 Flags; // 18
//uint32 Gender; // 19
//uint32 StateSpellVisualKitID; // 20
};
struct CreatureDisplayInfoExtraEntry
{
//uint32 Id; // 0
uint32 Race; // 1
uint32 Gender; // 2
//uint32 SkinColor; // 3
//uint32 FaceType; // 4
//uint32 HairType; // 5
//uint32 HairStyle; // 6
//uint32 FacialHair; // 7
//uint32 HelmDisplayId; // 8
//uint32 ShoulderDisplayId; // 9
//uint32 ShirtDisplayId; // 10
//uint32 ChestDisplayId; // 11
//uint32 BeltDisplayId; // 12
//uint32 LegsDisplayId; // 13
//uint32 BootsDisplayId; // 14
//uint32 WristDisplayId; // 15
//uint32 GlovesDisplayId; // 16
//uint32 TabardDisplayId; // 17
//uint32 CloakDisplayId; // 18
//uint32 CanEquip; // 19
//char const* Texture; // 20
//uint32 ID; // 0
uint32 DisplayRaceID; // 1
//uint32 DisplaySexID; // 2
//uint32 SkinID; // 3
//uint32 FaceID; // 4
//uint32 HairStyleID; // 5
//uint32 HairColorID; // 6
//uint32 FacialHairID; // 7
//uint32 NPCItemDisplay[11]; // 8-18
//uint32 Flags; // 19
//char* FileName; // 20
};
struct CreatureFamilyEntry
src/server/game/DataStores/DBCfmt.h
+2 -2
View File
@@ -42,8 +42,8 @@ char const ChrClassesEntryfmt[] = "nixsxxxixiiiixxxxx";
char const ChrRacesEntryfmt[] = "niixiixxxxxxiisxxxxxxxxxxxxxxxxxxxxxxxxx";
char const ChrClassesXPowerTypesfmt[] = "nii";
char const CinematicSequencesEntryfmt[] = "nxxxxxxxxx";
char const CreatureDisplayInfofmt[] = "nixifxxxxxxxxxxxx";
char const CreatureDisplayInfoExtrafmt[] = "diixxxxxxxxxxxxxxxxxx";
char const CreatureDisplayInfofmt[] = "nixifxxxxxxxxxxxxxxxx";
char const CreatureDisplayInfoExtrafmt[] = "dixxxxxxxxxxxxxxxxxxx";
char const CreatureModelDatafmt[] = "nixxxxxxxxxxxxffxxxxxxxxxxxxxxx";
char const CreatureFamilyfmt[] = "nfifiiiiixsx";
char const CreatureSpellDatafmt[] = "niiiixxxx";
src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -27253,13 +27253,13 @@ float Player::GetCollisionHeight(bool mounted) const
if (!mountDisplayInfo)
return GetCollisionHeight(false);
CreatureModelDataEntry const* mountModelData = sCreatureModelDataStore.LookupEntry(mountDisplayInfo->ModelId);
CreatureModelDataEntry const* mountModelData = sCreatureModelDataStore.LookupEntry(mountDisplayInfo->ModelID);
if (!mountModelData)
return GetCollisionHeight(false);
CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId());
ASSERT(displayInfo);
CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelId);
CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelID);
ASSERT(modelData);
float scaleMod = GetObjectScale(); // 99% sure about this
@@ -27271,7 +27271,7 @@ float Player::GetCollisionHeight(bool mounted) const
//! Dismounting case - use basic default model data
CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId());
ASSERT(displayInfo);
CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelId);
CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelID);
ASSERT(modelData);
return modelData->CollisionHeight;
src/server/game/Entities/Unit/Unit.cpp
+3 -3
View File
@@ -11465,12 +11465,12 @@ bool Unit::IsInDisallowedMountForm() const
if (!display)
return true;
CreatureDisplayInfoExtraEntry const* displayExtra = sCreatureDisplayInfoExtraStore.LookupEntry(display->ExtraId);
CreatureDisplayInfoExtraEntry const* displayExtra = sCreatureDisplayInfoExtraStore.LookupEntry(display->ExtendedDisplayInfoID);
if (!displayExtra)
return true;
CreatureModelDataEntry const* model = sCreatureModelDataStore.LookupEntry(display->ModelId);
ChrRacesEntry const* race = sChrRacesStore.LookupEntry(displayExtra->Race);
CreatureModelDataEntry const* model = sCreatureModelDataStore.LookupEntry(display->ModelID);
ChrRacesEntry const* race = sChrRacesStore.LookupEntry(displayExtra->DisplayRaceID);
if (model && !(model->Flags & 0x80))
if (race && !(race->Flags & 0x4))
src/server/game/Globals/ObjectMgr.cpp
+1 -1
View File
@@ -950,7 +950,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
if (cInfo->scale <= 0.0f)
{
if (displayScaleEntry)
const_cast<CreatureTemplate*>(cInfo)->scale = displayScaleEntry->scale;
const_cast<CreatureTemplate*>(cInfo)->scale = displayScaleEntry->CreatureModelScale;
else
const_cast<CreatureTemplate*>(cInfo)->scale = 1.0f;
}