OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-24 12:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Instance Stuff

Browse Source 
custom instance commands
warping takes you into instances
npcs show up only in the instance they are supposed to be inside.
This commit is contained in:
Zenpock
2020-10-02 15:17:24 -05:00
committed by Gent
parent 5a80c53e79
commit bd34bb294c
6 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/TableData.cpp
View File

@@ -23,11 +23,19 @@ void TableData::init() {
try {
std::ifstream inFile(settings::NPCJSON);
nlohmann::json npcData;
nlohmann::json nullExample;
// read file into json
inFile >> npcData;
int null = 0;
for (nlohmann::json::iterator _npc = npcData.begin(); _npc != npcData.end(); _npc++) {
if (npcData[_npc.key()]["mapNum"] == nullExample)
{
npcData[_npc.key()]["mapNum"] = 0;
_npc.value()["mapNum"] = 0;
null = 1;
//return;
}
auto npc = _npc.value();
BaseNPC *tmp = new BaseNPC(npc["x"], npc["y"], npc["z"], npc["angle"], INSTANCE_OVERWORLD, npc["id"], nextId);
@@ -38,7 +46,13 @@ void TableData::init() {
if (npc["id"] == 641 || npc["id"] == 642)
NPCManager::RespawnPoints.push_back({ npc["x"], npc["y"], ((int)npc["z"]) + RESURRECT_HEIGHT });
}
if (null == 1)
{
std::cout << "Updated Json to include Map Num" << std::endl;
std::ofstream outFile(settings::NPCJSON);
outFile << npcData << std::endl;
outFile.close();
}
}
catch (const std::exception& err) {
std::cerr << "[WARN] Malformed NPCs.json file! Reason:" << err.what() << std::endl;
@@ -61,7 +75,7 @@ void TableData::init() {
for (nlohmann::json::iterator _warp = warpData.begin(); _warp != warpData.end(); _warp++) {
auto warp = _warp.value();
WarpLocation warpLoc = { warp["m_iToX"], warp["m_iToY"], warp["m_iToZ"] };
WarpLocation warpLoc = { warp["m_iToX"], warp["m_iToY"], warp["m_iToZ"],warp["m_iToMapNum"],warp["m_iIsInstance"],warp["m_iLimit_TaskID"],warp["m_iNpcNumber"] };
int warpID = warp["m_iWarpNumber"];
NPCManager::Warps[warpID] = warpLoc;
}