Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/VP: fixed achievement 'Extra Credit Bonus Stage!'

Browse Source
This commit is contained in:
Ovahlord
2019-11-10 14:33:56 +01:00
parent 53d2ecf123
commit f0a5b4f400
5 changed files with 104 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp
View File

@@ -118,7 +118,8 @@ class instance_vortex_pinnacle : public InstanceMapScript
SummonGroundingFieldPrism(FirstPrismGroundingFieldTop, FirstPrismGroundingFieldPoints);
SummonGroundingFieldPrism(SecondPrismGroundingFieldTop, SecondPrismGroundingFieldPoints);
events.ScheduleEvent(EVENT_SUMMON_ZEPHYRS, 1s);
_events.ScheduleEvent(EVENT_SUMMON_ZEPHYRS, 1s);
_collectedGoldenOrbs = 0;
}
void OnCreatureCreate(Creature* creature) override
@@ -131,7 +132,7 @@ class instance_vortex_pinnacle : public InstanceMapScript
creature->SetDisplayId(creature->GetCreatureTemplate()->Modelid2);
break;
case NPC_AIR_CURRENT:
airCurrentGUIDs.push_back(creature->GetGUID());
_airCurrentGUIDs.push_back(creature->GetGUID());
break;
case NPC_SLIPSTREAM:
for (SlipstreamVehicleData info : SlipStreamInfo)
@@ -165,6 +166,9 @@ class instance_vortex_pinnacle : public InstanceMapScript
}
}
break;
case NPC_GOLDEN_ORB:
creature->SetDisplayId(creature->GetCreatureTemplate()->Modelid2);
break;
default:
break;
}
@@ -176,21 +180,37 @@ class instance_vortex_pinnacle : public InstanceMapScript
if (type == DATA_ALTAIRUS && (state == DONE || state == FAIL))
{
for (ObjectGuid guid : airCurrentGUIDs)
for (ObjectGuid guid : _airCurrentGUIDs)
if (Creature* air = instance->GetCreature(guid))
air->DespawnOrUnsummon(0, 30s);
airCurrentGUIDs.clear();
_airCurrentGUIDs.clear();
}
return true;
}
void SetData(uint32 type, uint32 value) override
{
switch (type)
{
case DATA_COLLECTED_GOLDEN_ORB:
_collectedGoldenOrbs++;
DoUpdateWorldState(WS_GOLDEN_ORBS_COLLECTED, _collectedGoldenOrbs);
if (_collectedGoldenOrbs == 5)
DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK);
SaveToDB();
break;
default:
break;
}
}
void Update(uint32 diff) override
{
events.Update(diff);
_events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
while (uint32 eventId = _events.ExecuteEvent())
{
switch (eventId)
{
@@ -201,7 +221,7 @@ class instance_vortex_pinnacle : public InstanceMapScript
if (instance->IsGridLoaded(NorthZephyrSummonLocation))
if (TempSummon* zephyr = instance->SummonCreature(NPC_ZEPHYR, NorthZephyrSummonLocation, nullptr, 18 * IN_MILLISECONDS))
zephyr->GetMotionMaster()->MovePath(PATH_ZEPHYR_NORTH, false);
events.Repeat(10s);
_events.Repeat(10s);
break;
default:
break;
@@ -209,6 +229,21 @@ class instance_vortex_pinnacle : public InstanceMapScript
}
}
void FillInitialWorldStates(WorldPacket& data) override
{
data << uint32(WS_GOLDEN_ORBS_COLLECTED) << uint32(_collectedGoldenOrbs);
}
void WriteSaveDataMore(std::ostringstream& data) override
{
data << _collectedGoldenOrbs;
}
void ReadSaveDataMore(std::istringstream& data) override
{
data >> _collectedGoldenOrbs;
}
private:
// Spawns Grounding Field prism
void SummonGroundingFieldPrism(Position positionTop, const Position positionPoints[PrismGroundingFieldPoints])
@@ -230,8 +265,9 @@ class instance_vortex_pinnacle : public InstanceMapScript
}
}
EventMap events;
GuidVector airCurrentGUIDs;
EventMap _events;
GuidVector _airCurrentGUIDs;
uint8 _collectedGoldenOrbs;
};
InstanceScript* GetInstanceScript(InstanceMap* map) const override

2
src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
View File

@@ -32,7 +32,7 @@
enum Texts
{
SAY_FEIGN_DEATH = 0,
SAY_FEIGN_DEATH = 0
};
enum Spells

15
src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
View File

@@ -45,7 +45,9 @@ enum DataTypes
DATA_SLIPSTREAM_ASAAD_1,
DATA_SLIPSTREAM_ENTRANCE_1,
DATA_SLIPSTREAM_ENTRANCE_2
DATA_SLIPSTREAM_ENTRANCE_2,
DATA_COLLECTED_GOLDEN_ORB
};
enum VPCreatureIds
@@ -71,16 +73,18 @@ enum VPCreatureIds
NPC_ZEPHYR = 45991,
NPC_SKYFALL = 45981,
NPC_SKYFALL_STAR = 52019,
NPC_GOLDEN_ORB = 51157,
// Grounding Field
NPC_GROUNDING_FIELD = 47085
NPC_GROUNDING_FIELD = 47085,
};
enum VPSpells
{
SPELL_BEAM_A = 87721,
SPELL_BEAM_B = 87722,
SPELL_BEAM_C = 87723
SPELL_BEAM_C = 87723,
SPELL_ACHIEVEMENT_CHECK = 94756
};
enum VPActions
@@ -95,6 +99,11 @@ enum VPMisc
PATH_ZEPHYR_NORTH = 4599101
};
enum VPWorldStates
{
WS_GOLDEN_ORBS_COLLECTED = 5649
};
template <class AI, class T>
inline AI* GetVortexPinnacleAI(T* obj)
{