nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-18 11:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
View File

@@ -29,12 +29,9 @@ public:
{
instance_auchenai_crypts_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
}
void Load(char const* data) override { LoadBossState(data); }
std::string GetSaveData() override { return DataHeader + GetBossSaveData(); }
};
InstanceScript* GetInstanceScript(InstanceMap* map) const override

5
src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
View File

@@ -29,12 +29,9 @@ public:
{
instance_mana_tombs_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
}
void Load(char const* data) override { LoadBossState(data); }
std::string GetSaveData() override { return DataHeader + GetBossSaveData(); }
};
InstanceScript* GetInstanceScript(InstanceMap* map) const override

2
src/server/scripts/Outland/BlackTemple/black_temple.h
View File

@@ -26,6 +26,8 @@
#include "SpellAuraEffects.h"
#include "SpellScript.h"
#define DataHeader "BT"
#define BlackTempleScriptName "instance_black_temple"
enum DataTypes

44
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
View File

@@ -64,6 +64,7 @@ public:
{
instance_black_temple_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTERS);
LoadDoorData(doorData);
LoadBossBoundaries(boundaries);
@@ -229,49 +230,6 @@ public:
return true;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "B T " << 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 == 'B' && dataHead2 == 'T')
{
for (uint8 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 ShadeOfAkamaGUID;
ObjectGuid AkamaShadeGUID;

44
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
View File

@@ -42,6 +42,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTERS);
LoadDoorData(doorData);
@@ -173,49 +174,6 @@ public:
return 0;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "S C " << 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 == 'C')
{
for (uint8 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;
}
private:
ObjectGuid LadyVashjGUID;
ObjectGuid ShieldGeneratorGUID[4];

2
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
View File

@@ -25,6 +25,8 @@
#include "SpellAuraEffects.h"
#include "SpellScript.h"
#define DataHeader "SS"
#define SerpentShrineScriptName "instance_serpent_shrine"
enum DataTypes

3
src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
View File

@@ -37,11 +37,10 @@ public:
{
instance_the_slave_pens_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
counter = DATA_FLAMECALLER_000;
}
void Load(char const* /*data*/) override { LoadBossState(DataHeader); }
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())

2
src/server/scripts/Outland/GruulsLair/gruuls_lair.h
View File

@@ -22,6 +22,8 @@
#include "CreatureAIImpl.h"
#include "SpellAuraEffects.h"
#define DataHeader "GL"
#define GruulsLairScriptName "instance_gruuls_lair"
enum DataTypes

44
src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
View File

@@ -44,6 +44,7 @@ public:
{
instance_gruuls_lair_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
LoadDoorData(doorData);
LoadMinionData(minionData);
@@ -127,49 +128,6 @@ public:
return 0;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "G L " << 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 == 'G' && dataHead2 == 'L')
{
for (uint32 i = 0; i < MAX_ENCOUNTER; ++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:
uint32 _addsKilled;
ObjectGuid _maulgarGUID;

1
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
View File

@@ -21,6 +21,7 @@
#include "CreatureAIImpl.h"
#include "SpellScript.h"
#define DataHeader "HR"
#define HellfireRampartsScriptName "instance_hellfire_ramparts"
enum DataTypes

31
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
View File

@@ -30,6 +30,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTERS);
}
@@ -55,36 +56,6 @@ public:
return true;
}
std::string GetSaveData() override
{
std::ostringstream saveStream;
saveStream << "H R " << GetBossSaveData();
return saveStream.str();
}
void Load(const char* strIn) override
{
if (!strIn)
return;
char dataHead1, dataHead2;
std::istringstream loadStream(strIn);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'H' && dataHead2 == 'R')
{
for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
}
}
protected:
ObjectGuid felIronChestGUID;
};

44
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
View File

