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
18 changes: 9 additions & 9 deletions Daybreak.API/Interop/GWCA.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8977,7 +8977,7 @@
internal const float Nearby = 252.0f;
internal const float Spellcast = 1248.0f;
internal const float Spirit = 2512.0f;
internal const float SpiritExtended = 3500.0f;
internal const float SpiritExtended = 3000.0f;
internal const float Touch = 144.0f;
}
}
Expand Down Expand Up @@ -9625,11 +9625,11 @@
kChangeTarget, // 0x10000020, wparam = UIPacket::kChangeTarget*
kMessage_0x10000021, // 0x10000021
kMessage_0x10000022, // 0x10000022
kMessage_0x10000023, // 0x10000023
kAgentSkillActivated, // 0x10000024, kAgentSkillPacket
kAgentSkillActivatedInstantly, // 0x10000025, kAgentSkillPacket
kAgentSkillCancelled, // 0x10000026, kAgentSkillPacket
kAgentSkillStartedCast, // 0x10000027, wparam = UIPacket::kAgentStartCasting*
kAgentSkillCancelled, // 0x10000023, wparam = kAgentSkillPacket; "<agent> canceled <skill>"
kAgentSkillActivated, // 0x10000024, wparam = kAgentSkillPacket; "<agent> executed <skill>"
kAgentSkillActivatedInstantly, // 0x10000025, wparam = kAgentSkillPacket; "<agent> used <skill>"
kAgentSkillInterrupted, // 0x10000026, wparam = kAgentSkillPacket; "<agent> was interrupted while using <skill>"
kAgentSkillStartedCast, // 0x10000027, wparam = UIPacket::kAgentSkillStartedCast*; "<agent> is warming up <skill>"
kMessage_0x10000028, // 0x10000028
kShowMapEntryMessage, // 0x10000029, wparam = { wchar_t* title, wchar_t* subtitle }
kSetCurrentPlayerData, // 0x1000002a, fired after setting the worldcontext player name
Expand Down Expand Up @@ -10196,7 +10196,7 @@
[global::System.Runtime.CompilerServices.InlineArray(23)]
public unsafe struct BagStructPtrArray23
{
private global::Daybreak.API.Interop.GuildWars.BagStruct* _element0;

Check warning on line 10199 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / build-windows

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10199 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / build-windows

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10199 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / build-windows

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10199 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / cd / build-x86

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10199 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / cd / build-x86

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.
}

/// <summary>
Expand All @@ -10205,7 +10205,7 @@
[global::System.Runtime.CompilerServices.InlineArray(1)]
public unsafe struct ChatMessagePtrArray1
{
private global::Daybreak.API.Interop.GuildWars.ChatMessage* _element0;

Check warning on line 10208 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / build-windows

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10208 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / build-windows

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10208 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / cd / build-x86

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10208 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / cd / build-x86

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.
}

/// <summary>
Expand All @@ -10223,7 +10223,7 @@
[global::System.Runtime.CompilerServices.InlineArray(4)]
public unsafe struct PathingTrapezoidPtrArray4
{
private global::Daybreak.API.Interop.GuildWars.PathingTrapezoid* _element0;

Check warning on line 10226 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / build-windows

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10226 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / build-windows

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10226 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / cd / build-x86

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.

Check warning on line 10226 in Daybreak.API/Interop/GWCA.cs

View workflow job for this annotation

GitHub Actions / cd / build-x86

'Inline arrays' language feature is not supported for an inline array type that is not valid as a type argument, or has element type that is not valid as a type argument.
}

/// <summary>
Expand Down Expand Up @@ -15740,10 +15740,10 @@
kChangeTarget,
kMessage_0x10000021,
kMessage_0x10000022,
kMessage_0x10000023,
kAgentSkillCancelled,
kAgentSkillActivated,
kAgentSkillActivatedInstantly,
kAgentSkillCancelled,
kAgentSkillInterrupted,
kAgentSkillStartedCast,
kMessage_0x10000028,
kShowMapEntryMessage,
Expand Down Expand Up @@ -19702,7 +19702,7 @@
public uint AgentId;
public global::Daybreak.API.Interop.GWCA.GW.Constants.SkillID SkillId;
public float Duration;
public uint H000c;
public float H000c;
}

[global::System.Runtime.InteropServices.StructLayout(global::System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 1)]
Expand Down
3 changes: 2 additions & 1 deletion Daybreak.API/Services/CharacterSelectService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,8 @@ private async Task<bool> WaitForCharSelectAndSelectCharacter(string characterNam
}

