mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-19 13:28:25 +00:00
Simplified the use of roamboxes and improved the AI for roambox pathing
This commit is contained in:
Akkadius
+242
-99
@@ -16,8 +16,8 @@
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include "../common/global_define.h"
|
||||
#include "../common/string_util.h"
|
||||
#include "../common/types.h"
|
||||
|
||||
#include "entity.h"
|
||||
@@ -26,209 +26,352 @@
|
||||
#include "zonedb.h"
|
||||
|
||||
extern EntityList entity_list;
|
||||
extern Zone* zone;
|
||||
extern Zone *zone;
|
||||
|
||||
SpawnEntry::SpawnEntry( uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit ) {
|
||||
NPCType = in_NPCType;
|
||||
chance = in_chance;
|
||||
SpawnEntry::SpawnEntry(uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit)
|
||||
{
|
||||
NPCType = in_NPCType;
|
||||
chance = in_chance;
|
||||
npc_spawn_limit = in_npc_spawn_limit;
|
||||
}
|
||||
|
||||
SpawnGroup::SpawnGroup( uint32 in_id, char* name, int in_group_spawn_limit, float dist, float maxx, float minx, float maxy, float miny, int delay_in, int despawn_in, uint32 despawn_timer_in, int min_delay_in ) {
|
||||
SpawnGroup::SpawnGroup(
|
||||
uint32 in_id,
|
||||
char *name,
|
||||
int in_group_spawn_limit,
|
||||
float dist,
|
||||
float maxx,
|
||||
float minx,
|
||||
float maxy,
|
||||
float miny,
|
||||
int delay_in,
|
||||
int despawn_in,
|
||||
uint32 despawn_timer_in,
|
||||
int min_delay_in
|
||||
)
|
||||
{
|
||||
id = in_id;
|
||||
strn0cpy( name_, name, 120);
|
||||
strn0cpy(name_, name, 120);
|
||||
group_spawn_limit = in_group_spawn_limit;
|
||||
roambox[0]=maxx;
|
||||
roambox[1]=minx;
|
||||
roambox[2]=maxy;
|
||||
roambox[3]=miny;
|
||||
roamdist=dist;
|
||||
min_delay=min_delay_in;
|
||||
delay=delay_in;
|
||||
despawn=despawn_in;
|
||||
despawn_timer=despawn_timer_in;
|
||||
roambox[0] = maxx;
|
||||
roambox[1] = minx;
|
||||
roambox[2] = maxy;
|
||||
roambox[3] = miny;
|
||||
roamdist = dist;
|
||||
min_delay = min_delay_in;
|
||||
delay = delay_in;
|
||||
despawn = despawn_in;
|
||||
despawn_timer = despawn_timer_in;
|
||||
}
|
||||
|
||||
uint32 SpawnGroup::GetNPCType() {
|
||||
uint32 SpawnGroup::GetNPCType()
|
||||
{
|
||||
#if EQDEBUG >= 10
|
||||
Log(Logs::General, Logs::None, "SpawnGroup[%08x]::GetNPCType()", (uint32) this);
|
||||
#endif
|
||||
int npcType = 0;
|
||||
int npcType = 0;
|
||||
int totalchance = 0;
|
||||
|
||||
if(!entity_list.LimitCheckGroup(id, group_spawn_limit))
|
||||
return(0);
|
||||
if (!entity_list.LimitCheckGroup(id, group_spawn_limit)) {
|
||||
return (0);
|
||||
}
|
||||
|
||||
std::list<SpawnEntry*>::iterator cur,end;
|
||||
std::list<SpawnEntry*> possible;
|
||||
std::list<SpawnEntry *>::iterator cur, end;
|
||||
std::list<SpawnEntry *> possible;
|
||||
cur = list_.begin();
|
||||
end = list_.end();
|
||||
for(; cur != end; ++cur) {
|
||||
for (; cur != end; ++cur) {
|
||||
SpawnEntry *se = *cur;
|
||||
|
||||
if(!entity_list.LimitCheckType(se->NPCType, se->npc_spawn_limit))
|
||||
if (!entity_list.LimitCheckType(se->NPCType, se->npc_spawn_limit)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
totalchance += se->chance;
|
||||
possible.push_back(se);
|
||||
}
|
||||
if(totalchance == 0)
|
||||
if (totalchance == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int32 roll = 0;
|
||||
roll = zone->random.Int(0, totalchance-1);
|
||||
roll = zone->random.Int(0, totalchance - 1);
|
||||
|
||||
cur = possible.begin();
|
||||
end = possible.end();
|
||||
for(; cur != end; ++cur) {
|
||||
for (; cur != end; ++cur) {
|
||||
SpawnEntry *se = *cur;
|
||||
if (roll < se->chance) {
|
||||
npcType = se->NPCType;
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
roll -= se->chance;
|
||||
}
|
||||
}
|
||||
return npcType;
|
||||
}
|
||||
|
||||
void SpawnGroup::AddSpawnEntry( SpawnEntry* newEntry ) {
|
||||
list_.push_back( newEntry );
|
||||
void SpawnGroup::AddSpawnEntry(SpawnEntry *newEntry)
|
||||
{
|
||||
list_.push_back(newEntry);
|
||||
}
|
||||
|
||||
SpawnGroup::~SpawnGroup() {
|
||||
std::list<SpawnEntry*>::iterator cur,end;
|
||||
SpawnGroup::~SpawnGroup()
|
||||
{
|
||||
std::list<SpawnEntry *>::iterator cur, end;
|
||||
cur = list_.begin();
|
||||
end = list_.end();
|
||||
for(; cur != end; ++cur) {
|
||||
SpawnEntry* tmp = *cur;
|
||||
for (; cur != end; ++cur) {
|
||||
SpawnEntry *tmp = *cur;
|
||||
safe_delete(tmp);
|
||||
}
|
||||
list_.clear();
|
||||
}
|
||||
|
||||
SpawnGroupList::~SpawnGroupList() {
|
||||
std::map<uint32, SpawnGroup*>::iterator cur,end;
|
||||
cur = groups.begin();
|
||||
end = groups.end();
|
||||
for(; cur != end; ++cur) {
|
||||
SpawnGroup* tmp = cur->second;
|
||||
SpawnGroupList::~SpawnGroupList()
|
||||
{
|
||||
std::map<uint32, SpawnGroup *>::iterator cur, end;
|
||||
cur = m_spawn_groups.begin();
|
||||
end = m_spawn_groups.end();
|
||||
for (; cur != end; ++cur) {
|
||||
SpawnGroup *tmp = cur->second;
|
||||
safe_delete(tmp);
|
||||
}
|
||||
groups.clear();
|
||||
m_spawn_groups.clear();
|
||||
}
|
||||
|
||||
void SpawnGroupList::AddSpawnGroup(SpawnGroup* newGroup) {
|
||||
if(newGroup == nullptr)
|
||||
void SpawnGroupList::AddSpawnGroup(SpawnGroup *new_group)
|
||||
{
|
||||
if (new_group == nullptr) {
|
||||
return;
|
||||
groups[newGroup->id] = newGroup;
|
||||
}
|
||||
|
||||
m_spawn_groups[new_group->id] = new_group;
|
||||
}
|
||||
|
||||
SpawnGroup* SpawnGroupList::GetSpawnGroup(uint32 in_id) {
|
||||
if(groups.count(in_id) != 1)
|
||||
SpawnGroup *SpawnGroupList::GetSpawnGroup(uint32 in_id)
|
||||
{
|
||||
if (m_spawn_groups.count(in_id) != 1) {
|
||||
return nullptr;
|
||||
return(groups[in_id]);
|
||||
}
|
||||
|
||||
return (m_spawn_groups[in_id]);
|
||||
}
|
||||
|
||||
bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id) {
|
||||
if(groups.count(in_id) != 1)
|
||||
return(false);
|
||||
bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id)
|
||||
{
|
||||
if (m_spawn_groups.count(in_id) != 1) {
|
||||
return (false);
|
||||
}
|
||||
|
||||
groups.erase(in_id);
|
||||
return(true);
|
||||
m_spawn_groups.erase(in_id);
|
||||
|
||||
return (true);
|
||||
}
|
||||
|
||||
void SpawnGroupList::ReloadSpawnGroups()
|
||||
{
|
||||
ClearSpawnGroups();
|
||||
database.LoadSpawnGroups(zone->GetShortName(), zone->GetInstanceVersion(), &zone->spawn_group_list);
|
||||
}
|
||||
|
||||
void SpawnGroupList::ClearSpawnGroups()
|
||||
{
|
||||
m_spawn_groups.clear();
|
||||
}
|
||||
|
||||
bool ZoneDatabase::LoadSpawnGroups(const char *zone_name, uint16 version, SpawnGroupList *spawn_group_list)
|
||||
{
|
||||
std::string query = StringFormat("SELECT DISTINCT(spawngroupID), spawngroup.name, spawngroup.spawn_limit, "
|
||||
"spawngroup.dist, spawngroup.max_x, spawngroup.min_x, "
|
||||
"spawngroup.max_y, spawngroup.min_y, spawngroup.delay, "
|
||||
"spawngroup.despawn, spawngroup.despawn_timer, spawngroup.mindelay "
|
||||
"FROM spawn2, spawngroup WHERE spawn2.spawngroupID = spawngroup.ID "
|
||||
"AND spawn2.version = %u and zone = '%s'",
|
||||
version, zone_name);
|
||||
std::string query = fmt::format(
|
||||
SQL(
|
||||
SELECT
|
||||
DISTINCT(spawngroupID),
|
||||
spawngroup.name,
|
||||
spawngroup.spawn_limit,
|
||||
spawngroup.dist,
|
||||
spawngroup.max_x,
|
||||
spawngroup.min_x,
|
||||
spawngroup.max_y,
|
||||
spawngroup.min_y,
|
||||
spawngroup.delay,
|
||||
spawngroup.despawn,
|
||||
spawngroup.despawn_timer,
|
||||
spawngroup.mindelay
|
||||
FROM
|
||||
spawn2,
|
||||
spawngroup
|
||||
WHERE
|
||||
spawn2.spawngroupID = spawngroup.ID
|
||||
AND
|
||||
spawn2.version = {} and zone = '{}'
|
||||
),
|
||||
version,
|
||||
zone_name
|
||||
);
|
||||
|
||||
auto results = QueryDatabase(query);
|
||||
if (!results.Success()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
auto newSpawnGroup = new SpawnGroup(atoi(row[0]), row[1], atoi(row[2]), atof(row[3]), atof(row[4]),
|
||||
atof(row[5]), atof(row[6]), atof(row[7]), atoi(row[8]),
|
||||
atoi(row[9]), atoi(row[10]), atoi(row[11]));
|
||||
spawn_group_list->AddSpawnGroup(newSpawnGroup);
|
||||
auto new_spawn_group = new SpawnGroup(
|
||||
atoi(row[0]),
|
||||
row[1],
|
||||
atoi(row[2]),
|
||||
atof(row[3]),
|
||||
atof(row[4]),
|
||||
atof(row[5]),
|
||||
atof(row[6]),
|
||||
atof(row[7]),
|
||||
atoi(row[8]),
|
||||
atoi(row[9]),
|
||||
atoi(row[10]),
|
||||
atoi(row[11])
|
||||
);
|
||||
|
||||
spawn_group_list->AddSpawnGroup(new_spawn_group);
|
||||
}
|
||||
|
||||
query = StringFormat("SELECT DISTINCT spawnentry.spawngroupID, npcid, chance, "
|
||||
"npc_types.spawn_limit AS sl "
|
||||
"FROM spawnentry, spawn2, npc_types "
|
||||
"WHERE spawnentry.npcID=npc_types.id "
|
||||
"AND spawnentry.spawngroupID = spawn2.spawngroupID "
|
||||
"AND zone = '%s'",
|
||||
zone_name);
|
||||
query = fmt::format(
|
||||
SQL(
|
||||
SELECT
|
||||
DISTINCT
|
||||
spawnentry.spawngroupID,
|
||||
npcid,
|
||||
chance,
|
||||
npc_types.spawn_limit
|
||||
AS sl
|
||||
FROM
|
||||
spawnentry,
|
||||
spawn2,
|
||||
npc_types
|
||||
WHERE
|
||||
spawnentry.npcID = npc_types.id
|
||||
AND
|
||||
spawnentry.spawngroupID = spawn2.spawngroupID
|
||||
AND
|
||||
zone = '{}'),
|
||||
zone_name
|
||||
);
|
||||
|
||||
results = QueryDatabase(query);
|
||||
if (!results.Success()) {
|
||||
Log(Logs::General, Logs::Error, "Error2 in PopulateZoneLists query '%'", query.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
auto newSpawnEntry = new SpawnEntry(atoi(row[1]), atoi(row[2]), row[3] ? atoi(row[3]) : 0);
|
||||
SpawnGroup *sg = spawn_group_list->GetSpawnGroup(atoi(row[0]));
|
||||
auto new_spawn_entry = new SpawnEntry(
|
||||
atoi(row[1]),
|
||||
atoi(row[2]),
|
||||
(row[3] ? atoi(row[3]) : 0)
|
||||
);
|
||||
|
||||
if (!sg) {
|
||||
safe_delete(newSpawnEntry);
|
||||
SpawnGroup *spawn_group = spawn_group_list->GetSpawnGroup(atoi(row[0]));
|
||||
|
||||
if (!spawn_group) {
|
||||
safe_delete(new_spawn_entry);
|
||||
continue;
|
||||
}
|
||||
|
||||
sg->AddSpawnEntry(newSpawnEntry);
|
||||
spawn_group->AddSpawnEntry(new_spawn_entry);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ZoneDatabase::LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList *spawn_group_list)
|
||||
/**
|
||||
* @param spawn_group_id
|
||||
* @param spawn_group_list
|
||||
* @return
|
||||
*/
|
||||
bool ZoneDatabase::LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList *spawn_group_list)
|
||||
{
|
||||
std::string query = StringFormat("SELECT DISTINCT(spawngroup.id), spawngroup.name, spawngroup.spawn_limit, "
|
||||
"spawngroup.dist, spawngroup.max_x, spawngroup.min_x, "
|
||||
"spawngroup.max_y, spawngroup.min_y, spawngroup.delay, "
|
||||
"spawngroup.despawn, spawngroup.despawn_timer, spawngroup.mindelay "
|
||||
"FROM spawngroup WHERE spawngroup.ID = '%i'",
|
||||
spawngroupid);
|
||||
std::string query = fmt::format(
|
||||
SQL(
|
||||
SELECT DISTINCT
|
||||
(spawngroup.id),
|
||||
spawngroup.name,
|
||||
spawngroup.spawn_limit,
|
||||
spawngroup.dist,
|
||||
spawngroup.max_x,
|
||||
spawngroup.min_x,
|
||||
spawngroup.max_y,
|
||||
spawngroup.min_y,
|
||||
spawngroup.delay,
|
||||
spawngroup.despawn,
|
||||
spawngroup.despawn_timer,
|
||||
spawngroup.mindelay
|
||||
FROM
|
||||
spawngroup
|
||||
WHERE
|
||||
spawngroup.ID = '{}'
|
||||
),
|
||||
spawn_group_id
|
||||
);
|
||||
|
||||
auto results = QueryDatabase(query);
|
||||
if (!results.Success()) {
|
||||
Log(Logs::General, Logs::Error, "Error2 in PopulateZoneLists query %s", query.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
auto newSpawnGroup = new SpawnGroup(atoi(row[0]), row[1], atoi(row[2]), atof(row[3]), atof(row[4]),
|
||||
atof(row[5]), atof(row[6]), atof(row[7]), atoi(row[8]),
|
||||
atoi(row[9]), atoi(row[10]), atoi(row[11]));
|
||||
spawn_group_list->AddSpawnGroup(newSpawnGroup);
|
||||
auto new_spawn_group = new SpawnGroup(
|
||||
atoi(row[0]),
|
||||
row[1],
|
||||
atoi(row[2]),
|
||||
atof(row[3]),
|
||||
atof(row[4]),
|
||||
atof(row[5]),
|
||||
atof(row[6]),
|
||||
atof(row[7]),
|
||||
atoi(row[8]),
|
||||
atoi(row[9]),
|
||||
atoi(row[10]),
|
||||
atoi(row[11])
|
||||
);
|
||||
|
||||
spawn_group_list->AddSpawnGroup(new_spawn_group);
|
||||
}
|
||||
|
||||
query = StringFormat("SELECT DISTINCT(spawnentry.spawngroupID), spawnentry.npcid, "
|
||||
"spawnentry.chance, spawngroup.spawn_limit FROM spawnentry, spawngroup "
|
||||
"WHERE spawnentry.spawngroupID = '%i' AND spawngroup.spawn_limit = '0' "
|
||||
"ORDER BY chance",
|
||||
spawngroupid);
|
||||
query = fmt::format(
|
||||
SQL(
|
||||
SELECT DISTINCT
|
||||
(spawnentry.spawngroupID),
|
||||
spawnentry.npcid,
|
||||
spawnentry.chance,
|
||||
spawngroup.spawn_limit
|
||||
FROM
|
||||
spawnentry,
|
||||
spawngroup
|
||||
WHERE
|
||||
spawnentry.spawngroupID = '{}'
|
||||
AND spawngroup.spawn_limit = '0'
|
||||
ORDER BY chance),
|
||||
spawn_group_id
|
||||
);
|
||||
|
||||
results = QueryDatabase(query);
|
||||
if (!results.Success()) {
|
||||
Log(Logs::General, Logs::Error, "Error3 in PopulateZoneLists query '%s'", query.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
auto newSpawnEntry = new SpawnEntry(atoi(row[1]), atoi(row[2]), row[3] ? atoi(row[3]) : 0);
|
||||
SpawnGroup *sg = spawn_group_list->GetSpawnGroup(atoi(row[0]));
|
||||
if (!sg) {
|
||||
safe_delete(newSpawnEntry);
|
||||
auto new_spawn_entry = new SpawnEntry(
|
||||
atoi(row[1]),
|
||||
atoi(row[2]),
|
||||
(row[3] ? atoi(row[3]) : 0)
|
||||
);
|
||||
|
||||
SpawnGroup *spawn_group = spawn_group_list->GetSpawnGroup(atoi(row[0]));
|
||||
if (!spawn_group) {
|
||||
safe_delete(new_spawn_entry);
|
||||
continue;
|
||||
}
|
||||
|
||||
sg->AddSpawnEntry(newSpawnEntry);
|
||||
spawn_group->AddSpawnEntry(new_spawn_entry);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user