Skip to content

[core] Add some startup sanity checks for NMs #9901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WinterSolstice8 wants to merge 1 commit into
base: base
Choose a base branch
from
+42 −0
Open

[core] Add some startup sanity checks for NMs #9901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions src/map/utils/zoneutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,48 @@ auto LoadMOBList(Scheduler& scheduler, const std::vector<uint16>& zoneIds) -> Ta
PZone->ForEachMob(
[&PZone](CMobEntity* PMob)
{
// Check if mob is spawnable via lottery
if (PMob->m_SpawnType == SPAWNTYPE_LOTTERY)
{
auto zone = PMob->loc.zone->getName();
auto name = PMob->getName();

auto phList = lua["xi"]["zones"][zone]["mobs"][name]["phList"];
if (phList.valid())
{
auto table = phList.get<sol::table>();
bool hasEntries = false;
bool mobInList = false;

for (auto& [phObj, nmObj] : table)
{
[[maybe_unused]] uint32 phID = phObj.as<uint32>(); // TODO: check if the PH is spawnable?
uint32 nmID = nmObj.as<uint32>();

if (nmID == PMob->id)
{
mobInList = true;
}

hasEntries = true;
}

if (!hasEntries)
{
ShowErrorFmt("Lottery spawn NM '{}' in zone '{}' has a blank phList", name, zone);
}

if (!mobInList)
{
ShowErrorFmt("Lottery spawn NM '{}' ID ({}) in zone '{}' has a phList that doesn't contain itself as a spawnable NM", name, PMob->id, zone);
}
}
else
{
ShowErrorFmt("Lottery spawn NM '{}' in zone '{}' is missing a phList and may not be spawnable", name, zone);
}
}

// Skip mobs already registered via setRespawnTime in onMobInitialize - let SpawnHandler handle them
if (PZone->spawnHandler().isRegistered(PMob))
{
Expand Down
Loading