aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/updates/world/master/2021_02_08_05_world_2017_11_22_03_world.sql2
-rw-r--r--src/server/game/AI/CoreAI/GuardAI.cpp4
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp102
-rw-r--r--src/server/game/Entities/Creature/Creature.h3
-rw-r--r--src/server/scripts/World/guards.cpp418
-rw-r--r--src/server/scripts/World/npc_guard.cpp247
-rw-r--r--src/server/scripts/World/world_script_loader.cpp4
7 files changed, 252 insertions, 528 deletions
diff --git a/sql/updates/world/master/2021_02_08_05_world_2017_11_22_03_world.sql b/sql/updates/world/master/2021_02_08_05_world_2017_11_22_03_world.sql
new file mode 100644
index 00000000000..12d213ae2f7
--- /dev/null
+++ b/sql/updates/world/master/2021_02_08_05_world_2017_11_22_03_world.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName` = 'npc_guard_generic' WHERE `ScriptName` = 'guard_generic';
+UPDATE `creature_template` SET `ScriptName` = 'npc_guard_shattrath_faction' WHERE `ScriptName` IN ('guard_shattrath_scryer', 'guard_shattrath_aldor');
diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index bce356937a5..2288c06122d 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -66,9 +66,7 @@ void GuardAI::EnterEvadeMode(EvadeReason /*why*/)
me->GetThreatManager().ClearAllThreat();
me->CombatStop(true);
- // Remove ChaseMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
- if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
- me->GetMotionMaster()->MoveTargetedHome();
+ me->GetMotionMaster()->MoveTargetedHome();
}
void GuardAI::JustDied(Unit* killer)
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index bbe45a5a577..57de3ba7691 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2273,108 +2273,6 @@ bool Creature::isWorldBoss() const
return (GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_BOSS_MOB) != 0;
}
-SpellInfo const* Creature::reachWithSpellAttack(Unit* victim)
-{
- if (!victim)
- return nullptr;
-
- for (uint32 i=0; i < MAX_CREATURE_SPELLS; ++i)
- {
- if (!m_spells[i])
- continue;
- SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(m_spells[i], GetMap()->GetDifficultyID());
- if (!spellInfo)
- {
- TC_LOG_ERROR("entities.unit", "WORLD: unknown spell id %i", m_spells[i]);
- continue;
- }
-
- bool bcontinue = true;
- for (SpellEffectInfo const* effect : spellInfo->GetEffects())
- {
- if (effect && ((effect->Effect == SPELL_EFFECT_SCHOOL_DAMAGE) ||
- (effect->Effect == SPELL_EFFECT_INSTAKILL) ||
- (effect->Effect == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE) ||
- (effect->Effect == SPELL_EFFECT_HEALTH_LEECH)
- ))
- {
- bcontinue = false;
- break;
- }
- }
- if (bcontinue)
- continue;
-
- std::vector<SpellPowerCost> costs = spellInfo->CalcPowerCost(this, SpellSchoolMask(spellInfo->SchoolMask));
- auto m = std::find_if(costs.begin(), costs.end(), [](SpellPowerCost const& cost) { return cost.Power == POWER_MANA; });
- if (m != costs.end())
- if (m->Amount > GetPower(POWER_MANA))
- continue;
-
- float range = spellInfo->GetMaxRange(false);
- float minrange = spellInfo->GetMinRange(false);
- float dist = GetDistance(victim);
- if (dist > range || dist < minrange)
- continue;
- if (spellInfo->PreventionType & SPELL_PREVENTION_TYPE_SILENCE && HasUnitFlag(UNIT_FLAG_SILENCED))
- continue;
- if (spellInfo->PreventionType & SPELL_PREVENTION_TYPE_PACIFY && HasUnitFlag(UNIT_FLAG_PACIFIED))
- continue;
- return spellInfo;
- }
- return nullptr;
-}
-
-SpellInfo const* Creature::reachWithSpellCure(Unit* victim)
-{
- if (!victim)
- return nullptr;
-
- for (uint32 i=0; i < MAX_CREATURE_SPELLS; ++i)
- {
- if (!m_spells[i])
- continue;
- SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(m_spells[i], GetMap()->GetDifficultyID());
- if (!spellInfo)
- {
- TC_LOG_ERROR("entities.unit", "WORLD: unknown spell id %i", m_spells[i]);
- continue;
- }
-
- bool bcontinue = true;
- for (SpellEffectInfo const* effect : spellInfo->GetEffects())
- {
- if (effect && (effect->Effect == SPELL_EFFECT_HEAL))
- {
- bcontinue = false;
- break;
- }
- }
- if (bcontinue)
- continue;
-
- std::vector<SpellPowerCost> costs = spellInfo->CalcPowerCost(this, SpellSchoolMask(spellInfo->SchoolMask));
- auto m = std::find_if(costs.begin(), costs.end(), [](SpellPowerCost const& cost) { return cost.Power == POWER_MANA; });
- if (m != costs.end())
- if (m->Amount > GetPower(POWER_MANA))
- continue;
-
- float range = spellInfo->GetMaxRange(true);
- float minrange = spellInfo->GetMinRange(true);
- float dist = GetDistance(victim);
- //if (!isInFront(victim, range) && spellInfo->AttributesEx)
- // continue;
- if (dist > range || dist < minrange)
- continue;
- if (spellInfo->PreventionType & SPELL_PREVENTION_TYPE_SILENCE && HasUnitFlag(UNIT_FLAG_SILENCED))
- continue;
- if (spellInfo->PreventionType & SPELL_PREVENTION_TYPE_PACIFY && HasUnitFlag(UNIT_FLAG_PACIFIED))
- continue;
- return spellInfo;
- }
- return nullptr;
-}
-
// select nearest hostile unit within the given distance (regardless of threat list).
Unit* Creature::SelectNearestTarget(float dist, bool playerOnly /* = false */) const
{
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index e98a740a398..a95e823e619 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -208,9 +208,6 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
void RemoveLootMode(uint16 lootMode) { m_LootMode &= ~lootMode; }
void ResetLootMode() { m_LootMode = LOOT_MODE_DEFAULT; }
- SpellInfo const* reachWithSpellAttack(Unit* victim);
- SpellInfo const* reachWithSpellCure(Unit* victim);
-
uint32 m_spells[MAX_CREATURE_SPELLS];
bool CanStartAttack(Unit const* u, bool force) const;
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
deleted file mode 100644
index d060aacd786..00000000000
--- a/src/server/scripts/World/guards.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* ScriptData
-SDName: Guards
-SD%Complete: 100
-SDComment:
-SDCategory: Guards
-EndScriptData */
-
-/* ContentData
-guard_generic
-guard_shattrath_aldor
-guard_shattrath_scryer
-EndContentData */
-
-#include "ScriptMgr.h"
-#include "CreatureAIImpl.h"
-#include "GuardAI.h"
-#include "MotionMaster.h"
-#include "ObjectAccessor.h"
-#include "Player.h"
-#include "SpellInfo.h"
-
-enum GuardGeneric
-{
- GENERIC_CREATURE_COOLDOWN = 5000,
-
- SAY_GUARD_SIL_AGGRO = 0,
-
- NPC_CENARION_HOLD_INFANTRY = 15184,
- NPC_STORMWIND_CITY_GUARD = 68,
- NPC_STORMWIND_CITY_PATROLLER = 1976,
- NPC_ORGRIMMAR_GRUNT = 3296
-};
-
-class guard_generic : public CreatureScript
-{
-public:
- guard_generic() : CreatureScript("guard_generic") { }
-
- struct guard_genericAI : public GuardAI
- {
- guard_genericAI(Creature* creature) : GuardAI(creature)
- {
- Initialize();
- }
-
- void Initialize()
- {
- globalCooldown = 0;
- buffTimer = 0;
- }
-
- void Reset() override
- {
- Initialize();
- }
-
- void EnterCombat(Unit* who) override
- {
- if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY)
- Talk(SAY_GUARD_SIL_AGGRO, who);
- if (SpellInfo const* spell = me->reachWithSpellAttack(who))
- DoCast(who, spell->Id);
- }
-
- void UpdateAI(uint32 diff) override
- {
- //Always decrease our global cooldown first
- if (globalCooldown > diff)
- globalCooldown -= diff;
- else
- globalCooldown = 0;
-
- //Buff timer (only buff when we are alive and not in combat
- if (me->IsAlive() && !me->IsInCombat())
- {
- if (buffTimer <= diff)
- {
- //Find a spell that targets friendly and applies an aura (these are generally buffs)
- SpellInfo const* info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, SELECT_EFFECT_AURA);
-
- if (info && !globalCooldown)
- {
- //Cast the buff spell
- DoCast(me, info->Id);
-
- //Set our global cooldown
- globalCooldown = GENERIC_CREATURE_COOLDOWN;
-
- //Set our timer to 10 minutes before rebuff
- buffTimer = 600000;
- } //Try again in 30 seconds
- else buffTimer = 30000;
- } else buffTimer -= diff;
- }
-
- //Return since we have no target
- if (!UpdateVictim())
- return;
-
- // Make sure our attack is ready and we arn't currently casting
- if (me->isAttackReady() && !me->IsNonMeleeSpellCast(false))
- {
- //If we are within range melee the target
- if (me->IsWithinMeleeRange(me->GetVictim()))
- {
- bool healing = false;
- SpellInfo const* info = nullptr;
-
- //Select a healing spell if less than 30% hp
- if (me->HealthBelowPct(30))
- info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, SELECT_EFFECT_HEALING);
-
- //No healing spell available, select a hostile spell
- if (info)
- healing = true;
- else
- info = SelectSpell(me->GetVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, SELECT_EFFECT_DONTCARE);
-
- //20% chance to replace our white hit with a spell
- if (info && urand(0, 99) < 20 && !globalCooldown)
- {
- //Cast the spell
- if (healing)
- DoCast(me, info->Id);
- else
- DoCastVictim(info->Id);
-
- //Set our global cooldown
- globalCooldown = GENERIC_CREATURE_COOLDOWN;
- }
- else
- me->AttackerStateUpdate(me->GetVictim());
-
- me->resetAttackTimer();
- }
- }
- else
- {
- //Only run this code if we arn't already casting
- if (!me->IsNonMeleeSpellCast(false))
- {
- bool healing = false;
- SpellInfo const* info = nullptr;
-
- //Select a healing spell if less than 30% hp ONLY 33% of the time
- if (me->HealthBelowPct(30) && 33 > urand(0, 99))
- info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, SELECT_EFFECT_HEALING);
-
- //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
- if (info)
- healing = true;
- else
- info = SelectSpell(me->GetVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE);
-
- //Found a spell, check if we arn't on cooldown
- if (info && !globalCooldown)
- {
- //If we are currently moving stop us and set the movement generator
- if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE)
- {
- me->GetMotionMaster()->Clear(false);
- me->GetMotionMaster()->MoveIdle();
- }
-
- //Cast spell
- if (healing)
- DoCast(me, info->Id);
- else
- DoCastVictim(info->Id);
-
- //Set our global cooldown
- globalCooldown = GENERIC_CREATURE_COOLDOWN;
- } //If no spells available and we arn't moving run to target
- else if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
- {
- //Cancel our current spell and then mutate new movement generator
- me->InterruptNonMeleeSpells(false);
- me->GetMotionMaster()->Clear(false);
- me->GetMotionMaster()->MoveChase(me->GetVictim());
- }
- }
- }
-
- DoMeleeAttackIfReady();
- }
-
- void DoReplyToTextEmote(uint32 emote)
- {
- switch (emote)
- {
- case TEXT_EMOTE_KISS:
- me->HandleEmoteCommand(EMOTE_ONESHOT_BOW);
- break;
-
- case TEXT_EMOTE_WAVE:
- me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE);
- break;
-
- case TEXT_EMOTE_SALUTE:
- me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
- break;
-
- case TEXT_EMOTE_SHY:
- me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX);
- break;
-
- case TEXT_EMOTE_RUDE:
- case TEXT_EMOTE_CHICKEN:
- me->HandleEmoteCommand(EMOTE_ONESHOT_POINT);
- break;
- }
- }
-
- void ReceiveEmote(Player* player, uint32 textEmote) override
- {
- switch (me->GetEntry())
- {
- case NPC_STORMWIND_CITY_GUARD:
- case NPC_STORMWIND_CITY_PATROLLER:
- case NPC_ORGRIMMAR_GRUNT:
- break;
- default:
- return;
- }
-
- if (!me->IsFriendlyTo(player))
- return;
-
- DoReplyToTextEmote(textEmote);
- }
-
- private:
- uint32 globalCooldown;
- uint32 buffTimer;
- };
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new guard_genericAI(creature);
- }
-};
-
-enum GuardShattrath
-{
- SPELL_BANISHED_SHATTRATH_A = 36642,
- SPELL_BANISHED_SHATTRATH_S = 36671,
- SPELL_BANISH_TELEPORT = 36643,
- SPELL_EXILE = 39533
-};
-
-class guard_shattrath_scryer : public CreatureScript
-{
-public:
- guard_shattrath_scryer() : CreatureScript("guard_shattrath_scryer") { }
-
- struct guard_shattrath_scryerAI : public GuardAI
- {
- guard_shattrath_scryerAI(Creature* creature) : GuardAI(creature)
- {
- Initialize();
- }
-
- void Initialize()
- {
- banishTimer = 5000;
- exileTimer = 8500;
- playerGUID.Clear();
- canTeleport = false;
- }
-
- void Reset() override
- {
- Initialize();
- }
-
- void UpdateAI(uint32 diff) override
- {
- if (!UpdateVictim())
- return;
-
- if (canTeleport)
- {
- if (exileTimer <= diff)
- {
- if (Unit* temp = ObjectAccessor::GetUnit(*me, playerGUID))
- {
- temp->CastSpell(temp, SPELL_EXILE, true);
- temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true);
- }
- playerGUID.Clear();
- exileTimer = 8500;
- canTeleport = false;
- } else exileTimer -= diff;
- }
- else if (banishTimer <= diff)
- {
- Unit* temp = me->GetVictim();
- if (temp && temp->GetTypeId() == TYPEID_PLAYER)
- {
- DoCast(temp, SPELL_BANISHED_SHATTRATH_A);
- banishTimer = 9000;
- playerGUID = temp->GetGUID();
- if (!playerGUID.IsEmpty())
- canTeleport = true;
- }
- } else banishTimer -= diff;
-
- DoMeleeAttackIfReady();
- }
-
- private:
- uint32 exileTimer;
- uint32 banishTimer;
- ObjectGuid playerGUID;
- bool canTeleport;
- };
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new guard_shattrath_scryerAI(creature);
- }
-};
-
-class guard_shattrath_aldor : public CreatureScript
-{
-public:
- guard_shattrath_aldor() : CreatureScript("guard_shattrath_aldor") { }
-
- struct guard_shattrath_aldorAI : public GuardAI
- {
- guard_shattrath_aldorAI(Creature* creature) : GuardAI(creature)
- {
- Initialize();
- }
-
- void Initialize()
- {
- banishTimer = 5000;
- exileTimer = 8500;
- playerGUID.Clear();
- canTeleport = false;
- }
-
- void Reset() override
- {
- Initialize();
- }
-
- void UpdateAI(uint32 diff) override
- {
- if (!UpdateVictim())
- return;
-
- if (canTeleport)
- {
- if (exileTimer <= diff)
- {
- if (Unit* temp = ObjectAccessor::GetUnit(*me, playerGUID))
- {
- temp->CastSpell(temp, SPELL_EXILE, true);
- temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true);
- }
- playerGUID.Clear();
- exileTimer = 8500;
- canTeleport = false;
- } else exileTimer -= diff;
- }
- else if (banishTimer <= diff)
- {
- Unit* temp = me->GetVictim();
- if (temp && temp->GetTypeId() == TYPEID_PLAYER)
- {
- DoCast(temp, SPELL_BANISHED_SHATTRATH_S);
- banishTimer = 9000;
- playerGUID = temp->GetGUID();
- if (!playerGUID.IsEmpty())
- canTeleport = true;
- }
- } else banishTimer -= diff;
-
- DoMeleeAttackIfReady();
- }
- private:
- uint32 exileTimer;
- uint32 banishTimer;
- ObjectGuid playerGUID;
- bool canTeleport;
- };
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new guard_shattrath_aldorAI(creature);
- }
-};
-
-void AddSC_guards()
-{
- new guard_generic();
- new guard_shattrath_aldor();
- new guard_shattrath_scryer();
-}
diff --git a/src/server/scripts/World/npc_guard.cpp b/src/server/scripts/World/npc_guard.cpp
new file mode 100644
index 00000000000..1dcfff5824e
--- /dev/null
+++ b/src/server/scripts/World/npc_guard.cpp
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "GuardAI.h"
+#include "ObjectAccessor.h"
+#include "Player.h"
+#include "Random.h"
+#include "ScriptMgr.h"
+#include "SpellInfo.h"
+#include "CreatureAIImpl.h"
+
+enum GuardMisc
+{
+ SAY_GUARD_SIL_AGGRO = 0,
+
+ NPC_CENARION_HOLD_INFANTRY = 15184,
+ NPC_STORMWIND_CITY_GUARD = 68,
+ NPC_STORMWIND_CITY_PATROLLER = 1976,
+ NPC_ORGRIMMAR_GRUNT = 3296,
+ NPC_ALDOR_VINDICATOR = 18549,
+
+ SPELL_BANISHED_SHATTRATH_A = 36642,
+ SPELL_BANISHED_SHATTRATH_S = 36671,
+ SPELL_BANISH_TELEPORT = 36643,
+ SPELL_EXILE = 39533,
+};
+
+struct npc_guard_generic : public GuardAI
+{
+ npc_guard_generic(Creature* creature) : GuardAI(creature)
+ {
+ _scheduler.SetValidator([this]
+ {
+ return !me->HasUnitState(UNIT_STATE_CASTING) && !me->IsInEvadeMode() && me->IsAlive();
+ });
+ _combatScheduler.SetValidator([this]
+ {
+ return !me->HasUnitState(UNIT_STATE_CASTING);
+ });
+ }
+
+ void Reset() override
+ {
+ _scheduler.CancelAll();
+ _combatScheduler.CancelAll();
+ _scheduler.Schedule(Seconds(1), [this](TaskContext context)
+ {
+ // Find a spell that targets friendly and applies an aura (these are generally buffs)
+ if (SpellInfo const* spellInfo = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, SELECT_EFFECT_AURA))
+ DoCast(me, spellInfo->Id);
+
+ context.Repeat(Minutes(10));
+ });
+ }
+
+ void DoReplyToTextEmote(uint32 emote)
+ {
+ switch (emote)
+ {
+ case TEXT_EMOTE_KISS:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_BOW);
+ break;
+ case TEXT_EMOTE_WAVE:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE);
+ break;
+ case TEXT_EMOTE_SALUTE:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
+ break;
+ case TEXT_EMOTE_SHY:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX);
+ break;
+ case TEXT_EMOTE_RUDE:
+ case TEXT_EMOTE_CHICKEN:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_POINT);
+ break;
+ default:
+ break;
+ }
+ }
+
+ void ReceiveEmote(Player* player, uint32 textEmote) override
+ {
+ switch (me->GetEntry())
+ {
+ case NPC_STORMWIND_CITY_GUARD:
+ case NPC_STORMWIND_CITY_PATROLLER:
+ case NPC_ORGRIMMAR_GRUNT:
+ break;
+ default:
+ return;
+ }
+
+ if (!me->IsFriendlyTo(player))
+ return;
+
+ DoReplyToTextEmote(textEmote);
+ }
+
+ void EnterCombat(Unit* who) override
+ {
+ if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY)
+ Talk(SAY_GUARD_SIL_AGGRO, who);
+
+ _combatScheduler.Schedule(Seconds(1), [this](TaskContext meleeContext)
+ {
+ Unit* victim = me->GetVictim();
+ if (!me->isAttackReady() || !me->IsWithinMeleeRange(victim))
+ {
+ meleeContext.Repeat();
+ return;
+ }
+ if (roll_chance_i(20))
+ {
+ if (SpellInfo const* spellInfo = SelectSpell(me->GetVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, NOMINAL_MELEE_RANGE, SELECT_EFFECT_DONTCARE))
+ {
+ me->resetAttackTimer();
+ DoCastVictim(spellInfo->Id);
+ meleeContext.Repeat();
+ return;
+ }
+ }
+ if (ShouldSparWith(victim))
+ me->FakeAttackerStateUpdate(victim);
+ else
+ me->AttackerStateUpdate(victim);
+ me->resetAttackTimer();
+ meleeContext.Repeat();
+ }).Schedule(Seconds(5), [this](TaskContext spellContext)
+ {
+ bool healing = false;
+ SpellInfo const* spellInfo = nullptr;
+
+ // Select a healing spell if less than 30% hp and ONLY 33% of the time
+ if (me->HealthBelowPct(30) && roll_chance_i(33))
+ spellInfo = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, SELECT_EFFECT_HEALING);
+
+ // No healing spell available, check if we can cast a ranged spell
+ if (spellInfo)
+ healing = true;
+ else
+ spellInfo = SelectSpell(me->GetVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE);
+
+ // Found a spell
+ if (spellInfo)
+ {
+ if (healing)
+ DoCast(me, spellInfo->Id);
+ else
+ DoCastVictim(spellInfo->Id);
+ spellContext.Repeat(Seconds(5));
+ }
+ else
+ spellContext.Repeat(Seconds(1));
+ });
+ }
+
+ void UpdateAI(uint32 diff) override
+ {
+ _scheduler.Update(diff);
+
+ if (!UpdateVictim())
+ return;
+
+ _combatScheduler.Update(diff);
+ }
+
+private:
+ TaskScheduler _scheduler;
+ TaskScheduler _combatScheduler;
+};
+
+struct npc_guard_shattrath_faction : public GuardAI
+{
+ npc_guard_shattrath_faction(Creature* creature) : GuardAI(creature)
+ {
+ _scheduler.SetValidator([this]
+ {
+ return !me->HasUnitState(UNIT_STATE_CASTING);
+ });
+ }
+
+ void Reset() override
+ {
+ _scheduler.CancelAll();
+ }
+
+ void EnterCombat(Unit* /*who*/) override
+ {
+ ScheduleVanish();
+ }
+
+ void UpdateAI(uint32 diff) override
+ {
+ if (!UpdateVictim())
+ return;
+
+ _scheduler.Update(diff, std::bind(&GuardAI::DoMeleeAttackIfReady, this));
+ }
+
+ void ScheduleVanish()
+ {
+ _scheduler.Schedule(Seconds(5), [this](TaskContext banishContext)
+ {
+ Unit* temp = me->GetVictim();
+ if (temp && temp->GetTypeId() == TYPEID_PLAYER)
+ {
+ DoCast(temp, me->GetEntry() == NPC_ALDOR_VINDICATOR ? SPELL_BANISHED_SHATTRATH_S : SPELL_BANISHED_SHATTRATH_A);
+ ObjectGuid playerGUID = temp->GetGUID();
+ banishContext.Schedule(Seconds(9), [this, playerGUID](TaskContext exileContext)
+ {
+ if (Unit* temp = ObjectAccessor::GetUnit(*me, playerGUID))
+ {
+ temp->CastSpell(temp, SPELL_EXILE, true);
+ temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true);
+ }
+ ScheduleVanish();
+ });
+ }
+ else
+ banishContext.Repeat();
+ });
+ }
+
+private:
+ TaskScheduler _scheduler;
+};
+
+void AddSC_npc_guard()
+{
+ RegisterCreatureAI(npc_guard_generic());
+ RegisterCreatureAI(npc_guard_shattrath_faction());
+}
diff --git a/src/server/scripts/World/world_script_loader.cpp b/src/server/scripts/World/world_script_loader.cpp
index fc4c0ad1df7..0a507b9fe04 100644
--- a/src/server/scripts/World/world_script_loader.cpp
+++ b/src/server/scripts/World/world_script_loader.cpp
@@ -24,7 +24,7 @@ void AddSC_conversation_scripts();
void AddSC_emerald_dragons();
void AddSC_generic_creature();
void AddSC_go_scripts();
-void AddSC_guards();
+void AddSC_npc_guard();
void AddSC_item_scripts();
void AddSC_npc_professions();
void AddSC_npc_innkeeper();
@@ -45,7 +45,7 @@ void AddWorldScripts()
AddSC_emerald_dragons();
AddSC_generic_creature();
AddSC_go_scripts();
- AddSC_guards();
+ AddSC_npc_guard();
AddSC_item_scripts();
AddSC_npc_professions();
AddSC_npc_innkeeper();