pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 07:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bot-rewrite

Browse Source
This commit is contained in:
nytmyr
2025-01-11 01:47:05 -06:00
parent 01afd68230 c2ebc2540a
commit e02839f4ec
29 changed files with 490 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+56 -8
View File
@@ -13042,19 +13042,19 @@ void Client::ClientToNpcAggroProcess()
const std::vector<int16>& Client::GetInventorySlots()
{
static const std::vector<std::pair<int16, int16>> slots = {
{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END },
{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
{EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END},
{EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END},
{EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
{EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END},
{EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END},
{EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END},
{EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END},
};
static std::vector<int16> slot_ids;
if (slot_ids.empty()) {
for (const auto& [begin, end] : slots) {
for (const auto &[begin, end]: slots) {
for (int16 slot_id = begin; slot_id <= end; ++slot_id) {
slot_ids.emplace_back(slot_id);
}
@@ -13064,6 +13064,54 @@ const std::vector<int16>& Client::GetInventorySlots()
return slot_ids;
}
void Client::ShowZoneShardMenu()
{
auto z = GetZone(GetZoneID());
if (z && !z->shard_at_player_count) {
return;
}
auto results = CharacterDataRepository::GetInstanceZonePlayerCounts(database, GetZoneID());
LogZoning("Zone sharding results count [{}]", results.size());
if (results.empty()) {
Message(Chat::White, "No zone shards found.");
return;
}
if (!results.empty()) {
Message(Chat::White, "Available Zone Shards:");
}
int number = 1;
for (auto &e: results) {
std::string teleport_link = Saylink::Silent(
fmt::format("#zoneshard {} {}", e.zone_id, (e.instance_id == 0 ? -1 : e.instance_id)),
"Teleport"
);
std::string yours;
if (e.zone_id == GetZoneID() && e.instance_id == GetInstanceID()) {
teleport_link = "Teleport";
yours = " (Yours)";
}
Message(
Chat::White, fmt::format(
" --> [{}] #{} {} ({}) [{}/{}] players {}",
teleport_link,
number,
z->long_name,
e.instance_id,
e.player_count,
z->shard_at_player_count,
yours
).c_str()
);
number++;
}
}
void Client::LoadDefaultBotSettings() {
_spellSettings.clear();