aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/database/Database/Implementation/WorldDatabase.cpp2
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp4
-rw-r--r--src/server/game/Entities/Creature/CreatureData.h6
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp89
-rw-r--r--src/server/game/Handlers/BattleGroundHandler.cpp3
-rw-r--r--src/server/game/Handlers/ItemHandler.cpp3
-rw-r--r--src/server/game/Handlers/NPCHandler.cpp3
-rw-r--r--src/server/game/Handlers/QuestHandler.cpp3
8 files changed, 74 insertions, 39 deletions
diff --git a/src/server/database/Database/Implementation/WorldDatabase.cpp b/src/server/database/Database/Implementation/WorldDatabase.cpp
index 5d36783dbc2..372f64a273c 100644
--- a/src/server/database/Database/Implementation/WorldDatabase.cpp
+++ b/src/server/database/Database/Implementation/WorldDatabase.cpp
@@ -77,7 +77,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, 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, type, type_flags, lootid, pickpocketloot, skinloot, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, 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_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, type, type_flags, lootid, pickpocketloot, skinloot, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, ctm.InteractionPauseTimer, 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/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index eac1f315e0a..a6aa7ead092 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -53,6 +53,9 @@
#include "WorldPacket.h"
#include <G3D/g3dmath.h>
+CreatureMovementData::CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None), Swim(true), Rooted(false), Chase(CreatureChaseMovementType::Run),
+Random(CreatureRandomMovementType::Walk), InteractionPauseTimer(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER)) { }
+
std::string CreatureMovementData::ToString() const
{
char const* const GroundStates[] = { "None", "Run", "Hover" };
@@ -69,6 +72,7 @@ std::string CreatureMovementData::ToString() const
<< ", Random: " << RandomStates[AsUnderlyingType(Random)];
if (Rooted)
str << ", Rooted";
+ str << ", InteractionPauseTimer: " << InteractionPauseTimer;
return str.str();
}
diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h
index cc10b4dfc14..e92446d2d75 100644
--- a/src/server/game/Entities/Creature/CreatureData.h
+++ b/src/server/game/Entities/Creature/CreatureData.h
@@ -113,8 +113,7 @@ enum class CreatureRandomMovementType : uint8
struct TC_GAME_API CreatureMovementData
{
- CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None), Swim(true), Rooted(false), Chase(CreatureChaseMovementType::Run),
- Random(CreatureRandomMovementType::Walk) { }
+ CreatureMovementData();
CreatureGroundMovementType Ground;
CreatureFlightMovementType Flight;
@@ -122,6 +121,7 @@ struct TC_GAME_API CreatureMovementData
bool Rooted;
CreatureChaseMovementType Chase;
CreatureRandomMovementType Random;
+ uint32 InteractionPauseTimer;
bool IsGroundAllowed() const { return Ground != CreatureGroundMovementType::None; }
bool IsSwimAllowed() const { return Swim; }
@@ -131,6 +131,8 @@ struct TC_GAME_API CreatureMovementData
CreatureChaseMovementType GetChase() const { return Chase; }
CreatureRandomMovementType GetRandom() const { return Random; }
+ uint32 GetInteractionPauseTimer() const { return InteractionPauseTimer; }
+
std::string ToString() const;
};
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index db4a45d5011..d68a07234f3 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -468,30 +468,32 @@ void ObjectMgr::LoadCreatureTemplates()
// 49
"ctm.Random,"
// 50
- "HoverHeight,"
+ "ctm.InteractionPauseTimer,"
// 51
- "HealthModifier,"
+ "HoverHeight,"
// 52
- "ManaModifier,"
+ "HealthModifier,"
// 53
- "ArmorModifier,"
+ "ManaModifier,"
// 54
- "DamageModifier,"
+ "ArmorModifier,"
// 55
- "ExperienceModifier,"
+ "DamageModifier,"
// 56
- "RacialLeader,"
+ "ExperienceModifier,"
// 57
- "movementId,"
+ "RacialLeader,"
// 58
- "RegenHealth,"
+ "movementId,"
// 59
- "mechanic_immune_mask,"
+ "RegenHealth,"
// 60
- "spell_school_immune_mask,"
+ "mechanic_immune_mask,"
// 61
- "flags_extra,"
+ "spell_school_immune_mask,"
// 62
+ "flags_extra,"
+ // 63
"ScriptName"
" FROM creature_template ct"
" LEFT JOIN creature_template_movement ctm ON ct.entry = ctm.CreatureId");
@@ -595,20 +597,23 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields)
if (!fields[49].IsNull())
creatureTemplate.Movement.Random = static_cast<CreatureRandomMovementType>(fields[49].GetUInt8());
- creatureTemplate.HoverHeight = fields[50].GetFloat();
- creatureTemplate.ModHealth = fields[51].GetFloat();
- creatureTemplate.ModMana = fields[52].GetFloat();
- creatureTemplate.ModArmor = fields[53].GetFloat();
- creatureTemplate.ModDamage = fields[54].GetFloat();
- creatureTemplate.ModExperience = fields[55].GetFloat();
- creatureTemplate.RacialLeader = fields[56].GetBool();
+ if (!fields[50].IsNull())
+ creatureTemplate.Movement.InteractionPauseTimer = fields[50].GetUInt32();
+
+ creatureTemplate.HoverHeight = fields[51].GetFloat();
+ creatureTemplate.ModHealth = fields[52].GetFloat();
+ creatureTemplate.ModMana = fields[53].GetFloat();
+ creatureTemplate.ModArmor = fields[54].GetFloat();
+ creatureTemplate.ModDamage = fields[55].GetFloat();
+ creatureTemplate.ModExperience = fields[56].GetFloat();
+ creatureTemplate.RacialLeader = fields[57].GetBool();
- creatureTemplate.movementId = fields[57].GetUInt32();
- creatureTemplate.RegenHealth = fields[58].GetBool();
- creatureTemplate.MechanicImmuneMask = fields[59].GetUInt32();
- creatureTemplate.SpellSchoolImmuneMask = fields[60].GetUInt32();
- creatureTemplate.flags_extra = fields[61].GetUInt32();
- creatureTemplate.ScriptID = GetScriptId(fields[62].GetString());
+ creatureTemplate.movementId = fields[58].GetUInt32();
+ creatureTemplate.RegenHealth = fields[59].GetBool();
+ creatureTemplate.MechanicImmuneMask = fields[60].GetUInt32();
+ creatureTemplate.SpellSchoolImmuneMask = fields[61].GetUInt32();
+ creatureTemplate.flags_extra = fields[62].GetUInt32();
+ creatureTemplate.ScriptID = GetScriptId(fields[63].GetString());
}
void ObjectMgr::LoadCreatureTemplateResistances()
@@ -1531,7 +1536,19 @@ void ObjectMgr::LoadCreatureMovementOverrides()
_creatureMovementOverrides.clear();
- QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted, Chase, Random from creature_movement_override");
+ // Load the data from creature_movement_override and if NULL fallback to creature_template_movement
+ QueryResult result = WorldDatabase.Query(
+ "SELECT cmo.SpawnId,"
+ "COALESCE(cmo.Ground, ctm.Ground),"
+ "COALESCE(cmo.Swim, ctm.Swim),"
+ "COALESCE(cmo.Flight, ctm.Flight),"
+ "COALESCE(cmo.Rooted, ctm.Rooted),"
+ "COALESCE(cmo.Chase, ctm.Chase),"
+ "COALESCE(cmo.Random, ctm.Random),"
+ "COALESCE(cmo.InteractionPauseTimer, ctm.InteractionPauseTimer) "
+ "FROM creature_movement_override AS cmo "
+ "LEFT JOIN creature AS c ON c.guid = cmo.SpawnId "
+ "LEFT JOIN creature_template_movement AS ctm ON ctm.CreatureId = c.id");
if (!result)
{
@@ -1550,12 +1567,20 @@ void ObjectMgr::LoadCreatureMovementOverrides()
}
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();
- movement.Chase = static_cast<CreatureChaseMovementType>(fields[5].GetUInt8());
- movement.Random = static_cast<CreatureRandomMovementType>(fields[6].GetUInt8());
+ if (!fields[1].IsNull())
+ movement.Ground = static_cast<CreatureGroundMovementType>(fields[1].GetUInt8());
+ if (!fields[2].IsNull())
+ movement.Swim = fields[2].GetBool();
+ if (!fields[3].IsNull())
+ movement.Flight = static_cast<CreatureFlightMovementType>(fields[3].GetUInt8());
+ if (!fields[4].IsNull())
+ movement.Rooted = fields[4].GetBool();
+ if (!fields[5].IsNull())
+ movement.Chase = static_cast<CreatureChaseMovementType>(fields[5].GetUInt8());
+ if (!fields[6].IsNull())
+ movement.Random = static_cast<CreatureRandomMovementType>(fields[6].GetUInt8());
+ if (!fields[7].IsNull())
+ movement.InteractionPauseTimer = fields[7].GetUInt32();
CheckCreatureMovement("creature_movement_override", spawnId, movement);
}
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index 9245c22ec61..33e25bd0d10 100644
--- a/src/server/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -49,7 +49,8 @@ void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recvData)
return;
// Stop the npc if moving
- unit->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
+ if (uint32 pause = unit->GetMovementTemplate().GetInteractionPauseTimer())
+ unit->PauseMovement(pause);
unit->SetHomePosition(unit->GetPosition());
BattlegroundTypeId bgTypeId = sBattlegroundMgr->GetBattleMasterBG(unit->GetEntry());
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index b813798b219..be942a06389 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -619,7 +619,8 @@ void WorldSession::SendListInventory(ObjectGuid vendorGuid)
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
// Stop the npc if moving
- vendor->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
+ if (uint32 pause = vendor->GetMovementTemplate().GetInteractionPauseTimer())
+ vendor->PauseMovement(pause);
vendor->SetHomePosition(vendor->GetPosition());
VendorItemData const* items = vendor->GetVendorItems();
diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp
index 75e7899a2c5..c171df8b9ec 100644
--- a/src/server/game/Handlers/NPCHandler.cpp
+++ b/src/server/game/Handlers/NPCHandler.cpp
@@ -165,7 +165,8 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket& recvData)
// GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
// Stop the npc if moving
- unit->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
+ if (uint32 pause = unit->GetMovementTemplate().GetInteractionPauseTimer())
+ unit->PauseMovement(pause);
unit->SetHomePosition(unit->GetPosition());
// If spiritguide, no need for gossip menu, just put player into resurrect queue
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index 3f928edaf33..cec47df7ed1 100644
--- a/src/server/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
@@ -92,7 +92,8 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket& recvData)
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
// Stop the npc if moving
- creature->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
+ if (uint32 pause = creature->GetMovementTemplate().GetInteractionPauseTimer())
+ creature->PauseMovement(pause);
creature->SetHomePosition(creature->GetPosition());
_player->PlayerTalkClass->ClearMenus();