pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bots] Convert Load, Save, SaveNew, and Delete to Repositories. (#2614)

Browse Source 
* [Bots] Convert Load, Save, SaveNew, and Delete to Repositories.

# Notes
- General code cleanup, as manually adding to these queries doesn't scale very well.

* FindOne.

* Update base_bot_data_repository.h

* Update template.
This commit is contained in:
Alex King 2022-12-04 18:22:35 -05:00 committed by GitHub
parent 9a35cacf27
commit 423e6ae751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 168 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/repositories/base/base_bot_data_repository.h
View File

@ -300,7 +300,8 @@ public:
{
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE id = {} LIMIT 1",
"{} WHERE {} = {} LIMIT 1",
PrimaryKey(),
BaseSelect(),
bot_data_id
)

3
common/repositories/template/base_repository.template
View File

@ -104,7 +104,8 @@ public:
{
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE id = {} LIMIT 1",
"{} WHERE {} = {} LIMIT 1",
PrimaryKey(),
BaseSelect(),
{{TABLE_NAME_VAR}}_id
)

6
zone/bot.h
View File

@ -38,9 +38,9 @@
#include <sstream>
constexpr float BOT_FOLLOW_DISTANCE_DEFAULT = 184.0f; // as DSq value (~13.565 units)
constexpr float BOT_FOLLOW_DISTANCE_DEFAULT_MAX = 2500.0f; // as DSq value (50 units)
constexpr float BOT_FOLLOW_DISTANCE_WALK = 1000.0f; // as DSq value (~31.623 units)
constexpr uint32 BOT_FOLLOW_DISTANCE_DEFAULT = 184; // as DSq value (~13.565 units)
constexpr uint32 BOT_FOLLOW_DISTANCE_DEFAULT_MAX = 2500; // as DSq value (50 units)
constexpr uint32 BOT_FOLLOW_DISTANCE_WALK = 1000; // as DSq value (~31.623 units)
constexpr uint32 BOT_KEEP_ALIVE_INTERVAL = 5000; // 5 seconds

494
zone/bot_database.cpp
View File

@ -24,6 +24,7 @@
#include "../common/strings.h"
#include "../common/eqemu_logsys.h"
#include "../common/repositories/bot_data_repository.h"
#include "../common/repositories/bot_inventories_repository.h"
#include "zonedb.h"
@ -379,86 +380,41 @@ bool BotDatabase::LoadBot(const uint32 bot_id, Bot*& loaded_bot)
return false;
}
query = fmt::format(
"SELECT"
" `owner_id`," // 0
" `spells_id`," // 1
" `name`," // 2
" `last_name`," // 3
" `title`," // 4
" `suffix`," // 5
" `level`," // 6
" `race`," // 7
" `class`," // 8
" `gender`," // 9
" `size`," // 10
" `face`," // 11
" `hair_style`," // 12
" `hair_color`," // 13
" `eye_color_1`," // 14
" `eye_color_2`," // 15
" `beard`," // 16
" `beard_color`," // 17
" `drakkin_heritage`," // 18
" `drakkin_tattoo`," // 19
" `drakkin_details`," // 20
" `hp`," // 21
" `mana`," // 22
" `time_spawned`," // 23
" `zone_id`," // 24
" `show_helm`," // 25
" `follow_distance`," // 26
" `stop_melee_level`," // 27
" `expansion_bitmask`," // 28
" `enforce_spell_settings`," // 29
" `archery_setting`" // 30
" FROM `bot_data`"
" WHERE `bot_id` = {}"
" LIMIT 1",
bot_id
);
auto results = database.QueryDatabase(query);
if (!results.Success()) {
const auto& l = BotDataRepository::FindOne(database, bot_id);
if (!l.bot_id) {
return false;
}
if (!results.RowCount()) {
return true;
}
auto row = results.begin();
auto d = Bot::CreateDefaultNPCTypeStructForBot(
std::string(row[2]), // Name
std::string(row[3]), // Last Name
static_cast<uint8>(EQ::Clamp(std::stoi(row[6]), 1, 255)), // Level
static_cast<uint16>(std::stoul(row[8])), // Race
static_cast<uint8>(EQ::Clamp(std::stoi(row[9]), WARRIOR, BERSERKER)), // Class
static_cast<uint8>(EQ::Clamp(std::stoi(row[7]), MALE, FEMALE)) // Gender
l.name,
l.last_name,
l.level,
l.race,
l.class_,
l.gender
);
auto t = Bot::FillNPCTypeStruct(
std::stoul(row[1]), // Spells ID
std::string(row[2]), // Name
std::string(row[3]), // Last Name
static_cast<uint8>(EQ::Clamp(std::stoi(row[6]), 1, 255)), // Level
static_cast<uint16>(std::stoul(row[7])), // Race
static_cast<uint8>(EQ::Clamp(std::stoi(row[8]), WARRIOR, BERSERKER)), // Class
static_cast<uint8>(EQ::Clamp(std::stoi(row[9]), MALE, FEMALE)), // Gender
std::stof(row[10]), // Size
std::stoul(row[11]), // Face
std::stoul(row[12]), // Hair Style
std::stoul(row[13]), // Hair Color
std::stoul(row[14]), // Eye Color 1
std::stoul(row[15]), // Eye Color 2
std::stoul(row[16]), // Beard
std::stoul(row[17]), // Beard Color
std::stoul(row[18]), // Drakkin Heritage
std::stoul(row[19]), // Drakkin Tattoo
std::stoul(row[20]), // Drakkin Details
std::stoi(row[21]), // Health
std::stoi(row[22]), // Mana
l.spells_id,
l.name,
l.last_name,
l.level,
l.race,
l.class_,
l.gender,
l.size,
l.face,
l.hair_style,
l.hair_color,
l.eye_color_1,
l.eye_color_2,
l.beard,
l.beard_color,
l.drakkin_heritage,
l.drakkin_tattoo,
l.drakkin_details,
l.hp,
l.mana,
d->MR,
d->CR,
d->DR,
@ -480,40 +436,30 @@ bool BotDatabase::LoadBot(const uint32 bot_id, Bot*& loaded_bot)
loaded_bot = new Bot(
bot_id,
std::stoul(row[0]), // Owner ID
std::stoul(row[1]), // Spells ID
std::stof(row[23]), // Total Play Time
std::stoul(row[24]), // Last Zone ID
l.owner_id,
l.spells_id,
l.time_spawned,
l.zone_id,
t
);
if (loaded_bot) {
loaded_bot->SetSurname(row[3]);
loaded_bot->SetTitle(row[4]);
loaded_bot->SetSuffix(row[5]);
loaded_bot->SetSurname(l.last_name);
loaded_bot->SetTitle(l.title);
loaded_bot->SetSuffix(l.suffix);
loaded_bot->SetShowHelm((std::stoi(row[25]) > 0 ? true : false));
auto bfd = std::stoul(row[26]);
if (bfd < 1) {
bfd = 1;
}
if (bfd > BOT_FOLLOW_DISTANCE_DEFAULT_MAX) {
bfd = BOT_FOLLOW_DISTANCE_DEFAULT_MAX;
}
loaded_bot->SetShowHelm((l.show_helm ? true : false));
auto bfd = EQ::Clamp(l.follow_distance, static_cast<uint32>(1), BOT_FOLLOW_DISTANCE_DEFAULT_MAX);
loaded_bot->SetFollowDistance(bfd);
auto sml = static_cast<uint8>(EQ::Clamp(std::stoi(row[27]), 1, 255));
loaded_bot->SetStopMeleeLevel(sml);
loaded_bot->SetStopMeleeLevel(l.stop_melee_level);
auto eb = std::stoi(row[28]);
loaded_bot->SetExpansionBitmask(eb, false);
loaded_bot->SetExpansionBitmask(l.expansion_bitmask, false);
loaded_bot->SetBotEnforceSpellSetting((std::stoi(row[29]) > 0 ? true : false));
loaded_bot->SetBotEnforceSpellSetting((l.enforce_spell_settings ? true : false));
loaded_bot->SetBotArcherySetting((std::stoi(row[30]) > 0 ? true : false));
loaded_bot->SetBotArcherySetting((l.archery_setting ? true : false));
}
return true;
@ -521,263 +467,147 @@ bool BotDatabase::LoadBot(const uint32 bot_id, Bot*& loaded_bot)
bool BotDatabase::SaveNewBot(Bot* bot_inst, uint32& bot_id)
{
if (!bot_inst)
if (!bot_inst) {
return false;
}
query = StringFormat(
"INSERT INTO `bot_data` ("
" `owner_id`,"
" `spells_id`,"
" `name`,"
" `last_name`,"
" `zone_id`,"
" `gender`,"
" `race`,"
" `class`,"
" `level`,"
" `creation_day`,"
" `last_spawn`,"
" `time_spawned`,"
" `size`,"
" `face`,"
" `hair_color`,"
" `hair_style`,"
" `beard`,"
" `beard_color`,"
" `eye_color_1`,"
" `eye_color_2`,"
" `drakkin_heritage`,"
" `drakkin_tattoo`,"
" `drakkin_details`,"
" `ac`,"
" `atk`,"
" `hp`,"
" `mana`,"
" `str`,"
" `sta`,"
" `cha`,"
" `dex`,"
" `int`,"
" `agi`,"
" `wis`,"
" `fire`,"
" `cold`,"
" `magic`,"
" `poison`,"
" `disease`,"
" `corruption`,"
" `show_helm`,"
" `follow_distance`,"
" `stop_melee_level`"
")"
" VALUES ("
"'%u'," /* owner_id */
" '%u'," /* spells_id */
" '%s'," /* name */
" '%s'," /* last_name */
" '%i'," /* zone_id */
" '%i'," /* gender */
" '%i'," /* race */
" '%i'," /* class */
" '%u'," /* level */
" UNIX_TIMESTAMP()," /* creation_day */
" UNIX_TIMESTAMP()," /* last_spawn */
" 0," /* time_spawned */
" '%f'," /* size */
" '%i'," /* face */
" '%i'," /* hair_color */
" '%i'," /* hair_style */
" '%i'," /* beard */
" '%i'," /* beard_color */
" '%i'," /* eye_color_1 */
" '%i'," /* eye_color_2 */
" '%i'," /* drakkin_heritage */
" '%i'," /* drakkin_tattoo */
" '%i'," /* drakkin_details */
" '%i'," /* ac */
" '%i'," /* atk */
" '%i'," /* hp */
" '%i'," /* mana */
" '%i'," /* str */
" '%i'," /* sta */
" '%i'," /* cha */
" '%i'," /* dex */
" '%i'," /* int */
" '%i'," /* agi */
" '%i'," /* wis */
" '%i'," /* fire */
" '%i'," /* cold */
" '%i'," /* magic */
" '%i'," /* poison */
" '%i'," /* disease */
" '%i'," /* corruption */
" '1'," /* show_helm */
" '%i'," /* follow_distance */
" '%u'" /* stop_melee_level */
")",
bot_inst->GetBotOwnerCharacterID(),
bot_inst->GetBotSpellID(),
bot_inst->GetCleanName(),
bot_inst->GetLastName(),
bot_inst->GetLastZoneID(),
bot_inst->GetGender(),
bot_inst->GetRace(),
bot_inst->GetClass(),
bot_inst->GetLevel(),
bot_inst->GetSize(),
bot_inst->GetLuclinFace(),
bot_inst->GetHairColor(),
bot_inst->GetHairStyle(),
bot_inst->GetBeard(),
bot_inst->GetBeardColor(),
bot_inst->GetEyeColor1(),
bot_inst->GetEyeColor2(),
bot_inst->GetDrakkinHeritage(),
bot_inst->GetDrakkinTattoo(),
bot_inst->GetDrakkinDetails(),
bot_inst->GetAC(),
bot_inst->GetATK(),
bot_inst->GetHP(),
bot_inst->GetMana(),
bot_inst->GetSTR(),
bot_inst->GetSTA(),
bot_inst->GetCHA(),
bot_inst->GetDEX(),
bot_inst->GetINT(),
bot_inst->GetAGI(),
bot_inst->GetWIS(),
bot_inst->GetFR(),
bot_inst->GetCR(),
bot_inst->GetMR(),
bot_inst->GetPR(),
bot_inst->GetDR(),
bot_inst->GetCorrup(),
(uint32)BOT_FOLLOW_DISTANCE_DEFAULT,
(IsCasterClass(bot_inst->GetClass()) ? (uint8)RuleI(Bots, CasterStopMeleeLevel) : 255)
);
auto results = database.QueryDatabase(query);
if (!results.Success())
auto e = BotDataRepository::NewEntity();
e.owner_id = bot_inst->GetBotOwnerCharacterID();
e.spells_id = bot_inst->GetBotSpellID();
e.name = bot_inst->GetCleanName();
e.last_name = bot_inst->GetLastName();
e.title = bot_inst->GetTitle();
e.suffix = bot_inst->GetSuffix();
e.zone_id = bot_inst->GetLastZoneID();
e.gender = bot_inst->GetGender();
e.race = bot_inst->GetBaseRace();
e.class_ = bot_inst->GetClass();
e.level = bot_inst->GetLevel();
e.creation_day = std::time(nullptr);
e.last_spawn = std::time(nullptr);
e.size = bot_inst->GetSize();
e.face = bot_inst->GetLuclinFace();
e.hair_color = bot_inst->GetHairColor();
e.hair_style = bot_inst->GetHairStyle();
e.beard = bot_inst->GetBeard();
e.beard_color = bot_inst->GetBeardColor();
e.eye_color_1 = bot_inst->GetEyeColor1();
e.eye_color_2 = bot_inst->GetEyeColor2();
e.drakkin_heritage = bot_inst->GetDrakkinHeritage();
e.drakkin_tattoo = bot_inst->GetDrakkinTattoo();
e.drakkin_details = bot_inst->GetDrakkinDetails();
e.ac = bot_inst->GetBaseAC();
e.atk = bot_inst->GetBaseATK();
e.hp = bot_inst->GetHP();
e.mana = bot_inst->GetMana();
e.str = bot_inst->GetBaseSTR();
e.sta = bot_inst->GetBaseSTA();
e.cha = bot_inst->GetBaseCHA();
e.dex = bot_inst->GetBaseDEX();
e.int_ = bot_inst->GetBaseINT();
e.agi = bot_inst->GetBaseAGI();
e.wis = bot_inst->GetBaseWIS();
e.fire = bot_inst->GetBaseFR();
e.cold = bot_inst->GetBaseCR();
e.magic = bot_inst->GetBaseMR();
e.poison = bot_inst->GetBasePR();
e.disease = bot_inst->GetBaseDR();
e.corruption = bot_inst->GetBaseCorrup();
e.show_helm = bot_inst->GetShowHelm() ? 1 : 0;
e.follow_distance = bot_inst->GetFollowDistance();
e.stop_melee_level = bot_inst->GetStopMeleeLevel();
e.expansion_bitmask = bot_inst->GetExpansionBitmask();
e.enforce_spell_settings = bot_inst->GetBotEnforceSpellSetting();
e.archery_setting = bot_inst->IsBotArcher() ? 1 : 0;
auto b = BotDataRepository::InsertOne(database, e);
if (!b.bot_id) {
return false;
}
bot_id = results.LastInsertedID();
bot_id = b.bot_id;
return true;
}
bool BotDatabase::SaveBot(Bot* bot_inst)
{
if (!bot_inst)
if (!bot_inst) {
return false;
}
query = StringFormat(
"UPDATE `bot_data`"
" SET"
" `owner_id` = '%u',"
" `spells_id` = '%u',"
" `name` = '%s',"
" `last_name` = '%s',"
" `zone_id` = '%i',"
" `gender` = '%i',"
" `race` = '%i',"
" `class` = '%i',"
" `level` = '%u',"
" `last_spawn` = UNIX_TIMESTAMP(),"
" `time_spawned` = '%u',"
" `size` = '%f',"
" `face` = '%i',"
" `hair_color` = '%i',"
" `hair_style` = '%i',"
" `beard` = '%i',"
" `beard_color` = '%i',"
" `eye_color_1` = '%i',"
" `eye_color_2` = '%i',"
" `drakkin_heritage` = '%i',"
" `drakkin_tattoo` = '%i',"
" `drakkin_details` = '%i',"
" `ac` = '%i',"
" `atk` = '%i',"
" `hp` = '%i',"
" `mana` = '%i',"
" `str` = '%i',"
" `sta` = '%i',"
" `cha` = '%i',"
" `dex` = '%i',"
" `int` = '%i',"
" `agi` = '%i',"
" `wis` = '%i',"
" `fire` = '%i',"
" `cold` = '%i',"
" `magic` = '%i',"
" `poison` = '%i',"
" `disease` = '%i',"
" `corruption` = '%i',"
" `show_helm` = '%i',"
" `follow_distance` = '%i',"
" `stop_melee_level` = '%u',"
" `title` = '%s',"
" `suffix` = '%s'"
" WHERE `bot_id` = '%u'",
bot_inst->GetBotOwnerCharacterID(),
bot_inst->GetBotSpellID(),
bot_inst->GetCleanName(),
bot_inst->GetSurname().c_str(),
bot_inst->GetLastZoneID(),
bot_inst->GetBaseGender(),
bot_inst->GetBaseRace(),
bot_inst->GetClass(),
bot_inst->GetLevel(),
bot_inst->GetTotalPlayTime(),
bot_inst->GetBaseSize(),
bot_inst->GetLuclinFace(),
bot_inst->GetHairColor(),
bot_inst->GetHairStyle(),
bot_inst->GetBeard(),
bot_inst->GetBeardColor(),
bot_inst->GetEyeColor1(),
bot_inst->GetEyeColor2(),
bot_inst->GetDrakkinHeritage(),
bot_inst->GetDrakkinTattoo(),
bot_inst->GetDrakkinDetails(),
bot_inst->GetBaseAC(),
bot_inst->GetBaseATK(),
bot_inst->GetHP(),
bot_inst->GetMana(),
bot_inst->GetBaseSTR(),
bot_inst->GetBaseSTA(),
bot_inst->GetBaseCHA(),
bot_inst->GetBaseDEX(),
bot_inst->GetBaseINT(),
bot_inst->GetBaseAGI(),
bot_inst->GetBaseWIS(),
bot_inst->GetBaseFR(),
bot_inst->GetBaseCR(),
bot_inst->GetBaseMR(),
bot_inst->GetBasePR(),
bot_inst->GetBaseDR(),
bot_inst->GetBaseCorrup(),
((bot_inst->GetShowHelm()) ? (1) : (0)),
bot_inst->GetFollowDistance(),
bot_inst->GetStopMeleeLevel(),
bot_inst->GetTitle().c_str(),
bot_inst->GetSuffix().c_str(),
bot_inst->GetBotID()
);
auto results = database.QueryDatabase(query);
if (!results.Success())
auto l = BotDataRepository::FindOne(database, bot_inst->GetBotID());
if (!l.bot_id) {
return false;
}
l.owner_id = bot_inst->GetBotOwnerCharacterID();
l.spells_id = bot_inst->GetBotSpellID();
l.name = bot_inst->GetCleanName();
l.last_name = bot_inst->GetLastName();
l.title = bot_inst->GetTitle();
l.suffix = bot_inst->GetSuffix();
l.zone_id = bot_inst->GetLastZoneID();
l.gender = bot_inst->GetGender();
l.race = bot_inst->GetBaseRace();
l.class_ = bot_inst->GetClass();
l.level = bot_inst->GetLevel();
l.last_spawn = std::time(nullptr);
l.time_spawned = bot_inst->GetTotalPlayTime();
l.size = bot_inst->GetSize();
l.face = bot_inst->GetLuclinFace();
l.hair_color = bot_inst->GetHairColor();
l.hair_style = bot_inst->GetHairStyle();
l.beard = bot_inst->GetBeard();
l.beard_color = bot_inst->GetBeardColor();
l.eye_color_1 = bot_inst->GetEyeColor1();
l.eye_color_2 = bot_inst->GetEyeColor2();
l.drakkin_heritage = bot_inst->GetDrakkinHeritage();
l.drakkin_tattoo = bot_inst->GetDrakkinTattoo();
l.drakkin_details = bot_inst->GetDrakkinDetails();
l.ac = bot_inst->GetBaseAC();
l.atk = bot_inst->GetBaseATK();
l.hp = bot_inst->GetHP();
l.mana = bot_inst->GetMana();
l.str = bot_inst->GetBaseSTR();
l.sta = bot_inst->GetBaseSTA();
l.cha = bot_inst->GetBaseCHA();
l.dex = bot_inst->GetBaseDEX();
l.int_ = bot_inst->GetBaseINT();
l.agi = bot_inst->GetBaseAGI();
l.wis = bot_inst->GetBaseWIS();
l.fire = bot_inst->GetBaseFR();
l.cold = bot_inst->GetBaseCR();
l.magic = bot_inst->GetBaseMR();
l.poison = bot_inst->GetBasePR();
l.disease = bot_inst->GetBaseDR();
l.corruption = bot_inst->GetBaseCorrup();
l.show_helm = bot_inst->GetShowHelm() ? 1 : 0;
l.follow_distance = bot_inst->GetFollowDistance();
l.stop_melee_level = bot_inst->GetStopMeleeLevel();
l.expansion_bitmask = bot_inst->GetExpansionBitmask();
l.enforce_spell_settings = bot_inst->GetBotEnforceSpellSetting();
l.archery_setting = bot_inst->IsBotArcher() ? 1 : 0;
const auto updated = BotDataRepository::UpdateOne(database, l);
if (!updated) {
return false;
}
return true;
}
bool BotDatabase::DeleteBot(const uint32 bot_id)
{
if (!bot_id)
if (!bot_id) {
return false;
}
query = StringFormat("DELETE FROM `bot_data` WHERE `bot_id` = '%u'", bot_id);
auto results = database.QueryDatabase(query);
if (!results.Success())
const auto deleted = BotDataRepository::DeleteOne(database, bot_id);
if (!deleted) {
return false;
}
return true;
}
@ -3310,7 +3140,6 @@ bool BotDatabase::SaveBotArcherSetting(const uint32 bot_id, const bool bot_arche
if (!bot_id) {
return false;
}
query = fmt::format(
"UPDATE `bot_data`"
"SET `archery_setting` = {} "
@ -3322,7 +3151,6 @@ bool BotDatabase::SaveBotArcherSetting(const uint32 bot_id, const bool bot_arche
if (!results.Success()) {
return false;
}
return true;
}