araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-25 07:59:42 -04:00
Code Issues 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/SmartScript.cpp
+12 -26
View File
@@ -3934,38 +3934,24 @@ void SmartScript::FillScript(SmartAIEventList e, WorldObject* obj, AreaTriggerEn
continue;
#endif
if (scriptholder.event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_ALL)//if has instance flag add only if in it
if (obj && scriptholder.Difficulties.size())
{
if (!(obj && obj->GetMap()->IsDungeon()))
continue;
// TODO: fix it for new maps and difficulties
switch (obj->GetMap()->GetDifficultyID())
bool foundValidDifficulty = false;
for (Difficulty difficulty : scriptholder.Difficulties)
{
case DIFFICULTY_NORMAL:
case DIFFICULTY_10_N:
if (!(scriptholder.event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_0))
continue;
break;
case DIFFICULTY_HEROIC:
case DIFFICULTY_25_N:
if (!(scriptholder.event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_1))
continue;
break;
case DIFFICULTY_10_HC:
if (!(scriptholder.event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_2))
continue;
break;
case DIFFICULTY_25_HC:
if (!(scriptholder.event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_3))
continue;
break;
default:
if (difficulty == obj->GetMap()->GetDifficultyID())
{
foundValidDifficulty = true;
break;
}
}
if (!foundValidDifficulty)
continue;
}
mAllEventFlags |= scriptholder.event.event_flags;
mEvents.push_back(scriptholder);//NOTE: 'world(0)' events still get processed in ANY instance mode
mEvents.push_back(scriptholder);
}
}