mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-11 16:51:29 +00:00
55155ff800
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
57 lines
2.2 KiB
C++
57 lines
2.2 KiB
C++
#pragma once
|
|
|
|
#include <chrono>
|
|
#include <string>
|
|
#include "repositories/base/base_dynamic_zone_lockouts_repository.h"
|
|
|
|
class DzLockout
|
|
{
|
|
public:
|
|
DzLockout() = default;
|
|
DzLockout(std::string uuid, std::string expedition, std::string event, uint64_t expire_time, uint32_t duration);
|
|
DzLockout(std::string_view name, BaseDynamicZoneLockoutsRepository::DynamicZoneLockouts&& lockout);
|
|
|
|
static constexpr char ReplayTimer[] = "Replay Timer";
|
|
|
|
static DzLockout Create(const std::string& expedition, const std::string& event, uint32_t seconds, std::string uuid = {});
|
|
|
|
struct TimeStrings
|
|
{
|
|
std::string days;
|
|
std::string hours;
|
|
std::string mins;
|
|
std::string secs;
|
|
};
|
|
|
|
void AddLockoutTime(int seconds);
|
|
uint32_t GetDuration() const { return static_cast<uint32_t>(m_duration.count()); }
|
|
uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
|
|
uint64_t GetStartTime() const { return std::chrono::system_clock::to_time_t(m_expire_time - m_duration); }
|
|
uint32_t GetSecondsRemaining() const;
|
|
TimeStrings GetTimeRemainingStrs() const;
|
|
const std::string& DzName() const { return m_name; }
|
|
const std::string& Event() const { return m_event; }
|
|
const std::string& UUID() const { return m_uuid; }
|
|
bool IsEvent(std::string_view event) const { return m_event == event; }
|
|
bool IsExpired() const { return GetSecondsRemaining() == 0; }
|
|
bool IsReplay() const { return m_is_replay; }
|
|
bool IsSame(const DzLockout& other) const;
|
|
bool IsSame(const std::string& expedition, const std::string& event) const;
|
|
bool IsUUID(const std::string& uuid) const { return uuid == m_uuid; }
|
|
void Reset() { m_expire_time = std::chrono::system_clock::now() + m_duration; }
|
|
void SetDuration(uint32_t seconds) { m_duration = std::chrono::seconds(seconds); }
|
|
void SetExpireTime(uint64_t expire_time) { m_expire_time = std::chrono::system_clock::from_time_t(expire_time); }
|
|
void SetUUID(const std::string& uuid) { m_uuid = uuid; }
|
|
|
|
template <typename T>
|
|
void serialize(T& archive);
|
|
|
|
private:
|
|
bool m_is_replay = false;
|
|
std::string m_uuid; // dz received in
|
|
std::string m_name;
|
|
std::string m_event;
|
|
std::chrono::seconds m_duration = {};
|
|
std::chrono::time_point<std::chrono::system_clock> m_expire_time;
|
|
};
|