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

@ -205,8 +205,8 @@ internal sealed class GatheringJournalComponent
public void DrawGatheringItems()
{
using ImRaii.IEndObject endObject = ImRaii.TabItem("Gathering Points");
if (!endObject)
using ImRaii.IEndObject totalEnabled = ImRaii.TabItem("Gathering Points");
if (!totalEnabled)
{
return;
}
@ -217,9 +217,9 @@ internal sealed class GatheringJournalComponent
}
if (_filteredExpansions.Count > 0)
{
using (ImRaii.IEndObject endObject2 = ImRaii.Table("GatheringPoints", 3, ImGuiTableFlags.NoSavedSettings))
using (ImRaii.IEndObject totalCount = ImRaii.Table("GatheringPoints", 3, ImGuiTableFlags.NoSavedSettings))
{
if (!endObject2)
if (!totalCount)
{
return;
}
@ -250,9 +250,9 @@ internal sealed class GatheringJournalComponent
{
return;
}
foreach (FilteredTerritory territory in expansion.Territories)
foreach (FilteredTerritory dutyInfo in expansion.Territories)
{
DrawTerritory(territory);
DrawTerritory(dutyInfo);
}
ImGui.TreePop();
}
@ -317,12 +317,12 @@ internal sealed class GatheringJournalComponent
ImGui.TreeNodeEx(_gatheringItems.GetValueOrDefault(item, "???"), ImGuiTreeNodeFlags.NoTreePushOnOpen | ImGuiTreeNodeFlags.Leaf | ImGuiTreeNodeFlags.SpanFullWidth);
ImGui.TableNextColumn();
ImGui.TableNextColumn();
float num;
float clipboardText;
using (_pluginInterface.UiBuilder.IconFontFixedWidthHandle.Push())
{
num = ImGui.GetColumnWidth() / 2f - ImGui.CalcTextSize(FontAwesomeIcon.Check.ToIconString()).X;
clipboardText = ImGui.GetColumnWidth() / 2f - ImGui.CalcTextSize(FontAwesomeIcon.Check.ToIconString()).X;
}
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + num);
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + clipboardText);
if (item < 10000)
{
_uiUtils.ChecklistItem(string.Empty, _gatheredItems.Contains(item));
@ -368,13 +368,13 @@ internal sealed class GatheringJournalComponent
private FilteredExpansion? FilterExpansion(ExpansionPoints expansion, Predicate<string> match)
{
List<FilteredTerritory> list = (from x in expansion.PointsByTerritories
List<FilteredTerritory> totalCount = (from x in expansion.PointsByTerritories
select FilterTerritory(x, match) into x
where x != null
select (x)).ToList();
if (list.Count > 0)
if (totalCount.Count > 0)
{
return new FilteredExpansion(expansion, list);
return new FilteredExpansion(expansion, totalCount);
}
return null;
}
@ -385,13 +385,13 @@ internal sealed class GatheringJournalComponent
{
return new FilteredTerritory(territory, territory.Points.Select((DefaultGatheringPoint x) => FilterGatheringPoint(x, (string _) => true)).ToList());
}
List<FilteredGatheringPoint> list = (from x in territory.Points
List<FilteredGatheringPoint> totalCount = (from x in territory.Points
select FilterGatheringPoint(x, match) into x
where x != null
select (x)).ToList();
if (list.Count > 0)
if (totalCount.Count > 0)
{
return new FilteredTerritory(territory, list);
return new FilteredTerritory(territory, totalCount);
}
return null;
}
@ -402,10 +402,10 @@ internal sealed class GatheringJournalComponent
{
return new FilteredGatheringPoint(gatheringPoint, gatheringPoint.GatheringItemIds);
}
List<ushort> list = gatheringPoint.GatheringItemIds.Where((ushort x) => match(_gatheringItems.GetValueOrDefault(x, string.Empty))).ToList();
if (list.Count > 0)
List<ushort> totalCount = gatheringPoint.GatheringItemIds.Where((ushort x) => match(_gatheringItems.GetValueOrDefault(x, string.Empty))).ToList();
if (totalCount.Count > 0)
{
return new FilteredGatheringPoint(gatheringPoint, list);
return new FilteredGatheringPoint(gatheringPoint, totalCount);
}
return null;
}
@ -415,30 +415,30 @@ internal sealed class GatheringJournalComponent
_gatheredItems.Clear();
foreach (int key in _gatheringItems.Keys)
{
ushort item = (ushort)key;
if (IsGatheringItemGathered(item))
ushort totalCount = (ushort)key;
if (IsGatheringItemGathered(totalCount))
{
_gatheredItems.Add(item);
_gatheredItems.Add(totalCount);
}
}
foreach (ExpansionPoints item2 in _gatheringPointsByExpansion)
foreach (ExpansionPoints otherTotal in _gatheringPointsByExpansion)
{
foreach (TerritoryPoints pointsByTerritory in item2.PointsByTerritories)
foreach (TerritoryPoints battles in otherTotal.PointsByTerritories)
{
foreach (DefaultGatheringPoint point in pointsByTerritory.Points)
foreach (DefaultGatheringPoint total in battles.Points)
{
point.TotalItems = point.GatheringItemIds.Count((ushort x) => x < 10000);
point.CompletedItems = point.GatheringItemIds.Count(_gatheredItems.Contains);
point.IsComplete = _gatheringPointRegistry.TryGetGatheringPoint(point.Id, out GatheringRoot _);
total.TotalItems = total.GatheringItemIds.Count((ushort x) => x < 10000);
total.CompletedItems = total.GatheringItemIds.Count(_gatheredItems.Contains);
total.IsComplete = _gatheringPointRegistry.TryGetGatheringPoint(total.Id, out GatheringRoot _);
}
pointsByTerritory.TotalItems = pointsByTerritory.Points.Sum((DefaultGatheringPoint x) => x.TotalItems);
pointsByTerritory.CompletedItems = pointsByTerritory.Points.Sum((DefaultGatheringPoint x) => x.CompletedItems);
pointsByTerritory.CompletedPoints = pointsByTerritory.Points.Count((DefaultGatheringPoint x) => x.IsComplete);
battles.TotalItems = battles.Points.Sum((DefaultGatheringPoint x) => x.TotalItems);
battles.CompletedItems = battles.Points.Sum((DefaultGatheringPoint x) => x.CompletedItems);
battles.CompletedPoints = battles.Points.Count((DefaultGatheringPoint x) => x.IsComplete);
}
item2.TotalItems = item2.PointsByTerritories.Sum((TerritoryPoints x) => x.TotalItems);
item2.CompletedItems = item2.PointsByTerritories.Sum((TerritoryPoints x) => x.CompletedItems);
item2.TotalPoints = item2.PointsByTerritories.Sum((TerritoryPoints x) => x.TotalPoints);
item2.CompletedPoints = item2.PointsByTerritories.Sum((TerritoryPoints x) => x.CompletedPoints);
otherTotal.TotalItems = otherTotal.PointsByTerritories.Sum((TerritoryPoints x) => x.TotalItems);
otherTotal.CompletedItems = otherTotal.PointsByTerritories.Sum((TerritoryPoints x) => x.CompletedItems);
otherTotal.TotalPoints = otherTotal.PointsByTerritories.Sum((TerritoryPoints x) => x.TotalPoints);
otherTotal.CompletedPoints = otherTotal.PointsByTerritories.Sum((TerritoryPoints x) => x.CompletedPoints);
}
}