Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Doomfire movement #18

Merged
merged 3 commits into from
Jul 25, 2024
Merged

Doomfire movement #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fd3d69
Merge branch 'master' into pr/19469
Tereneckla Jul 25, 2024
51ca8b5
rewrite with initial teleport
Tereneckla Jul 25, 2024
d4df131
Merge branch 'doomfire-schmovement' into doomfire-movement
heyitsbench Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,25 +149,33 @@ struct npc_doomfire_spirit : public ScriptedAI

void Reset() override
{
scheduler.CancelAll();
ScheduleTimedEvent(0s, [&] {
float nextOrientation = Position::NormalizeOrientation(me->GetOrientation() + irand(-1, 1) * turnConstant);
Position pos;
float dist = 8.f;
ScheduleUniqueTimedEvent(10ms, [&] {
TryTeleportInDirection(1.f, M_PI, 1.f, true); //turns around and teleports 1 unit on spawn, assuming same logic as later teleports applies

while (dist >= 0)
{
pos = me->WorldObject::GetFirstCollisionPosition(dist, nextOrientation);
if (fabsf(dist - me->GetExactDist2d(pos)) < 0.001) // Account for small deviation
break;
dist -= 2.0f; // Distance drops by two units with each unsuccessful attempt
}
if (dist)
me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), nextOrientation);
else // Orientation does not change if not moving, verified with sniffs
me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), me->GetOrientation());

ScheduleTimedEvent(10ms, [&] {
float angle = irand(-1, 1) * turnConstant;
TryTeleportInDirection(8.f, angle, 2.f, false);
}, 1600ms);
},1);

}

Position TryTeleportInDirection(float dist, float angle, float step, bool alwaysturn)
{
Position pos;
while (dist >= 0)
{
pos = me->WorldObject::GetFirstCollisionPosition(dist, angle);
if (fabsf(dist - me->GetExactDist2d(pos)) < 0.001) // Account for small deviation
break;
dist -= step; // Distance drops with each unsuccessful attempt
}

if (dist || alwaysturn)
me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), Position::NormalizeOrientation(me->GetOrientation() + angle));
else // Orientation does not change if not moving, verified with sniffs
me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), me->GetOrientation());
}

void UpdateAI(uint32 diff) override
Expand Down Expand Up @@ -397,7 +405,7 @@ struct boss_archimonde : public BossAI
float angle = 2 * M_PI * rand() / RAND_MAX;
float x = me->GetPositionX() + DOOMFIRE_OFFSET * cos(angle);
float y = me->GetPositionY() + DOOMFIRE_OFFSET * sin(angle);
Position spiritPosition = Position(x, y, me->GetPositionZ(), angle);
Position spiritPosition = Position(x, y, me->GetPositionZ(), Position::NormalizeOrientation(angle + M_PI)); //spirit faces archimonde on spawn
Position doomfirePosition = Position(x, y, me->GetPositionZ());
if (Creature* doomfireSpirit = me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, spiritPosition, TEMPSUMMON_TIMED_DESPAWN, 27000))
{
Expand Down