aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp161
1 files changed, 84 insertions, 77 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 3b731ef2519..d2bae6f7959 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -413,19 +413,19 @@ void ObjectMgr::LoadCreatureTemplates()
// 0 1 2 3 4 5 6 7 8
QueryResult result = WorldDatabase.Query("SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, "
- // 9 10 11 12 13 14 15 16 17 18 19 20 21 22
- "modelid4, name, femaleName, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, exp_unk, faction, npcflag, speed_walk, speed_run, "
- // 23 24 25 26 27 28 29 30 31 32
- "scale, rank, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, "
- // 33 34 35 36 37 38
- "dynamicflags, family, trainer_type, trainer_class, trainer_race, type, "
- // 39 40 41 42 43 44 45 46 47 48 49
+ // 9 10 11 12 13 14 15 16 17 18 19 20
+ "modelid4, name, femaleName, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, HealthScalingExpansion, RequiredExpansion, VignetteID, "
+ // 21 22 23 24 25 26 27 28 29 30 31
+ "faction, npcflag, speed_walk, speed_run, scale, rank, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, "
+ // 32 33 34 35 36 37 38 39 40
+ "unit_class, unit_flags, unit_flags2, dynamicflags, family, trainer_type, trainer_class, trainer_race, type, "
+ // 41 42 43 44 45 46 47 48 49 50 51
"type_flags, type_flags2, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, "
- // 50 51 52 53 54 55 56 57 58 59 60 61 62
+ // 52 53 54 55 56 57 58 59 60 61 62 63 64
"spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, VehicleId, mingold, maxgold, AIName, MovementType, "
- // 63 64 65 66 67 68 69 70 71
+ // 65 66 67 68 69 70 71 72 73
"InhabitType, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, "
- // 72 73 74 75 76 77
+ // 74 75 76 77 78 79
"RacialLeader, movementId, RegenHealth, mechanic_immune_mask, flags_extra, ScriptName FROM creature_template");
if (!result)
@@ -463,74 +463,75 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields)
creatureTemplate.DifficultyEntry[i] = fields[1 + i].GetUInt32();
for (uint8 i = 0; i < MAX_KILL_CREDIT; ++i)
- creatureTemplate.KillCredit[i] = fields[4 + i].GetUInt32();
-
- creatureTemplate.Modelid1 = fields[6].GetUInt32();
- creatureTemplate.Modelid2 = fields[7].GetUInt32();
- creatureTemplate.Modelid3 = fields[8].GetUInt32();
- creatureTemplate.Modelid4 = fields[9].GetUInt32();
- creatureTemplate.Name = fields[10].GetString();
- creatureTemplate.FemaleName = fields[11].GetString();
- creatureTemplate.SubName = fields[12].GetString();
- creatureTemplate.IconName = fields[13].GetString();
- creatureTemplate.GossipMenuId = fields[14].GetUInt32();
- creatureTemplate.minlevel = fields[15].GetInt16();
- creatureTemplate.maxlevel = fields[16].GetInt16();
- creatureTemplate.expansion = fields[17].GetInt16();
- creatureTemplate.expansionUnknown = fields[18].GetUInt16();
- creatureTemplate.faction = fields[19].GetUInt16();
- creatureTemplate.npcflag = fields[20].GetUInt64();
- creatureTemplate.speed_walk = fields[21].GetFloat();
- creatureTemplate.speed_run = fields[22].GetFloat();
- creatureTemplate.scale = fields[23].GetFloat();
- creatureTemplate.rank = uint32(fields[24].GetUInt8());
- creatureTemplate.dmgschool = uint32(fields[25].GetInt8());
- creatureTemplate.BaseAttackTime = fields[26].GetUInt32();
- creatureTemplate.RangeAttackTime = fields[27].GetUInt32();
- creatureTemplate.BaseVariance = fields[28].GetFloat();
- creatureTemplate.RangeVariance = fields[29].GetFloat();
- creatureTemplate.unit_class = uint32(fields[30].GetUInt8());
- creatureTemplate.unit_flags = fields[31].GetUInt32();
- creatureTemplate.unit_flags2 = fields[32].GetUInt32();
- creatureTemplate.dynamicflags = fields[33].GetUInt32();
- creatureTemplate.family = uint32(fields[34].GetUInt8());
- creatureTemplate.trainer_type = uint32(fields[35].GetUInt8());
- creatureTemplate.trainer_class = uint32(fields[36].GetUInt8());
- creatureTemplate.trainer_race = uint32(fields[37].GetUInt8());
- creatureTemplate.type = uint32(fields[38].GetUInt8());
- creatureTemplate.type_flags = fields[39].GetUInt32();
- creatureTemplate.type_flags2 = fields[40].GetUInt32();
- creatureTemplate.lootid = fields[41].GetUInt32();
- creatureTemplate.pickpocketLootId = fields[42].GetUInt32();
- creatureTemplate.SkinLootId = fields[43].GetUInt32();
+ creatureTemplate.KillCredit[i] = fields[4 + i].GetUInt32();
+
+ creatureTemplate.Modelid1 = fields[6].GetUInt32();
+ creatureTemplate.Modelid2 = fields[7].GetUInt32();
+ creatureTemplate.Modelid3 = fields[8].GetUInt32();
+ creatureTemplate.Modelid4 = fields[9].GetUInt32();
+ creatureTemplate.Name = fields[10].GetString();
+ creatureTemplate.FemaleName = fields[11].GetString();
+ creatureTemplate.SubName = fields[12].GetString();
+ creatureTemplate.IconName = fields[13].GetString();
+ creatureTemplate.GossipMenuId = fields[14].GetUInt32();
+ creatureTemplate.minlevel = fields[15].GetInt16();
+ creatureTemplate.maxlevel = fields[16].GetInt16();
+ creatureTemplate.expansion = fields[17].GetInt16();
+ creatureTemplate.HealthScalingExpansion = fields[18].GetUInt32();
+ creatureTemplate.RequiredExpansion = fields[19].GetUInt32();
+ creatureTemplate.VignetteID = fields[20].GetUInt32();
+ creatureTemplate.faction = fields[21].GetUInt16();
+ creatureTemplate.npcflag = fields[22].GetUInt64();
+ creatureTemplate.speed_walk = fields[23].GetFloat();
+ creatureTemplate.speed_run = fields[24].GetFloat();
+ creatureTemplate.scale = fields[25].GetFloat();
+ creatureTemplate.rank = uint32(fields[26].GetUInt8());
+ creatureTemplate.dmgschool = uint32(fields[27].GetInt8());
+ creatureTemplate.BaseAttackTime = fields[28].GetUInt32();
+ creatureTemplate.RangeAttackTime = fields[29].GetUInt32();
+ creatureTemplate.BaseVariance = fields[30].GetFloat();
+ creatureTemplate.RangeVariance = fields[31].GetFloat();
+ creatureTemplate.unit_class = uint32(fields[32].GetUInt8());
+ creatureTemplate.unit_flags = fields[33].GetUInt32();
+ creatureTemplate.unit_flags2 = fields[34].GetUInt32();
+ creatureTemplate.dynamicflags = fields[35].GetUInt32();
+ creatureTemplate.family = uint32(fields[36].GetUInt8());
+ creatureTemplate.trainer_type = uint32(fields[37].GetUInt8());
+ creatureTemplate.trainer_class = uint32(fields[38].GetUInt8());
+ creatureTemplate.trainer_race = uint32(fields[39].GetUInt8());
+ creatureTemplate.type = uint32(fields[40].GetUInt8());
+ creatureTemplate.type_flags = fields[42].GetUInt32();
+ creatureTemplate.type_flags2 = fields[43].GetUInt32();
+ creatureTemplate.lootid = fields[44].GetUInt32();
+ creatureTemplate.pickpocketLootId = fields[45].GetUInt32();
+ creatureTemplate.SkinLootId = fields[46].GetUInt32();
for (uint8 i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
- creatureTemplate.resistance[i] = fields[44 + i - 1].GetInt16();
+ creatureTemplate.resistance[i] = fields[47 + i - 1].GetInt16();
for (uint8 i = 0; i < CREATURE_MAX_SPELLS; ++i)
- creatureTemplate.spells[i] = fields[50 + i].GetUInt32();
-
- creatureTemplate.VehicleId = fields[58].GetUInt32();
- creatureTemplate.mingold = fields[59].GetUInt32();
- creatureTemplate.maxgold = fields[60].GetUInt32();
- creatureTemplate.AIName = fields[61].GetString();
- creatureTemplate.MovementType = uint32(fields[62].GetUInt8());
- creatureTemplate.InhabitType = uint32(fields[63].GetUInt8());
- creatureTemplate.HoverHeight = fields[64].GetFloat();
- creatureTemplate.ModHealth = fields[65].GetFloat();
- creatureTemplate.ModHealthExtra = fields[66].GetFloat();
- creatureTemplate.ModMana = fields[67].GetFloat();
- creatureTemplate.ModManaExtra = fields[68].GetFloat();
- creatureTemplate.ModArmor = fields[69].GetFloat();
- creatureTemplate.ModDamage = fields[70].GetFloat();
- creatureTemplate.ModExperience = fields[71].GetFloat();
- creatureTemplate.RacialLeader = fields[72].GetBool();
-
- creatureTemplate.movementId = fields[73].GetUInt32();
- creatureTemplate.RegenHealth = fields[74].GetBool();
- creatureTemplate.MechanicImmuneMask = fields[75].GetUInt32();
- creatureTemplate.flags_extra = fields[76].GetUInt32();
- creatureTemplate.ScriptID = GetScriptId(fields[77].GetString());
+ creatureTemplate.spells[i] = fields[52 + i].GetUInt32();
+
+ creatureTemplate.VehicleId = fields[60].GetUInt32();
+ creatureTemplate.mingold = fields[61].GetUInt32();
+ creatureTemplate.maxgold = fields[62].GetUInt32();
+ creatureTemplate.AIName = fields[63].GetString();
+ creatureTemplate.MovementType = uint32(fields[64].GetUInt8());
+ creatureTemplate.InhabitType = uint32(fields[65].GetUInt8());
+ creatureTemplate.HoverHeight = fields[66].GetFloat();
+ creatureTemplate.ModHealth = fields[67].GetFloat();
+ creatureTemplate.ModHealthExtra = fields[68].GetFloat();
+ creatureTemplate.ModMana = fields[69].GetFloat();
+ creatureTemplate.ModManaExtra = fields[70].GetFloat();
+ creatureTemplate.ModArmor = fields[71].GetFloat();
+ creatureTemplate.ModDamage = fields[72].GetFloat();
+ creatureTemplate.ModExperience = fields[73].GetFloat();
+ creatureTemplate.RacialLeader = fields[74].GetBool();
+ creatureTemplate.movementId = fields[75].GetUInt32();
+ creatureTemplate.RegenHealth = fields[76].GetBool();
+ creatureTemplate.MechanicImmuneMask = fields[77].GetUInt32();
+ creatureTemplate.flags_extra = fields[78].GetUInt32();
+ creatureTemplate.ScriptID = GetScriptId(fields[79].GetString());
}
void ObjectMgr::LoadCreatureTemplateAddons()
@@ -947,10 +948,16 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
const_cast<CreatureTemplate*>(cInfo)->expansion = 0;
}
- if (cInfo->expansionUnknown > MAX_EXPANSIONS)
+ if (cInfo->HealthScalingExpansion > MAX_EXPANSIONS)
{
- TC_LOG_ERROR("sql.sql", "Table `creature_template` lists creature (Entry: %u) with `exp_unk` %u. Ignored and set to 0.", cInfo->Entry, cInfo->expansionUnknown);
- const_cast<CreatureTemplate*>(cInfo)->expansionUnknown = 0;
+ TC_LOG_ERROR("sql.sql", "Table `creature_template` lists creature (Entry: %u) with `HealthScalingExpansion` %u. Ignored and set to 0.", cInfo->Entry, cInfo->RequiredExpansion);
+ const_cast<CreatureTemplate*>(cInfo)->RequiredExpansion = 0;
+ }
+
+ if (cInfo->RequiredExpansion > MAX_EXPANSIONS)
+ {
+ TC_LOG_ERROR("sql.sql", "Table `creature_template` lists creature (Entry: %u) with `RequiredExpansion` %u. Ignored and set to 0.", cInfo->Entry, cInfo->RequiredExpansion);
+ const_cast<CreatureTemplate*>(cInfo)->RequiredExpansion = 0;
}
if (uint32 badFlags = (cInfo->flags_extra & ~CREATURE_FLAG_EXTRA_DB_ALLOWED))