Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DelvCD/Config/CharacterStateTrigger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public override bool IsTriggered(bool preview)

IGameObject? actor = TriggerSource switch
{
TriggerSource.Player => Singletons.Get<IClientState>().LocalPlayer,
TriggerSource.Player => Singletons.Get<IObjectTable>().LocalPlayer,
TriggerSource.Target => Utils.FindTarget(),
TriggerSource.TargetOfTarget => Utils.FindTargetOfTarget(),
TriggerSource.FocusTarget => Singletons.Get<ITargetManager>().FocusTarget,
Expand All @@ -110,7 +110,7 @@ public override bool IsTriggered(bool preview)
}

_dataSource.Name = actor.Name.ToString();
var player = Singletons.Get<IClientState>().LocalPlayer;
var player = Singletons.Get<IObjectTable>().LocalPlayer;
if (player is not null)
{
Vector3 delta = player.Position - actor.Position;
Expand Down
4 changes: 2 additions & 2 deletions DelvCD/Config/CooldownTrigger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ public override bool IsTriggered(bool preview)

if (RangeCheck)
{
inRange = helper.GetActionInRange(actionId, Singletons.Get<IClientState>().LocalPlayer, Utils.FindTarget());
inRange = helper.GetActionInRange(actionId, Singletons.Get<IObjectTable>().LocalPlayer, Utils.FindTarget());
}

if (LosCheck)
{
inLos = helper.IsTargetInLos(Singletons.Get<IClientState>().LocalPlayer, Utils.FindTarget(), actionId);
inLos = helper.IsTargetInLos(Singletons.Get<IObjectTable>().LocalPlayer, Utils.FindTarget(), actionId);
}

if (HighlightCheck)
Expand Down
2 changes: 1 addition & 1 deletion DelvCD/Config/JobGaugeTrigger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public override bool IsTriggered(bool preview)
return false;
}

IPlayerCharacter? player = Singletons.Get<IClientState>().LocalPlayer;
IPlayerCharacter? player = Singletons.Get<IObjectTable>().LocalPlayer;
if (player == null || player.ClassJob.RowId != (uint)_jobGauge.Job)
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion DelvCD/Config/JobGauges/BlackMageJobGauge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public override unsafe bool IsTriggered(bool preview)
_dataSource.Paradox = gauge->ParadoxActive;
_dataSource.Astral_Soul_Stacks = gauge->AstralSoulStacks;

IPlayerCharacter? player = Singletons.Get<IClientState>().LocalPlayer;
IPlayerCharacter? player = Singletons.Get<IObjectTable>().LocalPlayer;
_dataSource.Max_Polyglot_Stacks = player == null ? 2 : (player.Level < 80 ? 1 : ((player.Level < 98 ? 2 : 3)));

if (preview) { return true; }
Expand Down
2 changes: 1 addition & 1 deletion DelvCD/Config/JobGauges/MonkJobGauge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public override bool IsTriggered(bool preview)
_dataSource.Raptor_Stacks = gauge.RaptorFury;
_dataSource.Coeurl_Stacks = gauge.CoeurlFury;

IPlayerCharacter? player = Singletons.Get<IClientState>().LocalPlayer;
IPlayerCharacter? player = Singletons.Get<IObjectTable>().LocalPlayer;
_dataSource.Max_Chakra_Stacks = player?.StatusList.FirstOrDefault(s => s.StatusId is 1182 or 2174) != null ? 10 : 5;

if (preview) { return true; }
Expand Down
2 changes: 1 addition & 1 deletion DelvCD/Config/JobGauges/ViperJobGauge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected override void InitializeConditions()
public override unsafe bool IsTriggered(bool preview)
{
VPRGauge gauge = Singletons.Get<IJobGauges>().Get<VPRGauge>();
IPlayerCharacter? player = Singletons.Get<IClientState>().LocalPlayer;
IPlayerCharacter? player = Singletons.Get<IObjectTable>().LocalPlayer;

_dataSource.Rattling_Coil_Stacks = gauge.RattlingCoilStacks;
_dataSource.Max_Rattling_Coil_Stacks = player == null || player.Level < 88 ? 2 : 3;
Expand Down
2 changes: 1 addition & 1 deletion DelvCD/Config/StatusTrigger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public override bool IsTriggered(bool preview)
return true;
}

