PvP Helpers and Hooks

Project-Epoch · Jan 8, 2025 · 08574fe · 08574fe
1 parent c724d95
commit 08574fe
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 1 deletion.
diff --git a/cores/TrinityCore b/cores/TrinityCore
diff --git a/tswow-core/Private/TSEventsLua.cpp b/tswow-core/Private/TSEventsLua.cpp
@@ -87,6 +87,8 @@ void TSLua::load_events(sol::state& state)
     LUA_HANDLE(player_events, PlayerEvents, OnRewardHonorEarly);
     LUA_HANDLE(player_events, PlayerEvents, OnSummonIfPossible);
     LUA_HANDLE(player_events, PlayerEvents, OnBeforeUpdateLocalChannels);
+    LUA_HANDLE(player_events, PlayerEvents, OnBeforeTogglePvP);
+    LUA_HANDLE(player_events, PlayerEvents, OnCheckPvPTarget);
     //LUA_HANDLE(player_events, PlayerEvents, OnTradeComplete);
     LUA_HANDLE(player_events, PlayerEvents, OnUpdateDodgePercentage);
     LUA_HANDLE(player_events, PlayerEvents, OnUpdateBlockPercentage);

diff --git a/tswow-core/Private/TSPlayer.cpp b/tswow-core/Private/TSPlayer.cpp
@@ -4217,4 +4217,29 @@ bool TSPlayer::CanSeeTransmog()
 void TSPlayer::SetCanSeeTransmog(bool on)
 {
     player->SetCanSeeTransmog(on);
+}
+
+void TSPlayer::TogglePvP(bool enable)
+{
+    if (enable)
+    {
+        player->ApplyModFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP, enable);
+        player->ApplyModFlag(PLAYER_FLAGS, PLAYER_FLAGS_PVP_TIMER, !enable);
+    }
+    else
+    {
+        player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
+        player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_PVP_TIMER);
+    }
+
+    if (player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP))
+    {
+        if (!player->IsPvP() || player->pvpInfo.EndTimer)
+            player->UpdatePvP(true, true);
+    }
+    else
+    {
+        if (!player->pvpInfo.IsHostile && player->IsPvP())
+            player->pvpInfo.EndTimer = GameTime::GetGameTime();     // start toggle-off
+    }
 }
diff --git a/tswow-core/Public/TSEvents.h b/tswow-core/Public/TSEvents.h
@@ -201,6 +201,10 @@ struct TSEvents
 
          EVENT(OnBeforeUpdateLocalChannels, TSPlayer, TSMutable<bool, bool>)
 
+         EVENT(OnBeforeTogglePvP, TSPlayer, TSMutable<bool, bool>)
+
+         EVENT(OnCheckPvPTarget, TSPlayer, TSPlayer, TSMutable<bool, bool>)
+
          EVENT(
              OnTradeCompleted
              , TSPlayer me

diff --git a/tswow-core/Public/TSPlayer.h b/tswow-core/Public/TSPlayer.h
@@ -376,6 +376,7 @@ class TC_GAME_API TSPlayer : public TSUnit, public TSDBJsonProvider {
 
 	bool CanSeeTransmog();
 	void SetCanSeeTransmog(bool on);
+	void TogglePvP(bool enable);
 private:
 		TSLua::Dictionary<TSNumber<uint32>, TSPlayerSpell> LGetSpellMap();
 		TSItem LGetItemByGUID0(TSGUID guid);

diff --git a/tswow-core/Public/global.d.ts b/tswow-core/Public/global.d.ts
@@ -2306,6 +2306,8 @@ declare interface TSPlayer extends TSUnit, TSDBJsonProvider {
     CanSeeTransmog(): bool;
 
     SetCanSeeTransmog(on: bool): void;
+
+    TogglePvP(enable: bool): void;
 }
 
 declare interface TSCorpse extends TSWorldObject {
@@ -8337,6 +8339,10 @@ declare namespace _hidden {
         OnSummonIfPossible(callback: (player: TSPlayer, cancel: TSMutable<boolean,boolean>)=>void);
 
         OnBeforeUpdateLocalChannels(callback: (player: TSPlayer, cancel: TSMutable<boolean,boolean>)=>void);
+
+        OnBeforeTogglePvP(callback: (player: TSPlayer, cancel: TSMutable<boolean, boolean>) => void);
+
+        OnCheckPvPTarget(callback: (attacker: TSPlayer, target: TSPlayer, valid: TSMutable<boolean, boolean>) => void);
     }
 
     export class Account<T> {
+13 −1		src/server/game/Entities/Object/Object.cpp
+3 −1		src/server/game/Entities/Player/Player.cpp
+12 −0		src/server/game/Handlers/MiscHandler.cpp