araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 11:43:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Maps: Replaced spawnmask with difficulty list

Browse Source
This commit is contained in:
Shauren
2018-09-15 17:55:26 +02:00
parent 0f3156d324
commit 738f37d3cf
36 changed files with 320 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -3871,9 +3871,29 @@ void SmartScript::FillScript(SmartAIEventList e, WorldObject* obj, AreaTriggerEn
{
if (obj && obj->GetMap()->IsDungeon())
{
if ((1 << (obj->GetMap()->GetSpawnMode()+1)) & (*i).event.event_flags)
// TODO: fix it for new maps and difficulties
switch (obj->GetMap()->GetDifficultyID())
{
mEvents.push_back((*i));
case DIFFICULTY_NORMAL:
case DIFFICULTY_10_N:
if (i->event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_0)
mEvents.emplace_back(std::move(*i));
break;
case DIFFICULTY_HEROIC:
case DIFFICULTY_25_N:
if (i->event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_1)
mEvents.emplace_back(std::move(*i));
break;
case DIFFICULTY_10_HC:
if (i->event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_2)
mEvents.emplace_back(std::move(*i));
break;
case DIFFICULTY_25_HC:
if (i->event.event_flags & SMART_EVENT_FLAG_DIFFICULTY_3)
mEvents.emplace_back(std::move(*i));
break;
default:
break;
}
}
continue;
@@ -3890,24 +3910,24 @@ void SmartScript::GetScript()
e = sSmartScriptMgr->GetScript(-((int32)me->GetSpawnId()), mScriptType);
if (e.empty())
e = sSmartScriptMgr->GetScript((int32)me->GetEntry(), mScriptType);
FillScript(e, me, nullptr, nullptr);
FillScript(std::move(e), me, nullptr, nullptr);
}
else if (go)
{
e = sSmartScriptMgr->GetScript(-((int32)go->GetSpawnId()), mScriptType);
if (e.empty())
e = sSmartScriptMgr->GetScript((int32)go->GetEntry(), mScriptType);
FillScript(e, go, nullptr, nullptr);
FillScript(std::move(e), go, nullptr, nullptr);
}
else if (trigger)
{
e = sSmartScriptMgr->GetScript((int32)trigger->ID, mScriptType);
FillScript(e, nullptr, trigger, nullptr);
FillScript(std::move(e), nullptr, trigger, nullptr);
}
else if (sceneTemplate)
{
e = sSmartScriptMgr->GetScript(sceneTemplate->SceneId, mScriptType);
FillScript(e, nullptr, nullptr, sceneTemplate);
FillScript(std::move(e), nullptr, nullptr, sceneTemplate);
}
}