OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-10-26 06:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grouped mobs adjustment

Browse Source
This commit is contained in:
Gent S
2020-11-22 19:14:22 -05:00
parent f1d04cec01
commit dab536cb6a
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/TableData.cpp
View File

@@ -216,8 +216,8 @@ void TableData::init() {
NPCManager::updateNPCPosition(nextId, npc["iX"], npc["iY"], npc["iZ"], instanceID, npc["iAngle"]);
// handling groups
if (npc.find("iOffsetX") != npc.end() && MobManager::Mobs.find(nextId) != MobManager::Mobs.end()) {
Mob* currNpc = MobManager::Mobs[nextId];
if (npc.find("iOffsetX") != npc.end()) {
Mob* currNpc = (Mob*)tmp;
if (leaderMob == -1) {
if (MobManager::Mobs.find(nextId-1) != MobManager::Mobs.end()) {
@@ -231,7 +231,6 @@ void TableData::init() {
} else {
if (MobManager::Mobs.find(leaderMob) != MobManager::Mobs.end()) {
Mob* leadNpc = MobManager::Mobs[leaderMob];
leaderMob = leaderMob;
leadNpc->groupMember[leaderMobFollowers] = nextId;
leaderMobFollowers++;
currNpc->groupLeader = leaderMob;
@@ -240,7 +239,7 @@ void TableData::init() {
currNpc->offsetX = (int)npc["iOffsetX"];
currNpc->offsetY = npc.find("iOffsetY") == npc.end() ? 0 : (int)npc["iOffsetY"];
std::cout << "[INFO] Added group NPC " << nextId << " to ID " << currNpc->groupLeader << std::endl;
std::cout << "[INFO] Added group NPC " << nextId << " to ID " << currNpc->groupLeader << std::endl; // TODO: get rid of this after testing
} else {
leaderMob = -1;
leaderMobFollowers = 0;
@@ -674,7 +673,6 @@ void TableData::loadGruntwork(int32_t *nextId) {
} else {
if (MobManager::Mobs.find(leaderMob) != MobManager::Mobs.end()) {
Mob* leadNpc = MobManager::Mobs[leaderMob];
leaderMob = leaderMob;
leadNpc->groupMember[leaderMobFollowers] = id;
leaderMobFollowers++;
currNpc->groupLeader = leaderMob;