ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: add ClientState IsPvP, EnterPvP, LeavePvP to help plugins with disabling themselves

Browse source
This commit is contained in:
goaaats 2022-04-17 16:33:41 +02:00
parent c24d7c0e08
commit 62fc1ea66b
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Dalamud/Game/ClientState/ClientState.cs
View file

@ -1,9 +1,9 @@
using System;
using System.Runtime.InteropServices;
using Dalamud.Data;
using Dalamud.Game.ClientState.Aetherytes;
using Dalamud.Game.ClientState.Buddy;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Fates;
using Dalamud.Game.ClientState.GamePad;
using Dalamud.Game.ClientState.JobGauge;
@ -17,6 +17,7 @@ using Dalamud.Hooking;
using Dalamud.IoC;
using Dalamud.IoC.Internal;
using Dalamud.Utility;
using Lumina.Excel.GeneratedSheets;
using Serilog;
namespace Dalamud.Game.ClientState
@ -32,6 +33,7 @@ namespace Dalamud.Game.ClientState
private readonly Hook<SetupTerritoryTypeDelegate> setupTerritoryTypeHook;
private bool lastConditionNone = true;
private bool lastFramePvP = false;
/// <summary>
/// Initializes a new instance of the <see cref="ClientState"/> class.
@ -95,6 +97,16 @@ namespace Dalamud.Game.ClientState
/// </summary>
public event EventHandler Logout;
/// <summary>
/// Event that fires when a character is entering PvP.
/// </summary>
public event System.Action EnterPvP;
/// <summary>
/// Event that fires when a character is leaving PvP.
/// </summary>
public event System.Action LeavePvP;
/// <summary>
/// Event that gets fired when a duty is ready.
/// </summary>
@ -125,12 +137,17 @@ namespace Dalamud.Game.ClientState
/// </summary>
public bool IsLoggedIn { get; private set; }
/// <summary>
/// Gets a value indicating whether or not the user is playing PvP.
/// </summary>
public bool IsPvP { get; private set; }
/// <summary>
/// Enable this module.
/// </summary>
public void Enable()
{
Service<Condition>.Get().Enable();
Service<Conditions.Condition>.Get().Enable();
Service<GamepadState>.Get().Enable();
this.setupTerritoryTypeHook.Enable();
}
@ -141,7 +158,7 @@ namespace Dalamud.Game.ClientState
void IDisposable.Dispose()
{
this.setupTerritoryTypeHook.Dispose();
Service<Condition>.Get().ExplicitDispose();
Service<Conditions.Condition>.Get().ExplicitDispose();
Service<GamepadState>.Get().ExplicitDispose();
Service<Framework>.Get().Update -= this.FrameworkOnOnUpdateEvent;
Service<NetworkHandlers>.Get().CfPop -= this.NetworkHandlersOnCfPop;
@ -164,8 +181,10 @@ namespace Dalamud.Game.ClientState
private void FrameworkOnOnUpdateEvent(Framework framework)
{
var condition = Service<Condition>.Get();
var condition = Service<Conditions.Condition>.Get();
var gameGui = Service<GameGui>.Get();
var data = Service<DataManager>.Get();
if (condition.Any() && this.lastConditionNone == true)
{
Log.Debug("Is login");
@ -183,6 +202,26 @@ namespace Dalamud.Game.ClientState
this.Logout?.Invoke(this, null);
gameGui.ResetUiHideState();
}
if (this.TerritoryType != 0)
{
var terriRow = data.GetExcelSheet<TerritoryType>()!.GetRow(this.TerritoryType);
this.IsPvP = terriRow?.Bg.RawString.StartsWith("ffxiv/pvp") ?? false;
}
if (this.IsPvP != this.lastFramePvP)
{
this.lastFramePvP = this.IsPvP;
if (this.IsPvP)
{
this.EnterPvP?.Invoke();
}
else
{
this.LeavePvP?.Invoke();
}
}
}
}
}