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

Entities/GO: Add forceRespawnTimer support to DespawnOrUnsummon. Use it in SAI.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/168be492f5924d306a90e7f8dfd86a6c547da3d7)
This commit is contained in:
hondacrx
2021-06-23 23:09:48 -04:00
parent 05c8b7adec
commit 751d397031
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/SmartScripts/SmartAI.cs
+1 -4
View File
@@ -63,7 +63,6 @@ namespace Game.AI
uint _invincibilityHpLevel;
uint _despawnTime;
uint _respawnTime;
uint _despawnState;
// Vehicle conditions
@@ -570,7 +569,6 @@ namespace Game.AI
GetScript().OnInitialize(me);
_despawnTime = 0;
_respawnTime = 0;
_despawnState = 0;
_escortState = SmartEscortState.None;
@@ -1021,7 +1019,7 @@ namespace Game.AI
_despawnState++;
}
else
me.DespawnOrUnsummon(0, TimeSpan.FromSeconds(_respawnTime));
me.DespawnOrUnsummon();
}
else
_despawnTime -= diff;
@@ -1048,7 +1046,6 @@ namespace Game.AI
public void SetDespawnTime(uint t, uint r = 0)
{
_despawnTime = t;
_respawnTime = r;
_despawnState = t != 0 ? 1 : 0u;
}
Source/Game/AI/SmartScripts/SmartAIManager.cs
+1 -1
View File
@@ -2696,7 +2696,7 @@ namespace Game.AI
public struct ForceDespawn
{
public uint delay;
public uint respawn;
public uint forceRespawnTimer;
}
public struct InvincHP
{
Source/Game/AI/SmartScripts/SmartScript.cs
+7 -12
View File
@@ -968,27 +968,22 @@ namespace Game.AI
case SmartActions.ForceDespawn:
{
// there should be at least a world update tick before despawn, to avoid breaking linked actions
uint respawnDelay = Math.Max(e.Action.forceDespawn.delay, 1u);
TimeSpan despawnDelay = TimeSpan.FromMilliseconds(e.Action.forceDespawn.delay);
if (despawnDelay <= TimeSpan.Zero)
despawnDelay = TimeSpan.FromMilliseconds(1);
TimeSpan forceRespawnTimer = TimeSpan.FromSeconds(e.Action.forceDespawn.forceRespawnTimer);
foreach (var target in targets)
{
Creature creature = target.ToCreature();
if (creature != null)
{
CreatureAI smartAI = creature.GetAI();
if (smartAI != null && smartAI is SmartAI)
{
((SmartAI)smartAI).SetDespawnTime(respawnDelay);
((SmartAI)smartAI).StartDespawn();
}
else
creature.DespawnOrUnsummon(TimeSpan.FromMilliseconds(respawnDelay));
}
creature.DespawnOrUnsummon(despawnDelay, forceRespawnTimer);
else
{
GameObject go = target.ToGameObject();
if (go != null)
go.SetRespawnTime((int)respawnDelay);
go.DespawnOrUnsummon(despawnDelay, forceRespawnTimer);
}
}
break;
Source/Game/Entities/GameObject/GameObject.cs
+9 -4
View File
@@ -429,7 +429,7 @@ namespace Game.Entities
if (m_despawnDelay > diff)
m_despawnDelay -= diff;
else
DespawnOrUnsummon();
DespawnOrUnsummon(TimeSpan.FromMilliseconds(0), m_despawnRespawnTime);
}
switch (m_lootState)
@@ -870,17 +870,21 @@ namespace Game.Entities
m_unique_users.Add(player.GetGUID());
}
void DespawnOrUnsummon(TimeSpan delay = default)
public void DespawnOrUnsummon(TimeSpan delay = default, TimeSpan forceRespawnTime = default)
{
if (delay > TimeSpan.Zero)
{
if (m_despawnDelay == 0 || m_despawnDelay > delay.TotalMilliseconds)
{
m_despawnDelay = (uint)delay.TotalMilliseconds;
m_despawnRespawnTime = forceRespawnTime;
}
}
else
{
if (m_goData != null && m_respawnDelayTime != 0)
SaveRespawnTime(m_respawnDelayTime);
uint respawnDelay = (uint)((forceRespawnTime > TimeSpan.Zero) ? forceRespawnTime.TotalSeconds : m_respawnDelayTime);
if (m_goData != null && respawnDelay != 0)
SaveRespawnTime(respawnDelay);
Delete();
}
}
@@ -2883,6 +2887,7 @@ namespace Game.Entities
long m_respawnTime; // (secs) time of next respawn (or despawn if GO have owner()),
uint m_respawnDelayTime; // (secs) if 0 then current GO state no dependent from timer
uint m_despawnDelay;
TimeSpan m_despawnRespawnTime; // override respawn time after delayed despawn
LootState m_lootState;
ObjectGuid m_lootStateUnitGUID; // GUID of the unit passed with SetLootState(LootState, Unit*)
bool m_spawnedByDefault;