var availableCharsContext = this.gameContextService.GetAvailableChars();
if (availableCharsContext.IsNull)
if (!availableCharsContext.IsValid ||
!availableCharsContext.Pointer->IsValid)
{
scopedLogger.LogError("Available characters context is not initialized");
return default;
Expand Down
2 changes: 1 addition & 1 deletion Dependencies/GWCA/Include/GWCA/Constants/Constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ namespace GW {
constexpr float Earshot = 1012.0f;
constexpr float Spellcast = 1248.0f;
constexpr float Spirit = 2512.0f;
constexpr float SpiritExtended = 3500.0f;
constexpr float SpiritExtended = 3000.0f;
constexpr float Compass = 5000.0f;
};

Expand Down
22 changes: 11 additions & 11 deletions Dependencies/GWCA/Include/GWCA/Constants/UIMessages.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ namespace GW {
kChangeTarget, // 0x10000020, wparam = UIPacket::kChangeTarget*
kMessage_0x10000021, // 0x10000021
kMessage_0x10000022, // 0x10000022
kMessage_0x10000023, // 0x10000023
kAgentSkillActivated, // 0x10000024, kAgentSkillPacket
kAgentSkillActivatedInstantly, // 0x10000025, kAgentSkillPacket
kAgentSkillCancelled, // 0x10000026, kAgentSkillPacket
kAgentSkillStartedCast, // 0x10000027, wparam = UIPacket::kAgentStartCasting*
kAgentSkillCancelled, // 0x10000023, wparam = kAgentSkillPacket; "<agent> canceled <skill>"
kAgentSkillActivated, // 0x10000024, wparam = kAgentSkillPacket; "<agent> executed <skill>"
kAgentSkillActivatedInstantly, // 0x10000025, wparam = kAgentSkillPacket; "<agent> used <skill>"
kAgentSkillInterrupted, // 0x10000026, wparam = kAgentSkillPacket; "<agent> was interrupted while using <skill>"
kAgentSkillStartedCast, // 0x10000027, wparam = UIPacket::kAgentSkillStartedCast*; "<agent> is warming up <skill>"
kMessage_0x10000028, // 0x10000028
kShowMapEntryMessage, // 0x10000029, wparam = { wchar_t* title, wchar_t* subtitle }
kSetCurrentPlayerData, // 0x1000002a, fired after setting the worldcontext player name
Expand Down Expand Up @@ -674,6 +674,12 @@ namespace GW {
uint32_t agent_id;
GW::Constants::SkillID skill_id;
};
struct kAgentSkillStartedCast {
uint32_t agent_id;
GW::Constants::SkillID skill_id;
float duration;
float h000c;
};
struct kLoadMapContext {
const wchar_t* file_name;
Constants::MapID map_id;
Expand Down Expand Up @@ -811,12 +817,6 @@ namespace GW {
uint32_t h0008;
uint32_t h000c;
};
struct kAgentSkillStartedCast {
uint32_t agent_id;
Constants::SkillID skill_id;
float duration;
uint32_t h000c;
};
struct kPreStartSalvage {
uint32_t item_id;
uint32_t kit_id;
Expand Down
22 changes: 11 additions & 11 deletions Dependencies/GWCA/Include/GWCA/Constants/UIMessages.h.bak
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ namespace GW {
kChangeTarget, // 0x10000020, wparam = UIPacket::kChangeTarget*
kMessage_0x10000021, // 0x10000021
kMessage_0x10000022, // 0x10000022
kMessage_0x10000023, // 0x10000023
kAgentSkillActivated, // 0x10000024, kAgentSkillPacket
kAgentSkillActivatedInstantly, // 0x10000025, kAgentSkillPacket
kAgentSkillCancelled, // 0x10000026, kAgentSkillPacket
kAgentSkillStartedCast, // 0x10000027, wparam = UIPacket::kAgentStartCasting*
kAgentSkillCancelled, // 0x10000023, wparam = kAgentSkillPacket; "<agent> canceled <skill>"
kAgentSkillActivated, // 0x10000024, wparam = kAgentSkillPacket; "<agent> executed <skill>"
kAgentSkillActivatedInstantly, // 0x10000025, wparam = kAgentSkillPacket; "<agent> used <skill>"
kAgentSkillInterrupted, // 0x10000026, wparam = kAgentSkillPacket; "<agent> was interrupted while using <skill>"
kAgentSkillStartedCast, // 0x10000027, wparam = UIPacket::kAgentSkillStartedCast*; "<agent> is warming up <skill>"
kMessage_0x10000028, // 0x10000028
kShowMapEntryMessage, // 0x10000029, wparam = { wchar_t* title, wchar_t* subtitle }
kSetCurrentPlayerData, // 0x1000002a, fired after setting the worldcontext player name
Expand Down Expand Up @@ -674,6 +674,12 @@ namespace GW {
uint32_t agent_id;
GW::Constants::SkillID skill_id;
};
struct kAgentSkillStartedCast {
uint32_t agent_id;
GW::Constants::SkillID skill_id;
float duration;
float h000c;
};
struct kLoadMapContext {
const wchar_t* file_name;
Constants::MapID map_id;
Expand Down Expand Up @@ -811,12 +817,6 @@ namespace GW {
uint32_t h0008;
uint32_t h000c;
};
struct kAgentSkillStartedCast {
uint32_t agent_id;
Constants::SkillID skill_id;
float duration;
uint32_t h000c;
};
struct kPreStartSalvage {
uint32_t item_id;
uint32_t kit_id;
Expand Down
4 changes: 2 additions & 2 deletions Dependencies/GWCA/Include/GWCA/GWCAVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#define GWCA_VERSION_MAJOR 4
#define GWCA_VERSION_MINOR 8
#define GWCA_VERSION_PATCH 5
#define GWCA_VERSION_PATCH 7
#define GWCA_VERSION_BUILD 0
#define GWCA_VERSION "4.8.5.0"
#define GWCA_VERSION "4.8.7.0"

namespace GWCA {
constexpr int VersionMajor = GWCA_VERSION_MAJOR;
Expand Down
2 changes: 1 addition & 1 deletion Dependencies/GWCA/Include/GWCA/Utilities/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <GWCA/Utilities/Export.h>

// Guards against headers and binary being from different releases -- struct offsets shift and nothing else catches it.
#define GWCA_ABI_VERSION 0x04080500u
#define GWCA_ABI_VERSION 0x04080700u

extern "C" {
// The version the binary was built at, against GWCA_ABI_VERSION which is what the caller compiled against.
Expand Down
Binary file modified Dependencies/GWCA/gwca.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<NoWarn>$(NoWarn);IL2104;IL3053;IL3000;IL3002;NU1701;CS0108</NoWarn>

<Version>0.9.10.20</Version>
<Version>0.9.10.21</Version>

<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Loading