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

Load mob groups hierarchically

Browse Source
This commit is contained in:
Gent S 2020-11-23 19:28:22 -05:00
parent 7d81035306
commit 73ef5fa5ff
2 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/TableData.cpp
View File

@ -198,14 +198,14 @@ void TableData::init() {
// load temporary mob dump // load temporary mob dump
try { try {
std::ifstream inFile(settings::MOBJSON); std::ifstream inFile(settings::MOBJSON);
nlohmann::json npcData; nlohmann::json npcData, groupData;
// read file into json // read file into json
inFile >> npcData; inFile >> npcData;
groupData = npcData["groups"];
npcData = npcData["mobs"]; npcData = npcData["mobs"];
int leaderMob = -1;
int leaderMobFollowers = 0;
// single mobs
for (nlohmann::json::iterator _npc = npcData.begin(); _npc != npcData.end(); _npc++) { for (nlohmann::json::iterator _npc = npcData.begin(); _npc != npcData.end(); _npc++) {
auto npc = _npc.value(); auto npc = _npc.value();
auto td = NPCManager::NPCData[(int)npc["iNPCType"]]; auto td = NPCManager::NPCData[(int)npc["iNPCType"]];
@ -217,37 +217,48 @@ void TableData::init() {
MobManager::Mobs[nextId] = (Mob*)NPCManager::NPCs[nextId]; MobManager::Mobs[nextId] = (Mob*)NPCManager::NPCs[nextId];
NPCManager::updateNPCPosition(nextId, npc["iX"], npc["iY"], npc["iZ"], instanceID, npc["iAngle"]); NPCManager::updateNPCPosition(nextId, npc["iX"], npc["iY"], npc["iZ"], instanceID, npc["iAngle"]);
// handling groups nextId++;
if (npc.find("iOffsetX") != npc.end()) {
Mob* currNpc = (Mob*)tmp;
if (leaderMob == -1) {
if (MobManager::Mobs.find(nextId-1) != MobManager::Mobs.end()) {
Mob* leadNpc = MobManager::Mobs[nextId-1];
leaderMob = nextId-1;
leadNpc->groupMember[leaderMobFollowers] = nextId;
leaderMobFollowers++;
currNpc->groupLeader = nextId-1;
leadNpc->groupLeader = nextId-1;
}
} else {
if (MobManager::Mobs.find(leaderMob) != MobManager::Mobs.end()) {
Mob* leadNpc = MobManager::Mobs[leaderMob];
leadNpc->groupMember[leaderMobFollowers] = nextId;
leaderMobFollowers++;
currNpc->groupLeader = leaderMob;
}
} }
currNpc->offsetX = (int)npc["iOffsetX"]; // mob groups
currNpc->offsetY = npc.find("iOffsetY") == npc.end() ? 0 : (int)npc["iOffsetY"]; // single mobs
std::cout << "[INFO] Added group NPC " << nextId << " to ID " << currNpc->groupLeader << std::endl; // TODO: get rid of this after testing for (nlohmann::json::iterator _group = groupData.begin(); _group != groupData.end(); _group++) {
} else { auto leader = _group.value();
leaderMob = -1; auto td = NPCManager::NPCData[(int)leader["iNPCType"]];
leaderMobFollowers = 0; uint64_t instanceID = leader.find("iMapNum") == leader.end() ? INSTANCE_OVERWORLD : (int)leader["iMapNum"];
}
Mob* tmp = new Mob(leader["iX"], leader["iY"], leader["iZ"], leader["iAngle"], instanceID, leader["iNPCType"], leader["iHP"], td, nextId);
NPCManager::NPCs[nextId] = tmp;
MobManager::Mobs[nextId] = (Mob*)NPCManager::NPCs[nextId];
NPCManager::updateNPCPosition(nextId, leader["iX"], leader["iY"], leader["iZ"], instanceID, leader["iAngle"]);
tmp->groupLeader = nextId;
nextId++; nextId++;
auto followers = leader["aFollowers"];
if (followers.size() < 5) {
int followerCount = 0;
for (nlohmann::json::iterator _fol = followers.begin(); _fol != followers.end(); _fol++) {
auto follower = _fol.value();
auto tdFol = NPCManager::NPCData[(int)follower["iNPCType"]];
Mob* tmpFol = new Mob((int)leader["iX"] + (int)follower["iOffsetX"], (int)leader["iY"] + (int)follower["iOffsetY"], leader["iZ"], leader["iAngle"], instanceID, follower["iNPCType"], follower["iHP"], tdFol, nextId);
NPCManager::NPCs[nextId] = tmpFol;
MobManager::Mobs[nextId] = (Mob*)NPCManager::NPCs[nextId];
NPCManager::updateNPCPosition(nextId, (int)leader["iX"] + (int)follower["iOffsetX"], (int)leader["iY"] + (int)follower["iOffsetY"], leader["iZ"], instanceID, leader["iAngle"]);
tmpFol->offsetX = follower.find("iOffsetX") == follower.end() ? 0 : (int)follower["iOffsetX"];
tmpFol->offsetY = follower.find("iOffsetY") == follower.end() ? 0 : (int)follower["iOffsetY"];
tmpFol->groupLeader = tmp->appearanceData.iNPC_ID;
tmp->groupMember[followerCount++] = nextId;
nextId++;
}
} else {
std::cout << "[WARN] Mob group leader with ID " << nextId << " has too many followers (" << followers.size() << ")\n";
}
} }
std::cout << "[INFO] Populated " << NPCManager::NPCs.size() << " NPCs" << std::endl; std::cout << "[INFO] Populated " << NPCManager::NPCs.size() << " NPCs" << std::endl;

2
tdata

@ -1 +1 @@
Subproject commit d7f7016c90267207a3ccfa5598b3fa6a3f1161fc Subproject commit f1531e1a4020e13f08b3f7f97870d97ccef66a9b