Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Scripts/OutdoorPvP: ported some refactors for Halaa

Browse Source
This commit is contained in:
Ovahlord committed 2022-12-26 11:59:49 +01:00
1 parent a3883ea2d5
commit d43170562c
2 files changed
+3 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+3 -5
View File
@@ -29,7 +29,7 @@
#include "WorldStatePackets.h"
// kill credit for pks
uint32 const NA_CREDIT_MARKER = 24867;
uint32 const NA_CREDIT_MARKER = 24867; // kill credit for pks
uint32 const NA_GUARDS_MAX = 15;
uint32 const NA_BUFF_ZONE = 3518;
uint32 const NA_HALAA_GRAVEYARD = 993;
@@ -129,10 +129,8 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team)
UpdateWyvernRoostWorldState(NA_ROOST_E);
}
OPvPCapturePointNA::OPvPCapturePointNA(OutdoorPvP* pvp) :
OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFaction(0),
m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0), m_WyvernStateWest(0),
m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME)
OPvPCapturePointNA::OPvPCapturePointNA(OutdoorPvP* pvp) : OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFaction(0), m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0),
m_WyvernStateWest(0), m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME)
{
SetCapturePointData(182210);
}
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
-17
View File
@@ -123,7 +123,6 @@ enum HalaaStates
class Unit;
class Creature;
class OutdoorPvPNA;
class OPvPCapturePointNA : public OPvPCapturePoint
{
@@ -131,17 +130,12 @@ class OPvPCapturePointNA : public OPvPCapturePoint
OPvPCapturePointNA(OutdoorPvP* pvp);
bool Update(uint32 diff) override;
void ChangeState() override;
bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go) override;
int32 HandleOpenGo(Player* player, GameObject* go) override;
uint32 GetAliveGuardsCount() const;
uint32 GetControllingFaction() const;
protected:
// called when a faction takes control
void FactionTakeOver(uint32 team);
void UpdateWyvernRoostWorldState(uint32 roost);
@@ -149,20 +143,14 @@ class OPvPCapturePointNA : public OPvPCapturePoint
private:
bool m_capturable;
uint32 m_GuardsAlive;
uint32 m_ControllingFaction;
uint32 m_WyvernStateNorth;
uint32 m_WyvernStateSouth;
uint32 m_WyvernStateEast;
uint32 m_WyvernStateWest;
uint32 m_HalaaState;
uint32 m_RespawnTimer;
uint32 m_GuardCheckTimer;
};
@@ -172,16 +160,11 @@ class OutdoorPvPNA : public OutdoorPvP
OutdoorPvPNA();
void OnGameObjectCreate(GameObject* go) override;
bool SetupOutdoorPvP() override;
void HandlePlayerEnterZone(Player* player, uint32 zone) override;
void HandlePlayerLeaveZone(Player* player, uint32 zone) override;
bool Update(uint32 diff) override;
void SendRemoveWorldStates(Player* player) override;
void HandleKillImpl(Player* player, Unit* killed) override;
private: