refactor(Core/InstanceScript): refactored load and save methods (#14977)

Co-authored-by: joschiwald <736792+joschiwald@users.noreply.github.com>
This commit is contained in:
Skjalf
2023-02-12 15:53:48 -03:00
committed by GitHub
parent 5cc73e1963
commit 0dbb8c814c
126 changed files with 677 additions and 2004 deletions

View File

@@ -19,6 +19,8 @@
#define DEF_BRD_H
#include "CreatureAIImpl.h"
#define DataHeader "BRD"
#define BRDScriptName "instance_blackrock_depths"
enum FactionIds

View File

@@ -107,7 +107,10 @@ public:
struct instance_blackrock_depths_InstanceMapScript : public InstanceScript
{
instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
uint32 encounter[MAX_ENCOUNTER];
std::string str_data;

View File

@@ -22,6 +22,8 @@
uint32 const EncounterCount = 23;
#define DataHeader "BRS"
#define BRSScriptName "instance_blackrock_spire"
enum DataTypes

View File

@@ -85,6 +85,7 @@ public:
instance_blackrock_spireMapScript(InstanceMap* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
LoadMinionData(minionData);
LoadDoorData(doorData);
@@ -672,50 +673,6 @@ public:
}
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "B S " << GetBossSaveData();
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
}
void Load(const char* strIn) override
{
if (!strIn)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(strIn);
char dataHead1, dataHead2;
std::istringstream loadStream(strIn);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'B' && dataHead2 == 'S')
{
for (uint8 i = 0; i < EncounterCount; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
}
protected:
EventMap Events;
ObjectGuid HighlordOmokk;

View File

@@ -78,7 +78,7 @@ public:
{
instance_blackwing_lair_InstanceMapScript(Map* map) : InstanceScript(map)
{
//SetHeaders(DataHeader);
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
LoadDoorData(doorData);
LoadObjectData(creatureData, objectData);
@@ -432,52 +432,15 @@ public:
}
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "B W L " << GetBossSaveData() << NefarianLeftTunnel << ' ' << NefarianRightTunnel;
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
data >> NefarianLeftTunnel;
data >> NefarianRightTunnel;
}
void Load(char const* data) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!data)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(data);
char dataHead1, dataHead2, dataHead3;
std::istringstream loadStream(data);
loadStream >> dataHead1 >> dataHead2 >> dataHead3;
if (dataHead1 == 'B' && dataHead2 == 'W' && dataHead3 == 'L')
{
for (uint32 i = 0; i < EncounterCount; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState == FAIL || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
loadStream >> NefarianLeftTunnel;
loadStream >> NefarianRightTunnel;
}
else
{
OUT_LOAD_INST_DATA_FAIL;
}
OUT_LOAD_INST_DATA_COMPLETE;
data << NefarianLeftTunnel << ' ' << NefarianRightTunnel;
}
protected:

View File

@@ -62,6 +62,7 @@ public:
{
instance_molten_core_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
LoadMinionData(minionData);
}
@@ -404,59 +405,6 @@ public:
return true;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "M C " << GetBossSaveData();
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
}
void Load(char const* data) override
{
if (!data)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(data);
char dataHead1, dataHead2;
std::istringstream loadStream(data);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'M' && dataHead2 == 'C')
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > TO_BE_DECIDED)
{
tmpState = NOT_STARTED;
}
SetBossState(i, static_cast<EncounterState>(tmpState));
}
if (CheckMajordomoExecutus())
{
SummonMajordomoExecutus();
}
}
else
{
OUT_LOAD_INST_DATA_FAIL;
}
OUT_LOAD_INST_DATA_COMPLETE;
}
private:
std::unordered_map<uint32/*bossid*/, ObjectGuid/*circleGUID*/> _circlesGUIDs;
std::unordered_map<uint32/*bossid*/, ObjectGuid/*runeGUID*/> _runesGUIDs;

View File

@@ -21,6 +21,8 @@
#include "CreatureAIImpl.h"
#include "Object.h"
#define DataHeader "MC"
constexpr auto MCScriptName = "instance_molten_core";
constexpr uint32 MAX_ENCOUNTER = 10;

View File

@@ -20,6 +20,7 @@
#include "CreatureAIImpl.h"
#define DataHeader "DM"
#define DeadminesScriptName "instance_deadmines"
enum DataTypes

View File

@@ -28,6 +28,7 @@ public:
{
instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
void Initialize() override

View File

@@ -20,6 +20,8 @@
#include "CreatureAIImpl.h"
#define DataHeader "GNO"
#define GnomereganScriptName "instance_gnomeregan"
template <class AI, class T>

View File

@@ -36,6 +36,7 @@ public:
{
instance_gnomeregan_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
void OnCreatureCreate(Creature* creature) override
@@ -77,30 +78,14 @@ public:
SaveToDB();
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "D E " << _encounters[0];
return saveStream.str();
data >> _encounters[TYPE_GRUBBIS];
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
return;
char dataHead1, dataHead2;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'D' && dataHead2 == 'E')
{
for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
{
loadStream >> _encounters[i];
if (_encounters[i] == IN_PROGRESS)
_encounters[i] = NOT_STARTED;
}
}
data << _encounters[TYPE_GRUBBIS];
}
private:

