Skip to content

Commit 6391b13

Browse files
committed
Fix quest log parsing (Closes #1344) (#1346)
1 parent 32f0879 commit 6391b13

File tree

5 files changed

+4
-11
lines changed

5 files changed

+4
-11
lines changed

Daybreak.API/Interop/GuildWars/Quest.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ public readonly struct QuestContext
1414

1515
[FieldOffset(0x0018)]
1616
public readonly Vector3 Marker;
17-
18-
[FieldOffset(0x0028)]
19-
public readonly uint MapTo;
2017
}
2118

2219
[StructLayout(LayoutKind.Sequential, Pack = 1, Size = 0xC)]

Daybreak.API/Services/MainPlayerService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public async Task<bool> SetCurrentBuild(string buildCode, CancellationToken canc
261261

262262
return new QuestLogInformation(
263263
gameContext.Pointer->WorldContext->ActiveQuestId,
264-
gameContext.Pointer->WorldContext->QuestLog.AsValueEnumerable().Select(q => new QuestInformation(q.QuestId, q.MapFrom, q.MapTo)).ToList());
264+
gameContext.Pointer->WorldContext->QuestLog.AsValueEnumerable().Select(q => new QuestInformation(q.QuestId, q.MapFrom)).ToList());
265265
}
266266
}, cancellationToken);
267267
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
namespace Daybreak.Shared.Models.Api;
22

3-
public sealed record QuestInformation(uint QuestId, uint MapFrom, uint MapTo)
3+
public sealed record QuestInformation(uint QuestId, uint MapFrom)
44
{
55
}

Daybreak.Shared/Models/Guildwars/QuestMetadata.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ public sealed class QuestMetadata
44
{
55
public Quest? Quest { get; init; }
66
public Map? From { get; init; }
7-
public Map? To { get; init; }
87
public float RotationAngle { get; } = 0f;
98
}

Daybreak/Views/FocusView.razor.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -573,11 +573,9 @@ characterSelectInformation.CharacterNames is null ||
573573
{
574574
_ = Quest.TryParse((int)questLog.CurrentQuestId, out var currentQuest);
575575
_ = Map.TryParse((int)currentQuestEntry.MapFrom, out var mapFrom);
576-
_ = Map.TryParse((int)currentQuestEntry.MapTo, out var mapTo);
577576
currentQuestMeta = new QuestMetadata
578577
{
579578
From = mapFrom,
580-
To = mapTo,
581579
Quest = currentQuest
582580
};
583581
}
@@ -590,13 +588,12 @@ characterSelectInformation.CharacterNames is null ||
590588
.Select(quest =>
591589
{
592590
if (!Quest.TryParse((int)quest.QuestId, out var parsedQuest) ||
593-
!Map.TryParse((int)quest.MapFrom, out var mapFrom) ||
594-
!Map.TryParse((int)quest.MapTo, out var mapTo))
591+
!Map.TryParse((int)quest.MapFrom, out var mapFrom))
595592
{
596593
return default;
597594
}
598595

599-
return new QuestMetadata { From = mapFrom, To = mapTo, Quest = parsedQuest };
596+
return new QuestMetadata { From = mapFrom, Quest = parsedQuest };
600597
})
601598
.OfType<QuestMetadata>()]
602599
};

0 commit comments

Comments
 (0)