diff options
Diffstat (limited to 'src')
10 files changed, 79 insertions, 48 deletions
diff --git a/src/server/database/Database/Implementation/WorldDatabase.cpp b/src/server/database/Database/Implementation/WorldDatabase.cpp index 1328fd83589..3148958fa7d 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, name, femaleName, subname, TitleAlt, IconName, gossip_menu_id, minlevel, maxlevel, HealthScalingExpansion, RequiredExpansion, VignetteID, faction, npcflag, speed_walk, speed_run, scale, `rank`, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, unit_flags3, dynamicflags, family, trainer_class, type, type_flags, type_flags2, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, CreatureDifficultyID, WidgetSetID, WidgetSetUnitConditionID, 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 = ? OR 1 = ?", CONNECTION_SYNCH); + PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, name, femaleName, subname, TitleAlt, IconName, gossip_menu_id, minlevel, maxlevel, HealthScalingExpansion, RequiredExpansion, VignetteID, faction, npcflag, speed_walk, speed_run, scale, `rank`, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, unit_flags3, dynamicflags, family, trainer_class, type, type_flags, type_flags2, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, CreatureDifficultyID, WidgetSetID, WidgetSetUnitConditionID, 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 = ? OR 1 = ?", 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_CREATURE_BY_ID, "SELECT guid FROM creature WHERE id = ?", CONNECTION_SYNCH); PrepareStatement(WORLD_SEL_GAMEOBJECT_NEAREST, "SELECT guid, id, position_x, position_y, position_z, map, (POW(position_x - ?, 2) + POW(position_y - ?, 2) + POW(position_z - ?, 2)) AS order_ FROM gameobject WHERE map = ? AND (POW(position_x - ?, 2) + POW(position_y - ?, 2) + POW(position_z - ?, 2)) <= ? ORDER BY order_", CONNECTION_SYNCH); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 43c62422e00..3f66428e474 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -60,12 +60,14 @@ std::string CreatureMovementData::ToString() const { char const* const GroundStates[] = { "None", "Run", "Hover" }; char const* const FlightStates[] = { "None", "DisableGravity", "CanFly" }; + char const* const ChaseStates[] = { "Run", "CanWalk", "AlwaysWalk" }; std::ostringstream str; str << std::boolalpha << "Ground: " << GroundStates[AsUnderlyingType(Ground)] << ", Swim: " << Swim - << ", Flight: " << FlightStates[AsUnderlyingType(Flight)]; + << ", Flight: " << FlightStates[AsUnderlyingType(Flight)] + << ", Chase: " << ChaseStates[AsUnderlyingType(Chase)]; if (Rooted) str << ", Rooted"; diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h index 67e65cc53d2..cfcfb6f1c23 100644 --- a/src/server/game/Entities/Creature/CreatureData.h +++ b/src/server/game/Entities/Creature/CreatureData.h @@ -318,20 +318,33 @@ enum class CreatureFlightMovementType : uint8 Max }; +enum class CreatureChaseMovementType : uint8 +{ + Run, + CanWalk, + AlwaysWalk, + + Max +}; + struct TC_GAME_API CreatureMovementData { - CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None), Swim(true), Rooted(false) { } + CreatureMovementData() : Ground(CreatureGroundMovementType::Run), Flight(CreatureFlightMovementType::None), + Swim(true), Rooted(false), Chase(CreatureChaseMovementType::Run) { } CreatureGroundMovementType Ground; CreatureFlightMovementType Flight; bool Swim; bool Rooted; + CreatureChaseMovementType Chase; bool IsGroundAllowed() const { return Ground != CreatureGroundMovementType::None; } bool IsSwimAllowed() const { return Swim; } bool IsFlightAllowed() const { return Flight != CreatureFlightMovementType::None; } bool IsRooted() const { return Rooted; } + CreatureChaseMovementType GetChase() const { return Chase; } + std::string ToString() const; }; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index b921933cfdf..14619398df2 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -359,13 +359,13 @@ void ObjectMgr::LoadCreatureTemplates() // "type_flags, type_flags2, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, " // 47 48 49 50 51 52 53 54 55 56 57 58 59 // "spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, VehicleId, mingold, maxgold, AIName, MovementType, " - // 60 61 62 63 64 65 66 67 68 69 70 71 - // "ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, " - // 72 73 74 75 76 77 + // 60 61 62 63 64 65 66 67 68 69 70 71 72 + // "ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, " + // 73 74 75 76 77 78 // "RacialLeader, movementId, CreatureDifficultyID, WidgetSetID, WidgetSetUnitConditionID, RegenHealth, " - // 78 79 80 + // 79 80 81 // "mechanic_immune_mask, spell_school_immune_mask, flags_extra, " - // 81 + // 82 // "ScriptName FROM creature_template WHERE entry = ? OR 1 = ?"); WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_CREATURE_TEMPLATE); @@ -468,24 +468,27 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields) if (!fields[63].IsNull()) creatureTemplate.Movement.Rooted = fields[63].GetBool(); - 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.CreatureDifficultyID = fields[74].GetInt32(); - creatureTemplate.WidgetSetID = fields[75].GetInt32(); - creatureTemplate.WidgetSetUnitConditionID = fields[76].GetInt32(); - creatureTemplate.RegenHealth = fields[77].GetBool(); - creatureTemplate.MechanicImmuneMask = fields[78].GetUInt32(); - creatureTemplate.SpellSchoolImmuneMask = fields[79].GetUInt32(); - creatureTemplate.flags_extra = fields[80].GetUInt32(); - creatureTemplate.ScriptID = GetScriptId(fields[81].GetString()); + if (!fields[64].IsNull()) + creatureTemplate.Movement.Chase = static_cast<CreatureChaseMovementType>(fields[64].GetUInt8()); + + creatureTemplate.HoverHeight = fields[65].GetFloat(); + creatureTemplate.ModHealth = fields[66].GetFloat(); + creatureTemplate.ModHealthExtra = fields[67].GetFloat(); + creatureTemplate.ModMana = fields[68].GetFloat(); + creatureTemplate.ModManaExtra = fields[69].GetFloat(); + creatureTemplate.ModArmor = fields[70].GetFloat(); + creatureTemplate.ModDamage = fields[71].GetFloat(); + creatureTemplate.ModExperience = fields[72].GetFloat(); + creatureTemplate.RacialLeader = fields[73].GetBool(); + creatureTemplate.movementId = fields[74].GetUInt32(); + creatureTemplate.CreatureDifficultyID = fields[75].GetInt32(); + creatureTemplate.WidgetSetID = fields[76].GetInt32(); + creatureTemplate.WidgetSetUnitConditionID = fields[77].GetInt32(); + creatureTemplate.RegenHealth = fields[78].GetBool(); + creatureTemplate.MechanicImmuneMask = fields[79].GetUInt32(); + creatureTemplate.SpellSchoolImmuneMask = fields[80].GetUInt32(); + creatureTemplate.flags_extra = fields[81].GetUInt32(); + creatureTemplate.ScriptID = GetScriptId(fields[82].GetString()); } void ObjectMgr::LoadCreatureTemplateModels() @@ -1053,6 +1056,13 @@ void ObjectMgr::CheckCreatureMovement(char const* table, uint64 id, CreatureMove table, uint32(creatureMovement.Flight), id); creatureMovement.Flight = CreatureFlightMovementType::None; } + + if (creatureMovement.Chase >= CreatureChaseMovementType::Max) + { + TC_LOG_ERROR("sql.sql", "`%s`.`Chase` wrong value (%u) for Id " UI64FMTD ", setting to Run.", + table, uint32(creatureMovement.Chase), id); + creatureMovement.Chase = CreatureChaseMovementType::Run; + } } void ObjectMgr::LoadCreatureAddons() @@ -1400,7 +1410,7 @@ void ObjectMgr::LoadCreatureMovementOverrides() _creatureMovementOverrides.clear(); - QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted from creature_movement_override"); + QueryResult result = WorldDatabase.Query("SELECT SpawnId, Ground, Swim, Flight, Rooted, Chase from creature_movement_override"); if (!result) { TC_LOG_INFO("server.loading", ">> Loaded 0 creature movement overrides. DB table `creature_movement_override` is empty!"); @@ -1422,6 +1432,7 @@ void ObjectMgr::LoadCreatureMovementOverrides() 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()); CheckCreatureMovement("creature_movement_override", spawnId, movement); } diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index d690877ab02..4f8fd1345ae 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -585,14 +585,14 @@ void MotionMaster::MoveFollow(Unit* target, float dist, ChaseAngle angle, Moveme Add(new FollowMovementGenerator(target, dist, angle), slot); } -void MotionMaster::MoveChase(Unit* target, Optional<ChaseRange> dist, Optional<ChaseAngle> angle, bool walk) +void MotionMaster::MoveChase(Unit* target, Optional<ChaseRange> dist, Optional<ChaseAngle> angle) { // Ignore movement request if target not exist if (!target || target == _owner) return; TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveChase: '%s', starts chasing '%s'", _owner->GetGUID().ToString().c_str(), target->GetGUID().ToString().c_str()); - Add(new ChaseMovementGenerator(target, dist, angle, walk)); + Add(new ChaseMovementGenerator(target, dist, angle)); } void MotionMaster::MoveConfused() diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 7e213276e29..2fc2135b603 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -140,7 +140,7 @@ class TC_GAME_API MotionMaster void MoveTargetedHome(); void MoveRandom(float spawndist = 0.0f); void MoveFollow(Unit* target, float dist, ChaseAngle angle, MovementSlot slot = MOTION_SLOT_ACTIVE); - void MoveChase(Unit* target, Optional<ChaseRange> dist = {}, Optional<ChaseAngle> angle = {}, bool walk = false); + void MoveChase(Unit* target, Optional<ChaseRange> dist = {}, Optional<ChaseAngle> angle = {}); void MoveChase(Unit* target, float dist, float angle) { MoveChase(target, ChaseRange(dist), ChaseAngle(angle)); } void MoveChase(Unit* target, float dist) { MoveChase(target, ChaseRange(dist)); } void MoveConfused(); diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp index 2dd7341dfc6..b7bf75e4a7d 100644 --- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp @@ -56,9 +56,8 @@ static void DoMovementInform(Unit* owner, Unit* target) AI->MovementInform(CHASE_MOTION_TYPE, target->GetGUID().GetCounter()); } -ChaseMovementGenerator::ChaseMovementGenerator(Unit *target, Optional<ChaseRange> range, Optional<ChaseAngle> angle, - bool walk) : AbstractFollower(ASSERT_NOTNULL(target)), _range(range), - _angle(angle), _walk(walk) +ChaseMovementGenerator::ChaseMovementGenerator(Unit *target, Optional<ChaseRange> range, Optional<ChaseAngle> angle) + : AbstractFollower(ASSERT_NOTNULL(target)), _range(range), _angle(angle) { Mode = MOTION_MODE_DEFAULT; Priority = MOTION_PRIORITY_NORMAL; @@ -67,12 +66,11 @@ ChaseMovementGenerator::ChaseMovementGenerator(Unit *target, Optional<ChaseRange } ChaseMovementGenerator::~ChaseMovementGenerator() = default; -void ChaseMovementGenerator::Initialize(Unit* owner) +void ChaseMovementGenerator::Initialize(Unit* /*owner*/) { RemoveFlag(MOVEMENTGENERATOR_FLAG_INITIALIZATION_PENDING | MOVEMENTGENERATOR_FLAG_DEACTIVATED); AddFlag(MOVEMENTGENERATOR_FLAG_INITIALIZED); - owner->SetWalk(_walk); _path = nullptr; _lastTargetPosition.reset(); } @@ -203,9 +201,26 @@ bool ChaseMovementGenerator::Update(Unit* owner, uint32 diff) owner->AddUnitState(UNIT_STATE_CHASE_MOVE); + bool walk = false; + if (cOwner && !cOwner->IsPet()) + { + switch (cOwner->GetMovementTemplate().GetChase()) + { + case CreatureChaseMovementType::CanWalk: + if (owner->IsWalking()) + walk = true; + break; + case CreatureChaseMovementType::AlwaysWalk: + walk = true; + break; + default: + break; + } + } + Movement::MoveSplineInit init(owner); init.MovebyPath(_path->GetPath()); - init.SetWalk(_walk); + init.SetWalk(walk); init.SetFacing(target); init.Launch(); diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h index 8991441fbae..2019d8f36e2 100644 --- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h @@ -30,7 +30,7 @@ class Unit; class ChaseMovementGenerator : public MovementGenerator, public AbstractFollower { public: - explicit ChaseMovementGenerator(Unit* target, Optional<ChaseRange> range = {}, Optional<ChaseAngle> angle = {}, bool walk = false); + explicit ChaseMovementGenerator(Unit* target, Optional<ChaseRange> range = {}, Optional<ChaseAngle> angle = {}); ~ChaseMovementGenerator(); void Initialize(Unit*) override; @@ -47,7 +47,6 @@ class ChaseMovementGenerator : public MovementGenerator, public AbstractFollower Optional<ChaseRange> const _range; Optional<ChaseAngle> const _angle; - bool _walk; std::unique_ptr<PathGenerator> _path; Optional<Position> _lastTargetPosition; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 1a9c39fa454..d23bdaded9a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -676,7 +676,7 @@ struct npc_dark_rider_of_acherus : public ScriptedAI case EVENT_START_MOVING: me->SetTarget(_horseGUID); if (Creature* horse = ObjectAccessor::GetCreature(*me, _horseGUID)) - me->GetMotionMaster()->MoveChase(horse, {}, {}, true); + me->GetMotionMaster()->MoveChase(horse); _events.ScheduleEvent(EVENT_DESPAWN_HORSE, 5s); break; case EVENT_DESPAWN_HORSE: diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 09ce00cde6c..b1507498aee 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -907,15 +907,6 @@ class boss_thaladred_the_darkener : public CreatureScript advisorbase_ai::Reset(); } - void AttackStart(Unit* who) override - { - if (!who || _inFakeDeath || me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (me->Attack(who, true)) - me->GetMotionMaster()->MoveChase(who, {}, {}, true); - } - void JustEngagedWith(Unit* who) override { Talk(SAY_THALADRED_AGGRO); |