OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 21:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polished reading egg json data

Browse Source
This commit is contained in:
Kamil 2020-11-09 10:34:11 +01:00 committed by Gent
parent 95b5da8932
commit 9087baae3c
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/TableData.cpp
View File

@ -224,7 +224,7 @@ void TableData::init() {
loadDrops(); loadDrops();
loadEggs(); loadEggs(&nextId);
loadPaths(&nextId); // load paths loadPaths(&nextId); // load paths
@ -436,7 +436,7 @@ void TableData::loadDrops() {
} }
} }
void TableData::loadEggs() { void TableData::loadEggs(int32_t* nextId) {
try { try {
std::ifstream inFile(settings::EGGSJSON); std::ifstream inFile(settings::EGGSJSON);
nlohmann::json eggData; nlohmann::json eggData;
@ -456,7 +456,20 @@ void TableData::loadEggs() {
NPCManager::EggTypes[(int)eggType["Id"]] = toAdd; NPCManager::EggTypes[(int)eggType["Id"]] = toAdd;
} }
std::cout << "[INFO] Loaded Egg Data" <<std::endl; // Egg instances
auto eggs = eggData["Eggs"];
for (auto _egg = eggs.begin(); _egg != eggs.end(); _egg++) {
auto egg = _egg.value();
int id = (*nextId)++;
uint64_t instanceID = egg.find("iMapNum") == egg.end() ? INSTANCE_OVERWORLD : (int)egg["iMapNum"];
Egg* addEgg = new Egg((int)egg["iX"], (int)egg["iY"], (int)egg["iZ"], instanceID, (int)egg["iType"], id, false);
NPCManager::NPCs[id] = addEgg;
NPCManager::Eggs[id] = addEgg;
NPCManager::updateNPCPosition(id, (int)egg["iX"], (int)egg["iY"], (int)egg["iZ"], instanceID);
}
std::cout << "[INFO] Loaded " <<NPCManager::Eggs.size()<<" eggs" <<std::endl;
} }
catch (const std::exception& err) { catch (const std::exception& err) {
@ -620,10 +633,12 @@ void TableData::loadGruntwork(int32_t *nextId) {
for (auto _egg = eggs.begin(); _egg != eggs.end(); _egg++) { for (auto _egg = eggs.begin(); _egg != eggs.end(); _egg++) {
auto egg = _egg.value(); auto egg = _egg.value();
int id = (*nextId)++; int id = (*nextId)++;
Egg* addEgg = new Egg(egg["iX"], egg["iY"], egg["iZ"], egg["iMapNum"], egg["iType"], id, false); uint64_t instanceID = egg.find("iMapNum") == egg.end() ? INSTANCE_OVERWORLD : (int)egg["iMapNum"];
Egg* addEgg = new Egg((int)egg["iX"], (int)egg["iY"], (int)egg["iZ"], instanceID, (int)egg["iType"], id, false);
NPCManager::NPCs[id] = addEgg; NPCManager::NPCs[id] = addEgg;
NPCManager::Eggs[id] = addEgg; NPCManager::Eggs[id] = addEgg;
NPCManager::updateNPCPosition(id, egg["iX"], egg["iY"], egg["iZ"], egg["iMapNum"]); NPCManager::updateNPCPosition(id, (int)egg["iX"], (int)egg["iY"], (int)egg["iZ"], instanceID);
TableData::RunningEggs[id] = addEgg; TableData::RunningEggs[id] = addEgg;
} }
@ -723,7 +738,9 @@ void TableData::flush() {
egg["iX"] = npc->appearanceData.iX; egg["iX"] = npc->appearanceData.iX;
egg["iY"] = npc->appearanceData.iY; egg["iY"] = npc->appearanceData.iY;
egg["iZ"] = npc->appearanceData.iZ; egg["iZ"] = npc->appearanceData.iZ;
egg["iMapNum"] = MAPNUM(npc->instanceID); int mapnum = MAPNUM(npc->instanceID);
if (mapnum != 0)
egg["iMapNum"] = mapnum;
egg["iType"] = npc->appearanceData.iNPCType; egg["iType"] = npc->appearanceData.iNPCType;
gruntwork["eggs"].push_back(egg); gruntwork["eggs"].push_back(egg);

2
src/TableData.hpp
View File

@ -19,7 +19,7 @@ namespace TableData {
int getItemType(int); int getItemType(int);
void loadPaths(int*); void loadPaths(int*);
void loadDrops(); void loadDrops();
void loadEggs(); void loadEggs(int32_t* nextId);
void constructPathSkyway(nlohmann::json::iterator); void constructPathSkyway(nlohmann::json::iterator);
void constructPathSlider(nlohmann::json, int, int); void constructPathSlider(nlohmann::json, int, int);
void constructPathNPC(nlohmann::json::iterator, int id=0); void constructPathNPC(nlohmann::json::iterator, int id=0);