From 9087baae3c2d2957ae6e320abbbf84090acd86c6 Mon Sep 17 00:00:00 2001
From: Kamil <kamilprzybspam@wp.pl>
Date: Mon, 9 Nov 2020 10:34:11 +0100
Subject: [PATCH] Polished reading egg json data

---
 src/TableData.cpp | 29 +++++++++++++++++++++++------
 src/TableData.hpp |  2 +-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/TableData.cpp b/src/TableData.cpp
index 79e9a55..59b811e 100644
--- a/src/TableData.cpp
+++ b/src/TableData.cpp
@@ -224,7 +224,7 @@ void TableData::init() {
 
     loadDrops();
 
-    loadEggs();
+    loadEggs(&nextId);
 
     loadPaths(&nextId); // load paths
 
@@ -436,7 +436,7 @@ void TableData::loadDrops() {
     }
 }
 
-void TableData::loadEggs() {
+void TableData::loadEggs(int32_t* nextId) {
     try {
         std::ifstream inFile(settings::EGGSJSON);
         nlohmann::json eggData;
@@ -456,7 +456,20 @@ void TableData::loadEggs() {
             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) {
@@ -620,10 +633,12 @@ void TableData::loadGruntwork(int32_t *nextId) {
         for (auto _egg = eggs.begin(); _egg != eggs.end(); _egg++) {
             auto egg = _egg.value();
             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::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;
         }
 
@@ -723,7 +738,9 @@ void TableData::flush() {
         egg["iX"] = npc->appearanceData.iX;
         egg["iY"] = npc->appearanceData.iY;
         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;
 
         gruntwork["eggs"].push_back(egg);
diff --git a/src/TableData.hpp b/src/TableData.hpp
index 437ffbc..7b9cd9b 100644
--- a/src/TableData.hpp
+++ b/src/TableData.hpp
@@ -19,7 +19,7 @@ namespace TableData {
     int getItemType(int);
     void loadPaths(int*);
     void loadDrops();
-    void loadEggs();
+    void loadEggs(int32_t* nextId);
     void constructPathSkyway(nlohmann::json::iterator);
     void constructPathSlider(nlohmann::json, int, int);
     void constructPathNPC(nlohmann::json::iterator, int id=0);