nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-23 13:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Creature): Creatures will periodically call for assistance. (#5065)

Browse Source
This commit is contained in:
Chero
2021-05-27 13:42:48 +02:00
committed by GitHub
parent 7f90f41ba6
commit 2ae84e2faf
6 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,7 +169,7 @@ Creature::Creature(bool isWorldObject): Unit(isWorldObject), MovableMapObject(),
m_spawnId(0), m_equipmentId(0), m_originalEquipmentId(0), m_originalAnimTier(UNIT_BYTE1_FLAG_GROUND), m_AlreadyCallAssistance(false),
m_AlreadySearchedAssistance(false), m_regenHealth(true), m_AI_locked(false), m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_originalEntry(0), m_moveInLineOfSightDisabled(false), m_moveInLineOfSightStrictlyDisabled(false),
m_homePosition(), m_transportHomePosition(), m_creatureInfo(nullptr), m_creatureData(nullptr), m_waypointID(0), m_path_id(0), m_formation(nullptr), _lastDamagedTime(nullptr), m_cannotReachTarget(false), m_cannotReachTimer(0),
_isMissingSwimmingFlagOutOfCombat(false)
_isMissingSwimmingFlagOutOfCombat(false), m_assistanceTimer(0)
{
m_regenTimer = CREATURE_REGEN_INTERVAL;
m_valuesCount = UNIT_END;
@@ -656,6 +656,24 @@ void Creature::Update(uint32 diff)
}
}
// Call for assistance if not disabled
if (m_assistanceTimer)
{
if (m_assistanceTimer <= diff)
{
if (CanPeriodicallyCallForAssistance())
{
SetNoCallAssistance(false);
CallAssistance();
}
m_assistanceTimer = sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_PERIOD);
}
else
{
m_assistanceTimer -= diff;
}
}
if (!IsInEvadeMode() && IsAIEnabled)
{
// do not allow the AI to be changed during update
@@ -3237,3 +3255,18 @@ void Creature::SetLastDamagedTimePtr(std::shared_ptr<time_t> const& val)
{
_lastDamagedTime = val;
}
bool Creature::CanPeriodicallyCallForAssistance() const
{
if (!IsInCombat())
return false;
// Unable to call for assistance
if (HasUnitState(UNIT_STATE_DIED | UNIT_STATE_POSSESSED))
return false;
if (!CanHaveThreatList())
return false;
return true;
}

6
src/server/game/Entities/Creature/Creature.h
View File

@@ -358,6 +358,8 @@ public:
}
void RefreshSwimmingFlag(bool recheck = false);
void SetAssistanceTimer(uint32 value) { m_assistanceTimer = value; }
protected:
bool CreateFromProto(ObjectGuid::LowType guidlow, uint32 Entry, uint32 vehId, const CreatureData* data = nullptr);
bool InitEntry(uint32 entry, const CreatureData* data = nullptr);
@@ -417,6 +419,8 @@ protected:
private:
void ForcedDespawn(uint32 timeMSToDespawn = 0);
[[nodiscard]] bool CanPeriodicallyCallForAssistance() const;
//WaypointMovementGenerator vars
uint32 m_waypointID;
uint32 m_path_id;
@@ -434,6 +438,8 @@ private:
bool _isMissingSwimmingFlagOutOfCombat;
uint32 m_assistanceTimer;
void applyInhabitFlags();
};