liza/ARControl
liza/ARControl
3
0
Fork 1
Code Issues 1 Pull Requests Releases 29 Activity

API 11

Browse Source
This commit is contained in:
Liza 2024-11-15 23:10:32 +01:00
parent a992a841e8
commit 8807769164
Signed by: liza
GPG Key ID: 7199F8D727D55F67
10 changed files with 144 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ARControl/ARControl.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Dalamud.NET.Sdk/9.0.2">
<Project Sdk="Dalamud.NET.Sdk/11.0.0">
<PropertyGroup>
<Version>5.8</Version>
<Version>6.0</Version>
<OutputPath>dist</OutputPath>
</PropertyGroup>

5
ARControl/AutoRetainerControlPlugin.Sync.cs
View File

@ -109,9 +109,10 @@ partial class AutoRetainerControlPlugin
save = true;
}
if (retainer.DisplayOrder != retainerData.DisplayOrder)
int displayOrder = offlineCharacterData.RetainerData.IndexOf(retainerData);
if (retainer.DisplayOrder != displayOrder)
{
retainer.DisplayOrder = retainerData.DisplayOrder;
retainer.DisplayOrder = displayOrder;
save = true;
}

40
ARControl/GameData/GameCache.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using Dalamud.Plugin.Services;
using Lumina.Excel.GeneratedSheets;
using Lumina.Excel.Sheets;
namespace ARControl.GameData;
@ -9,27 +9,27 @@ internal sealed class GameCache
{
public GameCache(IDataManager dataManager)
{
Jobs = dataManager.GetExcelSheet<ClassJob>()!.ToDictionary(x => x.RowId, x => x.Abbreviation.ToString());
Ventures = dataManager.GetExcelSheet<RetainerTask>()!
.Where(x => x.RowId > 0 && !x.IsRandom && x.Task != 0)
Jobs = dataManager.GetExcelSheet<ClassJob>().ToDictionary(x => x.RowId, x => x.Abbreviation.ToString());
Ventures = dataManager.GetExcelSheet<RetainerTask>()
.Where(x => x.RowId > 0 && !x.IsRandom && x.Task.RowId != 0)
.Select(x => new Venture(dataManager, x))
.ToList()
.AsReadOnly();
ItemsToGather = dataManager.GetExcelSheet<GatheringItem>()!
.Where(x => x.RowId > 0 && x.RowId < 10_000 && x.Item != 0 && x.Quest.Row == 0)
.Where(x => Ventures.Any(y => y.ItemId == x.Item))
.Select(x => new ItemToGather(dataManager, x))
ItemsToGather = dataManager.GetExcelSheet<GatheringItem>()
.Where(x => x.RowId > 0 && x.RowId < 10_000 && x.Item.RowId != 0)
.Where(x => Ventures.Any(y => y.ItemId == x.Item.RowId))
.Select(x => new ItemToGather(x))
.OrderBy(x => x.Name)
.ToList()
.AsReadOnly();
FolkloreBooks = dataManager.GetExcelSheet<GatheringSubCategory>()!
FolkloreBooks = dataManager.GetExcelSheet<GatheringSubCategory>()
.Where(x => x.RowId > 0)
.Where(x => x.Item.Row != 0)
.Where(x => x.Item.RowId != 0)
.Select(x => new
{
x.RowId,
ItemId = x.Item.Row,
ItemName = x.Item.Value!.Name.ToString()
ItemId = x.Item.RowId,
ItemName = x.Item.Value.Name.ToString()
})
.GroupBy(x => (x.ItemId, x.ItemName))
.Select(x =>
@ -41,23 +41,23 @@ internal sealed class GameCache
})
.ToDictionary(x => x.ItemId, x => x);
var gatheringNodes = dataManager.GetExcelSheet<GatheringPointBase>()!
.Where(x => x.RowId > 0 && x.GatheringType.Row <= 3)
var gatheringNodes = dataManager.GetExcelSheet<GatheringPointBase>()
.Where(x => x.RowId > 0 && x.GatheringType.RowId <= 3)
.Select(x =>
new
{
GatheringPointBaseId = x.RowId,
GatheringPoint =
dataManager.GetExcelSheet<GatheringPoint>()!.FirstOrDefault(y =>
y.GatheringPointBase.Row == x.RowId),
Items = x.Item.Where(y => y > 0).ToList()
dataManager.GetExcelSheet<GatheringPoint>().Cast<GatheringPoint?>().FirstOrDefault(y =>
y!.Value.GatheringPointBase.RowId == x.RowId),
Items = x.Item.Where(y => y.RowId > 0).ToList()
})
.Where(x => x.GatheringPoint != null)
.Select(x =>
new
{
x.GatheringPointBaseId,
CategoryId = (ushort)x.GatheringPoint!.GatheringSubCategory.Row,
CategoryId = (ushort)x.GatheringPoint!.Value.GatheringSubCategory.RowId,
x.Items,
})
.ToList();
@ -73,13 +73,13 @@ internal sealed class GameCache
new
{
x.CategoryId,
ItemId = (uint)y
ItemId = y.RowId
}))
.GroupBy(x => x.CategoryId)
.ToDictionary(x => x.Key, x => x.Select(y => y.ItemId).ToList());
foreach (var book in FolkloreBooks.Values)
{
book.TomeId = dataManager.GetExcelSheet<Item>()!.GetRow(book.ItemId)!.ItemAction.Value!.Data[0];
book.TomeId = dataManager.GetExcelSheet<Item>().GetRow(book.ItemId).ItemAction.Value.Data[0];
foreach (var category in book.GatheringSubCategories)
{
if (itemsWithTomes.TryGetValue(category, out var itemsInCategory))

13
ARControl/GameData/ItemToGather.cs
View File

@ -1,19 +1,20 @@
using Dalamud.Plugin.Services;
using Lumina.Excel.GeneratedSheets;
using Lumina.Excel.Sheets;
namespace ARControl.GameData;
internal sealed class ItemToGather
{
public ItemToGather(IDataManager dataManager, GatheringItem item)
public ItemToGather(GatheringItem item)
{
GatheredItemId = item.RowId;
ItemId = item.Item;
Name = dataManager.GetExcelSheet<Item>()!.GetRow((uint)item.Item)!.Name.ToString();
var itemRef = item.Item.GetValueOrDefault<Item>()!.Value;
ItemId = itemRef.RowId;
Name = itemRef.Name.ToString();
}
public uint GatheredItemId { get; }
public int ItemId { get; }
public uint ItemId { get; }
public string Name { get; }
}

15
ARControl/GameData/Venture.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using Dalamud.Plugin.Services;
using Lumina.Excel.GeneratedSheets;
using Lumina.Excel.Sheets;
namespace ARControl.GameData;
@ -9,13 +9,14 @@ internal sealed class Venture
public Venture(IDataManager dataManager, RetainerTask retainerTask)
{
RowId = retainerTask.RowId;
Category = retainerTask.ClassJobCategory.Value!;
Category = retainerTask.ClassJobCategory.Value;
var taskDetails = dataManager.GetExcelSheet<RetainerTaskNormal>()!.GetRow(retainerTask.Task)!;
var taskParameters = retainerTask.RetainerTaskParameter.Value!;
ItemId = taskDetails.Item.Row;
IconId = taskDetails.Item.Value!.Icon;
Name = taskDetails.Item.Value!.Name.ToString();
RetainerTaskNormal taskDetails =
dataManager.GetExcelSheet<RetainerTaskNormal>().GetRow(retainerTask.Task.RowId);
RetainerTaskParameter taskParameters = retainerTask.RetainerTaskParameter.Value;
ItemId = taskDetails.Item.RowId;
IconId = taskDetails.Item.Value.Icon;
Name = taskDetails.Item.Value.Name.ToString();
Level = retainerTask.RetainerLevel;
ItemLevelCombat = retainerTask.RequiredItemLevel;
RequiredGathering = retainerTask.RequiredGathering;

183
ARControl/Windows/Config/LockedItemsTab.cs
View File

@ -84,114 +84,123 @@ internal sealed class LockedItemsTab : ITab
.ToList();
if (checkPerCharacter)
DrawPerCharacter(charactersToCheck, itemsToCheck, onlyShowMissing);
else
DrawPerItem(charactersToCheck, itemsToCheck, onlyShowMissing);
}
private void DrawPerCharacter(List<CheckedCharacter> charactersToCheck, List<CheckedItem> itemsToCheck,
bool onlyShowMissing)
{
foreach (var ch in charactersToCheck.Where(x => x.ToCheck(onlyShowMissing).Count != 0))
{
foreach (var ch in charactersToCheck.Where(x => x.ToCheck(onlyShowMissing).Count != 0))
bool currentCharacter = _clientState.LocalContentId == ch.Character.LocalContentId;
ImGui.BeginDisabled(currentCharacter);
if (ImGuiComponents.IconButton($"SwitchCharacters{ch.Character.LocalContentId}",
FontAwesomeIcon.DoorOpen))
{
bool currentCharacter = _clientState.LocalContentId == ch.Character.LocalContentId;
ImGui.BeginDisabled(currentCharacter);
if (ImGuiComponents.IconButton($"SwitchCharacters{ch.Character.LocalContentId}",
FontAwesomeIcon.DoorOpen))
_commandManager.ProcessCommand(
$"/ays relog {ch.Character.CharacterName}@{ch.Character.WorldName}");
}
ImGui.EndDisabled();
ImGui.SameLine();
if (currentCharacter)
ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.HealerGreen);
bool expanded = ImGui.CollapsingHeader($"{ch.Character}###GatheredCh{ch.Character.LocalContentId}");
if (currentCharacter)
ImGui.PopStyleColor();
if (expanded)
{
ImGui.Indent(_configWindow.MainIndentSize + ImGui.GetStyle().FramePadding.X);
foreach (var item in itemsToCheck.Where(x =>
ch.ToCheck(onlyShowMissing).ContainsKey(x.ItemId)))
{
_commandManager.ProcessCommand(
$"/ays relog {ch.Character.CharacterName}@{ch.Character.WorldName}");
}
ImGui.EndDisabled();
ImGui.SameLine();
if (currentCharacter)
ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.HealerGreen);
bool expanded = ImGui.CollapsingHeader($"{ch.Character}###GatheredCh{ch.Character.LocalContentId}");
if (currentCharacter)
ImGui.PopStyleColor();
if (expanded)
{
ImGui.Indent(_configWindow.MainIndentSize + ImGui.GetStyle().FramePadding.X);
foreach (var item in itemsToCheck.Where(x =>
ch.ToCheck(onlyShowMissing).ContainsKey(x.ItemId)))
var color = ch.Items[item.ItemId];
if (color != ColorGrey)
{
var color = ch.Items[item.ItemId];
if (color != ColorGrey)
string itemName = item.GatheredItem.Name;
var folkloreBook = _gameCache.FolkloreBooks.Values.FirstOrDefault(x =>
x.GatheringItemIds.Contains(item.GatheredItem.GatheredItemId));
if (folkloreBook != null && !ch.Character.UnlockedFolkloreBooks.Contains(folkloreBook.ItemId))
itemName += $" ({SeIconChar.Prohibited.ToIconString()} {folkloreBook.Name})";
ImGui.PushStyleColor(ImGuiCol.Text, color);
if (currentCharacter && color == ColorRed)
{
string itemName = item.GatheredItem.Name;
var folkloreBook = _gameCache.FolkloreBooks.Values.FirstOrDefault(x =>
x.GatheringItemIds.Contains(item.GatheredItem.GatheredItemId));
if (folkloreBook != null && !ch.Character.UnlockedFolkloreBooks.Contains(folkloreBook.ItemId))
itemName += $" ({SeIconChar.Prohibited.ToIconString()} {folkloreBook.Name})";
ImGui.PushStyleColor(ImGuiCol.Text, color);
if (currentCharacter && color == ColorRed)
ImGui.Selectable(itemName);
if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
{
ImGui.Selectable(itemName);
if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
{
uint classJob = _clientState.LocalPlayer!.ClassJob.Id;
if (classJob == 16)
_commandManager.ProcessCommand($"/gathermin {item.GatheredItem.Name}");
else if (classJob == 17)
_commandManager.ProcessCommand($"/gatherbtn {item.GatheredItem.Name}");
else if (classJob == 18)
_commandManager.ProcessCommand($"/gatherfish {item.GatheredItem.Name}");
else
_commandManager.ProcessCommand($"/gather {item.GatheredItem.Name}");
}
uint classJob = _clientState.LocalPlayer!.ClassJob.RowId;
if (classJob == 16)
_commandManager.ProcessCommand($"/gathermin {item.GatheredItem.Name}");
else if (classJob == 17)
_commandManager.ProcessCommand($"/gatherbtn {item.GatheredItem.Name}");
else if (classJob == 18)
_commandManager.ProcessCommand($"/gatherfish {item.GatheredItem.Name}");
else
_commandManager.ProcessCommand($"/gather {item.GatheredItem.Name}");
}
else
{
ImGui.Text(itemName);
}
ImGui.PopStyleColor();
}
}
else
{
ImGui.Text(itemName);
}
ImGui.Unindent(_configWindow.MainIndentSize + ImGui.GetStyle().FramePadding.X);
ImGui.PopStyleColor();
}
}
ImGui.Unindent(_configWindow.MainIndentSize + ImGui.GetStyle().FramePadding.X);
}
}
else
}
private void DrawPerItem(List<CheckedCharacter> charactersToCheck, List<CheckedItem> itemsToCheck,
bool onlyShowMissing)
{
foreach (var item in itemsToCheck.Where(x =>
charactersToCheck.Any(y => y.ToCheck(onlyShowMissing).ContainsKey(x.ItemId))))
{
foreach (var item in itemsToCheck.Where(x =>
charactersToCheck.Any(y => y.ToCheck(onlyShowMissing).ContainsKey(x.ItemId))))
var folkloreBook = _gameCache.FolkloreBooks.Values.FirstOrDefault(x =>
x.GatheringItemIds.Contains(item.GatheredItem.GatheredItemId));
if (ImGui.CollapsingHeader($"{item.GatheredItem.Name}##Gathered{item.GatheredItem.ItemId}"))
{
var folkloreBook = _gameCache.FolkloreBooks.Values.FirstOrDefault(x =>
x.GatheringItemIds.Contains(item.GatheredItem.GatheredItemId));
if (ImGui.CollapsingHeader($"{item.GatheredItem.Name}##Gathered{item.GatheredItem.ItemId}"))
ImGui.Indent(_configWindow.MainIndentSize + ImGui.GetStyle().FramePadding.X);
foreach (var ch in charactersToCheck)
{
ImGui.Indent(_configWindow.MainIndentSize + ImGui.GetStyle().FramePadding.X);
foreach (var ch in charactersToCheck)
var color = ch.Items[item.ItemId];
if (color == ColorRed || (color == ColorGreen && !onlyShowMissing))
{
var color = ch.Items[item.ItemId];
if (color == ColorRed || (color == ColorGreen && !onlyShowMissing))
bool currentCharacter = _clientState.LocalContentId == ch.Character.LocalContentId;
if (currentCharacter)
{
bool currentCharacter = _clientState.LocalContentId == ch.Character.LocalContentId;
if (currentCharacter)
ImGui.PushFont(UiBuilder.IconFont);
var pos = ImGui.GetCursorPos();
ImGui.SetCursorPos(pos with
{
ImGui.PushFont(UiBuilder.IconFont);
var pos = ImGui.GetCursorPos();
ImGui.SetCursorPos(pos with
{
X = pos.X - ImGui.CalcTextSize(CurrentCharPrefix).X - 5
});
ImGui.TextUnformatted(CurrentCharPrefix);
ImGui.SetCursorPos(pos);
ImGui.PopFont();
}
string characterName = ch.Character.ToString();
if (folkloreBook != null && !ch.Character.UnlockedFolkloreBooks.Contains(folkloreBook.ItemId))
characterName += $" ({SeIconChar.Prohibited.ToIconString()} {folkloreBook.Name})";
ImGui.PushStyleColor(ImGuiCol.Text, color);
ImGui.TextUnformatted(characterName);
ImGui.PopStyleColor();
X = pos.X - ImGui.CalcTextSize(CurrentCharPrefix).X - 5
});
ImGui.TextUnformatted(CurrentCharPrefix);
ImGui.SetCursorPos(pos);
ImGui.PopFont();
}
}
ImGui.Unindent(_configWindow.MainIndentSize + ImGui.GetStyle().FramePadding.X);
string characterName = ch.Character.ToString();
if (folkloreBook != null &&
!ch.Character.UnlockedFolkloreBooks.Contains(folkloreBook.ItemId))
characterName += $" ({SeIconChar.Prohibited.ToIconString()} {folkloreBook.Name})";
ImGui.PushStyleColor(ImGuiCol.Text, color);
ImGui.TextUnformatted(characterName);
ImGui.PopStyleColor();
}
}
ImGui.Unindent(_configWindow.MainIndentSize + ImGui.GetStyle().FramePadding.X);
}
}
}

