mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

barber shop race/gender checks, fly check for map 571

Browse source
This commit is contained in:
tomrus88 2008-11-19 00:59:14 +03:00
parent 56c8d2549c
commit c0c0c9c776
8 changed files with 158 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/CharacterHandler.cpp
View file

@ -1126,12 +1126,12 @@ void WorldSession::HandleAlterAppearance( WorldPacket & recv_data )
BarberShopStyleEntry const* bs_hair = sBarberShopStyleStore.LookupEntry(Hair); BarberShopStyleEntry const* bs_hair = sBarberShopStyleStore.LookupEntry(Hair);
if(!bs_hair) if(!bs_hair || bs_hair->type != 0 || bs_hair->race != _player->getRace() || bs_hair->gender != _player->getGender())
return; return;
BarberShopStyleEntry const* bs_facialHair = sBarberShopStyleStore.LookupEntry(FacialHair); BarberShopStyleEntry const* bs_facialHair = sBarberShopStyleStore.LookupEntry(FacialHair);
if(!bs_facialHair) if(!bs_facialHair || bs_facialHair->type != 2 || bs_facialHair->race != _player->getRace() || bs_facialHair->gender != _player->getGender())
return; return;
uint32 Cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id); uint32 Cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id);

4
src/game/ObjectMgr.cpp
View file

