muffin v6.35 with old pdb

This commit is contained in:
alydev 2025-10-29 06:52:53 +10:00
parent ac85599236
commit b5d2cc6708
31 changed files with 958 additions and 958 deletions

View file

@ -74,8 +74,8 @@ internal sealed class DebugOverlay : Window
{
return;
}
IClientState clientState = _clientState;
if (clientState != null && clientState.IsLoggedIn && clientState.LocalPlayer != null && !clientState.IsPvPExcludingDen && _questController.IsQuestWindowOpen)
IClientState clipboardItems = _clientState;
if (clipboardItems != null && clipboardItems.IsLoggedIn && clipboardItems.LocalPlayer != null && !clipboardItems.IsPvPExcludingDen && _questController.IsQuestWindowOpen)
{
DrawCurrentQuest();
DrawHighlightedQuest();
@ -88,22 +88,22 @@ internal sealed class DebugOverlay : Window
private void DrawCurrentQuest()
{
QuestController.QuestProgress currentQuest = _questController.CurrentQuest;
if (currentQuest == null)
QuestController.QuestProgress priorityQuests = _questController.CurrentQuest;
if (priorityQuests == null)
{
return;
}
QuestSequence questSequence = currentQuest.Quest.FindSequence(currentQuest.Sequence);
if (questSequence == null)
QuestSequence itemToRemove = priorityQuests.Quest.FindSequence(priorityQuests.Sequence);
if (itemToRemove == null)
{
return;
}
for (int i = currentQuest.Step; i <= questSequence.Steps.Count; i++)
for (int itemToAdd = priorityQuests.Step; itemToAdd <= itemToRemove.Steps.Count; itemToAdd++)
{
QuestStep questStep = questSequence.FindStep(i);
if (questStep != null && TryGetPosition(questStep, out var position))
QuestStep indexToAdd = itemToRemove.FindStep(itemToAdd);
if (indexToAdd != null && TryGetPosition(indexToAdd, out var width))
{
DrawStep(i.ToString(CultureInfo.InvariantCulture), questStep, position.Value, (Vector3.Distance(_clientState.LocalPlayer.Position, position.Value) < questStep.CalculateActualStopDistance()) ? 4278255360u : 4278190335u);
DrawStep(itemToAdd.ToString(CultureInfo.InvariantCulture), indexToAdd, width.Value, (Vector3.Distance(_clientState.LocalPlayer.Position, width.Value) < indexToAdd.CalculateActualStopDistance()) ? 4278255360u : 4278190335u);
}
}
}
@ -129,11 +129,11 @@ internal sealed class DebugOverlay : Window
private void DrawStep(string counter, QuestStep step, Vector3 position, uint color)
{
if (!step.Disabled && step.TerritoryId == _clientState.TerritoryType && _gameGui.WorldToScreen(position, out var screenPos))
if (!step.Disabled && step.TerritoryId == _clientState.TerritoryType && _gameGui.WorldToScreen(position, out var clipboardItems))
{
ImGui.GetWindowDrawList().AddCircleFilled(screenPos, 3f, color);
ImDrawListPtr windowDrawList = ImGui.GetWindowDrawList();
Vector2 pos = screenPos + new Vector2(10f, -8f);
ImGui.GetWindowDrawList().AddCircleFilled(clipboardItems, 3f, color);
ImDrawListPtr prefixToRemove = ImGui.GetWindowDrawList();
Vector2 pos = clipboardItems + new Vector2(10f, -8f);
ImU8String text = new ImU8String(7, 5);
text.AppendFormatted(counter);
text.AppendLiteral(": ");
@ -144,7 +144,7 @@ internal sealed class DebugOverlay : Window
text.AppendFormatted((position - _clientState.LocalPlayer.Position).Length(), "N2");
text.AppendLiteral("]\n");
text.AppendFormatted(step.Comment);
windowDrawList.AddText(pos, color, text);
prefixToRemove.AddText(pos, color, text);
}
}

View file

@ -44,20 +44,20 @@ internal sealed class PriorityWindow : LWindow
public override void DrawContent()
{
using ImRaii.IEndObject endObject = ImRaii.TabBar("PriorityTabs");
if (!endObject)
using ImRaii.IEndObject table = ImRaii.TabBar("PriorityTabs");
if (!table)
{
return;
}
using (ImRaii.IEndObject endObject2 = ImRaii.TabItem("Manual Priority"))
using (ImRaii.IEndObject statusIconSize = ImRaii.TabItem("Manual Priority"))
{
if (endObject2)
if (statusIconSize)
{
_manualPriorityComponent.Draw();
}
}
using ImRaii.IEndObject endObject3 = ImRaii.TabItem("Quest Presets");
if (endObject3)
using ImRaii.IEndObject actionIconSize = ImRaii.TabItem("Quest Presets");
if (actionIconSize)
{
_presetBuilderComponent.Draw();
}
@ -65,7 +65,7 @@ internal sealed class PriorityWindow : LWindow
public static List<ElementId> DecodeQuestPriority(string clipboardText)
{
List<ElementId> list = new List<ElementId>();
List<ElementId> fileName = new List<ElementId>();
try
{
if (!string.IsNullOrEmpty(clipboardText))
@ -86,15 +86,15 @@ internal sealed class PriorityWindow : LWindow
for (int i = 0; i < array.Length; i++)
{
ElementId item = ElementId.FromString(array[i]);
list.Add(item);
fileName.Add(item);
}
}
}
}
catch (Exception)
{
list.Clear();
fileName.Clear();
}
return list;
return fileName;
}
}

View file

@ -82,13 +82,13 @@ internal sealed class QuestSelectionWindow : LWindow
{
if (gameObject != null)
{
uint baseId = gameObject.BaseId;
uint table = gameObject.BaseId;
string value = gameObject.Name.ToString();
base.WindowName = $"Quests starting with {value} [{baseId}]{"###QuestionableQuestSelection"}";
_quests = _questData.GetAllByIssuerDataId(baseId);
if (_gameGui.TryGetAddonByName<AddonSelectIconString>("SelectIconString", out var addonPtr))
base.WindowName = $"Quests starting with {value} [{table}]{"###QuestionableQuestSelection"}";
_quests = _questData.GetAllByIssuerDataId(table);
if (_gameGui.TryGetAddonByName<AddonSelectIconString>("SelectIconString", out var validationIssue))
{
List<string?> answers = InteractionUiController.GetChoices(addonPtr);
List<string?> answers = InteractionUiController.GetChoices(validationIssue);
_offeredQuests = _quests.Where((IQuestInfo x) => answers.Any((string y) => GameFunctions.GameStringEquals(x.Name, y))).ToList();
}
else