sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-10-10 23:13:20 +08:00
parent 0e1fb788c1 6ef16f18bb
commit 418afce6d7
15 changed files with 100 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+1 -1
View File
@@ -289,7 +289,7 @@ public:
_duelInProgress = true;
timer = 600000; // clear playerGUIDs after 10 minutes if no one initiates a duel
me->GetMotionMaster()->MoveFollow(caster, 2.0f, 0.0f);
me->SetFacingToObject(caster);
events.ScheduleEvent(EVENT_SPEAK, 3s);
events.ScheduleEvent(EVENT_SPEAK + 1, 7s);
src/server/scripts/Northrend/zone_dragonblight.cpp
+1
View File
@@ -2137,6 +2137,7 @@ public:
{
_textCounter = 1;
_playerGUID.Clear();
_events.Reset();
}
void JustEngagedWith(Unit* who) override
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+11 -1
View File
@@ -1317,8 +1317,18 @@ struct npc_flame_of_azzinoth : public ScriptedAI
{
ScheduleTimedEvent(10s, [&] {
if (Creature* _blade = ObjectAccessor::GetCreature(*me, _bladeGUID))
{
Unit* offTank = nullptr;
if (Creature* secondBlaze = me->FindNearestCreature(NPC_BLAZE, 100.0f, true))
offTank = secondBlaze->GetVictim();
if (Unit* target = _blade->AI()->SelectTarget(SelectTargetMethod::Random, 0, -40.0f, true))
DoCast(target, SPELL_CHARGE);
{
if (!offTank || offTank != target)
DoCast(target, SPELL_CHARGE);
}
}
}, 5s, 20s);
ScheduleTimedEvent(10s, 20s, [&] {
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+13 -3
View File
@@ -196,12 +196,22 @@ class spell_mother_shahraz_saber_lash_aura : public AuraScript
}
};
const Position validTeleportStairsPos[4] =
const Position validTeleportStairsPos[9] =
{
//Platform teleports
{945.00f, 149.17f, 197.07483},
{956.92f, 153.20f, 197.07483},
{933.69f, 154.15f, 197.07483},
//Floor teleports
{966.87f, 184.45f, 192.84f},
{927.22f, 187.04f, 192.84f},
{922.54f, 110.09f, 192.84f},
{958.01f, 110.47f, 192.84f}
{958.01f, 110.47f, 192.84f},
{939.95f, 108.29f, 192.84f},
{945.68f, 205.74f, 192.84f}
};
constexpr float minTeleportDist = 30.f;
@@ -227,7 +237,7 @@ class spell_mother_shahraz_fatal_attraction : public SpellScript
// Check if the boss is near stairs to avoid players falling through the platform with random teleports.
if (GetCaster()->GetPositionY() < 194.f)
finalDest = validTeleportStairsPos[urand(0, 3)];
finalDest = validTeleportStairsPos[urand(0, 8)];
else
{
finalDest = GetCaster()->GetNearPosition(frand(minTeleportDist, maxTeleportDist), static_cast<float>(rand_norm()) * static_cast<float>(2 * M_PI), true);