nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-14 07:53:44 +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

2
src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
View File

@@ -18,6 +18,8 @@
#ifndef BFD_H_
#define BFD_H_
#define DataHeader "BFD"
enum Data
{
TYPE_GELIHAST = 0,

35
src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
View File

@@ -35,6 +35,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
memset(&_encounters, 0, sizeof(_encounters));
_requiredDeaths = 0;
}
@@ -111,30 +112,24 @@ public:
SaveToDB();
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "B L " << _encounters[0] << ' ' << _encounters[1] << ' ' << _encounters[2] << ' ' << _encounters[3] << ' ' << _encounters[4] << ' ' << _encounters[5];
return saveStream.str();
data >> _encounters[0];
data >> _encounters[1];
data >> _encounters[2];
data >> _encounters[3];
data >> _encounters[4];
data >> _encounters[5];
}
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 == 'B' && dataHead2 == 'L')
{
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] << ' '
<< _encounters[3] << ' '
<< _encounters[4] << ' '
<< _encounters[5];
}
bool IsFireEventDone()

2
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
View File

@@ -21,6 +21,8 @@
#include "CreatureAIImpl.h"
#include "GridNotifiers.h"
#define DataHeader "HY"
#define HyjalScriptName "instance_hyjal"
uint32 const EncounterCount = 5;

47
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
View File

@@ -55,6 +55,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
m_uiAncientGemGUID.clear();
@@ -257,18 +258,7 @@ public:
if (data == DONE)
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' '
<< m_auiEncounter[3] << ' ' << m_auiEncounter[4]
<< ' ' << allianceRetreat << ' ' << hordeRetreat
<< ' ' << RaidDamage;
str_data = saveStream.str();
SaveToDB();
OUT_SAVE_INST_DATA_COMPLETE;
}
}
@@ -298,31 +288,32 @@ public:
return 0;
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
return str_data;
data >> m_auiEncounter[0];
data >> m_auiEncounter[1];
data >> m_auiEncounter[2];
data >> m_auiEncounter[3];
data >> m_auiEncounter[4];
data >> allianceRetreat;
data >> hordeRetreat;
data >> RaidDamage;
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(in);
std::istringstream loadStream(in);
loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4] >> allianceRetreat >> hordeRetreat >> RaidDamage;
for (uint8 i = 0; i < EncounterCount; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as IN_PROGRESS - reset it instead.
m_auiEncounter[i] = NOT_STARTED;
OUT_LOAD_INST_DATA_COMPLETE;
data << m_auiEncounter[0] << ' '
<< m_auiEncounter[1] << ' '
<< m_auiEncounter[2] << ' '
<< m_auiEncounter[3] << ' '
<< m_auiEncounter[4]<< ' '
<< allianceRetreat << ' '
<< hordeRetreat << ' '
<< RaidDamage;
}
protected:
uint32 m_auiEncounter[EncounterCount];
std::string str_data;
GuidList m_uiAncientGemGUID;
ObjectGuid RageWinterchill;
ObjectGuid Anetheron;

1
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
View File

@@ -20,6 +20,7 @@
#include "CreatureAIImpl.h"
#define DataHeader "CS"
#define CullingOfStratholmeScriptName "instance_culling_of_stratholme"
enum Data

1
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
View File

@@ -38,6 +38,7 @@ public:
instance_culling_of_stratholme_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
// Instance
SetHeaders(DataHeader);
_crateCount = 0;
_showCrateTimer = 0;
_guardianTimer = 0;

38
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
View File

@@ -53,6 +53,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
_encounterProgress = 0;
_barrelCount = 0;
_attemptsCount = 0;
@@ -298,42 +299,15 @@ public:
instance->LoadGrid(thrallPositions[i].GetPositionX(), thrallPositions[i].GetPositionY());
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "O H " << _encounterProgress << ' ' << _attemptsCount;
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
data >> _encounterProgress;
data >> _attemptsCount;
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
if (!in)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(in);
char dataHead1, dataHead2;
uint32 data0, data1;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2 >> data0 >> data1;
if (dataHead1 == 'O' && dataHead2 == 'H')
{
_encounterProgress = data0;
_attemptsCount = data1;
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
data << _encounterProgress << ' ' << _attemptsCount;
}
private:

2
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
View File

@@ -20,6 +20,8 @@
#include "CreatureAIImpl.h"
#define DataHeader "OH"
#define OldHillsbradScriptName "instance_old_hillsbrad"
enum DataIds

39
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
View File

@@ -53,6 +53,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
memset(&encounters, 0, sizeof(encounters));
_currentRift = 0;
_shieldPercent = 100;
@@ -327,40 +328,18 @@ public:
}
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "B M " << encounters[0] << ' ' << encounters[1] << ' ' << encounters[2];
OUT_SAVE_INST_DATA_COMPLETE;
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)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(in);
char dataHead1, dataHead2;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2;
if (dataHead1 == 'B' && dataHead2 == 'M')
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
loadStream >> encounters[i];
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
data << encounters[0] << ' '
<< encounters[1] << ' '
<< encounters[2] << ' ';
}
protected:

2
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
View File

@@ -22,6 +22,8 @@
#include "PassiveAI.h"
#include "SpellScript.h"
#define DataHeader "TBM"
#define TheBlackMorassScriptName "instance_the_black_morass"
enum DataTypes

2
src/server/scripts/Kalimdor/DireMaul/dire_maul.h
View File

@@ -20,6 +20,8 @@
#include "CreatureAIImpl.h"
#define DataHeader "DML"
constexpr auto DMScriptName = "instance_dire_maul";
enum DataTypes

32
src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
View File

@@ -30,6 +30,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
_eastWingProgress = 0;
_westWingProgress = 0;
_pylonsState = 0;
@@ -144,29 +145,22 @@ public:
return 0;
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "D M " << _eastWingProgress << ' ' << _westWingProgress << ' ' << _pylonsState << ' ' << _northWingProgress << ' ' << _northWingBosses;
return saveStream.str();
data >> _eastWingProgress;
data >> _westWingProgress;
data >> _pylonsState;
data >> _northWingProgress;
data >> _northWingBosses;
}
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 == 'M')
{
loadStream >> _eastWingProgress;
loadStream >> _westWingProgress;
loadStream >> _pylonsState;
loadStream >> _northWingProgress;
loadStream >> _northWingBosses;
}
data << _eastWingProgress << ' '
<< _westWingProgress << ' '
<< _pylonsState << ' '
<< _northWingProgress << ' '
<< _northWingBosses;
}
private:

25
src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
View File

@@ -32,6 +32,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
memset(&_encounters, 0, sizeof(_encounters));
}
@@ -59,30 +60,14 @@ public:
SaveToDB();
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "M A " << _encounters[0];
return saveStream.str();
data >> _encounters[0];
}
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 == 'M' && dataHead2 == 'A')
{
for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
{
loadStream >> _encounters[i];
if (_encounters[i] == IN_PROGRESS)
_encounters[i] = NOT_STARTED;
}
}
data << _encounters[0];
}
private:

2
src/server/scripts/Kalimdor/Maraudon/maraudon.h
View File

@@ -18,6 +18,8 @@
#ifndef DEF_MARAUDON_H
#define DEF_MARAUDON_H
#define DataHeader "MA"
enum DataTypes
{
TYPE_NOXXION = 0,

45
src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
View File

@@ -44,6 +44,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
ManyWhelpsCounter = 0;
bDeepBreath = true;
@@ -93,50 +94,6 @@ public:
}
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "O L " << GetBossSaveData();
str_data = saveStream.str();
OUT_SAVE_INST_DATA_COMPLETE;
return str_data;
}
void Load(const char* in) override
{
if (!in)
{
OUT_LOAD_INST_DATA_FAIL;
return;
}
OUT_LOAD_INST_DATA(in);
char dataHead1, dataHead2;
uint16 data0;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2 >> data0;
if (dataHead1 == 'O' && dataHead2 == 'L')
{
for (uint32 i = 0; i < MAX_ENCOUNTER; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState == FAIL || tmpState > SPECIAL)
{
tmpState = NOT_STARTED;
}
SetBossState(i, EncounterState(tmpState));
}
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
}
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{
switch(criteria_id)

2
src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
View File

@@ -20,6 +20,8 @@
#include "CreatureAIImpl.h"
#define DataHeader "OL"
#define OnyxiasLairScriptName "instance_onyxias_lair"
enum eInstanceData

23
src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
View File

@@ -33,6 +33,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
_gongPhase = 0;
_firesState = 0;
}
@@ -70,27 +71,15 @@ public:
SaveToDB();
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "R D " << _gongPhase << ' ' << _firesState;
return saveStream.str();
data >> _gongPhase;
data >> _firesState;
}
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 == 'R' && dataHead2 == 'D')
{
loadStream >> _gongPhase;
loadStream >> _firesState;
}
data << _gongPhase << ' ' << _firesState;
}
private:

2
src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
View File

@@ -21,6 +21,8 @@
#include "CreatureAIImpl.h"
#include "PassiveAI.h"
#define DataHeader "RFD"
#define RazorfenDownsScriptName "instance_razorfen_downs"
enum CreatureIds

44
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
View File

@@ -72,6 +72,7 @@ public:
{
instance_ruins_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(NUM_ENCOUNTER);
LoadObjectData(creatureData, nullptr);
_rajaxWaveCounter = 0;
@@ -244,49 +245,6 @@ public:
return ObjectGuid::Empty;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "R A" << 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 == 'R' && dataHead2 == 'A')
{
for (uint8 i = 0; i < NUM_ENCOUNTER; ++i)
{
uint32 tmpState;
loadStream >> tmpState;
if (tmpState == IN_PROGRESS || tmpState > TO_BE_DECIDED)
tmpState = NOT_STARTED;
SetBossState(i, EncounterState(tmpState));
}
}
else
OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;
}
void CallNextRajaxxLeader(bool announce = false)
{
++_rajaxWaveCounter;

1
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
View File

@@ -20,6 +20,7 @@
#include "CreatureAIImpl.h"
#define DataHeader "RA"
#define RuinsOfAhnQirajScriptName "instance_ruins_of_ahnqiraj"
enum DataTypes

1
src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
View File

@@ -60,6 +60,7 @@ public:
{
instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
SetBossNumber(MAX_BOSS_NUMBER);
LoadObjectData(creatureData, nullptr);
LoadDoorData(doorData);

1
src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
View File

@@ -20,6 +20,7 @@
#include "CreatureAIImpl.h"
#define DataHeader "AQT"
#define TempleOfAhnQirajScriptName "instance_temple_of_ahnqiraj"
enum DataTypes

32
src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
View File

@@ -91,30 +91,22 @@ public:
return 0;
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "W C " << _encounters[0] << ' ' << _encounters[1] << ' ' << _encounters[2] << ' ' << _encounters[3] << ' ' << _encounters[4];
return saveStream.str();
data >> _encounters[0];
data >> _encounters[1];
data >> _encounters[2];
data >> _encounters[3];
data >> _encounters[4];
}
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 == 'W' && dataHead2 == 'C')
{
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] << ' '
<< _encounters[3] << ' '
<< _encounters[4] << ' ';
}
private:

2
src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
View File

@@ -18,6 +18,8 @@
#ifndef DEF_WAILING_CAVERNS_H
#define DEF_WAILING_CAVERNS_H
#define DataHeader "WC"
#include "CreatureAI.h"
enum DataTypes

23
src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
View File

@@ -133,6 +133,7 @@ public:
void Initialize() override
{
SetHeaders(DataHeader);
GahzrillaSummoned = NOT_STARTED;
PyramidPhase = 0;
@@ -440,27 +441,15 @@ public:
}
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
std::ostringstream saveStream;
saveStream << "Z F " << PyramidPhase << ' ' << GahzrillaSummoned;
return saveStream.str();
data >> PyramidPhase;
data >> GahzrillaSummoned;
}
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 == 'Z' && dataHead2 == 'F')
{
loadStream >> PyramidPhase;
loadStream >> GahzrillaSummoned;
}
data << PyramidPhase << ' ' << GahzrillaSummoned;
}
};
};

2
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
View File

@@ -22,6 +22,8 @@
#include "CreatureAIImpl.h"
#include "SpellScript.h"
#define DataHeader "ZF"
#define ZFScriptName "instance_zulfarrak"
enum ZulFarrakCreatures