@@ -44,6 +44,7 @@ public:
{
instance_magtheridons_lair_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
LoadDoorData(doorData);
LoadMinionData(minionData);
@@ -179,49 +180,6 @@ public:
}
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "M L " << 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 == 'M' && dataHead2 == 'L')
{
for (uint32 i = 0; i < MAX_ENCOUNTER; ++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:
ObjectGuid _magtheridonGUID;
GuidSet _wardersSet;

2
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
View File

@@ -21,6 +21,8 @@
#include "CreatureAIImpl.h"
#include "SpellScript.h"
#define DataHeader "ML"
#define MagtheridonsLairScriptName "instance_magtheridons_lair"
enum DataTypes

43
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
View File

@@ -186,49 +186,14 @@ public:
}
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "S H " << GetBossSaveData() << ' ' << RescueTimer;
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
data >> RescueTimer;
}
void Load(const char* strIn) override
void WriteSaveDataMore(std::ostringstream& data) 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 == 'S' && dataHead2 == 'H')
{
for (uint8 i = 0; i < ENCOUNTER_COUNT; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
loadStream >> RescueTimer;
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
data << RescueTimer;
}
protected:

54
src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
View File

@@ -26,7 +26,11 @@ public:
struct instance_the_eye_InstanceMapScript : public InstanceScript
{
instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) {}
instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
}
ObjectGuid ThaladredTheDarkenerGUID;
ObjectGuid LordSanguinarGUID;
@@ -38,11 +42,6 @@ public:
ObjectGuid KaelStateRightGUID;
ObjectGuid KaelStateLeftGUID;
void Initialize() override
{
SetBossNumber(MAX_ENCOUNTER);
}
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
@@ -110,49 +109,6 @@ public:
return ObjectGuid::Empty;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "E Y " << 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 == 'E' && dataHead2 == 'Y')
{
for (uint32 i = 0; i < MAX_ENCOUNTER; ++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;
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const override

2
src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
View File

@@ -24,6 +24,8 @@
#include "SpellAuraEffects.h"
#include "SpellScript.h"
#define DataHeader "TE"
#define TheEyeScriptName "instance_the_eye"
enum EyeData

58
src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
View File

@@ -36,6 +36,7 @@ public:
{
instance_mechanar_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
LoadDoorData(doorData);
@@ -192,60 +193,19 @@ public:
}
}
bool SetBossState(uint32 type, EncounterState state) override
void ReadSaveDataMore(std::istringstream& data) override
{
if (!InstanceScript::SetBossState(type, state))
return false;
data >> _passageEncounter;
return true;
if (_passageEncounter == ENCOUNTER_PASSAGE_DONE)
{
_passageEncounter = ENCOUNTER_PASSAGE_PHASE6;
}
}
std::string GetSaveData() override
void WriteSaveDataMore(std::ostringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
// Xinef: no space needed
saveStream << "M E " << GetBossSaveData() << _passageEncounter;
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 == 'M' && dataHead2 == 'E')
{
for (uint32 i = 0; i < MAX_ENCOUNTER; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
loadStream >> _passageEncounter;
if (_passageEncounter == ENCOUNTER_PASSAGE_DONE)
_passageEncounter = ENCOUNTER_PASSAGE_PHASE6;
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
data << _passageEncounter;
}
private:

2
src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
View File

@@ -24,6 +24,8 @@
#include "SpellAuraEffects.h"
#include "SpellScript.h"
#define DataHeader "MR"
#define MechanarScriptName "instance_mechanar"
enum DataTypes

2
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
View File

@@ -23,6 +23,8 @@
#include "Player.h"
#include "SpellScript.h"
#define DataHeader "AZ"
#define ArcatrazScriptName "instance_arcatraz"
enum DataTypes

44
src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
View File

@@ -35,6 +35,7 @@ public:
{
instance_arcatraz_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUTER);
LoadDoorData(doorData);
}
@@ -154,49 +155,6 @@ public:
return true;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "A Z " << 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 == 'A' && dataHead2 == 'Z')
{
for (uint32 i = 0; i < MAX_ENCOUTER; ++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 DalliahGUID;
ObjectGuid SoccothratesGUID;

52
src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
View File

@@ -29,59 +29,9 @@ public:
{
instance_the_botanica_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
}
bool SetBossState(uint32 type, EncounterState state) override
{
if (!InstanceScript::SetBossState(type, state))
return false;
return true;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "B O " << 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 == 'B' && dataHead2 == 'O')
{
for (uint32 i = 0; i < MAX_ENCOUNTER; ++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;
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const override

2
src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
View File

@@ -23,6 +23,8 @@
#define TheBotanicaScriptName "instance_the_botanica"
#define DataHeader "BC"
enum DataTypes
{
DATA_COMMANDER_SARANNIS = 0,