Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: Allow using walk when chasing v2 (#23073)

Browse Source 
* Allow walk when chasing
This commit is contained in:
Sorikoff
2019-03-02 14:04:01 +00:00
committed by Giacomo Pozzoni
parent 91c0bc966a
commit dbadb6369c
10 changed files with 78 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/updates/world/3.3.5/2019_03_02_00_world.sql Normal file
View File

@@ -0,0 +1,7 @@
ALTER TABLE `creature_template_movement` ADD `Chase` tinyint(3) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `creature_movement_override` ADD `Chase` tinyint(3) UNSIGNED NOT NULL DEFAULT '0';
DELETE FROM `creature_template_movement` WHERE `CreatureID` IN (20064,28654);
INSERT INTO `creature_template_movement` (`CreatureID`,`Ground`,`Swim`,`Flight`,`Rooted`,`Chase`) VALUES
(20064,1,0,0,0,2),
(28654,1,0,0,0,2);

4
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -57,12 +57,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";

15
src/server/game/Entities/Creature/CreatureData.h
View File

@@ -93,20 +93,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;
};

45
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -371,9 +371,9 @@ void ObjectMgr::LoadCreatureTemplates()
"dynamicflags, family, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, "
// 44 45 46 47 48 49 50 51 52 53 54 55 56 57
"spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, "
// 58 59 60 61 62 63 64 65 66
"ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, "
// 67 68 69 70 71 72 73 74
// 58 59 60 61 62 63 64 65 66 67
"ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, "
// 68 69 70 71 72 73 74 75
"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");
@@ -467,20 +467,23 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields)
if (!fields[61].IsNull())
creatureTemplate.Movement.Rooted = fields[61].GetBool();
creatureTemplate.HoverHeight = fields[62].GetFloat();
creatureTemplate.ModHealth = fields[63].GetFloat();
creatureTemplate.ModMana = fields[64].GetFloat();
creatureTemplate.ModArmor = fields[65].GetFloat();
creatureTemplate.ModDamage = fields[66].GetFloat();
creatureTemplate.ModExperience = fields[67].GetFloat();
creatureTemplate.RacialLeader = fields[68].GetBool();
if (!fields[62].IsNull())
creatureTemplate.Movement.Chase = static_cast<CreatureChaseMovementType>(fields[62].GetUInt8());
creatureTemplate.movementId = fields[69].GetUInt32();
creatureTemplate.RegenHealth = fields[70].GetBool();
creatureTemplate.MechanicImmuneMask = fields[71].GetUInt32();
creatureTemplate.SpellSchoolImmuneMask = fields[72].GetUInt32();
creatureTemplate.flags_extra = fields[73].GetUInt32();
creatureTemplate.ScriptID = GetScriptId(fields[74].GetString());
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());
}
void ObjectMgr::LoadCreatureTemplateAddons()
@@ -985,6 +988,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()
@@ -1281,7 +1291,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!");
@@ -1303,6 +1313,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);
}

4
src/server/game/Movement/MotionMaster.cpp
View File

@@ -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()

2
src/server/game/Movement/MotionMaster.h
View File

@@ -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();

27
src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
View File

@@ -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();

3
src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h
View File

@@ -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;

2
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
View File

@@ -671,7 +671,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:

9
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -908,15 +908,6 @@ class boss_thaladred_the_darkener : public CreatureScript
advisorbase_ai::Reset();
}
void AttackStart(Unit* who) override
{
if (!who || _inFakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
return;
if (me->Attack(who, true))
me->GetMotionMaster()->MoveChase(who, {}, {}, true);
}
void JustEngagedWith(Unit* who) override
{
Talk(SAY_THALADRED_AGGRO);