nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 10:30:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/IcecrownCitadel): Fix Sindragosa's icewall poping up prem… (#15836)

Browse Source 
fix(Scripts/IcecrownCitadel): Fix Sindragosa's icewall poping up prematurely
This commit is contained in:
Skjalf
2023-04-05 16:36:18 -03:00
committed by GitHub
parent 98e071157a
commit 67dd96e502
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -282,6 +282,7 @@ public:
_didFirstFlyPhase = false;
_isBelow20Pct = false;
_isThirdPhase = false;
_isLanding = false;
_bombCount = 0;
_mysticBuffetStack = 0;
_Reset();
@@ -365,15 +366,16 @@ public:
void DoAction(int32 action) override
{
if (action == ACTION_START_FROSTWYRM)
if (action == ACTION_START_FROSTWYRM && !_isLanding)
{
_isLanding = true;
if (TempSummon* summon = me->ToTempSummon())
summon->SetTempSummonType(TEMPSUMMON_DEAD_DESPAWN);
if (me->isDead())
return;
instance->SetBossState(DATA_SINDRAGOSA, IN_PROGRESS);
me->setActive(true);
me->SetDisableGravity(true);
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
@@ -673,6 +675,7 @@ public:
bool _isBelow20Pct;
bool _isThirdPhase;
bool _isInAirPhase;
bool _isLanding;
};
CreatureAI* GetAI(Creature* creature) const override

29
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -116,6 +116,11 @@ DoorData const doorData[] =
{0, 0, DOOR_TYPE_ROOM }
};
ObjectData const creatureData[] =
{
{ NPC_SINDRAGOSA, DATA_SINDRAGOSA }
};
// this doesnt have to only store questgivers, also can be used for related quest spawns
struct WeeklyQuest
{
@@ -203,6 +208,7 @@ public:
SetBossNumber(MAX_ENCOUNTERS);
SetPersistentDataCount(MAX_DATA_INDEXES);
LoadBossBoundaries(boundaries);
LoadObjectData(creatureData, nullptr);
LoadDoorData(doorData);
TeamIdInInstance = TEAM_NEUTRAL;
HeroicAttempts = MaxHeroicAttempts;
@@ -257,7 +263,7 @@ public:
if (GetBossState(DATA_LADY_DEATHWHISPER) == DONE && GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != DONE)
SpawnGunship();
if (GetBossState(DATA_SINDRAGOSA) != DONE && IsSindragosaIntroDone && SindragosaGUID.IsEmpty() && Events.GetTimeUntilEvent(EVENT_RESPAWN_SINDRAGOSA) == Milliseconds::max())
if (GetBossState(DATA_SINDRAGOSA) != DONE && IsSindragosaIntroDone && !GetCreature(DATA_SINDRAGOSA) && Events.GetTimeUntilEvent(EVENT_RESPAWN_SINDRAGOSA) == Milliseconds::max())
{
Events.ScheduleEvent(EVENT_RESPAWN_SINDRAGOSA, 30s);
}
@@ -518,12 +524,16 @@ public:
default:
break;
}
InstanceScript::OnCreatureCreate(creature);
}
void OnCreatureRemove(Creature* creature) override
{
if (creature->GetEntry() == NPC_SINDRAGOSA)
SindragosaGUID.Clear();
InstanceScript::OnCreatureRemove(creature);
}
uint32 GetCreatureEntry(ObjectGuid::LowType /*guidLow*/, CreatureData const* data) override
@@ -1764,15 +1774,18 @@ public:
SpawnGunship();
break;
case EVENT_RESPAWN_SINDRAGOSA:
if (Creature* sindragosa = instance->SummonCreature(NPC_SINDRAGOSA, SindragosaSpawnPos))
if (!GetCreature(DATA_SINDRAGOSA))
{
sindragosa->setActive(true);
sindragosa->SetDisableGravity(true);
sindragosa->GetMotionMaster()->MovePath(NPC_SINDRAGOSA * 10, true);
if (TempSummon* summon = sindragosa->ToTempSummon())
if (Creature* sindragosa = instance->SummonCreature(NPC_SINDRAGOSA, SindragosaSpawnPos))
{
summon->SetTempSummonType(TEMPSUMMON_DEAD_DESPAWN);
sindragosa->setActive(true);
sindragosa->SetDisableGravity(true);
sindragosa->GetMotionMaster()->MovePath(NPC_SINDRAGOSA * 10, true);
if (TempSummon* summon = sindragosa->ToTempSummon())
{
summon->SetTempSummonType(TEMPSUMMON_DEAD_DESPAWN);
}
}
}
// Could happen more than once if more than one player enters before she respawns.