aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/base/auth_database.sql7
-rw-r--r--sql/updates/auth/3.3.5/2018_03_08_00_auth.sql7
-rw-r--r--sql/updates/world/3.3.5/2018_03_08_11_world.sql34
-rw-r--r--src/server/database/Database/Implementation/WorldDatabase.cpp2
-rw-r--r--src/server/game/Accounts/RBAC.h1
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp50
-rw-r--r--src/server/game/Entities/Creature/Creature.h9
-rw-r--r--src/server/game/Entities/Creature/CreatureData.h37
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp111
-rw-r--r--src/server/game/Globals/ObjectMgr.h4
-rw-r--r--src/server/game/Miscellaneous/Language.h2
-rw-r--r--src/server/game/World/World.cpp3
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp2
-rw-r--r--src/server/scripts/Commands/cs_reload.cpp10
14 files changed, 232 insertions, 47 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 47e4d031439..11ff05d219c 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -820,6 +820,7 @@ INSERT INTO `rbac_linked_permissions` VALUES
(196,870),
(196,871),
(196,872),
+(196,873),
(197,232),
(197,236),
(197,237),
@@ -1714,7 +1715,8 @@ INSERT INTO `rbac_permissions` VALUES
(867,'Command: reload quest_greeting_locale'),
(870,'Command: debug threatinfo'),
(871,'Command: debug instancespawn'),
-(872,'Command: server debug');
+(872,'Command: server debug'),
+(873,'Command: reload creature_movement_override');
/*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1836,7 +1838,8 @@ INSERT INTO `updates` VALUES
('2018_01_09_00_auth.sql','A5D4EC8FCFAB4F2DCE70EDCAD1ACBFB484FD68D5','ARCHIVED','2018-01-09 00:00:00',69),
('2018_01_24_00_auth.sql','167B17D8A253D62A8112F8A7EB21C6E99CAEF1E4','ARCHIVED','2018-01-24 00:00:00',73),
('2018_02_19_00_auth.sql','80E50F9C7F1EE7BA62789EA4C4F009170B79E6C9','RELEASED','2018-02-18 19:49:37',62),
-('2018_03_06_00_auth.sql','2D71E93DF7419A30D0D21D8A80CF05698302575A','RELEASED','2018-03-06 00:00:00',0);
+('2018_03_06_00_auth.sql','2D71E93DF7419A30D0D21D8A80CF05698302575A','RELEASED','2018-03-06 00:00:00',0),
+('2018_03_08_00_auth.sql','624C58A07E0B4DDC4C1347E8BA8EFEEFD5B43DA7','RELEASED','2018-01-12 15:10:11',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/updates/auth/3.3.5/2018_03_08_00_auth.sql b/sql/updates/auth/3.3.5/2018_03_08_00_auth.sql
new file mode 100644
index 00000000000..8b0e18b1e6c
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2018_03_08_00_auth.sql
@@ -0,0 +1,7 @@
+DELETE FROM `rbac_permissions` WHERE `id` = 873;
+INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
+(873, 'Command: reload creature_movement_override');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 873;
+INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
+(196, 873);
diff --git a/sql/updates/world/3.3.5/2018_03_08_11_world.sql b/sql/updates/world/3.3.5/2018_03_08_11_world.sql
new file mode 100644
index 00000000000..73762639747
--- /dev/null
+++ b/sql/updates/world/3.3.5/2018_03_08_11_world.sql
@@ -0,0 +1,34 @@
+DROP TABLE IF EXISTS `creature_template_movement`;
+CREATE TABLE `creature_template_movement` (
+ `CreatureId` int(10) unsigned NOT NULL DEFAULT '0',
+ `Ground` tinyint(3) unsigned NOT NULL DEFAULT '1',
+ `Swim` tinyint(3) unsigned NOT NULL DEFAULT '1',
+ `Flight` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `Rooted` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`CreatureId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `creature_movement_override`;
+CREATE TABLE `creature_movement_override` (
+ `SpawnId` int(10) unsigned NOT NULL DEFAULT '0',
+ `Ground` tinyint(3) unsigned NOT NULL DEFAULT '1',
+ `Swim` tinyint(3) unsigned NOT NULL DEFAULT '1',
+ `Flight` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `Rooted` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`SpawnId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `creature_template_movement` SELECT `entry`,0,0,0,0 FROM `creature_template` WHERE `InhabitType`!=3;
+UPDATE `creature_template_movement` SET `Ground`=1 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE `InhabitType` & 1);
+UPDATE `creature_template_movement` SET `Swim`=1 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE `InhabitType` & 2);
+UPDATE `creature_template_movement` SET `Flight`=1 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE (`InhabitType` & 5) = 4);
+UPDATE `creature_template_movement` SET `Flight`=2 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE (`InhabitType` & 5) = 5);
+UPDATE `creature_template_movement` SET `Rooted`=1 WHERE `CreatureId` IN (SELECT `entry` FROM `creature_template` WHERE `InhabitType` & 8);
+
+ALTER TABLE `creature_template` DROP `InhabitType`;
+
+UPDATE `trinity_string` SET `content_default`='Movement type: %s' WHERE `entry`=11008;
+
+DELETE FROM `command` WHERE `name`='reload creature_movement_override';
+INSERT INTO `command` (`name`,`permission`,`help`) VALUES
+('reload creature_movement_override',873,'Syntax: .reload creature_movement_override\nReload creature_movement_override table.');
diff --git a/src/server/database/Database/Implementation/WorldDatabase.cpp b/src/server/database/Database/Implementation/WorldDatabase.cpp
index fcedfbb7202..40c63a0c527 100644
--- a/src/server/database/Database/Implementation/WorldDatabase.cpp
+++ b/src/server/database/Database/Implementation/WorldDatabase.cpp
@@ -78,7 +78,7 @@ void WorldDatabaseConnection::DoPrepareStatements()
PrepareStatement(WORLD_SEL_WAYPOINT_SCRIPT_ID_BY_GUID, "SELECT id FROM waypoint_scripts WHERE guid = ?", CONNECTION_SYNCH);
PrepareStatement(WORLD_DEL_CREATURE, "DELETE FROM creature WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(WORLD_SEL_COMMANDS, "SELECT name, permission, help FROM command", CONNECTION_SYNCH);
- PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction, npcflag, speed_walk, speed_run, scale, rank, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = ?", CONNECTION_SYNCH);
+ PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction, npcflag, speed_walk, speed_run, scale, rank, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName FROM creature_template ct LEFT JOIN creature_template_movement ctm ON ct.entry = ctm.CreatureId WHERE entry = ?", CONNECTION_SYNCH);
PrepareStatement(WORLD_SEL_WAYPOINT_SCRIPT_BY_ID, "SELECT guid, delay, command, datalong, datalong2, dataint, x, y, z, o FROM waypoint_scripts WHERE id = ?", CONNECTION_SYNCH);
PrepareStatement(WORLD_SEL_ITEM_TEMPLATE_BY_NAME, "SELECT entry FROM item_template WHERE name = ?", CONNECTION_SYNCH);
PrepareStatement(WORLD_SEL_CREATURE_BY_ID, "SELECT guid FROM creature WHERE id = ?", CONNECTION_SYNCH);
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index d9e5bb106d8..522ab23f330 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -778,6 +778,7 @@ enum RBACPermissions
RBAC_PERM_COMMAND_DEBUG_THREATINFO = 870,
RBAC_PERM_COMMAND_DEBUG_INSTANCESPAWN = 871,
RBAC_PERM_COMMAND_SERVER_DEBUG = 872,
+ RBAC_PERM_COMMAND_RELOAD_CREATURE_MOVEMENT_OVERRIDE = 873,
//
// IF YOU ADD NEW PERMISSIONS, ADD THEM IN MASTER BRANCH AS WELL!
//
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 9cdef4266d4..c536e24312b 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -53,6 +53,22 @@
#include "WorldPacket.h"
#include <G3D/g3dmath.h>
+std::string CreatureMovementData::ToString() const
+{
+ char const* const GroundStates[] = { "None", "Run", "Hover" };
+ char const* const FlightStates[] = { "None", "DisableGravity", "CanFly" };
+
+ std::ostringstream str;
+ str << std::boolalpha
+ << "Ground: " << GroundStates[AsUnderlyingType(Ground)]
+ << ", Swim: " << Swim
+ << ", Flight: " << FlightStates[AsUnderlyingType(Flight)];
+ if (Rooted)
+ str << ", Rooted";
+
+ return str.str();
+}
+
VendorItemCount::VendorItemCount(uint32 _item, uint32 _count)
: itemId(_item), count(_count), lastIncrementTime(GameTime::GetGameTime()) { }
@@ -610,7 +626,7 @@ bool Creature::UpdateEntry(uint32 entry, CreatureData const* data /*= nullptr*/,
ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
}
- if (cInfo->InhabitType & INHABIT_ROOT)
+ if (GetMovementTemplate().IsRooted())
SetControlled(true, UNIT_STATE_ROOT);
UpdateMovementFlags();
@@ -2454,7 +2470,7 @@ bool Creature::CanCreatureAttack(Unit const* victim, bool /*force*/) const
dist += GetCombatReach() + victim->GetCombatReach();
// to prevent creatures in air ignore attacks because distance is already too high...
- if (GetCreatureTemplate()->InhabitType & INHABIT_AIR)
+ if (GetMovementTemplate().IsFlightAllowed())
return victim->IsInDist2d(&m_homePosition, dist);
else
return victim->IsInDist(&m_homePosition, dist);
@@ -2501,7 +2517,7 @@ bool Creature::LoadCreaturesAddon()
//! Check using InhabitType as movement flags are assigned dynamically
//! basing on whether the creature is in air or not
//! Set MovementFlag_Hover. Otherwise do nothing.
- if (GetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER) & UNIT_BYTE1_FLAG_HOVER && !(GetCreatureTemplate()->InhabitType & INHABIT_AIR))
+ if (CanHover())
AddUnitMovementFlag(MOVEMENTFLAG_HOVER);
}
@@ -2612,6 +2628,14 @@ void Creature::GetRespawnPosition(float &x, float &y, float &z, float* ori, floa
}
}
+CreatureMovementData const& Creature::GetMovementTemplate() const
+{
+ if (CreatureMovementData const* movementOverride = sObjectMgr->GetCreatureMovementOverride(m_spawnId))
+ return *movementOverride;
+
+ return GetCreatureTemplate()->Movement;
+}
+
void Creature::AllLootRemovedFromCorpse()
{
if (loot.loot_type != LOOT_SKINNING && !IsPet() && GetCreatureTemplate()->SkinLootId && hasLootRecipient())
@@ -2879,12 +2903,6 @@ bool Creature::SetHover(bool enable, bool packetOnly /*= false*/)
if (!packetOnly && !Unit::SetHover(enable))
return false;
- //! Unconfirmed for players:
- if (enable)
- SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER);
- else
- RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER);
-
if (!movespline->Initialized())
return true;
@@ -2972,25 +2990,31 @@ void Creature::UpdateMovementFlags()
// Set the movement flags if the creature is in that mode. (Only fly if actually in air, only swim if in water, etc)
float ground = GetFloorZ();
- bool isInAir = (G3D::fuzzyGt(GetPositionZ(), ground + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(GetPositionZ(), ground - GROUND_HEIGHT_TOLERANCE)); // Can be underground too, prevent the falling
+ bool canHover = CanHover();
+ bool isInAir = (G3D::fuzzyGt(GetPositionZ(), ground + (canHover ? GetFloatValue(UNIT_FIELD_HOVERHEIGHT) : 0.0f) + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(GetPositionZ(), ground - GROUND_HEIGHT_TOLERANCE)); // Can be underground too, prevent the falling
- if (GetCreatureTemplate()->InhabitType & INHABIT_AIR && isInAir && !IsFalling())
+ if (GetMovementTemplate().IsFlightAllowed() && isInAir && !IsFalling())
{
- if (GetCreatureTemplate()->InhabitType & INHABIT_GROUND)
+ if (GetMovementTemplate().Flight == CreatureFlightMovementType::CanFly)
SetCanFly(true);
else
SetDisableGravity(true);
+
+ if (!HasAuraType(SPELL_AURA_HOVER))
+ SetHover(false);
}
else
{
SetCanFly(false);
SetDisableGravity(false);
+ if (CanHover() || HasAuraType(SPELL_AURA_HOVER))
+ SetHover(true);
}
if (!isInAir)
RemoveUnitMovementFlag(MOVEMENTFLAG_FALLING);
- SetSwim(GetCreatureTemplate()->InhabitType & INHABIT_WATER && IsInWater());
+ SetSwim(GetMovementTemplate().IsSwimAllowed() && IsInWater());
}
void Creature::SetObjectScale(float scale)
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 0aa74aabf58..c46e2022b01 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -91,9 +91,12 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
bool IsCivilian() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_CIVILIAN) != 0; }
bool IsTrigger() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER) != 0; }
bool IsGuard() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_GUARD) != 0; }
- bool CanWalk() const { return (GetCreatureTemplate()->InhabitType & INHABIT_GROUND) != 0; }
- bool CanSwim() const override { return (GetCreatureTemplate()->InhabitType & INHABIT_WATER) != 0 || IsPet(); }
- bool CanFly() const override { return (GetCreatureTemplate()->InhabitType & INHABIT_AIR) != 0; }
+ CreatureMovementData const& GetMovementTemplate() const;
+ bool CanWalk() const { return GetMovementTemplate().IsGroundAllowed(); }
+ bool CanSwim() const override { return GetMovementTemplate().IsSwimAllowed() || IsPet(); }
+ bool CanFly() const override { return GetMovementTemplate().IsFlightAllowed(); }
+ bool CanHover() const { return GetMovementTemplate().Ground == CreatureGroundMovementType::Hover; }
+
bool IsDungeonBoss() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_DUNGEON_BOSS) != 0; }
bool IsAffectedByDiminishingReturns() const override { return Unit::IsAffectedByDiminishingReturns() || (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH) != 0; }
diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h
index 1305a412bf4..2fc9158078a 100644
--- a/src/server/game/Entities/Creature/CreatureData.h
+++ b/src/server/game/Entities/Creature/CreatureData.h
@@ -74,6 +74,41 @@ enum CreatureFlagsExtra : uint32
CREATURE_FLAG_EXTRA_DB_ALLOWED = (0xFFFFFFFF & ~(CREATURE_FLAG_EXTRA_UNUSED | CREATURE_FLAG_EXTRA_DUNGEON_BOSS))
};
+enum class CreatureGroundMovementType : uint8
+{
+ None,
+ Run,
+ Hover,
+
+ Max
+};
+
+enum class CreatureFlightMovementType : uint8
+{
+ None,
+ DisableGravity,
+ CanFly,
+
+ Max
+};
+
+struct TC_GAME_API CreatureMovementData
+{
+ CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None), Swim(true), Rooted(false) { }
+
+ CreatureGroundMovementType Ground;
+ CreatureFlightMovementType Flight;
+ bool Swim;
+ bool Rooted;
+
+ bool IsGroundAllowed() const { return Ground != CreatureGroundMovementType::None; }
+ bool IsSwimAllowed() const { return Swim; }
+ bool IsFlightAllowed() const { return Flight != CreatureFlightMovementType::None; }
+ bool IsRooted() const { return Rooted; }
+
+ std::string ToString() const;
+};
+
static const uint32 CREATURE_REGEN_INTERVAL = 2 * IN_MILLISECONDS;
static const uint32 PET_FOCUS_REGEN_INTERVAL = 4 * IN_MILLISECONDS;
static const uint32 CREATURE_NOPATH_EVADE_TIME = 5 * IN_MILLISECONDS;
@@ -133,7 +168,7 @@ struct TC_GAME_API CreatureTemplate
uint32 maxgold;
std::string AIName;
uint32 MovementType;
- uint32 InhabitType;
+ CreatureMovementData Movement;
float HoverHeight;
float ModHealth;
float ModMana;
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 1b207d4912e..0cda1e31113 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -373,11 +373,11 @@ void ObjectMgr::LoadCreatureTemplates()
"type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, "
// 49 50 51 52 53 54 55 56 57 58 59 60 61
"spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, "
- // 62 63 64 65 66 67 68 69
- "InhabitType, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, "
- // 70 71 72 73 74 75
- "movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName "
- "FROM creature_template");
+ // 62 63 64 65 66 67 68 69 70
+ "ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, "
+ // 71 72 73 74 75 76 77 78
+ "ExperienceModifier, RacialLeader, movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName "
+ "FROM creature_template ct LEFT JOIN creature_template_movement ctm ON ct.entry = ctm.CreatureId");
if (!result)
{
@@ -461,21 +461,28 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields)
creatureTemplate.maxgold = fields[59].GetUInt32();
creatureTemplate.AIName = fields[60].GetString();
creatureTemplate.MovementType = fields[61].GetUInt8();
- creatureTemplate.InhabitType = fields[62].GetUInt8();
- creatureTemplate.HoverHeight = fields[63].GetFloat();
- creatureTemplate.ModHealth = fields[64].GetFloat();
- creatureTemplate.ModMana = fields[65].GetFloat();
- creatureTemplate.ModArmor = fields[66].GetFloat();
- creatureTemplate.ModDamage = fields[67].GetFloat();
- creatureTemplate.ModExperience = fields[68].GetFloat();
- creatureTemplate.RacialLeader = fields[69].GetBool();
-
- creatureTemplate.movementId = fields[70].GetUInt32();
- creatureTemplate.RegenHealth = fields[71].GetBool();
- creatureTemplate.MechanicImmuneMask = fields[72].GetUInt32();
- creatureTemplate.SpellSchoolImmuneMask = fields[73].GetUInt32();
- creatureTemplate.flags_extra = fields[74].GetUInt32();
- creatureTemplate.ScriptID = GetScriptId(fields[75].GetString());
+ if (!fields[62].IsNull())
+ creatureTemplate.Movement.Ground = static_cast<CreatureGroundMovementType>(fields[62].GetUInt8());
+
+ creatureTemplate.Movement.Swim = fields[63].GetBool();
+ if (!fields[64].IsNull())
+ creatureTemplate.Movement.Flight = static_cast<CreatureFlightMovementType>(fields[64].GetUInt8());
+
+ creatureTemplate.Movement.Rooted = fields[65].GetBool();
+ creatureTemplate.HoverHeight = fields[66].GetFloat();
+ creatureTemplate.ModHealth = fields[67].GetFloat();
+ creatureTemplate.ModMana = 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.SpellSchoolImmuneMask = fields[76].GetUInt32();
+ creatureTemplate.flags_extra = fields[77].GetUInt32();
+ creatureTemplate.ScriptID = GetScriptId(fields[78].GetString());
}
void ObjectMgr::LoadCreatureTemplateAddons()
@@ -929,11 +936,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
const_cast<CreatureTemplate*>(cInfo)->family = CREATURE_FAMILY_NONE;
}
- if (cInfo->InhabitType <= 0 || cInfo->InhabitType > INHABIT_ANYWHERE)
- {
- TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has wrong value (%u) in `InhabitType`, creature will not correctly walk/swim/fly.", cInfo->Entry, cInfo->InhabitType);
- const_cast<CreatureTemplate*>(cInfo)->InhabitType = INHABIT_ANYWHERE;
- }
+ CheckCreatureMovement("creature_template_movement", cInfo->Entry, const_cast<CreatureTemplate*>(cInfo)->Movement);
if (cInfo->HoverHeight < 0.0f)
{
@@ -997,6 +1000,23 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
const_cast<CreatureTemplate*>(cInfo)->ModDamage *= Creature::_GetDamageMod(cInfo->rank);
}
+void ObjectMgr::CheckCreatureMovement(char const* table, uint64 id, CreatureMovementData& creatureMovement)
+{
+ if (creatureMovement.Ground >= CreatureGroundMovementType::Max)
+ {
+ TC_LOG_ERROR("sql.sql", "`%s`.`Ground` wrong value (%u) for Id " UI64FMTD ", setting to Run.",
+ table, uint32(creatureMovement.Ground), id);
+ creatureMovement.Ground = CreatureGroundMovementType::Run;
+ }
+
+ if (creatureMovement.Flight >= CreatureFlightMovementType::Max)
+ {
+ TC_LOG_ERROR("sql.sql", "`%s`.`Flight` wrong value (%u) for Id " UI64FMTD ", setting to None.",
+ table, uint32(creatureMovement.Flight), id);
+ creatureMovement.Flight = CreatureFlightMovementType::None;
+ }
+}
+
void ObjectMgr::LoadCreatureAddons()
{
uint32 oldMSTime = getMSTime();
@@ -1169,6 +1189,11 @@ CreatureAddon const* ObjectMgr::GetCreatureTemplateAddon(uint32 entry) const
return nullptr;
}
+CreatureMovementData const* ObjectMgr::GetCreatureMovementOverride(ObjectGuid::LowType spawnId) const
+{
+ return Trinity::Containers::MapGetValuePtr(_creatureMovementOverrides, spawnId);
+}
+
EquipmentInfo const* ObjectMgr::GetEquipmentInfo(uint32 entry, int8& id) const
{
EquipmentInfoContainer::const_iterator itr = _equipmentInfoStore.find(entry);
@@ -1272,6 +1297,42 @@ void ObjectMgr::LoadEquipmentTemplates()
TC_LOG_INFO("server.loading", ">> Loaded %u equipment templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
+void ObjectMgr::LoadCreatureMovementOverrides()
+{
+ uint32 oldMSTime = getMSTime();
+
+ _creatureMovementOverrides.clear();
+
+ QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted from creature_movement_override");
+ if (!result)
+ {
+ TC_LOG_INFO("server.loading", ">> Loaded 0 creature movement overrides. DB table `creature_movement_override` is empty!");
+ return;
+ }
+
+ do
+ {
+ Field* fields = result->Fetch();
+ ObjectGuid::LowType spawnId = fields[0].GetUInt32();
+ if (!GetCreatureData(spawnId))
+ {
+ TC_LOG_ERROR("sql.sql", "Creature (GUID: %u) does not exist but has a record in `creature_movement_override`", spawnId);
+ continue;
+ }
+
+ CreatureMovementData& movement = _creatureMovementOverrides[spawnId];
+ movement.Ground = static_cast<CreatureGroundMovementType>(fields[1].GetUInt8());
+ movement.Swim = fields[2].GetBool();
+ movement.Flight = static_cast<CreatureFlightMovementType>(fields[3].GetUInt8());
+ movement.Rooted = fields[4].GetBool();
+
+ CheckCreatureMovement("creature_movement_override", spawnId, movement);
+ }
+ while (result->NextRow());
+
+ TC_LOG_INFO("server.loading", ">> Loaded " SZFMTD " movement overrides in %u ms", _creatureMovementOverrides.size(), GetMSTimeDiffToNow(oldMSTime));
+}
+
CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelId) const
{
CreatureModelContainer::const_iterator itr = _creatureModelStore.find(modelId);
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 70610ed67a1..6c5c69ad226 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -943,6 +943,7 @@ class TC_GAME_API ObjectMgr
GameObjectTemplateAddon const* GetGameObjectTemplateAddon(uint32 entry) const;
GameObjectOverride const* GetGameObjectOverride(ObjectGuid::LowType spawnId) const;
CreatureAddon const* GetCreatureTemplateAddon(uint32 entry) const;
+ CreatureMovementData const* GetCreatureMovementOverride(ObjectGuid::LowType spawnId) const;
ItemTemplate const* GetItemTemplate(uint32 entry) const;
ItemTemplateContainer const& GetItemTemplateStore() const { return _itemTemplateStore; }
@@ -1139,6 +1140,7 @@ class TC_GAME_API ObjectMgr
void LoadCreatureTemplateAddons();
void LoadCreatureTemplate(Field* fields);
void CheckCreatureTemplate(CreatureTemplate const* cInfo);
+ void CheckCreatureMovement(char const* table, uint64 id, CreatureMovementData& creatureMovement);
void LoadGameObjectQuestItems();
void LoadCreatureQuestItems();
void LoadTempSummons();
@@ -1149,6 +1151,7 @@ class TC_GAME_API ObjectMgr
void LoadGameObjectAddons();
void LoadCreatureModelInfo();
void LoadEquipmentTemplates();
+ void LoadCreatureMovementOverrides();
void LoadGameObjectLocales();
void LoadGameObjects();
void LoadSpawnGroupTemplates();
@@ -1628,6 +1631,7 @@ class TC_GAME_API ObjectMgr
CreatureModelContainer _creatureModelStore;
CreatureAddonContainer _creatureAddonStore;
CreatureTemplateAddonContainer _creatureTemplateAddonStore;
+ std::unordered_map<ObjectGuid::LowType, CreatureMovementData> _creatureMovementOverrides;
GameObjectAddonContainer _gameObjectAddonStore;
GameObjectQuestItemMap _gameObjectQuestItemStore;
CreatureQuestItemMap _creatureQuestItemStore;
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
index d11604174f3..873b2779884 100644
--- a/src/server/game/Miscellaneous/Language.h
+++ b/src/server/game/Miscellaneous/Language.h
@@ -1137,7 +1137,7 @@ enum TrinityStrings
LANG_BAN_ACCOUNT_YOUBANNEDMESSAGE_WORLD = 11006,
LANG_BAN_ACCOUNT_YOUPERMBANNEDMESSAGE_WORLD = 11007,
- LANG_NPCINFO_INHABIT_TYPE = 11008,
+ LANG_NPCINFO_MOVEMENT_DATA = 11008,
LANG_NPCINFO_FLAGS_EXTRA = 11009,
LANG_INSTANCE_LOGIN_GAMEMASTER_EXCEPTION = 11010,
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 376a430d28a..da625cb5625 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1741,6 +1741,9 @@ void World::SetInitialWorldSettings()
TC_LOG_INFO("server.loading", "Loading Creature Addon Data...");
sObjectMgr->LoadCreatureAddons(); // must be after LoadCreatureTemplates() and LoadCreatures()
+ TC_LOG_INFO("server.loading", "Loading Creature Movement Overrides...");
+ sObjectMgr->LoadCreatureMovementOverrides(); // must be after LoadCreatures()
+
TC_LOG_INFO("server.loading", "Loading Gameobject Data...");
sObjectMgr->LoadGameObjects();
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 524e07ddfed..0fb22ba7c05 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -793,7 +793,7 @@ public:
handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel());
handler->PSendSysMessage(LANG_NPCINFO_EQUIPMENT, target->GetCurrentEquipmentId(), target->GetOriginalEquipmentId());
handler->PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth());
- handler->PSendSysMessage(LANG_NPCINFO_INHABIT_TYPE, cInfo->InhabitType);
+ handler->PSendSysMessage(LANG_NPCINFO_MOVEMENT_DATA, target->GetMovementTemplate().ToString().c_str());
handler->PSendSysMessage(LANG_NPCINFO_UNIT_FIELD_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS));
for (uint8 i = 0; i < MAX_UNIT_FLAGS; ++i)
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index 53350239032..660af91ed6e 100644
--- a/src/server/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
@@ -88,6 +88,7 @@ public:
{ "creature_questender", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_QUESTENDER, true, &HandleReloadCreatureQuestEnderCommand, "" },
{ "creature_linked_respawn", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_LINKED_RESPAWN, true, &HandleReloadLinkedRespawnCommand, "" },
{ "creature_loot_template", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_LOOT_TEMPLATE, true, &HandleReloadLootTemplatesCreatureCommand, "" },
+ { "creature_movement_override", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_MOVEMENT_OVERRIDE, true, &HandleReloadCreatureMovementOverrideCommand, "" },
{ "creature_onkill_reputation", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_ONKILL_REPUTATION, true, &HandleReloadOnKillReputationCommand, "" },
{ "creature_queststarter", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_QUESTSTARTER, true, &HandleReloadCreatureQuestStarterCommand, "" },
{ "creature_summon_groups", rbac::RBAC_PERM_COMMAND_RELOAD_CREATURE_SUMMON_GROUPS, true, &HandleReloadCreatureSummonGroupsCommand, "" },
@@ -198,6 +199,7 @@ public:
HandleReloadTrinityStringCommand(handler, "");
HandleReloadGameTeleCommand(handler, "");
+ HandleReloadCreatureMovementOverrideCommand(handler, "");
HandleReloadCreatureSummonGroupsCommand(handler, "");
HandleReloadVehicleAccessoryCommand(handler, "");
@@ -567,6 +569,14 @@ public:
return true;
}
+ static bool HandleReloadCreatureMovementOverrideCommand(ChatHandler* handler, char const* /*args*/)
+ {
+ TC_LOG_INFO("misc", "Re-Loading Creature movement overrides...");
+ sObjectMgr->LoadCreatureMovementOverrides();
+ handler->SendGlobalGMSysMessage("DB table `creature_movement_override` reloaded.");
+ return true;
+ }
+
static bool HandleReloadLootTemplatesDisenchantCommand(ChatHandler* handler, char const* /*args*/)
{
TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`disenchant_loot_template`)");