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

[refactor] E g g s

Browse Source
This commit is contained in:
dongresource
2021-03-17 22:28:24 +01:00
parent a55a34e09a
commit 610a683804
11 changed files with 324 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/TableData.cpp
View File

@@ -9,6 +9,7 @@
#include "Racing.hpp"
#include "Vendor.hpp"
#include "Abilities.hpp"
#include "Eggs.hpp"
#include "JSON.hpp"
@@ -378,7 +379,7 @@ static void loadEggs(int32_t* nextId) {
toAdd.effectId = (int)eggType["EffectId"];
toAdd.duration = (int)eggType["Duration"];
toAdd.regen= (int)eggType["Regen"];
NPCManager::EggTypes[(int)eggType["Id"]] = toAdd;
Eggs::EggTypes[(int)eggType["Id"]] = toAdd;
}
// Egg instances
@@ -390,11 +391,11 @@ static void loadEggs(int32_t* nextId) {
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;
Eggs::Eggs[id] = addEgg;
NPCManager::updateNPCPosition(id, (int)egg["iX"], (int)egg["iY"], (int)egg["iZ"], instanceID, 0);
}
std::cout << "[INFO] Loaded " <<NPCManager::Eggs.size()<<" eggs" <<std::endl;
std::cout << "[INFO] Loaded " <<Eggs::Eggs.size()<<" eggs" <<std::endl;
}
catch (const std::exception& err) {
@@ -539,7 +540,7 @@ static void loadGruntwork(int32_t *nextId) {
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;
Eggs::Eggs[id] = addEgg;
NPCManager::updateNPCPosition(id, (int)egg["iX"], (int)egg["iY"], (int)egg["iZ"], instanceID, 0);
RunningEggs[id] = addEgg;
}
@@ -1053,7 +1054,7 @@ void TableData::flush() {
nlohmann::json egg;
BaseNPC* npc = pair.second;
if (NPCManager::Eggs.find(pair.first) == NPCManager::Eggs.end())
if (Eggs::Eggs.find(pair.first) == Eggs::Eggs.end())
continue;
egg["iX"] = npc->appearanceData.iX;
egg["iY"] = npc->appearanceData.iY;