View File

@@ -46,6 +46,7 @@ public:
{
instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
// 1 - OZ, 2 - HOOD, 3 - RAJ, this never gets altered.

View File

@@ -26,7 +26,10 @@ public:
struct instance_magisters_terrace_InstanceMapScript : public InstanceScript
{
instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
uint32 Encounter[MAX_ENCOUNTER];
@@ -150,39 +153,17 @@ public:
}
}
std::string GetSaveData() override
// @todo: Use BossStates. This is for code compatibility
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << Encounter[0] << ' ' << Encounter[1] << ' ' << Encounter[2] << ' ' << Encounter[3];
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
data >> Encounter[1];
data >> Encounter[2];
data >> Encounter[3];
}
void Load(const char* str) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!str)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(str);
std::istringstream loadStream(str);
for (uint32 i = 0; i < MAX_ENCOUNTER; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetData(i, tmpState);
}
OUT_LOAD_INST_DATA_COMPLETE;
data << Encounter[0] << ' ' << Encounter[1] << ' ' << Encounter[2] << ' ' << Encounter[3];
}
ObjectGuid GetGuidData(uint32 identifier) const override

View File

@@ -23,6 +23,7 @@
#include "Player.h"
#include "SpellScript.h"
#define DataHeader "MT"
#define MTScriptName "instance_magisters_terrace"
enum MTData

View File

@@ -66,7 +66,10 @@ public:
struct instance_scarlet_monastery_InstanceMapScript : public InstanceScript
{
instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
void OnPlayerEnter(Player* player) override
{

View File

@@ -20,6 +20,8 @@
#include "CreatureAIImpl.h"
#define DataHeader "SM"
#define ScarletMonasteryScriptName "instance_scarlet_monastery"
template <class AI, class T>

View File

@@ -211,30 +211,15 @@ public:
return 0;
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "S O " << _kirtonosState << ' ' << _miniBosses;
return saveStream.str();
data >> _kirtonosState;
data >> _miniBosses;
}
void Load(const char* str) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!str)
return;
char dataHead1, dataHead2;
std::istringstream loadStream(str);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'S' && dataHead2 == 'O')
{
loadStream >> _kirtonosState;
loadStream >> _miniBosses;
if (_kirtonosState == IN_PROGRESS)
_kirtonosState = NOT_STARTED;
}
data << _kirtonosState << ' ' << _miniBosses;
}
protected:

View File

@@ -37,7 +37,10 @@ public:
struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript
{
instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map) { }
instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
void Initialize() override
{
@@ -112,30 +115,16 @@ public:
SaveToDB();
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "S K " << _encounters[0] << ' ' << _encounters[1] << ' ' << _encounters[2];
return saveStream.str();
data >> _encounters[0];
data >> _encounters[1];
data >> _encounters[2];
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
return;
char dataHead1, dataHead2;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'S' && dataHead2 == 'K')
{
for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
{
loadStream >> _encounters[i];
if (_encounters[i] == IN_PROGRESS)
_encounters[i] = NOT_STARTED;
}
}
data << _encounters[0] << ' ' << _encounters[1] << ' ' << _encounters[2];
}
private:

View File

@@ -22,6 +22,7 @@
#include "SpellScript.h"
#include "CreatureAIImpl.h"
#define DataHeader "SK"
#define ShadowfangKeepScriptName "instance_shadowfang_keep"
enum DataTypes

View File

@@ -60,6 +60,7 @@ public:
{
instance_stratholme_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
void Initialize() override
@@ -344,37 +345,36 @@ public:
SaveToDB();
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "S T " << _baronRunProgress << ' ' << _baronRunTime << ' ' << _zigguratState1 << ' ' << _zigguratState2 << ' ' << _zigguratState3 << ' ' << _slaughterProgress << ' ' << _postboxesOpened;
return saveStream.str();
}
data >> _baronRunProgress;
data >> _baronRunTime;
data >> _zigguratState1;
data >> _zigguratState2;
data >> _zigguratState3;
data >> _slaughterProgress;
data >> _postboxesOpened;
void Load(const char* in) override
{
if (!in)
return;
char dataHead1, dataHead2;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'S' && dataHead2 == 'T')
if (_baronRunTime)
{
loadStream >> _baronRunProgress;
loadStream >> _baronRunTime;
loadStream >> _zigguratState1;
loadStream >> _zigguratState2;
loadStream >> _zigguratState3;
loadStream >> _slaughterProgress;
loadStream >> _postboxesOpened;
events.ScheduleEvent(EVENT_BARON_TIME, 60000);
}
if (_baronRunTime > 0)
events.ScheduleEvent(EVENT_BARON_TIME, 60000);
if (_slaughterProgress > 0 && _slaughterProgress < 4)
{
events.ScheduleEvent(EVENT_FORCE_SLAUGHTER_EVENT, 5000);
}
}
void WriteSaveDataMore(std::ostringstream& data) override
{
data << _baronRunProgress << ' '
<< _baronRunTime << ' '
<< _zigguratState1 << ' '
<< _zigguratState2 << ' '
<< _zigguratState3 << ' '
<< _slaughterProgress << ' '
<< _postboxesOpened;
}
uint32 GetData(uint32 type) const override

