Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
fix: update submodules.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Oct 4, 2023
1 parent 781e217 commit b83ab31
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 20 deletions.
2 changes: 1 addition & 1 deletion ECommons
2 changes: 1 addition & 1 deletion Resources/RotationSolverRecord.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"ClickingCount": 11761,
"ClickingCount": 11783,
"SaidUsers": []
}
4 changes: 1 addition & 3 deletions RotationSolver/Helpers/DownloadHelper.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using Dalamud.Logging;
using ECommons.DalamudServices;
using ECommons.DalamudServices;
using RotationSolver.UI;
using System.Text;

namespace RotationSolver.Helpers;

Expand Down
4 changes: 3 additions & 1 deletion RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -530,5 +530,7 @@
"ConfigWindow_Basic_JustSayHelloOnce": "Just say hello once to the same user.",
"ConfigWindow_About_Clicking100k": "Well, you must be a lazy player!",
"ConfigWindow_About_Clicking500k": "You're tiring RS out, give it a break!",
"ConfigWindow_About_ThanksToSupporters": "Many thanks to the sponsors."
"ConfigWindow_About_ThanksToSupporters": "Many thanks to the sponsors.",
"ConfigWindow_Rotations_Download": "Download Rotations",
"ConfigWindow_Rotations_Links": "Links of the rotations online"
}
2 changes: 2 additions & 0 deletions RotationSolver/Localization/Strings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -755,4 +755,6 @@ internal class Strings
public string ConfigWindow_About_Clicking500k { get; set; } = "You're tiring RS out, give it a break!";

public string ConfigWindow_About_ThanksToSupporters { get; set; } = "Many thanks to the sponsors.";
public string ConfigWindow_Rotations_Download { get; set; } = "Download Rotations";
public string ConfigWindow_Rotations_Links { get; set; } = "Links of the rotations online";
}
2 changes: 1 addition & 1 deletion RotationSolver/RotationSolver.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DalamudPackager" Version="2.1.11" />
<PackageReference Include="DalamudPackager" Version="2.1.12" />
</ItemGroup>

<ItemGroup>
Expand Down
27 changes: 17 additions & 10 deletions RotationSolver/UI/RotationConfigWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1359,23 +1359,30 @@ private static unsafe void DrawActions()
#region Rotations
private static void DrawRotations()
{
if (ImGui.Button("Download Rotations"))
{
Task.Run(async () =>
{
await RotationUpdater.GetAllCustomRotationsAsync(DownloadOption.MustDownload | DownloadOption.ShowList);
});
}

var width = ImGui.GetWindowWidth();

var text = "Links of the rotations online";

var text = LocalizationManager.RightLang.ConfigWindow_Rotations_Download;
var textWidth = ImGuiHelpers.GetButtonSize(text).X;

ImGuiHelper.DrawItemMiddle(() =>
{
if (ImGui.Button(text))
{
Task.Run(async () =>
{
await RotationUpdater.GetAllCustomRotationsAsync(DownloadOption.MustDownload | DownloadOption.ShowList);
});
}
}, width, textWidth);

text = LocalizationManager.RightLang.ConfigWindow_Rotations_Links;
textWidth = ImGuiHelpers.GetButtonSize(text).X;
ImGuiHelper.DrawItemMiddle(() =>
{
if (ImGui.Button(text))
{
Util.OpenLink($"https://github.com/{Service.USERNAME}/{Service.REPO}/blob/main/Rotations%20Link.md");
Util.OpenLink($"https://github.com/{Service.USERNAME}/{Service.REPO}/blob/main/RotationsLink.md");
}
}, width, textWidth);

Expand Down
2 changes: 1 addition & 1 deletion RotationSolver/Updaters/PreviewUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal static class PreviewUpdater
{
internal static void UpdatePreview()
{
//UpdateEntry();
UpdateEntry();
UpdateCancelCast();
}

Expand Down
1 change: 0 additions & 1 deletion RotationSolver/Updaters/TargetUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ private static IEnumerable<BattleChara> GetHostileTargets(IEnumerable<BattleChar

private static unsafe uint[] GetEnemies()
{
return Array.Empty<uint>();
if (!Service.Config.GetValue(PluginConfigBool.AddEnemyListToHostile)) return Array.Empty<uint>();

var addons = Service.GetAddons<AddonEnemyList>();
Expand Down
2 changes: 1 addition & 1 deletion XIVPainter

0 comments on commit b83ab31

Please sign in to comment.