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

Don't write mob HP to gruntwork

Browse Source
This commit is contained in:
Gent S 2020-12-14 10:00:07 -05:00
parent 5431d21d27
commit f1a2723274
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/TableData.cpp
View File

@ -817,23 +817,20 @@ void TableData::flush() {
if (NPCManager::NPCs.find(pair.first) == NPCManager::NPCs.end()) if (NPCManager::NPCs.find(pair.first) == NPCManager::NPCs.end())
continue; continue;
int x, y, z, hp; int x, y, z;
if (npc->npcClass == NPC_MOB) { if (npc->npcClass == NPC_MOB) {
Mob *m = (Mob*)npc; Mob *m = (Mob*)npc;
x = m->spawnX; x = m->spawnX;
y = m->spawnY; y = m->spawnY;
z = m->spawnZ; z = m->spawnZ;
hp = m->maxHealth;
} else { } else {
x = npc->appearanceData.iX; x = npc->appearanceData.iX;
y = npc->appearanceData.iY; y = npc->appearanceData.iY;
z = npc->appearanceData.iZ; z = npc->appearanceData.iZ;
hp = npc->appearanceData.iHP;
} }
// NOTE: this format deviates slightly from the one in mobs.json // NOTE: this format deviates slightly from the one in mobs.json
mob["iNPCType"] = (int)npc->appearanceData.iNPCType; mob["iNPCType"] = (int)npc->appearanceData.iNPCType;
mob["iHP"] = hp;
mob["iX"] = x; mob["iX"] = x;
mob["iY"] = y; mob["iY"] = y;
mob["iZ"] = z; mob["iZ"] = z;
@ -852,14 +849,13 @@ void TableData::flush() {
if (NPCManager::NPCs.find(pair.first) == NPCManager::NPCs.end()) if (NPCManager::NPCs.find(pair.first) == NPCManager::NPCs.end())
continue; continue;
int x, y, z, hp; int x, y, z;
std::vector<Mob*> followers; std::vector<Mob*> followers;
if (npc->npcClass == NPC_MOB) { if (npc->npcClass == NPC_MOB) {
Mob* m = (Mob*)npc; Mob* m = (Mob*)npc;
x = m->spawnX; x = m->spawnX;
y = m->spawnY; y = m->spawnY;
z = m->spawnZ; z = m->spawnZ;
hp = m->maxHealth;
if (m->groupLeader != m->appearanceData.iNPC_ID) { // make sure this is a leader if (m->groupLeader != m->appearanceData.iNPC_ID) { // make sure this is a leader
std::cout << "[WARN] Non-leader mob found in running groups; ignoring\n"; std::cout << "[WARN] Non-leader mob found in running groups; ignoring\n";
continue; continue;
@ -878,12 +874,10 @@ void TableData::flush() {
x = npc->appearanceData.iX; x = npc->appearanceData.iX;
y = npc->appearanceData.iY; y = npc->appearanceData.iY;
z = npc->appearanceData.iZ; z = npc->appearanceData.iZ;
hp = npc->appearanceData.iHP;
} }
// NOTE: this format deviates slightly from the one in mobs.json // NOTE: this format deviates slightly from the one in mobs.json
mob["iNPCType"] = (int)npc->appearanceData.iNPCType; mob["iNPCType"] = (int)npc->appearanceData.iNPCType;
mob["iHP"] = hp;
mob["iX"] = x; mob["iX"] = x;
mob["iY"] = y; mob["iY"] = y;
mob["iZ"] = z; mob["iZ"] = z;
@ -899,7 +893,6 @@ void TableData::flush() {
// populate JSON entry // populate JSON entry
nlohmann::json fol; nlohmann::json fol;
fol["iNPCType"] = follower->appearanceData.iNPCType; fol["iNPCType"] = follower->appearanceData.iNPCType;
fol["iHP"] = follower->maxHealth;
fol["iOffsetX"] = follower->offsetX; fol["iOffsetX"] = follower->offsetX;
fol["iOffsetY"] = follower->offsetY; fol["iOffsetY"] = follower->offsetY;