10
ARControl/packages.lock.json
View File

@ -4,9 +4,9 @@
"net8.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[2.1.13, )",
"resolved": "2.1.13",
"contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
"requested": "[11.0.0, )",
"resolved": "11.0.0",
"contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
},
"DotNet.ReproducibleBuilds": {
"type": "Direct",
@ -79,7 +79,7 @@
"autoretainerapi": {
"type": "Project",
"dependencies": {
"ECommons": "[2.1.0.7, )"
"ECommons": "[2.2.0.2, )"
}
},
"ecommons": {
@ -88,7 +88,7 @@
"llib": {
"type": "Project",
"dependencies": {
"DalamudPackager": "[2.1.13, )"
"DalamudPackager": "[11.0.0, )"
}
}
}

2
AutoRetainerAPI

@ -1 +1 @@
Subproject commit a63c8e7154e272374ffa03d5c801736d4229e38a
Subproject commit 069cf988b5da8657bc13ade73bfcbc2675601023

2
ECommons

@ -1 +1 @@
Subproject commit 677e28c0696eb13351d90d13ff27adb667b2c862
Subproject commit b99ba7a861300164b9b293b2bbbd510af0cda8a2

2
LLib

@ -1 +1 @@
Subproject commit fa3d19dde18bfd00237e66ea1eb48a60caa01b8a
Subproject commit 4033a1c78aec5bc2a187268e8f2615779dcc2b72