OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-02-21 10:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Summoned mobs are now actually treated as mobs.

Browse Source 
Unfortunetly, this necessitated keeping around yet more JSON objects for
the duration of the server's runtime.
It also involved unifying the way NPC IDs are handled, such that they
may be allocated and deallocated out of order.

If any NPCID-related bugs occour, this commit should be regarded as
the prime suspect.
This commit is contained in:
dongresource
2020-09-25 00:36:25 +02:00
parent cfb3d25bc5
commit 72d625fd8d
8 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/MobManager.hpp
View File

@@ -20,7 +20,7 @@ enum class MobState {
struct Mob : public BaseNPC {
// general
MobState state;
const int maxHealth;
int maxHealth;
int spawnX;
int spawnY;
int spawnZ;
@@ -28,6 +28,7 @@ struct Mob : public BaseNPC {
// dead
time_t killedTime = 0;
time_t regenTime;
bool summoned = false;
bool despawned = false; // for the sake of death animations
// roaming
@@ -41,8 +42,8 @@ struct Mob : public BaseNPC {
// temporary; until we're sure what's what
nlohmann::json data;
Mob(int x, int y, int z, int type, int hp, int angle, nlohmann::json d)
: BaseNPC(x, y, z, type), maxHealth(hp) {
Mob(int x, int y, int z, int type, int hp, int angle, nlohmann::json d, int32_t id)
: BaseNPC(x, y, z, type, id), maxHealth(hp) {
state = MobState::ROAMING;
data = d;
@@ -58,7 +59,17 @@ struct Mob : public BaseNPC {
// NOTE: there appear to be discrepancies in the dump
appearanceData.iHP = maxHealth;
npcClass = NPC_MOB;
}
// constructor for /summon
Mob(int x, int y, int z, int type, nlohmann::json d, int32_t id)
: Mob(x, y, z, type, 0, 0, d, id) {
summoned = true; // will be despawned and deallocated when killed
appearanceData.iHP = maxHealth = d["m_iHP"];
}
~Mob() {}
auto operator[](std::string s) {