IPlayerCharacter? player = Singletons.Get<IClientState>().LocalPlayer;
IPlayerCharacter? player = Singletons.Get<IObjectTable>().LocalPlayer;
if (player is null)
{
return false;
Expand Down
10 changes: 5 additions & 5 deletions DelvCD/DelvCD.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Dalamud.NET.Sdk/13.0.0">
<Project Sdk="Dalamud.NET.Sdk/14.0.0">
<PropertyGroup Label="Target">
<PlatformTarget>x64</PlatformTarget>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<Platforms>x64</Platforms>
<Configurations>Debug;Release</Configurations>
Expand All @@ -10,9 +10,9 @@
<!-- Assembly Configuration -->
<PropertyGroup>
<AssemblyName>DelvCD</AssemblyName>
<AssemblyVersion>1.4.0.0</AssemblyVersion>
<FileVersion>1.4.0.0</FileVersion>
<InformationalVersion>1.4.0.0</InformationalVersion>
<AssemblyVersion>1.5.0.0</AssemblyVersion>
<FileVersion>1.5.0.0</FileVersion>
<InformationalVersion>1.5.0.0</InformationalVersion>
</PropertyGroup>

<!-- Build Configuration -->
Expand Down
8 changes: 4 additions & 4 deletions DelvCD/Helpers/CharacterState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static bool IsInGoldenSaucer()

public static Job GetCharacterJob()
{
var player = Singletons.Get<IClientState>().LocalPlayer;
var player = Singletons.Get<IObjectTable>().LocalPlayer;
if (player is null)
{
return Job.UKN;
Expand All @@ -72,18 +72,18 @@ public static Job GetCharacterJob()

public static int GetCharacterLevel()
{
return Singletons.Get<IClientState>().LocalPlayer?.Level ?? 0;
return Singletons.Get<IObjectTable>().LocalPlayer?.Level ?? 0;
}

public static bool IsWeaponDrawn()
{
var player = Singletons.Get<IClientState>().LocalPlayer;
var player = Singletons.Get<IObjectTable>().LocalPlayer;
return player != null && player.StatusFlags.HasFlag(StatusFlags.WeaponOut);
}

public static unsafe bool ShouldBeVisible()
{
if (Singletons.Get<IClientState>().LocalPlayer == null || IsCharacterBusy())
if (Singletons.Get<IObjectTable>().LocalPlayer == null || IsCharacterBusy())
{
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions DelvCD/Helpers/StatusHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Dalamud.Plugin.Services;
using Lumina.Excel;

using DalamudStatus = Dalamud.Game.ClientState.Statuses.Status;
using DalamudStatus = Dalamud.Game.ClientState.Statuses.IStatus;

Check failure on line 10 in DelvCD/Helpers/StatusHelpers.cs

View workflow job for this annotation

GitHub Actions / Build against Latest Dalamud

The type or namespace name 'IStatus' does not exist in the namespace 'Dalamud.Game.ClientState.Statuses' (are you missing an assembly reference?)

Check failure on line 10 in DelvCD/Helpers/StatusHelpers.cs

View workflow job for this annotation

GitHub Actions / Build against Latest Dalamud

The type or namespace name 'IStatus' does not exist in the namespace 'Dalamud.Game.ClientState.Statuses' (are you missing an assembly reference?)
using LuminaStatus = Lumina.Excel.Sheets.Status;

namespace DelvCD.Helpers
Expand Down Expand Up @@ -44,7 +44,7 @@
dict.Clear();
}

IPlayerCharacter? player = Singletons.Get<IClientState>().LocalPlayer;
IPlayerCharacter? player = Singletons.Get<IObjectTable>().LocalPlayer;
if (player is null)
{
return;
Expand Down
2 changes: 1 addition & 1 deletion DelvCD/Helpers/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static Vector2 GetAnchoredPosition(Vector2 position, Vector2 size, DrawAn
return null;
}

IGameObject? player = Singletons.Get<IClientState>().LocalPlayer;
IGameObject? player = Singletons.Get<IObjectTable>().LocalPlayer;
if (target.TargetObjectId == 0 && player is not null && player.TargetObjectId == 0)
{
return player;
Expand Down
5 changes: 4 additions & 1 deletion DelvCD/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# 1.5.0.0
- Added support for Patch 7.4 and Dalamud API 14.

# 1.4.0.0
- Added support for Patch 7.2 and Dalamud API 12.
- Added support for Patch 7.3 and Dalamud API 13.
- Added a setting to change the glow direction CW or CCW.
- Fixed config window being shrunk and in the corner of the screen.
- Fixed issues with Dancer's Technical Step.
Expand Down
14 changes: 7 additions & 7 deletions DelvCD/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"version": 1,
"dependencies": {
"net9.0": {
"net10.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[13.0.0, )",
"resolved": "13.0.0",
"contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w=="
"requested": "[14.0.0, )",
"resolved": "14.0.0",
"contentHash": "9c1q/eAeAs82mkQWBOaCvbt3GIQxAIadz5b/7pCXDIy9nHPtnRc+tDXEvKR+M36Wvi7n+qBTevRupkLUQp6DFA=="
},
"DotNet.ReproducibleBuilds": {
"type": "Direct",
"requested": "[1.2.25, )",
"resolved": "1.2.25",
"contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg=="
"requested": "[1.2.39, )",
"resolved": "1.2.39",
"contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
}
}
}
Expand Down
Loading