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

@@ -39,7 +39,11 @@ public:
struct instance_trial_of_the_champion_InstanceMapScript : public InstanceScript
{
instance_trial_of_the_champion_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); }
instance_trial_of_the_champion_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
SetHeaders(DataHeader);
Initialize();
}
bool CLEANED;
TeamId TeamIdInInstance;

View File

@@ -21,6 +21,8 @@
#include "CombatAI.h"
#include "CreatureAIImpl.h"
#define DataHeader "TC"
#define TrialOfTheChampionScriptName "instance_trial_of_the_champion"
enum eData

View File

@@ -32,7 +32,11 @@ public:
struct instance_trial_of_the_crusader_InstanceMapScript : public InstanceScript
{
instance_trial_of_the_crusader_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); }
instance_trial_of_the_crusader_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
SetHeaders(DataHeader);
Initialize();
}
bool CLEANED;
uint32 EncounterStatus;
@@ -1589,54 +1593,32 @@ public:
events.RescheduleEvent(EVENT_CHECK_PLAYERS, CLEANUP_CHECK_INTERVAL);
}
std::string GetSaveData() override
void ReadSaveDataMore(std::istringstream& data) override
{
OUT_SAVE_INST_DATA;
std::ostringstream saveStream;
saveStream << "T C " << InstanceProgress;
if( instance->IsHeroic() )
saveStream << ' ' << AttemptsLeft << ' ' << (bDedicatedInsanity ? (uint32)1 : (uint32)0) << ' ' << (bNooneDied ? (uint32)1 : (uint32)0);
str_data = saveStream.str();
OUT_SAVE_INST_DATA_COMPLETE;
return str_data;
data >> InstanceProgress;
if (instance->IsHeroic())
{
data >> AttemptsLeft;
uint32 temp = 0;
data >> temp;
bDedicatedInsanity = !!temp;
data >> temp;
bNooneDied = !!temp;
}
}
void Load(const char* in) override
void WriteSaveDataMore(std::ostringstream& data) override
{
EncounterStatus = NOT_STARTED;
CLEANED = false;
events.Reset();
events.RescheduleEvent(EVENT_CHECK_PLAYERS, 0);
data << InstanceProgress;
if( !in )
if (instance->IsHeroic())
{
OUT_LOAD_INST_DATA_FAIL;
return;
data << ' '
<< AttemptsLeft << ' '
<< (bDedicatedInsanity ? 1 : 0) << ' '
<< (bNooneDied ? 1 : 0);
}
OUT_LOAD_INST_DATA(in);
char dataHead1, dataHead2;
uint16 data0;
std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2 >> data0;
if( dataHead1 == 'T' && dataHead2 == 'C' )
{
InstanceProgress = data0;
if( instance->IsHeroic() )
{
uint32 data1 = 0, data2 = 0, data3 = 0;
loadStream >> data1 >> data2 >> data3;
AttemptsLeft = data1;
bDedicatedInsanity = !!data2;
bNooneDied = !!data3;
}
}
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

View File

@@ -22,6 +22,8 @@
#include "GridNotifiers.h"
#include "SpellAuraEffects.h"
#define DataHeader "TCR"
#define TrialOfTheCrusaderScriptName "instance_trial_of_the_crusader"
enum DataTypes