Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Creatures: moved combat pulse into heartbeat handling and implemented CREATURE_STATIC_FLAG_2_FORCE_PARTY_MEMBERS_INTO_COMBAT

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/11f32a2427caf7064947b03f3256e06d27fe6327)
This commit is contained in:
Hondacrx
2024-08-19 12:33:21 -04:00
parent 40ba30a61c
commit 5639a58a11
3 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.Fields.cs
-2
View File
@@ -80,8 +80,6 @@ namespace Game.Entities
bool m_ignoreCorpseDecayRatio;
float m_wanderDistance;
uint m_boundaryCheckTime; // (msecs) remaining time for next evade boundary check
uint m_combatPulseTime; // (msecs) remaining time for next zone-in-combat pulse
uint m_combatPulseDelay; // (secs) how often the creature puts the entire zone in combat (only works in dungeons)
// vendor items
List<VendorItemCount> m_vendorItemCounts = new();
Source/Game/Entities/Creature/Creature.cs
+44 -30
View File
@@ -562,29 +562,6 @@ namespace Game.Entities
m_boundaryCheckTime -= diff;
}
// if periodic combat pulse is enabled and we are both in combat and in a dungeon, do this now
if (m_combatPulseDelay > 0 && IsEngaged() && GetMap().IsDungeon())
{
if (diff > m_combatPulseTime)
m_combatPulseTime = 0;
else
m_combatPulseTime -= diff;
if (m_combatPulseTime == 0)
{
var players = GetMap().GetPlayers();
foreach (var player in players)
{
if (player.IsGameMaster())
continue;
if (player.IsAlive() && IsHostileTo(player))
EngageWithTarget(player);
}
m_combatPulseTime = m_combatPulseDelay * Time.InMilliseconds;
}
}
AIUpdateTick(diff);
DoMeleeAttackIfReady();
@@ -645,6 +622,14 @@ namespace Game.Entities
}
}
public override void Heartbeat()
{
base.Heartbeat();
// Creatures with CREATURE_STATIC_FLAG_2_FORCE_PARTY_MEMBERS_INTO_COMBAT periodically force party members into combat
ForcePartyMembersIntoCombat();
}
public void Regenerate(PowerType power)
{
int curValue = GetPower(power);
@@ -1124,6 +1109,9 @@ namespace Game.Entities
CreatureGroup formation = GetFormation();
if (formation != null)
formation.MemberEngagingTarget(this, target);
// Creatures with CREATURE_STATIC_FLAG_2_FORCE_PARTY_MEMBERS_INTO_COMBAT periodically force party members into combat
ForcePartyMembersIntoCombat();
}
public override void AtDisengage()
@@ -1142,6 +1130,39 @@ namespace Game.Entities
}
}
void ForcePartyMembersIntoCombat()
{
if (!_staticFlags.HasFlag(CreatureStaticFlags2.ForcePartyMembersIntoCombat) || !IsEngaged())
return;
List<Group> partiesToForceIntoCombat = new();
foreach (var (_, combatReference) in GetCombatManager().GetPvECombatRefs())
{
if (combatReference.IsSuppressedFor(this))
continue;
Player player = combatReference.GetOther(this)?.ToPlayer();
if (player == null || player.IsGameMaster())
continue;
Group group = player.GetGroup();
if (group != null)
partiesToForceIntoCombat.Add(group);
}
foreach (Group partyToForceIntoCombat in partiesToForceIntoCombat)
{
for (GroupReference refe = partyToForceIntoCombat.GetFirstMember(); refe != null; refe = refe.Next())
{
Player player = refe.GetSource();
if (player == null || !player.IsInWorld || player.GetMap() != GetMap() || player.IsGameMaster())
continue;
EngageWithTarget(player);
}
}
}
public bool IsEscorted()
{
CreatureAI ai = GetAI();
@@ -3602,13 +3623,6 @@ namespace Game.Entities
public void SetWanderDistance(float dist) { m_wanderDistance = dist; }
public void DoImmediateBoundaryCheck() { m_boundaryCheckTime = 0; }
uint GetCombatPulseDelay() { return m_combatPulseDelay; }
public void SetCombatPulseDelay(uint delay) // (secs) interval at which the creature pulses the entire zone into combat (only works in dungeons)
{
m_combatPulseDelay = delay;
if (m_combatPulseTime == 0 || m_combatPulseTime > delay)
m_combatPulseTime = delay;
}
bool CanRegenerateHealth() { return !_staticFlags.HasFlag(CreatureStaticFlags5.NoHealthRegen) && _regenerateHealth; }
public void SetRegenerateHealth(bool value) { _staticFlags.ApplyFlag(CreatureStaticFlags5.NoHealthRegen, !value); }