josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/SAI: Moved event_flags for difficulties to new field Difficulties (#29377)

Browse Source
This commit is contained in:
Meji
2023-10-30 09:53:52 +01:00
committed by GitHub
parent 79e69f3634
commit b8ce70d528
5 changed files with 785 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+65 -30
View File
@@ -30,6 +30,7 @@
#include "ObjectMgr.h"
#include "SpellInfo.h"
#include "SpellMgr.h"
#include "StringConvert.h"
#include "Timer.h"
#include "UnitDefines.h"
#include "Util.h"
@@ -248,37 +249,65 @@ void SmartAIMgr::LoadSmartAIFromDB()
temp.source_type = source_type;
temp.event_id = fields[2].GetUInt16();
temp.link = fields[3].GetUInt16();
temp.event.type = (SMART_EVENT)fields[4].GetUInt8();
temp.event.event_phase_mask = fields[5].GetUInt16();
temp.event.event_chance = fields[6].GetUInt8();
temp.event.event_flags = fields[7].GetUInt16();
temp.event.raw.param1 = fields[8].GetUInt32();
temp.event.raw.param2 = fields[9].GetUInt32();
temp.event.raw.param3 = fields[10].GetUInt32();
temp.event.raw.param4 = fields[11].GetUInt32();
temp.event.raw.param5 = fields[12].GetUInt32();
bool invalidDifficulties = false;
for (std::string_view token : Trinity::Tokenize(fields[4].GetStringView(), ',', false))
{
std::optional<std::underlying_type_t<Difficulty>> tokenValue = Trinity::StringTo<std::underlying_type_t<Difficulty>>(token);
if (!tokenValue.has_value())
{
invalidDifficulties = true;
TC_LOG_ERROR("sql.sql", "SmartAIMgr::LoadSmartAIFromDB: Invalid difficulties for entryorguid ({}) source_type ({}) id ({}), skipped loading.",
temp.entryOrGuid, temp.GetScriptType(), temp.event_id);
break;
}
temp.event.param_string = fields[13].GetString();
Difficulty difficultyId = Difficulty(tokenValue.value());
if (difficultyId && !sDifficultyStore.LookupEntry(difficultyId))
{
invalidDifficulties = true;
TC_LOG_ERROR("sql.sql", "SmartAIMgr::LoadSmartAIFromDB: Invalid difficulty id ({}) for entryorguid ({}) source_type ({}) id ({}), skipped loading.",
difficultyId, temp.entryOrGuid, temp.GetScriptType(), temp.event_id);
break;
}
temp.action.type = (SMART_ACTION)fields[14].GetUInt8();
temp.action.raw.param1 = fields[15].GetUInt32();
temp.action.raw.param2 = fields[16].GetUInt32();
temp.action.raw.param3 = fields[17].GetUInt32();
temp.action.raw.param4 = fields[18].GetUInt32();
temp.action.raw.param5 = fields[19].GetUInt32();
temp.action.raw.param6 = fields[20].GetUInt32();
temp.action.raw.param7 = fields[21].GetUInt32();
temp.Difficulties.push_back(difficultyId);
}
temp.target.type = (SMARTAI_TARGETS)fields[22].GetUInt8();
temp.target.raw.param1 = fields[23].GetUInt32();
temp.target.raw.param2 = fields[24].GetUInt32();
temp.target.raw.param3 = fields[25].GetUInt32();
temp.target.raw.param4 = fields[26].GetUInt32();
temp.target.x = fields[27].GetFloat();
temp.target.y = fields[28].GetFloat();
temp.target.z = fields[29].GetFloat();
temp.target.o = fields[30].GetFloat();
if (invalidDifficulties)
continue;
temp.event.type = (SMART_EVENT)fields[5].GetUInt8();
temp.event.event_phase_mask = fields[6].GetUInt16();
temp.event.event_chance = fields[7].GetUInt8();
temp.event.event_flags = fields[8].GetUInt16();
temp.event.raw.param1 = fields[9].GetUInt32();
temp.event.raw.param2 = fields[10].GetUInt32();
temp.event.raw.param3 = fields[11].GetUInt32();
temp.event.raw.param4 = fields[12].GetUInt32();
temp.event.raw.param5 = fields[13].GetUInt32();
temp.event.param_string = fields[14].GetString();
temp.action.type = (SMART_ACTION)fields[15].GetUInt8();
temp.action.raw.param1 = fields[16].GetUInt32();
temp.action.raw.param2 = fields[17].GetUInt32();
temp.action.raw.param3 = fields[18].GetUInt32();
temp.action.raw.param4 = fields[19].GetUInt32();
temp.action.raw.param5 = fields[20].GetUInt32();
temp.action.raw.param6 = fields[21].GetUInt32();
temp.action.raw.param7 = fields[22].GetUInt32();
temp.target.type = (SMARTAI_TARGETS)fields[23].GetUInt8();
temp.target.raw.param1 = fields[24].GetUInt32();
temp.target.raw.param2 = fields[25].GetUInt32();
temp.target.raw.param3 = fields[26].GetUInt32();
temp.target.raw.param4 = fields[27].GetUInt32();
temp.target.x = fields[28].GetFloat();
temp.target.y = fields[29].GetFloat();
temp.target.z = fields[30].GetFloat();
temp.target.o = fields[31].GetFloat();
//check target
if (!IsTargetValid(temp))
@@ -1079,19 +1108,25 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
if (e.action.type <= 0 || e.action.type >= SMART_ACTION_END)
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: EntryOrGuid {} using event({}) has invalid action type ({}), skipped.", e.entryOrGuid, e.event_id, e.GetActionType());
TC_LOG_ERROR("sql.sql", "SmartAIMgr: EntryOrGuid {} using event ({}) has invalid action type ({}), skipped.", e.entryOrGuid, e.event_id, e.GetActionType());
return false;
}
if (e.event.event_phase_mask > SMART_EVENT_PHASE_ALL)
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: EntryOrGuid {} using event({}) has invalid phase mask ({}), skipped.", e.entryOrGuid, e.event_id, e.event.event_phase_mask);
TC_LOG_ERROR("sql.sql", "SmartAIMgr: EntryOrGuid {} using event ({}) has invalid phase mask ({}), skipped.", e.entryOrGuid, e.event_id, e.event.event_phase_mask);
return false;
}
if (e.event.event_flags > SMART_EVENT_FLAGS_ALL)
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: EntryOrGuid {} using event({}) has invalid event flags ({}), skipped.", e.entryOrGuid, e.event_id, e.event.event_flags);
TC_LOG_ERROR("sql.sql", "SmartAIMgr: EntryOrGuid {} using event ({}) has invalid event flags ({}), skipped.", e.entryOrGuid, e.event_id, e.event.event_flags);
return false;
}
if (e.event.event_flags & SMART_EVENT_FLAGS_DEPRECATED)
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: EntryOrGuid {} using event ({}) has deprecated event flags ({}), skipped.", e.entryOrGuid, e.event_id, e.event.event_flags);
return false;
}