mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-11 21:01:29 +00:00
This removes the separate Expedition class and moves lockout code and
/dz command handlers into DynamicZone classes. It also refactors some
code to reduce bloat and some database usage.
This completes the effort of moving everything to DynamicZone that
started when implementing shared tasks. It also makes sense to do this
since expeditions are just dynamic zones internally despite dzs being
used for other types. Expedition specific things are just handled with
dz type checks.
Functionally nothing should change. This is mainly internal refactoring
and moving code around along with some bug fixes and reduced database
usage.
Main changes:
- The `expeditions` database table has been removed
- Expeditions no longer use a separate id, the expedition id is just the dz id
- Expedition lock state and replay timer option were moved to the
`dynamic_zones` table
- Expeditions no longer have a separate cache from dynamic zones
- Expedition creation no longer has every zone query the database to cache it
- Expedition internal lockouts are now stored on DynamicZone
- The `expedition_lockouts` table has been renamed to `dynamic_zone_lockouts`
- Fixed a small bug with the UpdateLockoutDuration api where the
internal lockout would get the time added twice in memory in the
initiating zone (this api is likely rarely used)
- Fixed an issue where use of the group/raid DoesAnyMemberHaveExpeditionLockout
api would query once for every out of zone character.
- This api now checks all members in the current zone first and only
performs a single bulk query for out of zone members if that check
is exhausted
- Deprecated the max_check_count param of DoesAnyMemberHaveExpeditionLockout,
the quest api still exists to avoid api break but a passed arg has no effect
290 lines
10 KiB
C++
290 lines
10 KiB
C++
#ifdef LUA_EQEMU
|
|
|
|
#include "lua_expedition.h"
|
|
#include "dynamic_zone.h"
|
|
#include "../common/zone_store.h"
|
|
#include "lua.hpp"
|
|
#include <luabind/luabind.hpp>
|
|
#include <luabind/object.hpp>
|
|
|
|
void Lua_Expedition::AddLockout(std::string event_name, uint32_t seconds) {
|
|
Lua_Safe_Call_Void();
|
|
self->AddLockout(event_name, seconds);
|
|
}
|
|
|
|
void Lua_Expedition::AddLockoutDuration(std::string event_name, int seconds) {
|
|
Lua_Safe_Call_Void();
|
|
self->AddLockoutDuration(event_name, seconds);
|
|
}
|
|
|
|
void Lua_Expedition::AddLockoutDuration(std::string event_name, int seconds, bool members_only) {
|
|
Lua_Safe_Call_Void();
|
|
self->AddLockoutDuration(event_name, seconds, members_only);
|
|
}
|
|
|
|
void Lua_Expedition::AddReplayLockout(uint32_t seconds) {
|
|
Lua_Safe_Call_Void();
|
|
self->AddLockout(DzLockout::ReplayTimer, seconds);
|
|
}
|
|
|
|
void Lua_Expedition::AddReplayLockoutDuration(int seconds) {
|
|
Lua_Safe_Call_Void();
|
|
self->AddLockoutDuration(DzLockout::ReplayTimer, seconds);
|
|
}
|
|
|
|
void Lua_Expedition::AddReplayLockoutDuration(int seconds, bool members_only) {
|
|
Lua_Safe_Call_Void();
|
|
self->AddLockoutDuration(DzLockout::ReplayTimer, seconds, members_only);
|
|
}
|
|
|
|
uint32_t Lua_Expedition::GetID() {
|
|
Lua_Safe_Call_Int();
|
|
return self->GetID();
|
|
}
|
|
|
|
int Lua_Expedition::GetInstanceID() {
|
|
Lua_Safe_Call_Int();
|
|
return self->GetInstanceID();
|
|
}
|
|
|
|
std::string Lua_Expedition::GetLeaderName() {
|
|
Lua_Safe_Call_String();
|
|
return self->GetLeaderName();
|
|
}
|
|
|
|
luabind::object Lua_Expedition::GetLockouts(lua_State* L) {
|
|
luabind::object lua_table = luabind::newtable(L);
|
|
|
|
if (d_)
|
|
{
|
|
auto self = reinterpret_cast<NativeType*>(d_);
|
|
const auto& lockouts = self->GetLockouts();
|
|
for (const auto& lockout : lockouts)
|
|
{
|
|
lua_table[lockout.Event()] = lockout.GetSecondsRemaining();
|
|
}
|
|
}
|
|
return lua_table;
|
|
}
|
|
|
|
std::string Lua_Expedition::GetLootEventByNPCTypeID(uint32_t npc_type_id) {
|
|
Lua_Safe_Call_String();
|
|
return self->GetLootEvent(npc_type_id, DzLootEvent::Type::NpcType);
|
|
}
|
|
|
|
std::string Lua_Expedition::GetLootEventBySpawnID(uint32_t spawn_id) {
|
|
Lua_Safe_Call_String();
|
|
return self->GetLootEvent(spawn_id, DzLootEvent::Type::Entity);
|
|
}
|
|
|
|
uint32_t Lua_Expedition::GetMemberCount() {
|
|
Lua_Safe_Call_Int();
|
|
return self->GetMemberCount();
|
|
}
|
|
|
|
luabind::object Lua_Expedition::GetMembers(lua_State* L) {
|
|
luabind::object lua_table = luabind::newtable(L);
|
|
|
|
if (d_)
|
|
{
|
|
auto self = reinterpret_cast<NativeType*>(d_);
|
|
for (const auto& member : self->GetMembers())
|
|
{
|
|
lua_table[member.name] = member.id;
|
|
}
|
|
}
|
|
return lua_table;
|
|
}
|
|
|
|
std::string Lua_Expedition::GetName() {
|
|
Lua_Safe_Call_String();
|
|
return self->GetName();
|
|
}
|
|
|
|
int Lua_Expedition::GetSecondsRemaining() {
|
|
Lua_Safe_Call_Int();
|
|
return self->GetSecondsRemaining();
|
|
}
|
|
|
|
std::string Lua_Expedition::GetUUID() {
|
|
Lua_Safe_Call_String();
|
|
return self->GetUUID();
|
|
}
|
|
|
|
int Lua_Expedition::GetZoneID() {
|
|
Lua_Safe_Call_Int();
|
|
return self->GetZoneID();
|
|
}
|
|
|
|
std::string Lua_Expedition::GetZoneName() {
|
|
Lua_Safe_Call_String();
|
|
return ZoneName(self->GetZoneID());
|
|
}
|
|
|
|
int Lua_Expedition::GetZoneVersion() {
|
|
Lua_Safe_Call_Int();
|
|
return self->GetZoneVersion();
|
|
}
|
|
|
|
bool Lua_Expedition::HasLockout(std::string event_name) {
|
|
Lua_Safe_Call_Bool();
|
|
return self->HasLockout(event_name);
|
|
}
|
|
|
|
bool Lua_Expedition::HasReplayLockout() {
|
|
Lua_Safe_Call_Bool();
|
|
return self->HasReplayLockout();
|
|
}
|
|
|
|
bool Lua_Expedition::IsLocked() {
|
|
Lua_Safe_Call_Bool();
|
|
return self->IsLocked();
|
|
}
|
|
|
|
void Lua_Expedition::RemoveCompass() {
|
|
Lua_Safe_Call_Void();
|
|
self->SetCompass(0, 0, 0, 0, true);
|
|
}
|
|
|
|
void Lua_Expedition::RemoveLockout(std::string event_name) {
|
|
Lua_Safe_Call_Void();
|
|
self->RemoveLockout(event_name);
|
|
}
|
|
|
|
void Lua_Expedition::SetCompass(uint32_t zone_id, float x, float y, float z) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetCompass(zone_id, x, y, z, true);
|
|
}
|
|
|
|
void Lua_Expedition::SetCompass(std::string zone_name, float x, float y, float z) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetCompass(ZoneID(zone_name), x, y, z, true);
|
|
}
|
|
|
|
void Lua_Expedition::SetLocked(bool lock_expedition) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetLocked(lock_expedition, true);
|
|
}
|
|
|
|
void Lua_Expedition::SetLocked(bool lock_expedition, int lock_msg) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetLocked(lock_expedition, true, static_cast<DzLockMsg>(lock_msg));
|
|
}
|
|
|
|
void Lua_Expedition::SetLocked(bool lock_expedition, int lock_msg, uint32_t msg_color) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetLocked(lock_expedition, true, static_cast<DzLockMsg>(lock_msg), msg_color);
|
|
}
|
|
|
|
void Lua_Expedition::SetLootEventByNPCTypeID(uint32_t npc_type_id, std::string event_name) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetLootEvent(npc_type_id, event_name, DzLootEvent::Type::NpcType);
|
|
}
|
|
|
|
void Lua_Expedition::SetLootEventBySpawnID(uint32_t spawn_id, std::string event_name) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetLootEvent(spawn_id, event_name, DzLootEvent::Type::Entity);
|
|
}
|
|
|
|
void Lua_Expedition::SetReplayLockoutOnMemberJoin(bool enable) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetReplayOnJoin(enable, true);
|
|
}
|
|
|
|
void Lua_Expedition::SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetSafeReturn(zone_id, x, y, z, heading, true);
|
|
}
|
|
|
|
void Lua_Expedition::SetSafeReturn(std::string zone_name, float x, float y, float z, float heading) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetSafeReturn(ZoneID(zone_name), x, y, z, heading, true);
|
|
}
|
|
|
|
void Lua_Expedition::SetSecondsRemaining(uint32_t seconds_remaining)
|
|
{
|
|
Lua_Safe_Call_Void();
|
|
self->SetSecondsRemaining(seconds_remaining);
|
|
}
|
|
|
|
void Lua_Expedition::SetSwitchID(int dz_switch_id)
|
|
{
|
|
Lua_Safe_Call_Void();
|
|
self->SetSwitchID(dz_switch_id, true);
|
|
}
|
|
|
|
void Lua_Expedition::SetZoneInLocation(float x, float y, float z, float heading) {
|
|
Lua_Safe_Call_Void();
|
|
self->SetZoneInLocation(x, y, z, heading, true);
|
|
}
|
|
|
|
void Lua_Expedition::UpdateLockoutDuration(std::string event_name, uint32_t duration) {
|
|
Lua_Safe_Call_Void();
|
|
self->UpdateLockoutDuration(event_name, duration);
|
|
}
|
|
|
|
void Lua_Expedition::UpdateLockoutDuration(std::string event_name, uint32_t duration, bool members_only) {
|
|
Lua_Safe_Call_Void();
|
|
self->UpdateLockoutDuration(event_name, duration, members_only);
|
|
}
|
|
|
|
luabind::scope lua_register_expedition() {
|
|
return luabind::class_<Lua_Expedition>("Expedition")
|
|
.def(luabind::constructor<>())
|
|
.property("null", &Lua_Expedition::Null)
|
|
.property("valid", &Lua_Expedition::Valid)
|
|
.def("AddLockout", (void(Lua_Expedition::*)(std::string, uint32_t))&Lua_Expedition::AddLockout)
|
|
.def("AddLockoutDuration", (void(Lua_Expedition::*)(std::string, int))&Lua_Expedition::AddLockoutDuration)
|
|
.def("AddLockoutDuration", (void(Lua_Expedition::*)(std::string, int, bool))&Lua_Expedition::AddLockoutDuration)
|
|
.def("AddReplayLockout", (void(Lua_Expedition::*)(uint32_t))&Lua_Expedition::AddReplayLockout)
|
|
.def("AddReplayLockoutDuration", (void(Lua_Expedition::*)(int))&Lua_Expedition::AddReplayLockoutDuration)
|
|
.def("AddReplayLockoutDuration", (void(Lua_Expedition::*)(int, bool))&Lua_Expedition::AddReplayLockoutDuration)
|
|
.def("GetDynamicZoneID", &Lua_Expedition::GetID)
|
|
.def("GetID", (uint32_t(Lua_Expedition::*)(void))&Lua_Expedition::GetID)
|
|
.def("GetInstanceID", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetInstanceID)
|
|
.def("GetLeaderName", (std::string(Lua_Expedition::*)(void))&Lua_Expedition::GetLeaderName)
|
|
.def("GetLockouts", &Lua_Expedition::GetLockouts)
|
|
.def("GetLootEventByNPCTypeID", (std::string(Lua_Expedition::*)(uint32_t))&Lua_Expedition::GetLootEventByNPCTypeID)
|
|
.def("GetLootEventBySpawnID", (std::string(Lua_Expedition::*)(uint32_t))&Lua_Expedition::GetLootEventBySpawnID)
|
|
.def("GetMemberCount", (uint32_t(Lua_Expedition::*)(void))&Lua_Expedition::GetMemberCount)
|
|
.def("GetMembers", &Lua_Expedition::GetMembers)
|
|
.def("GetName", (std::string(Lua_Expedition::*)(void))&Lua_Expedition::GetName)
|
|
.def("GetSecondsRemaining", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetSecondsRemaining)
|
|
.def("GetUUID", (std::string(Lua_Expedition::*)(void))&Lua_Expedition::GetUUID)
|
|
.def("GetZoneID", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetZoneID)
|
|
.def("GetZoneName", &Lua_Expedition::GetZoneName)
|
|
.def("GetZoneVersion", &Lua_Expedition::GetZoneVersion)
|
|
.def("HasLockout", (bool(Lua_Expedition::*)(std::string))&Lua_Expedition::HasLockout)
|
|
.def("HasReplayLockout", (bool(Lua_Expedition::*)(void))&Lua_Expedition::HasReplayLockout)
|
|
.def("IsLocked", &Lua_Expedition::IsLocked)
|
|
.def("RemoveCompass", (void(Lua_Expedition::*)(void))&Lua_Expedition::RemoveCompass)
|
|
.def("RemoveLockout", (void(Lua_Expedition::*)(std::string))&Lua_Expedition::RemoveLockout)
|
|
.def("SetCompass", (void(Lua_Expedition::*)(uint32_t, float, float, float))&Lua_Expedition::SetCompass)
|
|
.def("SetCompass", (void(Lua_Expedition::*)(std::string, float, float, float))&Lua_Expedition::SetCompass)
|
|
.def("SetLocked", (void(Lua_Expedition::*)(bool))&Lua_Expedition::SetLocked)
|
|
.def("SetLocked", (void(Lua_Expedition::*)(bool, int))&Lua_Expedition::SetLocked)
|
|
.def("SetLocked", (void(Lua_Expedition::*)(bool, int, uint32_t))&Lua_Expedition::SetLocked)
|
|
.def("SetLootEventByNPCTypeID", (void(Lua_Expedition::*)(uint32_t, std::string))&Lua_Expedition::SetLootEventByNPCTypeID)
|
|
.def("SetLootEventBySpawnID", (void(Lua_Expedition::*)(uint32_t, std::string))&Lua_Expedition::SetLootEventBySpawnID)
|
|
.def("SetReplayLockoutOnMemberJoin", (void(Lua_Expedition::*)(bool))&Lua_Expedition::SetReplayLockoutOnMemberJoin)
|
|
.def("SetSafeReturn", (void(Lua_Expedition::*)(uint32_t, float, float, float, float))&Lua_Expedition::SetSafeReturn)
|
|
.def("SetSafeReturn", (void(Lua_Expedition::*)(std::string, float, float, float, float))&Lua_Expedition::SetSafeReturn)
|
|
.def("SetSecondsRemaining", &Lua_Expedition::SetSecondsRemaining)
|
|
.def("SetSwitchID", &Lua_Expedition::SetSwitchID)
|
|
.def("SetZoneInLocation", (void(Lua_Expedition::*)(float, float, float, float))&Lua_Expedition::SetZoneInLocation)
|
|
.def("UpdateLockoutDuration", (void(Lua_Expedition::*)(std::string, uint32_t))&Lua_Expedition::UpdateLockoutDuration)
|
|
.def("UpdateLockoutDuration", (void(Lua_Expedition::*)(std::string, uint32_t, bool))&Lua_Expedition::UpdateLockoutDuration);
|
|
}
|
|
|
|
luabind::scope lua_register_expedition_lock_messages() {
|
|
return luabind::class_<DzLockMsg>("ExpeditionLockMessage")
|
|
.enum_("constants")
|
|
[(
|
|
luabind::value("None", static_cast<int>(DzLockMsg::None)),
|
|
luabind::value("Close", static_cast<int>(DzLockMsg::Close)),
|
|
luabind::value("Begin", static_cast<int>(DzLockMsg::Begin))
|
|
)];
|
|
}
|
|
|
|
#endif // LUA_EQEMU
|