View File

@@ -20,6 +20,7 @@
#include "SpellAuras.h"
#define DataHeader "STR"
#define StratholmeScriptName "instance_stratholme"
enum DataTypes

View File

@@ -33,6 +33,7 @@ public:
{
instance_sunken_temple_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
}
void Initialize() override
@@ -168,33 +169,22 @@ public:
}
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "T A " << _encounters[0] << ' ' << _encounters[1] << ' ' << _encounters[2] << ' ' << _statuePhase << ' ' << _defendersKilled;
return saveStream.str();
data >> _encounters[0];
data >> _encounters[1];
data >> _encounters[2];
data >> _statuePhase;
data >> _defendersKilled;
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
return;
char dataHead1, dataHead2;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'T' && dataHead2 == 'A')
{
for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
{
loadStream >> _encounters[i];
if (_encounters[i] == IN_PROGRESS)
_encounters[i] = NOT_STARTED;
}
loadStream >> _statuePhase;
loadStream >> _defendersKilled;
}
data << _encounters[0] << ' '
<< _encounters[1] << ' '
<< _encounters[2] << ' '
<< _statuePhase << ' '
<< _defendersKilled;
}
private:

View File

@@ -18,6 +18,8 @@
#ifndef DEF_SUNKEN_TEMPLE_H
#define DEF_SUNKEN_TEMPLE_H
#define DataHeader "STR"
enum DataTypes
{
DATA_STATUES = 10,

View File

@@ -40,6 +40,7 @@ public:
{
instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTERS);
LoadDoorData(doorData);
}
@@ -233,49 +234,6 @@ public:
return ObjectGuid::Empty;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "S P " << GetBossSaveData();
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
}
void Load(char const* str) override
{
if (!str)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(str);
char dataHead1, dataHead2;
std::istringstream loadStream(str);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'S' && dataHead2 == 'P')
{
for (uint32 i = 0; i < MAX_ENCOUNTERS; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
}
protected:
ObjectGuid KalecgosDragonGUID;
ObjectGuid SathrovarrGUID;

View File

@@ -24,6 +24,8 @@
#include "SpellAuraEffects.h"
#include "SpellScript.h"
#define DataHeader "SWP"
#define SWPScriptName "instance_sunwell_plateau"
enum DataTypes

View File

@@ -43,6 +43,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
memset(&_encounters, 0, sizeof(_encounters));
}
@@ -101,31 +102,18 @@ public:
return 0;
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "U D " << _encounters[DATA_IRONAYA_DOORS] << ' ' << _encounters[DATA_STONE_KEEPERS] << ' ' << _encounters[DATA_ARCHAEDAS];
return saveStream.str();
data >> _encounters[DATA_IRONAYA_DOORS];
data >> _encounters[DATA_STONE_KEEPERS];
data >> _encounters[DATA_ARCHAEDAS];
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
return;
char dataHead1, dataHead2;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'U' && dataHead2 == 'D')
{
for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
{
loadStream >> _encounters[i];
if (_encounters[i] == IN_PROGRESS)
_encounters[i] = NOT_STARTED;
}
}
data << _encounters[DATA_IRONAYA_DOORS] << ' '
<< _encounters[DATA_STONE_KEEPERS] << ' '
<< _encounters[DATA_ARCHAEDAS];
}
void OnCreatureCreate(Creature* creature) override

View File

@@ -18,6 +18,8 @@
#ifndef DEF_ULDAMAN_H
#define DEF_ULDAMAN_H
#define DataHeader "UD"
enum DataTypes
{
DATA_IRONAYA_DOORS = 0,

View File

@@ -91,6 +91,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
QuestTimer = 0;

View File

@@ -20,6 +20,7 @@
#include "CreatureAIImpl.h"
#define DataHeader "ZA"
#define ZulAmanScriptName "instance_zulaman"
enum DataTypes

View File

@@ -50,6 +50,7 @@ public:
{
instance_zulgurub_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
LoadDoorData(doorData);
LoadObjectData(creatureData, nullptr);
@@ -170,48 +171,6 @@ public:
return true;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "Z G " << GetBossSaveData();
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
}
void Load(const char* str) override
{
if (!str)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(str);
char dataHead1, dataHead2;
std::istringstream loadStream(str);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'Z' && dataHead2 == 'G')
{
for (uint32 i = 0; i < EncounterCount; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
}
private:
// If all High Priest bosses were killed. Ohgan is added too.
// Jindo is needed for healfunction.

View File

@@ -22,6 +22,8 @@
uint32 const EncounterCount = 13;
#define DataHeader "ZG"
#define ZGScriptName "instance_zulgurub"
enum DataTypes