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

Core/Instances: Instance lock rewrite (WIP)

Browse Source
This commit is contained in:
Shauren
2018-07-22 13:22:35 +02:00
parent ad2df01b2c
commit 17665c929c
27 changed files with 1261 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/server/game/Instances/InstanceScript.cpp
View File

@@ -21,6 +21,7 @@
#include "CreatureAI.h"
#include "CreatureAIImpl.h"
#include "DatabaseEnv.h"
#include "DB2Stores.h"
#include "GameEventSender.h"
#include "GameObject.h"
#include "Group.h"
@@ -51,6 +52,16 @@ BossBoundaryData::~BossBoundaryData()
delete it->Boundary;
}
DungeonEncounterEntry const* BossInfo::GetDungeonEncounterForDifficulty(Difficulty difficulty) const
{
auto itr = std::find_if(DungeonEncounters.begin(), DungeonEncounters.end(), [difficulty](DungeonEncounterEntry const* dungeonEncounter)
{
return dungeonEncounter && (dungeonEncounter->DifficultyID == 0 || Difficulty(dungeonEncounter->DifficultyID) == difficulty);
});
return itr != DungeonEncounters.end() ? *itr : nullptr;
}
InstanceScript::InstanceScript(InstanceMap* map) : instance(map), completedEncounters(0), _instanceSpawnGroups(sObjectMgr->GetInstanceSpawnGroupsForMap(map->GetId())),
_entranceId(0), _temporaryEntranceId(0), _combatResurrectionTimer(0), _combatResurrectionCharges(0), _combatResurrectionTimerStarted(false)
{
@@ -217,6 +228,13 @@ void InstanceScript::LoadObjectData(ObjectData const* data, ObjectInfoMap& objec
}
}
void InstanceScript::LoadDungeonEncounterData(uint32 bossId, std::array<uint32, MAX_DUNGEON_ENCOUNTERS_PER_BOSS> const& dungeonEncounterIds)
{
if (bossId < bosses.size())
for (std::size_t i = 0; i < MAX_DUNGEON_ENCOUNTERS_PER_BOSS; ++i)
bosses[bossId].DungeonEncounters[i] = sDungeonEncounterStore.LookupEntry(dungeonEncounterIds[i]);
}
void InstanceScript::UpdateDoorState(GameObject* door)
{
DoorInfoMapBounds range = doors.equal_range(door->GetEntry());
@@ -397,6 +415,7 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
if (minion->isWorldBoss() && minion->IsAlive())
return false;
DungeonEncounterEntry const* dungeonEncounter = nullptr;
switch (state)
{
case IN_PROGRESS:
@@ -413,9 +432,18 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
break;
}
case FAIL:
ResetCombatResurrections();
SendEncounterEnd();
break;
case DONE:
ResetCombatResurrections();
SendEncounterEnd();
dungeonEncounter = bossInfo->GetDungeonEncounterForDifficulty(instance->GetDifficultyID());
if (dungeonEncounter)
{
DoUpdateCriteria(CriteriaType::DefeatDungeonEncounter, dungeonEncounter->ID);
SendBossKillCredit(dungeonEncounter->ID);
}
break;
default:
break;
@@ -423,6 +451,8 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
bossInfo->state = state;
SaveToDB();
if (state == DONE)
instance->UpdateInstanceLock(dungeonEncounter, { id, state });
}
for (uint32 type = 0; type < MAX_DOOR_TYPES; ++type)
@@ -493,7 +523,7 @@ bool InstanceScript::ReadSaveDataHeaders(std::istringstream& data)
void InstanceScript::ReadSaveDataBossStates(std::istringstream& data)
{
uint32 bossId = 0;
for (std::vector<BossInfo>::iterator i = bosses.begin(); i != bosses.end(); ++i, ++bossId)
for (; bossId < bosses.size(); ++bossId)
{
uint32 buff;
data >> buff;
@@ -521,6 +551,31 @@ std::string InstanceScript::GetSaveData()
return saveStream.str();
}
std::string InstanceScript::UpdateSaveData(std::string const& oldData, UpdateSaveDataEvent const& event)
{
if (!instance->GetMapDifficulty()->IsUsingEncounterLocks())
return GetSaveData();
std::size_t position = (headers.size() + event.BossId) * 2;
std::string newData = oldData;
if (position >= oldData.length())
{
// Initialize blank data
std::ostringstream saveStream;
WriteSaveDataHeaders(saveStream);
for (std::size_t i = 0; i < bosses.size(); ++i)
saveStream << uint32(NOT_STARTED) << ' ';
WriteSaveDataMore(saveStream);
newData = saveStream.str();
}
newData[position] = uint32(event.NewState) + '0';
return newData;
}
void InstanceScript::WriteSaveDataHeaders(std::ostringstream& data)
{
for (char header : headers)