From f1a2723274bc0773bfa891c28bcee57f70e3d962 Mon Sep 17 00:00:00 2001 From: Gent S Date: Mon, 14 Dec 2020 10:00:07 -0500 Subject: [PATCH] Don't write mob HP to gruntwork --- src/TableData.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/TableData.cpp b/src/TableData.cpp index 32601a3..7ebdd28 100644 --- a/src/TableData.cpp +++ b/src/TableData.cpp @@ -817,23 +817,20 @@ void TableData::flush() { if (NPCManager::NPCs.find(pair.first) == NPCManager::NPCs.end()) continue; - int x, y, z, hp; + int x, y, z; if (npc->npcClass == NPC_MOB) { Mob *m = (Mob*)npc; x = m->spawnX; y = m->spawnY; z = m->spawnZ; - hp = m->maxHealth; } else { x = npc->appearanceData.iX; y = npc->appearanceData.iY; z = npc->appearanceData.iZ; - hp = npc->appearanceData.iHP; } // NOTE: this format deviates slightly from the one in mobs.json mob["iNPCType"] = (int)npc->appearanceData.iNPCType; - mob["iHP"] = hp; mob["iX"] = x; mob["iY"] = y; mob["iZ"] = z; @@ -852,14 +849,13 @@ void TableData::flush() { if (NPCManager::NPCs.find(pair.first) == NPCManager::NPCs.end()) continue; - int x, y, z, hp; + int x, y, z; std::vector followers; if (npc->npcClass == NPC_MOB) { Mob* m = (Mob*)npc; x = m->spawnX; y = m->spawnY; z = m->spawnZ; - hp = m->maxHealth; 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"; continue; @@ -878,12 +874,10 @@ void TableData::flush() { x = npc->appearanceData.iX; y = npc->appearanceData.iY; z = npc->appearanceData.iZ; - hp = npc->appearanceData.iHP; } // NOTE: this format deviates slightly from the one in mobs.json mob["iNPCType"] = (int)npc->appearanceData.iNPCType; - mob["iHP"] = hp; mob["iX"] = x; mob["iY"] = y; mob["iZ"] = z; @@ -899,7 +893,6 @@ void TableData::flush() { // populate JSON entry nlohmann::json fol; fol["iNPCType"] = follower->appearanceData.iNPCType; - fol["iHP"] = follower->maxHealth; fol["iOffsetX"] = follower->offsetX; fol["iOffsetY"] = follower->offsetY;