@ -4703,14 +4703,14 @@ uint16 ObjectMgr::GetTaxiMount( uint32 id, uint32 team )
{ {
if (team == ALLIANCE) if (team == ALLIANCE)
{ {
mount_entry = node->alliance_mount_type; mount_entry = node->MountCreatureID[1];
CreatureInfo const *ci = GetCreatureTemplate(mount_entry); CreatureInfo const *ci = GetCreatureTemplate(mount_entry);
if(ci) if(ci)
mount_id = ci->DisplayID_A; mount_id = ci->DisplayID_A;
} }
if (team == HORDE) if (team == HORDE)
{ {
mount_entry = node->horde_mount_type; mount_entry = node->MountCreatureID[0];
CreatureInfo const *ci = GetCreatureTemplate(mount_entry); CreatureInfo const *ci = GetCreatureTemplate(mount_entry);
if(ci) if(ci)
mount_id = ci->DisplayID_H; mount_id = ci->DisplayID_H;

3
src/game/Player.cpp
View file

@ -18376,7 +18376,8 @@ void Player::UpdateZoneDependentAuras( uint32 newZone )
{ {
// remove new continent flight forms // remove new continent flight forms
if( !isGameMaster() && if( !isGameMaster() &&
GetVirtualMapForMapAndZone(GetMapId(),newZone) != 530) GetVirtualMapForMapAndZone(GetMapId(),newZone) != 530 &&
GetVirtualMapForMapAndZone(GetMapId(),newZone) != 571)
{ {
RemoveSpellsCausingAura(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED); RemoveSpellsCausingAura(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED);
RemoveSpellsCausingAura(SPELL_AURA_FLY); RemoveSpellsCausingAura(SPELL_AURA_FLY);

19
src/game/Spell.cpp
View file

@ -4018,7 +4018,9 @@ uint8 Spell::CanCast(bool strict)
if(int32(m_targets.getUnitTarget()->getLevel()) > CalculateDamage(i,m_targets.getUnitTarget())) if(int32(m_targets.getUnitTarget()->getLevel()) > CalculateDamage(i,m_targets.getUnitTarget()))
return SPELL_FAILED_HIGHLEVEL; return SPELL_FAILED_HIGHLEVEL;
};break;
break;
}
case SPELL_AURA_MOUNTED: case SPELL_AURA_MOUNTED:
{ {
if (m_caster->IsInWater()) if (m_caster->IsInWater())
@ -4051,7 +4053,9 @@ uint8 Spell::CanCast(bool strict)
// can be casted at non-friendly unit or own pet/charm // can be casted at non-friendly unit or own pet/charm
if(m_caster->IsFriendlyTo(m_targets.getUnitTarget())) if(m_caster->IsFriendlyTo(m_targets.getUnitTarget()))
return SPELL_FAILED_TARGET_FRIENDLY; return SPELL_FAILED_TARGET_FRIENDLY;
};break;
break;
}
case SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED: case SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED:
case SPELL_AURA_FLY: case SPELL_AURA_FLY:
{ {
@ -4059,10 +4063,13 @@ uint8 Spell::CanCast(bool strict)
if(m_caster->GetTypeId()==TYPEID_PLAYER) if(m_caster->GetTypeId()==TYPEID_PLAYER)
{ {
if( !((Player*)m_caster)->isGameMaster() && if( !((Player*)m_caster)->isGameMaster() &&
GetVirtualMapForMapAndZone(m_caster->GetMapId(),m_caster->GetZoneId()) != 530) GetVirtualMapForMapAndZone(m_caster->GetMapId(),m_caster->GetZoneId()) != 530 &&
!(GetVirtualMapForMapAndZone(m_caster->GetMapId(),m_caster->GetZoneId()) == 571 && ((Player*)m_caster)->HasSpell(54197)))
return SPELL_FAILED_NOT_HERE; return SPELL_FAILED_NOT_HERE;
} }
};break;
break;
}
case SPELL_AURA_PERIODIC_MANA_LEECH: case SPELL_AURA_PERIODIC_MANA_LEECH:
{ {
if (!m_targets.getUnitTarget()) if (!m_targets.getUnitTarget())
@ -4073,9 +4080,11 @@ uint8 Spell::CanCast(bool strict)
if(m_targets.getUnitTarget()->getPowerType()!=POWER_MANA) if(m_targets.getUnitTarget()->getPowerType()!=POWER_MANA)
return SPELL_FAILED_BAD_TARGETS; return SPELL_FAILED_BAD_TARGETS;
break; break;
} }
default:break; default:
break;
} }
} }

2
src/game/SpellEffects.cpp
View file

@ -4942,7 +4942,7 @@ void Spell::EffectDuel(uint32 i)
// Players can only fight a duel with each other outside (=not inside dungeons and not in capital cities) // Players can only fight a duel with each other outside (=not inside dungeons and not in capital cities)
// Don't have to check the target's map since you cannot challenge someone across maps // Don't have to check the target's map since you cannot challenge someone across maps
if( caster->GetMapId() != 0 && caster->GetMapId() != 1 && caster->GetMapId() != 530) if( caster->GetMapId() != 0 && caster->GetMapId() != 1 && caster->GetMapId() != 530 && caster->GetMapId() != 571)
{ {
SendCastResult(SPELL_FAILED_NO_DUELING); // Dueling isn't allowed here SendCastResult(SPELL_FAILED_NO_DUELING); // Dueling isn't allowed here
return; return;

4
src/shared/Database/DBCStores.cpp
View file

@ -203,7 +203,7 @@ void LoadDBCStores(std::string dataPath)
sAreaFlagByAreaID.insert(AreaFlagByAreaID::value_type(uint16(area->ID),area->exploreFlag)); sAreaFlagByAreaID.insert(AreaFlagByAreaID::value_type(uint16(area->ID),area->exploreFlag));
// fill MapId->DBC records ( skip sub zones and continents ) // fill MapId->DBC records ( skip sub zones and continents )
if(area->zone==0 && area->mapid != 0 && area->mapid != 1 && area->mapid != 530 ) if(area->zone==0 && area->mapid != 0 && area->mapid != 1 && area->mapid != 530 && area->mapid != 571 )
sAreaFlagByMapID.insert(AreaFlagByMapID::value_type(area->mapid,area->exploreFlag)); sAreaFlagByMapID.insert(AreaFlagByMapID::value_type(area->mapid,area->exploreFlag));
} }
} }
@ -546,7 +546,7 @@ uint32 GetAreaFlagByMapId(uint32 mapid)
uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId) uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId)
{ {
if(mapid != 530) // speed for most cases if(mapid != 530 || mapid != 571) // speed for most cases
return mapid; return mapid;
if(WorldMapAreaEntry const* wma = sWorldMapAreaStore.LookupEntry(zoneId)) if(WorldMapAreaEntry const* wma = sWorldMapAreaStore.LookupEntry(zoneId))

258
src/shared/Database/DBCStructure.h
View file

@ -478,16 +478,16 @@ struct AreaTableEntry
struct AreaTriggerEntry struct AreaTriggerEntry
{ {
uint32 id; // 0 m_ID uint32 id; // 0 m_ID
uint32 mapid; // 1 m_ContinentID uint32 mapid; // 1 m_ContinentID
float x; // 2 m_x float x; // 2 m_x
float y; // 3 m_y float y; // 3 m_y
float z; // 4 m_z float z; // 4 m_z
float radius; // 5 m_radius float radius; // 5 m_radius
float box_x; // 6 m_box_length extent x edge float box_x; // 6 m_box_length
float box_y; // 7 m_box_width extent y edge float box_y; // 7 m_box_width
float box_z; // 8 m_box_heigh extent z edge float box_z; // 8 m_box_heigh
float box_orientation; // 9 m_box_yaw extent rotation by about z axis float box_orientation; // 9 m_box_yaw
}; };
struct BankBagSlotPricesEntry struct BankBagSlotPricesEntry
@ -499,14 +499,14 @@ struct BankBagSlotPricesEntry
struct BarberShopStyleEntry struct BarberShopStyleEntry
{ {
uint32 Id; // 0 uint32 Id; // 0
//uint32 type; // 1 value 0 -> hair, value 2 -> facialhair uint32 type; // 1 value 0 -> hair, value 2 -> facialhair
//char* name[16]; // 2-17 name of hair style //char* name[16]; // 2-17 name of hair style
//uint32 name_flags; // 18 //uint32 name_flags; // 18
//uint32 unk_name[16]; // 19-34, all empty //uint32 unk_name[16]; // 19-34, all empty
//uint32 unk_flags; // 35 //uint32 unk_flags; // 35
//float unk3; // 36 values 1 and 0,75 //float CostMultiplier; // 36 values 1 and 0.75
//uint32 race; // 37 race uint32 race; // 37 race
//uint32 gender; // 38 0 -> male, 1 -> female uint32 gender; // 38 0 -> male, 1 -> female
uint32 hair_id; // 39 real ID to hair/facial hair uint32 hair_id; // 39 real ID to hair/facial hair
}; };
@ -590,20 +590,20 @@ struct ChrRacesEntry
struct CreatureDisplayInfoEntry struct CreatureDisplayInfoEntry
{ {
uint32 Displayid; // 0 m_ID uint32 Displayid; // 0 m_ID
// 1 m_modelID // 1 m_modelID
// 2 m_soundID // 2 m_soundID
// 3 m_extendedDisplayInfoID // 3 m_extendedDisplayInfoID
float scale; // 4 m_creatureModelScale float scale; // 4 m_creatureModelScale
// 5 m_creatureModelAlpha // 5 m_creatureModelAlpha
// 6-8 m_textureVariation[3] // 6-8 m_textureVariation[3]
// 9 m_portraitTextureName // 9 m_portraitTextureName
// 10 m_sizeClass // 10 m_sizeClass
// 11 m_bloodID // 11 m_bloodID
// 12 m_NPCSoundID // 12 m_NPCSoundID
// 13 m_particleColorID // 13 m_particleColorID
// 14 m_creatureGeosetData // 14 m_creatureGeosetData
// 15 m_objectEffectPackageID // 15 m_objectEffectPackageID
}; };
struct CreatureFamilyEntry struct CreatureFamilyEntry
@ -618,15 +618,15 @@ struct CreatureFamilyEntry
int32 petTalentType; // 8 m_petTalentType int32 petTalentType; // 8 m_petTalentType
// 9 m_categoryEnumID // 9 m_categoryEnumID
char* Name[16]; // 10-25 m_name_lang char* Name[16]; // 10-25 m_name_lang
// 26 string flags, unused // 26 string flags
// 27 m_iconFile unused // 27 m_iconFile
}; };
struct CreatureSpellDataEntry struct CreatureSpellDataEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
//uint32 spellId[4]; // 1-4 m_spells hunter pet learned spell (for later use) //uint32 spellId[4]; // 1-4 m_spells[4]
//uint32 availability[4]; // 4-7 m_availability //uint32 availability[4]; // 4-7 m_availability[4]
}; };
struct DurabilityCostsEntry struct DurabilityCostsEntry
@ -651,54 +651,48 @@ struct FactionEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
int32 reputationListID; // 1 m_reputationIndex int32 reputationListID; // 1 m_reputationIndex
uint32 BaseRepRaceMask[4]; // 2-5 m_reputationRaceMask Base reputation race masks (see enum Races) uint32 BaseRepRaceMask[4]; // 2-5 m_reputationRaceMask
uint32 BaseRepClassMask[4]; // 6-9 m_reputationClassMask Base reputation class masks (see enum Classes) uint32 BaseRepClassMask[4]; // 6-9 m_reputationClassMask
int32 BaseRepValue[4]; // 10-13 m_reputationBase Base reputation values int32 BaseRepValue[4]; // 10-13 m_reputationBase
uint32 ReputationFlags[4]; // 14-17 m_reputationFlags Default flags to apply uint32 ReputationFlags[4]; // 14-17 m_reputationFlags
uint32 team; // 18 m_parentFactionID enum Team uint32 team; // 18 m_parentFactionID
char* name[16]; // 19-34 m_name_lang char* name[16]; // 19-34 m_name_lang
// 35 string flags, unused // 35 string flags
//char* description[16]; // 36-51 m_description_lang unused //char* description[16]; // 36-51 m_description_lang
// 52 string flags, unused // 52 string flags
}; };
struct FactionTemplateEntry struct FactionTemplateEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
uint32 faction; // 1 m_faction uint32 faction; // 1 m_faction
uint32 factionFlags; // 2 m_flags specific flags for that faction uint32 factionFlags; // 2 m_flags
uint32 ourMask; // 3 m_factionGroup if mask set (see FactionMasks) then faction included in masked team uint32 ourMask; // 3 m_factionGroup
uint32 friendlyMask; // 4 m_friendGroup if mask set (see FactionMasks) then faction friendly to masked team uint32 friendlyMask; // 4 m_friendGroup
uint32 hostileMask; // 5 m_enemyGroup if mask set (see FactionMasks) then faction hostile to masked team uint32 hostileMask; // 5 m_enemyGroup
uint32 enemyFaction1; // 6 m_enemies[4] uint32 enemyFaction[4]; // 6 m_enemies[4]
uint32 enemyFaction2; // 7 uint32 friendFaction[4]; // 10 m_friend[4]
uint32 enemyFaction3; // 8
uint32 enemyFaction4; // 9
uint32 friendFaction1; // 10 m_friend[4]
uint32 friendFaction2; // 11
uint32 friendFaction3; // 12
uint32 friendFaction4; // 13
//------------------------------------------------------- end structure //------------------------------------------------------- end structure
// helpers // helpers
bool IsFriendlyTo(FactionTemplateEntry const& entry) const bool IsFriendlyTo(FactionTemplateEntry const& entry) const
{ {
if(enemyFaction1 == entry.faction || enemyFaction2 == entry.faction || enemyFaction3 == entry.faction || enemyFaction4 == entry.faction ) if(enemyFaction[0] == entry.faction || enemyFaction[1] == entry.faction || enemyFaction[2] == entry.faction || enemyFaction[3] == entry.faction )
return false; return false;
if(friendFaction1 == entry.faction || friendFaction2 == entry.faction || friendFaction3 == entry.faction || friendFaction4 == entry.faction ) if(friendFaction[0] == entry.faction || friendFaction[1] == entry.faction || friendFaction[2] == entry.faction || friendFaction[3] == entry.faction )
return true; return true;
return (friendlyMask & entry.ourMask) || (ourMask & entry.friendlyMask); return (friendlyMask & entry.ourMask) || (ourMask & entry.friendlyMask);
} }
bool IsHostileTo(FactionTemplateEntry const& entry) const bool IsHostileTo(FactionTemplateEntry const& entry) const
{ {
if(enemyFaction1 == entry.faction || enemyFaction2 == entry.faction || enemyFaction3 == entry.faction || enemyFaction4 == entry.faction ) if(enemyFaction[0] == entry.faction || enemyFaction[1] == entry.faction || enemyFaction[2] == entry.faction || enemyFaction[3] == entry.faction )
return true; return true;
if(friendFaction1 == entry.faction || friendFaction2 == entry.faction || friendFaction3 == entry.faction || friendFaction4 == entry.faction ) if(friendFaction[0] == entry.faction || friendFaction[1] == entry.faction || friendFaction[2] == entry.faction || friendFaction[3] == entry.faction )
return false; return false;
return (hostileMask & entry.ourMask) != 0; return (hostileMask & entry.ourMask) != 0;
} }
bool IsHostileToPlayers() const { return (hostileMask & FACTION_MASK_PLAYER) !=0; } bool IsHostileToPlayers() const { return (hostileMask & FACTION_MASK_PLAYER) !=0; }
bool IsNeutralToAll() const { return hostileMask == 0 && friendlyMask == 0 && enemyFaction1==0 && enemyFaction2==0 && enemyFaction3==0 && enemyFaction4==0; } bool IsNeutralToAll() const { return hostileMask == 0 && friendlyMask == 0 && enemyFaction[0]==0 && enemyFaction[1]==0 && enemyFaction[2]==0 && enemyFaction[3]==0; }
bool IsContestedGuardFaction() const { return (factionFlags & FACTION_TEMPLATE_FLAG_CONTESTED_GUARD)!=0; } bool IsContestedGuardFaction() const { return (factionFlags & FACTION_TEMPLATE_FLAG_CONTESTED_GUARD)!=0; }
}; };
@ -790,8 +784,18 @@ struct ItemEntry
struct ItemDisplayInfoEntry struct ItemDisplayInfoEntry
{ {
uint32 ID; uint32 ID; // 0 m_ID
uint32 randomPropertyChance; // 1 m_modelName[2]
// 2 m_modelTexture[2]
// 3 m_inventoryIcon
// 4 m_geosetGroup[3]
// 5 m_flags
// 6 m_spellVisualID
// 7 m_groupSoundIndex
// 8 m_helmetGeosetVis[2]
// 9 m_texture[2]
// 10 m_itemVisual[8]
// 11 m_particleColorID
}; };
//struct ItemCondExtCostsEntry //struct ItemCondExtCostsEntry
@ -814,19 +818,19 @@ struct ItemExtendedCostEntry
struct ItemRandomPropertiesEntry struct ItemRandomPropertiesEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
//char* internalName // 1 m_Name //char* internalName // 1 m_Name
uint32 enchant_id[5]; // 2-6 m_Enchantment uint32 enchant_id[5]; // 2-6 m_Enchantment
//char* nameSuffix[16] // 7-22 m_name_lang //char* nameSuffix[16] // 7-22 m_name_lang
// 23 nameSufix flags // 23 name flags
}; };
struct ItemRandomSuffixEntry struct ItemRandomSuffixEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
//char* name[16] // 1-16 m_name_lang unused //char* name[16] // 1-16 m_name_lang
// 17, name flags, unused // 17, name flags
// 18 m_internalName, unused // 18 m_internalName
uint32 enchant_id[5]; // 19-21 m_enchantment uint32 enchant_id[5]; // 19-21 m_enchantment
uint32 prefix[5]; // 22-24 m_allocationPct uint32 prefix[5]; // 22-24 m_allocationPct
}; };
@ -909,13 +913,18 @@ struct MapEntry
MapID==568 || MapID==309 || MapID==209 || MapID==534 || MapID==568 || MapID==309 || MapID==209 || MapID==534 ||
MapID==560 || MapID==509 || MapID==269; MapID==560 || MapID==509 || MapID==269;
} }
bool IsContinent() const
{
return MapID == 0 || MapID == 1 || MapID == 530 || MapID == 571;
}
}; };
struct QuestSortEntry struct QuestSortEntry
{ {
uint32 id; // 0, sort id uint32 id; // 0 m_ID
//char* name[16]; // 1-16, unused //char* name[16]; // 1-16 m_SortName_lang
// 17 name flags, unused // 17 name flags
}; };
struct RandomPropertiesPointsEntry struct RandomPropertiesPointsEntry
@ -969,15 +978,15 @@ struct ScalingStatValuesEntry
struct SkillLineEntry struct SkillLineEntry
{ {
uint32 id; // 0 m_ID uint32 id; // 0 m_ID
int32 categoryId; // 1 m_categoryID (index from SkillLineCategory.dbc) int32 categoryId; // 1 m_categoryID
//uint32 skillCostID; // 2 m_skillCostsID not used //uint32 skillCostID; // 2 m_skillCostsID
char* name[16]; // 3-18 m_displayName_lang char* name[16]; // 3-18 m_displayName_lang
// 19 string flags, not used // 19 string flags
//char* description[16]; // 20-35 m_description_lang, not used //char* description[16]; // 20-35 m_description_lang
// 36 string flags, not used // 36 string flags
uint32 spellIcon; // 37 m_spellIconID uint32 spellIcon; // 37 m_spellIconID
//char* alternateVerb[16]; // 38-53 m_alternateVerb_lang //char* alternateVerb[16]; // 38-53 m_alternateVerb_lang
// 54 string flags, not used // 54 string flags
// 55 m_canLink // 55 m_canLink
}; };
@ -995,7 +1004,7 @@ struct SkillLineAbilityEntry
uint32 learnOnGetSkill; // 9 m_acquireMethod uint32 learnOnGetSkill; // 9 m_acquireMethod
uint32 max_value; // 10 m_trivialSkillLineRankHigh uint32 max_value; // 10 m_trivialSkillLineRankHigh
uint32 min_value; // 11 m_trivialSkillLineRankLow uint32 min_value; // 11 m_trivialSkillLineRankLow
//uint32 characterPoints[2]; // 12-13 m_characterPoints //uint32 characterPoints[2]; // 12-13 m_characterPoints[2]
}; };
struct SoundEntriesEntry struct SoundEntriesEntry
@ -1003,8 +1012,8 @@ struct SoundEntriesEntry
uint32 Id; // 0 m_ID uint32 Id; // 0 m_ID
//uint32 Type; // 1 m_soundType //uint32 Type; // 1 m_soundType
//char* InternalName; // 2 m_name //char* InternalName; // 2 m_name
//char* FileName[10]; // 3-12 m_File //char* FileName[10]; // 3-12 m_File[10]
//uint32 Unk13[10]; // 13-22 m_Freq //uint32 Unk13[10]; // 13-22 m_Freq[10]
//char* Path; // 23 m_DirectoryBase //char* Path; // 23 m_DirectoryBase
// 24 m_volumeFloat // 24 m_volumeFloat
// 25 m_flags // 25 m_flags
@ -1210,29 +1219,31 @@ struct SpellDurationEntry
struct SpellItemEnchantmentEntry struct SpellItemEnchantmentEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
//uint32 charges; // 1 m_charges //uint32 charges; // 1 m_charges
uint32 type[3]; // 2-4 m_effect uint32 type[3]; // 2-4 m_effect[3]
uint32 amount[3]; // 5-7 m_effectPointsMin uint32 amount[3]; // 5-7 m_effectPointsMin[3]
//uint32 amount2[3] // 8-10 m_effectPointsMax //uint32 amount2[3] // 8-10 m_effectPointsMax[3]
uint32 spellid[3]; // 11-13 m_effectArg uint32 spellid[3]; // 11-13 m_effectArg[3]
char* description[16]; // 14-30 m_name_lang char* description[16]; // 14-30 m_name_lang[16]
//uint32 descriptionFlags; // 31 name flags //uint32 descriptionFlags; // 31 name flags
uint32 aura_id; // 32 m_itemVisual uint32 aura_id; // 32 m_itemVisual
uint32 slot; // 33 m_flags uint32 slot; // 33 m_flags
uint32 GemID; // 34 m_src_itemID uint32 GemID; // 34 m_src_itemID
uint32 EnchantmentCondition; // 35 m_condition_id uint32 EnchantmentCondition; // 35 m_condition_id
//uint32 requiredSkill; // 36 m_requiredSkillID //uint32 requiredSkill; // 36 m_requiredSkillID
//uint32 requiredSkillValue; // 37 m_requiredSkillRank //uint32 requiredSkillValue; // 37 m_requiredSkillRank
}; };
struct SpellItemEnchantmentConditionEntry struct SpellItemEnchantmentConditionEntry
{ {
uint32 ID; uint32 ID; // 0 m_ID
uint8 Color[5]; uint8 Color[5]; // 1-5 m_lt_operandType[5]
uint8 Comparator[5]; //uint32 LT_Operand[5]; // 6-10 m_lt_operand[5]
uint8 CompareColor[5]; uint8 Comparator[5]; // 11-15 m_operator[5]
uint32 Value[5]; uint8 CompareColor[5]; // 15-20 m_rt_operandType[5]
uint32 Value[5]; // 21-25 m_rt_operand[5]
//uint8 Logic[5] // 25-30 m_logic[5]
}; };
struct StableSlotPricesEntry struct StableSlotPricesEntry
@ -1284,38 +1295,37 @@ struct TalentTabEntry
struct TaxiNodesEntry struct TaxiNodesEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
uint32 map_id; // 1 m_ContinentID uint32 map_id; // 1 m_ContinentID
float x; // 2 m_x float x; // 2 m_x
float y; // 3 m_y float y; // 3 m_y
float z; // 4 m_z float z; // 4 m_z
//char* name[16]; // 5-21 m_Name_lang //char* name[16]; // 5-21 m_Name_lang
// 22 string flags, unused // 22 string flags
uint32 horde_mount_type; // 23 m_MountCreatureID[2] uint32 MountCreatureID[2]; // 23-24 m_MountCreatureID[2]
uint32 alliance_mount_type; // 24
}; };
struct TaxiPathEntry struct TaxiPathEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
uint32 from; // 1 m_FromTaxiNode uint32 from; // 1 m_FromTaxiNode
uint32 to; // 2 m_ToTaxiNode uint32 to; // 2 m_ToTaxiNode
uint32 price; // 3 m_Cost uint32 price; // 3 m_Cost
}; };
struct TaxiPathNodeEntry struct TaxiPathNodeEntry
{ {
// 0 m_ID // 0 m_ID
uint32 path; // 1 m_PathID uint32 path; // 1 m_PathID
uint32 index; // 2 m_NodeIndex uint32 index; // 2 m_NodeIndex
uint32 mapid; // 3 m_ContinentID uint32 mapid; // 3 m_ContinentID
float x; // 4 m_LocX float x; // 4 m_LocX
float y; // 5 m_LocY float y; // 5 m_LocY
float z; // 6 m_LocZ float z; // 6 m_LocZ
uint32 actionFlag; // 7 m_flags uint32 actionFlag; // 7 m_flags
uint32 delay; // 8 m_delay uint32 delay; // 8 m_delay
// 9 m_arrivalEventID // 9 m_arrivalEventID
// 10 m_departureEventID // 10 m_departureEventID
}; };
struct TotemCategoryEntry struct TotemCategoryEntry

