Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 21:32:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/TotT: use a different method to select Ozumat's cinematic version for a more reliable selection behaivior

Browse Source
This commit is contained in:
Ovahlord
2019-11-23 08:01:55 +01:00
parent 779df2668f
commit f102ce1cdf
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/scripts/EasternKingdoms/ThroneOfTheTides/instance_throne_of_the_tides.cpp
View File

@@ -33,6 +33,7 @@ ObjectData const creatureData[] =
{ NPC_OZUMAT_VEHICLE_BIG, DATA_OZUMAT_VEHICLE_BIG },
{ NPC_OZUMAT_VEHICLE, DATA_OZUMAT_VEHICLE },
{ NPC_NEPTULON, DATA_NEPTULON },
{ NPC_OZUMAT, DATA_OZUMAT_PASSENGER },
{ 0, 0 } // END
};

16
src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp
View File

@@ -43,15 +43,9 @@ struct npc_tott_ozumat_vehicle_big : public ScriptedAI
void JustAppeared() override
{
me->setActive(true); // ugly but the only safe way for now to keep the grid loaded...
if (_instance->GetData(DATA_CURRENT_EVENT_PROGRESS) < EVENT_INDEX_DEFENSE_SYSTEM_ACTIVATED)
{
if (Creature* ozumat = DoSummon(NPC_OZUMAT, me->GetPosition()))
{
me->HandleSpellClick(ozumat, SEAT_TENTACLE_BLOCK);
ozumat->setActive(true);
}
}
ozumat->EnterVehicle(me, SEAT_TENTACLE_BLOCK);
}
void DoAction(int32 action) override
@@ -70,16 +64,16 @@ struct npc_tott_ozumat_vehicle_big : public ScriptedAI
{
case EVENT_CHANGE_TO_SHOCK_SEAT:
if (Vehicle* vehicle = me->GetVehicleKit())
if (Unit* ozumat = vehicle->GetPassenger(SEAT_TENTACLE_BLOCK))
me->HandleSpellClick(ozumat, SEAT_DEFENSE_SYSTEM);
if (Creature* ozumat = _instance->GetCreature(DATA_OZUMAT_PASSENGER))
ozumat->EnterVehicle(me, SEAT_DEFENSE_SYSTEM);
_events.ScheduleEvent(EVENT_CHANGE_TO_ESCAPE_SEAT, 29s);
break;
case EVENT_CHANGE_TO_ESCAPE_SEAT:
if (Vehicle* vehicle = me->GetVehicleKit())
{
if (Unit* ozumat = vehicle->GetPassenger(SEAT_DEFENSE_SYSTEM))
if (Creature* ozumat = _instance->GetCreature(DATA_OZUMAT_PASSENGER))
{
me->HandleSpellClick(ozumat, SEAT_ESCAPE);
ozumat->EnterVehicle(me, SEAT_ESCAPE);
me->DespawnOrUnsummon(6s);
if (Creature* creature = ozumat->ToCreature())
creature->DespawnOrUnsummon(6s);

3
src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.h
View File

@@ -47,7 +47,8 @@ enum TotTDataTypes
DATA_ABYSSAL_CORAL_CHUNK = 14,
DATA_NEPTULON = 15,
DATA_OZUMAT_VEHICLE = 16,
DATA_LADY_NAZJAR_GEYSERS = 17
DATA_LADY_NAZJAR_GEYSERS = 17,
DATA_OZUMAT_PASSENGER = 18
};
enum TotTCreatureIds