2
src/shared/Database/DBCfmt.cpp
View file

@ -21,7 +21,7 @@ const char AchievementCriteriafmt[]="niiiiiiiixxxxxxxxxxxxxxxxxiixix";
const char AreaTableEntryfmt[]="iiinixxxxxissssssssssssssssxixxxxxxx"; const char AreaTableEntryfmt[]="iiinixxxxxissssssssssssssssxixxxxxxx";
const char AreaTriggerEntryfmt[]="niffffffff"; const char AreaTriggerEntryfmt[]="niffffffff";
const char BankBagSlotPricesEntryfmt[]="ni"; const char BankBagSlotPricesEntryfmt[]="ni";
const char BarberShopStyleEntryfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxi"; const char BarberShopStyleEntryfmt[]="nixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiii";
const char BattlemasterListEntryfmt[]="niiiiiiiiiiiixxxssssssssssssssssxx"; const char BattlemasterListEntryfmt[]="niiiiiiiiiiiixxxssssssssssssssssxx";
const char CharTitlesEntryfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxi"; const char CharTitlesEntryfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxi";
const char ChatChannelsEntryfmt[]="iixssssssssssssssssxxxxxxxxxxxxxxxxxx"; const char ChatChannelsEntryfmt[]="iixssssssssssssssssxxxxxxxxxxxxxxxxxx";